From 013cf2721f8e31cbd3f6087987c17f6001d42ee7 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Sat, 16 Nov 2024 23:52:48 +0000 Subject: [PATCH 01/50] Add FDN token images --- .../sources/ScryfallImageSupportTokens.java | 29 +++++++++++++++++++ Mage/src/main/resources/tokens-database.txt | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java index 4f519a3c10a..94a87f91fdb 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java @@ -2458,9 +2458,38 @@ public class ScryfallImageSupportTokens { put("BLC/Raccoon", "https://api.scryfall.com/cards/tblc/29/en?format=image"); // FDN + put("FDN/Beast/1", "https://api.scryfall.com/cards/tfdn/32/en?format=image"); + put("FDN/Beast/2", "https://api.scryfall.com/cards/tfdn/33/en?format=image"); + put("FDN/Cat/1", "https://api.scryfall.com/cards/tfdn/1/en?format=image"); + put("FDN/Cat/2", "https://api.scryfall.com/cards/tfdn/27/en?format=image"); + put("FDN/Cat/3", "https://api.scryfall.com/cards/tfdn/2/en?format=image"); + put("FDN/Cat Beast", "https://api.scryfall.com/cards/tfdn/28/en?format=image"); + put("FDN/Dog", "https://api.scryfall.com/cards/tfdn/29/en?format=image"); + put("FDN/Dragon/1", "https://api.scryfall.com/cards/tfdn/16/en?format=image"); + put("FDN/Dragon/2", "https://api.scryfall.com/cards/tfdn/17/en?format=image"); + put("FDN/Drake", "https://api.scryfall.com/cards/tfdn/8/en?format=image"); + put("FDN/Elf Warrior", "https://api.scryfall.com/cards/tfdn/19/en?format=image"); + put("FDN/Faerie", "https://api.scryfall.com/cards/tfdn/9/en?format=image"); + put("FDN/Fish", "https://api.scryfall.com/cards/tfdn/10/en?format=image"); + put("FDN/Food", "https://api.scryfall.com/cards/tfdn/22/en?format=image"); + put("FDN/Goblin", "https://api.scryfall.com/cards/tfdn/18/en?format=image"); + put("FDN/Human", "https://api.scryfall.com/cards/tfdn/3/en?format=image"); + put("FDN/Insect", "https://api.scryfall.com/cards/tfdn/21/en?format=image"); put("FDN/Emblem Kaito", "https://api.scryfall.com/cards/tfdn/24/en?format=image"); + put("FDN/Knight", "https://api.scryfall.com/cards/tfdn/4/en?format=image"); + put("FDN/Koma's Coil", "https://api.scryfall.com/cards/tfdn/11/en?format=image"); put("FDN/Ninja", "https://api.scryfall.com/cards/tfdn/12/en?format=image"); + put("FDN/Phyrexian Goblin", "https://api.scryfall.com/cards/tfdn/31/en?format=image"); + put("FDN/Rabbit", "https://api.scryfall.com/cards/tfdn/5/en?format=image"); + put("FDN/Raccoon", "https://api.scryfall.com/cards/tfdn/20/en?format=image"); + put("FDN/Rat/1", "https://api.scryfall.com/cards/tfdn/14/en?format=image"); + put("FDN/Rat/2", "https://api.scryfall.com/cards/tfdn/30/en?format=image"); put("FDN/Scion of the Deep", "https://api.scryfall.com/cards/tfdn/13/en?format=image"); + put("FDN/Soldier", "https://api.scryfall.com/cards/tfdn/6/en?format=image"); + put("FDN/Spirit", "https://api.scryfall.com/cards/tfdn/7/en?format=image"); + put("FDN/Treasure", "https://api.scryfall.com/cards/tfdn/23/en?format=image"); + put("FDN/Emblem Vivien", "https://api.scryfall.com/cards/tfdn/25/en?format=image"); + put("FDN/Zombie", "https://api.scryfall.com/cards/tfdn/15/en?format=image"); // generate supported sets supportedSets.clear(); diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt index 5068b7c0c30..97af92fe948 100644 --- a/Mage/src/main/resources/tokens-database.txt +++ b/Mage/src/main/resources/tokens-database.txt @@ -137,6 +137,7 @@ |Generate|EMBLEM:ACR|Emblem Capitoline Triad|||TheCapitolineTriadEmblem| |Generate|EMBLEM:BLB|Emblem Ral|||RalCracklingWitEmblem| |Generate|EMBLEM:FDN|Emblem Kaito|||KaitoCunningInfiltratorEmblem| +|Generate|EMBLEM:FDN|Emblem Vivien|||VivienReidEmblem| # ALL PLANES # Usage hints: @@ -2396,5 +2397,33 @@ |Generate|TOK:BLC|Racoon|||RaccoonToken| # FDN +|Generate|TOK:FDN|Beast|1||BeastToken| +|Generate|TOK:FDN|Beast|2||BeastToken2| +|Generate|TOK:FDN|Cat|1||CatToken3| +|Generate|TOK:FDN|Cat|2||CatToken2| +|Generate|TOK:FDN|Cat|3||CatToken| +|Generate|TOK:FDN|Cat Beast|||CatBeastToken| +|Generate|TOK:FDN|Dog|||WhiteDogToken| +|Generate|TOK:FDN|Dragon|1||DragonToken| +|Generate|TOK:FDN|Dragon|2||DragonToken2| +|Generate|TOK:FDN|Drake|||DrakeToken| +|Generate|TOK:FDN|Elf Warrior|||ElfWarriorToken| +|Generate|TOK:FDN|Faerie|||FaerieToken| +|Generate|TOK:FDN|Fish|||FishNoAbilityToken| +|Generate|TOK:FDN|Food|||FoodToken| +|Generate|TOK:FDN|Goblin|||GoblinToken| +|Generate|TOK:FDN|Human|||HumanToken| +|Generate|TOK:FDN|Insect|||InsectBlackGreenFlyingToken| +|Generate|TOK:FDN|Knight|||Knight33Token| +|Generate|TOK:FDN|Koma's Coil|||KomasCoilToken| |Generate|TOK:FDN|Ninja|||NinjaToken2| +|Generate|TOK:FDN|Phyrexian Goblin|||PhyrexianGoblinToken| +|Generate|TOK:FDN|Rabbit|||RabbitToken| +|Generate|TOK:FDN|Raccoon|||RaccoonToken| +|Generate|TOK:FDN|Rat|1||RatToken| +|Generate|TOK:FDN|Rat|2||RatCantBlockToken| |Generate|TOK:FDN|Scion of the Deep|||ScionOfTheDeepToken| +|Generate|TOK:FDN|Soldier|||SoldierToken| +|Generate|TOK:FDN|Spirit|||SpiritWhiteToken| +|Generate|TOK:FDN|Treasure|||TreasureToken| +|Generate|TOK:FDN|Zombie|||ZombieToken| -- 2.47.2 From c8d7b7e765d3084879a2b7e4691e6c16d30e77bb Mon Sep 17 00:00:00 2001 From: tiera3 <87589219+tiera3@users.noreply.github.com> Date: Thu, 3 Oct 2024 23:24:47 +1000 Subject: [PATCH 02/50] [TMP] Tempest - collation - commons (closes #12969) Four unimplemented cards omitted from the rare run. --- Mage.Sets/src/mage/sets/Tempest.java | 82 ++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/Mage.Sets/src/mage/sets/Tempest.java b/Mage.Sets/src/mage/sets/Tempest.java index 6c694b4f6c4..e85d2072e8d 100644 --- a/Mage.Sets/src/mage/sets/Tempest.java +++ b/Mage.Sets/src/mage/sets/Tempest.java @@ -3,6 +3,13 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; +import mage.collation.BoosterCollator; +import mage.collation.BoosterStructure; +import mage.collation.CardRun; +import mage.collation.RarityConfiguration; + +import java.util.ArrayList; +import java.util.List; public final class Tempest extends ExpansionSet { @@ -368,4 +375,79 @@ public final class Tempest extends ExpansionSet { cards.add(new SetCardInfo("Wood Sage", 275, Rarity.RARE, mage.cards.w.WoodSage.class)); cards.add(new SetCardInfo("Worthy Cause", 53, Rarity.UNCOMMON, mage.cards.w.WorthyCause.class)); } + + @Override + public BoosterCollator createCollator() { + return new TempestCollator(); + } +} + +// Booster collation info from https://www.lethe.xyz/mtg/collation/tmp.html +// Using common collation +class TempestCollator implements BoosterCollator { + private final CardRun commonA = new CardRun(true, "129", "226", "185", "105", "23", "137", "252", "173", "57", "34", "129", "244", "190", "78", "23", "132", "252", "198", "105", "16", "113", "257", "186", "78", "29", "128", "216", "173", "67", "3", "117", "251", "190", "57", "29", "113", "216", "184", "82", "15", "132", "257", "198", "85", "34", "128", "251", "185", "67", "15", "117", "226", "186", "82", "3", "137", "244", "184", "85", "16"); + private final CardRun commonB = new CardRun(true, "296", "258", "189", "11", "86", "309", "256", "191", "30", "106", "159", "294", "199", "10", "93", "112", "297", "207", "30", "55", "122", "261", "296", "5", "106", "119", "228", "309", "10", "74", "122", "249", "191", "279", "55", "119", "261", "164", "297", "86", "126", "256", "199", "11", "294", "112", "249", "189", "43", "74", "159", "258", "207", "5", "93", "126", "228", "164", "43", "279"); + private final CardRun commonC = new CardRun(true, "133", "238", "167", "99", "14", "134", "255", "211", "66", "17", "144", "245", "174", "89", "1", "133", "260", "160", "66", "44", "144", "217", "167", "59", "47", "148", "245", "187", "89", "14", "123", "260", "211", "96", "17", "134", "238", "174", "59", "1", "148", "217", "160", "99", "44", "123", "255", "187", "96", "47"); + private final CardRun commonD = new CardRun(true, "109", "215", "182", "101", "13", "150", "239", "206", "94", "12", "118", "254", "169", "95", "9", "153", "231", "203", "87", "8", "150", "246", "182", "65", "12", "156", "239", "178", "95", "50", "153", "215", "203", "101", "8", "109", "254", "206", "87", "13", "118", "231", "178", "94", "50", "156", "246", "169", "65", "9"); + private final CardRun uncommon = new CardRun(false, "107", "161", "315", "2", "214", "4", "163", "165", "278", "218", "56", "219", "317", "120", "121", "124", "125", "58", "130", "171", "286", "287", "63", "172", "227", "19", "175", "64", "20", "318", "179", "230", "181", "233", "234", "138", "68", "69", "25", "183", "26", "140", "235", "141", "71", "72", "27", "267", "319", "145", "77", "298", "320", "192", "241", "242", "194", "32", "243", "299", "147", "302", "303", "80", "304", "36", "149", "268", "151", "247", "152", "197", "37", "323", "81", "253", "155", "201", "269", "40", "202", "88", "157", "271", "41", "45", "46", "158", "273", "327", "49", "90", "91", "259", "208", "209", "311", "92", "328", "262", "329", "264", "51", "330", "314", "103", "212", "104", "265", "53"); + // excluding unimplemented rares 61|Ertai's Meddling, 102|Whim of Volrath, 193|No Quarter, 295|Magnetic Web + private final CardRun rare = new CardRun(false, "276", "213", "162", "6", "7", "108", "54", "277", "110", "316", "166", "111", "168", "114", "280", "115", "116", "220", "281", "170", "127", "221", "266", "131", "60", "222", "282", "224", "223", "225", "283", "284", "285", "62", "135", "136", "18", "288", "176", "289", "229", "177", "21", "290", "180", "22", "232", "291", "24", "70", "292", "293", "139", "142", "143", "188", "73", "28", "75", "76", "146", "236", "237", "240", "31", "33", "195", "300", "35", "301", "321", "79", "196", "248", "322", "250", "83", "84", "305", "38", "39", "324", "306", "154", "325", "307", "200", "308", "270", "204", "326", "42", "272", "48", "205", "310", "312", "97", "210", "313", "98", "100", "263", "274", "52", "275"); + + private final BoosterStructure AAABBB = new BoosterStructure( + commonA, commonA, commonA, + commonB, commonB, commonB + ); + private final BoosterStructure BBBAAA = new BoosterStructure( + commonB, commonB, commonB, + commonA, commonA, commonA + ); + private final BoosterStructure AAAABB = new BoosterStructure( + commonA, commonA, commonA, commonA, + commonB, commonB + ); + private final BoosterStructure BBBBAA = new BoosterStructure( + commonB, commonB, commonB, commonB, + commonA, commonA + ); + private final BoosterStructure CCCDD = new BoosterStructure( + commonC, commonC, commonC, + commonD, commonD + ); + private final BoosterStructure DDDCC = new BoosterStructure( + commonD, commonD, commonD, + commonC, commonC + ); + private final BoosterStructure CCDDD = new BoosterStructure( + commonC, commonC, + commonD, commonD, commonD + ); + private final BoosterStructure DDCCC = new BoosterStructure( + commonD, commonD, + commonC, commonC, commonC + ); + private final BoosterStructure U3 = new BoosterStructure(uncommon, uncommon, uncommon); + private final BoosterStructure R1 = new BoosterStructure(rare); + + // https://www.lethe.xyz/mtg/collation/mir.html states a very rough estimate of the 4-2 rate is 1/3 + private final RarityConfiguration commonRunsAB = new RarityConfiguration( + AAAABB, + AAABBB, AAABBB, + BBBAAA, BBBAAA, + BBBBAA + ); + private final RarityConfiguration commonRunsCD = new RarityConfiguration( + CCCDD, DDDCC, CCDDD, DDCCC + ); + private final RarityConfiguration uncommonRuns = new RarityConfiguration(U3); + private final RarityConfiguration rareRuns = new RarityConfiguration(R1); + + @Override + public List makeBooster() { + List booster = new ArrayList<>(); + booster.addAll(commonRunsAB.getNext().makeRun()); + booster.addAll(commonRunsCD.getNext().makeRun()); + booster.addAll(uncommonRuns.getNext().makeRun()); + booster.addAll(rareRuns.getNext().makeRun()); + return booster; + } } -- 2.47.2 From 8c58eab8abd4004022e57c3a0352238a3bf1e0cf Mon Sep 17 00:00:00 2001 From: tiera3 <87589219+tiera3@users.noreply.github.com> Date: Thu, 3 Oct 2024 06:53:30 +1000 Subject: [PATCH 03/50] [USG] Urza's Saga - collation - commons (closes #12965) --- Mage.Sets/src/mage/sets/UrzasSaga.java | 80 ++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/Mage.Sets/src/mage/sets/UrzasSaga.java b/Mage.Sets/src/mage/sets/UrzasSaga.java index 8a7ff4755d3..002a8b44779 100644 --- a/Mage.Sets/src/mage/sets/UrzasSaga.java +++ b/Mage.Sets/src/mage/sets/UrzasSaga.java @@ -3,6 +3,13 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; +import mage.collation.BoosterCollator; +import mage.collation.BoosterStructure; +import mage.collation.CardRun; +import mage.collation.RarityConfiguration; + +import java.util.ArrayList; +import java.util.List; /** * @@ -376,4 +383,77 @@ public final class UrzasSaga extends ExpansionSet { cards.add(new SetCardInfo("Zephid", 113, Rarity.RARE, mage.cards.z.Zephid.class)); cards.add(new SetCardInfo("Zephid's Embrace", 114, Rarity.UNCOMMON, mage.cards.z.ZephidsEmbrace.class)); } + + @Override + public BoosterCollator createCollator() { + return new UrzasSagaCollator(); + } +} + +// Booster collation info from https://www.lethe.xyz/mtg/collation/usg.html +// Using common collation +class UrzasSagaCollator implements BoosterCollator { + private final CardRun commonA = new CardRun(true, "139", "247", "94", "213", "5", "163", "256", "92", "226", "8", "139", "241", "82", "213", "46", "158", "267", "68", "191", "51", "129", "284", "64", "186", "10", "118", "256", "68", "201", "51", "124", "264", "67", "186", "46", "118", "267", "94", "226", "16", "124", "284", "92", "194", "8", "163", "241", "67", "201", "10", "129", "247", "82", "194", "5", "158", "264", "64", "191", "16"); + private final CardRun commonB = new CardRun(true, "323", "238", "86", "174", "12", "148", "279", "324", "195", "29", "147", "327", "80", "199", "4", "152", "285", "112", "328", "27", "116", "238", "324", "224", "29", "148", "275", "86", "195", "320", "147", "269", "78", "174", "30", "323", "285", "89", "224", "320", "135", "269", "112", "199", "12", "152", "327", "78", "223", "4", "135", "275", "80", "328", "30", "116", "279", "89", "223", "27"); + private final CardRun commonC = new CardRun(true, "156", "230", "110", "182", "42", "120", "235", "87", "193", "24", "119", "266", "106", "196", "21", "120", "253", "98", "182", "25", "137", "230", "59", "196", "11", "156", "235", "106", "217", "42", "121", "266", "98", "209", "11", "137", "248", "87", "217", "25", "121", "253", "110", "193", "21", "119", "248", "59", "209", "24"); + private final CardRun commonD = new CardRun(true, "132", "280", "93", "184", "41", "127", "252", "69", "177", "40", "134", "254", "93", "207", "36", "162", "271", "104", "198", "38", "122", "280", "65", "184", "37", "132", "252", "90", "208", "36", "122", "270", "65", "198", "37", "127", "271", "90", "177", "41", "134", "270", "104", "208", "40", "162", "254", "69", "207", "38"); + private final CardRun uncommon = new CardRun(false, "130", "272", "189", "107", "2", "293", "274", "227", "79", "50", "297", "114", "1", "166", "260", "215", "111", "292", "164", "245", "32", "150", "287", "180", "83", "44", "145", "239", "203", "88", "277", "200", "60", "18", "153", "255", "303", "70", "48", "318", "314", "33", "144", "259", "205", "95", "7", "155", "261", "219", "54", "319", "211", "75", "311", "47", "141", "222", "74", "278", "142", "99", "246", "43", "192", "170", "58", "313", "52", "216", "276", "55", "307", "149", "105", "237", "22", "181", "136", "109", "197", "157", "102", "232", "9", "187", "151", "294", "251", "56", "66", "240", "317", "221", "117", "315", "231", "20", "172", "160", "290", "190", "167", "84", "233", "35", "206", "125", "72", "282"); + private final CardRun rare = new CardRun(true, "321", "169", "281", "228", "305", "73", "13", "146", "273", "291", "183", "101", "14", "138", "316", "234", "176", "113", "6", "299", "133", "263", "178", "103", "301", "330", "57", "140", "262", "289", "175", "76", "28", "161", "288", "236", "188", "97", "53", "302", "154", "244", "173", "61", "298", "49", "131", "243", "212", "309", "329", "77", "3", "126", "283", "218", "85", "31", "159", "229", "286", "204", "100", "39", "165", "308", "250", "214", "108", "34", "300", "168", "257", "210", "63", "312", "26", "322", "171", "268", "296", "220", "71", "19", "143", "310", "242", "225", "96", "15", "306", "123", "258", "202", "62", "304", "45", "128", "265", "185", "325", "81", "17", "295", "115", "326", "249", "179", "91", "23"); + + private final BoosterStructure AAABBB = new BoosterStructure( + commonA, commonA, commonA, + commonB, commonB, commonB + ); + private final BoosterStructure BBBAAA = new BoosterStructure( + commonB, commonB, commonB, + commonA, commonA, commonA + ); + private final BoosterStructure AAAABB = new BoosterStructure( + commonA, commonA, commonA, commonA, + commonB, commonB + ); + private final BoosterStructure BBBBAA = new BoosterStructure( + commonB, commonB, commonB, commonB, + commonA, commonA + ); + private final BoosterStructure CCCDD = new BoosterStructure( + commonC, commonC, commonC, + commonD, commonD + ); + private final BoosterStructure DDDCC = new BoosterStructure( + commonD, commonD, commonD, + commonC, commonC + ); + private final BoosterStructure CCDDD = new BoosterStructure( + commonC, commonC, + commonD, commonD, commonD + ); + private final BoosterStructure DDCCC = new BoosterStructure( + commonD, commonD, + commonC, commonC, commonC + ); + private final BoosterStructure U3 = new BoosterStructure(uncommon, uncommon, uncommon); + private final BoosterStructure R1 = new BoosterStructure(rare); + + private final RarityConfiguration commonRunsAB = new RarityConfiguration( + AAAABB, + AAABBB, AAABBB, AAABBB, AAABBB, AAABBB, AAABBB, AAABBB, AAABBB, AAABBB, + BBBAAA, BBBAAA, BBBAAA, BBBAAA, BBBAAA, BBBAAA, BBBAAA, BBBAAA, BBBAAA, + BBBBAA + ); + private final RarityConfiguration commonRunsCD = new RarityConfiguration( + CCCDD, DDDCC, CCDDD, DDCCC + ); + private final RarityConfiguration uncommonRuns = new RarityConfiguration(U3); + private final RarityConfiguration rareRuns = new RarityConfiguration(R1); + + @Override + public List makeBooster() { + List booster = new ArrayList<>(); + booster.addAll(commonRunsAB.getNext().makeRun()); + booster.addAll(commonRunsCD.getNext().makeRun()); + booster.addAll(uncommonRuns.getNext().makeRun()); + booster.addAll(rareRuns.getNext().makeRun()); + return booster; + } } -- 2.47.2 From 83389d594f4179fea91af3c6fcb9196d4a603019 Mon Sep 17 00:00:00 2001 From: tiera3 <87589219+tiera3@users.noreply.github.com> Date: Fri, 4 Oct 2024 07:05:56 +1000 Subject: [PATCH 04/50] [VIS] Visions - collation - commons (closes #12971) One unimplemented uncommon and one unimplemented rare omitted --- Mage.Sets/src/mage/sets/Visions.java | 69 +++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/Visions.java b/Mage.Sets/src/mage/sets/Visions.java index fa419e8cadb..351718bd5d5 100644 --- a/Mage.Sets/src/mage/sets/Visions.java +++ b/Mage.Sets/src/mage/sets/Visions.java @@ -3,9 +3,15 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; +import mage.collation.BoosterCollator; +import mage.collation.BoosterStructure; +import mage.collation.CardRun; +import mage.collation.RarityConfiguration; + +import java.util.ArrayList; +import java.util.List; /** - * * @author North */ public final class Visions extends ExpansionSet { @@ -193,4 +199,65 @@ public final class Visions extends ExpansionSet { cards.add(new SetCardInfo("Wind Shear", 125, Rarity.UNCOMMON, mage.cards.w.WindShear.class)); cards.add(new SetCardInfo("Zhalfirin Crusader", 25, Rarity.RARE, mage.cards.z.ZhalfirinCrusader.class)); } + + @Override + public BoosterCollator createCollator() { + return new VisionsCollator(); + } +} + +// Booster collation info from https://www.lethe.xyz/mtg/collation/vis.html +// Using USA sequential collation +class VisionsCollator implements BoosterCollator { + + private final CardRun commonA = new CardRun(true, "59", "93", "108", "37", "8", "54", "92", "117", "27", "14", "62", "96", "120", "49", "11", "57", "94", "107", "37", "5", "61", "85", "101", "49", "11", "75", "96", "107", "36", "18", "57", "92", "106", "48", "10", "54", "99", "117", "38", "5", "62", "93", "101", "48", "8", "59", "85", "108", "38", "10", "75", "99", "106", "36", "14", "61", "94", "120", "27", "18"); + private final CardRun commonB = new CardRun(true, "55", "82", "115", "24", "34", "70", "90", "105", "17", "43", "56", "77", "118", "17", "26", "55", "90", "115", "21", "26", "74", "82", "118", "24", "29", "71", "79", "113", "6", "47", "74", "97", "110", "20", "29", "70", "77", "105", "21", "34", "71", "79", "110", "6", "43", "56", "97", "113", "20", "47"); + private final CardRun commonC = new CardRun(false, "68", "81", "124", "154", "9", "35", "152"); + // omitted "46" unimplemented Time and Tide + private final CardRun uncommon = new CardRun(false, "157", "125", "40", "161", "7", "64", "111", "132", "83", "22", "148", "22", "53", "123", "142", "149", "13", "146", "122", "149", "66", "150", "31", "95", "15", "58", "122", "50", "84", "111", "31", "88", "150", "69", "135", "50", "135", "16", "166", "80", "162", "64", "103", "160", "88", "145", "52", "144", "136", "121", "148", "164", "12", "144", "123", "162", "100", "12", "42", "164", "7", "53", "104", "142", "84", "2", "73", "136", "16", "73", "161", "33", "98", "15", "58", "147", "39", "80", "157", "42", "100", "165", "147", "125", "139", "98", "160", "66", "95", "132", "126", "121", "39", "126", "13", "52", "104", "33", "145", "83", "166", "69", "103", "40", "146", "2", "139", "165"); + // omitted "89" unimplemented Ogre Enforcer + private final CardRun rare = new CardRun(false, "151", "45", "137", "114", "131", "72", "143", "4", "140", "63", "28", "153", "109", "129", "60", "44", "23", "155", "76", "128", "30", "156", "112", "158", "51", "134", "25", "130", "78", "141", "32", "3", "116", "86", "67", "159", "1", "102", "91", "127", "41", "167", "119", "138", "65", "133", "19", "163", "87"); + + private final BoosterStructure AAAAABBBBBC = new BoosterStructure( + commonA, commonA, commonA, commonA, commonA, + commonB, commonB, commonB, commonB, commonB, + commonC + ); + private final BoosterStructure AAAAAAAACCC = new BoosterStructure( + commonA, commonA, commonA, commonA, commonA, commonA, commonA, commonA, + commonC, commonC, commonC + ); + private final BoosterStructure AAAAAAAAACC = new BoosterStructure( + commonA, commonA, commonA, commonA, commonA, commonA, commonA, commonA, commonA, + commonC, commonC + ); + private final BoosterStructure U3 = new BoosterStructure(uncommon, uncommon, uncommon); + private final BoosterStructure R1 = new BoosterStructure(rare); + + // guesses from lethe based on AAAAAAAACCC observed and likely sheet structure + private final RarityConfiguration commonRuns = new RarityConfiguration( + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, AAAAABBBBBC, + AAAAAAAACCC, AAAAAAAACCC, AAAAAAAACCC, AAAAAAAACCC, AAAAAAAACCC, + AAAAAAAAACC + ); + private final RarityConfiguration uncommonRuns = new RarityConfiguration(U3); + private final RarityConfiguration rareRuns = new RarityConfiguration(R1); + + @Override + public List makeBooster() { + List booster = new ArrayList<>(); + booster.addAll(commonRuns.getNext().makeRun()); + booster.addAll(uncommonRuns.getNext().makeRun()); + booster.addAll(rareRuns.getNext().makeRun()); + return booster; + } } -- 2.47.2 From 7d2db7ddddc9de968ff56b3f4447b0dceeb43c2b Mon Sep 17 00:00:00 2001 From: tiera3 <87589219+tiera3@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:03:44 +1000 Subject: [PATCH 05/50] [EXO] Exodus - collation - commons (closes #12966) --- Mage.Sets/src/mage/sets/Exodus.java | 48 +++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/Exodus.java b/Mage.Sets/src/mage/sets/Exodus.java index 072d1e0c9bb..de821457fe9 100644 --- a/Mage.Sets/src/mage/sets/Exodus.java +++ b/Mage.Sets/src/mage/sets/Exodus.java @@ -1,9 +1,15 @@ - package mage.sets; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; +import mage.collation.BoosterCollator; +import mage.collation.BoosterStructure; +import mage.collation.CardRun; +import mage.collation.RarityConfiguration; + +import java.util.ArrayList; +import java.util.List; /** * @@ -75,7 +81,7 @@ public final class Exodus extends ExpansionSet { cards.add(new SetCardInfo("Keeper of the Beasts", 112, Rarity.UNCOMMON, mage.cards.k.KeeperOfTheBeasts.class)); cards.add(new SetCardInfo("Keeper of the Dead", 65, Rarity.UNCOMMON, mage.cards.k.KeeperOfTheDead.class)); cards.add(new SetCardInfo("Keeper of the Flame", 85, Rarity.UNCOMMON, mage.cards.k.KeeperOfTheFlame.class)); - cards.add(new SetCardInfo("Keeper of the Light", 8, Rarity.UNCOMMON, mage.cards.k.KeeperOfTheLight.class)); + cards.add(new SetCardInfo("Keeper of the Light", 8, Rarity.UNCOMMON, mage.cards.k.KeeperOfTheLight.class)); cards.add(new SetCardInfo("Keeper of the Mind", 36, Rarity.UNCOMMON, mage.cards.k.KeeperOfTheMind.class)); cards.add(new SetCardInfo("Killer Whale", 37, Rarity.UNCOMMON, mage.cards.k.KillerWhale.class)); cards.add(new SetCardInfo("Kor Chant", 9, Rarity.COMMON, mage.cards.k.KorChant.class)); @@ -172,4 +178,42 @@ public final class Exodus extends ExpansionSet { cards.add(new SetCardInfo("Workhorse", 142, Rarity.RARE, mage.cards.w.Workhorse.class)); cards.add(new SetCardInfo("Zealots en-Dal", 26, Rarity.UNCOMMON, mage.cards.z.ZealotsEnDal.class)); } + + @Override + public BoosterCollator createCollator() { + return new ExodusCollator(); + } +} + +// Booster collation info from https://www.lethe.xyz/mtg/collation/exo.html +// Using US collation - commons only +class ExodusCollator implements BoosterCollator { + private final CardRun commonA = new CardRun(true, "67", "130", "52", "86", "9", "58", "105", "34", "98", "19", "77", "122", "39", "87", "20", "76", "119", "34", "79", "18", "54", "118", "48", "92", "22", "58", "116", "52", "103", "19", "67", "122", "51", "79", "9", "63", "119", "28", "98", "21", "77", "130", "39", "92", "20", "54", "116", "28", "86", "18", "76", "105", "48", "87", "22", "63", "118", "51", "103", "21"); + private final CardRun commonB = new CardRun(true, "56", "106", "44", "102", "4", "53", "120", "43", "81", "25", "60", "106", "45", "96", "2", "56", "117", "27", "84", "4", "60", "111", "43", "80", "1", "55", "110", "49", "96", "25", "73", "120", "44", "81", "16", "55", "111", "45", "102", "2", "73", "110", "27", "80", "16", "53", "117", "49", "84", "1"); + private final CardRun uncommon = new CardRun(false, "107", "108", "29", "57", "59", "109", "83", "35", "62", "7", "112", "65", "85", "8", "36", "37", "38", "133", "66", "41", "88", "68", "94", "13", "14", "15", "95", "17", "121", "99", "100", "46", "137", "123", "74", "125", "138", "104", "75", "127", "141", "23", "50", "26"); + private final CardRun rare = new CardRun(false, "3", "143", "131", "5", "30", "61", "31", "32", "132", "33", "6", "82", "64", "10", "113", "134", "135", "40", "114", "89", "136", "115", "69", "11", "90", "42", "91", "12", "93", "70", "71", "97", "72", "101", "124", "139", "126", "128", "129", "47", "140", "78", "24", "142"); + + private final BoosterStructure A6 = new BoosterStructure( + commonA, commonA, commonA, commonA, commonA, commonA + ); + private final BoosterStructure B5 = new BoosterStructure( + commonB, commonB, commonB, commonB, commonB + ); + private final BoosterStructure U3 = new BoosterStructure(uncommon, uncommon, uncommon); + private final BoosterStructure R1 = new BoosterStructure(rare); + + private final RarityConfiguration commonRunsA = new RarityConfiguration(A6); + private final RarityConfiguration commonRunsB = new RarityConfiguration(B5); + private final RarityConfiguration uncommonRuns = new RarityConfiguration(U3); + private final RarityConfiguration rareRuns = new RarityConfiguration(R1); + + @Override + public List makeBooster() { + List booster = new ArrayList<>(); + booster.addAll(commonRunsA.getNext().makeRun()); + booster.addAll(uncommonRuns.getNext().makeRun()); + booster.addAll(rareRuns.getNext().makeRun()); + booster.addAll(commonRunsB.getNext().makeRun()); + return booster; + } } -- 2.47.2 From 0bed78a52932419e1b7b39a3aea2f55c0b8adaf8 Mon Sep 17 00:00:00 2001 From: tiera3 <87589219+tiera3@users.noreply.github.com> Date: Wed, 2 Oct 2024 22:06:13 +1000 Subject: [PATCH 06/50] [ULG] Urza's Legacy - common collation (closes #12964) --- Mage.Sets/src/mage/sets/UrzasLegacy.java | 43 +++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/UrzasLegacy.java b/Mage.Sets/src/mage/sets/UrzasLegacy.java index 922af28dc07..953f8cf867b 100644 --- a/Mage.Sets/src/mage/sets/UrzasLegacy.java +++ b/Mage.Sets/src/mage/sets/UrzasLegacy.java @@ -1,9 +1,15 @@ - package mage.sets; import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; +import mage.collation.BoosterCollator; +import mage.collation.BoosterStructure; +import mage.collation.CardRun; +import mage.collation.RarityConfiguration; + +import java.util.ArrayList; +import java.util.List; /** * @@ -172,4 +178,39 @@ public final class UrzasLegacy extends ExpansionSet { cards.add(new SetCardInfo("Yavimaya Scion", 119, Rarity.COMMON, mage.cards.y.YavimayaScion.class)); cards.add(new SetCardInfo("Yavimaya Wurm", 120, Rarity.COMMON, mage.cards.y.YavimayaWurm.class)); } + + @Override + public BoosterCollator createCollator() { + return new UrzasLegacyCollator(); + } +} + +// Booster collation info from https://www.lethe.xyz/mtg/collation/ulg.html +// Using common collation +class UrzasLegacyCollator implements BoosterCollator { + + private final CardRun commonA = new CardRun(true, "72", "120", "48", "75", "16", "66", "118", "44", "96", "22", "54", "113", "29", "75", "7", "66", "119", "46", "96", "5", "59", "110", "48", "86", "8", "54", "120", "42", "79", "4", "64", "113", "46", "93", "7", "58", "110", "44", "86", "5", "64", "119", "36", "79", "16", "72", "114", "42", "77", "8", "59", "118", "36", "93", "22", "58", "114", "29", "77", "4"); + private final CardRun commonB = new CardRun(true, "69", "98", "28", "87", "10", "57", "111", "33", "73", "1", "67", "115", "28", "84", "3", "53", "112", "27", "81", "10", "61", "108", "43", "73", "6", "53", "98", "32", "87", "3", "69", "115", "43", "81", "24", "57", "112", "33", "92", "6", "67", "108", "27", "84", "1", "61", "111", "32", "92", "24"); + private final CardRun uncommon = new CardRun(false, "121", "74", "97", "49", "99", "51", "139", "140", "102", "141", "76", "78", "103", "9", "128", "34", "12", "83", "35", "105", "13", "14", "109", "37", "17", "60", "63", "89", "21", "65", "39", "40", "142", "23", "70", "134", "136", "45", "71", "143", "94", "95", "47", "117"); + private final CardRun rare = new CardRun(false, "25", "26", "122", "2", "50", "123", "124", "125", "100", "30", "101", "52", "31", "80", "126", "104", "82", "127", "11", "55", "129", "106", "85", "107", "56", "15", "38", "62", "18", "19", "88", "130", "20", "131", "90", "132", "41", "91", "68", "133", "135", "137", "116", "138"); + + private final BoosterStructure AAAAAABBBBB = new BoosterStructure( + commonA, commonA, commonA, commonA, commonA, commonA, + commonB, commonB, commonB, commonB, commonB + ); + private final BoosterStructure U3 = new BoosterStructure(uncommon, uncommon, uncommon); + private final BoosterStructure R1 = new BoosterStructure(rare); + + private final RarityConfiguration commonRuns = new RarityConfiguration(AAAAAABBBBB); + private final RarityConfiguration uncommonRuns = new RarityConfiguration(U3); + private final RarityConfiguration rareRuns = new RarityConfiguration(R1); + + @Override + public List makeBooster() { + List booster = new ArrayList<>(); + booster.addAll(commonRuns.getNext().makeRun()); + booster.addAll(uncommonRuns.getNext().makeRun()); + booster.addAll(rareRuns.getNext().makeRun()); + return booster; + } } -- 2.47.2 From c5d527785e8ec3e70d4984696a0e892fe7d1515b Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 19:36:23 -0500 Subject: [PATCH 07/50] fix verify --- Mage.Sets/src/mage/sets/DuskmournHouseOfHorrorCommander.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/DuskmournHouseOfHorrorCommander.java b/Mage.Sets/src/mage/sets/DuskmournHouseOfHorrorCommander.java index a9a0c7f2350..1ab3f889832 100644 --- a/Mage.Sets/src/mage/sets/DuskmournHouseOfHorrorCommander.java +++ b/Mage.Sets/src/mage/sets/DuskmournHouseOfHorrorCommander.java @@ -123,7 +123,7 @@ public final class DuskmournHouseOfHorrorCommander extends ExpansionSet { cards.add(new SetCardInfo("Gray Merchant of Asphodel", 142, Rarity.UNCOMMON, mage.cards.g.GrayMerchantOfAsphodel.class)); cards.add(new SetCardInfo("Greater Tanuki", 181, Rarity.COMMON, mage.cards.g.GreaterTanuki.class)); cards.add(new SetCardInfo("Grim Backwoods", 281, Rarity.RARE, mage.cards.g.GrimBackwoods.class)); - cards.add(new SetCardInfo("Grim Flayer", 218, Rarity.RARE, mage.cards.g.GrimFlayer.class)); + cards.add(new SetCardInfo("Grim Flayer", 218, Rarity.MYTHIC, mage.cards.g.GrimFlayer.class)); cards.add(new SetCardInfo("Grisly Salvage", 219, Rarity.COMMON, mage.cards.g.GrislySalvage.class)); cards.add(new SetCardInfo("Grist, the Hunger Tide", 220, Rarity.MYTHIC, mage.cards.g.GristTheHungerTide.class)); cards.add(new SetCardInfo("Growth Spiral", 88, Rarity.COMMON, mage.cards.g.GrowthSpiral.class)); -- 2.47.2 From 178b7e03435e06425fdddd84a42c4b91ab881207 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:00:11 -0500 Subject: [PATCH 08/50] text fixes --- Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java | 2 +- Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java | 4 ++-- Mage.Sets/src/mage/cards/f/FumulusTheInfestation.java | 2 +- Mage.Sets/src/mage/cards/k/KomaWorldEater.java | 2 +- Mage.Sets/src/mage/cards/p/PlagonLordOfTheBeach.java | 3 ++- Mage.Sets/src/mage/cards/s/SireOfSevenDeaths.java | 2 +- .../effects/common/EntersWithCountersControlledEffect.java | 1 + 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java b/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java index 8b7f38f9330..92dcafb438e 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java @@ -44,7 +44,7 @@ public final class ArlinnThePacksHope extends CardImpl { ).setText("until your next turn, you may cast creature spells as though they had flash"), 1); ability.addEffect(new EntersWithCountersControlledEffect( StaticFilters.FILTER_PERMANENT_CREATURE, CounterType.P1P1.createInstance(), false - )); + ).concatBy(", and")); this.addAbility(ability); // −3: Create two 2/2 green Wolf creature tokens. diff --git a/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java b/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java index b88a9ea5cb5..742222efb38 100644 --- a/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java +++ b/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java @@ -73,11 +73,11 @@ enum DelightfulDiscoveryValue implements DynamicValue { @Override public String getMessage() { - return "1"; + return "spell your opponents have cast this turn"; } @Override public String toString() { - return "spell your opponents have cast this turn"; + return "1"; } } diff --git a/Mage.Sets/src/mage/cards/f/FumulusTheInfestation.java b/Mage.Sets/src/mage/cards/f/FumulusTheInfestation.java index f3a37cb826c..a6360bb7d1c 100644 --- a/Mage.Sets/src/mage/cards/f/FumulusTheInfestation.java +++ b/Mage.Sets/src/mage/cards/f/FumulusTheInfestation.java @@ -60,7 +60,7 @@ public final class FumulusTheInfestation extends CardImpl { // Whenever an Insect, Leech, Slug, or Worm you control attacks, defending player loses 1 life and you gain 1 life. Ability ability = new AttacksAllTriggeredAbility( - new LoseLifeTargetEffect(1), false, + new LoseLifeTargetEffect(1).setText("defending player loses 1 life"), false, filter, SetTargetPointer.PLAYER, false ); ability.addEffect(new GainLifeEffect(1).concatBy("and")); diff --git a/Mage.Sets/src/mage/cards/k/KomaWorldEater.java b/Mage.Sets/src/mage/cards/k/KomaWorldEater.java index b01b0692c49..094f3f81f82 100644 --- a/Mage.Sets/src/mage/cards/k/KomaWorldEater.java +++ b/Mage.Sets/src/mage/cards/k/KomaWorldEater.java @@ -36,7 +36,7 @@ public final class KomaWorldEater extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Ward {4} - this.addAbility(new WardAbility(new ManaCostsImpl<>("{4}"))); + this.addAbility(new WardAbility(new ManaCostsImpl<>("{4}"), false)); // Whenever Koma deals combat damage to a player, create four 3/3 blue Serpent creature tokens named Koma's Coil. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new CreateTokenEffect(new KomasCoilToken(), 4))); diff --git a/Mage.Sets/src/mage/cards/p/PlagonLordOfTheBeach.java b/Mage.Sets/src/mage/cards/p/PlagonLordOfTheBeach.java index 552cbfd4a64..a9ec5b80f16 100644 --- a/Mage.Sets/src/mage/cards/p/PlagonLordOfTheBeach.java +++ b/Mage.Sets/src/mage/cards/p/PlagonLordOfTheBeach.java @@ -51,7 +51,8 @@ public final class PlagonLordOfTheBeach extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(xValue)).addHint(hint)); // {W/U}: Target creature you control assigns combat damage equal to its toughness rather than its power this turn. - Ability ability = new SimpleActivatedAbility(new CombatDamageByToughnessTargetEffect(), new ManaCostsImpl<>("{W/U}")); + Ability ability = new SimpleActivatedAbility(new CombatDamageByToughnessTargetEffect() + .setText("target creature you control assigns combat damage equal to its toughness rather than its power this turn"), new ManaCostsImpl<>("{W/U}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SireOfSevenDeaths.java b/Mage.Sets/src/mage/cards/s/SireOfSevenDeaths.java index 961cc1b913c..4625a3aee33 100644 --- a/Mage.Sets/src/mage/cards/s/SireOfSevenDeaths.java +++ b/Mage.Sets/src/mage/cards/s/SireOfSevenDeaths.java @@ -29,7 +29,7 @@ public final class SireOfSevenDeaths extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Menace - this.addAbility(new MenaceAbility()); + this.addAbility(new MenaceAbility(false)); // Trample this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/EntersWithCountersControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EntersWithCountersControlledEffect.java index 28cf8362ed6..0c2be985f77 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EntersWithCountersControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EntersWithCountersControlledEffect.java @@ -79,6 +79,7 @@ public class EntersWithCountersControlledEffect extends ReplacementEffectImpl { sb.append(CardUtil.numberToText(counter.getCount(), "an")); sb.append(" additional "); sb.append(counter.getName()); + sb.append(" counter"); if (counter.getCount() > 1) { sb.append('s'); } -- 2.47.2 From 670acdb4a6e2ff2c54c6dfa9145c83033075c81d Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:09:41 -0500 Subject: [PATCH 09/50] refactor: SimpleStaticAbility default zone (cards A) --- Mage.Sets/src/mage/cards/a/ATST.java | 2 +- Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java | 2 +- Mage.Sets/src/mage/cards/a/Abduction.java | 2 +- Mage.Sets/src/mage/cards/a/Abundance.java | 2 +- Mage.Sets/src/mage/cards/a/AbundantGrowth.java | 2 +- Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanFalconer.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanRunemark.java | 2 +- Mage.Sets/src/mage/cards/a/AcesBaseballBat.java | 2 +- Mage.Sets/src/mage/cards/a/AdantoVanguard.java | 2 +- Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java | 5 ++--- Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java | 2 +- Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java | 2 +- Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java | 2 +- Mage.Sets/src/mage/cards/a/AegisOfTheGods.java | 2 +- Mage.Sets/src/mage/cards/a/AerialModification.java | 4 ++-- Mage.Sets/src/mage/cards/a/AeronautTinkerer.java | 2 +- Mage.Sets/src/mage/cards/a/AetherMeltdown.java | 2 +- Mage.Sets/src/mage/cards/a/AetherStorm.java | 2 +- Mage.Sets/src/mage/cards/a/AggressiveMining.java | 2 +- Mage.Sets/src/mage/cards/a/Agoraphobia.java | 2 +- Mage.Sets/src/mage/cards/a/AinokBondKin.java | 3 +-- Mage.Sets/src/mage/cards/a/AirBladder.java | 4 ++-- Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java | 2 +- Mage.Sets/src/mage/cards/a/AkkiLavarunner.java | 2 +- Mage.Sets/src/mage/cards/a/AkkiUnderling.java | 2 +- Mage.Sets/src/mage/cards/a/AkromasDevoted.java | 2 +- Mage.Sets/src/mage/cards/a/AkromasMemorial.java | 2 +- Mage.Sets/src/mage/cards/a/AkronLegionnaire.java | 2 +- Mage.Sets/src/mage/cards/a/AlexisCloak.java | 2 +- Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java | 2 +- Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java | 4 ++-- Mage.Sets/src/mage/cards/a/AliFromCairo.java | 2 +- Mage.Sets/src/mage/cards/a/AlloyGolem.java | 2 +- Mage.Sets/src/mage/cards/a/AlmsCollector.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaAuthority.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaStatus.java | 2 +- Mage.Sets/src/mage/cards/a/AlpineMoon.java | 2 +- Mage.Sets/src/mage/cards/a/AltarGolem.java | 2 +- Mage.Sets/src/mage/cards/a/AlwaysWatching.java | 2 +- Mage.Sets/src/mage/cards/a/AmbushCommander.java | 2 +- Mage.Sets/src/mage/cards/a/AnHavvaConstable.java | 2 +- Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java | 2 +- Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java | 2 +- Mage.Sets/src/mage/cards/a/AnakinSkywalker.java | 2 +- Mage.Sets/src/mage/cards/a/AncestralVengeance.java | 2 +- Mage.Sets/src/mage/cards/a/AngelOfInvention.java | 2 +- Mage.Sets/src/mage/cards/a/AngelOfJubilation.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicArbiter.java | 4 ++-- Mage.Sets/src/mage/cards/a/AngelicDestiny.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicGift.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicOverseer.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicShield.java | 2 +- Mage.Sets/src/mage/cards/a/AngelsTrumpet.java | 2 +- Mage.Sets/src/mage/cards/a/AngrathsMarauders.java | 2 +- Mage.Sets/src/mage/cards/a/AngryMob.java | 2 +- Mage.Sets/src/mage/cards/a/AnimalBoneyard.java | 2 +- Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java | 2 +- Mage.Sets/src/mage/cards/a/AnimateArtifact.java | 2 +- Mage.Sets/src/mage/cards/a/AnimateWall.java | 4 ++-- Mage.Sets/src/mage/cards/a/Annex.java | 2 +- Mage.Sets/src/mage/cards/a/AnointedProcession.java | 2 +- Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java | 2 +- Mage.Sets/src/mage/cards/a/AntiMagicAura.java | 2 +- Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java | 2 +- Mage.Sets/src/mage/cards/a/AqueousForm.java | 2 +- Mage.Sets/src/mage/cards/a/ArachnusWeb.java | 2 +- Mage.Sets/src/mage/cards/a/ArcadesSabboth.java | 2 +- Mage.Sets/src/mage/cards/a/ArcaneFlight.java | 2 +- Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java | 2 +- Mage.Sets/src/mage/cards/a/ArcanumWings.java | 2 +- Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java | 2 +- Mage.Sets/src/mage/cards/a/ArcticAven.java | 2 +- Mage.Sets/src/mage/cards/a/ArdentRecruit.java | 2 +- Mage.Sets/src/mage/cards/a/ArgentumArmor.java | 2 +- Mage.Sets/src/mage/cards/a/ArmadilloCloak.java | 2 +- Mage.Sets/src/mage/cards/a/ArmamentMaster.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorOfFaith.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorOfThorns.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorSliver.java | 2 +- Mage.Sets/src/mage/cards/a/ArmoredGalleon.java | 2 +- Mage.Sets/src/mage/cards/a/ArmoryGuard.java | 2 +- Mage.Sets/src/mage/cards/a/Arrest.java | 2 +- Mage.Sets/src/mage/cards/a/ArvadTheCursed.java | 2 +- Mage.Sets/src/mage/cards/a/AscendantEvincar.java | 4 ++-- Mage.Sets/src/mage/cards/a/AshenmoorCohort.java | 2 +- Mage.Sets/src/mage/cards/a/AshenmoorLiege.java | 4 ++-- Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java | 2 +- Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java | 2 +- Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java | 4 ++-- Mage.Sets/src/mage/cards/a/AshmouthBlade.java | 2 +- Mage.Sets/src/mage/cards/a/AspectOfGorgon.java | 2 +- Mage.Sets/src/mage/cards/a/AspectOfMongoose.java | 2 +- Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java | 2 +- Mage.Sets/src/mage/cards/a/AuraGnarlid.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuraOfSilence.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuramancersGuise.java | 2 +- Mage.Sets/src/mage/cards/a/Aurification.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvariceAmulet.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfHope.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java | 2 +- Mage.Sets/src/mage/cards/a/AvenBrigadier.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvenMindcensor.java | 2 +- Mage.Sets/src/mage/cards/a/AvenWindGuide.java | 2 +- Mage.Sets/src/mage/cards/a/AwakenTheAncient.java | 2 +- Mage.Sets/src/mage/cards/a/AysenHighway.java | 2 +- Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java | 2 +- 112 files changed, 130 insertions(+), 132 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/ATST.java b/Mage.Sets/src/mage/cards/a/ATST.java index 5eccb6aed7b..4f92f1e841d 100644 --- a/Mage.Sets/src/mage/cards/a/ATST.java +++ b/Mage.Sets/src/mage/cards/a/ATST.java @@ -33,7 +33,7 @@ public final class ATST extends CardImpl { this.toughness = new MageInt(3); // Trooper creatures you control get +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java b/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java index 362aaf135f2..a1508c004f1 100644 --- a/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java +++ b/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java @@ -40,7 +40,7 @@ public final class AbandonedSarcophagus extends CardImpl { this.addAbility(new SimpleStaticAbility(new PlayFromGraveyardControllerEffect(filter))); // If a card with cycling would be put into your graveyard from anywhere and it wasn't cycled, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbandonedSarcophagusReplacementEffect()), new AbandonedSarcophagusWatcher()); + this.addAbility(new SimpleStaticAbility(new AbandonedSarcophagusReplacementEffect()), new AbandonedSarcophagusWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/Abduction.java b/Mage.Sets/src/mage/cards/a/Abduction.java index 2b4bc880bbf..b83b1f10a90 100644 --- a/Mage.Sets/src/mage/cards/a/Abduction.java +++ b/Mage.Sets/src/mage/cards/a/Abduction.java @@ -40,7 +40,7 @@ public final class Abduction extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapAttachedEffect())); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // When enchanted creature dies, return that card to the battlefield under its owner's control. this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToBattlefieldUnderOwnerControlAttachedEffect(), "enchanted creature", false)); diff --git a/Mage.Sets/src/mage/cards/a/Abundance.java b/Mage.Sets/src/mage/cards/a/Abundance.java index 1b6545fb90c..1ce1fe50f0f 100644 --- a/Mage.Sets/src/mage/cards/a/Abundance.java +++ b/Mage.Sets/src/mage/cards/a/Abundance.java @@ -27,7 +27,7 @@ public final class Abundance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); // If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbundanceReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AbundanceReplacementEffect())); } private Abundance(final Abundance card) { diff --git a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java index fb5b81258e8..93f3b8c8382 100644 --- a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java +++ b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java @@ -41,7 +41,7 @@ public final class AbundantGrowth extends CardImpl { Ability gainedAbility = new AnyColorManaAbility(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add one mana of any color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AbundantGrowth(final AbundantGrowth card) { diff --git a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java index 1185b3e3192..d21335aa819 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java @@ -33,7 +33,7 @@ public final class AbyssalPersecutor extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // You can't win the game and your opponents can't lose the game. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbyssalPersecutorCannotWinEffect())); + this.addAbility(new SimpleStaticAbility(new AbyssalPersecutorCannotWinEffect())); } private AbyssalPersecutor(final AbyssalPersecutor card) { diff --git a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java index 10b01542ecc..98d9d5400b5 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java +++ b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java @@ -31,7 +31,7 @@ public final class AbzanFalconer extends CardImpl { this.addAbility(new OutlastAbility(new ColoredManaCost(ColoredManaSymbol.W))); // Each creature you control with a +1/+1 counter on it has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1) diff --git a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java index 08c17792440..8f487ce98cf 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java +++ b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java @@ -44,7 +44,7 @@ public final class AbzanRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has vigilance as long as you control a black or green permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java b/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java index 708ec10be13..75383b17811 100644 --- a/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java +++ b/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java @@ -43,7 +43,7 @@ public final class AcesBaseballBat extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+0 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); // As long as equipped creature is attacking, it has first strike and must be blocked by a Dalek if able. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/a/AdantoVanguard.java b/Mage.Sets/src/mage/cards/a/AdantoVanguard.java index e6c56c647ef..1019fccb186 100644 --- a/Mage.Sets/src/mage/cards/a/AdantoVanguard.java +++ b/Mage.Sets/src/mage/cards/a/AdantoVanguard.java @@ -33,7 +33,7 @@ public final class AdantoVanguard extends CardImpl { this.toughness = new MageInt(1); // As long as Adanto Vanguard is attacking, it gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), SourceAttackingCondition.instance, "As long as {this} is attacking, it gets +2/+0" diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java index febdaf1d340..cf8b977acdc 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java @@ -38,9 +38,9 @@ public final class AdaptiveAutomaton extends CardImpl { ability.addEffect(new EnterAttributeAddChosenSubtypeEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // Other creatures you control of the chosen type get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private AdaptiveAutomaton(final AdaptiveAutomaton card) { @@ -52,4 +52,3 @@ public final class AdaptiveAutomaton extends CardImpl { return new AdaptiveAutomaton(this); } } - diff --git a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java index 33ab01435ff..fdee119783e 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java @@ -46,7 +46,7 @@ public final class AdmiralBeckettBrass extends CardImpl { this.toughness = new MageInt(3); // Other Pirates you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // At the beginning of your end step, gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn. Ability ability = new BeginningOfEndStepTriggeredAbility(new GainControlTargetEffect(Duration.Custom, true)); diff --git a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java index 5440fd66811..50e3cfa50dd 100644 --- a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java +++ b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java @@ -29,7 +29,7 @@ public final class AdrianaCaptainOfTheGuard extends CardImpl { this.addAbility(new MeleeAbility()); // Other creatures you control have melee. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new MeleeAbility(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new MeleeAbility(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); } diff --git a/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java b/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java index bda63d25143..a95838dba1b 100644 --- a/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java +++ b/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java @@ -32,7 +32,7 @@ public final class AdventurersGuildhouse extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Green legendary creatures you control have "bands with other legendary creatures." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter).withForceQuotes())); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter).withForceQuotes())); } private AdventurersGuildhouse(final AdventurersGuildhouse card) { diff --git a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java index cb2066c38db..b26766f94a6 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java @@ -28,7 +28,7 @@ public final class AegisOfTheGods extends CardImpl { this.toughness = new MageInt(1); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); } private AegisOfTheGods(final AegisOfTheGods card) { diff --git a/Mage.Sets/src/mage/cards/a/AerialModification.java b/Mage.Sets/src/mage/cards/a/AerialModification.java index a9648df897a..2aced485449 100644 --- a/Mage.Sets/src/mage/cards/a/AerialModification.java +++ b/Mage.Sets/src/mage/cards/a/AerialModification.java @@ -44,12 +44,12 @@ public final class AerialModification extends CardImpl { this.addAbility(ability); // As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureIfVehicleEffect())); + this.addAbility(new SimpleStaticAbility(new BecomesCreatureIfVehicleEffect())); // Enchanted creature gets +2/+2 and has flying. Effect effect = new BoostEnchantedEffect(2, 2); effect.setText("Enchanted creature gets +2/+2"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(" and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java index 769b373b33b..2e0a85a633f 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java +++ b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java @@ -34,7 +34,7 @@ public final class AeronautTinkerer extends CardImpl { this.toughness = new MageInt(3); // Aeronaut Tinkerer has flying as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); } diff --git a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java index 5dd8864cad7..5a86fd7e514 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java +++ b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java @@ -47,7 +47,7 @@ public final class AetherMeltdown extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); // Enchanted permanent gets -4/-0. Effect effect = new BoostEnchantedEffect(-4, 0, Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AetherMeltdown(final AetherMeltdown card) { diff --git a/Mage.Sets/src/mage/cards/a/AetherStorm.java b/Mage.Sets/src/mage/cards/a/AetherStorm.java index 59adaa1b776..943d827cbac 100644 --- a/Mage.Sets/src/mage/cards/a/AetherStorm.java +++ b/Mage.Sets/src/mage/cards/a/AetherStorm.java @@ -27,7 +27,7 @@ public final class AetherStorm extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Creature spells can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AetherStormReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AetherStormReplacementEffect())); // Pay 4 life: Destroy Aether Storm. It can't be regenerated. Any player may activate this ability. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroySourceEffect(true), new PayLifeCost(4)); diff --git a/Mage.Sets/src/mage/cards/a/AggressiveMining.java b/Mage.Sets/src/mage/cards/a/AggressiveMining.java index 9d3cf0c2d40..4841c68211e 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveMining.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveMining.java @@ -33,7 +33,7 @@ public final class AggressiveMining extends CardImpl { // You can't play lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AggressiveMiningEffect())); + this.addAbility(new SimpleStaticAbility(new AggressiveMiningEffect())); // Sacrifice a land: Draw two cards. Activate this ability only once each turn. Cost cost = new SacrificeTargetCost(StaticFilters.FILTER_LAND); diff --git a/Mage.Sets/src/mage/cards/a/Agoraphobia.java b/Mage.Sets/src/mage/cards/a/Agoraphobia.java index 9af799cb4a0..4753b6ab23f 100644 --- a/Mage.Sets/src/mage/cards/a/Agoraphobia.java +++ b/Mage.Sets/src/mage/cards/a/Agoraphobia.java @@ -38,7 +38,7 @@ public final class Agoraphobia extends CardImpl { this.addAbility(ability); // Enchanted creature gets -5/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-5, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-5, 0))); // {2}{U}: Return Agoraphobia to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); diff --git a/Mage.Sets/src/mage/cards/a/AinokBondKin.java b/Mage.Sets/src/mage/cards/a/AinokBondKin.java index 76e4482c4dd..a3649c72a6d 100644 --- a/Mage.Sets/src/mage/cards/a/AinokBondKin.java +++ b/Mage.Sets/src/mage/cards/a/AinokBondKin.java @@ -31,7 +31,7 @@ public final class AinokBondKin extends CardImpl { this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{1}{W}"))); // Each creature you control with a +1/+1 counter on it has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1))); @@ -46,4 +46,3 @@ public final class AinokBondKin extends CardImpl { return new AinokBondKin(this); } } - diff --git a/Mage.Sets/src/mage/cards/a/AirBladder.java b/Mage.Sets/src/mage/cards/a/AirBladder.java index 77131379fd7..98a8b7e60f7 100644 --- a/Mage.Sets/src/mage/cards/a/AirBladder.java +++ b/Mage.Sets/src/mage/cards/a/AirBladder.java @@ -35,10 +35,10 @@ public final class AirBladder extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Enchanted creature can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockOnlyFlyingAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CanBlockOnlyFlyingAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java index 91ff1aeedfe..ed74652664e 100644 --- a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java +++ b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java @@ -40,7 +40,7 @@ public final class AkiriLineSlinger extends CardImpl { // Akiri, Line-Slinger gets +1/+0 for each artifact you control. Effect effect = new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield); effect.setText("{this} gets +1/+0 for each artifact you control"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect) + this.addAbility(new SimpleStaticAbility(effect) .addHint(ArtifactYouControlHint.instance)); // Partner diff --git a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java index f12786d3615..e999385adca 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java @@ -94,7 +94,7 @@ class TokTokVolcanoBorn extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(ProtectionAbility.from(ObjectColor.RED)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TokTokVolcanoBornEffect())); + this.addAbility(new SimpleStaticAbility(new TokTokVolcanoBornEffect())); } private TokTokVolcanoBorn(final TokTokVolcanoBorn token) { super(token); diff --git a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java index 33e193d7504..e626ccd726e 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java +++ b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java @@ -31,7 +31,7 @@ public final class AkkiUnderling extends CardImpl { // As long as you have seven or more cards in hand, Akki Underling gets +2/+1 and has first strike. Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,6); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1")); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), condition, "and has first strike")); diff --git a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java index 32c23bb8ef8..2c028119436 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java +++ b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java @@ -28,7 +28,7 @@ public final class AkromasDevoted extends CardImpl { this.toughness = new MageInt(4); // Cleric creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.CLERIC, "Cleric creatures")))); } diff --git a/Mage.Sets/src/mage/cards/a/AkromasMemorial.java b/Mage.Sets/src/mage/cards/a/AkromasMemorial.java index 2470c8c5ea7..7070b36a856 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasMemorial.java +++ b/Mage.Sets/src/mage/cards/a/AkromasMemorial.java @@ -27,7 +27,7 @@ public final class AkromasMemorial extends CardImpl { // Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red. CompoundAbility compoundAbilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); } private AkromasMemorial(final AkromasMemorial card) { diff --git a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java index 654c17694a4..1ff3c9677ec 100644 --- a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java +++ b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java @@ -37,7 +37,7 @@ public final class AkronLegionnaire extends CardImpl { // Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack. Effect effect = new CantAttackAllEffect(Duration.WhileOnBattlefield, filter); effect.setText("Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/a/AlexisCloak.java b/Mage.Sets/src/mage/cards/a/AlexisCloak.java index 358fe9d2e3d..7949315d695 100644 --- a/Mage.Sets/src/mage/cards/a/AlexisCloak.java +++ b/Mage.Sets/src/mage/cards/a/AlexisCloak.java @@ -34,7 +34,7 @@ public final class AlexisCloak extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private AlexisCloak(final AlexisCloak card) { diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java index 978fef081f4..5e37d2046c6 100644 --- a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java @@ -40,7 +40,7 @@ public final class AlhammarretHighArbiter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As Alhammarret, High Arbiter enters the battlefield, each opponent reveals their hand. You choose the name of a nonland card revealed this way. // Your opponents can't cast spells with the chosen name. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new AlhammarretHighArbiterEffect(), ""))); + this.addAbility(new SimpleStaticAbility(new EntersBattlefieldEffect(new AlhammarretHighArbiterEffect(), ""))); } private AlhammarretHighArbiter(final AlhammarretHighArbiter card) { diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java index f3ed61ac613..1ce92cda1b2 100644 --- a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java +++ b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java @@ -24,10 +24,10 @@ public final class AlhammarretsArchive extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // If you would gain life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveEffect())); + this.addAbility(new SimpleStaticAbility(new AlhammarretsArchiveEffect())); // If you draw a card except the first one you draw in each of your draw steps, draw two cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); + this.addAbility(new SimpleStaticAbility(new AlhammarretsArchiveReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); } private AlhammarretsArchive(final AlhammarretsArchive card) { diff --git a/Mage.Sets/src/mage/cards/a/AliFromCairo.java b/Mage.Sets/src/mage/cards/a/AliFromCairo.java index fd59a73b719..6722d506744 100644 --- a/Mage.Sets/src/mage/cards/a/AliFromCairo.java +++ b/Mage.Sets/src/mage/cards/a/AliFromCairo.java @@ -28,7 +28,7 @@ public final class AliFromCairo extends CardImpl { this.toughness = new MageInt(1); // Damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AliFromCairoReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AliFromCairoReplacementEffect())); } private AliFromCairo(final AliFromCairo card) { diff --git a/Mage.Sets/src/mage/cards/a/AlloyGolem.java b/Mage.Sets/src/mage/cards/a/AlloyGolem.java index 1afcccc96da..814bfae1e1b 100644 --- a/Mage.Sets/src/mage/cards/a/AlloyGolem.java +++ b/Mage.Sets/src/mage/cards/a/AlloyGolem.java @@ -33,7 +33,7 @@ public final class AlloyGolem extends CardImpl { Ability ability = new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral)); ability.addEffect(new EnterAttributeSetChosenColorEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetChosenColorEffect())); + this.addAbility(new SimpleStaticAbility(new SetChosenColorEffect())); } private AlloyGolem(final AlloyGolem card) { diff --git a/Mage.Sets/src/mage/cards/a/AlmsCollector.java b/Mage.Sets/src/mage/cards/a/AlmsCollector.java index f1a5e2c95e7..95dd9afa7db 100644 --- a/Mage.Sets/src/mage/cards/a/AlmsCollector.java +++ b/Mage.Sets/src/mage/cards/a/AlmsCollector.java @@ -35,7 +35,7 @@ public final class AlmsCollector extends CardImpl { this.addAbility(FlashAbility.getInstance()); // If an opponent would draw two or more cards, instead you and that player each draw a card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlmsCollectorReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AlmsCollectorReplacementEffect())); } private AlmsCollector(final AlmsCollector card) { diff --git a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java index 4d38e6629b4..7797f39291c 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java +++ b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java @@ -34,7 +34,7 @@ public final class AlphaAuthority extends CardImpl { this.addAbility(ability); // Enchanted creature has hexproof and can't be blocked by more than one creature. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); Effect effect = new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.AURA); effect.setText("and can't be blocked by more than one creature"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AlphaStatus.java b/Mage.Sets/src/mage/cards/a/AlphaStatus.java index 36f8a0db5af..958d3ffcd18 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaStatus.java +++ b/Mage.Sets/src/mage/cards/a/AlphaStatus.java @@ -37,7 +37,7 @@ public final class AlphaStatus extends CardImpl { // Enchanted creature gets +2/+2 for each other creature on the battlefield that shares a creature type with it. DynamicValue dynamicValue = new AlphaStatusDynamicValue(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(dynamicValue, dynamicValue, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(dynamicValue, dynamicValue, Duration.WhileOnBattlefield))); } private AlphaStatus(final AlphaStatus card) { diff --git a/Mage.Sets/src/mage/cards/a/AlpineMoon.java b/Mage.Sets/src/mage/cards/a/AlpineMoon.java index d1fe7619ea6..da13a2bff44 100644 --- a/Mage.Sets/src/mage/cards/a/AlpineMoon.java +++ b/Mage.Sets/src/mage/cards/a/AlpineMoon.java @@ -30,7 +30,7 @@ public final class AlpineMoon extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NONBASIC_LAND_NAME))); // Lands your opponents control with the chosen name lose all land types and abilities, and they gain "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlpineMoonEffect())); + this.addAbility(new SimpleStaticAbility(new AlpineMoonEffect())); } private AlpineMoon(final AlpineMoon card) { diff --git a/Mage.Sets/src/mage/cards/a/AltarGolem.java b/Mage.Sets/src/mage/cards/a/AltarGolem.java index 3c9f8c399ef..28b8d99cf13 100644 --- a/Mage.Sets/src/mage/cards/a/AltarGolem.java +++ b/Mage.Sets/src/mage/cards/a/AltarGolem.java @@ -50,7 +50,7 @@ public final class AltarGolem extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(amount))); // Altar Golem doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Tap five untapped creatures you control: Untap Altar Golem. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter, true)))); diff --git a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java index 464b6f395c5..85806acd384 100644 --- a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java +++ b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java @@ -32,7 +32,7 @@ public final class AlwaysWatching extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); // Nontoken creatures you control get +1/+1 and have vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index c8326fa36ba..c3a94efbce0 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -43,7 +43,7 @@ public final class AmbushCommander extends CardImpl { new CreatureToken(1, 1, "1/1 green Elf creatures").withColor("G").withSubType(SubType.ELF), "lands", filter2, Duration.WhileOnBattlefield, true); effect.getDependencyTypes().add(DependencyType.BecomeForest); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java index 0d0e37d51c6..f077d739041 100644 --- a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java +++ b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java @@ -29,7 +29,7 @@ public final class AnHavvaConstable extends CardImpl { this.toughness = new MageInt(1); // An-Havva Constable's toughness is equal to 1 plus the number of green creatures on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnHavvaConstableEffect())); + this.addAbility(new SimpleStaticAbility(new AnHavvaConstableEffect())); } private AnHavvaConstable(final AnHavvaConstable card) { diff --git a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java index eb50d85134d..6f55e9ab5e1 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java +++ b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java @@ -33,7 +33,7 @@ public final class AnabaSpiritCrafter extends CardImpl { this.toughness = new MageInt(3); // Minotaur creatures get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, false))); } private AnabaSpiritCrafter(final AnabaSpiritCrafter card) { diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java index 0846e7444e7..0dc09db1b19 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java @@ -52,7 +52,7 @@ public final class AnafenzaTheForemost extends CardImpl { this.addAbility(ability); // If a nontoken creature an opponent owns would die or a creature card not on the battlefield would be put into an opponent's graveyard, exile that card instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnafenzaTheForemostEffect())); + this.addAbility(new SimpleStaticAbility(new AnafenzaTheForemostEffect())); } private AnafenzaTheForemost(final AnafenzaTheForemost card) { diff --git a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java index ff037d42aa1..45af92015a5 100644 --- a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java +++ b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java @@ -51,7 +51,7 @@ public final class AnakinSkywalker extends CardImpl { // If Anakin Skywalker would be destroyed, regenerate, then transform him instead. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnakinSkywalkerEffect())); + this.addAbility(new SimpleStaticAbility(new AnakinSkywalkerEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java index ae6f7f9414a..a01001024ec 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java +++ b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java @@ -40,7 +40,7 @@ public final class AncestralVengeance extends CardImpl { this.addAbility(ability); // Enchanted creature gets -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); } private AncestralVengeance(final AncestralVengeance card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java index 740a4fbfe49..4481871950e 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java @@ -37,7 +37,7 @@ public final class AngelOfInvention extends CardImpl { // Fabricate 2 this.addAbility(new FabricateAbility(2)); // Other creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); } private AngelOfInvention(final AngelOfInvention card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java index b2f51d8da59..535752c85f4 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java @@ -36,7 +36,7 @@ public final class AngelOfJubilation extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other nonblack creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES_NON_BLACK, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES_NON_BLACK, true))); // Players can't pay life or sacrifice creatures to cast spells or activate abilities. Ability ability = new SimpleStaticAbility(new AngelOfJubilationEffect()); diff --git a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java index b799e68b472..c774819091b 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java @@ -34,10 +34,10 @@ public final class AngelicArbiter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Each opponent who cast a spell this turn can't attack with creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelicArbiterCantAttackTargetEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new AngelicArbiterCantAttackTargetEffect(Duration.WhileOnBattlefield))); // Each opponent who attacked with a creature this turn can't cast spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelicArbiterEffect2()), new PlayerAttackedWatcher()); + this.addAbility(new SimpleStaticAbility(new AngelicArbiterEffect2()), new PlayerAttackedWatcher()); } private AngelicArbiter(final AngelicArbiter card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java index 5cf5e25c687..a3aeba3e175 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java +++ b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java @@ -38,7 +38,7 @@ public final class AngelicDestiny extends CardImpl { this.addAbility(ability); // Enchanted creature gets +4/+4, has flying and first strike, and is an Angel in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(", has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AngelicGift.java b/Mage.Sets/src/mage/cards/a/AngelicGift.java index 1eed31cce37..de37d0b2ad1 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicGift.java +++ b/Mage.Sets/src/mage/cards/a/AngelicGift.java @@ -37,7 +37,7 @@ public final class AngelicGift extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private AngelicGift(final AngelicGift card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java index 48d49d07e0a..507b689ab74 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java +++ b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java @@ -43,7 +43,7 @@ public final class AngelicOverseer extends CardImpl { // As long as you control a Human, Angelic Overseer has hexproof and is indestructible. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HexproofAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule1); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); ability.addEffect(effect2); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AngelicShield.java b/Mage.Sets/src/mage/cards/a/AngelicShield.java index eb6222638f8..10cfe3fe663 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicShield.java +++ b/Mage.Sets/src/mage/cards/a/AngelicShield.java @@ -26,7 +26,7 @@ public final class AngelicShield extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}{U}"); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); // Sacrifice Angelic Shield: Return target creature to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java index bdaa033fa4b..082613a8c32 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java @@ -27,7 +27,7 @@ public final class AngelsTrumpet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // All creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); // At the beginning of each player's end step, tap all untapped creatures that player controls that didn't attack this turn. Angel's Trumpet deals damage to the player equal to the number of creatures tapped this way. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.EACH_PLAYER, new AngelsTrumpetTapEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java b/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java index a90287a641c..a6a02096c16 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java +++ b/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java @@ -32,7 +32,7 @@ public final class AngrathsMarauders extends CardImpl { this.toughness = new MageInt(4); // If a source you control would deal damage to a permanent or player, it deals double that damage to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngrathsMaraudersEffect())); + this.addAbility(new SimpleStaticAbility(new AngrathsMaraudersEffect())); } private AngrathsMarauders(final AngrathsMarauders card) { diff --git a/Mage.Sets/src/mage/cards/a/AngryMob.java b/Mage.Sets/src/mage/cards/a/AngryMob.java index a85c6468100..aa9f1897bfd 100644 --- a/Mage.Sets/src/mage/cards/a/AngryMob.java +++ b/Mage.Sets/src/mage/cards/a/AngryMob.java @@ -39,7 +39,7 @@ public final class AngryMob extends CardImpl { // As long as it's your turn, Angry Mob's power and toughness are each equal to 2 plus the number of Swamps your opponents control. As long as it's not your turn, Angry Mob's power and toughness are each 2. PermanentsOnBattlefieldCount swamps = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(swamps, swamps, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, {this}'s power and toughness are each equal to 2 plus the number of Swamps your opponents control. During turns other than yours, {this}'s power and toughness are each 2")) diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index a5d14feb1c5..7ec2f30c3d5 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -42,7 +42,7 @@ public final class AnimalBoneyard extends CardImpl { gainedAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AnimalBoneyard(final AnimalBoneyard card) { diff --git a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java index e079cd58301..0b697a9b82c 100644 --- a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java +++ b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java @@ -40,7 +40,7 @@ public final class AnimarSoulOfElements extends CardImpl { this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), StaticFilters.FILTER_SPELL_A_CREATURE, false)); // Creature spells you cast cost {1} less to cast for each +1/+1 counter on Animar. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnimarCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new AnimarCostReductionEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java index 1430feebaf2..3b40eec226e 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java +++ b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java @@ -42,7 +42,7 @@ public final class AnimateArtifact extends CardImpl { this.addAbility(ability); // As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnimateArtifactContinuousEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new AnimateArtifactContinuousEffect(Duration.WhileOnBattlefield))); } private AnimateArtifact(final AnimateArtifact card) { diff --git a/Mage.Sets/src/mage/cards/a/AnimateWall.java b/Mage.Sets/src/mage/cards/a/AnimateWall.java index 398d8b26129..7b852039321 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateWall.java +++ b/Mage.Sets/src/mage/cards/a/AnimateWall.java @@ -41,10 +41,10 @@ public final class AnimateWall extends CardImpl { this.addAbility(ability); // Enchanted Wall can attack as though it didn't have defender. - Ability canAttackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield)); + Ability canAttackAbility = new SimpleStaticAbility(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield)); Effect enchantEffect = new GainAbilityAttachedEffect(canAttackAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); enchantEffect.setText("Enchanted Wall can attack as though it didn't have defender"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, enchantEffect)); + this.addAbility(new SimpleStaticAbility(enchantEffect)); } private AnimateWall(final AnimateWall card) { diff --git a/Mage.Sets/src/mage/cards/a/Annex.java b/Mage.Sets/src/mage/cards/a/Annex.java index 8518e84fec3..e20c831cba4 100644 --- a/Mage.Sets/src/mage/cards/a/Annex.java +++ b/Mage.Sets/src/mage/cards/a/Annex.java @@ -33,7 +33,7 @@ public final class Annex extends CardImpl { this.addAbility(ability); // You control enchanted land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("land"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("land"))); } private Annex(final Annex card) { diff --git a/Mage.Sets/src/mage/cards/a/AnointedProcession.java b/Mage.Sets/src/mage/cards/a/AnointedProcession.java index b6835921a0e..862634c2f3f 100644 --- a/Mage.Sets/src/mage/cards/a/AnointedProcession.java +++ b/Mage.Sets/src/mage/cards/a/AnointedProcession.java @@ -19,7 +19,7 @@ public final class AnointedProcession extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CreateTwiceThatManyTokensEffect())); + this.addAbility(new SimpleStaticAbility(new CreateTwiceThatManyTokensEffect())); } private AnointedProcession(final AnointedProcession card) { diff --git a/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java b/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java index 042ee5c0009..520e001ee70 100644 --- a/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java +++ b/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java @@ -38,7 +38,7 @@ public final class AnthemOfRakdos extends CardImpl { this.addAbility(ability); // Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnthemOfRakdosHellbentEffect())); + this.addAbility(new SimpleStaticAbility(new AnthemOfRakdosHellbentEffect())); } private AnthemOfRakdos(final AnthemOfRakdos card) { diff --git a/Mage.Sets/src/mage/cards/a/AntiMagicAura.java b/Mage.Sets/src/mage/cards/a/AntiMagicAura.java index 99531330278..4fb0772a235 100644 --- a/Mage.Sets/src/mage/cards/a/AntiMagicAura.java +++ b/Mage.Sets/src/mage/cards/a/AntiMagicAura.java @@ -38,7 +38,7 @@ public final class AntiMagicAura extends CardImpl { // Enchanted creature can't be the target of spells and can't be enchanted by other Auras. CantBeTargetedAttachedEffect cantTargetEffect = new CantBeTargetedAttachedEffect(new FilterSpell("spells"), Duration.WhileOnBattlefield, AttachmentType.AURA, TargetController.ANY); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, cantTargetEffect); + Ability ability2 = new SimpleStaticAbility(cantTargetEffect); ability2.addEffect(new AntiMagicAuraRuleEffect()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java index 9bcdbb74394..dbf38a698d8 100644 --- a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java +++ b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java @@ -26,7 +26,7 @@ public final class AnvilOfBogardan extends CardImpl { // Players have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET, TargetController.ANY); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // At the beginning of each player's draw step, that player draws an additional card, then discards a card. this.addAbility(new BeginningOfDrawTriggeredAbility(TargetController.EACH_PLAYER, new AnvilOfBogardanEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/a/AqueousForm.java b/Mage.Sets/src/mage/cards/a/AqueousForm.java index 2feb1fa12f1..54cf1496632 100644 --- a/Mage.Sets/src/mage/cards/a/AqueousForm.java +++ b/Mage.Sets/src/mage/cards/a/AqueousForm.java @@ -33,7 +33,7 @@ public final class AqueousForm extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedAttachedEffect(AttachmentType.AURA))); // Whenever enchanted creature attacks, scry 1. this.addAbility(new AttacksAttachedTriggeredAbility(new ScryEffect(1), AttachmentType.AURA,false)); diff --git a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java index 5a488b8cecd..5b0c4b8bd45 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java @@ -36,7 +36,7 @@ public final class ArachnusWeb extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // At the beginning of the end step, if enchanted creature's power is 4 or greater, destroy Arachnus Web. FilterPermanent filter = new FilterPermanent("if enchanted creature's power is 4 or greater"); filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index bd2dda43293..3247fb35aec 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -48,7 +48,7 @@ public final class ArcadesSabboth extends CardImpl { new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{G}{W}{U}")))); // Each untapped creature you control gets +0/+2 as long as it's not attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, filter, false))); // {W}: Arcades Sabboth gets +0/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneFlight.java b/Mage.Sets/src/mage/cards/a/ArcaneFlight.java index df6222d567d..db8e4508a4c 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneFlight.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneFlight.java @@ -36,7 +36,7 @@ public final class ArcaneFlight extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java b/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java index 54570cc9024..32bcfb4169b 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java @@ -21,7 +21,7 @@ public final class ArcaneLaboratory extends CardImpl { // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.ANY))); } private ArcaneLaboratory(final ArcaneLaboratory card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcanumWings.java b/Mage.Sets/src/mage/cards/a/ArcanumWings.java index 7aa520175c8..9bae2d422f8 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanumWings.java +++ b/Mage.Sets/src/mage/cards/a/ArcanumWings.java @@ -34,7 +34,7 @@ public final class ArcanumWings extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Aura swap {2}{U} this.addAbility(new AuraSwapAbility(new ManaCostsImpl<>("{2}{U}"))); diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java index 8fda073bba3..a6d36d38479 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java @@ -37,10 +37,10 @@ public final class ArchangelOfStrife extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ArchangelOfStrifeChooseEffect())); // Creatures controlled by players who chose war get +3/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfStrifeWarEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfStrifeWarEffect())); // Creatures controlled by players who chose peace get +0/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfStrifePeaceEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfStrifePeaceEffect())); } private ArchangelOfStrife(final ArchangelOfStrife card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java index d08e7b2329e..a9e920024c2 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java @@ -35,10 +35,10 @@ public final class ArchangelOfTithes extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As long as Archangel of Tithes is untapped, creatures can't attack you or a planeswalker you control unless their controller pays {1} for each of those creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfTithesPayManaToAttackAllEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfTithesPayManaToAttackAllEffect())); // As long as Archangel of Tithes is attacking, creatures can't block unless their controller pays {1} for each of those creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfTithesPayManaToBlockAllEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfTithesPayManaToBlockAllEffect())); } private ArchangelOfTithes(final ArchangelOfTithes card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java index 42149989237..8ed4f8c1760 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java @@ -53,7 +53,7 @@ public final class ArchonOfValorsReach extends CardImpl { )); // Players can't cast spells of the chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchonOfValorsReachReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ArchonOfValorsReachReplacementEffect())); } private ArchonOfValorsReach(final ArchonOfValorsReach card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcticAven.java b/Mage.Sets/src/mage/cards/a/ArcticAven.java index 32dddb0688a..def04d87a63 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticAven.java +++ b/Mage.Sets/src/mage/cards/a/ArcticAven.java @@ -41,7 +41,7 @@ public final class ArcticAven extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Arctic Aven gets +1/+1 as long as you control a Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {W}: Arctic Aven gains lifelink until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java index a8ab1d943e8..0d2b7298e6f 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java +++ b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java @@ -31,7 +31,7 @@ public final class ArdentRecruit extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, "{this} gets +2/+2 as long as you control three or more artifacts"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.setAbilityWord(AbilityWord.METALCRAFT); ability.addHint(MetalcraftHint.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java index c4e8cab728f..e90ad9c7c2a 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java +++ b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java @@ -28,7 +28,7 @@ public final class ArgentumArmor extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +6/+6. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(6, 6))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(6, 6))); // Whenever equipped creature attacks, destroy target permanent. Ability ability = new AttacksAttachedTriggeredAbility(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java index 74ba32112c3..5d558ed9071 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java +++ b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java @@ -37,7 +37,7 @@ public final class ArmadilloCloak extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java index c6bd0f0788e..46591b108a7 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java @@ -35,7 +35,7 @@ public final class ArmamentMaster extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArmamentMasterEffect())); + this.addAbility(new SimpleStaticAbility(new ArmamentMasterEffect())); } private ArmamentMaster(final ArmamentMaster card) { @@ -99,4 +99,4 @@ class ArmamentMasterEffect extends ContinuousEffectImpl { return count; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java index 10662727c23..c1c9c6f794b 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java @@ -47,7 +47,7 @@ public final class ArmamentOfNyx extends CardImpl { this.addAbility(ability); Condition condition = new AttachedToMatchesFilterCondition(filter); // Enchanted creature has double strike as long as it's an enchantment. Otherwise, prevent all damage that would be dealt by enchanted creature - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), condition, "Enchanted creature has double strike as long as it's an enchantment")); ReplacementEffect effect = new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false); diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java index f82b60729ce..f9ee8e5f6d7 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java @@ -32,7 +32,7 @@ public final class ArmorOfFaith extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {W}: Enchanted creature gets +0/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java index 69b30553c8e..6f2740c6efd 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java @@ -35,7 +35,7 @@ public final class ArmorOfThorns extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } private ArmorOfThorns(final ArmorOfThorns card) { diff --git a/Mage.Sets/src/mage/cards/a/ArmorSliver.java b/Mage.Sets/src/mage/cards/a/ArmorSliver.java index d3b81dcb084..716d1c76dde 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorSliver.java +++ b/Mage.Sets/src/mage/cards/a/ArmorSliver.java @@ -28,7 +28,7 @@ public final class ArmorSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn).setText("this creature gets +0/+1 until end of turn"), new GenericManaCost(2)), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java index 1c96f405baf..2ceaa36175d 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java @@ -26,7 +26,7 @@ public final class ArmoredGalleon extends CardImpl { this.toughness = new MageInt(4); // Armored Galleon can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private ArmoredGalleon(final ArmoredGalleon card) { diff --git a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java index 33186adc2f7..6b20c41adaa 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java @@ -39,7 +39,7 @@ public final class ArmoryGuard extends CardImpl { // Armory Guard has vigilance as long as you control a Gate. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private ArmoryGuard(final ArmoryGuard card) { diff --git a/Mage.Sets/src/mage/cards/a/Arrest.java b/Mage.Sets/src/mage/cards/a/Arrest.java index e3204b09cae..6dea4126463 100644 --- a/Mage.Sets/src/mage/cards/a/Arrest.java +++ b/Mage.Sets/src/mage/cards/a/Arrest.java @@ -36,7 +36,7 @@ public final class Arrest extends CardImpl { this.addAbility(ability); //Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); } private Arrest(final Arrest card) { diff --git a/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java b/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java index e9f7622fb56..4a666c81898 100644 --- a/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java +++ b/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java @@ -43,7 +43,7 @@ public final class ArvadTheCursed extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Other legendary creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); } private ArvadTheCursed(final ArvadTheCursed card) { diff --git a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java index 63d5c7354f4..1cf5a1c9ea2 100644 --- a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java +++ b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java @@ -38,8 +38,8 @@ public final class AscendantEvincar extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filterNonBlack, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filterNonBlack, false))); } private AscendantEvincar(final AscendantEvincar card) { diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java index 778edcdb755..5356d392c67 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java @@ -44,7 +44,7 @@ public final class AshenmoorCohort extends CardImpl { // Ashenmoor Cohort gets +1/+1 as long as you control another black creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java index ca02268669b..bc1d52240b5 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java @@ -38,9 +38,9 @@ public final class AshenmoorLiege extends CardImpl { this.toughness = new MageInt(1); // Other black creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); // Whenever Ashenmoor Liege becomes the target of a spell or ability an opponent controls, that player loses 4 life. this.addAbility(new BecomesTargetSourceTriggeredAbility(new LoseLifeTargetEffect(4), diff --git a/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java b/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java index 697dc26ec5e..89282f4d220 100644 --- a/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java +++ b/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java @@ -27,7 +27,7 @@ public final class AshesOfTheAbhorrent extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); // Players can't cast spells from graveyards or activate abilities of cards in graveyards. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshesOfTheAbhorrentEffect())); + this.addAbility(new SimpleStaticAbility(new AshesOfTheAbhorrentEffect())); // Whenever a creature dies, you gain 1 life. this.addAbility(new DiesCreatureTriggeredAbility(new GainLifeEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java index cc46bd2a3e4..7d66823818e 100644 --- a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java +++ b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java @@ -30,7 +30,7 @@ public final class AshesOfTheFallen extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Benefit))); // Each creature card in your graveyard has the chosen creature type in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshesOfTheFallenEffect())); + this.addAbility(new SimpleStaticAbility(new AshesOfTheFallenEffect())); } private AshesOfTheFallen(final AshesOfTheFallen card) { diff --git a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java index 1baae502b13..84d3a3c59a1 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java +++ b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java @@ -34,10 +34,10 @@ public final class AshlingsPrerogative extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new ChooseModeEffect("Odd or even?", "Odd", "Even"), null, "As {this} enters, choose odd or even. (Zero is even.)", "")); // Each creature with converted mana cost of the chosen value has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshlingsPrerogativeCorrectOddityEffect())); + this.addAbility(new SimpleStaticAbility(new AshlingsPrerogativeCorrectOddityEffect())); // Each creature without converted mana cost of the chosen value enters the battlefield tapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshlingsPrerogativeIncorrectOddityEffect())); + this.addAbility(new SimpleStaticAbility(new AshlingsPrerogativeIncorrectOddityEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java index 2fe642b6b13..7ada6ce0445 100644 --- a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java +++ b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java @@ -29,7 +29,7 @@ public final class AshmouthBlade extends CardImpl { this.nightCard = true; // Equipped creature gets +3/+3 - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 3)); this.addAbility(ability); // and has first strike. diff --git a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java index b1aabc72608..5b4467c48dc 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java @@ -37,7 +37,7 @@ public final class AspectOfGorgon extends CardImpl { // Enchanted creature gets +1/+3 and has deathtouch. Effect effect = new BoostEnchantedEffect(1,3, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +1/+3"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has deathtouch"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java index 5c4938a4fa4..cd9f2bd361a 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java @@ -35,7 +35,7 @@ public final class AspectOfMongoose extends CardImpl { this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); // When Aspect of Mongoose is put into a graveyard from the battlefield, return Aspect of Mongoose to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java index 58bab8ce0b6..3677d59cfcd 100644 --- a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java +++ b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java @@ -31,7 +31,7 @@ public final class AudaciousInfiltrator extends CardImpl { // Audacious Infiltrator can't be blocked by artifact creatures. Effect effect = new CantBeBlockedByCreaturesSourceEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE, Duration.WhileOnBattlefield); effect.setText("{this} can't be blocked by artifact creatures"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AudaciousInfiltrator(final AudaciousInfiltrator card) { diff --git a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java index d99b8c265c7..33bb9857e25 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java +++ b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java @@ -35,10 +35,10 @@ public final class AuraGnarlid extends CardImpl { this.toughness = new MageInt(2); // Creatures with power less than Aura Gnarlid's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); // Aura Gnarlid gets +1/+1 for each Aura on the battlefield. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } private AuraGnarlid(final AuraGnarlid card) { diff --git a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java index f03a3d249b4..7431846b325 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java @@ -35,7 +35,7 @@ public final class AuraOfSilence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); // Artifact and enchantment spells your opponents cast cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(2, filter, TargetController.OPPONENT))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(2, filter, TargetController.OPPONENT))); // Sacrifice Aura of Silence: Destroy target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); @@ -51,4 +51,4 @@ public final class AuraOfSilence extends CardImpl { public AuraOfSilence copy() { return new AuraOfSilence(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java index 0655344cf70..a63e6660004 100644 --- a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java +++ b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java @@ -43,7 +43,7 @@ public final class AuramancersGuise extends CardImpl { DynamicValue ptBoost = new EnchantedCreatureAurasCount(); BoostEnchantedEffect effect = new BoostEnchantedEffect(ptBoost, ptBoost, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2 for each Aura attached to it"); - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability2 = new SimpleStaticAbility(effect); ability2.addEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA).setText("and has vigilance")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/a/Aurification.java b/Mage.Sets/src/mage/cards/a/Aurification.java index ce985e4a73b..7fb1c58e04a 100644 --- a/Mage.Sets/src/mage/cards/a/Aurification.java +++ b/Mage.Sets/src/mage/cards/a/Aurification.java @@ -43,8 +43,8 @@ public final class Aurification extends CardImpl { BecomesSubtypeAllEffect becomesSubtypeAllEffect = new BecomesSubtypeAllEffect(Duration.WhileOnBattlefield, Arrays.asList(SubType.WALL), filter, false); becomesSubtypeAllEffect.setText(""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, becomesSubtypeAllEffect)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield, filter, rule))); + this.addAbility(new SimpleStaticAbility(becomesSubtypeAllEffect)); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield, filter, rule))); // When Aurification leaves the battlefield, remove all gold counters from all creatures. this.addAbility(new LeavesBattlefieldTriggeredAbility(new RemoveAllCountersAllEffect( diff --git a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java index 13183a247cb..f4ee36dd3d4 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java +++ b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java @@ -33,9 +33,9 @@ public final class AuriokGlaivemaster extends CardImpl { this.toughness = new MageInt(1); ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedSourceCondition.instance, rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(effect1)); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedSourceCondition.instance, rule2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(effect2)); } private AuriokGlaivemaster(final AuriokGlaivemaster card) { diff --git a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java index a46f070c583..df4ad9aff84 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java @@ -42,10 +42,10 @@ public final class AuriokSteelshaper extends CardImpl { this.toughness = new MageInt(1); // Equip costs you pay cost {1} less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(EquipAbility.class, "Equip"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(EquipAbility.class, "Equip"))); // As long as Auriok Steelshaper is equipped, each creature you control that's a Soldier or a Knight gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, soldiersOrKnights, false), EquippedSourceCondition.instance, "As long as {this} is equipped, each creature you control that's a Soldier or a Knight gets +1/+1" diff --git a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java index e9824f95f33..0b7faa1834d 100644 --- a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java +++ b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java @@ -32,7 +32,7 @@ public final class AvariceAmulet extends CardImpl { // Equipped creature gets +2/+0 Effect effect = new BoostEquippedEffect(2, 0); effect.setText("Equipped creature gets +2/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); // and has vigilance effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has vigilance"); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java index f2ad028ddbc..848d04052cf 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java @@ -40,7 +40,7 @@ public final class AvatarOfHope extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Avatar of Hope can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private AvatarOfHope(final AvatarOfHope card) { diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java index bbc4f2ea311..772cbb3528a 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java @@ -33,7 +33,7 @@ public final class AvatarOfSlaughter extends CardImpl { // All creatures have double strike and attack each turn if able. Effect effect = new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("All creatures have double strike"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("and attack each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java index 21a05786aa9..647211d438a 100644 --- a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java +++ b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java @@ -38,9 +38,9 @@ public final class AvenBrigadier extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Bird creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Other Soldier creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); } private AvenBrigadier(final AvenBrigadier card) { diff --git a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java index 004d3af9ba8..ee8c8de963c 100644 --- a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java +++ b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java @@ -34,7 +34,7 @@ public final class AvenMindcensor extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // If an opponent would search a library, that player searches the top four cards of that library instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AvenMindcensorEffect())); + this.addAbility(new SimpleStaticAbility(new AvenMindcensorEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AvenWindGuide.java b/Mage.Sets/src/mage/cards/a/AvenWindGuide.java index 5cbf46c7310..f663fc6bbc1 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWindGuide.java +++ b/Mage.Sets/src/mage/cards/a/AvenWindGuide.java @@ -45,7 +45,7 @@ public final class AvenWindGuide extends CardImpl { Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURE_TOKENS); effect.setText("Creature tokens you control have flying"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java index 9cdf13a640d..e4ffb5e9d66 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java @@ -38,7 +38,7 @@ public final class AwakenTheAncient extends CardImpl { this.addAbility(ability); // Enchanted Mountain is a 7/7 red Giant creature with haste. It's still a land. - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new GiantToken(), "Enchanted Mountain is a 7/7 red Giant creature with haste. It's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/a/AysenHighway.java b/Mage.Sets/src/mage/cards/a/AysenHighway.java index 5a771dd715a..98a30a9454a 100644 --- a/Mage.Sets/src/mage/cards/a/AysenHighway.java +++ b/Mage.Sets/src/mage/cards/a/AysenHighway.java @@ -30,7 +30,7 @@ public final class AysenHighway extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}{W}{W}"); // White creatures have plainswalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new PlainswalkAbility(false), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java index 2fcfa0a1cc7..b78da83fcc8 100644 --- a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java +++ b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java @@ -24,7 +24,7 @@ public final class AzusaLostButSeeking extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(2, Duration.WhileOnBattlefield))); } private AzusaLostButSeeking(final AzusaLostButSeeking card) { -- 2.47.2 From 6963717a830ab0d80454505a38ada41a86e1c261 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:10:15 -0500 Subject: [PATCH 10/50] refactor: SimpleStaticAbility default zone (cards B) --- Mage.Sets/src/mage/cards/b/BINGO.java | 2 +- Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java | 2 +- Mage.Sets/src/mage/cards/b/BadMoon.java | 2 +- Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java | 2 +- Mage.Sets/src/mage/cards/b/BalefireLiege.java | 4 ++-- Mage.Sets/src/mage/cards/b/BalefulEidolon.java | 2 +- Mage.Sets/src/mage/cards/b/BallynockCohort.java | 2 +- Mage.Sets/src/mage/cards/b/BallyrushBanneret.java | 2 +- Mage.Sets/src/mage/cards/b/BalothPup.java | 2 +- Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java | 2 +- Mage.Sets/src/mage/cards/b/BantSureblade.java | 2 +- Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java | 2 +- Mage.Sets/src/mage/cards/b/BarbedBattlegear.java | 2 +- Mage.Sets/src/mage/cards/b/BarbedField.java | 2 +- Mage.Sets/src/mage/cards/b/BarbedSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BarrowBlade.java | 4 ++-- Mage.Sets/src/mage/cards/b/BartelRuneaxe.java | 2 +- Mage.Sets/src/mage/cards/b/BasalSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BasaltMonolith.java | 2 +- Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java | 2 +- Mage.Sets/src/mage/cards/b/BastionProtector.java | 2 +- Mage.Sets/src/mage/cards/b/BatteredGolem.java | 2 +- Mage.Sets/src/mage/cards/b/BatteringWurm.java | 2 +- Mage.Sets/src/mage/cards/b/Batterskull.java | 6 +++--- Mage.Sets/src/mage/cards/b/BattleMastery.java | 2 +- Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java | 2 +- Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java | 2 +- Mage.Sets/src/mage/cards/b/BattlegroundGeist.java | 2 +- Mage.Sets/src/mage/cards/b/BattletideAlchemist.java | 2 +- Mage.Sets/src/mage/cards/b/BeastmasterAscension.java | 2 +- Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java | 2 +- Mage.Sets/src/mage/cards/b/Bedlam.java | 2 +- Mage.Sets/src/mage/cards/b/BehemothSledge.java | 2 +- Mage.Sets/src/mage/cards/b/BelligerentSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java | 2 +- Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java | 2 +- Mage.Sets/src/mage/cards/b/BenalishMarshal.java | 2 +- Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java | 2 +- Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java | 2 +- Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java | 2 +- Mage.Sets/src/mage/cards/b/BindingGrasp.java | 4 ++-- Mage.Sets/src/mage/cards/b/BitingTether.java | 2 +- Mage.Sets/src/mage/cards/b/BitterFeud.java | 2 +- Mage.Sets/src/mage/cards/b/BlackCarriage.java | 2 +- Mage.Sets/src/mage/cards/b/BlackScarab.java | 4 ++-- Mage.Sets/src/mage/cards/b/BlackbladeReforged.java | 2 +- Mage.Sets/src/mage/cards/b/BladeSplicer.java | 2 +- Mage.Sets/src/mage/cards/b/BladegraftAspirant.java | 2 +- Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java | 2 +- Mage.Sets/src/mage/cards/b/BladewingsThrall.java | 2 +- Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java | 2 +- Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java | 4 ++-- Mage.Sets/src/mage/cards/b/BlazingArchon.java | 2 +- Mage.Sets/src/mage/cards/b/BlessedOrator.java | 2 +- Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java | 2 +- Mage.Sets/src/mage/cards/b/BlindWorship.java | 2 +- Mage.Sets/src/mage/cards/b/BloodFunnel.java | 2 +- Mage.Sets/src/mage/cards/b/BloodMoon.java | 2 +- Mage.Sets/src/mage/cards/b/BloodScrivener.java | 2 +- Mage.Sets/src/mage/cards/b/BloodSun.java | 2 +- Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java | 2 +- Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java | 2 +- Mage.Sets/src/mage/cards/b/Bloodghast.java | 2 +- Mage.Sets/src/mage/cards/b/BloodmarkMentor.java | 2 +- Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java | 2 +- Mage.Sets/src/mage/cards/b/BloodswornSteward.java | 2 +- Mage.Sets/src/mage/cards/b/BlueScarab.java | 4 ++-- Mage.Sets/src/mage/cards/b/BlurSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BoarUmbra.java | 2 +- Mage.Sets/src/mage/cards/b/BoartuskLiege.java | 4 ++-- Mage.Sets/src/mage/cards/b/BogSerpent.java | 2 +- Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java | 2 +- Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java | 2 +- Mage.Sets/src/mage/cards/b/BoneSaw.java | 2 +- Mage.Sets/src/mage/cards/b/Bonesplitter.java | 2 +- Mage.Sets/src/mage/cards/b/BontusMonument.java | 2 +- Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java | 2 +- Mage.Sets/src/mage/cards/b/BoonReflection.java | 2 +- Mage.Sets/src/mage/cards/b/BoonSatyr.java | 2 +- Mage.Sets/src/mage/cards/b/BoskBanneret.java | 2 +- Mage.Sets/src/mage/cards/b/BouncingBeebles.java | 2 +- Mage.Sets/src/mage/cards/b/BoundInSilence.java | 2 +- Mage.Sets/src/mage/cards/b/BountySpotter.java | 2 +- Mage.Sets/src/mage/cards/b/BowerPassage.java | 2 +- Mage.Sets/src/mage/cards/b/Brainwash.java | 2 +- Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java | 2 +- Mage.Sets/src/mage/cards/b/BrandedBrawlers.java | 4 ++-- Mage.Sets/src/mage/cards/b/BrassGnat.java | 2 +- Mage.Sets/src/mage/cards/b/BrassHerald.java | 2 +- Mage.Sets/src/mage/cards/b/BrassMan.java | 2 +- Mage.Sets/src/mage/cards/b/BrassclawOrcs.java | 2 +- Mage.Sets/src/mage/cards/b/Bravado.java | 2 +- Mage.Sets/src/mage/cards/b/BraveTheSands.java | 4 ++-- Mage.Sets/src/mage/cards/b/BreakerOfArmies.java | 2 +- Mage.Sets/src/mage/cards/b/BreathOfDreams.java | 2 +- Mage.Sets/src/mage/cards/b/BriarShield.java | 2 +- Mage.Sets/src/mage/cards/b/BriarberryCohort.java | 2 +- Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java | 2 +- Mage.Sets/src/mage/cards/b/BrilliantHalo.java | 2 +- Mage.Sets/src/mage/cards/b/BristlingBoar.java | 2 +- Mage.Sets/src/mage/cards/b/Broodwarden.java | 2 +- Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java | 2 +- Mage.Sets/src/mage/cards/b/BrutalSuppression.java | 2 +- Mage.Sets/src/mage/cards/b/BubbleMatrix.java | 2 +- Mage.Sets/src/mage/cards/b/BubbleSmuggler.java | 2 +- Mage.Sets/src/mage/cards/b/BubblingBeebles.java | 2 +- Mage.Sets/src/mage/cards/b/Buoyancy.java | 2 +- Mage.Sets/src/mage/cards/b/BurningAnger.java | 2 +- Mage.Sets/src/mage/cards/b/ButchersCleaver.java | 2 +- 109 files changed, 120 insertions(+), 120 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BINGO.java b/Mage.Sets/src/mage/cards/b/BINGO.java index f227e0abf0b..3d680111570 100644 --- a/Mage.Sets/src/mage/cards/b/BINGO.java +++ b/Mage.Sets/src/mage/cards/b/BINGO.java @@ -52,7 +52,7 @@ public final class BINGO extends CardImpl { // B-I-N-G-O gets +9/+9 for each set of three numbers in a row with chip counters on them. BingoCount count = new BingoCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } private BINGO(final BINGO card) { diff --git a/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java b/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java index e043d4f2b56..bbc0de902b5 100644 --- a/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java +++ b/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java @@ -31,7 +31,7 @@ public final class BackwoodsSurvivalists extends CardImpl { // Delirium — Backwoods Survivalists gets +1/+1 and has trample as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), DeliriumCondition.instance, "and has trample as long as there are four or more card types among cards in your graveyard.")); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BadMoon.java b/Mage.Sets/src/mage/cards/b/BadMoon.java index f8ce094bcf8..a1ee41f0f2a 100644 --- a/Mage.Sets/src/mage/cards/b/BadMoon.java +++ b/Mage.Sets/src/mage/cards/b/BadMoon.java @@ -30,7 +30,7 @@ public final class BadMoon extends CardImpl { // Black creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java index 05c23b8e032..34ad281c55f 100644 --- a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java +++ b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java @@ -39,7 +39,7 @@ public final class BalanWanderingKnight extends CardImpl { // Balan, Wandering Knight has double strike as long as two or more Equipment are attached to it. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance()), EquippedMultipleSourceCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {1}{W}: Attach all Equipment you control to Balan. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalanWanderingKnightEffect(), new ManaCostsImpl<>("{1}{W}"))); diff --git a/Mage.Sets/src/mage/cards/b/BalefireLiege.java b/Mage.Sets/src/mage/cards/b/BalefireLiege.java index 15cf5e99b4d..5bc0ea8ac83 100644 --- a/Mage.Sets/src/mage/cards/b/BalefireLiege.java +++ b/Mage.Sets/src/mage/cards/b/BalefireLiege.java @@ -44,8 +44,8 @@ public final class BalefireLiege extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhiteCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhiteCreature, true))); Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(3), filterRedSpell, false); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BalefulEidolon.java b/Mage.Sets/src/mage/cards/b/BalefulEidolon.java index 08c1fa152ec..2fd6a0676c6 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulEidolon.java +++ b/Mage.Sets/src/mage/cards/b/BalefulEidolon.java @@ -31,7 +31,7 @@ public final class BalefulEidolon extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // Enchanted creature gets +1/+1 and has deathtouch. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield,"and has deathtouch")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BallynockCohort.java b/Mage.Sets/src/mage/cards/b/BallynockCohort.java index 539e3f0a082..204bd9a6f1d 100644 --- a/Mage.Sets/src/mage/cards/b/BallynockCohort.java +++ b/Mage.Sets/src/mage/cards/b/BallynockCohort.java @@ -51,7 +51,7 @@ public final class BallynockCohort extends CardImpl { // Ballynock Cohort gets +1/+1 as long as you control another white creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java index 4fc376a1cd3..1d8fd979bd5 100644 --- a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java @@ -35,7 +35,7 @@ public final class BallyrushBanneret extends CardImpl { this.toughness = new MageInt(1); // Kithkin spells and Soldier spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private BallyrushBanneret(final BallyrushBanneret card) { diff --git a/Mage.Sets/src/mage/cards/b/BalothPup.java b/Mage.Sets/src/mage/cards/b/BalothPup.java index cf9059761c1..179ec558a52 100644 --- a/Mage.Sets/src/mage/cards/b/BalothPup.java +++ b/Mage.Sets/src/mage/cards/b/BalothPup.java @@ -32,7 +32,7 @@ public final class BalothPup extends CardImpl { // Baloth Pup has trample as long as it has a +1/+1 counter on it. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BalothPup(final BalothPup card) { diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java index 3566fbf9aba..190272d1ef8 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java @@ -37,7 +37,7 @@ public final class BalthorTheDefiled extends CardImpl { this.toughness = new MageInt(2); // Minion creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.MINION, "Minion creatures"), false))); // {B}{B}{B}, Exile Balthor the Defiled: Each player returns all black and all red creature cards from their graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/cards/b/BantSureblade.java b/Mage.Sets/src/mage/cards/b/BantSureblade.java index fe889bf15dc..c68f8e140a3 100644 --- a/Mage.Sets/src/mage/cards/b/BantSureblade.java +++ b/Mage.Sets/src/mage/cards/b/BantSureblade.java @@ -41,7 +41,7 @@ public final class BantSureblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Bant Sureblade gets +1/+1 and has first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java b/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java index edcef1d2ec2..76fc9d1cc9f 100644 --- a/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java +++ b/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java @@ -40,7 +40,7 @@ public final class BaralChiefOfCompliance extends CardImpl { this.toughness = new MageInt(3); // Instant and sorcery spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever a spell or ability you control counters a spell, you may draw a card. If you do, discard a card. this.addAbility(new SpellCounteredControllerTriggeredAbility(new DrawDiscardControllerEffect(true))); diff --git a/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java b/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java index 6202b258c1d..4c5f28c4c9c 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java +++ b/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java @@ -26,7 +26,7 @@ public final class BarbedBattlegear extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, -1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, -1))); // Equip {2} this.addAbility(new EquipAbility(Outcome.Neutral, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/b/BarbedField.java b/Mage.Sets/src/mage/cards/b/BarbedField.java index 90b9b7ede8d..fd18ef3b1ed 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedField.java +++ b/Mage.Sets/src/mage/cards/b/BarbedField.java @@ -39,7 +39,7 @@ public final class BarbedField extends CardImpl { ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: This land deals 1 damage to any target.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BarbedField(final BarbedField card) { diff --git a/Mage.Sets/src/mage/cards/b/BarbedSliver.java b/Mage.Sets/src/mage/cards/b/BarbedSliver.java index 0b8a258bb3e..c9c75a84cc3 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedSliver.java +++ b/Mage.Sets/src/mage/cards/b/BarbedSliver.java @@ -28,7 +28,7 @@ public final class BarbedSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText("this creature gets +1/+0 until end of turn"), + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText("this creature gets +1/+0 until end of turn"), new GenericManaCost(2)), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BarrowBlade.java b/Mage.Sets/src/mage/cards/b/BarrowBlade.java index 547c9b141e1..e0fbfcbd410 100644 --- a/Mage.Sets/src/mage/cards/b/BarrowBlade.java +++ b/Mage.Sets/src/mage/cards/b/BarrowBlade.java @@ -23,7 +23,7 @@ public final class BarrowBlade extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Whenever equipped creature blocks or becomes blocked by a creature, that creature loses all abilities until end of turn. this.addAbility(new BlocksOrBlockedByCreatureAttachedTriggeredAbility( @@ -44,4 +44,4 @@ public final class BarrowBlade extends CardImpl { public BarrowBlade copy() { return new BarrowBlade(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java b/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java index 53ecf14104e..07d483ce5b0 100644 --- a/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java +++ b/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java @@ -31,7 +31,7 @@ public final class BartelRuneaxe extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Bartel Runeaxe can't be the target of Aura spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BartelRuneaxeEffect())); + this.addAbility(new SimpleStaticAbility(new BartelRuneaxeEffect())); } private BartelRuneaxe(final BartelRuneaxe card) { diff --git a/Mage.Sets/src/mage/cards/b/BasalSliver.java b/Mage.Sets/src/mage/cards/b/BasalSliver.java index c32e87fa6e5..d5ea89e1aeb 100644 --- a/Mage.Sets/src/mage/cards/b/BasalSliver.java +++ b/Mage.Sets/src/mage/cards/b/BasalSliver.java @@ -37,7 +37,7 @@ public final class BasalSliver extends CardImpl { // All Slivers have "Sacrifice this permanent: Add {B}{B}." Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(2), new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"Sacrifice this permanent: Add {B}{B}.\""))); } diff --git a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java index 57a2046f7bb..b5561ae21b8 100644 --- a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java +++ b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java @@ -25,7 +25,7 @@ public final class BasaltMonolith extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Basalt Monolith doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {tap}: Add {C}{C}{C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); // {3}: Untap Basalt Monolith. diff --git a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java index 57b3ee98727..d493a3bbc66 100644 --- a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java +++ b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java @@ -35,7 +35,7 @@ public final class BasandraBattleSeraph extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Players can't cast spells during combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BasandraBattleSeraphEffect())); + this.addAbility(new SimpleStaticAbility(new BasandraBattleSeraphEffect())); // {R}: Target creature attacks this turn if able. Effect effect = new AttacksIfAbleTargetEffect(Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/b/BastionProtector.java b/Mage.Sets/src/mage/cards/b/BastionProtector.java index ababacd673b..39670e9fe3b 100644 --- a/Mage.Sets/src/mage/cards/b/BastionProtector.java +++ b/Mage.Sets/src/mage/cards/b/BastionProtector.java @@ -37,7 +37,7 @@ public final class BastionProtector extends CardImpl { this.toughness = new MageInt(3); // Commander creatures you control get +2/+2 and have indestructible. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have indestructible"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/b/BatteredGolem.java b/Mage.Sets/src/mage/cards/b/BatteredGolem.java index 2ff5b7cbb5f..6c88d6218df 100644 --- a/Mage.Sets/src/mage/cards/b/BatteredGolem.java +++ b/Mage.Sets/src/mage/cards/b/BatteredGolem.java @@ -28,7 +28,7 @@ public final class BatteredGolem extends CardImpl { this.toughness = new MageInt(2); // Battered Golem doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever an artifact enters the battlefield, you may untap Battered Golem. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new FilterArtifactPermanent("an artifact"), true)); } diff --git a/Mage.Sets/src/mage/cards/b/BatteringWurm.java b/Mage.Sets/src/mage/cards/b/BatteringWurm.java index 0371c0cd8f1..ddc32801f5e 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringWurm.java +++ b/Mage.Sets/src/mage/cards/b/BatteringWurm.java @@ -27,7 +27,7 @@ public final class BatteringWurm extends CardImpl { this.addAbility(new BloodthirstAbility(1)); // Creatures with power less than Battering Wurm's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private BatteringWurm(final BatteringWurm card) { diff --git a/Mage.Sets/src/mage/cards/b/Batterskull.java b/Mage.Sets/src/mage/cards/b/Batterskull.java index 707743af465..11ef76bfe46 100644 --- a/Mage.Sets/src/mage/cards/b/Batterskull.java +++ b/Mage.Sets/src/mage/cards/b/Batterskull.java @@ -31,9 +31,9 @@ public final class Batterskull extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +4/+4 and has vigilance and lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 4))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 4))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); // {3}: Return Batterskull to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/cards/b/BattleMastery.java b/Mage.Sets/src/mage/cards/b/BattleMastery.java index bf9a04053fc..75b25af14cd 100644 --- a/Mage.Sets/src/mage/cards/b/BattleMastery.java +++ b/Mage.Sets/src/mage/cards/b/BattleMastery.java @@ -29,7 +29,7 @@ public final class BattleMastery extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA))); } private BattleMastery(final BattleMastery card) { diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java b/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java index 85fcfe7d66e..b44fcf8ddea 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java @@ -37,7 +37,7 @@ public final class BattlefieldThaumaturge extends CardImpl { this.toughness = new MageInt(1); // Each instant and sorcery spell you cast costs 1 less to cast for each creature it targets. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BattlefieldThaumaturgeSpellsCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new BattlefieldThaumaturgeSpellsCostReductionEffect())); // Heroic - Whenever you cast a spell that targets Battlefield Thaumaturge, Battlefield Thaumaturge gains hexproof until end of turn. this.addAbility(new HeroicAbility(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn))); diff --git a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java index afc317aa324..0a0bae295e3 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java +++ b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java @@ -29,7 +29,7 @@ public final class BattlefrontKrushok extends CardImpl { this.toughness = new MageInt(4); // Battlefront Krushok can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); // Each creature you control with a +1/+1 counter on it can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java index ffed5d1467e..a8048844b2b 100644 --- a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java +++ b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java @@ -35,7 +35,7 @@ public final class BattlegroundGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Spirit creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } private BattlegroundGeist(final BattlegroundGeist card) { diff --git a/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java b/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java index 301bd12b158..779418b1cd0 100644 --- a/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java +++ b/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java @@ -30,7 +30,7 @@ public final class BattletideAlchemist extends CardImpl { this.toughness = new MageInt(4); // If a source would deal damage to a player, you may prevent X of that damage, where X is the number of Clerics you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BattletideAlchemistEffect())); + this.addAbility(new SimpleStaticAbility(new BattletideAlchemistEffect())); } private BattletideAlchemist(final BattletideAlchemist card) { diff --git a/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java b/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java index f12a8a69de9..f88ede4d892 100644 --- a/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java @@ -28,7 +28,7 @@ public final class BeastmasterAscension extends CardImpl { this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BeastmasterAscensionEffect())); + this.addAbility(new SimpleStaticAbility(new BeastmasterAscensionEffect())); } private BeastmasterAscension(final BeastmasterAscension card) { diff --git a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java index 87210552f79..0b8803c26cd 100644 --- a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java +++ b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java @@ -41,7 +41,7 @@ public final class BeastsOfBogardan extends CardImpl { // Protection from red this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // Beasts of Bogardan gets +1/+1 as long as an opponent controls a nontoken white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(controlFilter), "{this} gets +1/+1 as long as an opponent controls a nontoken white permanent"))); diff --git a/Mage.Sets/src/mage/cards/b/Bedlam.java b/Mage.Sets/src/mage/cards/b/Bedlam.java index f305f65a97b..84426a3331d 100644 --- a/Mage.Sets/src/mage/cards/b/Bedlam.java +++ b/Mage.Sets/src/mage/cards/b/Bedlam.java @@ -21,7 +21,7 @@ public final class Bedlam extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); // Creatures can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, Duration.WhileOnBattlefield))); } private Bedlam(final Bedlam card) { diff --git a/Mage.Sets/src/mage/cards/b/BehemothSledge.java b/Mage.Sets/src/mage/cards/b/BehemothSledge.java index 37dcd4c939e..158ed6dd5b1 100644 --- a/Mage.Sets/src/mage/cards/b/BehemothSledge.java +++ b/Mage.Sets/src/mage/cards/b/BehemothSledge.java @@ -25,7 +25,7 @@ public final class BehemothSledge extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2 and has trample and lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 2)); ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has trample")); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and lifelink")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java index 5d28573ed53..27cd53ae16d 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java @@ -36,7 +36,7 @@ public final class BelligerentSliver extends CardImpl { // Sliver creatures you control have menace. (They can't be blocked except by two or more creatures.)" Effect effect = new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter); effect.setText("Sliver creatures you control have menace. (They can't be blocked except by two or more creatures.)"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BelligerentSliver(final BelligerentSliver card) { diff --git a/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java b/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java index 607da3a7c6a..3cc38fea673 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java +++ b/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java @@ -36,7 +36,7 @@ public final class BellowingTanglewurm extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(IntimidateAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } private BellowingTanglewurm(final BellowingTanglewurm card) { diff --git a/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java b/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java index 97ab5d73f36..6581c86cb68 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java +++ b/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java @@ -38,7 +38,7 @@ public final class BenalishHonorGuard extends CardImpl { // Benalish Honor Guard gets +1/+0 for each legendary creature you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); } private BenalishHonorGuard(final BenalishHonorGuard card) { diff --git a/Mage.Sets/src/mage/cards/b/BenalishMarshal.java b/Mage.Sets/src/mage/cards/b/BenalishMarshal.java index d95b521f742..ce39cd3965c 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishMarshal.java +++ b/Mage.Sets/src/mage/cards/b/BenalishMarshal.java @@ -22,7 +22,7 @@ public final class BenalishMarshal extends CardImpl { toughness = new MageInt(3); // Other creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); } diff --git a/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java b/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java index 42832ef07e4..8935c9d29b8 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java @@ -34,7 +34,7 @@ public final class BenevolentUnicorn extends CardImpl { this.toughness = new MageInt(2); // If a spell would deal damage to a permanent or player, it deals that much damage minus 1 to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BenevolentUnicornEffect())); + this.addAbility(new SimpleStaticAbility(new BenevolentUnicornEffect())); } private BenevolentUnicorn(final BenevolentUnicorn card) { diff --git a/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java b/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java index 54a12da1b25..bad7c7acc0a 100644 --- a/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java +++ b/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java @@ -28,7 +28,7 @@ public final class BespokeBattlegarb extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0, Duration.WhileOnBattlefield))); // Celebration -- At the beginning of combat on your turn, if two or more nonland permanents entered the battlefield under your control this turn, attach Bespoke Battlegarb to up to one target creature you control. Ability ability = new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java b/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java index f91c4b148b5..4e60439570c 100644 --- a/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java +++ b/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java @@ -58,7 +58,7 @@ public final class BiggerOnTheInside extends CardImpl { Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BiggerOnTheInsideEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPlayer()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, null, "permanent"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BiggerOnTheInside(final BiggerOnTheInside card) { diff --git a/Mage.Sets/src/mage/cards/b/BindingGrasp.java b/Mage.Sets/src/mage/cards/b/BindingGrasp.java index fe202dfc6a7..084cadb339e 100644 --- a/Mage.Sets/src/mage/cards/b/BindingGrasp.java +++ b/Mage.Sets/src/mage/cards/b/BindingGrasp.java @@ -36,9 +36,9 @@ public final class BindingGrasp extends CardImpl { // At the beginning of your upkeep, sacrifice Binding Grasp unless you pay {1}{U}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{U}")))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Enchanted creature gets +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 1, Duration.WhileOnBattlefield))); } private BindingGrasp(final BindingGrasp card) { diff --git a/Mage.Sets/src/mage/cards/b/BitingTether.java b/Mage.Sets/src/mage/cards/b/BitingTether.java index d8b1434d909..369e494ae00 100644 --- a/Mage.Sets/src/mage/cards/b/BitingTether.java +++ b/Mage.Sets/src/mage/cards/b/BitingTether.java @@ -35,7 +35,7 @@ public final class BitingTether extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of your upkeep, put a -1/-1 counter on enchanted creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAttachedEffect(CounterType.M1M1.createInstance(), "enchanted creature"))); diff --git a/Mage.Sets/src/mage/cards/b/BitterFeud.java b/Mage.Sets/src/mage/cards/b/BitterFeud.java index 76efa46184f..312b52ad319 100644 --- a/Mage.Sets/src/mage/cards/b/BitterFeud.java +++ b/Mage.Sets/src/mage/cards/b/BitterFeud.java @@ -36,7 +36,7 @@ public final class BitterFeud extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new BitterFeudEntersBattlefieldEffect())); // If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BitterFeudEffect())); + this.addAbility(new SimpleStaticAbility(new BitterFeudEffect())); } private BitterFeud(final BitterFeud card) { diff --git a/Mage.Sets/src/mage/cards/b/BlackCarriage.java b/Mage.Sets/src/mage/cards/b/BlackCarriage.java index 5504f662fd5..78d9afde558 100644 --- a/Mage.Sets/src/mage/cards/b/BlackCarriage.java +++ b/Mage.Sets/src/mage/cards/b/BlackCarriage.java @@ -35,7 +35,7 @@ public final class BlackCarriage extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Black Carriage doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Sacrifice a creature: Untap Black Carriage. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/b/BlackScarab.java b/Mage.Sets/src/mage/cards/b/BlackScarab.java index ad89a47bd87..63664b5eaa1 100644 --- a/Mage.Sets/src/mage/cards/b/BlackScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlackScarab.java @@ -48,11 +48,11 @@ public final class BlackScarab extends CardImpl { // Enchanted creature can't be blocked by black creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a black permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a black permanent"))); diff --git a/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java b/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java index 7d6ad2c793e..4cf85be7bfe 100644 --- a/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java +++ b/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java @@ -36,7 +36,7 @@ public final class BlackbladeReforged extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1 for each land you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(count, count)).addHint(new ValueHint("Lands you control", count))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(count, count)).addHint(new ValueHint("Lands you control", count))); // Equip legendary creature (3) this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3), new TargetControlledCreaturePermanent(filter), false)); diff --git a/Mage.Sets/src/mage/cards/b/BladeSplicer.java b/Mage.Sets/src/mage/cards/b/BladeSplicer.java index a6290b2378e..63c117c3057 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSplicer.java +++ b/Mage.Sets/src/mage/cards/b/BladeSplicer.java @@ -38,7 +38,7 @@ public final class BladeSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); // Golem creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private BladeSplicer(final BladeSplicer card) { diff --git a/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java b/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java index 49dbd0104d0..0bbc3ff48e5 100644 --- a/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java +++ b/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java @@ -42,7 +42,7 @@ public final class BladegraftAspirant extends CardImpl { this.addAbility(new MenaceAbility(false)); // Equipment spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Activated abilities of Equipment you control that target Bladegraft Aspirant cost {1} less to activate. diff --git a/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java b/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java index 9705acf5960..a3c22682573 100644 --- a/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java +++ b/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java @@ -39,7 +39,7 @@ public final class BladeholdWarWhip extends CardImpl { this.addAbility(ability); // Equipped creature has double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {3}{R}{W} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{3}{R}{W}"), false)); diff --git a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java index fef8d468180..2d650fcfc82 100644 --- a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java +++ b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java @@ -33,7 +33,7 @@ public final class BladewingsThrall extends CardImpl { this.toughness = new MageInt(3); // Bladewing's Thrall has flying as long as you control a Dragon. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(SubType.DRAGON, "a Dragon")), RULE))); diff --git a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java index 9927bb684b3..00eabb0939a 100644 --- a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java @@ -36,7 +36,7 @@ public final class BlanchwoodArmor extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } private BlanchwoodArmor(final BlanchwoodArmor card) { diff --git a/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java b/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java index 1d3f1af3519..6ab3136bba9 100644 --- a/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java +++ b/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java @@ -44,11 +44,11 @@ public final class BlazethornScarecrow extends CardImpl { // Blazethorn Scarecrow has haste as long as you control a red creature. ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Blazethorn Scarecrow has wither as long as you control a green creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/b/BlazingArchon.java b/Mage.Sets/src/mage/cards/b/BlazingArchon.java index fd1d14f6471..da8c89e24f9 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingArchon.java +++ b/Mage.Sets/src/mage/cards/b/BlazingArchon.java @@ -29,7 +29,7 @@ public final class BlazingArchon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creatures can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/b/BlessedOrator.java b/Mage.Sets/src/mage/cards/b/BlessedOrator.java index 7340bba3eb2..afbb46b2a05 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedOrator.java +++ b/Mage.Sets/src/mage/cards/b/BlessedOrator.java @@ -27,7 +27,7 @@ public final class BlessedOrator extends CardImpl { this.toughness = new MageInt(4); // Other creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, true))); } private BlessedOrator(final BlessedOrator card) { diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java index 14244bcea16..689320209fb 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java @@ -37,7 +37,7 @@ public final class BlessingOfTheNephilim extends CardImpl { // Enchanted creature gets +1/+1 for each of its colors. DynamicValue numberOfColors = new EnchantedCreatureColorsCount(); Effect effect = new BoostEnchantedEffect(numberOfColors, numberOfColors, Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BlessingOfTheNephilim(final BlessingOfTheNephilim card) { diff --git a/Mage.Sets/src/mage/cards/b/BlindWorship.java b/Mage.Sets/src/mage/cards/b/BlindWorship.java index 55566116726..063fc6b0282 100644 --- a/Mage.Sets/src/mage/cards/b/BlindWorship.java +++ b/Mage.Sets/src/mage/cards/b/BlindWorship.java @@ -39,7 +39,7 @@ public final class BlindWorship extends CardImpl { Ability attachedAbility = new AttacksTriggeredAbility(new BoostControlledEffect(SourcePermanentPowerValue.NOT_NEGATIVE, SourcePermanentPowerValue.NOT_NEGATIVE, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, true), false); Effect gainAbilityEffect = new GainAbilityAttachedEffect(attachedAbility, AttachmentType.AURA); gainAbilityEffect.setText("Enchanted creature has \"Whenever this creature attacks, each other creature you control gets +X/+X until end of turn, where X is this creature's power\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, gainAbilityEffect)); + this.addAbility(new SimpleStaticAbility(gainAbilityEffect)); } diff --git a/Mage.Sets/src/mage/cards/b/BloodFunnel.java b/Mage.Sets/src/mage/cards/b/BloodFunnel.java index 779652bbb54..1dd735916a9 100644 --- a/Mage.Sets/src/mage/cards/b/BloodFunnel.java +++ b/Mage.Sets/src/mage/cards/b/BloodFunnel.java @@ -32,7 +32,7 @@ public final class BloodFunnel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); // Noncreature spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2))); // Whenever you cast a noncreature spell, counter that spell unless you sacrifice a creature. Effect effect = new CounterUnlessPaysEffect(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/b/BloodMoon.java b/Mage.Sets/src/mage/cards/b/BloodMoon.java index 2a8b6ee791f..40b3f9a2b23 100644 --- a/Mage.Sets/src/mage/cards/b/BloodMoon.java +++ b/Mage.Sets/src/mage/cards/b/BloodMoon.java @@ -23,7 +23,7 @@ public final class BloodMoon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // Nonbasic lands are Mountains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodMoonEffect())); + this.addAbility(new SimpleStaticAbility(new BloodMoonEffect())); } private BloodMoon(final BloodMoon card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodScrivener.java b/Mage.Sets/src/mage/cards/b/BloodScrivener.java index d90ffecad16..3518b122750 100644 --- a/Mage.Sets/src/mage/cards/b/BloodScrivener.java +++ b/Mage.Sets/src/mage/cards/b/BloodScrivener.java @@ -30,7 +30,7 @@ public final class BloodScrivener extends CardImpl { this.toughness = new MageInt(1); // If you would draw a card while you have no cards in hand, instead draw two cards and lose 1 life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodScrivenerReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new BloodScrivenerReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BloodSun.java b/Mage.Sets/src/mage/cards/b/BloodSun.java index aabd79a4215..57c3b169d85 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSun.java +++ b/Mage.Sets/src/mage/cards/b/BloodSun.java @@ -30,7 +30,7 @@ public final class BloodSun extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // All lands lose all abilities except mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodSunEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BloodSunEffect(Duration.WhileOnBattlefield))); } private BloodSun(final BloodSun card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java b/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java index e98a69f885d..3a056fc56fe 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java +++ b/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java @@ -29,7 +29,7 @@ public final class BloodcrazedGoblin extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodcrazedGoblinEffect())); + this.addAbility(new SimpleStaticAbility(new BloodcrazedGoblinEffect())); } private BloodcrazedGoblin(final BloodcrazedGoblin card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java b/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java index d50be0e4f9f..7be16f31ce1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java +++ b/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java @@ -32,7 +32,7 @@ public final class BloodforgedBattleAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Whenever equipped creature deals combat damage to a player, create a token that's a copy of Bloodforged War Axe. this.addAbility(new BloodforgedBattleAxeAbility()); diff --git a/Mage.Sets/src/mage/cards/b/Bloodghast.java b/Mage.Sets/src/mage/cards/b/Bloodghast.java index 2e832b9b9d8..b14159daa9e 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodghast.java +++ b/Mage.Sets/src/mage/cards/b/Bloodghast.java @@ -32,7 +32,7 @@ public final class Bloodghast extends CardImpl { this.addAbility(new CantBlockAbility()); // Bloodghast has haste as long as an opponent has 10 or less life. ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new LifeCompareCondition(TargetController.OPPONENT, ComparisonType.OR_LESS, 10), "{this} has haste as long as an opponent has 10 or less life"))); // Landfall — Whenever a land you control enters, you may return Bloodghast from your graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java b/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java index b2088e731a2..d4c66fc0db1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java +++ b/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java @@ -36,7 +36,7 @@ public final class BloodmarkMentor extends CardImpl { this.toughness = new MageInt(1); // Red creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private BloodmarkMentor(final BloodmarkMentor card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java b/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java index 1a2bc183a64..6208b825a84 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java +++ b/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java @@ -33,7 +33,7 @@ public final class BloodsporeThrinax extends CardImpl { this.addAbility(new DevourAbility(1)); // Each other creature you control enters the battlefield with an additional X +1/+1 counters on it, where X is the number of +1/+1 counters on Bloodspire Thrinax. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodsporeThrinaxEntersBattlefieldEffect())); + this.addAbility(new SimpleStaticAbility(new BloodsporeThrinaxEntersBattlefieldEffect())); } private BloodsporeThrinax(final BloodsporeThrinax card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java index 9801b696564..0bcfa741380 100644 --- a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java +++ b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java @@ -40,7 +40,7 @@ public final class BloodswornSteward extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Commander creatures you control get +2/+2 and have haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/b/BlueScarab.java b/Mage.Sets/src/mage/cards/b/BlueScarab.java index 97f8f587032..72c77add772 100644 --- a/Mage.Sets/src/mage/cards/b/BlueScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlueScarab.java @@ -48,11 +48,11 @@ public final class BlueScarab extends CardImpl { // Enchanted creature can't be blocked by blue creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a blue permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a blue permanent"))); diff --git a/Mage.Sets/src/mage/cards/b/BlurSliver.java b/Mage.Sets/src/mage/cards/b/BlurSliver.java index 6ce764dfcec..c795ac4d602 100644 --- a/Mage.Sets/src/mage/cards/b/BlurSliver.java +++ b/Mage.Sets/src/mage/cards/b/BlurSliver.java @@ -28,7 +28,7 @@ public final class BlurSliver extends CardImpl { this.toughness = new MageInt(2); // Sliver creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent(SubType.SLIVER, "Sliver creatures you control")))); diff --git a/Mage.Sets/src/mage/cards/b/BoarUmbra.java b/Mage.Sets/src/mage/cards/b/BoarUmbra.java index 3c77f3e7a16..d4ee1a2319b 100644 --- a/Mage.Sets/src/mage/cards/b/BoarUmbra.java +++ b/Mage.Sets/src/mage/cards/b/BoarUmbra.java @@ -33,7 +33,7 @@ public final class BoarUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/b/BoartuskLiege.java b/Mage.Sets/src/mage/cards/b/BoartuskLiege.java index d0dbca04bba..f2e100d061e 100644 --- a/Mage.Sets/src/mage/cards/b/BoartuskLiege.java +++ b/Mage.Sets/src/mage/cards/b/BoartuskLiege.java @@ -39,9 +39,9 @@ public final class BoartuskLiege extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRed, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRed, true))); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); } private BoartuskLiege(final BoartuskLiege card) { diff --git a/Mage.Sets/src/mage/cards/b/BogSerpent.java b/Mage.Sets/src/mage/cards/b/BogSerpent.java index ea66f12f86e..e56063147da 100644 --- a/Mage.Sets/src/mage/cards/b/BogSerpent.java +++ b/Mage.Sets/src/mage/cards/b/BogSerpent.java @@ -28,7 +28,7 @@ public final class BogSerpent extends CardImpl { this.toughness = new MageInt(5); // Bog Serpent can't attack unless defending player controls a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.SWAMP, "a Swamp")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.SWAMP, "a Swamp")))); // When you control no Swamps, sacrifice Bog Serpent. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java b/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java index adcb2533f6a..e4208cec87b 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java +++ b/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java @@ -36,7 +36,7 @@ public final class BoggartSpriteChaser extends CardImpl { FilterPermanent filter = new FilterPermanent(SubType.FAERIE, "Faerie"); Effect effect = new BoostSourceWhileControlsEffect(filter, 1, 1); effect.setText("As long as you control a Faerie, {this} gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "and has flying")); diff --git a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java index 7e8701b5dba..50abbf96a79 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java @@ -40,7 +40,7 @@ public final class BondsOfQuicksilver extends CardImpl { this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BoneSaw.java b/Mage.Sets/src/mage/cards/b/BoneSaw.java index 7e873c41178..6fc407aeed3 100644 --- a/Mage.Sets/src/mage/cards/b/BoneSaw.java +++ b/Mage.Sets/src/mage/cards/b/BoneSaw.java @@ -23,7 +23,7 @@ public final class BoneSaw extends CardImpl { public BoneSaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/b/Bonesplitter.java b/Mage.Sets/src/mage/cards/b/Bonesplitter.java index 6069f3f37f9..8ba756d6fc6 100644 --- a/Mage.Sets/src/mage/cards/b/Bonesplitter.java +++ b/Mage.Sets/src/mage/cards/b/Bonesplitter.java @@ -23,7 +23,7 @@ public final class Bonesplitter extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/b/BontusMonument.java b/Mage.Sets/src/mage/cards/b/BontusMonument.java index bcf823b7e54..5f707a24b1c 100644 --- a/Mage.Sets/src/mage/cards/b/BontusMonument.java +++ b/Mage.Sets/src/mage/cards/b/BontusMonument.java @@ -38,7 +38,7 @@ public final class BontusMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Black creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast a creature spell, each opponent loses 1 life and you gain 1 life. Ability ability = new SpellCastControllerTriggeredAbility(new LoseLifeOpponentsEffect(1), StaticFilters.FILTER_SPELL_A_CREATURE, false); diff --git a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java index e0a36bebe42..a62a9baec8f 100644 --- a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java +++ b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java @@ -31,7 +31,7 @@ public final class BoonOfEmrakul extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/-3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, -3, Duration.WhileOnBattlefield))); } private BoonOfEmrakul(final BoonOfEmrakul card) { diff --git a/Mage.Sets/src/mage/cards/b/BoonReflection.java b/Mage.Sets/src/mage/cards/b/BoonReflection.java index 9e963f0bcbe..b377bebe77a 100644 --- a/Mage.Sets/src/mage/cards/b/BoonReflection.java +++ b/Mage.Sets/src/mage/cards/b/BoonReflection.java @@ -24,7 +24,7 @@ public final class BoonReflection extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}"); // If you would gain life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoonReflectionEffect())); + this.addAbility(new SimpleStaticAbility(new BoonReflectionEffect())); } private BoonReflection(final BoonReflection card) { diff --git a/Mage.Sets/src/mage/cards/b/BoonSatyr.java b/Mage.Sets/src/mage/cards/b/BoonSatyr.java index 3c62ace58e8..c90ef65a50a 100644 --- a/Mage.Sets/src/mage/cards/b/BoonSatyr.java +++ b/Mage.Sets/src/mage/cards/b/BoonSatyr.java @@ -32,7 +32,7 @@ public final class BoonSatyr extends CardImpl { // Bestow {3}{G}{G} this.addAbility(new BestowAbility(this, "{3}{G}{G}")); // Enchanted creature gets +4/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(4,2, Duration.WhileOnBattlefield))); } private BoonSatyr(final BoonSatyr card) { diff --git a/Mage.Sets/src/mage/cards/b/BoskBanneret.java b/Mage.Sets/src/mage/cards/b/BoskBanneret.java index bc5d0630125..1144dfe4fe9 100644 --- a/Mage.Sets/src/mage/cards/b/BoskBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BoskBanneret.java @@ -35,7 +35,7 @@ public final class BoskBanneret extends CardImpl { this.toughness = new MageInt(3); // Treefolk spells and Shaman spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private BoskBanneret(final BoskBanneret card) { diff --git a/Mage.Sets/src/mage/cards/b/BouncingBeebles.java b/Mage.Sets/src/mage/cards/b/BouncingBeebles.java index 9e7d3ebec56..932de87ccf5 100644 --- a/Mage.Sets/src/mage/cards/b/BouncingBeebles.java +++ b/Mage.Sets/src/mage/cards/b/BouncingBeebles.java @@ -33,7 +33,7 @@ public final class BouncingBeebles extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(new FilterArtifactPermanent())); effect.setText("{this} can't be blocked as long as defending player controls an artifact"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BouncingBeebles(final BouncingBeebles card) { diff --git a/Mage.Sets/src/mage/cards/b/BoundInSilence.java b/Mage.Sets/src/mage/cards/b/BoundInSilence.java index edb7ec78b05..89effe1f65b 100644 --- a/Mage.Sets/src/mage/cards/b/BoundInSilence.java +++ b/Mage.Sets/src/mage/cards/b/BoundInSilence.java @@ -31,7 +31,7 @@ public final class BoundInSilence extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } private BoundInSilence(final BoundInSilence card) { diff --git a/Mage.Sets/src/mage/cards/b/BountySpotter.java b/Mage.Sets/src/mage/cards/b/BountySpotter.java index d2818f63054..3345880dc9a 100644 --- a/Mage.Sets/src/mage/cards/b/BountySpotter.java +++ b/Mage.Sets/src/mage/cards/b/BountySpotter.java @@ -33,7 +33,7 @@ public final class BountySpotter extends CardImpl { this.toughness = new MageInt(2); // Bounty Spotter doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {T}: Put a bounty counter on target creature an opponent controls. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BowerPassage.java b/Mage.Sets/src/mage/cards/b/BowerPassage.java index e6dc5bd216f..72df348c547 100644 --- a/Mage.Sets/src/mage/cards/b/BowerPassage.java +++ b/Mage.Sets/src/mage/cards/b/BowerPassage.java @@ -24,7 +24,7 @@ public final class BowerPassage extends CardImpl { // Creatures with flying can't block creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BowerPassageEffect())); + this.addAbility(new SimpleStaticAbility(new BowerPassageEffect())); } private BowerPassage(final BowerPassage card) { diff --git a/Mage.Sets/src/mage/cards/b/Brainwash.java b/Mage.Sets/src/mage/cards/b/Brainwash.java index 8739d170403..2e73e6fab70 100644 --- a/Mage.Sets/src/mage/cards/b/Brainwash.java +++ b/Mage.Sets/src/mage/cards/b/Brainwash.java @@ -33,7 +33,7 @@ public final class Brainwash extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack unless its controller pays {3}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java b/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java index 9b13aba3bd4..5cf0a45a4d9 100644 --- a/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java +++ b/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java @@ -41,7 +41,7 @@ public final class BrandOfIllOmen extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{R}"))); // Enchanted creature's controller can't cast creature spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BrandOfIllOmenEffect())); + this.addAbility(new SimpleStaticAbility(new BrandOfIllOmenEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java index 509eab88bc9..907970014ca 100644 --- a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java +++ b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java @@ -39,10 +39,10 @@ public final class BrandedBrawlers extends CardImpl { this.toughness = new MageInt(2); // Branded Brawlers can't attack if defending player controls an untapped land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackIfDefenderControlsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackIfDefenderControlsPermanent(filter))); // Branded Brawlers can't block if you control an untapped land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BrandedBrawlersCantBlockEffect(filter))); + this.addAbility(new SimpleStaticAbility(new BrandedBrawlersCantBlockEffect(filter))); } private BrandedBrawlers(final BrandedBrawlers card) { diff --git a/Mage.Sets/src/mage/cards/b/BrassGnat.java b/Mage.Sets/src/mage/cards/b/BrassGnat.java index e953259c031..3e61dccac2f 100644 --- a/Mage.Sets/src/mage/cards/b/BrassGnat.java +++ b/Mage.Sets/src/mage/cards/b/BrassGnat.java @@ -31,7 +31,7 @@ public final class BrassGnat extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Brass Gnat doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Gnat. this.addAbility(new BeginningOfUpkeepTriggeredAbility( new DoIfCostPaid(new UntapSourceEffect(), new GenericManaCost(1)) diff --git a/Mage.Sets/src/mage/cards/b/BrassHerald.java b/Mage.Sets/src/mage/cards/b/BrassHerald.java index 4f5dd3c4766..440b934c16a 100644 --- a/Mage.Sets/src/mage/cards/b/BrassHerald.java +++ b/Mage.Sets/src/mage/cards/b/BrassHerald.java @@ -37,7 +37,7 @@ public final class BrassHerald extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BrassHeraldEntersEffect())); // Creatures of the chosen type get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, false))); } private BrassHerald(final BrassHerald card) { diff --git a/Mage.Sets/src/mage/cards/b/BrassMan.java b/Mage.Sets/src/mage/cards/b/BrassMan.java index 5d625029a0d..5e56a966663 100644 --- a/Mage.Sets/src/mage/cards/b/BrassMan.java +++ b/Mage.Sets/src/mage/cards/b/BrassMan.java @@ -29,7 +29,7 @@ public final class BrassMan extends CardImpl { this.toughness = new MageInt(3); // Brass Man doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Man. this.addAbility(new BeginningOfUpkeepTriggeredAbility( new DoIfCostPaid(new UntapSourceEffect(), new GenericManaCost(1)) diff --git a/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java index c4f97ef7869..4a9f4ba04b8 100644 --- a/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java +++ b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java @@ -33,7 +33,7 @@ public final class BrassclawOrcs extends CardImpl { this.toughness = new MageInt(2); // Brassclaw Orcs can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/b/Bravado.java b/Mage.Sets/src/mage/cards/b/Bravado.java index 8b261c03a54..5d8114d786d 100644 --- a/Mage.Sets/src/mage/cards/b/Bravado.java +++ b/Mage.Sets/src/mage/cards/b/Bravado.java @@ -36,7 +36,7 @@ public final class Bravado extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 for each other creature you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BravadoBoostEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new BravadoBoostEnchantedEffect())); } private Bravado(final Bravado card) { diff --git a/Mage.Sets/src/mage/cards/b/BraveTheSands.java b/Mage.Sets/src/mage/cards/b/BraveTheSands.java index 41427ab3a12..2bcc675c293 100644 --- a/Mage.Sets/src/mage/cards/b/BraveTheSands.java +++ b/Mage.Sets/src/mage/cards/b/BraveTheSands.java @@ -24,10 +24,10 @@ public final class BraveTheSands extends CardImpl { // Creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); // Each creature you control can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield))); } private BraveTheSands(final BraveTheSands card) { diff --git a/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java b/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java index ad007e88b77..f5826acee5c 100644 --- a/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java +++ b/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java @@ -25,7 +25,7 @@ public final class BreakerOfArmies extends CardImpl { this.toughness = new MageInt(8); // All creatures able to block Breaker of Armies do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); } private BreakerOfArmies(final BreakerOfArmies card) { diff --git a/Mage.Sets/src/mage/cards/b/BreathOfDreams.java b/Mage.Sets/src/mage/cards/b/BreathOfDreams.java index b386cdcfe9a..14961993bd4 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfDreams.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfDreams.java @@ -34,7 +34,7 @@ public final class BreathOfDreams extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{U}"))); // Green creatures have "Cumulative upkeep {1}." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")), Duration.WhileOnBattlefield, filter))); } private BreathOfDreams(final BreathOfDreams card) { diff --git a/Mage.Sets/src/mage/cards/b/BriarShield.java b/Mage.Sets/src/mage/cards/b/BriarShield.java index f5606220c67..d8b4743be75 100644 --- a/Mage.Sets/src/mage/cards/b/BriarShield.java +++ b/Mage.Sets/src/mage/cards/b/BriarShield.java @@ -32,7 +32,7 @@ public final class BriarShield extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice Briar Shield: Enchanted creature gets +3/+3 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java index edbe30cab86..37b06ae6e8d 100644 --- a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java +++ b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java @@ -51,7 +51,7 @@ public final class BriarberryCohort extends CardImpl { // Briarberry Cohort gets +1/+1 as long as you control another blue creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java index 54c5fedb3ea..cb8a95ac6e6 100644 --- a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java @@ -36,7 +36,7 @@ public final class BrighthearthBanneret extends CardImpl { this.toughness = new MageInt(1); // Elemental spells and Warrior spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Reinforce 1-{1}{R} this.addAbility(new ReinforceAbility(1, new ManaCostsImpl<>("{1}{R}"))); diff --git a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java index f814b252ada..0f04bab6c71 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java @@ -33,7 +33,7 @@ public final class BrilliantHalo extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); // When Brilliant Halo is put into a graveyard from the battlefield, return Brilliant Halo to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BristlingBoar.java b/Mage.Sets/src/mage/cards/b/BristlingBoar.java index b71ccf7d0b6..98fd0e503ab 100644 --- a/Mage.Sets/src/mage/cards/b/BristlingBoar.java +++ b/Mage.Sets/src/mage/cards/b/BristlingBoar.java @@ -24,7 +24,7 @@ public final class BristlingBoar extends CardImpl { this.toughness = new MageInt(3); // Bristling Boar can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private BristlingBoar(final BristlingBoar card) { diff --git a/Mage.Sets/src/mage/cards/b/Broodwarden.java b/Mage.Sets/src/mage/cards/b/Broodwarden.java index 50db1fe1bea..cadb69d1941 100644 --- a/Mage.Sets/src/mage/cards/b/Broodwarden.java +++ b/Mage.Sets/src/mage/cards/b/Broodwarden.java @@ -33,7 +33,7 @@ public final class Broodwarden extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); // Eldrazi Spawn creatures you control get +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false))); } private Broodwarden(final Broodwarden card) { diff --git a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java index be87db6713d..eb39673f1a5 100644 --- a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java +++ b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java @@ -44,7 +44,7 @@ public final class BrudicladTelchorEngineer extends CardImpl { this.toughness = new MageInt(4); // Creature tokens you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // At the beginning of combat on your turn, create a 2/1 blue Myr artifact creature token. Then you may choose a token you control. If you do, each other token you control becomes a copy of that token. this.addAbility(new BeginningOfCombatTriggeredAbility(new BrudicladTelchorEngineerEffect())); diff --git a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java index 3410e5134ea..29baaf407d5 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java +++ b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java @@ -25,7 +25,7 @@ public final class BrutalSuppression extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{R}"); // Activated abilities of nontoken Rebels cost an additional "Sacrifice a land" to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BrutalSuppressionAdditionalCostEffect())); + this.addAbility(new SimpleStaticAbility(new BrutalSuppressionAdditionalCostEffect())); } private BrutalSuppression(final BrutalSuppression card) { diff --git a/Mage.Sets/src/mage/cards/b/BubbleMatrix.java b/Mage.Sets/src/mage/cards/b/BubbleMatrix.java index 99ab139bf7a..8fd4a477445 100644 --- a/Mage.Sets/src/mage/cards/b/BubbleMatrix.java +++ b/Mage.Sets/src/mage/cards/b/BubbleMatrix.java @@ -20,7 +20,7 @@ public final class BubbleMatrix extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Prevent all damage that would be dealt to creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } private BubbleMatrix(final BubbleMatrix card) { diff --git a/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java b/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java index 7e305c24e69..6e921cba2c3 100644 --- a/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java +++ b/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java @@ -36,7 +36,7 @@ public final class BubbleSmuggler extends CardImpl { // As Bubble Smuggler is turned face up, put four +1/+1 counters on it. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)); effect.setText("put four +1/+1 counters on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AsTurnedFaceUpEffect(effect, false)); + Ability ability = new SimpleStaticAbility(new AsTurnedFaceUpEffect(effect, false)); ability.setWorksFaceDown(true); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BubblingBeebles.java b/Mage.Sets/src/mage/cards/b/BubblingBeebles.java index 2a8fbef44b2..c7c99cf0287 100644 --- a/Mage.Sets/src/mage/cards/b/BubblingBeebles.java +++ b/Mage.Sets/src/mage/cards/b/BubblingBeebles.java @@ -33,7 +33,7 @@ public final class BubblingBeebles extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(StaticFilters.FILTER_PERMANENT_ENCHANTMENT)); effect.setText("{this} can't be blocked as long as defending player controls an enchantment"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BubblingBeebles(final BubblingBeebles card) { diff --git a/Mage.Sets/src/mage/cards/b/Buoyancy.java b/Mage.Sets/src/mage/cards/b/Buoyancy.java index 6b619cb403f..55b20dcdc29 100644 --- a/Mage.Sets/src/mage/cards/b/Buoyancy.java +++ b/Mage.Sets/src/mage/cards/b/Buoyancy.java @@ -37,7 +37,7 @@ public final class Buoyancy extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private Buoyancy(final Buoyancy card) { diff --git a/Mage.Sets/src/mage/cards/b/BurningAnger.java b/Mage.Sets/src/mage/cards/b/BurningAnger.java index 8215745859e..bb80db5080c 100644 --- a/Mage.Sets/src/mage/cards/b/BurningAnger.java +++ b/Mage.Sets/src/mage/cards/b/BurningAnger.java @@ -43,7 +43,7 @@ public final class BurningAnger extends CardImpl { effect.setText("{this} deals damage equal to its power to any target"); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals damage equal to its power to any target.\""))); } diff --git a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java index 4a04642d72c..edfd66a7031 100644 --- a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java +++ b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java @@ -27,7 +27,7 @@ public final class ButchersCleaver extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); // As long as equipped creature is a Human, it has lifelink. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, -- 2.47.2 From 145ce7d1edbd23a7ed62c51b86e51b34b34c1f4b Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:10:37 -0500 Subject: [PATCH 11/50] refactor: SimpleStaticAbility default zone (cards C) --- Mage.Sets/src/mage/cards/c/CagedSun.java | 2 +- Mage.Sets/src/mage/cards/c/CairnWanderer.java | 2 +- Mage.Sets/src/mage/cards/c/CallForUnity.java | 2 +- Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java | 2 +- Mage.Sets/src/mage/cards/c/CallToServe.java | 2 +- Mage.Sets/src/mage/cards/c/CallousGiant.java | 2 +- Mage.Sets/src/mage/cards/c/CalmingLicid.java | 2 +- Mage.Sets/src/mage/cards/c/Camel.java | 2 +- Mage.Sets/src/mage/cards/c/CandlelightVigil.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenStandard.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainsClaws.java | 3 +-- Mage.Sets/src/mage/cards/c/CaptainsHook.java | 2 +- Mage.Sets/src/mage/cards/c/CaptivatingVampire.java | 2 +- Mage.Sets/src/mage/cards/c/CaptureSphere.java | 2 +- Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java | 2 +- Mage.Sets/src/mage/cards/c/Carapace.java | 2 +- Mage.Sets/src/mage/cards/c/CarboniteChamber.java | 4 ++-- Mage.Sets/src/mage/cards/c/CaribouRange.java | 2 +- Mage.Sets/src/mage/cards/c/CarryAway.java | 2 +- Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java | 2 +- Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java | 2 +- Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java | 2 +- Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java | 2 +- Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java | 2 +- Mage.Sets/src/mage/cards/c/CastIntoDarkness.java | 2 +- Mage.Sets/src/mage/cards/c/CastawaysDespair.java | 2 +- Mage.Sets/src/mage/cards/c/CastleRaptors.java | 2 +- Mage.Sets/src/mage/cards/c/CatalystStone.java | 4 ++-- Mage.Sets/src/mage/cards/c/CathedralOfSerra.java | 2 +- Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java | 2 +- Mage.Sets/src/mage/cards/c/CausticTar.java | 2 +- Mage.Sets/src/mage/cards/c/CaveSense.java | 2 +- Mage.Sets/src/mage/cards/c/CavernLampad.java | 2 +- Mage.Sets/src/mage/cards/c/CavernsOfDespair.java | 4 ++-- Mage.Sets/src/mage/cards/c/CelestialArchon.java | 2 +- Mage.Sets/src/mage/cards/c/CelestialCrusader.java | 2 +- Mage.Sets/src/mage/cards/c/CelestialDawn.java | 6 +++--- Mage.Sets/src/mage/cards/c/CelestialMantle.java | 2 +- Mage.Sets/src/mage/cards/c/CemeteryReaper.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurOmenreader.java | 2 +- Mage.Sets/src/mage/cards/c/Cessation.java | 2 +- Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java | 2 +- Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java | 2 +- Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java | 2 +- Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java | 2 +- Mage.Sets/src/mage/cards/c/ChampionsHelm.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java | 2 +- Mage.Sets/src/mage/cards/c/ChaosImps.java | 4 ++-- Mage.Sets/src/mage/cards/c/Chaosphere.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChargingRhino.java | 2 +- Mage.Sets/src/mage/cards/c/ChargingTuskodon.java | 2 +- Mage.Sets/src/mage/cards/c/ChariotOfVictory.java | 2 +- Mage.Sets/src/mage/cards/c/ChiefEngineer.java | 2 +- Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java | 2 +- Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java | 2 +- Mage.Sets/src/mage/cards/c/Chill.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericMass.java | 2 +- Mage.Sets/src/mage/cards/c/ChirrutImwe.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChitinousCloak.java | 2 +- Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java | 2 +- Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java | 2 +- Mage.Sets/src/mage/cards/c/ChokingRestraints.java | 2 +- Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChosenByHeliod.java | 2 +- Mage.Sets/src/mage/cards/c/Chromanticore.java | 2 +- Mage.Sets/src/mage/cards/c/ChromaticLantern.java | 2 +- Mage.Sets/src/mage/cards/c/ChromaticOrrery.java | 4 ++-- Mage.Sets/src/mage/cards/c/CitanulHierophants.java | 2 +- Mage.Sets/src/mage/cards/c/CityOfSolitude.java | 2 +- Mage.Sets/src/mage/cards/c/CivicSaber.java | 3 +-- Mage.Sets/src/mage/cards/c/ClaimOfErebos.java | 2 +- Mage.Sets/src/mage/cards/c/ClamIAm.java | 2 +- Mage.Sets/src/mage/cards/c/ClashOfRealities.java | 4 ++-- Mage.Sets/src/mage/cards/c/Claustrophobia.java | 2 +- Mage.Sets/src/mage/cards/c/ClawsOfValakut.java | 2 +- Mage.Sets/src/mage/cards/c/ClingingDarkness.java | 2 +- Mage.Sets/src/mage/cards/c/CloakAndDagger.java | 2 +- Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java | 2 +- Mage.Sets/src/mage/cards/c/CloakOfMists.java | 2 +- Mage.Sets/src/mage/cards/c/Cloudform.java | 2 +- Mage.Sets/src/mage/cards/c/CloudreachCavalry.java | 2 +- Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java | 4 ++-- Mage.Sets/src/mage/cards/c/CoatOfArms.java | 2 +- Mage.Sets/src/mage/cards/c/CobbledWings.java | 2 +- Mage.Sets/src/mage/cards/c/Cocoon.java | 2 +- Mage.Sets/src/mage/cards/c/CoercedToKill.java | 2 +- Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java | 2 +- Mage.Sets/src/mage/cards/c/ColfenorsPlans.java | 6 +++--- Mage.Sets/src/mage/cards/c/CollectiveBlessing.java | 4 ++-- Mage.Sets/src/mage/cards/c/CollectiveRestraint.java | 2 +- Mage.Sets/src/mage/cards/c/ColossusOfSardia.java | 2 +- Mage.Sets/src/mage/cards/c/ComaVeil.java | 2 +- Mage.Sets/src/mage/cards/c/CommanderCody.java | 2 +- Mage.Sets/src/mage/cards/c/CommandersAuthority.java | 2 +- Mage.Sets/src/mage/cards/c/CompulsoryRest.java | 4 ++-- Mage.Sets/src/mage/cards/c/ConclavesBlessing.java | 2 +- Mage.Sets/src/mage/cards/c/ConduitOfRuin.java | 2 +- Mage.Sets/src/mage/cards/c/Confiscate.java | 2 +- Mage.Sets/src/mage/cards/c/Conquer.java | 2 +- Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java | 2 +- Mage.Sets/src/mage/cards/c/Conspiracy.java | 2 +- Mage.Sets/src/mage/cards/c/ConsumingFerocity.java | 2 +- Mage.Sets/src/mage/cards/c/ConsumingFervor.java | 2 +- Mage.Sets/src/mage/cards/c/ContainmentMembrane.java | 2 +- Mage.Sets/src/mage/cards/c/ContainmentPriest.java | 2 +- Mage.Sets/src/mage/cards/c/ContaminatedGround.java | 2 +- Mage.Sets/src/mage/cards/c/Contamination.java | 2 +- Mage.Sets/src/mage/cards/c/ControlMagic.java | 2 +- Mage.Sets/src/mage/cards/c/ControlledInstincts.java | 2 +- Mage.Sets/src/mage/cards/c/Conversion.java | 2 +- Mage.Sets/src/mage/cards/c/Conviction.java | 2 +- Mage.Sets/src/mage/cards/c/ConvincingMirage.java | 2 +- Mage.Sets/src/mage/cards/c/ConvulsingLicid.java | 2 +- Mage.Sets/src/mage/cards/c/Cooperation.java | 2 +- Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java | 2 +- Mage.Sets/src/mage/cards/c/CoralNet.java | 2 +- Mage.Sets/src/mage/cards/c/CoralhelmCommander.java | 2 +- Mage.Sets/src/mage/cards/c/CorneredMarket.java | 2 +- Mage.Sets/src/mage/cards/c/CorpsejackMenace.java | 2 +- Mage.Sets/src/mage/cards/c/CorrosiveMentor.java | 2 +- Mage.Sets/src/mage/cards/c/CorruptedConscience.java | 4 ++-- Mage.Sets/src/mage/cards/c/CorruptingLicid.java | 2 +- Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java | 4 ++-- Mage.Sets/src/mage/cards/c/CoverOfDarkness.java | 2 +- Mage.Sets/src/mage/cards/c/CoverOfWinter.java | 2 +- Mage.Sets/src/mage/cards/c/CowedByWisdom.java | 2 +- Mage.Sets/src/mage/cards/c/CrabappleCohort.java | 2 +- Mage.Sets/src/mage/cards/c/CracklingClub.java | 2 +- Mage.Sets/src/mage/cards/c/Crawlspace.java | 2 +- Mage.Sets/src/mage/cards/c/CreakwoodLiege.java | 4 ++-- Mage.Sets/src/mage/cards/c/Crevasse.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java | 2 +- Mage.Sets/src/mage/cards/c/Crosswinds.java | 2 +- Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrownHunterHireling.java | 2 +- Mage.Sets/src/mage/cards/c/CrownOfConvergence.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrownOfGondor.java | 2 +- Mage.Sets/src/mage/cards/c/CrucibleOfFire.java | 2 +- Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java | 2 +- Mage.Sets/src/mage/cards/c/Crusade.java | 2 +- Mage.Sets/src/mage/cards/c/CrusadingKnight.java | 2 +- Mage.Sets/src/mage/cards/c/CrusherZendikon.java | 2 +- Mage.Sets/src/mage/cards/c/CryptolithRite.java | 2 +- Mage.Sets/src/mage/cards/c/CrystallineNautilus.java | 2 +- Mage.Sets/src/mage/cards/c/CrystallineSliver.java | 2 +- Mage.Sets/src/mage/cards/c/Crystallization.java | 2 +- Mage.Sets/src/mage/cards/c/CultistsStaff.java | 2 +- Mage.Sets/src/mage/cards/c/CumberStone.java | 2 +- Mage.Sets/src/mage/cards/c/Cunning.java | 2 +- Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java | 2 +- Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java | 2 +- Mage.Sets/src/mage/cards/c/CursedFlesh.java | 2 +- Mage.Sets/src/mage/cards/c/CursedRack.java | 2 +- Mage.Sets/src/mage/cards/c/CursedTotem.java | 2 +- Mage.Sets/src/mage/cards/c/CustodyBattle.java | 2 +- Mage.Sets/src/mage/cards/c/CutthroatIlDal.java | 2 +- Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java | 2 +- Mage.Sets/src/mage/cards/c/CyclopsTyrant.java | 2 +- 158 files changed, 180 insertions(+), 182 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CagedSun.java b/Mage.Sets/src/mage/cards/c/CagedSun.java index 038a367d185..bd34452308f 100644 --- a/Mage.Sets/src/mage/cards/c/CagedSun.java +++ b/Mage.Sets/src/mage/cards/c/CagedSun.java @@ -32,7 +32,7 @@ public final class CagedSun extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Creatures you control of the chosen color get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CagedSunEffect2())); + this.addAbility(new SimpleStaticAbility(new CagedSunEffect2())); // Whenever a land's ability adds one or more mana of the chosen color, add one additional mana of that color. this.addAbility(new CagedSunTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CairnWanderer.java b/Mage.Sets/src/mage/cards/c/CairnWanderer.java index 631ce405073..4c6029497c5 100644 --- a/Mage.Sets/src/mage/cards/c/CairnWanderer.java +++ b/Mage.Sets/src/mage/cards/c/CairnWanderer.java @@ -33,7 +33,7 @@ public final class CairnWanderer extends CardImpl { this.addAbility(new ChangelingAbility()); // As long as a creature card with flying is in a graveyard, Cairn Wanderer has flying. The same is true for fear, first strike, double strike, deathtouch, haste, landwalk, lifelink, protection, reach, trample, shroud, and vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CairnWandererEffect())); + this.addAbility(new SimpleStaticAbility(new CairnWandererEffect())); } private CairnWanderer(final CairnWanderer card) { diff --git a/Mage.Sets/src/mage/cards/c/CallForUnity.java b/Mage.Sets/src/mage/cards/c/CallForUnity.java index 2dc68a3eacd..a6fdead9c67 100644 --- a/Mage.Sets/src/mage/cards/c/CallForUnity.java +++ b/Mage.Sets/src/mage/cards/c/CallForUnity.java @@ -40,7 +40,7 @@ public final class CallForUnity extends CardImpl { Effect effect = new BoostControlledEffect(new CountersSourceCount(CounterType.UNITY), new CountersSourceCount(CounterType.UNITY), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false); effect.setText("Creatures you control get +1/+1 for each unity counter on {this}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private CallForUnity(final CallForUnity card) { diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java b/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java index fb342a56be5..fa705881e8a 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java @@ -39,7 +39,7 @@ public final class CallOfTheFullMoon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+2 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CallToServe.java b/Mage.Sets/src/mage/cards/c/CallToServe.java index f015b5edda4..79343503e67 100644 --- a/Mage.Sets/src/mage/cards/c/CallToServe.java +++ b/Mage.Sets/src/mage/cards/c/CallToServe.java @@ -35,7 +35,7 @@ public final class CallToServe extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+2, has flying, and is an Angel in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(", has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CallousGiant.java b/Mage.Sets/src/mage/cards/c/CallousGiant.java index 66fe6a85a65..ae5bad00412 100644 --- a/Mage.Sets/src/mage/cards/c/CallousGiant.java +++ b/Mage.Sets/src/mage/cards/c/CallousGiant.java @@ -29,7 +29,7 @@ public final class CallousGiant extends CardImpl { this.toughness = new MageInt(4); // If a source would deal 3 or less damage to Callous Giant, prevent that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CallousGiantEffect())); + this.addAbility(new SimpleStaticAbility(new CallousGiantEffect())); } private CallousGiant(final CallousGiant card) { diff --git a/Mage.Sets/src/mage/cards/c/CalmingLicid.java b/Mage.Sets/src/mage/cards/c/CalmingLicid.java index 84aa30eacad..ce155e87cd2 100644 --- a/Mage.Sets/src/mage/cards/c/CalmingLicid.java +++ b/Mage.Sets/src/mage/cards/c/CalmingLicid.java @@ -31,7 +31,7 @@ public final class CalmingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.W), new ColoredManaCost(ColoredManaSymbol.W))); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); } private CalmingLicid(final CalmingLicid card) { diff --git a/Mage.Sets/src/mage/cards/c/Camel.java b/Mage.Sets/src/mage/cards/c/Camel.java index e68cf30be0a..fcec5bfd2c8 100644 --- a/Mage.Sets/src/mage/cards/c/Camel.java +++ b/Mage.Sets/src/mage/cards/c/Camel.java @@ -35,7 +35,7 @@ public final class Camel extends CardImpl { this.addAbility(BandingAbility.getInstance()); // As long as Camel is attacking, prevent all damage Deserts would deal to Camel and to creatures banded with Camel. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CamelEffect())); + this.addAbility(new SimpleStaticAbility(new CamelEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CandlelightVigil.java b/Mage.Sets/src/mage/cards/c/CandlelightVigil.java index fda0ebbd194..c75af151dac 100644 --- a/Mage.Sets/src/mage/cards/c/CandlelightVigil.java +++ b/Mage.Sets/src/mage/cards/c/CandlelightVigil.java @@ -40,7 +40,7 @@ public final class CandlelightVigil extends CardImpl { // Enchanted creature gets +3/+2 and has vigilance. Effect effect = new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +3/+2"); - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability2 = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText("and has vigilance"); ability2.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CapashenStandard.java b/Mage.Sets/src/mage/cards/c/CapashenStandard.java index 8e11f88f5ef..b6e6db81af7 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenStandard.java +++ b/Mage.Sets/src/mage/cards/c/CapashenStandard.java @@ -38,7 +38,7 @@ public final class CapashenStandard extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {2}, Sacrifice Capashen Standard: Draw a card. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CaptainsClaws.java b/Mage.Sets/src/mage/cards/c/CaptainsClaws.java index b8df40e9f70..98e41ba567d 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainsClaws.java +++ b/Mage.Sets/src/mage/cards/c/CaptainsClaws.java @@ -27,7 +27,7 @@ public final class CaptainsClaws extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature attacks, create a 1/1 white Kor Ally creature token tapped and attacking. this.addAbility(new AttacksAttachedTriggeredAbility(new CreateTokenEffect(new KorAllyToken(), 1, true, true))); // Equip {1} @@ -43,4 +43,3 @@ public final class CaptainsClaws extends CardImpl { return new CaptainsClaws(this); } } - diff --git a/Mage.Sets/src/mage/cards/c/CaptainsHook.java b/Mage.Sets/src/mage/cards/c/CaptainsHook.java index 16f32447e77..f7d25f900f5 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainsHook.java +++ b/Mage.Sets/src/mage/cards/c/CaptainsHook.java @@ -35,7 +35,7 @@ public final class CaptainsHook extends CardImpl { // Equipped creature gets +2/+0 Effect effect = new BoostEquippedEffect(2, 0); effect.setText("Equipped creature gets +2/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); // has menace, effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.EQUIPMENT); effect.setText(", has menace"); diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java index 9f9c542c323..2a2e358476f 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java @@ -42,7 +42,7 @@ public final class CaptivatingVampire extends CardImpl { this.toughness = new MageInt(2); // Other Vampire creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Tap five untapped Vampires you control: Gain control of target creature. It becomes a Vampire in addition to its other types. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CaptivatingVampireEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter2, true))); diff --git a/Mage.Sets/src/mage/cards/c/CaptureSphere.java b/Mage.Sets/src/mage/cards/c/CaptureSphere.java index e7f28f9f537..f5d9e487f7c 100644 --- a/Mage.Sets/src/mage/cards/c/CaptureSphere.java +++ b/Mage.Sets/src/mage/cards/c/CaptureSphere.java @@ -43,7 +43,7 @@ public final class CaptureSphere extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private CaptureSphere(final CaptureSphere card) { diff --git a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java index 4deae3cbd2d..7e4ed9447fe 100644 --- a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java +++ b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java @@ -43,7 +43,7 @@ public final class CapturedByTheConsulate extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // Whenever an opponent casts a spell, if it has a single target, change the target to enchanted creature if able. this.addAbility(new CapturedByTheConsulateTriggeredAbility(Zone.BATTLEFIELD, new CapturedByTheConsulateEffect())); diff --git a/Mage.Sets/src/mage/cards/c/Carapace.java b/Mage.Sets/src/mage/cards/c/Carapace.java index 87eb9e9a19d..a16077b3126 100644 --- a/Mage.Sets/src/mage/cards/c/Carapace.java +++ b/Mage.Sets/src/mage/cards/c/Carapace.java @@ -33,7 +33,7 @@ public final class Carapace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); // Sacrifice Carapace: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/c/CarboniteChamber.java b/Mage.Sets/src/mage/cards/c/CarboniteChamber.java index d9d6d8a5c5c..44228f3c2c0 100644 --- a/Mage.Sets/src/mage/cards/c/CarboniteChamber.java +++ b/Mage.Sets/src/mage/cards/c/CarboniteChamber.java @@ -43,10 +43,10 @@ public final class CarboniteChamber extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // It can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index fb14322c026..20d11dd93ed 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -51,7 +51,7 @@ public final class CaribouRange extends CardImpl { ability.addCost(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{W}{W}, {T}: Create a 0/1 white Caribou creature token.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Sacrifice a Caribou token: You gain 1 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new SacrificeTargetCost(filter))); diff --git a/Mage.Sets/src/mage/cards/c/CarryAway.java b/Mage.Sets/src/mage/cards/c/CarryAway.java index 02188998d84..8cdfda62ae9 100644 --- a/Mage.Sets/src/mage/cards/c/CarryAway.java +++ b/Mage.Sets/src/mage/cards/c/CarryAway.java @@ -42,7 +42,7 @@ public final class CarryAway extends CardImpl { ability = new EntersBattlefieldTriggeredAbility(new CarryAwayEffect()); this.addAbility(ability); // You control enchanted Equipment. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("Equipment"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("Equipment"))); } private CarryAway(final CarryAway card) { diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java b/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java index f993b3d1f0c..083bc926127 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java @@ -45,7 +45,7 @@ public final class CartoucheOfAmbition extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has lifelink. - ability =new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability =new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA); effect.setText("and has lifelink"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java b/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java index 17362e636bf..7986e2fb2b1 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java @@ -41,7 +41,7 @@ public final class CartoucheOfKnowledge extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature gets +1/+1 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java b/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java index 7273228be64..8078acc983a 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java @@ -42,7 +42,7 @@ public final class CartoucheOfSolidarity extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WarriorVigilantToken()))); // Enchanted creature gets +1/+1 and has first strike. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java b/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java index 0e3a0f8a44b..ba2f234c7de 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java @@ -47,7 +47,7 @@ public final class CartoucheOfStrength extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java b/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java index 36f23b6cf8c..18a33e9e41f 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java @@ -44,7 +44,7 @@ public final class CartoucheOfZeal extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has haste. - ability =new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability =new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA); effect.setText("and has haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java b/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java index 89ed547abb3..0be1326b071 100644 --- a/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java +++ b/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java @@ -36,7 +36,7 @@ public final class CastIntoDarkness extends CardImpl { // Enchanted creature gets -2/-0 and can't block. Effect effect = new BoostEnchantedEffect(-2,0, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets -2/-0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new CantBlockAttachedEffect(AttachmentType.AURA); effect.setText("and can't block"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CastawaysDespair.java b/Mage.Sets/src/mage/cards/c/CastawaysDespair.java index 7870389ca9d..3cee6e4e3fb 100644 --- a/Mage.Sets/src/mage/cards/c/CastawaysDespair.java +++ b/Mage.Sets/src/mage/cards/c/CastawaysDespair.java @@ -40,7 +40,7 @@ public final class CastawaysDespair extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private CastawaysDespair(final CastawaysDespair card) { diff --git a/Mage.Sets/src/mage/cards/c/CastleRaptors.java b/Mage.Sets/src/mage/cards/c/CastleRaptors.java index 2a80246e423..477ce757fdf 100644 --- a/Mage.Sets/src/mage/cards/c/CastleRaptors.java +++ b/Mage.Sets/src/mage/cards/c/CastleRaptors.java @@ -32,7 +32,7 @@ public final class CastleRaptors extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // As long as Castle Raptors is untapped, it gets +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(0, 2, Duration.WhileOnBattlefield), SourceTappedCondition.UNTAPPED, "As long as {this} is untapped, it gets +0/+2."))); } diff --git a/Mage.Sets/src/mage/cards/c/CatalystStone.java b/Mage.Sets/src/mage/cards/c/CatalystStone.java index 0471ca52986..142a0892b57 100644 --- a/Mage.Sets/src/mage/cards/c/CatalystStone.java +++ b/Mage.Sets/src/mage/cards/c/CatalystStone.java @@ -32,10 +32,10 @@ public final class CatalystStone extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Flashback costs you pay cost up to {2} less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CatalystStoneCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new CatalystStoneCostReductionEffect())); // Flashback costs your opponents pay cost {2} more. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CatalystStoneCostRaiseEffect())); + this.addAbility(new SimpleStaticAbility(new CatalystStoneCostRaiseEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CathedralOfSerra.java b/Mage.Sets/src/mage/cards/c/CathedralOfSerra.java index 72c8c2166e8..8468891061b 100644 --- a/Mage.Sets/src/mage/cards/c/CathedralOfSerra.java +++ b/Mage.Sets/src/mage/cards/c/CathedralOfSerra.java @@ -31,7 +31,7 @@ public final class CathedralOfSerra extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // White legendary creatures you control have "bands with other legendary creatures." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter) .withForceQuotes() )); diff --git a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java index f33f2284a78..5398f3de006 100644 --- a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java +++ b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java @@ -41,7 +41,7 @@ public final class CaughtInTheBrights extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // When a Vehicle you control attacks, exile enchanted creature. this.addAbility(new AttacksAllTriggeredAbility(new ExileAttachedEffect(), false, filter, SetTargetPointer.NONE, false).setTriggerPhrase("When a Vehicle you control attacks, ")); diff --git a/Mage.Sets/src/mage/cards/c/CausticTar.java b/Mage.Sets/src/mage/cards/c/CausticTar.java index faf14ceefde..072df12adab 100644 --- a/Mage.Sets/src/mage/cards/c/CausticTar.java +++ b/Mage.Sets/src/mage/cards/c/CausticTar.java @@ -38,7 +38,7 @@ public final class CausticTar extends CardImpl { // Enchanted land has "{T}: Target player loses 3 life." Ability tarAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new TapSourceCost()); tarAbility.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(tarAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(tarAbility, AttachmentType.AURA, Duration.WhileOnBattlefield,"Enchanted land has \"{T}: Target player loses 3 life.\""))); } diff --git a/Mage.Sets/src/mage/cards/c/CaveSense.java b/Mage.Sets/src/mage/cards/c/CaveSense.java index c523159b88c..9c8b31f647e 100644 --- a/Mage.Sets/src/mage/cards/c/CaveSense.java +++ b/Mage.Sets/src/mage/cards/c/CaveSense.java @@ -40,7 +40,7 @@ public final class CaveSense extends CardImpl { // Enchanted creature gets +1/+1 and has mountainwalk. Effect effect = new GainAbilityAttachedEffect(new MountainwalkAbility(), AttachmentType.AURA); effect.setText("and has mountainwalk"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CavernLampad.java b/Mage.Sets/src/mage/cards/c/CavernLampad.java index 60d9574f2d5..3809f8dc454 100644 --- a/Mage.Sets/src/mage/cards/c/CavernLampad.java +++ b/Mage.Sets/src/mage/cards/c/CavernLampad.java @@ -35,7 +35,7 @@ public final class CavernLampad extends CardImpl { // Intimidate this.addAbility(IntimidateAbility.getInstance()); // Enchanted creature gets +2/+2 and has intimidate. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2)); Effect effect = new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA); effect.setText("and has intimidate"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CavernsOfDespair.java b/Mage.Sets/src/mage/cards/c/CavernsOfDespair.java index e30ae9e09ec..9f5ee6610cd 100644 --- a/Mage.Sets/src/mage/cards/c/CavernsOfDespair.java +++ b/Mage.Sets/src/mage/cards/c/CavernsOfDespair.java @@ -25,10 +25,10 @@ public final class CavernsOfDespair extends CardImpl { this.supertype.add(SuperType.WORLD); // No more than two creatures can attack each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CavernsOfDespairAttackRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new CavernsOfDespairAttackRestrictionEffect())); // No more than two creatures can block each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CavernsOfDespairBlockRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new CavernsOfDespairBlockRestrictionEffect())); } private CavernsOfDespair(final CavernsOfDespair card) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialArchon.java b/Mage.Sets/src/mage/cards/c/CelestialArchon.java index f3cb0cf637a..3adced13454 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialArchon.java +++ b/Mage.Sets/src/mage/cards/c/CelestialArchon.java @@ -39,7 +39,7 @@ public final class CelestialArchon extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Enchanted creature gets +4/+4 and has flying and first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4,4)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(4,4)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CelestialCrusader.java b/Mage.Sets/src/mage/cards/c/CelestialCrusader.java index a937b6d87ea..b14cd70e098 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialCrusader.java +++ b/Mage.Sets/src/mage/cards/c/CelestialCrusader.java @@ -48,7 +48,7 @@ public final class CelestialCrusader extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other white creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private CelestialCrusader(final CelestialCrusader card) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialDawn.java b/Mage.Sets/src/mage/cards/c/CelestialDawn.java index c04dc9aa6bf..397cf682d29 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialDawn.java +++ b/Mage.Sets/src/mage/cards/c/CelestialDawn.java @@ -33,14 +33,14 @@ public final class CelestialDawn extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); // Lands you control are Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CelestialDawnToPlainsEffect())); + this.addAbility(new SimpleStaticAbility(new CelestialDawnToPlainsEffect())); // Nonland cards you own that aren't on the battlefield, spells you control, and nonland permanents you control are white. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CelestialDawnToWhiteEffect())); + this.addAbility(new SimpleStaticAbility(new CelestialDawnToWhiteEffect())); // You may spend white mana as though it were mana of any color. // You may spend other mana only as though it were colorless mana. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CelestialDawnSpendAnyManaEffect()); + Ability ability = new SimpleStaticAbility(new CelestialDawnSpendAnyManaEffect()); ability.addEffect(new CelestialDawnSpendColorlessManaEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CelestialMantle.java b/Mage.Sets/src/mage/cards/c/CelestialMantle.java index 41700d85229..f318f6e3a1c 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialMantle.java +++ b/Mage.Sets/src/mage/cards/c/CelestialMantle.java @@ -43,7 +43,7 @@ public final class CelestialMantle extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals combat damage to a player, double its controller's life total. this.addAbility(new CelestialMantleAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java index 73ceef64f44..acd3bf384e1 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java @@ -41,7 +41,7 @@ public final class CemeteryReaper extends CardImpl { this.toughness = new MageInt(2); // Other Zombie creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {2}{B}, {T} : Exile target creature card from a graveyard. Create a 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); diff --git a/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java b/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java index 3b4437eadd4..620712556f7 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java +++ b/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java @@ -38,7 +38,7 @@ public final class CentaurOmenreader extends CardImpl { this.toughness = new MageInt(3); // As long as Centaur Omenreader is tapped, creature spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CentaurOmenreaderSpellsCostReductionEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CentaurOmenreaderSpellsCostReductionEffect(filter))); } private CentaurOmenreader(final CentaurOmenreader card) { diff --git a/Mage.Sets/src/mage/cards/c/Cessation.java b/Mage.Sets/src/mage/cards/c/Cessation.java index 86b9875a8e9..596346e9f79 100644 --- a/Mage.Sets/src/mage/cards/c/Cessation.java +++ b/Mage.Sets/src/mage/cards/c/Cessation.java @@ -32,7 +32,7 @@ public final class Cessation extends CardImpl { this.addAbility(ability); //Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); //When Cessation is put into a graveyard from the battlefield, return Cessation to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java index 6b4a0f82516..b404b090605 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java +++ b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java @@ -52,7 +52,7 @@ public final class ChainerDementiaMaster extends CardImpl { this.toughness = new MageInt(3); // Nightmare creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterCreature, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterCreature, false))); // {B}{B}{B}, Pay 3 life: Put target creature card from a graveyard onto the battlefield under your control. That creature is black and is a Nightmare in addition to its other creature types. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChainerDementiaMasterEffect(), new ManaCostsImpl<>("{B}{B}{B}")); diff --git a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java index ca4add45d53..cc9d1b43296 100644 --- a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java +++ b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java @@ -26,7 +26,7 @@ public final class ChainsOfMephistopheles extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); // If a player would draw a card except the first one they draw in their draw step each turn, that player discards a card instead. If the player discards a card this way, they draw a card. If the player doesn't discard a card this way, they put the top card of their library into their graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChainsOfMephistophelesReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); + this.addAbility(new SimpleStaticAbility(new ChainsOfMephistophelesReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); } private ChainsOfMephistopheles(final ChainsOfMephistopheles card) { diff --git a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java index 6bb422cba54..eda43ffe3f9 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java +++ b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java @@ -41,7 +41,7 @@ public final class ChamberOfManipulation extends CardImpl { Ability controlAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn), new TapSourceCost()); controlAbility.addTarget(new TargetCreaturePermanent()); controlAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(controlAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(controlAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}, Discard a card: Gain control of target creature until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java index c33b76c72cb..8d84684d3d6 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java @@ -30,7 +30,7 @@ public final class ChampionOfLambholt extends CardImpl { this.toughness = new MageInt(1); // Creatures with power less than Champion of Lambholt's power can't block creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChampionOfLambholtEffect())); + this.addAbility(new SimpleStaticAbility(new ChampionOfLambholtEffect())); // Whenever another creature you control enters, put a +1/+1 counter on Champion of Lambholt. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/c/ChampionsHelm.java b/Mage.Sets/src/mage/cards/c/ChampionsHelm.java index fdd7e73830a..4b6d65ff192 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionsHelm.java +++ b/Mage.Sets/src/mage/cards/c/ChampionsHelm.java @@ -28,10 +28,10 @@ public final class ChampionsHelm extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // As long as equipped creature is legendary, it has hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSupertypeCondition(SuperType.LEGENDARY), staticText))); diff --git a/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java b/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java index 845d8786dfa..016eab45c90 100644 --- a/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java +++ b/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java @@ -34,7 +34,7 @@ public final class ChantOfTheSkifsang extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -13/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-13, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-13, 0, Duration.WhileOnBattlefield))); } private ChantOfTheSkifsang(final ChantOfTheSkifsang card) { diff --git a/Mage.Sets/src/mage/cards/c/ChaosImps.java b/Mage.Sets/src/mage/cards/c/ChaosImps.java index d60cc035bd0..c8fab63d494 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosImps.java +++ b/Mage.Sets/src/mage/cards/c/ChaosImps.java @@ -37,7 +37,7 @@ public final class ChaosImps extends CardImpl { this.addAbility(new UnleashAbility()); // Chaos Imps has trample as long as it has a +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1),"{this} has trample as long as it has a +1/+1 counter on it"))); @@ -51,4 +51,4 @@ public final class ChaosImps extends CardImpl { public ChaosImps copy() { return new ChaosImps(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/Chaosphere.java b/Mage.Sets/src/mage/cards/c/Chaosphere.java index 66cba7593d7..17888bde841 100644 --- a/Mage.Sets/src/mage/cards/c/Chaosphere.java +++ b/Mage.Sets/src/mage/cards/c/Chaosphere.java @@ -38,10 +38,10 @@ public final class Chaosphere extends CardImpl { this.supertype.add(SuperType.WORLD); // Creatures with flying can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChaosphereEffect())); + this.addAbility(new SimpleStaticAbility(new ChaosphereEffect())); // Creatures without flying have reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield, filterCreature, rule))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield, filterCreature, rule))); } diff --git a/Mage.Sets/src/mage/cards/c/ChargingRhino.java b/Mage.Sets/src/mage/cards/c/ChargingRhino.java index e543fa69006..a592d67508c 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingRhino.java +++ b/Mage.Sets/src/mage/cards/c/ChargingRhino.java @@ -25,7 +25,7 @@ public final class ChargingRhino extends CardImpl { this.toughness = new MageInt(4); // Charging Rhino can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private ChargingRhino(final ChargingRhino card) { diff --git a/Mage.Sets/src/mage/cards/c/ChargingTuskodon.java b/Mage.Sets/src/mage/cards/c/ChargingTuskodon.java index 0d98bd61a87..6fadfbd66b4 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingTuskodon.java +++ b/Mage.Sets/src/mage/cards/c/ChargingTuskodon.java @@ -36,7 +36,7 @@ public final class ChargingTuskodon extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // If Charging Tuskodon would deal combat damage to a player, it deals double that damage to that player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChargingTuskodonEffect())); + this.addAbility(new SimpleStaticAbility(new ChargingTuskodonEffect())); } private ChargingTuskodon(final ChargingTuskodon card) { diff --git a/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java b/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java index 441d278f56d..67cad8bc883 100644 --- a/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java +++ b/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java @@ -30,7 +30,7 @@ public final class ChariotOfVictory extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has first strike, trample, and haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText(", trample,"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/ChiefEngineer.java b/Mage.Sets/src/mage/cards/c/ChiefEngineer.java index 9ab8cfdcb71..26e2ef50542 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefEngineer.java +++ b/Mage.Sets/src/mage/cards/c/ChiefEngineer.java @@ -36,7 +36,7 @@ public final class ChiefEngineer extends CardImpl { this.toughness = new MageInt(3); // Artifact spells you cast have convoke. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(new ConvokeAbility(), filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect(new ConvokeAbility(), filter))); } private ChiefEngineer(final ChiefEngineer card) { diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java index 6f79471fb10..3d9c25a4952 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java @@ -34,7 +34,7 @@ public final class ChiefOfTheEdge extends CardImpl { this.toughness = new MageInt(2); // Other Warrior creatures you control get +1/+0 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } private ChiefOfTheEdge(final ChiefOfTheEdge card) { diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java index d6c847e6a19..67f21615ed8 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java @@ -34,7 +34,7 @@ public final class ChiefOfTheScale extends CardImpl { this.toughness = new MageInt(3); // Other Warrior creatures you control get +0/+1 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } private ChiefOfTheScale(final ChiefOfTheScale card) { diff --git a/Mage.Sets/src/mage/cards/c/Chill.java b/Mage.Sets/src/mage/cards/c/Chill.java index 609384ba9ed..af0615080a1 100644 --- a/Mage.Sets/src/mage/cards/c/Chill.java +++ b/Mage.Sets/src/mage/cards/c/Chill.java @@ -28,7 +28,7 @@ public final class Chill extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // Red spells cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY))); } private Chill(final Chill card) { diff --git a/Mage.Sets/src/mage/cards/c/ChimericMass.java b/Mage.Sets/src/mage/cards/c/ChimericMass.java index 76aabe80a40..757f09251ae 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericMass.java +++ b/Mage.Sets/src/mage/cards/c/ChimericMass.java @@ -34,7 +34,7 @@ public final class ChimericMass extends CardImpl { new CreatureToken(0, 0, "Construct artifact creature with \"This creature's power and toughness are each equal to the number of charge counters on it.\"") .withType(CardType.ARTIFACT) .withSubType(SubType.CONSTRUCT) - .withAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(count, Duration.WhileOnBattlefield))), + .withAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(count, Duration.WhileOnBattlefield))), CardType.ARTIFACT, Duration.EndOfTurn).withDurationRuleAtStart(true), new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java index d886ce602b8..cebfe7fabdc 100644 --- a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java +++ b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java @@ -38,7 +38,7 @@ public final class ChirrutImwe extends CardImpl { this.toughness = new MageInt(3); // Chirrut Imwe can block up to two additional creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChirrutImweEffect())); + this.addAbility(new SimpleStaticAbility(new ChirrutImweEffect())); // {1}{W}: Prevent all combat damage that would be dealt to Chirrut Imwe until end of turn. Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn); @@ -97,4 +97,4 @@ class ChirrutImweEffect extends ContinuousEffectImpl { public boolean hasLayer(Layer layer) { return layer == Layer.RulesEffects; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/ChitinousCloak.java b/Mage.Sets/src/mage/cards/c/ChitinousCloak.java index f4bbbaa1b85..0b4a336d908 100644 --- a/Mage.Sets/src/mage/cards/c/ChitinousCloak.java +++ b/Mage.Sets/src/mage/cards/c/ChitinousCloak.java @@ -29,7 +29,7 @@ public final class ChitinousCloak extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2 and has menace. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 2)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.EQUIPMENT); effect.setText("and has menace. (It can't be blocked except by two or more creatures.)"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java b/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java index b2be8836477..1097c60b3ab 100644 --- a/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java +++ b/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java @@ -27,7 +27,7 @@ public final class ChoMannoRevolutionary extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToSourceEffect(Duration.WhileOnBattlefield))); } private ChoMannoRevolutionary(final ChoMannoRevolutionary card) { diff --git a/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java b/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java index 9117ef8469a..e86c9c7b737 100644 --- a/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java +++ b/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java @@ -41,7 +41,7 @@ public final class ChoMannosBlessing extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Enchanted creature has protection from the chosen color. This effect doesn't remove Cho-Manno's Blessing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); } private ChoMannosBlessing(final ChoMannosBlessing card) { diff --git a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java index a1295bfbc2b..948760d7298 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java +++ b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java @@ -38,7 +38,7 @@ public final class ChokingRestraints extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // {3}{W}{W}, Sacrifice Choking Restraints: Exile enchanted creature. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAttachedEffect(), new ManaCostsImpl<>("{3}{W}{W}")); diff --git a/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java b/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java index 34ea358fdfe..37a915be9c8 100644 --- a/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java +++ b/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java @@ -38,8 +38,8 @@ public final class ChorusOfTheConclave extends CardImpl { this.addAbility(new ForestwalkAbility()); // As an additional cost to cast creature spells, you may pay any amount of mana. If you do, that creature enters the battlefield with that many additional +1/+1 counters on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChorusOfTheConclaveReplacementEffect())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChorusOfTheConclaveReplacementEffect2())); + this.addAbility(new SimpleStaticAbility(new ChorusOfTheConclaveReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ChorusOfTheConclaveReplacementEffect2())); } diff --git a/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java b/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java index 95ff44fe0a1..e01536df9f5 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java +++ b/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java @@ -41,7 +41,7 @@ public final class ChosenByHeliod extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); } private ChosenByHeliod(final ChosenByHeliod card) { diff --git a/Mage.Sets/src/mage/cards/c/Chromanticore.java b/Mage.Sets/src/mage/cards/c/Chromanticore.java index bb089e575fe..a2f03ae672e 100644 --- a/Mage.Sets/src/mage/cards/c/Chromanticore.java +++ b/Mage.Sets/src/mage/cards/c/Chromanticore.java @@ -42,7 +42,7 @@ public final class Chromanticore extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); // Enchanted creature gets +4/+4 and has flying, first strike, vigilance, trample and lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4,4)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(4,4)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/ChromaticLantern.java b/Mage.Sets/src/mage/cards/c/ChromaticLantern.java index 86980595755..db50ca986ef 100644 --- a/Mage.Sets/src/mage/cards/c/ChromaticLantern.java +++ b/Mage.Sets/src/mage/cards/c/ChromaticLantern.java @@ -21,7 +21,7 @@ public final class ChromaticLantern extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Lands you control have "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false))); // {T}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); diff --git a/Mage.Sets/src/mage/cards/c/ChromaticOrrery.java b/Mage.Sets/src/mage/cards/c/ChromaticOrrery.java index 6bcb13a8995..75389e5015d 100644 --- a/Mage.Sets/src/mage/cards/c/ChromaticOrrery.java +++ b/Mage.Sets/src/mage/cards/c/ChromaticOrrery.java @@ -30,7 +30,7 @@ public final class ChromaticOrrery extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // You may spend mana as though it were mana of any color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChromaticOrreryEffect())); + this.addAbility(new SimpleStaticAbility(new ChromaticOrreryEffect())); // {T}: Add {C}{C}{C}{C}{C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(5), new TapSourceCost())); @@ -81,4 +81,4 @@ class ChromaticOrreryEffect extends AsThoughEffectImpl implements AsThoughManaEf public ManaType getAsThoughManaType(ManaType manaType, ManaPoolItem mana, UUID affectedControllerId, Ability source, Game game) { return mana.getFirstAvailable(); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CitanulHierophants.java b/Mage.Sets/src/mage/cards/c/CitanulHierophants.java index 9396afda318..ce0ccf14214 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulHierophants.java +++ b/Mage.Sets/src/mage/cards/c/CitanulHierophants.java @@ -35,7 +35,7 @@ public final class CitanulHierophants extends CardImpl { this.toughness = new MageInt(2); //Creatures you control have "{T}: Add {G}." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new GreenManaAbility(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new GreenManaAbility(), Duration.WhileOnBattlefield, filter, false))); } private CitanulHierophants(final CitanulHierophants card) { diff --git a/Mage.Sets/src/mage/cards/c/CityOfSolitude.java b/Mage.Sets/src/mage/cards/c/CityOfSolitude.java index 2a1fe74702f..2502f43d73f 100644 --- a/Mage.Sets/src/mage/cards/c/CityOfSolitude.java +++ b/Mage.Sets/src/mage/cards/c/CityOfSolitude.java @@ -26,7 +26,7 @@ public final class CityOfSolitude extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // Players can cast spells and activate abilities only during their own turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CityOfSolitudeEffect())); + this.addAbility(new SimpleStaticAbility(new CityOfSolitudeEffect())); } private CityOfSolitude(final CityOfSolitude card) { diff --git a/Mage.Sets/src/mage/cards/c/CivicSaber.java b/Mage.Sets/src/mage/cards/c/CivicSaber.java index a8c7976c0de..7b41372b2b4 100644 --- a/Mage.Sets/src/mage/cards/c/CivicSaber.java +++ b/Mage.Sets/src/mage/cards/c/CivicSaber.java @@ -29,7 +29,7 @@ public final class CivicSaber extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0 for each of its colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new CivicSaberColorCount(), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(new CivicSaberColorCount(), StaticValue.get(0), Duration.WhileOnBattlefield))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), new TargetControlledCreaturePermanent(), false)); @@ -81,4 +81,3 @@ class CivicSaberColorCount implements DynamicValue { return "of its colors"; } } - \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java index c0cf04cedbd..4c2aff1899d 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java +++ b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java @@ -39,7 +39,7 @@ public final class ClaimOfErebos extends CardImpl { Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{1}{B}")); grantedAbility.addCost(new TapSourceCost()); grantedAbility.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/c/ClamIAm.java b/Mage.Sets/src/mage/cards/c/ClamIAm.java index 3960f1deb15..b8b5e5fc3c4 100644 --- a/Mage.Sets/src/mage/cards/c/ClamIAm.java +++ b/Mage.Sets/src/mage/cards/c/ClamIAm.java @@ -24,7 +24,7 @@ public final class ClamIAm extends CardImpl { this.toughness = new MageInt(2); // If you roll a 3 on a six-sided die, you may reroll that die. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ClamIAmEffect())); + this.addAbility(new SimpleStaticAbility(new ClamIAmEffect())); } private ClamIAm(final ClamIAm card) { diff --git a/Mage.Sets/src/mage/cards/c/ClashOfRealities.java b/Mage.Sets/src/mage/cards/c/ClashOfRealities.java index b0e0c8b6041..6d8f13d6c8e 100644 --- a/Mage.Sets/src/mage/cards/c/ClashOfRealities.java +++ b/Mage.Sets/src/mage/cards/c/ClashOfRealities.java @@ -39,12 +39,12 @@ public final class ClashOfRealities extends CardImpl { // All Spirits have "When this permanent enters the battlefield, you may have it deal 3 damage to target non-Spirit creature." Ability ability1 = new ClashOfRealitiesTriggeredAbility(new DamageTargetEffect(3), "When this permanent enters, "); ability1.addTarget(new TargetCreaturePermanent(filterNotSpirit)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability1, Duration.WhileOnBattlefield, filterSpirit, "All Spirits have \"When this permanent enters the battlefield, you may have it deal 3 damage to target non-Spirit creature.\""))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ability1, Duration.WhileOnBattlefield, filterSpirit, "All Spirits have \"When this permanent enters the battlefield, you may have it deal 3 damage to target non-Spirit creature.\""))); // Non-Spirit creatures have "When this creature enters the battlefield, you may have it deal 3 damage to target Spirit creature." Ability ability2 = new ClashOfRealitiesTriggeredAbility(new DamageTargetEffect(3), "When this creature enters, "); ability2.addTarget(new TargetCreaturePermanent(filterSpirit)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability2, Duration.WhileOnBattlefield, filterNotSpirit, "Non-Spirit creatures have \"When this creature enters the battlefield, you may have it deal 3 damage to target Spirit creature.\""))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ability2, Duration.WhileOnBattlefield, filterNotSpirit, "Non-Spirit creatures have \"When this creature enters the battlefield, you may have it deal 3 damage to target Spirit creature.\""))); } private ClashOfRealities(final ClashOfRealities card) { diff --git a/Mage.Sets/src/mage/cards/c/Claustrophobia.java b/Mage.Sets/src/mage/cards/c/Claustrophobia.java index 3af7c79b008..165e0de604f 100644 --- a/Mage.Sets/src/mage/cards/c/Claustrophobia.java +++ b/Mage.Sets/src/mage/cards/c/Claustrophobia.java @@ -37,7 +37,7 @@ public final class Claustrophobia extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private Claustrophobia(final Claustrophobia card) { diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java index c5a6ed4add7..109874668da 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java @@ -39,7 +39,7 @@ public final class ClawsOfValakut extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter, 1), + SimpleStaticAbility ability = new SimpleStaticAbility(new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter, 1), new PermanentsOnBattlefieldCount(filter, 0), Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA).setText("and has first strike")); diff --git a/Mage.Sets/src/mage/cards/c/ClingingDarkness.java b/Mage.Sets/src/mage/cards/c/ClingingDarkness.java index c51155c2cb5..4e899a0c72d 100644 --- a/Mage.Sets/src/mage/cards/c/ClingingDarkness.java +++ b/Mage.Sets/src/mage/cards/c/ClingingDarkness.java @@ -35,7 +35,7 @@ public final class ClingingDarkness extends CardImpl { this.addAbility(ability); // Enchanted creature gets -4/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-4, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-4, -1, Duration.WhileOnBattlefield))); } private ClingingDarkness(final ClingingDarkness card) { diff --git a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java index 9ceae6f6e75..504915fea46 100644 --- a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java +++ b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java @@ -31,7 +31,7 @@ public final class CloakAndDagger extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0 and has shroud. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 0)); ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has shroud")); this.addAbility(ability); // Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it. diff --git a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java index e40e4c76208..854a6f001c3 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java @@ -39,7 +39,7 @@ public final class CloakOfInvisibility extends CardImpl { this.addAbility(ability); // Enchanted creature has phasing and can't be blocked except by Walls. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(PhasingAbility.getInstance(), AttachmentType.AURA).setText("Enchanted creature has phasing")); + ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(PhasingAbility.getInstance(), AttachmentType.AURA).setText("Enchanted creature has phasing")); ability.addEffect(new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA) .setText("and can't be blocked except by Walls. " + "(It phases in or out before its controller untaps during each of their untap steps. " + diff --git a/Mage.Sets/src/mage/cards/c/CloakOfMists.java b/Mage.Sets/src/mage/cards/c/CloakOfMists.java index 9580d79635a..6ffe0c36c5a 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfMists.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfMists.java @@ -33,7 +33,7 @@ public final class CloakOfMists extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedAttachedEffect(AttachmentType.AURA))); } private CloakOfMists(final CloakOfMists card) { diff --git a/Mage.Sets/src/mage/cards/c/Cloudform.java b/Mage.Sets/src/mage/cards/c/Cloudform.java index ec10447ac2e..c359d037301 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudform.java +++ b/Mage.Sets/src/mage/cards/c/Cloudform.java @@ -31,7 +31,7 @@ public final class Cloudform extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesAuraAttachToManifestSourceEffect())); // Enchanted creature has flying and hexproof. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java b/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java index 1f06e308b4d..39a7e252abc 100644 --- a/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java +++ b/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java @@ -38,7 +38,7 @@ public final class CloudreachCavalry extends CardImpl { this.toughness = new MageInt(1); // As long as you control a Bird, Cloudreach Cavalry gets +2/+2 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a Bird, {this} gets +2/+2")); diff --git a/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java b/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java index 86672d22527..2ac910714e5 100644 --- a/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java +++ b/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java @@ -41,14 +41,14 @@ public final class CloutOfTheDominus extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is blue, it gets +1/+1 and has shroud. - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + SimpleStaticAbility blueAbility = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); blueAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has shroud")); this.addAbility(blueAbility); // As long as enchanted creature is red, it gets +1/+1 and has haste. - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + SimpleStaticAbility redAbility = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has haste")); diff --git a/Mage.Sets/src/mage/cards/c/CoatOfArms.java b/Mage.Sets/src/mage/cards/c/CoatOfArms.java index ca19dcc74a0..26b8c76254a 100644 --- a/Mage.Sets/src/mage/cards/c/CoatOfArms.java +++ b/Mage.Sets/src/mage/cards/c/CoatOfArms.java @@ -23,7 +23,7 @@ public final class CoatOfArms extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // Each creature gets +1/+1 for each other creature on the battlefield that shares at least one creature type with it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CoatOfArmsEffect())); + this.addAbility(new SimpleStaticAbility(new CoatOfArmsEffect())); } private CoatOfArms(final CoatOfArms card) { diff --git a/Mage.Sets/src/mage/cards/c/CobbledWings.java b/Mage.Sets/src/mage/cards/c/CobbledWings.java index f8463a051b1..cebbf409531 100644 --- a/Mage.Sets/src/mage/cards/c/CobbledWings.java +++ b/Mage.Sets/src/mage/cards/c/CobbledWings.java @@ -26,7 +26,7 @@ public final class CobbledWings extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/cards/c/Cocoon.java b/Mage.Sets/src/mage/cards/c/Cocoon.java index 221d948726e..9f75b0963b4 100644 --- a/Mage.Sets/src/mage/cards/c/Cocoon.java +++ b/Mage.Sets/src/mage/cards/c/Cocoon.java @@ -50,7 +50,7 @@ public final class Cocoon extends CardImpl { this.addAbility(ability); // Enchanted creature doesn’t untap during your untap step if Cocoon has a pupa counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), new SourceHasCounterCondition(CounterType.PUPA)).setText("Enchanted creature doesn't untap during its controller's untap step if Cocoon has a pupa counter on it"))); // At the beginning of your upkeep, remove a pupa counter from Cocoon. If you can’t, sacrifice it, put a +1/+1 counter on enchanted creature, and that creature gains flying. diff --git a/Mage.Sets/src/mage/cards/c/CoercedToKill.java b/Mage.Sets/src/mage/cards/c/CoercedToKill.java index 8142d1417dc..5cc229736b6 100644 --- a/Mage.Sets/src/mage/cards/c/CoercedToKill.java +++ b/Mage.Sets/src/mage/cards/c/CoercedToKill.java @@ -34,7 +34,7 @@ public final class CoercedToKill extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Enchanted creature has base power and toughness 1/1, has deathtouch, and is an Assassin in addition to its other types. Ability ability = new SimpleStaticAbility(new SetBasePowerToughnessEnchantedEffect(1, 1)); diff --git a/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java b/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java index fa162048959..e5956feeb91 100644 --- a/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java +++ b/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java @@ -38,7 +38,7 @@ public final class CoilsOfTheMedusa extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield))); // Sacrifice Coils of the Medusa: Destroy all non-Wall creatures blocking enchanted creature. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java b/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java index 2f744112fec..41f78f45962 100644 --- a/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java +++ b/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java @@ -34,14 +34,14 @@ public final class ColfenorsPlans extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ColfenorsPlansExileEffect(), false)); // You may look at and play cards exiled with Colfenor's Plans. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ColfenorsPlansPlayCardEffect())); + this.addAbility(new SimpleStaticAbility(new ColfenorsPlansPlayCardEffect())); this.addAbility(new SimpleStaticAbility(Zone.ALL, new ColfenorsPlansLookAtCardEffect())); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // You can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.YOU))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java b/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java index a53ec2cd015..398c4a58ccf 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java @@ -21,7 +21,7 @@ public final class CollectiveBlessing extends CardImpl { // Creatures you control get +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3,3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(3,3, Duration.WhileOnBattlefield))); } private CollectiveBlessing(final CollectiveBlessing card) { @@ -32,4 +32,4 @@ public final class CollectiveBlessing extends CardImpl { public CollectiveBlessing copy() { return new CollectiveBlessing(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java b/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java index 932c868f16c..316471e572f 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java @@ -28,7 +28,7 @@ public final class CollectiveRestraint extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Domain - Creatures can't attack you unless their controller pays {X} for each creature they control that's attacking you, where X is the number of basic land types you control. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CollectiveRestraintPayManaToAttackAllEffect()); + Ability ability = new SimpleStaticAbility(new CollectiveRestraintPayManaToAttackAllEffect()); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); diff --git a/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java b/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java index c022af26dc6..52a44993f62 100644 --- a/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java +++ b/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java @@ -34,7 +34,7 @@ public final class ColossusOfSardia extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Colossus of Sardia doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {9}: Untap Colossus of Sardia. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/c/ComaVeil.java b/Mage.Sets/src/mage/cards/c/ComaVeil.java index d8331cf1f99..5c5feaa6b00 100644 --- a/Mage.Sets/src/mage/cards/c/ComaVeil.java +++ b/Mage.Sets/src/mage/cards/c/ComaVeil.java @@ -33,7 +33,7 @@ public final class ComaVeil extends CardImpl { this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); } private ComaVeil(final ComaVeil card) { diff --git a/Mage.Sets/src/mage/cards/c/CommanderCody.java b/Mage.Sets/src/mage/cards/c/CommanderCody.java index f6edbe75b6d..47d1c5e02e8 100644 --- a/Mage.Sets/src/mage/cards/c/CommanderCody.java +++ b/Mage.Sets/src/mage/cards/c/CommanderCody.java @@ -35,7 +35,7 @@ public final class CommanderCody extends CardImpl { this.toughness = new MageInt(7); // Non-token Trooper creatures you control have "At the beginning of your upkeep, create a 1/1 white Trooper creature token." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new TrooperToken())), Duration.WhileOnBattlefield, filter, false) .withForceQuotes() diff --git a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java index 30fda08a7a4..4862d3c044e 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java +++ b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java @@ -35,7 +35,7 @@ public final class CommandersAuthority extends CardImpl { this.addAbility(ability); // Enchanted creature has "At the beginning of your upkeep, create a 1/1 white Human creature token." ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new HumanToken())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } private CommandersAuthority(final CommandersAuthority card) { diff --git a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java index 463fae03926..a6f13062d41 100644 --- a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java +++ b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java @@ -43,14 +43,14 @@ public final class CompulsoryRest extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // Enchanted creature has "{2}, Sacrifice this creature: You gain 2 life." Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new GenericManaCost(2)); Cost cost = new SacrificeSourceCost(); cost.setText("Sacrifice this creature"); grantedAbility.addCost(cost); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java b/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java index e8051adb668..b141e925837 100644 --- a/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java +++ b/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java @@ -45,7 +45,7 @@ public final class ConclavesBlessing extends CardImpl { PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter, 2); BoostEnchantedEffect effect = new BoostEnchantedEffect(StaticValue.get(0), value, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +0/+2 for each other creature you control."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private ConclavesBlessing(final ConclavesBlessing card) { diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java index 40bffb1b60d..ff68bae7618 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java @@ -56,7 +56,7 @@ public final class ConduitOfRuin extends CardImpl { // The first creature spell you cast each turn costs {2} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filterCost, 2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), new ConduitOfRuinWatcher()); + this.addAbility(new SimpleStaticAbility(effect), new ConduitOfRuinWatcher()); } private ConduitOfRuin(final ConduitOfRuin card) { diff --git a/Mage.Sets/src/mage/cards/c/Confiscate.java b/Mage.Sets/src/mage/cards/c/Confiscate.java index 1658f300fe6..8a5880e4bca 100644 --- a/Mage.Sets/src/mage/cards/c/Confiscate.java +++ b/Mage.Sets/src/mage/cards/c/Confiscate.java @@ -34,7 +34,7 @@ public final class Confiscate extends CardImpl { this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); } private Confiscate(final Confiscate card) { diff --git a/Mage.Sets/src/mage/cards/c/Conquer.java b/Mage.Sets/src/mage/cards/c/Conquer.java index 5aab955e270..4bfd505d64a 100644 --- a/Mage.Sets/src/mage/cards/c/Conquer.java +++ b/Mage.Sets/src/mage/cards/c/Conquer.java @@ -35,7 +35,7 @@ public final class Conquer extends CardImpl { this.addAbility(ability); // You control enchanted land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("land"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("land"))); } private Conquer(final Conquer card) { diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java index b057de08be8..a6d7e5b7d22 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java @@ -46,7 +46,7 @@ public final class ConsecratedByBlood extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying and "Sacrifice two other creatures: Regenerate this creature." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/Conspiracy.java b/Mage.Sets/src/mage/cards/c/Conspiracy.java index 1c186a3bc90..c05affa5d3b 100644 --- a/Mage.Sets/src/mage/cards/c/Conspiracy.java +++ b/Mage.Sets/src/mage/cards/c/Conspiracy.java @@ -36,7 +36,7 @@ public final class Conspiracy extends CardImpl { // Creature cards you own that aren't on the battlefield, creature // spells you control, and creatures you control are the chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConspiracyEffect())); + this.addAbility(new SimpleStaticAbility(new ConspiracyEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java b/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java index 2c4e82a7e69..ce8287c5a1c 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java @@ -48,7 +48,7 @@ public final class ConsumingFerocity extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); // At the beginning of your upkeep, put a +1/+0 counter on enchanted creature. If that creature has three or more +1/+0 counters on it, it deals damage equal to its power to its controller, then destroy that creature and it can't be regenerated. Ability upkeepAbility = new BeginningOfUpkeepTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P0.createInstance(), "enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/c/ConsumingFervor.java b/Mage.Sets/src/mage/cards/c/ConsumingFervor.java index 79e55ede901..16f757a6251 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingFervor.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingFervor.java @@ -42,7 +42,7 @@ public final class ConsumingFervor extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 and has "At the beginning of your upkeep, put a -1/-1 counter on this creature." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); Ability grantedAbility = new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(1))); Effect effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA); effect.setText("and has \"At the beginning of your upkeep, put a -1/-1 counter on this creature.\""); diff --git a/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java b/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java index 730c44b1c8e..d711b3ba697 100644 --- a/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java +++ b/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java @@ -35,7 +35,7 @@ public final class ContainmentMembrane extends CardImpl { this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Surge {U} (You may cast a spell for its surge cost if you or a teammate have cast another spell in the same turn.) addAbility(new SurgeAbility(this, "{U}")); diff --git a/Mage.Sets/src/mage/cards/c/ContainmentPriest.java b/Mage.Sets/src/mage/cards/c/ContainmentPriest.java index 4002023db50..d7fd6171afb 100644 --- a/Mage.Sets/src/mage/cards/c/ContainmentPriest.java +++ b/Mage.Sets/src/mage/cards/c/ContainmentPriest.java @@ -34,7 +34,7 @@ public final class ContainmentPriest extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // If a nontoken creature would enter the battlefield and it wasn't cast, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ContainmentPriestReplacementEffect()), + this.addAbility(new SimpleStaticAbility(new ContainmentPriestReplacementEffect()), new PermanentWasCastWatcher()); } diff --git a/Mage.Sets/src/mage/cards/c/ContaminatedGround.java b/Mage.Sets/src/mage/cards/c/ContaminatedGround.java index ea3f3622f47..388aa4c3174 100644 --- a/Mage.Sets/src/mage/cards/c/ContaminatedGround.java +++ b/Mage.Sets/src/mage/cards/c/ContaminatedGround.java @@ -37,7 +37,7 @@ public final class ContaminatedGround extends CardImpl { this.addAbility(ability); // Enchanted land is a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); // Whenever enchanted land becomes tapped, its controller loses 2 life. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new LoseLifeControllerAttachedEffect(2), "enchanted land")); diff --git a/Mage.Sets/src/mage/cards/c/Contamination.java b/Mage.Sets/src/mage/cards/c/Contamination.java index 92914384eee..c239afb83d5 100644 --- a/Mage.Sets/src/mage/cards/c/Contamination.java +++ b/Mage.Sets/src/mage/cards/c/Contamination.java @@ -33,7 +33,7 @@ public final class Contamination extends CardImpl { ); // If a land is tapped for mana, it produces {B} instead of any other type and amount. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ContaminationReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ContaminationReplacementEffect())); } private Contamination(final Contamination card) { diff --git a/Mage.Sets/src/mage/cards/c/ControlMagic.java b/Mage.Sets/src/mage/cards/c/ControlMagic.java index 123eb9438d2..387919bfa4a 100644 --- a/Mage.Sets/src/mage/cards/c/ControlMagic.java +++ b/Mage.Sets/src/mage/cards/c/ControlMagic.java @@ -33,7 +33,7 @@ public final class ControlMagic extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } private ControlMagic(final ControlMagic card) { diff --git a/Mage.Sets/src/mage/cards/c/ControlledInstincts.java b/Mage.Sets/src/mage/cards/c/ControlledInstincts.java index 5b44bade4e3..cd8e447f483 100644 --- a/Mage.Sets/src/mage/cards/c/ControlledInstincts.java +++ b/Mage.Sets/src/mage/cards/c/ControlledInstincts.java @@ -44,7 +44,7 @@ public final class ControlledInstincts extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private ControlledInstincts(final ControlledInstincts card) { diff --git a/Mage.Sets/src/mage/cards/c/Conversion.java b/Mage.Sets/src/mage/cards/c/Conversion.java index fb19f7aec79..73afd85c63a 100644 --- a/Mage.Sets/src/mage/cards/c/Conversion.java +++ b/Mage.Sets/src/mage/cards/c/Conversion.java @@ -36,7 +36,7 @@ public final class Conversion extends CardImpl { )); // All Mountains are Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConversionEffect())); + this.addAbility(new SimpleStaticAbility(new ConversionEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/Conviction.java b/Mage.Sets/src/mage/cards/c/Conviction.java index 35112ca0f8d..e80ed6ea7ff 100644 --- a/Mage.Sets/src/mage/cards/c/Conviction.java +++ b/Mage.Sets/src/mage/cards/c/Conviction.java @@ -38,7 +38,7 @@ public final class Conviction extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); // {W}: Return Conviction to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/c/ConvincingMirage.java b/Mage.Sets/src/mage/cards/c/ConvincingMirage.java index c496bf77be8..08674d28a6a 100644 --- a/Mage.Sets/src/mage/cards/c/ConvincingMirage.java +++ b/Mage.Sets/src/mage/cards/c/ConvincingMirage.java @@ -38,7 +38,7 @@ public final class ConvincingMirage extends CardImpl { // Enchanted land is the chosen type. Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConvincingMirageContinousEffect())); + this.addAbility(new SimpleStaticAbility(new ConvincingMirageContinousEffect())); } private ConvincingMirage(final ConvincingMirage card) { diff --git a/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java b/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java index abe53956e55..62fab787e90 100644 --- a/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java +++ b/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java @@ -31,7 +31,7 @@ public final class ConvulsingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.R), new ColoredManaCost(ColoredManaSymbol.R))); // Enchanted creature can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantBlockAttachedEffect(AttachmentType.AURA))); } private ConvulsingLicid(final ConvulsingLicid card) { diff --git a/Mage.Sets/src/mage/cards/c/Cooperation.java b/Mage.Sets/src/mage/cards/c/Cooperation.java index 5583ebb1979..1c03fef1b73 100644 --- a/Mage.Sets/src/mage/cards/c/Cooperation.java +++ b/Mage.Sets/src/mage/cards/c/Cooperation.java @@ -36,7 +36,7 @@ public final class Cooperation extends CardImpl { this.addAbility(ability); // Enchanted creature has banding. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(BandingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(BandingAbility.getInstance(), AttachmentType.AURA))); } private Cooperation(final Cooperation card) { diff --git a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java index 5c7fea0eca0..ee289693717 100644 --- a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java +++ b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java @@ -39,7 +39,7 @@ public final class CopperhoofVorrac extends CardImpl { // Copperhoof Vorrac gets +1/+1 for each untapped permanent your opponents control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } private CopperhoofVorrac(final CopperhoofVorrac card) { diff --git a/Mage.Sets/src/mage/cards/c/CoralNet.java b/Mage.Sets/src/mage/cards/c/CoralNet.java index c9166b6a789..2fccfb646fd 100644 --- a/Mage.Sets/src/mage/cards/c/CoralNet.java +++ b/Mage.Sets/src/mage/cards/c/CoralNet.java @@ -49,7 +49,7 @@ public final class CoralNet extends CardImpl { // Enchanted creature has "At the beginning of your upkeep, sacrifice this creature unless you discard a card." Ability abilityToGain = new BeginningOfUpkeepTriggeredAbility( new SacrificeSourceUnlessPaysEffect(new DiscardCardCost())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java b/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java index e148b1ae94a..4a988abf446 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java @@ -48,7 +48,7 @@ public final class CoralhelmCommander extends LevelerCard { Abilities abilities2 = new AbilitiesImpl<>(); abilities2.add(FlyingAbility.getInstance()); - abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + abilities2.add(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); this.addAbilities(LevelerCardBuilder.construct( new LevelerCardBuilder.LevelAbility(2, 3, abilities1, 3, 3), diff --git a/Mage.Sets/src/mage/cards/c/CorneredMarket.java b/Mage.Sets/src/mage/cards/c/CorneredMarket.java index 5f1f66791fc..42059aa41d3 100644 --- a/Mage.Sets/src/mage/cards/c/CorneredMarket.java +++ b/Mage.Sets/src/mage/cards/c/CorneredMarket.java @@ -32,7 +32,7 @@ public final class CorneredMarket extends CardImpl { // Players can't cast spells with the same name as a nontoken permanent. // Players can't play nonbasic lands with the same name as a nontoken permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CorneredMarketReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new CorneredMarketReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java b/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java index 9e26d933109..9c00b3b352f 100644 --- a/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java +++ b/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java @@ -37,7 +37,7 @@ public final class CorpsejackMenace extends CardImpl { this.toughness = new MageInt(4); // If one or more +1/+1 counters would be put on a creature you control, twice that many +1/+1 counters are put on it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CorpsejackMenaceReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new CorpsejackMenaceReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java b/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java index 09508684ed4..ae13fd0f692 100644 --- a/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java +++ b/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java @@ -38,7 +38,7 @@ public final class CorrosiveMentor extends CardImpl { this.toughness = new MageInt(3); // Black creatures you control have wither. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private CorrosiveMentor(final CorrosiveMentor card) { diff --git a/Mage.Sets/src/mage/cards/c/CorruptedConscience.java b/Mage.Sets/src/mage/cards/c/CorruptedConscience.java index 824f07b8c42..610b08306dc 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedConscience.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedConscience.java @@ -37,10 +37,10 @@ public final class CorruptedConscience extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Enchanted creature has infect. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); } private CorruptedConscience(final CorruptedConscience card) { diff --git a/Mage.Sets/src/mage/cards/c/CorruptingLicid.java b/Mage.Sets/src/mage/cards/c/CorruptingLicid.java index 9ca76b662a3..4c2cdcef7b0 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptingLicid.java +++ b/Mage.Sets/src/mage/cards/c/CorruptingLicid.java @@ -32,7 +32,7 @@ public final class CorruptingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.B), new ColoredManaCost(ColoredManaSymbol.B))); // Enchanted creature has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); } private CorruptingLicid(final CorruptingLicid card) { diff --git a/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java b/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java index 4a42c7f9ddd..207445fe8e4 100644 --- a/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java +++ b/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java @@ -36,9 +36,9 @@ public final class CouncilOfTheAbsolute extends CardImpl { // As Council of the Absolute enters the battlefield, name a card other than a creature or a land card. this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_AND_NON_CREATURE_NAME))); // Your opponents can't cast the chosen card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CouncilOfTheAbsoluteReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new CouncilOfTheAbsoluteReplacementEffect())); // Spells with the chosen name cost 2 less for you to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CouncilOfTheAbsoluteCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new CouncilOfTheAbsoluteCostReductionEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java b/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java index 38863dc17b8..1457085fdbc 100644 --- a/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java +++ b/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java @@ -27,7 +27,7 @@ public final class CoverOfDarkness extends CardImpl { // As Cover of Darkness enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.AddAbility))); // Creatures of the chosen type have fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCoverOfDarkness()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCoverOfDarkness()))); } private CoverOfDarkness(final CoverOfDarkness card) { diff --git a/Mage.Sets/src/mage/cards/c/CoverOfWinter.java b/Mage.Sets/src/mage/cards/c/CoverOfWinter.java index b46da935171..e0e37be41de 100644 --- a/Mage.Sets/src/mage/cards/c/CoverOfWinter.java +++ b/Mage.Sets/src/mage/cards/c/CoverOfWinter.java @@ -36,7 +36,7 @@ public final class CoverOfWinter extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{S}"))); // If a creature would deal combat damage to you and/or one or more creatures you control, prevent X of that damage, where X is the number of age counters on Cover of Winter. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CoverOfWinterEffect())); + this.addAbility(new SimpleStaticAbility(new CoverOfWinterEffect())); // {S}: Put an age counter on Cover of Winter. this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.AGE.createInstance()), new ManaCostsImpl<>("{S}"))); diff --git a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java index 97356085517..a193b6b11f4 100644 --- a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java +++ b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java @@ -42,7 +42,7 @@ public final class CowedByWisdom extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block unless its controller pays {1} for each card in your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CowedByWisdomayCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new CowedByWisdomayCostToAttackBlockEffect())); } private CowedByWisdom(final CowedByWisdom card) { diff --git a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java index c105f943f2c..20fc7a5b735 100644 --- a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java +++ b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java @@ -48,7 +48,7 @@ public final class CrabappleCohort extends CardImpl { // Crabapple Cohort gets +1/+1 as long as you control another green creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private CrabappleCohort(final CrabappleCohort card) { diff --git a/Mage.Sets/src/mage/cards/c/CracklingClub.java b/Mage.Sets/src/mage/cards/c/CracklingClub.java index 08d5424a427..8e93c3c3e82 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingClub.java +++ b/Mage.Sets/src/mage/cards/c/CracklingClub.java @@ -37,7 +37,7 @@ public final class CracklingClub extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); // Sacrifice Crackling Club: Crackling Club deals 1 damage to target creature. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/Crawlspace.java b/Mage.Sets/src/mage/cards/c/Crawlspace.java index 18956035817..29bd0d34e2a 100644 --- a/Mage.Sets/src/mage/cards/c/Crawlspace.java +++ b/Mage.Sets/src/mage/cards/c/Crawlspace.java @@ -22,7 +22,7 @@ public final class Crawlspace extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // No more than two creatures can attack you each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChangeMaxNumberThatCanAttackSourceEffect(2))); + this.addAbility(new SimpleStaticAbility(new ChangeMaxNumberThatCanAttackSourceEffect(2))); } diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java index e2b8a47cbf8..375d7f5113f 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java @@ -40,9 +40,9 @@ public final class CreakwoodLiege extends CardImpl { this.toughness = new MageInt(2); // Other black creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true))); // At the beginning of your upkeep, you may create a 1/1 black and green Worm creature token. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new BlackGreenWormToken(), 1), true)); } diff --git a/Mage.Sets/src/mage/cards/c/Crevasse.java b/Mage.Sets/src/mage/cards/c/Crevasse.java index 178723b4899..78d8395865c 100644 --- a/Mage.Sets/src/mage/cards/c/Crevasse.java +++ b/Mage.Sets/src/mage/cards/c/Crevasse.java @@ -24,7 +24,7 @@ public final class Crevasse extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // Creatures with mountainwalk can be blocked as though they didn't have mountainwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CrevasseEffect())); + this.addAbility(new SimpleStaticAbility(new CrevasseEffect())); } private Crevasse(final Crevasse card) { diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java index 6e2a1ca22cb..f559bfef3c8 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java @@ -35,7 +35,7 @@ public final class CrimsonMuckwader extends CardImpl { this.toughness = new MageInt(1); // Crimson Muckwader gets +1/+1 as long as you control a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {2}{B}: Regenerate Crimson Muckwader. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/c/Crosswinds.java b/Mage.Sets/src/mage/cards/c/Crosswinds.java index 6438bde2022..98eca56c8b6 100644 --- a/Mage.Sets/src/mage/cards/c/Crosswinds.java +++ b/Mage.Sets/src/mage/cards/c/Crosswinds.java @@ -29,7 +29,7 @@ public final class Crosswinds extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // Creatures with flying get -2/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-2, 0, Duration.WhileOnBattlefield, filter1, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-2, 0, Duration.WhileOnBattlefield, filter1, false))); } private Crosswinds(final Crosswinds card) { diff --git a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java index bb6ee6bf59c..85b37bfd06e 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java @@ -43,9 +43,9 @@ public final class CrovaxAscendantHero extends CardImpl { this.toughness = new MageInt(4); // Other white creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Nonwhite creatures get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter2, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter2, false))); // Pay 2 life: Return Crovax, Ascendant Hero to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayLifeCost(2))); } diff --git a/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java b/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java index 8dc7f65b9d1..a35d0cacf4d 100644 --- a/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java +++ b/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java @@ -35,7 +35,7 @@ public final class CrownHunterHireling extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesMonarchSourceEffect()).addHint(MonarchHint.instance)); // Crown-Hunter Hireling can't attack unless defending player is the monarch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CrownHunterHirelingCantAttackEffect())); + this.addAbility(new SimpleStaticAbility(new CrownHunterHirelingCantAttackEffect())); } private CrownHunterHireling(final CrownHunterHireling card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java index 8260b90ffef..11d7699fbec 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java @@ -36,11 +36,11 @@ public final class CrownOfConvergence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is a creature card, creatures you control that share a color with that card get +1/+1. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new CrownOfConvergenceColorBoostEffect(), new TopLibraryCardTypeCondition(CardType.CREATURE), rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {G}{W}: Put the top card of your library on the bottom of your library. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfConvergenceEffect(), new ManaCostsImpl<>("{G}{W}"))); diff --git a/Mage.Sets/src/mage/cards/c/CrownOfGondor.java b/Mage.Sets/src/mage/cards/c/CrownOfGondor.java index bcec1e55100..27329de82bf 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfGondor.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfGondor.java @@ -39,7 +39,7 @@ public final class CrownOfGondor extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1 for each creature you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(xValue, xValue))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(xValue, xValue))); // When a legendary creature you control enters, if there is no monarch, you become the monarch. this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java index 9ca306dfaa2..f6104d90fe3 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java @@ -26,7 +26,7 @@ public final class CrucibleOfFire extends CardImpl { // Dragon creatures you control get +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); } private CrucibleOfFire(final CrucibleOfFire card) { diff --git a/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java b/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java index c2ae9607bbc..76cff5e1ca2 100644 --- a/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java +++ b/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java @@ -25,7 +25,7 @@ public final class CrumblingSanctuary extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // If damage would be dealt to a player, that player exiles that many cards from the top of their library instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CrumblingSanctuaryEffect())); + this.addAbility(new SimpleStaticAbility(new CrumblingSanctuaryEffect())); } private CrumblingSanctuary(final CrumblingSanctuary card) { diff --git a/Mage.Sets/src/mage/cards/c/Crusade.java b/Mage.Sets/src/mage/cards/c/Crusade.java index d7372e4696e..b1fbc3f48a4 100644 --- a/Mage.Sets/src/mage/cards/c/Crusade.java +++ b/Mage.Sets/src/mage/cards/c/Crusade.java @@ -29,7 +29,7 @@ public final class Crusade extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}{W}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private Crusade(final Crusade card) { diff --git a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java index cd8afd850c6..596812ccc42 100644 --- a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java +++ b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java @@ -37,7 +37,7 @@ public final class CrusadingKnight extends CardImpl { // Crusading Knight gets +1/+1 for each Swamp your opponents control. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(swampFilter, 1); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java index a14b81d0f33..6dac2c4bb1a 100644 --- a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java @@ -40,7 +40,7 @@ public final class CrusherZendikon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a 4/2 red Beast creature with trample. It's still a land. - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new CrusherZendikonToken(), "Enchanted land is a 4/2 red Beast creature with trample. It's still a land.", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); // When enchanted land dies, return that card to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/c/CryptolithRite.java b/Mage.Sets/src/mage/cards/c/CryptolithRite.java index 05ad46543d1..ee734efb3f7 100644 --- a/Mage.Sets/src/mage/cards/c/CryptolithRite.java +++ b/Mage.Sets/src/mage/cards/c/CryptolithRite.java @@ -22,7 +22,7 @@ public final class CryptolithRite extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // Creatures you control have "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } diff --git a/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java b/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java index bedc6207572..d5dfa99350a 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java @@ -41,7 +41,7 @@ public final class CrystallineNautilus extends CardImpl { // Enchanted creature gets +4/+4 and has "When this creature becomes the target of a spell or ability, sacrifice it." Effect effect = new BoostEnchantedEffect(4,4,Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +4/+4"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect()), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"When this creature becomes the target of a spell or ability, sacrifice it.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CrystallineSliver.java b/Mage.Sets/src/mage/cards/c/CrystallineSliver.java index 658c8caad80..b8c674f59b5 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineSliver.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineSliver.java @@ -28,7 +28,7 @@ public final class CrystallineSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterPermanent(SubType.SLIVER, "All Slivers")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterPermanent(SubType.SLIVER, "All Slivers")))); } private CrystallineSliver(final CrystallineSliver card) { diff --git a/Mage.Sets/src/mage/cards/c/Crystallization.java b/Mage.Sets/src/mage/cards/c/Crystallization.java index fd33661b067..7eeaae78527 100644 --- a/Mage.Sets/src/mage/cards/c/Crystallization.java +++ b/Mage.Sets/src/mage/cards/c/Crystallization.java @@ -34,7 +34,7 @@ public final class Crystallization extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // When enchanted creature becomes the target of a spell or ability, exile that creature. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new ExileAttachedEffect().setText("exile that creature"))); diff --git a/Mage.Sets/src/mage/cards/c/CultistsStaff.java b/Mage.Sets/src/mage/cards/c/CultistsStaff.java index bf1526ac13a..17c211fbf97 100644 --- a/Mage.Sets/src/mage/cards/c/CultistsStaff.java +++ b/Mage.Sets/src/mage/cards/c/CultistsStaff.java @@ -25,7 +25,7 @@ public final class CultistsStaff extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // Equip {3} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3), new TargetControlledCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/cards/c/CumberStone.java b/Mage.Sets/src/mage/cards/c/CumberStone.java index 04c6232c945..13633c00035 100644 --- a/Mage.Sets/src/mage/cards/c/CumberStone.java +++ b/Mage.Sets/src/mage/cards/c/CumberStone.java @@ -21,7 +21,7 @@ public final class CumberStone extends CardImpl { // Creatures your opponents control get -1/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-1, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostOpponentsEffect(-1, 0, Duration.WhileOnBattlefield))); } private CumberStone(final CumberStone card) { diff --git a/Mage.Sets/src/mage/cards/c/Cunning.java b/Mage.Sets/src/mage/cards/c/Cunning.java index 602728e1f0c..dcc4db68769 100644 --- a/Mage.Sets/src/mage/cards/c/Cunning.java +++ b/Mage.Sets/src/mage/cards/c/Cunning.java @@ -39,7 +39,7 @@ public final class Cunning extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3))); // When enchanted creature attacks or blocks, sacrifice Cunning at the beginning of the next cleanup step. this.addAbility(new AttacksOrBlocksAttachedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java index f1d90abb184..22d495b0d5f 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java @@ -34,7 +34,7 @@ public final class CurseOfBloodletting extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // If a source would deal damage to enchanted player, it deals double that damage to that player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CurseOfBloodlettingEffect())); + this.addAbility(new SimpleStaticAbility(new CurseOfBloodlettingEffect())); } private CurseOfBloodletting(final CurseOfBloodletting card) { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java b/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java index 90c3a1830bc..2852fc1e3d9 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java @@ -35,7 +35,7 @@ public final class CurseOfExhaustion extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CurseOfExhaustionEffect())); + this.addAbility(new SimpleStaticAbility(new CurseOfExhaustionEffect())); } private CurseOfExhaustion(final CurseOfExhaustion card) { diff --git a/Mage.Sets/src/mage/cards/c/CursedFlesh.java b/Mage.Sets/src/mage/cards/c/CursedFlesh.java index 7f8622f0d68..978ce5f2b1a 100644 --- a/Mage.Sets/src/mage/cards/c/CursedFlesh.java +++ b/Mage.Sets/src/mage/cards/c/CursedFlesh.java @@ -33,7 +33,7 @@ public final class CursedFlesh extends CardImpl { this.addAbility(ability); // Enchanted creature gets -1/-1 and has fear. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, "and has fear")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CursedRack.java b/Mage.Sets/src/mage/cards/c/CursedRack.java index 27a6af510eb..570bf0a4858 100644 --- a/Mage.Sets/src/mage/cards/c/CursedRack.java +++ b/Mage.Sets/src/mage/cards/c/CursedRack.java @@ -25,7 +25,7 @@ public final class CursedRack extends CardImpl { // As Cursed Rack enters the battlefield, choose an opponent. this.addAbility(new AsEntersBattlefieldAbility(new ChooseOpponentEffect(Outcome.Detriment))); // The chosen player's maximum hand size is four. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CursedRackHandSizeEffect())); + this.addAbility(new SimpleStaticAbility(new CursedRackHandSizeEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CursedTotem.java b/Mage.Sets/src/mage/cards/c/CursedTotem.java index 413ba396d74..5e3b81b997f 100644 --- a/Mage.Sets/src/mage/cards/c/CursedTotem.java +++ b/Mage.Sets/src/mage/cards/c/CursedTotem.java @@ -22,7 +22,7 @@ public final class CursedTotem extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Activated abilities of creatures can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CursedTotemCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new CursedTotemCantActivateEffect())); } private CursedTotem(final CursedTotem card) { diff --git a/Mage.Sets/src/mage/cards/c/CustodyBattle.java b/Mage.Sets/src/mage/cards/c/CustodyBattle.java index d7d0907cb45..8ff892631d4 100644 --- a/Mage.Sets/src/mage/cards/c/CustodyBattle.java +++ b/Mage.Sets/src/mage/cards/c/CustodyBattle.java @@ -58,7 +58,7 @@ public final class CustodyBattle extends CardImpl { // Enchanted creature has "At the beginning of your upkeep, target opponent gains control of this creature unless you sacrifice a land." ability = new BeginningOfUpkeepTriggeredAbility(new CustodyBattleUnlessPaysEffect(new SacrificeTargetCost(filter))); ability.addTarget(new TargetOpponent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java b/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java index 254dc888d49..9bcdb7020a6 100644 --- a/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java +++ b/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java @@ -29,7 +29,7 @@ public final class CutthroatIlDal extends CardImpl { this.toughness = new MageInt(1); // Hellbent - Cutthroat il-Dal has shadow as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — {this} has shadow as long as you have no cards in hand"))); } diff --git a/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java b/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java index e7dfe857ce2..321ffde078a 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java +++ b/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java @@ -29,7 +29,7 @@ public final class CyclopsOfEternalFury extends CardImpl { this.toughness = new MageInt(3); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } private CyclopsOfEternalFury(final CyclopsOfEternalFury card) { diff --git a/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java b/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java index d54ab7550c7..2121b28c6db 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java +++ b/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java @@ -37,7 +37,7 @@ public final class CyclopsTyrant extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // Cyclops Tyrant can't block creatures with power 2 or less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } private CyclopsTyrant(final CyclopsTyrant card) { -- 2.47.2 From ec01e50edd65597fe2a64d571b4822fa12c001ce Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:11:26 -0500 Subject: [PATCH 12/50] refactor: SimpleStaticAbility default zone (cards D) --- Mage.Sets/src/mage/cards/d/DagobahMawSlug.java | 2 +- Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java | 2 +- Mage.Sets/src/mage/cards/d/DampingField.java | 2 +- Mage.Sets/src/mage/cards/d/DampingMatrix.java | 2 +- Mage.Sets/src/mage/cards/d/Dandan.java | 2 +- Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java | 2 +- Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java | 2 +- Mage.Sets/src/mage/cards/d/DarkFavor.java | 2 +- Mage.Sets/src/mage/cards/d/DarkPrivilege.java | 2 +- Mage.Sets/src/mage/cards/d/DarkestHour.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelAxe.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelGarrison.java | 2 +- Mage.Sets/src/mage/cards/d/DaruWarchief.java | 4 ++-- Mage.Sets/src/mage/cards/d/DauntingDefender.java | 2 +- Mage.Sets/src/mage/cards/d/DauntlessDourbark.java | 2 +- Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java | 2 +- Mage.Sets/src/mage/cards/d/DawnElemental.java | 2 +- Mage.Sets/src/mage/cards/d/DayOfDestiny.java | 2 +- Mage.Sets/src/mage/cards/d/DeadWeight.java | 2 +- Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java | 2 +- Mage.Sets/src/mage/cards/d/Deadfall.java | 2 +- Mage.Sets/src/mage/cards/d/DeadlyWanderings.java | 2 +- Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java | 2 +- Mage.Sets/src/mage/cards/d/DeathPitOffering.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeathTrooper.java | 2 +- Mage.Sets/src/mage/cards/d/DeathbringerLiege.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java | 2 +- Mage.Sets/src/mage/cards/d/Deathrender.java | 2 +- Mage.Sets/src/mage/cards/d/DeathsApproach.java | 2 +- Mage.Sets/src/mage/cards/d/DeathsShadow.java | 2 +- Mage.Sets/src/mage/cards/d/DebilitatingInjury.java | 2 +- Mage.Sets/src/mage/cards/d/DebtorsPulpit.java | 2 +- Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java | 2 +- Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java | 2 +- Mage.Sets/src/mage/cards/d/DeepchannelMentor.java | 2 +- Mage.Sets/src/mage/cards/d/Defang.java | 2 +- Mage.Sets/src/mage/cards/d/DefenseGrid.java | 2 +- Mage.Sets/src/mage/cards/d/DefensiveStance.java | 2 +- Mage.Sets/src/mage/cards/d/Dehydration.java | 2 +- Mage.Sets/src/mage/cards/d/DelayingShield.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicAppetite.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicEmbrace.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicRuckus.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicTorment.java | 4 ++-- Mage.Sets/src/mage/cards/d/DemonicVigor.java | 2 +- Mage.Sets/src/mage/cards/d/DemonmailHauberk.java | 2 +- Mage.Sets/src/mage/cards/d/DemonsJester.java | 2 +- Mage.Sets/src/mage/cards/d/Demotion.java | 2 +- Mage.Sets/src/mage/cards/d/DenProtector.java | 2 +- Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java | 2 +- Mage.Sets/src/mage/cards/d/DenseCanopy.java | 2 +- Mage.Sets/src/mage/cards/d/DenseFoliage.java | 2 +- Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java | 4 ++-- Mage.Sets/src/mage/cards/d/DerangedHermit.java | 2 +- Mage.Sets/src/mage/cards/d/Derelor.java | 2 +- Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java | 2 +- Mage.Sets/src/mage/cards/d/DesperateCastaways.java | 2 +- Mage.Sets/src/mage/cards/d/DesperateSentry.java | 2 +- Mage.Sets/src/mage/cards/d/Despondency.java | 2 +- Mage.Sets/src/mage/cards/d/DetainmentSpell.java | 2 +- Mage.Sets/src/mage/cards/d/DeviantGlee.java | 2 +- Mage.Sets/src/mage/cards/d/DhundOperative.java | 2 +- Mage.Sets/src/mage/cards/d/DictateOfHeliod.java | 2 +- Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java | 2 +- Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java | 2 +- Mage.Sets/src/mage/cards/d/DiregrafCaptain.java | 4 ++-- Mage.Sets/src/mage/cards/d/DiregrafEscort.java | 2 +- Mage.Sets/src/mage/cards/d/DismissIntoDream.java | 2 +- Mage.Sets/src/mage/cards/d/DisruptionAura.java | 2 +- Mage.Sets/src/mage/cards/d/DivineFavor.java | 2 +- Mage.Sets/src/mage/cards/d/DivinePresence.java | 2 +- Mage.Sets/src/mage/cards/d/DivineTransformation.java | 2 +- Mage.Sets/src/mage/cards/d/DivinersWand.java | 2 +- Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java | 2 +- Mage.Sets/src/mage/cards/d/DolmenGate.java | 2 +- Mage.Sets/src/mage/cards/d/Domestication.java | 2 +- Mage.Sets/src/mage/cards/d/DominatingLicid.java | 2 +- Mage.Sets/src/mage/cards/d/Domineer.java | 2 +- Mage.Sets/src/mage/cards/d/DoorOfDestinies.java | 2 +- Mage.Sets/src/mage/cards/d/DormantGomazoa.java | 2 +- Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java | 2 +- Mage.Sets/src/mage/cards/d/DowsingDagger.java | 4 ++-- Mage.Sets/src/mage/cards/d/DraconicDestiny.java | 2 +- Mage.Sets/src/mage/cards/d/DragonAppeasement.java | 2 +- Mage.Sets/src/mage/cards/d/DragonBreath.java | 2 +- Mage.Sets/src/mage/cards/d/DragonFangs.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonGrip.java | 2 +- Mage.Sets/src/mage/cards/d/DragonHunter.java | 2 +- Mage.Sets/src/mage/cards/d/DragonMantle.java | 2 +- Mage.Sets/src/mage/cards/d/DragonScales.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonShadow.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java | 2 +- Mage.Sets/src/mage/cards/d/DragonWings.java | 2 +- Mage.Sets/src/mage/cards/d/DragonloftIdol.java | 2 +- Mage.Sets/src/mage/cards/d/DragonlordsServant.java | 2 +- Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java | 2 +- Mage.Sets/src/mage/cards/d/DralnusCrusade.java | 4 ++-- Mage.Sets/src/mage/cards/d/DreadOfNight.java | 2 +- Mage.Sets/src/mage/cards/d/DreadSlag.java | 2 +- Mage.Sets/src/mage/cards/d/DreamChisel.java | 2 +- Mage.Sets/src/mage/cards/d/DreamDevourer.java | 2 +- Mage.Sets/src/mage/cards/d/DreamHalls.java | 2 +- Mage.Sets/src/mage/cards/d/Drought.java | 4 ++-- Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java | 2 +- Mage.Sets/src/mage/cards/d/DruidsFamiliar.java | 2 +- Mage.Sets/src/mage/cards/d/DualCasting.java | 2 +- Mage.Sets/src/mage/cards/d/Dub.java | 2 +- Mage.Sets/src/mage/cards/d/Duplicant.java | 2 +- Mage.Sets/src/mage/cards/d/DuskCharger.java | 2 +- Mage.Sets/src/mage/cards/d/DustCorona.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenPatrol.java | 2 +- Mage.Sets/src/mage/cards/d/Dwindle.java | 2 +- Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java | 2 +- Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java | 2 +- 114 files changed, 126 insertions(+), 126 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java b/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java index 66221798f5f..bdc5c10b844 100644 --- a/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java +++ b/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java @@ -31,7 +31,7 @@ public final class DagobahMawSlug extends CardImpl { this.addAbility(new MonstrosityAbility("{3}{R}{G}{W}", 2)); // As long as Dagobah Maw Slug is monstrous it has swampwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new SwampwalkAbility()), MonstrousCondition.instance, "As long as Dagobah Maw Slug is monstrous it has swampwalk") diff --git a/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java b/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java index 34a6cc5f232..e689e8989a8 100644 --- a/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java +++ b/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java @@ -40,7 +40,7 @@ public final class DamiaSageOfStone extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // At the beginning of your upkeep, if you have fewer than seven cards in hand, draw cards equal to the difference. this.addAbility(new DamiaSageOfStoneTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DampingField.java b/Mage.Sets/src/mage/cards/d/DampingField.java index 54a3da79ba9..bb0688da254 100644 --- a/Mage.Sets/src/mage/cards/d/DampingField.java +++ b/Mage.Sets/src/mage/cards/d/DampingField.java @@ -26,7 +26,7 @@ public final class DampingField extends CardImpl { // Players can't untap more than one artifact during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DampingFieldEffect())); + this.addAbility(new SimpleStaticAbility(new DampingFieldEffect())); } private DampingField(final DampingField card) { diff --git a/Mage.Sets/src/mage/cards/d/DampingMatrix.java b/Mage.Sets/src/mage/cards/d/DampingMatrix.java index 25ac2ff31da..beaa0109ee2 100644 --- a/Mage.Sets/src/mage/cards/d/DampingMatrix.java +++ b/Mage.Sets/src/mage/cards/d/DampingMatrix.java @@ -29,7 +29,7 @@ public final class DampingMatrix extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Activated abilities of artifacts and creatures can't be activated unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DampingMatrixEffect())); + this.addAbility(new SimpleStaticAbility(new DampingMatrixEffect())); } private DampingMatrix(final DampingMatrix card) { diff --git a/Mage.Sets/src/mage/cards/d/Dandan.java b/Mage.Sets/src/mage/cards/d/Dandan.java index 15be04bb225..b702063bd6c 100644 --- a/Mage.Sets/src/mage/cards/d/Dandan.java +++ b/Mage.Sets/src/mage/cards/d/Dandan.java @@ -28,7 +28,7 @@ public final class Dandan extends CardImpl { this.toughness = new MageInt(1); // Dandan can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // When you control no Islands, sacrifice Dandan. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java b/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java index 6cc1a77137a..870f340fae5 100644 --- a/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java +++ b/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java @@ -50,7 +50,7 @@ public final class DanithaCapashenParagon extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Aura and Equipment spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private DanithaCapashenParagon(final DanithaCapashenParagon card) { diff --git a/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java b/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java index 40d23c4106e..5a05b6caaee 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java @@ -49,7 +49,7 @@ public final class DarigaazReincarnated extends CardImpl { this.addAbility(HasteAbility.getInstance()); // If Darigaaz Reincarnated would die, instead exile it with three egg counters on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DarigaazReincarnatedDiesEffect())); + this.addAbility(new SimpleStaticAbility(new DarigaazReincarnatedDiesEffect())); // At the beginning of your upkeep, if Darigaaz is exiled with an egg counter on it, remove an egg counter from it. Then if Darigaaz has no egg counters on it, return it to the battlefield. this.addAbility(new DarigaazReincarnatedInterveningIfTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DarkFavor.java b/Mage.Sets/src/mage/cards/d/DarkFavor.java index 6442332b0e7..ad1c9fd26e0 100644 --- a/Mage.Sets/src/mage/cards/d/DarkFavor.java +++ b/Mage.Sets/src/mage/cards/d/DarkFavor.java @@ -35,7 +35,7 @@ public final class DarkFavor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(1), false)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield))); } private DarkFavor(final DarkFavor card) { diff --git a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java index 901f4d206e9..21304bb3b65 100644 --- a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java +++ b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java @@ -42,7 +42,7 @@ public final class DarkPrivilege extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice a creature: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/d/DarkestHour.java b/Mage.Sets/src/mage/cards/d/DarkestHour.java index 6430ed367d0..297069926a9 100644 --- a/Mage.Sets/src/mage/cards/d/DarkestHour.java +++ b/Mage.Sets/src/mage/cards/d/DarkestHour.java @@ -23,7 +23,7 @@ public final class DarkestHour extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}"); // All creatures are black. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DarkestHourEffect())); + this.addAbility(new SimpleStaticAbility(new DarkestHourEffect())); } private DarkestHour(final DarkestHour card) { diff --git a/Mage.Sets/src/mage/cards/d/DarksteelAxe.java b/Mage.Sets/src/mage/cards/d/DarksteelAxe.java index 7f009e0e898..c50e0444146 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelAxe.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelAxe.java @@ -29,7 +29,7 @@ public final class DarksteelAxe extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java b/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java index f7b0998015d..32f2614745e 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java @@ -34,7 +34,7 @@ public final class DarksteelGarrison extends CardImpl { Ability gainedAbility = IndestructibleAbility.getInstance(); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Fortified land has indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever fortified land becomes tapped, target creature gets +1/+1 until end of turn. Ability ability = new BecomesTappedAttachedTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), "fortified land"); diff --git a/Mage.Sets/src/mage/cards/d/DaruWarchief.java b/Mage.Sets/src/mage/cards/d/DaruWarchief.java index bb6eb56aab9..75ad2af7c5e 100644 --- a/Mage.Sets/src/mage/cards/d/DaruWarchief.java +++ b/Mage.Sets/src/mage/cards/d/DaruWarchief.java @@ -37,10 +37,10 @@ public final class DaruWarchief extends CardImpl { this.toughness = new MageInt(1); // Soldier spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Soldier creatures you control get +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 2, Duration.WhileOnBattlefield, filterCreatures, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 2, Duration.WhileOnBattlefield, filterCreatures, false))); } private DaruWarchief(final DaruWarchief card) { diff --git a/Mage.Sets/src/mage/cards/d/DauntingDefender.java b/Mage.Sets/src/mage/cards/d/DauntingDefender.java index 148dcc9915a..c887e1e7601 100644 --- a/Mage.Sets/src/mage/cards/d/DauntingDefender.java +++ b/Mage.Sets/src/mage/cards/d/DauntingDefender.java @@ -32,7 +32,7 @@ public final class DauntingDefender extends CardImpl { this.toughness = new MageInt(3); // If a source would deal damage to a Cleric creature you control, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DauntingDefenderEffect(1))); + this.addAbility(new SimpleStaticAbility(new DauntingDefenderEffect(1))); } private DauntingDefender(final DauntingDefender card) { diff --git a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java index 2c6dff4dce2..2cbf9c4bf09 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -54,7 +54,7 @@ public final class DauntlessDourbark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(amount))); // Dauntless Dourbark has trample as long as you control another Treefolk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter2), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter2), rule))); } diff --git a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java index 07fe1b4bc56..f898a711b32 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java @@ -39,7 +39,7 @@ public final class DauntlessRiverMarshal extends CardImpl { this.toughness = new MageInt(1); // Dauntless River Marshal gets +1/+1 as long as you control an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {3}{U}: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); diff --git a/Mage.Sets/src/mage/cards/d/DawnElemental.java b/Mage.Sets/src/mage/cards/d/DawnElemental.java index ba6ccfd3c52..9f4e4301b50 100644 --- a/Mage.Sets/src/mage/cards/d/DawnElemental.java +++ b/Mage.Sets/src/mage/cards/d/DawnElemental.java @@ -33,7 +33,7 @@ public final class DawnElemental extends CardImpl { // Prevent all damage that would be dealt to Dawn Elemental. Effect effect = new PreventAllDamageToSourceEffect(Duration.WhileOnBattlefield); effect.setText("Prevent all damage that would be dealt to {this}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private DawnElemental(final DawnElemental card) { diff --git a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java index 6d29e25f9c0..c28e3092c8f 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java +++ b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java @@ -29,7 +29,7 @@ public final class DayOfDestiny extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Legendary creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } private DayOfDestiny(final DayOfDestiny card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadWeight.java b/Mage.Sets/src/mage/cards/d/DeadWeight.java index a4198a02117..0f7e6378f6f 100644 --- a/Mage.Sets/src/mage/cards/d/DeadWeight.java +++ b/Mage.Sets/src/mage/cards/d/DeadWeight.java @@ -35,7 +35,7 @@ public final class DeadWeight extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); } private DeadWeight(final DeadWeight card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java index 89794e69400..67ca2b63b70 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java @@ -37,7 +37,7 @@ public final class DeadeyeNavigator extends CardImpl { // As long as Deadeye Navigator is paired with another creature, each of those creatures has "{1}{U}: Exile this creature, then return it to the battlefield under your control." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(true), new ManaCostsImpl<>("{1}{U}")); ability.addEffect(new ReturnToBattlefieldUnderYourControlSourceEffect()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private DeadeyeNavigator(final DeadeyeNavigator card) { diff --git a/Mage.Sets/src/mage/cards/d/Deadfall.java b/Mage.Sets/src/mage/cards/d/Deadfall.java index 9b172a1af1b..c2a80a1ae8b 100644 --- a/Mage.Sets/src/mage/cards/d/Deadfall.java +++ b/Mage.Sets/src/mage/cards/d/Deadfall.java @@ -24,7 +24,7 @@ public final class Deadfall extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // Creatures with forestwalk can be blocked as though they didn't have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DeadfallEffect())); + this.addAbility(new SimpleStaticAbility(new DeadfallEffect())); } private Deadfall(final Deadfall card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java b/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java index 552b8f28f67..3c04592fdc5 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java @@ -32,7 +32,7 @@ public final class DeadlyWanderings extends CardImpl { ContinuousEffect boostEffect = new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield); Effect effect = new ConditionalContinuousEffect(boostEffect, new CreatureCountCondition(1, TargetController.YOU), "As long as you control exactly one creature, that creature gets +2/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ContinuousEffect deathtouchEffect = new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE); effect = new ConditionalContinuousEffect(deathtouchEffect, new CreatureCountCondition(1, TargetController.YOU), "and has deathtouch"); diff --git a/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java b/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java index 19e6824e411..bc7eb7d2280 100644 --- a/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java +++ b/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java @@ -57,7 +57,7 @@ public final class DeathMaskDuplicant extends CardImpl { this.addAbility(ability); // As long as a card exiled with Death-Mask Duplicant has flying, Death-Mask Duplicant has flying. The same is true for fear, first strike, double strike, haste, landwalk, protection, and trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DeathMaskDuplicantEffect())); + this.addAbility(new SimpleStaticAbility(new DeathMaskDuplicantEffect())); } private DeathMaskDuplicant(final DeathMaskDuplicant card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java index 3a13b82a18c..c4c2f5665fe 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java +++ b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java @@ -24,7 +24,7 @@ public final class DeathPitOffering extends CardImpl { // When Death Pit Offering enters the battlefield, sacrifice all creatures you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeAllControllerEffect(StaticFilters.FILTER_PERMANENT_CREATURES))); // Creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); } private DeathPitOffering(final DeathPitOffering card) { @@ -35,4 +35,4 @@ public final class DeathPitOffering extends CardImpl { public DeathPitOffering copy() { return new DeathPitOffering(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DeathTrooper.java b/Mage.Sets/src/mage/cards/d/DeathTrooper.java index fa5933e5449..976497f6fa8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathTrooper.java +++ b/Mage.Sets/src/mage/cards/d/DeathTrooper.java @@ -34,7 +34,7 @@ public final class DeathTrooper extends CardImpl { this.toughness = new MageInt(1); // Trooper creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java index 44bf071a318..dfc6fb45df6 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java @@ -49,8 +49,8 @@ public final class DeathbringerLiege extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); Ability ability = new SpellCastControllerTriggeredAbility(new TapTargetEffect(), filterWhiteSpellCard, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java b/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java index 267085dea95..46a2e7112d8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java +++ b/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java @@ -35,7 +35,7 @@ public final class DeathmaskNezumi extends CardImpl { // As long as you have seven or more cards in hand, Deathmask Nezumi gets +2/+1 and has fear. Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,6); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1")); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield), condition, "and has fear")); diff --git a/Mage.Sets/src/mage/cards/d/Deathrender.java b/Mage.Sets/src/mage/cards/d/Deathrender.java index e5a86500000..503576da976 100644 --- a/Mage.Sets/src/mage/cards/d/Deathrender.java +++ b/Mage.Sets/src/mage/cards/d/Deathrender.java @@ -32,7 +32,7 @@ public final class Deathrender extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // Whenever equipped creature dies, you may put a creature card from your hand onto the battlefield and attach Deathrender to it. this.addAbility(new DiesAttachedTriggeredAbility(new DeathrenderEffect(), "equipped creature")); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/d/DeathsApproach.java b/Mage.Sets/src/mage/cards/d/DeathsApproach.java index 9543a3d5f5d..27d79664fc3 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsApproach.java +++ b/Mage.Sets/src/mage/cards/d/DeathsApproach.java @@ -43,7 +43,7 @@ public final class DeathsApproach extends CardImpl { // Enchanted Creature gets -X/-X, where X is the number of creature cards in its controller's graveyard. DynamicValue unboost = new SignInversionDynamicValue( new CardsInEnchantedCreaturesControllerGraveyardCount(new FilterCreatureCard("the number of creature cards in its controller's graveyard"))); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(unboost,unboost, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(unboost,unboost, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeathsShadow.java b/Mage.Sets/src/mage/cards/d/DeathsShadow.java index 9059bd9834f..c56e39eb0dd 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsShadow.java +++ b/Mage.Sets/src/mage/cards/d/DeathsShadow.java @@ -29,7 +29,7 @@ public final class DeathsShadow extends CardImpl { // Death's Shadow gets -X/-X, where X is your life total. SignInversionDynamicValue x = new SignInversionDynamicValue(ControllerLifeCount.instance, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(x, x, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(x, x, Duration.WhileOnBattlefield))); } private DeathsShadow(final DeathsShadow card) { diff --git a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java index 7febccb5786..01d8111ee52 100644 --- a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java +++ b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java @@ -36,7 +36,7 @@ public final class DebilitatingInjury extends CardImpl { this.addAbility(ability); // Enchanted creature gets -2/-2 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2,-2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2,-2, Duration.WhileOnBattlefield))); } private DebilitatingInjury(final DebilitatingInjury card) { diff --git a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java index cfbbf2f8b7a..5344a120d3f 100644 --- a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java @@ -39,7 +39,7 @@ public final class DebtorsPulpit extends CardImpl { // Enchanted land has "{T}: Tap target creature." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Tap target creature.\""))); } diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java b/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java index a35260a56df..20a18a4af03 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java @@ -25,7 +25,7 @@ public final class DeepSeaSerpent extends CardImpl { this.toughness = new MageInt(5); // Deep-Sea Serpent can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private DeepSeaSerpent(final DeepSeaSerpent card) { diff --git a/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java b/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java index c45342bc9bf..7dfef31f535 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java +++ b/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java @@ -33,7 +33,7 @@ public final class DeepSlumberTitan extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Deep-Slumber Titan doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever Deep-Slumber Titan is dealt damage, untap it. this.addAbility(new DealtDamageToSourceTriggeredAbility(new UntapSourceEffect().setText("untap it"), false)); diff --git a/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java b/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java index 0856936789f..5b9f788df12 100644 --- a/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java +++ b/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java @@ -36,7 +36,7 @@ public final class DeepchannelMentor extends CardImpl { this.toughness = new MageInt(2); // Blue creatures you control can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield))); } private DeepchannelMentor(final DeepchannelMentor card) { diff --git a/Mage.Sets/src/mage/cards/d/Defang.java b/Mage.Sets/src/mage/cards/d/Defang.java index 980908683ed..f037ba144a8 100644 --- a/Mage.Sets/src/mage/cards/d/Defang.java +++ b/Mage.Sets/src/mage/cards/d/Defang.java @@ -35,7 +35,7 @@ public final class Defang extends CardImpl { this.addAbility(ability); // Prevent all damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); } private Defang(final Defang card) { diff --git a/Mage.Sets/src/mage/cards/d/DefenseGrid.java b/Mage.Sets/src/mage/cards/d/DefenseGrid.java index f8f55298195..57dd6ef513c 100644 --- a/Mage.Sets/src/mage/cards/d/DefenseGrid.java +++ b/Mage.Sets/src/mage/cards/d/DefenseGrid.java @@ -22,7 +22,7 @@ public final class DefenseGrid extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Each spell costs {3} more to cast except during its controller's turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DefenseGridCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new DefenseGridCostModificationEffect())); } diff --git a/Mage.Sets/src/mage/cards/d/DefensiveStance.java b/Mage.Sets/src/mage/cards/d/DefensiveStance.java index 0d61c6f79de..18c4b33d086 100644 --- a/Mage.Sets/src/mage/cards/d/DefensiveStance.java +++ b/Mage.Sets/src/mage/cards/d/DefensiveStance.java @@ -31,7 +31,7 @@ public final class DefensiveStance extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-1, 1, Duration.WhileOnBattlefield))); } private DefensiveStance(final DefensiveStance card) { diff --git a/Mage.Sets/src/mage/cards/d/Dehydration.java b/Mage.Sets/src/mage/cards/d/Dehydration.java index 7f3376d4216..894a153c490 100644 --- a/Mage.Sets/src/mage/cards/d/Dehydration.java +++ b/Mage.Sets/src/mage/cards/d/Dehydration.java @@ -32,7 +32,7 @@ public final class Dehydration extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private Dehydration(final Dehydration card) { diff --git a/Mage.Sets/src/mage/cards/d/DelayingShield.java b/Mage.Sets/src/mage/cards/d/DelayingShield.java index a2daebff08d..f4b9191873b 100644 --- a/Mage.Sets/src/mage/cards/d/DelayingShield.java +++ b/Mage.Sets/src/mage/cards/d/DelayingShield.java @@ -31,7 +31,7 @@ public final class DelayingShield extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If damage would be dealt to you, put that many delay counters on Delaying Shield instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DelayingShieldReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new DelayingShieldReplacementEffect())); // At the beginning of your upkeep, remove all delay counters from Delaying Shield. For each delay counter removed this way, you lose 1 life unless you pay {1}{W}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DelayingShieldUpkeepEffect())); diff --git a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java index 1041cb6bf07..fdf7702a653 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java +++ b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java @@ -34,7 +34,7 @@ public final class DemonicAppetite extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // At the beginning of your upkeep, sacrifice a creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, "") diff --git a/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java b/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java index 6a06eb34c49..4742ab35130 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java +++ b/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java @@ -45,7 +45,7 @@ public final class DemonicEmbrace extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+1, has flying, and is a Demon in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(", has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DemonicRuckus.java b/Mage.Sets/src/mage/cards/d/DemonicRuckus.java index 8a6523f099f..f50a91eed80 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicRuckus.java +++ b/Mage.Sets/src/mage/cards/d/DemonicRuckus.java @@ -36,7 +36,7 @@ public final class DemonicRuckus extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 and has menace and trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); ability.addEffect(new GainAbilityAttachedEffect(new MenaceAbility(false), AttachmentType.AURA).setText("and has menace")); ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA).setText("and trample")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DemonicTorment.java b/Mage.Sets/src/mage/cards/d/DemonicTorment.java index 543c929f584..452677b55ea 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTorment.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTorment.java @@ -32,9 +32,9 @@ public final class DemonicTorment extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // Prevent all combat damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); } private DemonicTorment(final DemonicTorment card) { diff --git a/Mage.Sets/src/mage/cards/d/DemonicVigor.java b/Mage.Sets/src/mage/cards/d/DemonicVigor.java index 53c5c27bbe1..1fd11281def 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicVigor.java +++ b/Mage.Sets/src/mage/cards/d/DemonicVigor.java @@ -38,7 +38,7 @@ public final class DemonicVigor extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // When enchanted creature dies, return that card to its owner's hand. this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java b/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java index bc7c4f8b10f..57dd4b7b12c 100644 --- a/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java +++ b/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java @@ -26,7 +26,7 @@ public final class DemonmailHauberk extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 2))); // Equip - Sacrifice a creature. this.addAbility(new EquipAbility( diff --git a/Mage.Sets/src/mage/cards/d/DemonsJester.java b/Mage.Sets/src/mage/cards/d/DemonsJester.java index c2a73b9fcfb..f07aa228ecc 100644 --- a/Mage.Sets/src/mage/cards/d/DemonsJester.java +++ b/Mage.Sets/src/mage/cards/d/DemonsJester.java @@ -31,7 +31,7 @@ public final class DemonsJester extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Hellbent - Demon's Jester gets +2/+1 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,1,Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — {this} gets +2/+1 as long as you have no cards in hand"))); } diff --git a/Mage.Sets/src/mage/cards/d/Demotion.java b/Mage.Sets/src/mage/cards/d/Demotion.java index 590fa55984d..e964c4dc0bf 100644 --- a/Mage.Sets/src/mage/cards/d/Demotion.java +++ b/Mage.Sets/src/mage/cards/d/Demotion.java @@ -32,7 +32,7 @@ public final class Demotion extends CardImpl { this.addAbility(ability); // Enchanted creature can't block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockActivateAttachedEffect())); } diff --git a/Mage.Sets/src/mage/cards/d/DenProtector.java b/Mage.Sets/src/mage/cards/d/DenProtector.java index 943c41c0ff1..4e489e89299 100644 --- a/Mage.Sets/src/mage/cards/d/DenProtector.java +++ b/Mage.Sets/src/mage/cards/d/DenProtector.java @@ -31,7 +31,7 @@ public final class DenProtector extends CardImpl { this.toughness = new MageInt(1); // Creatures with power less than Den Protector's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); // Megamorph {1}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}"), true)); diff --git a/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java b/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java index e590cce7a81..55885247a4a 100644 --- a/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java +++ b/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java @@ -34,7 +34,7 @@ public final class DennickPiousApprentice extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Cards in graveyards can't be the targets of spells or abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedCardsGraveyardsEffect())); // Disturb {2}{W}{U} this.addAbility(new DisturbAbility(this, "{2}{W}{U}")); diff --git a/Mage.Sets/src/mage/cards/d/DenseCanopy.java b/Mage.Sets/src/mage/cards/d/DenseCanopy.java index 62d967e9b36..4d8256b8eee 100644 --- a/Mage.Sets/src/mage/cards/d/DenseCanopy.java +++ b/Mage.Sets/src/mage/cards/d/DenseCanopy.java @@ -26,7 +26,7 @@ public final class DenseCanopy extends CardImpl { // Creatures with flying can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DenseCanopyCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new DenseCanopyCantBlockEffect())); } private DenseCanopy(final DenseCanopy card) { diff --git a/Mage.Sets/src/mage/cards/d/DenseFoliage.java b/Mage.Sets/src/mage/cards/d/DenseFoliage.java index 95d6fb52e83..f9bce7f005a 100644 --- a/Mage.Sets/src/mage/cards/d/DenseFoliage.java +++ b/Mage.Sets/src/mage/cards/d/DenseFoliage.java @@ -24,7 +24,7 @@ public final class DenseFoliage extends CardImpl { // Creatures can't be the targets of spells. CantBeTargetedAllEffect cantTargetEffect = new CantBeTargetedAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, new FilterSpell("spells"), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, cantTargetEffect)); + this.addAbility(new SimpleStaticAbility(cantTargetEffect)); } private DenseFoliage(final DenseFoliage card) { diff --git a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java index e281ace2cbc..126338d0e63 100644 --- a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java +++ b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java @@ -38,12 +38,12 @@ public final class DepalaPilotExemplar extends CardImpl { this.toughness = new MageInt(3); // Other Dwarves you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.DWARF, "Dwarves"), true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.DWARF, "Dwarves"), true))); // Each Vehicle you control gets +1/+1 as long as it's a creature. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.VEHICLE, "Vehicle")); effect.setText("Each Vehicle you control gets +1/+1 as long as it's a creature"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever Depala, Pilot Exemplar becomes tapped, you may pay {X}. If you do, reveal the top X cards of your library, put all Dwarf and Vehicle cards from among them into your hand, then put the rest on the bottom of your library in a random order. this.addAbility(new BecomesTappedSourceTriggeredAbility(new DepalaPilotExemplarEffect(), true)); diff --git a/Mage.Sets/src/mage/cards/d/DerangedHermit.java b/Mage.Sets/src/mage/cards/d/DerangedHermit.java index 84fcb18453e..7a45e61924a 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedHermit.java +++ b/Mage.Sets/src/mage/cards/d/DerangedHermit.java @@ -41,7 +41,7 @@ public final class DerangedHermit extends CardImpl { // When Deranged Hermit enters the battlefield, create four 1/1 green Squirrel creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SquirrelToken(), 4))); // Squirrel creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/d/Derelor.java b/Mage.Sets/src/mage/cards/d/Derelor.java index 5d1ff13d712..1c9107f5918 100644 --- a/Mage.Sets/src/mage/cards/d/Derelor.java +++ b/Mage.Sets/src/mage/cards/d/Derelor.java @@ -35,7 +35,7 @@ public final class Derelor extends CardImpl { this.toughness = new MageInt(4); // Black spells you cast cost {B} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); } private Derelor(final Derelor card) { diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java index 6542a29050d..ab84c6d5de5 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java @@ -33,7 +33,7 @@ public final class DescendantOfKiyomaro extends CardImpl { this.toughness = new MageInt(3); // As long as you have more cards in hand than each opponent, Descendant of Kiyomaro gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,2, Duration.WhileOnBattlefield), MoreCardsInHandThanOpponentsCondition.instance, "As long as you have more cards in hand than each opponent, {this} gets +1/+2")); diff --git a/Mage.Sets/src/mage/cards/d/DesperateCastaways.java b/Mage.Sets/src/mage/cards/d/DesperateCastaways.java index e8b45c8215b..dbe011022b0 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateCastaways.java +++ b/Mage.Sets/src/mage/cards/d/DesperateCastaways.java @@ -30,7 +30,7 @@ public final class DesperateCastaways extends CardImpl { this.toughness = new MageInt(3); // Desperate Castaways can't attack unless you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DesperateCastawaysEffect())); + this.addAbility(new SimpleStaticAbility(new DesperateCastawaysEffect())); } private DesperateCastaways(final DesperateCastaways card) { diff --git a/Mage.Sets/src/mage/cards/d/DesperateSentry.java b/Mage.Sets/src/mage/cards/d/DesperateSentry.java index f86be64b859..1035a151ee7 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateSentry.java +++ b/Mage.Sets/src/mage/cards/d/DesperateSentry.java @@ -38,7 +38,7 @@ public final class DesperateSentry extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +3/+0 as long as there are four or more card types among cards in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/Despondency.java b/Mage.Sets/src/mage/cards/d/Despondency.java index 1c64c029276..16ef621859a 100644 --- a/Mage.Sets/src/mage/cards/d/Despondency.java +++ b/Mage.Sets/src/mage/cards/d/Despondency.java @@ -36,7 +36,7 @@ public final class Despondency extends CardImpl { this.addAbility(ability); // Enchanted creature gets -2/-0. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(-2, 0)); this.addAbility(ability); // When Despondency is put into a graveyard from the battlefield, return Despondency to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java index 0dcd4bc8711..538f62585e8 100644 --- a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java +++ b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java @@ -37,7 +37,7 @@ public final class DetainmentSpell extends CardImpl { this.addAbility(ability); // Enchanted creature's activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantActivateAbilitiesAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantActivateAbilitiesAttachedEffect())); // {1}{W}: Attach Detainment Spell to target creature. ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature"), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/d/DeviantGlee.java b/Mage.Sets/src/mage/cards/d/DeviantGlee.java index 88da6d180c3..e9802ae78d0 100644 --- a/Mage.Sets/src/mage/cards/d/DeviantGlee.java +++ b/Mage.Sets/src/mage/cards/d/DeviantGlee.java @@ -40,7 +40,7 @@ public final class DeviantGlee extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has "{R}: This creature gains trample until end of turn." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn),new ManaCostsImpl<>("{R}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/d/DhundOperative.java b/Mage.Sets/src/mage/cards/d/DhundOperative.java index 9b36aad2756..70545c501c1 100644 --- a/Mage.Sets/src/mage/cards/d/DhundOperative.java +++ b/Mage.Sets/src/mage/cards/d/DhundOperative.java @@ -41,7 +41,7 @@ public final class DhundOperative extends CardImpl { new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), "and has deathtouch"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); + Ability ability = new SimpleStaticAbility(boostEffect); ability.addEffect(gainAbilityEffect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java b/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java index 85261780cdf..96d344f6f77 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java @@ -24,7 +24,7 @@ public final class DictateOfHeliod extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2,2,Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2,2,Duration.WhileOnBattlefield))); } private DictateOfHeliod(final DictateOfHeliod card) { diff --git a/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java b/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java index b4006a5d982..0f20c7f0940 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java @@ -31,7 +31,7 @@ public final class DictateOfTheTwinGods extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DictateOfTheTwinGodsEffect())); + this.addAbility(new SimpleStaticAbility(new DictateOfTheTwinGodsEffect())); } diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java index 48767027a5c..4bdaf42965e 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java @@ -39,7 +39,7 @@ public final class DiplomaticImmunity extends CardImpl { this.addAbility(ShroudAbility.getInstance()); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private DiplomaticImmunity(final DiplomaticImmunity card) { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java index 74e6ee240a7..0e35ac6c7bb 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java @@ -40,7 +40,7 @@ public final class DiregrafCaptain extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Other Zombie creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever another Zombie you control dies, target opponent loses 1 life. this.addAbility(new DiregrafCaptainTriggeredAbility()); @@ -99,4 +99,4 @@ class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever another Zombie you control dies, target opponent loses 1 life."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java index 4f2b77d80df..3db913288a8 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java @@ -40,7 +40,7 @@ public final class DiregrafEscort extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Diregraf Escort is paired with another creature, both creatures have protection from Zombies. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(new ProtectionAbility(filter), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(new ProtectionAbility(filter), ruleText))); } private DiregrafEscort(final DiregrafEscort card) { diff --git a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java index b43d6514179..c504fd86cd4 100644 --- a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java +++ b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java @@ -31,7 +31,7 @@ public final class DismissIntoDream extends CardImpl { // Each creature your opponents control is an Illusion in addition to its other types // and has "When this creature becomes the target of a spell or ability, sacrifice it." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DismissIntoDreamEffect(filter))); + this.addAbility(new SimpleStaticAbility(new DismissIntoDreamEffect(filter))); } private DismissIntoDream(final DismissIntoDream card) { diff --git a/Mage.Sets/src/mage/cards/d/DisruptionAura.java b/Mage.Sets/src/mage/cards/d/DisruptionAura.java index 10653f75037..f722c6bd301 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptionAura.java +++ b/Mage.Sets/src/mage/cards/d/DisruptionAura.java @@ -41,7 +41,7 @@ public final class DisruptionAura extends CardImpl { ability = new BeginningOfUpkeepTriggeredAbility(new DisruptionAuraEffect()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted artifact has \"At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private DisruptionAura(final DisruptionAura card) { diff --git a/Mage.Sets/src/mage/cards/d/DivineFavor.java b/Mage.Sets/src/mage/cards/d/DivineFavor.java index 7f25ae6ab7e..9e2ec4c9fa3 100644 --- a/Mage.Sets/src/mage/cards/d/DivineFavor.java +++ b/Mage.Sets/src/mage/cards/d/DivineFavor.java @@ -35,7 +35,7 @@ public final class DivineFavor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3), false)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/d/DivinePresence.java b/Mage.Sets/src/mage/cards/d/DivinePresence.java index c6e1612ede3..1bad685fde0 100644 --- a/Mage.Sets/src/mage/cards/d/DivinePresence.java +++ b/Mage.Sets/src/mage/cards/d/DivinePresence.java @@ -24,7 +24,7 @@ public final class DivinePresence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // If a source would deal 4 or more damage to a creature or player, that source deals 3 damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DivinePresenceEffect())); + this.addAbility(new SimpleStaticAbility(new DivinePresenceEffect())); } private DivinePresence(final DivinePresence card) { diff --git a/Mage.Sets/src/mage/cards/d/DivineTransformation.java b/Mage.Sets/src/mage/cards/d/DivineTransformation.java index f384e1a8068..43ba9008699 100644 --- a/Mage.Sets/src/mage/cards/d/DivineTransformation.java +++ b/Mage.Sets/src/mage/cards/d/DivineTransformation.java @@ -35,7 +35,7 @@ public final class DivineTransformation extends CardImpl { // Enchanted creature gets +3/+3. Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); } private DivineTransformation(final DivineTransformation card) { diff --git a/Mage.Sets/src/mage/cards/d/DivinersWand.java b/Mage.Sets/src/mage/cards/d/DivinersWand.java index d31f9ac204a..789c266a3b7 100644 --- a/Mage.Sets/src/mage/cards/d/DivinersWand.java +++ b/Mage.Sets/src/mage/cards/d/DivinersWand.java @@ -45,7 +45,7 @@ public final class DivinersWand extends CardImpl { Effect effectDraw = new GainAbilityAttachedEffect(newDraw, AttachmentType.EQUIPMENT) .setText("\"{4}: Draw a card.\""); // total ability - Ability totalAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, effectBoost); + Ability totalAbility = new SimpleStaticAbility(effectBoost); totalAbility.addEffect(effectDraw.concatBy("and")); this.addAbility(totalAbility); diff --git a/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java b/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java index 672bb8c7256..7149a0ca5d6 100644 --- a/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java +++ b/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java @@ -53,7 +53,7 @@ public final class DjeruWithEyesOpen extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); // If a source would deal damage to a planeswalker you control, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DjeruWithEyesOpenPreventEffect())); + this.addAbility(new SimpleStaticAbility(new DjeruWithEyesOpenPreventEffect())); } private DjeruWithEyesOpen(final DjeruWithEyesOpen card) { diff --git a/Mage.Sets/src/mage/cards/d/DolmenGate.java b/Mage.Sets/src/mage/cards/d/DolmenGate.java index d0b126bf1e3..9b708e557f9 100644 --- a/Mage.Sets/src/mage/cards/d/DolmenGate.java +++ b/Mage.Sets/src/mage/cards/d/DolmenGate.java @@ -27,7 +27,7 @@ public final class DolmenGate extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Prevent all combat damage that would be dealt to attacking creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, filter, true))); } private DolmenGate(final DolmenGate card) { diff --git a/Mage.Sets/src/mage/cards/d/Domestication.java b/Mage.Sets/src/mage/cards/d/Domestication.java index a83bb7f4bec..c3cf849cf4e 100644 --- a/Mage.Sets/src/mage/cards/d/Domestication.java +++ b/Mage.Sets/src/mage/cards/d/Domestication.java @@ -42,7 +42,7 @@ public final class Domestication extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of your end step, if enchanted creature's power is 4 or greater, sacrifice Domestication. TriggeredAbility ability2 = new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/d/DominatingLicid.java b/Mage.Sets/src/mage/cards/d/DominatingLicid.java index adf90bfdf9b..09ed27f0b32 100644 --- a/Mage.Sets/src/mage/cards/d/DominatingLicid.java +++ b/Mage.Sets/src/mage/cards/d/DominatingLicid.java @@ -31,7 +31,7 @@ public final class DominatingLicid extends CardImpl { this.addAbility(new LicidAbility(new ManaCostsImpl<>("{1}{U}{U}"), new ColoredManaCost(ColoredManaSymbol.U))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } private DominatingLicid(final DominatingLicid card) { diff --git a/Mage.Sets/src/mage/cards/d/Domineer.java b/Mage.Sets/src/mage/cards/d/Domineer.java index ff847f390f4..e41877951dc 100644 --- a/Mage.Sets/src/mage/cards/d/Domineer.java +++ b/Mage.Sets/src/mage/cards/d/Domineer.java @@ -40,7 +40,7 @@ public final class Domineer extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted artifact creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("artifact creature"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("artifact creature"))); } private Domineer(final Domineer card) { diff --git a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java index d3103fc9718..22fcd5cfdf0 100644 --- a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java +++ b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java @@ -36,7 +36,7 @@ public final class DoorOfDestinies extends CardImpl { this.addAbility(new AddCounterAbility()); // Creatures you control of the chosen type get +1/+1 for each charge counter on Door of Destinies. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostCreatureEffectEffect())); + this.addAbility(new SimpleStaticAbility(new BoostCreatureEffectEffect())); } private DoorOfDestinies(final DoorOfDestinies card) { diff --git a/Mage.Sets/src/mage/cards/d/DormantGomazoa.java b/Mage.Sets/src/mage/cards/d/DormantGomazoa.java index f1a3d32dbcb..b52f1096d8f 100644 --- a/Mage.Sets/src/mage/cards/d/DormantGomazoa.java +++ b/Mage.Sets/src/mage/cards/d/DormantGomazoa.java @@ -35,7 +35,7 @@ public final class DormantGomazoa extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Dormant Gomazoa doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you become the target of a spell, you may untap Dormant Gomazoa. this.addAbility(new BecomesTargetControllerTriggeredAbility(new UntapSourceEffect(), diff --git a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java index eb4301f0d4d..740878c830a 100644 --- a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java +++ b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java @@ -28,7 +28,7 @@ public final class DosanTheFallingLeaf extends CardImpl { this.toughness = new MageInt(2); // Players can cast spells only during their own turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DosanTheFallingLeafEffect())); + this.addAbility(new SimpleStaticAbility(new DosanTheFallingLeafEffect())); } private DosanTheFallingLeaf(final DosanTheFallingLeaf card) { diff --git a/Mage.Sets/src/mage/cards/d/DowsingDagger.java b/Mage.Sets/src/mage/cards/d/DowsingDagger.java index 7c1dcf9256c..8a2f5db3934 100644 --- a/Mage.Sets/src/mage/cards/d/DowsingDagger.java +++ b/Mage.Sets/src/mage/cards/d/DowsingDagger.java @@ -42,7 +42,7 @@ public final class DowsingDagger extends CardImpl { this.addAbility(ability); // Equipped creature gets +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 1))); // Whenever equipped creature deals combat damage to a player, you may transform Dowsing Dagger. this.addAbility(new TransformAbility()); @@ -60,4 +60,4 @@ public final class DowsingDagger extends CardImpl { public DowsingDagger copy() { return new DowsingDagger(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DraconicDestiny.java b/Mage.Sets/src/mage/cards/d/DraconicDestiny.java index e377cbf651b..e0bef7a7145 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicDestiny.java +++ b/Mage.Sets/src/mage/cards/d/DraconicDestiny.java @@ -39,7 +39,7 @@ public final class DraconicDestiny extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying, haste, and "{1}: This creature gets +1/+0 until end of turn." It's a Dragon in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA).setText("and has flying")); ability.addEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA).setText(", haste")); ability.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/d/DragonAppeasement.java b/Mage.Sets/src/mage/cards/d/DragonAppeasement.java index f2ed52d82f5..8453ffa881b 100644 --- a/Mage.Sets/src/mage/cards/d/DragonAppeasement.java +++ b/Mage.Sets/src/mage/cards/d/DragonAppeasement.java @@ -24,7 +24,7 @@ public final class DragonAppeasement extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{R}{G}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you sacrifice a creature, you may draw a card. this.addAbility(new SacrificePermanentTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/d/DragonBreath.java b/Mage.Sets/src/mage/cards/d/DragonBreath.java index 3964d3b2349..2fe3a6ca27c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBreath.java +++ b/Mage.Sets/src/mage/cards/d/DragonBreath.java @@ -48,7 +48,7 @@ public final class DragonBreath extends CardImpl { this.addAbility(ability); // Enchanted creature has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); // {R}: Enchanted creature gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); diff --git a/Mage.Sets/src/mage/cards/d/DragonFangs.java b/Mage.Sets/src/mage/cards/d/DragonFangs.java index 5aed726aa94..96de2ba40cf 100644 --- a/Mage.Sets/src/mage/cards/d/DragonFangs.java +++ b/Mage.Sets/src/mage/cards/d/DragonFangs.java @@ -46,8 +46,8 @@ public final class DragonFangs extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Fangs from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonFangsEffect(), filter, true, SetTargetPointer.PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/d/DragonGrip.java b/Mage.Sets/src/mage/cards/d/DragonGrip.java index 5c77069f020..3cf21d87ea0 100644 --- a/Mage.Sets/src/mage/cards/d/DragonGrip.java +++ b/Mage.Sets/src/mage/cards/d/DragonGrip.java @@ -47,7 +47,7 @@ public final class DragonGrip extends CardImpl { // Enchanted creature gets +2/+0 and has first strike. Effect effect2 = new BoostEnchantedEffect(2, 0, Duration.WhileOnBattlefield); effect2.setText("Enchanted creature gets +2/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect2); + ability = new SimpleStaticAbility(effect2); effect2 = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect2.setText("and has first strike"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/d/DragonHunter.java b/Mage.Sets/src/mage/cards/d/DragonHunter.java index 758de2dc73d..0171eeaaa6d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonHunter.java +++ b/Mage.Sets/src/mage/cards/d/DragonHunter.java @@ -30,7 +30,7 @@ public final class DragonHunter extends CardImpl { this.addAbility(new ProtectionAbility(new FilterPermanent(SubType.DRAGON, "Dragons"))); // Dragon Hunter can block Dragons as though it had reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockDragonsAsThoughtIthadReachEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockDragonsAsThoughtIthadReachEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonMantle.java b/Mage.Sets/src/mage/cards/d/DragonMantle.java index 79f5c81c72a..d92616e4e90 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMantle.java +++ b/Mage.Sets/src/mage/cards/d/DragonMantle.java @@ -39,7 +39,7 @@ public final class DragonMantle extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has "{R}: This creature gets +1/+0 until end of turn." Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{R}: This creature gets +1/+0 until end of turn.\""))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{R}: This creature gets +1/+0 until end of turn.\""))); } private DragonMantle(final DragonMantle card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonScales.java b/Mage.Sets/src/mage/cards/d/DragonScales.java index 4a90cddd5c3..d8bc4a54e0f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonScales.java +++ b/Mage.Sets/src/mage/cards/d/DragonScales.java @@ -46,8 +46,8 @@ public final class DragonScales extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+2 and has vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Scales from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonScalesEffect(), filter, true, SetTargetPointer.PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/d/DragonShadow.java b/Mage.Sets/src/mage/cards/d/DragonShadow.java index 7f344cb81c4..6b7dc1b3c38 100644 --- a/Mage.Sets/src/mage/cards/d/DragonShadow.java +++ b/Mage.Sets/src/mage/cards/d/DragonShadow.java @@ -46,8 +46,8 @@ public final class DragonShadow extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+0 and has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Breath from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonShadowEffect(), filter, true, SetTargetPointer.PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java index a44ca1aa7ec..4eb644b2ef6 100644 --- a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java +++ b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java @@ -32,7 +32,7 @@ public final class DragonThroneOfTarkir extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has defender and "{2}, {T}: Other creatures you control gain trample and get +X/+X until end of turn, where X is this creature's power." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, true); effect.setText("Other creatures you control gain trample"); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/cards/d/DragonWings.java b/Mage.Sets/src/mage/cards/d/DragonWings.java index a41c58ccf14..b92be8c4d6f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWings.java +++ b/Mage.Sets/src/mage/cards/d/DragonWings.java @@ -47,7 +47,7 @@ public final class DragonWings extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Cycling {1}{U} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{U}"))); diff --git a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java index 18ed9bd68cc..805fe54d118 100644 --- a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java +++ b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java @@ -41,7 +41,7 @@ public final class DragonloftIdol extends CardImpl { Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a Dragon, Dragonloft Idol gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), "and has flying"); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java index ed764c1d016..690818e3a9b 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java @@ -32,7 +32,7 @@ public final class DragonlordsServant extends CardImpl { this.toughness = new MageInt(3); // Dragon spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private DragonlordsServant(final DragonlordsServant card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java index b059404da4b..1d5b7ff197d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java +++ b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java @@ -34,7 +34,7 @@ public final class DragonspeakerShaman extends CardImpl { this.toughness = new MageInt(2); // Dragon spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2))); } private DragonspeakerShaman(final DragonspeakerShaman card) { diff --git a/Mage.Sets/src/mage/cards/d/DralnusCrusade.java b/Mage.Sets/src/mage/cards/d/DralnusCrusade.java index 2f3a59c1e92..f4d07d47e29 100755 --- a/Mage.Sets/src/mage/cards/d/DralnusCrusade.java +++ b/Mage.Sets/src/mage/cards/d/DralnusCrusade.java @@ -24,10 +24,10 @@ public final class DralnusCrusade extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{R}"); // Goblin creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false))); // All Goblins are black and are Zombies in addition to their other creature types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DralnusCrusadeEffect())); + this.addAbility(new SimpleStaticAbility(new DralnusCrusadeEffect())); } private DralnusCrusade(final DralnusCrusade card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadOfNight.java b/Mage.Sets/src/mage/cards/d/DreadOfNight.java index 1c95310b9ee..c94b8c40602 100644 --- a/Mage.Sets/src/mage/cards/d/DreadOfNight.java +++ b/Mage.Sets/src/mage/cards/d/DreadOfNight.java @@ -28,7 +28,7 @@ public final class DreadOfNight extends CardImpl { public DreadOfNight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); } private DreadOfNight(final DreadOfNight card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadSlag.java b/Mage.Sets/src/mage/cards/d/DreadSlag.java index e839ff7a2f6..ac89d84771f 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSlag.java +++ b/Mage.Sets/src/mage/cards/d/DreadSlag.java @@ -35,7 +35,7 @@ public final class DreadSlag extends CardImpl { DynamicValue amount = new MultipliedValue(CardsInControllerHandCount.instance, -4); Effect effect = new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield); effect.setText("{this} gets -4/-4 for each card in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private DreadSlag(final DreadSlag card) { diff --git a/Mage.Sets/src/mage/cards/d/DreamChisel.java b/Mage.Sets/src/mage/cards/d/DreamChisel.java index 1c384389294..688f99f8f41 100644 --- a/Mage.Sets/src/mage/cards/d/DreamChisel.java +++ b/Mage.Sets/src/mage/cards/d/DreamChisel.java @@ -17,7 +17,7 @@ public final class DreamChisel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Face-down creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FaceDownSpellsCostReductionControllerEffect(1))); + this.addAbility(new SimpleStaticAbility(new FaceDownSpellsCostReductionControllerEffect(1))); } private DreamChisel(final DreamChisel card) { diff --git a/Mage.Sets/src/mage/cards/d/DreamDevourer.java b/Mage.Sets/src/mage/cards/d/DreamDevourer.java index dfa6dde851e..e9a00346504 100644 --- a/Mage.Sets/src/mage/cards/d/DreamDevourer.java +++ b/Mage.Sets/src/mage/cards/d/DreamDevourer.java @@ -38,7 +38,7 @@ public final class DreamDevourer extends CardImpl { this.toughness = new MageInt(3); // Each nonland card in your hand without foretell has foretell. Its foretell cost is equal to its mana cost reduced by 2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DreamDevourerAddAbilityEffect())); + this.addAbility(new SimpleStaticAbility(new DreamDevourerAddAbilityEffect())); // Whenever you foretell a card, Dream Devourer gets +2/+0 until end of turn. this.addAbility(new ForetellSourceControllerTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn))); diff --git a/Mage.Sets/src/mage/cards/d/DreamHalls.java b/Mage.Sets/src/mage/cards/d/DreamHalls.java index 85e73f171fc..94b9a4783fb 100644 --- a/Mage.Sets/src/mage/cards/d/DreamHalls.java +++ b/Mage.Sets/src/mage/cards/d/DreamHalls.java @@ -27,7 +27,7 @@ public final class DreamHalls extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}{U}"); // Rather than pay the mana cost for a spell, its controller may discard a card that shares a color with that spell. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DreamHallsEffect())); + this.addAbility(new SimpleStaticAbility(new DreamHallsEffect())); } private DreamHalls(final DreamHalls card) { diff --git a/Mage.Sets/src/mage/cards/d/Drought.java b/Mage.Sets/src/mage/cards/d/Drought.java index a68cf5850ef..79b3203a79b 100644 --- a/Mage.Sets/src/mage/cards/d/Drought.java +++ b/Mage.Sets/src/mage/cards/d/Drought.java @@ -27,10 +27,10 @@ public final class Drought extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{W}")))); // Spells cost an additional "Sacrifice a Swamp" to cast for each black mana symbol in their mana costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DroughtAdditionalCostEffect(true))); + this.addAbility(new SimpleStaticAbility(new DroughtAdditionalCostEffect(true))); // Activated abilities cost an additional "Sacrifice a Swamp" to activate for each black mana symbol in their activation costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DroughtAdditionalCostEffect(false))); + this.addAbility(new SimpleStaticAbility(new DroughtAdditionalCostEffect(false))); } private Drought(final Drought card) { diff --git a/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java b/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java index 692cbfc3ed5..91abf980e6a 100644 --- a/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java @@ -34,7 +34,7 @@ public final class DroverOfTheMighty extends CardImpl { this.toughness = new MageInt(1); // Drover of the Mighty gets +2/+2 as long as you control a Dinosaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 2, 2))); // {T}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java b/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java index 7cc21cbf6bc..d022f738b62 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java +++ b/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java @@ -32,7 +32,7 @@ public final class DruidsFamiliar extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Druid's Familiar is paired with another creature, each of those creatures gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(2, 2, ruleText))); + this.addAbility(new SimpleStaticAbility(new BoostPairedEffect(2, 2, ruleText))); } private DruidsFamiliar(final DruidsFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/d/DualCasting.java b/Mage.Sets/src/mage/cards/d/DualCasting.java index 8c0092a0d5c..7556af2b090 100644 --- a/Mage.Sets/src/mage/cards/d/DualCasting.java +++ b/Mage.Sets/src/mage/cards/d/DualCasting.java @@ -49,7 +49,7 @@ public final class DualCasting extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell(filter)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } private DualCasting(final DualCasting card) { diff --git a/Mage.Sets/src/mage/cards/d/Dub.java b/Mage.Sets/src/mage/cards/d/Dub.java index 01b19d5522c..272fc3aeefe 100644 --- a/Mage.Sets/src/mage/cards/d/Dub.java +++ b/Mage.Sets/src/mage/cards/d/Dub.java @@ -40,7 +40,7 @@ public final class Dub extends CardImpl { // Enchanted creature gets +2/+2, has first strike, and is a Knight in addition to its other types. Effect effect = new BoostEnchantedEffect(2, 2); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText(", has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/Duplicant.java b/Mage.Sets/src/mage/cards/d/Duplicant.java index a49eca838fa..c1a1ebd8a9b 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicant.java +++ b/Mage.Sets/src/mage/cards/d/Duplicant.java @@ -45,7 +45,7 @@ public final class Duplicant extends CardImpl { ability.setAbilityWord(AbilityWord.IMPRINT); this.addAbility(ability); // As long as the exiled card is a creature card, Duplicant has that card's power, toughness, and creature types. It's still a Shapeshifter. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DuplicantContinuousEffect())); + this.addAbility(new SimpleStaticAbility(new DuplicantContinuousEffect())); } private Duplicant(final Duplicant card) { diff --git a/Mage.Sets/src/mage/cards/d/DuskCharger.java b/Mage.Sets/src/mage/cards/d/DuskCharger.java index d41e7bb1c14..496439fb19d 100644 --- a/Mage.Sets/src/mage/cards/d/DuskCharger.java +++ b/Mage.Sets/src/mage/cards/d/DuskCharger.java @@ -37,7 +37,7 @@ public final class DuskCharger extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} gets +2/+2 as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); + Ability ability = new SimpleStaticAbility(effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DustCorona.java b/Mage.Sets/src/mage/cards/d/DustCorona.java index 967c23c7092..a9e0f06c6d8 100644 --- a/Mage.Sets/src/mage/cards/d/DustCorona.java +++ b/Mage.Sets/src/mage/cards/d/DustCorona.java @@ -41,7 +41,7 @@ public final class DustCorona extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0 and can't be blocked by creatures with flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 0)); Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); effect.setText("and can't be blocked by creatures with flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java b/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java index ca891cea5fc..afa0a340db8 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java @@ -37,7 +37,7 @@ public final class DwarvenPatrol extends CardImpl { this.toughness = new MageInt(2); // Dwarven Patrol doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you cast a nonred spell, untap Dwarven Patrol. this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/d/Dwindle.java b/Mage.Sets/src/mage/cards/d/Dwindle.java index ad646d3e556..cbada33aac9 100644 --- a/Mage.Sets/src/mage/cards/d/Dwindle.java +++ b/Mage.Sets/src/mage/cards/d/Dwindle.java @@ -37,7 +37,7 @@ public final class Dwindle extends CardImpl { this.addAbility(ability); // Enchanted creature gets -6/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-6, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-6, 0))); // When enchanted creature blocks, destroy it. this.addAbility(new DwindleTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java b/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java index 0049638e0d6..575f7904963 100644 --- a/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java +++ b/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java @@ -39,7 +39,7 @@ public final class DwynenGiltLeafDaen extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Other Elf creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.ELF, "Elf creatures"), true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.ELF, "Elf creatures"), true))); // Whenever Dwynen, Gilt-Leaf Daen attacks, you gain 1 life for each attacking Elf you control. this.addAbility(new AttacksTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)).setText("you gain 1 life for each attacking Elf you control"), false)); diff --git a/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java b/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java index a12ff4e143b..84870e5d52c 100644 --- a/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java +++ b/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java @@ -40,7 +40,7 @@ public final class DynaheirInvokerAdept extends CardImpl { this.addAbility(HasteAbility.getInstance()); // You may activate abilities of other creatures you control as though those creatures had haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DynaheirInvokerAdeptHasteEffect())); + this.addAbility(new SimpleStaticAbility(new DynaheirInvokerAdeptHasteEffect())); // {T}: When you next activate an ability that isn't a mana ability this turn by spending four or more mana to activate it, copy that ability. You may choose new targets for the copy. this.addAbility(new SimpleActivatedAbility(new CreateDelayedTriggeredAbilityEffect(new DynaheirInvokerAdeptTriggeredAbility()), new TapSourceCost())); -- 2.47.2 From d489a11f185e94284173f21994e05153a2c8b68c Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:11:57 -0500 Subject: [PATCH 13/50] refactor: SimpleStaticAbility default zone (cards E-F) --- Mage.Sets/src/mage/cards/e/EarnestFellowship.java | 2 +- Mage.Sets/src/mage/cards/e/EarthServant.java | 2 +- Mage.Sets/src/mage/cards/e/EarthSurge.java | 2 +- Mage.Sets/src/mage/cards/e/EaterOfVirtue.java | 4 ++-- Mage.Sets/src/mage/cards/e/EchoBaseCommando.java | 2 +- Mage.Sets/src/mage/cards/e/EchoCirclet.java | 2 +- Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java | 4 ++-- Mage.Sets/src/mage/cards/e/Edgewalker.java | 2 +- Mage.Sets/src/mage/cards/e/EelUmbra.java | 2 +- Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java | 2 +- Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java | 2 +- Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java | 2 +- Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java | 4 ++-- Mage.Sets/src/mage/cards/e/ElandUmbra.java | 2 +- Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java | 2 +- Mage.Sets/src/mage/cards/e/ElderscaleWurm.java | 2 +- Mage.Sets/src/mage/cards/e/EldraziAggressor.java | 2 +- Mage.Sets/src/mage/cards/e/EldraziConscription.java | 2 +- Mage.Sets/src/mage/cards/e/ElementalMastery.java | 2 +- Mage.Sets/src/mage/cards/e/ElephantGrass.java | 2 +- Mage.Sets/src/mage/cards/e/ElephantGuide.java | 2 +- Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java | 4 ++-- Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java | 2 +- Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java | 4 ++-- Mage.Sets/src/mage/cards/e/ElvishBard.java | 2 +- Mage.Sets/src/mage/cards/e/EmbalmersTools.java | 2 +- Mage.Sets/src/mage/cards/e/EmbermawHellion.java | 2 +- Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java | 2 +- Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java | 2 +- Mage.Sets/src/mage/cards/e/EmbraalBruiser.java | 2 +- Mage.Sets/src/mage/cards/e/EmeraldMedallion.java | 2 +- Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java | 2 +- Mage.Sets/src/mage/cards/e/EmpyrialArmor.java | 2 +- Mage.Sets/src/mage/cards/e/EmpyrialPlate.java | 2 +- Mage.Sets/src/mage/cards/e/EncaseInIce.java | 2 +- Mage.Sets/src/mage/cards/e/Encrust.java | 2 +- Mage.Sets/src/mage/cards/e/Endbringer.java | 2 +- Mage.Sets/src/mage/cards/e/EndlessScream.java | 2 +- Mage.Sets/src/mage/cards/e/EndlessWhispers.java | 2 +- Mage.Sets/src/mage/cards/e/EnergyField.java | 2 +- Mage.Sets/src/mage/cards/e/Enfeeblement.java | 2 +- Mage.Sets/src/mage/cards/e/EngineeredPlague.java | 2 +- Mage.Sets/src/mage/cards/e/EnragingLicid.java | 2 +- Mage.Sets/src/mage/cards/e/Enslave.java | 2 +- Mage.Sets/src/mage/cards/e/EnsnaringBridge.java | 2 +- Mage.Sets/src/mage/cards/e/EnsoulArtifact.java | 2 +- Mage.Sets/src/mage/cards/e/EnsouledScimitar.java | 2 +- Mage.Sets/src/mage/cards/e/Entangler.java | 2 +- Mage.Sets/src/mage/cards/e/EntanglingVines.java | 2 +- Mage.Sets/src/mage/cards/e/EntourageOfTrest.java | 2 +- Mage.Sets/src/mage/cards/e/EonHub.java | 2 +- Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java | 2 +- Mage.Sets/src/mage/cards/e/EpharasRadiance.java | 2 +- Mage.Sets/src/mage/cards/e/EpiphanyStorm.java | 2 +- Mage.Sets/src/mage/cards/e/EquestrianSkill.java | 4 ++-- Mage.Sets/src/mage/cards/e/ErebossEmissary.java | 2 +- Mage.Sets/src/mage/cards/e/Errantry.java | 2 +- Mage.Sets/src/mage/cards/e/EsperStormblade.java | 2 +- Mage.Sets/src/mage/cards/e/EssenceFlare.java | 2 +- Mage.Sets/src/mage/cards/e/EssenceLeak.java | 2 +- Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java | 2 +- Mage.Sets/src/mage/cards/e/EternalThirst.java | 2 +- Mage.Sets/src/mage/cards/e/EternalWarrior.java | 2 +- Mage.Sets/src/mage/cards/e/EternitySnare.java | 2 +- Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java | 2 +- Mage.Sets/src/mage/cards/e/EtherswornCanonist.java | 2 +- Mage.Sets/src/mage/cards/e/EvanescentIntellect.java | 2 +- Mage.Sets/src/mage/cards/e/EverflameEidolon.java | 2 +- Mage.Sets/src/mage/cards/e/Evermind.java | 2 +- Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java | 2 +- Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java | 2 +- Mage.Sets/src/mage/cards/e/EvilPresence.java | 2 +- Mage.Sets/src/mage/cards/e/ExaltedDragon.java | 2 +- Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java | 2 +- Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java | 2 +- Mage.Sets/src/mage/cards/e/ExclusionRitual.java | 2 +- Mage.Sets/src/mage/cards/e/Excruciator.java | 2 +- Mage.Sets/src/mage/cards/e/ExecutionersHood.java | 2 +- Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java | 2 +- Mage.Sets/src/mage/cards/e/ExoticCurse.java | 2 +- Mage.Sets/src/mage/cards/e/ExperimentKraj.java | 2 +- Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java | 2 +- Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java | 2 +- Mage.Sets/src/mage/cards/e/EyeOfUgin.java | 2 +- Mage.Sets/src/mage/cards/e/EzurisBrigade.java | 2 +- Mage.Sets/src/mage/cards/f/FaceOfDivinity.java | 6 ++---- Mage.Sets/src/mage/cards/f/FaerieNoble.java | 2 +- Mage.Sets/src/mage/cards/f/FaithsFetters.java | 2 +- Mage.Sets/src/mage/cards/f/FalkenrathGorger.java | 2 +- Mage.Sets/src/mage/cards/f/FamiliarGround.java | 2 +- Mage.Sets/src/mage/cards/f/FamishedPaladin.java | 2 +- Mage.Sets/src/mage/cards/f/Farmstead.java | 2 +- Mage.Sets/src/mage/cards/f/Fastbond.java | 2 +- Mage.Sets/src/mage/cards/f/Fasting.java | 2 +- Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java | 2 +- Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java | 4 ++-- Mage.Sets/src/mage/cards/f/Fear.java | 2 +- Mage.Sets/src/mage/cards/f/FearsomeTemper.java | 2 +- Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java | 2 +- Mage.Sets/src/mage/cards/f/FeastingHobbit.java | 2 +- Mage.Sets/src/mage/cards/f/Feebleness.java | 2 +- Mage.Sets/src/mage/cards/f/FelhideBrawler.java | 2 +- Mage.Sets/src/mage/cards/f/FelhidePetrifier.java | 2 +- Mage.Sets/src/mage/cards/f/FelidarUmbra.java | 2 +- Mage.Sets/src/mage/cards/f/FelineSovereign.java | 2 +- Mage.Sets/src/mage/cards/f/FellFlagship.java | 2 +- Mage.Sets/src/mage/cards/f/FencersMagemark.java | 2 +- Mage.Sets/src/mage/cards/f/FeralInvocation.java | 2 +- Mage.Sets/src/mage/cards/f/FerozsBan.java | 2 +- Mage.Sets/src/mage/cards/f/Fervor.java | 2 +- Mage.Sets/src/mage/cards/f/FibrousEntangler.java | 4 ++-- Mage.Sets/src/mage/cards/f/FieldOfDreams.java | 2 +- Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java | 2 +- Mage.Sets/src/mage/cards/f/FinalIteration.java | 2 +- Mage.Sets/src/mage/cards/f/FireServant.java | 2 +- Mage.Sets/src/mage/cards/f/FireWhip.java | 2 +- Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java | 2 +- Mage.Sets/src/mage/cards/f/Fireshrieker.java | 2 +- Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java | 2 +- Mage.Sets/src/mage/cards/f/FirewakeSliver.java | 4 ++-- Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java | 2 +- Mage.Sets/src/mage/cards/f/FishliverOil.java | 2 +- Mage.Sets/src/mage/cards/f/FistOfSuns.java | 2 +- Mage.Sets/src/mage/cards/f/FistsOfIronwood.java | 2 +- Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlameTrooper.java | 2 +- Mage.Sets/src/mage/cards/f/FlamespeakersWill.java | 2 +- Mage.Sets/src/mage/cards/f/FlamingSword.java | 2 +- Mage.Sets/src/mage/cards/f/FlaringFlameKin.java | 2 +- Mage.Sets/src/mage/cards/f/FlayerHusk.java | 2 +- Mage.Sets/src/mage/cards/f/FledglingOsprey.java | 2 +- Mage.Sets/src/mage/cards/f/FleecemaneLion.java | 2 +- Mage.Sets/src/mage/cards/f/FlickeringWard.java | 2 +- Mage.Sets/src/mage/cards/f/Flight.java | 2 +- Mage.Sets/src/mage/cards/f/FlightOfFancy.java | 2 +- Mage.Sets/src/mage/cards/f/FlinthoofBoar.java | 2 +- Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java | 2 +- Mage.Sets/src/mage/cards/f/Floodchaser.java | 2 +- Mage.Sets/src/mage/cards/f/FloodedWoodlands.java | 2 +- Mage.Sets/src/mage/cards/f/FloodtideSerpent.java | 2 +- Mage.Sets/src/mage/cards/f/FloweringField.java | 2 +- Mage.Sets/src/mage/cards/f/FloweringLumberknot.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneSurge.java | 2 +- Mage.Sets/src/mage/cards/f/Fluctuator.java | 2 +- Mage.Sets/src/mage/cards/f/ForbiddenLore.java | 2 +- Mage.Sets/src/mage/cards/f/ForceBubble.java | 2 +- Mage.Sets/src/mage/cards/f/ForcedWorship.java | 2 +- Mage.Sets/src/mage/cards/f/ForebearsBlade.java | 2 +- Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java | 2 +- Mage.Sets/src/mage/cards/f/ForiysianBrigade.java | 2 +- Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java | 2 +- Mage.Sets/src/mage/cards/f/ForiysianTotem.java | 2 +- Mage.Sets/src/mage/cards/f/FormOfTheDragon.java | 2 +- Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java | 6 +++--- Mage.Sets/src/mage/cards/f/ForsakenCity.java | 2 +- Mage.Sets/src/mage/cards/f/FortifiedArea.java | 2 +- Mage.Sets/src/mage/cards/f/FortuneThief.java | 2 +- Mage.Sets/src/mage/cards/f/FoulPresence.java | 2 +- Mage.Sets/src/mage/cards/f/FoundryInspector.java | 2 +- Mage.Sets/src/mage/cards/f/FoundryScreecher.java | 2 +- Mage.Sets/src/mage/cards/f/FountainWatch.java | 2 +- Mage.Sets/src/mage/cards/f/FreneticRaptor.java | 2 +- Mage.Sets/src/mage/cards/f/FrenziedRage.java | 2 +- Mage.Sets/src/mage/cards/f/FrenzySliver.java | 4 ++-- Mage.Sets/src/mage/cards/f/FreyalisesWinds.java | 2 +- Mage.Sets/src/mage/cards/f/FrogTongue.java | 2 +- Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java | 2 +- Mage.Sets/src/mage/cards/f/Frostwielder.java | 2 +- Mage.Sets/src/mage/cards/f/FrozenSolid.java | 2 +- Mage.Sets/src/mage/cards/f/FullMoonsRise.java | 2 +- Mage.Sets/src/mage/cards/f/FungalFortitude.java | 2 +- Mage.Sets/src/mage/cards/f/FungusSliver.java | 2 +- Mage.Sets/src/mage/cards/f/FurnaceOfRath.java | 2 +- Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java | 2 +- Mage.Sets/src/mage/cards/f/FutureSight.java | 4 ++-- 175 files changed, 190 insertions(+), 192 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/EarnestFellowship.java b/Mage.Sets/src/mage/cards/e/EarnestFellowship.java index 5e4cc1501cf..02a8f0e676b 100644 --- a/Mage.Sets/src/mage/cards/e/EarnestFellowship.java +++ b/Mage.Sets/src/mage/cards/e/EarnestFellowship.java @@ -30,7 +30,7 @@ public final class EarnestFellowship extends CardImpl { // Each creature has protection from its colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EarnestFellowshipEffect())); + this.addAbility(new SimpleStaticAbility(new EarnestFellowshipEffect())); } private EarnestFellowship(final EarnestFellowship card) { diff --git a/Mage.Sets/src/mage/cards/e/EarthServant.java b/Mage.Sets/src/mage/cards/e/EarthServant.java index 12d90a47432..86b789ac2d5 100644 --- a/Mage.Sets/src/mage/cards/e/EarthServant.java +++ b/Mage.Sets/src/mage/cards/e/EarthServant.java @@ -32,7 +32,7 @@ public final class EarthServant extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter, 0), + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter, 0), new PermanentsOnBattlefieldCount(filter, 1), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/e/EarthSurge.java b/Mage.Sets/src/mage/cards/e/EarthSurge.java index d5b03d78177..7e45dc5a39f 100644 --- a/Mage.Sets/src/mage/cards/e/EarthSurge.java +++ b/Mage.Sets/src/mage/cards/e/EarthSurge.java @@ -30,7 +30,7 @@ public final class EarthSurge extends CardImpl { //Each land gets +2/+2 as long as it's a creature. Effect effect = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, true); effect.setText("Each land gets +2/+2 as long as it\'s a creature"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private EarthSurge(final EarthSurge card) { diff --git a/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java b/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java index 7b7b830edf0..fdc8088aa17 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java @@ -56,10 +56,10 @@ public final class EaterOfVirtue extends CardImpl { this.addAbility(new DiesAttachedTriggeredAbility(new EaterOfVirtueExileEffect(), "equipped creature", false, true, SetTargetPointer.CARD)); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0, Duration.WhileOnBattlefield))); // As long as a card exiled with Eater of Virtue has flying, equipped creature has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EaterOfVirtueGainAbilityAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new EaterOfVirtueGainAbilityAttachedEffect())); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java index dec9d161deb..b1f0f605eac 100644 --- a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java +++ b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java @@ -40,7 +40,7 @@ public final class EchoBaseCommando extends CardImpl { this.addAbility(new ProtectionAbility(filter)); // Activated abilities of creatures your opponent controls cost {2} more to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EchoBaseCommandoEffect())); + this.addAbility(new SimpleStaticAbility(new EchoBaseCommandoEffect())); } diff --git a/Mage.Sets/src/mage/cards/e/EchoCirclet.java b/Mage.Sets/src/mage/cards/e/EchoCirclet.java index a8765b7b7a0..eba9756b02b 100644 --- a/Mage.Sets/src/mage/cards/e/EchoCirclet.java +++ b/Mage.Sets/src/mage/cards/e/EchoCirclet.java @@ -25,7 +25,7 @@ public final class EchoCirclet extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature can block an additional creature each combat. (static abilit of equipment, no ability that will be gained to equiped creature!) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EchoCircletEffect())); + this.addAbility(new SimpleStaticAbility(new EchoCircletEffect())); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java index 013be003915..9d1a0ab9be0 100644 --- a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java +++ b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java @@ -37,10 +37,10 @@ public final class EdgeOfTheDivinity extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is white, it gets +1/+2. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+2")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+2")); this.addAbility(whiteAbility); // As long as enchanted creature is black, it gets +2/+1. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +2/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +2/+1")); this.addAbility(blackAbility); } diff --git a/Mage.Sets/src/mage/cards/e/Edgewalker.java b/Mage.Sets/src/mage/cards/e/Edgewalker.java index c29aca99390..8dc24078183 100644 --- a/Mage.Sets/src/mage/cards/e/Edgewalker.java +++ b/Mage.Sets/src/mage/cards/e/Edgewalker.java @@ -32,7 +32,7 @@ public final class Edgewalker extends CardImpl { this.toughness = new MageInt(2); // Cleric spells you cast cost {W}{B} less to cast. This effect reduces only the amount of colored mana you pay. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, new ManaCostsImpl<>("{W}{B}")))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, new ManaCostsImpl<>("{W}{B}")))); } private Edgewalker(final Edgewalker card) { diff --git a/Mage.Sets/src/mage/cards/e/EelUmbra.java b/Mage.Sets/src/mage/cards/e/EelUmbra.java index c3a45cac530..a568eb5eccd 100644 --- a/Mage.Sets/src/mage/cards/e/EelUmbra.java +++ b/Mage.Sets/src/mage/cards/e/EelUmbra.java @@ -40,7 +40,7 @@ public final class EelUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java index 84d371d943d..c7ded67f660 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java @@ -45,7 +45,7 @@ public final class EidolonOfCountlessBattles extends CardImpl { PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 1); Effect effect = new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield); effect.setText("{this} and enchanted creature each get +1/+1 for each creature you control"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield); effect.setText("and +1/+1 for each Aura you control"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java b/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java index ee4bf3c653e..cd824e1e040 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java @@ -26,7 +26,7 @@ public final class EidolonOfRhetoric extends CardImpl { this.toughness = new MageInt(4); // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.ANY))); } private EidolonOfRhetoric(final EidolonOfRhetoric card) { diff --git a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java index 335466a9809..f96d87e576c 100644 --- a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java +++ b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java @@ -29,7 +29,7 @@ public final class ElaborateFirecannon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Elaborate Firecannon doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {4}, {T}: Elaborate Firecannon deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}")); diff --git a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java index 5c6cc3a7874..14621d68615 100644 --- a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java +++ b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java @@ -35,8 +35,8 @@ public final class EladamriLordOfLeaves extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filterCreatures, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filterPermanents, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filterCreatures, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filterPermanents, true))); } private EladamriLordOfLeaves(final EladamriLordOfLeaves card) { diff --git a/Mage.Sets/src/mage/cards/e/ElandUmbra.java b/Mage.Sets/src/mage/cards/e/ElandUmbra.java index 0f3b9d14a3c..9e2a3de7c05 100644 --- a/Mage.Sets/src/mage/cards/e/ElandUmbra.java +++ b/Mage.Sets/src/mage/cards/e/ElandUmbra.java @@ -36,7 +36,7 @@ public final class ElandUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 4, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 4, Duration.WhileOnBattlefield))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java b/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java index 46a39195b04..3b3e67f5c3b 100644 --- a/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java +++ b/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java @@ -35,7 +35,7 @@ public final class ElbrusTheBindingBlade extends CardImpl { this.addAbility(new TransformAbility()); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // When equipped creature deals combat damage to a player, unattach Elbrus, the Binding Blade, then transform it. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new ElbrusTheBindingBladeEffect(), "equipped", false)); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java b/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java index 83f241238b9..c28f7b7a87b 100644 --- a/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java +++ b/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java @@ -39,7 +39,7 @@ public final class ElderscaleWurm extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ElderscaleWurmSetLifeEffect(), false)); // As long as you have 7 or more life, damage that would reduce your life total to less than 7 reduces it to 7 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ElderscaleWurmReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ElderscaleWurmReplacementEffect())); } private ElderscaleWurm(final ElderscaleWurm card) { diff --git a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java index f5ac7fec13c..2904f8c3b3f 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java +++ b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java @@ -45,7 +45,7 @@ public final class EldraziAggressor extends CardImpl { // Eldrazi Aggressor has haste as long as you control another colorless creature. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private EldraziAggressor(final EldraziAggressor card) { diff --git a/Mage.Sets/src/mage/cards/e/EldraziConscription.java b/Mage.Sets/src/mage/cards/e/EldraziConscription.java index 3f399afb241..800997d164c 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziConscription.java +++ b/Mage.Sets/src/mage/cards/e/EldraziConscription.java @@ -37,7 +37,7 @@ public final class EldraziConscription extends CardImpl { this.addAbility(ability); // Enchanted creature gets +10/+10 and has trample and annihilator 2 - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(10, 10, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(10, 10, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/ElementalMastery.java b/Mage.Sets/src/mage/cards/e/ElementalMastery.java index 6fbfaa8898a..51a9ca43438 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElementalMastery.java @@ -43,7 +43,7 @@ public final class ElementalMastery extends CardImpl { // Enchanted creature has "{tap}: create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step." Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElementalMasteryEffect(), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA))); } private ElementalMastery(final ElementalMastery card) { diff --git a/Mage.Sets/src/mage/cards/e/ElephantGrass.java b/Mage.Sets/src/mage/cards/e/ElephantGrass.java index 5df6c63dd45..903399da926 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGrass.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGrass.java @@ -38,7 +38,7 @@ public final class ElephantGrass extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // Black creatures can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filterBlack))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filterBlack))); // Nonblack creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you. this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/e/ElephantGuide.java b/Mage.Sets/src/mage/cards/e/ElephantGuide.java index 065aa17cf50..3019c843bab 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGuide.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGuide.java @@ -39,7 +39,7 @@ public final class ElephantGuide extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield))); // When enchanted creature dies, create a 3/3 green Elephant creature token. this.addAbility(new DiesAttachedTriggeredAbility(new CreateTokenEffect(new ElephantToken()),"enchanted creature")); } diff --git a/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java b/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java index b6c8493719e..e640ce0d677 100644 --- a/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java +++ b/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java @@ -35,10 +35,10 @@ public final class EleshNornGrandCenobite extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Other creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true))); // Creatures your opponents control get -2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostOpponentsEffect(-2, -2, Duration.WhileOnBattlefield))); } private EleshNornGrandCenobite(final EleshNornGrandCenobite card) { diff --git a/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java b/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java index dcde2f4946b..13b30b0d345 100644 --- a/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java +++ b/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java @@ -32,7 +32,7 @@ public final class ElgaudShieldmate extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Elgaud Shieldmate is paired with another creature, both creatures have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(HexproofAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(HexproofAbility.getInstance(), ruleText))); } private ElgaudShieldmate(final ElgaudShieldmate card) { diff --git a/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java b/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java index bfe5524a816..8b87b566f72 100644 --- a/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java +++ b/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java @@ -79,7 +79,7 @@ public final class ElugeTheShorelessSea extends CardImpl { // The first instant or sorcery spell you cast each turn costs {U} (or {1}) less to cast for each land you // control with a flood counter on it. Effect effect = new SpellsCostReductionControllerEffect(spellFilter, new ManaCostsImpl<>("{U}"), new PermanentsOnBattlefieldCount(floodLandFilter), true); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), + this.addAbility(new SimpleStaticAbility(effect), new ElugeTheShorelessSeaWatcher()); } @@ -173,4 +173,4 @@ class ElugeTheShorelessSeaWatcher extends Watcher { public int getInstantOrSorcerySpellsCastThisTurn(UUID playerId) { return playerInstantOrSorcerySpells.getOrDefault(playerId, 0); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/e/ElvishBard.java b/Mage.Sets/src/mage/cards/e/ElvishBard.java index f84960b6dc2..2504dabc6bc 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBard.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBard.java @@ -27,7 +27,7 @@ public final class ElvishBard extends CardImpl { this.toughness = new MageInt(4); // All creatures able to block Elvish Bard do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); } private ElvishBard(final ElvishBard card) { diff --git a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java index f3b2b44504c..2db95b909a5 100644 --- a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java +++ b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java @@ -37,7 +37,7 @@ public final class EmbalmersTools extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Activated abilities of creature cards in your graveyard cost {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmbalmersToolsEffect())); + this.addAbility(new SimpleStaticAbility(new EmbalmersToolsEffect())); // Tap an untapped Zombie you control: Target player puts the top card of their library into their graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/e/EmbermawHellion.java b/Mage.Sets/src/mage/cards/e/EmbermawHellion.java index a7b0086f8d9..904d0889e12 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermawHellion.java +++ b/Mage.Sets/src/mage/cards/e/EmbermawHellion.java @@ -36,7 +36,7 @@ public final class EmbermawHellion extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // If another red source you control would deal damage to a permanent or player, it deals that much damage plus 1 to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmbermawHellionEffect())); + this.addAbility(new SimpleStaticAbility(new EmbermawHellionEffect())); } private EmbermawHellion(final EmbermawHellion card) { diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java index 038bfc178f1..97a42b03ab0 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java @@ -44,7 +44,7 @@ public final class EmbodimentOfFury extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Land creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); // Landfall — Whenever a land you control enters, you may have target land you control // become a 3/3 Elemental creature with haste until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java index 1c6c3678823..8003a5c302a 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java @@ -44,7 +44,7 @@ public final class EmbodimentOfInsight extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Land creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); // Landfall — Whenever a land enters the battlefield under you control, you may have target land you control // become a 3/3 Elemental creature with haste until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java b/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java index e8da1ad0391..17c99a944b5 100644 --- a/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java +++ b/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java @@ -33,7 +33,7 @@ public final class EmbraalBruiser extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Embraal Bruiser has menace as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new MenaceAbility()), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), "{this} has menace as long as you control an artifact"))); diff --git a/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java b/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java index 6ffa4e00c12..73878468f3b 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java @@ -27,7 +27,7 @@ public final class EmeraldMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Green spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private EmeraldMedallion(final EmeraldMedallion card) { diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java b/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java index 58e387313cf..919ce9fa105 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java @@ -36,7 +36,7 @@ public final class EmpyrialArchangel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(ShroudAbility.getInstance()); // All damage that would be dealt to you is dealt to Empyrial Archangel instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmpyrialArchangelEffect())); + this.addAbility(new SimpleStaticAbility(new EmpyrialArchangelEffect())); } private EmpyrialArchangel(final EmpyrialArchangel card) { diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java index d6e425b0d64..8ddd1e03472 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java @@ -39,7 +39,7 @@ public final class EmpyrialArmor extends CardImpl { // Enchanted creature gets +1/+1 for each card in your hand. DynamicValue xValue = CardsInControllerHandCount.instance; - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(xValue, xValue, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(xValue, xValue, Duration.WhileOnBattlefield))); } private EmpyrialArmor(final EmpyrialArmor card) { diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java b/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java index f4e231058f0..8437ac9dbed 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java @@ -25,7 +25,7 @@ public final class EmpyrialPlate extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1 for each card in your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(CardsInControllerHandCount.instance, CardsInControllerHandCount.instance))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(CardsInControllerHandCount.instance, CardsInControllerHandCount.instance))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/e/EncaseInIce.java b/Mage.Sets/src/mage/cards/e/EncaseInIce.java index 5c0d1dba1d2..9dc67bbfc9c 100644 --- a/Mage.Sets/src/mage/cards/e/EncaseInIce.java +++ b/Mage.Sets/src/mage/cards/e/EncaseInIce.java @@ -53,7 +53,7 @@ public final class EncaseInIce extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private EncaseInIce(final EncaseInIce card) { diff --git a/Mage.Sets/src/mage/cards/e/Encrust.java b/Mage.Sets/src/mage/cards/e/Encrust.java index e1e70836fae..a9311eb9027 100644 --- a/Mage.Sets/src/mage/cards/e/Encrust.java +++ b/Mage.Sets/src/mage/cards/e/Encrust.java @@ -37,7 +37,7 @@ public final class Encrust extends CardImpl { this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step and its activated abilities can't be activated. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent")); + ability = new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent")); Effect effect = new CantActivateAbilitiesAttachedEffect(); effect.setText("and its activated abilities can't be activated"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/Endbringer.java b/Mage.Sets/src/mage/cards/e/Endbringer.java index 6063b189670..1c1f5370270 100644 --- a/Mage.Sets/src/mage/cards/e/Endbringer.java +++ b/Mage.Sets/src/mage/cards/e/Endbringer.java @@ -34,7 +34,7 @@ public final class Endbringer extends CardImpl { this.toughness = new MageInt(5); // Untap Endbringer during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapSourceDuringEachOtherPlayersUntapStepEffect())); + this.addAbility(new SimpleStaticAbility(new UntapSourceDuringEachOtherPlayersUntapStepEffect())); // {T}: Endbringer deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EndlessScream.java b/Mage.Sets/src/mage/cards/e/EndlessScream.java index 7979a9eee57..828966eea25 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessScream.java +++ b/Mage.Sets/src/mage/cards/e/EndlessScream.java @@ -41,7 +41,7 @@ public final class EndlessScream extends CardImpl { // Endless Scream enters the battlefield with X scream counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.SCREAM.createInstance()))); // Enchanted creature gets +1/+0 for each scream counter on Endless Scream. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new CountersSourceCount(CounterType.SCREAM), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(new CountersSourceCount(CounterType.SCREAM), StaticValue.get(0), Duration.WhileOnBattlefield))); } private EndlessScream(final EndlessScream card) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java index 97c3403a9aa..4f4afcbfb45 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java +++ b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java @@ -41,7 +41,7 @@ public final class EndlessWhispers extends CardImpl { effect = new GainAbilityAllEffect(gainAbility, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Each creature")); effect.setText("Each creature has \"When this creature dies, choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under their control at the beginning of the next end step.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyField.java b/Mage.Sets/src/mage/cards/e/EnergyField.java index 2c5fba7fdfe..22955540fbd 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyField.java +++ b/Mage.Sets/src/mage/cards/e/EnergyField.java @@ -30,7 +30,7 @@ public final class EnergyField extends CardImpl { // Prevent all damage that would be dealt to you by sources you don't control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnergyFieldEffect())); + this.addAbility(new SimpleStaticAbility(new EnergyFieldEffect())); // When a card is put into your graveyard from anywhere, sacrifice Energy Field. this.addAbility(new PutCardIntoGraveFromAnywhereAllTriggeredAbility( new SacrificeSourceEffect(), false, TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/e/Enfeeblement.java b/Mage.Sets/src/mage/cards/e/Enfeeblement.java index 77847a935fa..0075da1a1ad 100644 --- a/Mage.Sets/src/mage/cards/e/Enfeeblement.java +++ b/Mage.Sets/src/mage/cards/e/Enfeeblement.java @@ -31,7 +31,7 @@ public final class Enfeeblement extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); } private Enfeeblement(final Enfeeblement card) { diff --git a/Mage.Sets/src/mage/cards/e/EngineeredPlague.java b/Mage.Sets/src/mage/cards/e/EngineeredPlague.java index 31700302610..586523aeea9 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredPlague.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredPlague.java @@ -25,7 +25,7 @@ public final class EngineeredPlague extends CardImpl { // As Engineered Plague enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.UnboostCreature))); // All creatures of the chosen type get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(-1, -1, Duration.WhileOnBattlefield, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllOfChosenSubtypeEffect(-1, -1, Duration.WhileOnBattlefield, false))); } private EngineeredPlague(final EngineeredPlague card) { diff --git a/Mage.Sets/src/mage/cards/e/EnragingLicid.java b/Mage.Sets/src/mage/cards/e/EnragingLicid.java index b066ea98865..3e7145beb67 100644 --- a/Mage.Sets/src/mage/cards/e/EnragingLicid.java +++ b/Mage.Sets/src/mage/cards/e/EnragingLicid.java @@ -32,7 +32,7 @@ public final class EnragingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.R), new ColoredManaCost(ColoredManaSymbol.R))); // Enchanted creature has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); } private EnragingLicid(final EnragingLicid card) { diff --git a/Mage.Sets/src/mage/cards/e/Enslave.java b/Mage.Sets/src/mage/cards/e/Enslave.java index 72328da0b75..8d1d35635e0 100644 --- a/Mage.Sets/src/mage/cards/e/Enslave.java +++ b/Mage.Sets/src/mage/cards/e/Enslave.java @@ -35,7 +35,7 @@ public final class Enslave extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of your upkeep, enchanted creature deals 1 damage to its owner. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new EnslaveEffect())); diff --git a/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java b/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java index a5eb318b6a2..f8027a245a4 100644 --- a/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java +++ b/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java @@ -23,7 +23,7 @@ public final class EnsnaringBridge extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Creatures with power greater than the number of cards in your hand can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnsnaringBridgeRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new EnsnaringBridgeRestrictionEffect())); } private EnsnaringBridge(final EnsnaringBridge card) { diff --git a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java index df75c675e74..5bf6fca06d3 100644 --- a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java +++ b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java @@ -37,7 +37,7 @@ public final class EnsoulArtifact extends CardImpl { this.addAbility(ability); // Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CreatureToken(5, 5), "Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types", Duration.WhileOnBattlefield) )); diff --git a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java index 0f346edd43b..ea021fdc840 100644 --- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java +++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java @@ -32,7 +32,7 @@ public final class EnsouledScimitar extends CardImpl { // {3}: Ensouled Scimitar becomes a 1/5 Spirit artifact creature with flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new EnsouledScimitarToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); // Equipped creature gets +1/+5. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 5))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 5))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/e/Entangler.java b/Mage.Sets/src/mage/cards/e/Entangler.java index 516cdbfba83..f17560fc8e9 100644 --- a/Mage.Sets/src/mage/cards/e/Entangler.java +++ b/Mage.Sets/src/mage/cards/e/Entangler.java @@ -42,7 +42,7 @@ public final class Entangler extends CardImpl { SimpleStaticAbility blockAbility = new SimpleStaticAbility(Zone.BATTLEFIELD,new CanBlockAdditionalCreatureEffect(0)); Effect effect = new GainAbilityAttachedEffect(blockAbility,AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature can block any number of creatures."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Entangler(final Entangler card) { diff --git a/Mage.Sets/src/mage/cards/e/EntanglingVines.java b/Mage.Sets/src/mage/cards/e/EntanglingVines.java index 63a1c0449b3..394f004d1bc 100644 --- a/Mage.Sets/src/mage/cards/e/EntanglingVines.java +++ b/Mage.Sets/src/mage/cards/e/EntanglingVines.java @@ -41,7 +41,7 @@ public final class EntanglingVines extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private EntanglingVines(final EntanglingVines card) { diff --git a/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java b/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java index bd84dde45c9..029225503d1 100644 --- a/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java +++ b/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java @@ -34,7 +34,7 @@ public final class EntourageOfTrest extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesMonarchSourceEffect()).addHint(MonarchHint.instance)); // Entourage of Trest can block an additional creature each combat as long as you're the monarch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new CanBlockAdditionalCreatureEffect(1), MonarchIsSourceControllerCondition.instance, "{this} can block an additional creature each combat as long as you're the monarch"))); } diff --git a/Mage.Sets/src/mage/cards/e/EonHub.java b/Mage.Sets/src/mage/cards/e/EonHub.java index 387ac2cacab..f6eb35912f0 100644 --- a/Mage.Sets/src/mage/cards/e/EonHub.java +++ b/Mage.Sets/src/mage/cards/e/EonHub.java @@ -25,7 +25,7 @@ public final class EonHub extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // Players skip their upkeep steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUpkeepStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipUpkeepStepEffect())); } private EonHub(final EonHub card) { diff --git a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java index 4424f68b590..641cf5972bb 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java +++ b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java @@ -44,7 +44,7 @@ public final class EpharasEnlightenment extends CardImpl { // When Ephara's Enlightenment enters the battlefield, put a +1/+1 counter on enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P1.createInstance(), "enchanted creature"), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Whenever a creature you control enters, you may return Ephara's Enlightenment to its owner's hand. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), diff --git a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java index e002319132f..4c2a8cfa41c 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java +++ b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java @@ -37,7 +37,7 @@ public final class EpharasRadiance extends CardImpl { // Enchanted creature has "{1}{W}, {T}: You gain 3 life." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } private EpharasRadiance(final EpharasRadiance card) { diff --git a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java index 05ac33b21c3..4625f9c41d6 100644 --- a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java @@ -44,7 +44,7 @@ public final class EpiphanyStorm extends CardImpl { Ability drawAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}")); drawAbility.addCost(new TapSourceCost()); drawAbility.addCost(new DiscardCardCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(drawAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(drawAbility, AttachmentType.AURA))); } private EpiphanyStorm(final EpiphanyStorm card) { diff --git a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java index 0273b7e1661..130970fcc7f 100644 --- a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java +++ b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java @@ -34,9 +34,9 @@ public final class EquestrianSkill extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // As long as enchanted creature is a Human, it has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), new EnchantedCreatureSubtypeCondition(SubType.HUMAN), "As long as enchanted creature is a Human, it has trample" diff --git a/Mage.Sets/src/mage/cards/e/ErebossEmissary.java b/Mage.Sets/src/mage/cards/e/ErebossEmissary.java index 7162ecddc7c..0d8289c5e83 100644 --- a/Mage.Sets/src/mage/cards/e/ErebossEmissary.java +++ b/Mage.Sets/src/mage/cards/e/ErebossEmissary.java @@ -43,7 +43,7 @@ public final class ErebossEmissary extends CardImpl { new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE)))); // Enchanted creature gets +3/+3 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); } private ErebossEmissary(final ErebossEmissary card) { diff --git a/Mage.Sets/src/mage/cards/e/Errantry.java b/Mage.Sets/src/mage/cards/e/Errantry.java index 0494aabe560..add6e432457 100644 --- a/Mage.Sets/src/mage/cards/e/Errantry.java +++ b/Mage.Sets/src/mage/cards/e/Errantry.java @@ -37,7 +37,7 @@ public final class Errantry extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+0 and can only attack alone. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); Effect effect = new CanAttackOnlyAloneEffect(); effect.setText("and can only attack alone"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EsperStormblade.java b/Mage.Sets/src/mage/cards/e/EsperStormblade.java index c9ae008bc62..64176b4cf2f 100644 --- a/Mage.Sets/src/mage/cards/e/EsperStormblade.java +++ b/Mage.Sets/src/mage/cards/e/EsperStormblade.java @@ -45,7 +45,7 @@ public final class EsperStormblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Esper Stormblade gets +1/+1 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/e/EssenceFlare.java b/Mage.Sets/src/mage/cards/e/EssenceFlare.java index fbf0e2d7a7e..24cdf03177f 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceFlare.java +++ b/Mage.Sets/src/mage/cards/e/EssenceFlare.java @@ -37,7 +37,7 @@ public final class EssenceFlare extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // At the beginning of the upkeep of enchanted creature's controller, put a -0/-1 counter on that creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new AddCountersAttachedEffect(CounterType.M0M1.createInstance(), "that creature"), false)); diff --git a/Mage.Sets/src/mage/cards/e/EssenceLeak.java b/Mage.Sets/src/mage/cards/e/EssenceLeak.java index e480c12ba1a..8669f909706 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceLeak.java +++ b/Mage.Sets/src/mage/cards/e/EssenceLeak.java @@ -45,7 +45,7 @@ public final class EssenceLeak extends CardImpl { // As long as enchanted permanent is red or green, it has "At the beginning of your upkeep, sacrifice this permanent unless you pay its mana cost." Ability sacAbility =new BeginningOfUpkeepTriggeredAbility(new EssenceLeakEffect()); ContinuousEffect isRedOrGreenAbility = new GainAbilityAttachedEffect(sacAbility, AttachmentType.AURA); - SimpleStaticAbility ifRedOrGreenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(isRedOrGreenAbility, + SimpleStaticAbility ifRedOrGreenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(isRedOrGreenAbility, new OrCondition(new EnchantedCreatureColorCondition(ObjectColor.RED), new EnchantedCreatureColorCondition(ObjectColor.GREEN)), "As long as enchanted permanent is red or green, it has \"At the beginning of your upkeep, sacrifice this permanent unless you pay its mana cost.\"")); this.addAbility(ifRedOrGreenAbility); diff --git a/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java b/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java index 13f2915b7b7..8727d8cbdd2 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java +++ b/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java @@ -26,7 +26,7 @@ public final class EssenceOfTheWild extends CardImpl { this.toughness = new MageInt(6); // Creatures you control enter the battlefield as a copy of Essence of the Wild. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EssenceOfTheWildEffect())); + this.addAbility(new SimpleStaticAbility(new EssenceOfTheWildEffect())); } private EssenceOfTheWild(final EssenceOfTheWild card) { diff --git a/Mage.Sets/src/mage/cards/e/EternalThirst.java b/Mage.Sets/src/mage/cards/e/EternalThirst.java index c07dac54a8f..932c9dc259a 100644 --- a/Mage.Sets/src/mage/cards/e/EternalThirst.java +++ b/Mage.Sets/src/mage/cards/e/EternalThirst.java @@ -39,7 +39,7 @@ public final class EternalThirst extends CardImpl { // Enchanted creature has lifelink Effect effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA); effect.setText("Enchanted creature has lifelink"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); // and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature." effect = new GainAbilityAttachedEffect(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, StaticFilters.FILTER_OPPONENTS_PERMANENT_A_CREATURE), AttachmentType.AURA); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EternalWarrior.java b/Mage.Sets/src/mage/cards/e/EternalWarrior.java index f2c14cea107..4bc0dc8e5c2 100644 --- a/Mage.Sets/src/mage/cards/e/EternalWarrior.java +++ b/Mage.Sets/src/mage/cards/e/EternalWarrior.java @@ -36,7 +36,7 @@ public final class EternalWarrior extends CardImpl { this.addAbility(ability); // Enchant creature has vigilance - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); } private EternalWarrior(final EternalWarrior card) { diff --git a/Mage.Sets/src/mage/cards/e/EternitySnare.java b/Mage.Sets/src/mage/cards/e/EternitySnare.java index 11a596adc8e..284fd2fb39b 100644 --- a/Mage.Sets/src/mage/cards/e/EternitySnare.java +++ b/Mage.Sets/src/mage/cards/e/EternitySnare.java @@ -40,7 +40,7 @@ public final class EternitySnare extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private EternitySnare(final EternitySnare card) { diff --git a/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java b/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java index 20c52023519..4d64ac11593 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java +++ b/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java @@ -29,7 +29,7 @@ public final class EtherealWhiskergill extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Ethereal Whiskergill can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private EtherealWhiskergill(final EtherealWhiskergill card) { diff --git a/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java b/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java index 7d21845c47f..fad19a9e952 100644 --- a/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java +++ b/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java @@ -33,7 +33,7 @@ public final class EtherswornCanonist extends CardImpl { this.toughness = new MageInt(2); // Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EtherswornCanonistReplacementEffect()), new EtherswornCanonistWatcher()); + this.addAbility(new SimpleStaticAbility(new EtherswornCanonistReplacementEffect()), new EtherswornCanonistWatcher()); } private EtherswornCanonist(final EtherswornCanonist card) { diff --git a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java index 890c1fc129d..351dfbcf06f 100644 --- a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java +++ b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java @@ -39,7 +39,7 @@ public final class EvanescentIntellect extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } private EvanescentIntellect(final EvanescentIntellect card) { diff --git a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java index d09adc7a3e0..7f7527c0eca 100644 --- a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java @@ -36,7 +36,7 @@ public final class EverflameEidolon extends CardImpl { // {R}: Everflame Eidolon gets +1/+0 until end of turn. If it's an Aura, enchanted creature gets +1/+0 until end of turn instead. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EverflameEidolonEffect(), new ManaCostsImpl<>("{R}"))); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); } private EverflameEidolon(final EverflameEidolon card) { diff --git a/Mage.Sets/src/mage/cards/e/Evermind.java b/Mage.Sets/src/mage/cards/e/Evermind.java index 53e6f6a9a84..52d71c1bed6 100644 --- a/Mage.Sets/src/mage/cards/e/Evermind.java +++ b/Mage.Sets/src/mage/cards/e/Evermind.java @@ -26,7 +26,7 @@ public final class Evermind extends CardImpl { this.color.setBlue(true); // (Nonexistent mana costs can't be paid.) - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("(Nonexistent mana costs can't be paid.)")); + Ability ability = new SimpleStaticAbility(new InfoEffect("(Nonexistent mana costs can't be paid.)")); ability.setRuleAtTheTop(true); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java index 490279aaebf..33dc7febde1 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java @@ -36,7 +36,7 @@ public final class EvilEyeOfOrmsByGore extends CardImpl { this.toughness = new MageInt(6); // Non-Eye creatures you control can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); // Evil Eye of Orms-by-Gore can't be blocked except by Walls. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(cantBeBlockedByFilter, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java index 01452b51c52..9f4543819e4 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java @@ -33,7 +33,7 @@ public final class EvilEyeOfUrborg extends CardImpl { this.toughness = new MageInt(3); // Non-Eye creatures you control can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); // Whenever Evil Eye of Urborg becomes blocked by a creature, destroy that creature. this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new DestroyTargetEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/e/EvilPresence.java b/Mage.Sets/src/mage/cards/e/EvilPresence.java index 8f8caa54ad4..95ae47fd84b 100644 --- a/Mage.Sets/src/mage/cards/e/EvilPresence.java +++ b/Mage.Sets/src/mage/cards/e/EvilPresence.java @@ -33,7 +33,7 @@ public final class EvilPresence extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); } private EvilPresence(final EvilPresence card) { diff --git a/Mage.Sets/src/mage/cards/e/ExaltedDragon.java b/Mage.Sets/src/mage/cards/e/ExaltedDragon.java index fea3c6f2219..5ee216075e6 100644 --- a/Mage.Sets/src/mage/cards/e/ExaltedDragon.java +++ b/Mage.Sets/src/mage/cards/e/ExaltedDragon.java @@ -37,7 +37,7 @@ public final class ExaltedDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Exalted Dragon can't attack unless you sacrifice a land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExaltedDragonCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new ExaltedDragonCostToAttackBlockEffect())); } private ExaltedDragon(final ExaltedDragon card) { diff --git a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java index 883cea588eb..88312183b57 100644 --- a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java +++ b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java @@ -36,7 +36,7 @@ public final class ExavaRakdosBloodWitch extends CardImpl { // Unleash this.addAbility(new UnleashAbility()); // Each other creature you control with a +1/+1 counter on it has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_OTHER_CONTROLLED_CREATURE_P1P1, diff --git a/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java b/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java index fe2a24e51dd..40a00e27ba1 100644 --- a/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java +++ b/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java @@ -52,7 +52,7 @@ public final class ExcaliburSwordOfEden extends CardImpl { ); // Equipped creature gets +10/+0 and has vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(10, 0)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(10, 0)); ability.addEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has vigilance")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java index b41ee9dd0b1..8c5b9ad086c 100644 --- a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java +++ b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java @@ -40,7 +40,7 @@ public final class ExclusionRitual extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); // Players can't cast spells with the same name as the exiled card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExclusionRitualReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ExclusionRitualReplacementEffect())); } private ExclusionRitual(final ExclusionRitual card) { diff --git a/Mage.Sets/src/mage/cards/e/Excruciator.java b/Mage.Sets/src/mage/cards/e/Excruciator.java index 3ec3f99b1b2..4d7524d8141 100644 --- a/Mage.Sets/src/mage/cards/e/Excruciator.java +++ b/Mage.Sets/src/mage/cards/e/Excruciator.java @@ -30,7 +30,7 @@ public final class Excruciator extends CardImpl { this.toughness = new MageInt(7); // Damage that would be dealt by Excruciator can't be prevented. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExcruciatorEffect())); + this.addAbility(new SimpleStaticAbility(new ExcruciatorEffect())); } private Excruciator(final Excruciator card) { diff --git a/Mage.Sets/src/mage/cards/e/ExecutionersHood.java b/Mage.Sets/src/mage/cards/e/ExecutionersHood.java index 31bb5feba56..8ceeecba4c4 100644 --- a/Mage.Sets/src/mage/cards/e/ExecutionersHood.java +++ b/Mage.Sets/src/mage/cards/e/ExecutionersHood.java @@ -26,7 +26,7 @@ public final class ExecutionersHood extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has intimidate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java index 7bdfff85721..cfd4cf96602 100644 --- a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java +++ b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java @@ -39,7 +39,7 @@ public final class ExoskeletalArmor extends CardImpl { CardsInAllGraveyardsCount count = new CardsInAllGraveyardsCount(StaticFilters.FILTER_CARD_CREATURES); Effect effect = new BoostEnchantedEffect(count, count, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +X/+X, where X is the number of creature cards in all graveyards"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private ExoskeletalArmor(final ExoskeletalArmor card) { diff --git a/Mage.Sets/src/mage/cards/e/ExoticCurse.java b/Mage.Sets/src/mage/cards/e/ExoticCurse.java index 92fab7e1af7..0851411f1c2 100644 --- a/Mage.Sets/src/mage/cards/e/ExoticCurse.java +++ b/Mage.Sets/src/mage/cards/e/ExoticCurse.java @@ -34,7 +34,7 @@ public final class ExoticCurse extends CardImpl { // Domain - Enchanted creature gets -1/-1 for each basic land type among lands you control. DynamicValue unboost = new SignInversionDynamicValue(DomainValue.REGULAR); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(unboost, unboost, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(unboost, unboost, Duration.WhileOnBattlefield)); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java index f25835e285d..c208a7ac2d3 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java @@ -35,7 +35,7 @@ public final class ExperimentKraj extends CardImpl { this.toughness = new MageInt(6); // Experiment Kraj has all activated abilities of each other creature with a +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExperimentKrajEffect())); + this.addAbility(new SimpleStaticAbility(new ExperimentKrajEffect())); // {tap}: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java b/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java index 7821b7ee120..45670ba24d2 100644 --- a/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java +++ b/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java @@ -37,7 +37,7 @@ public final class ExquisiteArchangel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If you would lose the game, instead exile Exquisite Archangel and your life total becomes equal to your starting life total. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExquisiteArchangelEffect())); + this.addAbility(new SimpleStaticAbility(new ExquisiteArchangelEffect())); } diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java index 96aba193e73..5b176a45956 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java @@ -46,7 +46,7 @@ public final class ExtricatorOfFlesh extends CardImpl { this.nightCard = true; // Eldrazi you control have vigilance - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filterEldrazi))); // {2}, {T}, Sacrifice a non-Eldrazi creature: Create a 3/2 colorless Eldrazi Horror creature token. diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index 5bfd94ba16c..f6382c38d5f 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -39,7 +39,7 @@ public final class EyeOfUgin extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Colorless Eldrazi spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterSpells, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterSpells, 2))); // {7}, {tap}: Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library. Ability searchAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java index 70c285bf42d..e5bc886ce92 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java +++ b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java @@ -32,7 +32,7 @@ public final class EzurisBrigade extends CardImpl { // Metalcraft — As long as you control three or more artifacts, Ezuri’s Brigade gets +4/+4 and has trample. ContinuousEffect boostSource = new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, rule); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MetalcraftCondition.instance, "and has trample")); ability.setAbilityWord(AbilityWord.METALCRAFT); ability.addHint(MetalcraftHint.instance); diff --git a/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java b/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java index 4dbdf91f625..926a8035310 100644 --- a/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java +++ b/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java @@ -38,14 +38,14 @@ public final class FaceOfDivinity extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // As long as another Aura is attached to enchanted creature, it has first strike and lifelink. Effect effect1 = new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), FaceOfDivinityCondition.instance, "As long as another Aura is attached to enchanted creature, it has first strike"); Effect effect2 = new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), FaceOfDivinityCondition.instance, "and lifelink"); - Ability abilityBoost = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability abilityBoost = new SimpleStaticAbility(effect1); abilityBoost.addEffect(effect2); this.addAbility(abilityBoost); } @@ -88,5 +88,3 @@ enum FaceOfDivinityCondition implements Condition { return "another Aura is attached to enchanted creature"; } } - - diff --git a/Mage.Sets/src/mage/cards/f/FaerieNoble.java b/Mage.Sets/src/mage/cards/f/FaerieNoble.java index 8a7074d25db..8d5afad5300 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieNoble.java +++ b/Mage.Sets/src/mage/cards/f/FaerieNoble.java @@ -38,7 +38,7 @@ public final class FaerieNoble extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Faerie creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); // {tap}: Other Faerie creatures you control get +1/+0 until end of turn. Effect effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter, true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FaithsFetters.java b/Mage.Sets/src/mage/cards/f/FaithsFetters.java index 4c22aecddbd..63b2a8e1091 100644 --- a/Mage.Sets/src/mage/cards/f/FaithsFetters.java +++ b/Mage.Sets/src/mage/cards/f/FaithsFetters.java @@ -43,7 +43,7 @@ public final class FaithsFetters extends CardImpl { // Enchanted permanent's activated abilities can't be activated unless they're mana abilities. If enchanted permanent is a creature, it can't attack or block. Effect effect = new CantAttackBlockAttachedEffect(AttachmentType.AURA); effect.setText("Enchanted permanent can't attack or block,"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); ability.addEffect(new FaithsFettersEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java index a5ba41d8c4c..e4156ea35e1 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java @@ -43,7 +43,7 @@ public final class FalkenrathGorger extends CardImpl { * from Falkenrath Gorger. */ // Each Vampire creature card you own that isn't on the battlefield has madness. Its madness cost is equal to its mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FalkenrathGorgerEffect())); + this.addAbility(new SimpleStaticAbility(new FalkenrathGorgerEffect())); } private FalkenrathGorger(final FalkenrathGorger card) { diff --git a/Mage.Sets/src/mage/cards/f/FamiliarGround.java b/Mage.Sets/src/mage/cards/f/FamiliarGround.java index 749958e8e86..b30f55cde2d 100644 --- a/Mage.Sets/src/mage/cards/f/FamiliarGround.java +++ b/Mage.Sets/src/mage/cards/f/FamiliarGround.java @@ -21,7 +21,7 @@ public final class FamiliarGround extends CardImpl { // Each creature you control can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE))); } private FamiliarGround(final FamiliarGround card) { diff --git a/Mage.Sets/src/mage/cards/f/FamishedPaladin.java b/Mage.Sets/src/mage/cards/f/FamishedPaladin.java index f14fe25957e..23c06713c01 100644 --- a/Mage.Sets/src/mage/cards/f/FamishedPaladin.java +++ b/Mage.Sets/src/mage/cards/f/FamishedPaladin.java @@ -27,7 +27,7 @@ public final class FamishedPaladin extends CardImpl { this.toughness = new MageInt(3); // Famished Paladin doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you gain life, untap Famished Paladin. this.addAbility(new GainLifeControllerTriggeredAbility(new UntapSourceEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/f/Farmstead.java b/Mage.Sets/src/mage/cards/f/Farmstead.java index 0ff0e850985..37b61ff1c68 100644 --- a/Mage.Sets/src/mage/cards/f/Farmstead.java +++ b/Mage.Sets/src/mage/cards/f/Farmstead.java @@ -40,7 +40,7 @@ public final class Farmstead extends CardImpl { ); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Farmstead(final Farmstead card) { diff --git a/Mage.Sets/src/mage/cards/f/Fastbond.java b/Mage.Sets/src/mage/cards/f/Fastbond.java index ea180834bab..c735fbcfc42 100644 --- a/Mage.Sets/src/mage/cards/f/Fastbond.java +++ b/Mage.Sets/src/mage/cards/f/Fastbond.java @@ -26,7 +26,7 @@ public final class Fastbond extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // You may play any number of additional lands on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield))); // Whenever you play a land, if it wasn't the first land you played this turn, Fastbond deals 1 damage to you. this.addAbility(new PlayALandTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/f/Fasting.java b/Mage.Sets/src/mage/cards/f/Fasting.java index b67a87ef443..b46ca01c300 100644 --- a/Mage.Sets/src/mage/cards/f/Fasting.java +++ b/Mage.Sets/src/mage/cards/f/Fasting.java @@ -37,7 +37,7 @@ public final class Fasting extends CardImpl { this.addAbility(ability); // If you would begin your draw step, you may skip that step instead. If you do, you gain 2 life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FastingReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new FastingReplacementEffect())); // When you draw a card, destroy Fasting. this.addAbility(new DrawCardControllerTriggeredAbility(new DestroySourceEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java index 943d8077196..7e434ef6d0c 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java @@ -31,7 +31,7 @@ public final class FavorOfTheMighty extends CardImpl { this.subtype.add(SubType.GIANT); // Each creature with the highest converted mana cost has protection from all colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FavorOfTheMightyEffect())); + this.addAbility(new SimpleStaticAbility(new FavorOfTheMightyEffect())); } private FavorOfTheMighty(final FavorOfTheMighty card) { diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java index 0bd0df63850..fe97ba9e3ae 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java @@ -41,11 +41,11 @@ public final class FavorOfTheOverbeing extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is green, it gets +1/+1 and has vigilance. - SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); + SimpleStaticAbility greenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); greenAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has vigilance")); this.addAbility(greenAbility); // As long as enchanted creature is blue, it gets +1/+1 and has flying. - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); blueAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has flying")); this.addAbility(blueAbility); } diff --git a/Mage.Sets/src/mage/cards/f/Fear.java b/Mage.Sets/src/mage/cards/f/Fear.java index a7ed049fc7c..7abf44624a8 100644 --- a/Mage.Sets/src/mage/cards/f/Fear.java +++ b/Mage.Sets/src/mage/cards/f/Fear.java @@ -36,7 +36,7 @@ public final class Fear extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); } private Fear(final Fear card) { diff --git a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java index 753989475a9..78da48253ae 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java @@ -39,7 +39,7 @@ public final class FearsomeTemper extends CardImpl { // Enchanted creature gets +2/+2 and has "{2}{R}: Target creature can't block this creature this turn." Effect effect = new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); grantedAbility.addTarget(new TargetCreaturePermanent()); effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java index e12778852c3..4a7eb8803e9 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java @@ -35,7 +35,7 @@ public final class FeastOfTheUnicorn extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +4/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(4, 0, Duration.WhileOnBattlefield))); } private FeastOfTheUnicorn(final FeastOfTheUnicorn card) { diff --git a/Mage.Sets/src/mage/cards/f/FeastingHobbit.java b/Mage.Sets/src/mage/cards/f/FeastingHobbit.java index a326576dbd2..f8dbd8c91ad 100644 --- a/Mage.Sets/src/mage/cards/f/FeastingHobbit.java +++ b/Mage.Sets/src/mage/cards/f/FeastingHobbit.java @@ -30,7 +30,7 @@ public final class FeastingHobbit extends CardImpl { this.addAbility(new DevourAbility(3, StaticFilters.FILTER_CONTROLLED_FOOD)); // Creatures with power less than Feasting Hobbit's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private FeastingHobbit(final FeastingHobbit card) { diff --git a/Mage.Sets/src/mage/cards/f/Feebleness.java b/Mage.Sets/src/mage/cards/f/Feebleness.java index e4f80309739..0676f4e2e86 100644 --- a/Mage.Sets/src/mage/cards/f/Feebleness.java +++ b/Mage.Sets/src/mage/cards/f/Feebleness.java @@ -37,7 +37,7 @@ public final class Feebleness extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); } private Feebleness(final Feebleness card) { diff --git a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java index bc1a772569d..1e05868e34b 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java @@ -34,7 +34,7 @@ public final class FelhideBrawler extends CardImpl { this.toughness = new MageInt(2); // Felhide Brawler can't block unless you control another Minotaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockUnlessYouControlSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockUnlessYouControlSourceEffect(filter))); } private FelhideBrawler(final FelhideBrawler card) { diff --git a/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java b/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java index c826513a78d..40dbf54847b 100644 --- a/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java +++ b/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java @@ -31,7 +31,7 @@ public final class FelhidePetrifier extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // Other Minotaur creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.MINOTAUR,"Minotaur creatures"), true) diff --git a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java index 0377f10113b..729f7299394 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java +++ b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java @@ -41,7 +41,7 @@ public final class FelidarUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature has lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); // {1}{W}: Attach Felidar Umbra to target creature you control. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/f/FelineSovereign.java b/Mage.Sets/src/mage/cards/f/FelineSovereign.java index a2201d40efa..305f05d98fa 100644 --- a/Mage.Sets/src/mage/cards/f/FelineSovereign.java +++ b/Mage.Sets/src/mage/cards/f/FelineSovereign.java @@ -44,7 +44,7 @@ public final class FelineSovereign extends CardImpl { this.toughness = new MageInt(3); // Other Cats you control get +1/+1 and have protection from Dogs. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCat, true)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCat, true)); // Effect effect = new GainAbilityAllEffect(new ProtectionAbility(filterProtectionFromDogs), Duration.WhileOnBattlefield, filterCat, true); effect.setText("and have protection from Dogs"); diff --git a/Mage.Sets/src/mage/cards/f/FellFlagship.java b/Mage.Sets/src/mage/cards/f/FellFlagship.java index 267504e362a..4596f0f4b45 100644 --- a/Mage.Sets/src/mage/cards/f/FellFlagship.java +++ b/Mage.Sets/src/mage/cards/f/FellFlagship.java @@ -36,7 +36,7 @@ public final class FellFlagship extends CardImpl { this.toughness = new MageInt(3); // Pirates you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter))); // Whenever Fell Flagship deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1, false), false, true)); diff --git a/Mage.Sets/src/mage/cards/f/FencersMagemark.java b/Mage.Sets/src/mage/cards/f/FencersMagemark.java index e646bdfd7cb..612c81d4bfd 100644 --- a/Mage.Sets/src/mage/cards/f/FencersMagemark.java +++ b/Mage.Sets/src/mage/cards/f/FencersMagemark.java @@ -41,7 +41,7 @@ public final class FencersMagemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1 and have first strike. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); Effect effect = new GainAbilityAllEffect(FirstStrikeAbility.getInstance(),Duration.WhileOnBattlefield,filter, " and have first strike"); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FeralInvocation.java b/Mage.Sets/src/mage/cards/f/FeralInvocation.java index ee5d4a0aa43..1ad0848f9c1 100644 --- a/Mage.Sets/src/mage/cards/f/FeralInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FeralInvocation.java @@ -38,7 +38,7 @@ public final class FeralInvocation extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/f/FerozsBan.java b/Mage.Sets/src/mage/cards/f/FerozsBan.java index 94216031e14..929b822add7 100644 --- a/Mage.Sets/src/mage/cards/f/FerozsBan.java +++ b/Mage.Sets/src/mage/cards/f/FerozsBan.java @@ -23,7 +23,7 @@ public final class FerozsBan extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // Creature spells cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY))); } private FerozsBan(final FerozsBan card) { diff --git a/Mage.Sets/src/mage/cards/f/Fervor.java b/Mage.Sets/src/mage/cards/f/Fervor.java index bb9514e88fe..513b02b245e 100644 --- a/Mage.Sets/src/mage/cards/f/Fervor.java +++ b/Mage.Sets/src/mage/cards/f/Fervor.java @@ -22,7 +22,7 @@ public final class Fervor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } diff --git a/Mage.Sets/src/mage/cards/f/FibrousEntangler.java b/Mage.Sets/src/mage/cards/f/FibrousEntangler.java index 45323d737de..ac64f9a2e07 100644 --- a/Mage.Sets/src/mage/cards/f/FibrousEntangler.java +++ b/Mage.Sets/src/mage/cards/f/FibrousEntangler.java @@ -33,10 +33,10 @@ public final class FibrousEntangler extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Fibrous Entangler must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); // Fibrous Entangler can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); } private FibrousEntangler(final FibrousEntangler card) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfDreams.java b/Mage.Sets/src/mage/cards/f/FieldOfDreams.java index ca253ecff36..f6227dad864 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfDreams.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfDreams.java @@ -21,7 +21,7 @@ public final class FieldOfDreams extends CardImpl { this.supertype.add(SuperType.WORLD); // Players play with the top card of their libraries revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect(true))); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect(true))); } private FieldOfDreams(final FieldOfDreams card) { diff --git a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java index 5f2ef3ba47d..53bdec74ab9 100644 --- a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java +++ b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java @@ -42,7 +42,7 @@ public final class FiendslayerPaladin extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Fiendslayer Paladin can't be the target of black or red spells your opponents control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FiendslayerPaladinEffect())); + this.addAbility(new SimpleStaticAbility(new FiendslayerPaladinEffect())); } diff --git a/Mage.Sets/src/mage/cards/f/FinalIteration.java b/Mage.Sets/src/mage/cards/f/FinalIteration.java index 89767168fcb..7ef4c765c72 100644 --- a/Mage.Sets/src/mage/cards/f/FinalIteration.java +++ b/Mage.Sets/src/mage/cards/f/FinalIteration.java @@ -50,7 +50,7 @@ public final class FinalIteration extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Wizards you control get +2/+1 and have flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false)); Effect effect = new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("and have flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FireServant.java b/Mage.Sets/src/mage/cards/f/FireServant.java index a788e1a42e3..fa337592b13 100644 --- a/Mage.Sets/src/mage/cards/f/FireServant.java +++ b/Mage.Sets/src/mage/cards/f/FireServant.java @@ -33,7 +33,7 @@ public final class FireServant extends CardImpl { this.toughness = new MageInt(3); // If a red instant or sorcery spell you control would deal damage, it deals double that damage instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FireServantEffect())); + this.addAbility(new SimpleStaticAbility(new FireServantEffect())); } private FireServant(final FireServant card) { diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index 5e87e556597..a5a419fb5ca 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -39,7 +39,7 @@ public final class FireWhip extends CardImpl { // Enchanted creature has "{t}: This creature deals 1 damage to any target." Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability1.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); // Sacrifice Fire Whip: Fire Whip deals 1 damage to any target. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability2.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java index c383ff9d101..e8776bb3246 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java @@ -27,7 +27,7 @@ public final class FiresOfYavimaya extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{G}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Fireshrieker.java b/Mage.Sets/src/mage/cards/f/Fireshrieker.java index af034ef564d..76c0c70de8c 100644 --- a/Mage.Sets/src/mage/cards/f/Fireshrieker.java +++ b/Mage.Sets/src/mage/cards/f/Fireshrieker.java @@ -26,7 +26,7 @@ public final class Fireshrieker extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java index 9966bf2722e..39ef82a2e5d 100644 --- a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java +++ b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java @@ -46,7 +46,7 @@ public final class FiresongAndSunspeaker extends CardImpl { // Red instant and sorcery spells you control have lifelink. Effect effect = new GainAbilityControlledSpellsEffect(LifelinkAbility.getInstance(), filter); effect.setText("Red instant and sorcery spells you control have lifelink"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player. this.addAbility(new FiresongAndSunspeakerTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java index 6029250a192..8457630204d 100644 --- a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java +++ b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java @@ -42,13 +42,13 @@ public final class FirewakeSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1)); gainedAbility.addCost(new SacrificeSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(targetSliverFilter)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( gainedAbility, Duration.WhileOnBattlefield, filter, "All Slivers have \"{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn.\""))); diff --git a/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java b/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java index d8ea30122af..9e84cc5e144 100644 --- a/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java +++ b/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java @@ -34,7 +34,7 @@ public final class FirstComeFirstServed extends CardImpl { // Each attacking or blocking creature with the lowest collector number among attacking or blocking creatures has first strike. GainAbilityAllEffect gainEffect = new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, gainEffect)); + this.addAbility(new SimpleStaticAbility(gainEffect)); } private FirstComeFirstServed(final FirstComeFirstServed card) { diff --git a/Mage.Sets/src/mage/cards/f/FishliverOil.java b/Mage.Sets/src/mage/cards/f/FishliverOil.java index b6e528b3b50..38215a093d8 100644 --- a/Mage.Sets/src/mage/cards/f/FishliverOil.java +++ b/Mage.Sets/src/mage/cards/f/FishliverOil.java @@ -35,7 +35,7 @@ public final class FishliverOil extends CardImpl { this.addAbility(ability); // Enchanted creature has islandwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new IslandwalkAbility(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/f/FistOfSuns.java b/Mage.Sets/src/mage/cards/f/FistOfSuns.java index 856b21ac505..42352f453ea 100644 --- a/Mage.Sets/src/mage/cards/f/FistOfSuns.java +++ b/Mage.Sets/src/mage/cards/f/FistOfSuns.java @@ -18,7 +18,7 @@ public final class FistOfSuns extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // You may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells that you cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WUBRGInsteadEffect())); + this.addAbility(new SimpleStaticAbility(new WUBRGInsteadEffect())); } private FistOfSuns(final FistOfSuns card) { diff --git a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java index bfe9b308f38..04b175d8d6f 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java @@ -41,7 +41,7 @@ public final class FistsOfIronwood extends CardImpl { // When Fists of Ironwood enters the battlefield, create two 1/1 green Saproling creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), 2), false)); // Enchanted creature has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); } private FistsOfIronwood(final FistsOfIronwood card) { diff --git a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java index 558c308445c..758bee188ae 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java @@ -41,11 +41,11 @@ public final class FistsOfTheDemigod extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has wither. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(WitherAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has wither")); this.addAbility(blackAbility); // As long as enchanted creature is red, it gets +1/+1 and has first strike. - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has first strike")); this.addAbility(redAbility); } diff --git a/Mage.Sets/src/mage/cards/f/FlameTrooper.java b/Mage.Sets/src/mage/cards/f/FlameTrooper.java index 46e6fcaf753..92f5d16cc38 100644 --- a/Mage.Sets/src/mage/cards/f/FlameTrooper.java +++ b/Mage.Sets/src/mage/cards/f/FlameTrooper.java @@ -34,7 +34,7 @@ public final class FlameTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have menace. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter, false))); } private FlameTrooper(final FlameTrooper card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java index c3b824d21d0..21899e284bd 100644 --- a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java +++ b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java @@ -37,7 +37,7 @@ public final class FlamespeakersWill extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals combat damage to a player, you may sacrifice Flamespeaker's Will. If you do, destroy target artifact. ability = new DealsDamageToAPlayerAttachedTriggeredAbility( new DoIfCostPaid(new DestroyTargetEffect(), new SacrificeSourceCost()), "enchanted creature", false, false, true, TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/f/FlamingSword.java b/Mage.Sets/src/mage/cards/f/FlamingSword.java index 1a88cc61d0d..5c1f1b228f7 100644 --- a/Mage.Sets/src/mage/cards/f/FlamingSword.java +++ b/Mage.Sets/src/mage/cards/f/FlamingSword.java @@ -46,7 +46,7 @@ public final class FlamingSword extends CardImpl { // Enchanted creature gets +1/+0 and has first strike. Effect effect = new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +1/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java index 21a215d38c9..b0fc9e5477b 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java @@ -35,7 +35,7 @@ public final class FlaringFlameKin extends CardImpl { // As long as Flaring Flame-Kin is enchanted, it gets +2/+2, has trample, and has "{R}: Flaring Flame-Kin gets +1/+0 until end of turn." EnchantedSourceCondition enchanted = new EnchantedSourceCondition(); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, "As long as {this} is enchanted, it gets +2/+2")); ability.addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/f/FlayerHusk.java b/Mage.Sets/src/mage/cards/f/FlayerHusk.java index 25243c68fab..c2626560f14 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerHusk.java +++ b/Mage.Sets/src/mage/cards/f/FlayerHusk.java @@ -28,7 +28,7 @@ public final class FlayerHusk extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +1/+1 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/f/FledglingOsprey.java b/Mage.Sets/src/mage/cards/f/FledglingOsprey.java index b6c0c5b0f55..753b9563814 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingOsprey.java +++ b/Mage.Sets/src/mage/cards/f/FledglingOsprey.java @@ -29,7 +29,7 @@ public final class FledglingOsprey extends CardImpl { this.toughness = new MageInt(1); // Fledgling Osprey has flying as long as it's enchanted. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new EnchantedSourceCondition(), "{this} has flying as long as it's enchanted"))); diff --git a/Mage.Sets/src/mage/cards/f/FleecemaneLion.java b/Mage.Sets/src/mage/cards/f/FleecemaneLion.java index b3760b26295..fe7e1f7e729 100644 --- a/Mage.Sets/src/mage/cards/f/FleecemaneLion.java +++ b/Mage.Sets/src/mage/cards/f/FleecemaneLion.java @@ -39,7 +39,7 @@ public final class FleecemaneLion extends CardImpl { new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has hexproof"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, diff --git a/Mage.Sets/src/mage/cards/f/FlickeringWard.java b/Mage.Sets/src/mage/cards/f/FlickeringWard.java index e036567ef2d..de6dd0e93ba 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringWard.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringWard.java @@ -40,7 +40,7 @@ public final class FlickeringWard extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Enchanted creature has protection from the chosen color. This effect doesn't remove Flickering Ward. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); // {W}: Return Flickering Ward to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/f/Flight.java b/Mage.Sets/src/mage/cards/f/Flight.java index 9ca193dba97..0974181cad1 100644 --- a/Mage.Sets/src/mage/cards/f/Flight.java +++ b/Mage.Sets/src/mage/cards/f/Flight.java @@ -36,7 +36,7 @@ public final class Flight extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private Flight(final Flight card) { diff --git a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java index d7e67dd3ec0..666771e76af 100644 --- a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java +++ b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java @@ -40,7 +40,7 @@ public final class FlightOfFancy extends CardImpl { // When Flight of Fancy enters the battlefield, draw two cards. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(2), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private FlightOfFancy(final FlightOfFancy card) { diff --git a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java index 89f35e8d400..4dc0d23dbaa 100644 --- a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java @@ -37,7 +37,7 @@ public final class FlinthoofBoar extends CardImpl { this.toughness = new MageInt(2); // Flinthoof Boar gets +1/+1 as long as you control a Mountain. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {R}: Flinthoof Boar gains haste until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java b/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java index 0556b056104..3bb1e100a3b 100644 --- a/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java +++ b/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java @@ -35,7 +35,7 @@ public final class FlitterstepEidolon extends CardImpl { // Flitterstep Eidolon can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); // Enchanted creature gets +1/+1 and can't be blocked. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); ability.addEffect(new CantBeBlockedAttachedEffect(AttachmentType.AURA).setText("and can't be blocked")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Floodchaser.java b/Mage.Sets/src/mage/cards/f/Floodchaser.java index 4be23201afe..4cf86bf8ed6 100644 --- a/Mage.Sets/src/mage/cards/f/Floodchaser.java +++ b/Mage.Sets/src/mage/cards/f/Floodchaser.java @@ -39,7 +39,7 @@ public final class Floodchaser extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6)), "with six +1/+1 counters on it")); // Floodchaser can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); // {U}, Remove a +1/+1 counter from Floodchaser: Target land becomes an Island until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java b/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java index 3e842dad7b6..635f0d195b6 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java +++ b/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java @@ -26,7 +26,7 @@ public final class FloodedWoodlands extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{B}"); // Green creatures can't attack unless their controller sacrifices a land for each green creature they control that's attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FloodedWoodlandsCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new FloodedWoodlandsCostToAttackBlockEffect())); } diff --git a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java index 7bc5a934ac7..4e30b2d64cb 100644 --- a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java +++ b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java @@ -28,7 +28,7 @@ public final class FloodtideSerpent extends CardImpl { this.toughness = new MageInt(4); // Floodtide Serpent can't attack unless you return an enchantment you control to its owner's hand (This cost is paid as attackers are declared.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessPaysSourceEffect( + this.addAbility(new SimpleStaticAbility(new CantAttackBlockUnlessPaysSourceEffect( new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT)), PayCostToAttackBlockEffectImpl.RestrictType.ATTACK))); } diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 5b4f3eec5bc..655a538d915 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -39,7 +39,7 @@ public final class FloweringField extends CardImpl { ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private FloweringField(final FloweringField card) { diff --git a/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java b/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java index 410b7a6e2e9..adf2449acf6 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java +++ b/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java @@ -29,7 +29,7 @@ public final class FloweringLumberknot extends CardImpl { this.toughness = new MageInt(5); // Flowering Lumberknot can't attack or block unless it's paired with a creature with soulbond. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FloweringLumberknotEffect())); + this.addAbility(new SimpleStaticAbility(new FloweringLumberknotEffect())); } private FloweringLumberknot(final FloweringLumberknot card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java b/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java index e3d6f788271..af11479d10a 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java @@ -21,7 +21,7 @@ public final class FlowstoneSurge extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // Creatures you control get +1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, -1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, -1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private FlowstoneSurge(final FlowstoneSurge card) { diff --git a/Mage.Sets/src/mage/cards/f/Fluctuator.java b/Mage.Sets/src/mage/cards/f/Fluctuator.java index 85a94979b1c..ed3153ebf24 100644 --- a/Mage.Sets/src/mage/cards/f/Fluctuator.java +++ b/Mage.Sets/src/mage/cards/f/Fluctuator.java @@ -26,7 +26,7 @@ public final class Fluctuator extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Cycling abilities you activate cost you up to {2} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FluctuatorEffect())); + this.addAbility(new SimpleStaticAbility(new FluctuatorEffect())); } private Fluctuator(final Fluctuator card) { diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java index 85edf1cebc1..06987afcf3c 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java @@ -36,7 +36,7 @@ public final class ForbiddenLore extends CardImpl { // Enchanted land has "{tap}: Target creature gets +2/+1 until end of turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 1, Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +2/+1 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/f/ForceBubble.java b/Mage.Sets/src/mage/cards/f/ForceBubble.java index e4407509e7f..9d852bc5354 100644 --- a/Mage.Sets/src/mage/cards/f/ForceBubble.java +++ b/Mage.Sets/src/mage/cards/f/ForceBubble.java @@ -33,7 +33,7 @@ public final class ForceBubble extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); // If damage would be dealt to you, put that many depletion counters on Force Bubble instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ForceBubbleReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ForceBubbleReplacementEffect())); // When there are four or more depletion counters on Force Bubble, sacrifice it. this.addAbility(new ForceBubbleStateTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/f/ForcedWorship.java b/Mage.Sets/src/mage/cards/f/ForcedWorship.java index 5101fae3bf2..91dba6f9140 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedWorship.java +++ b/Mage.Sets/src/mage/cards/f/ForcedWorship.java @@ -39,7 +39,7 @@ public final class ForcedWorship extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // {2}{W}: Return Forced Worship to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/f/ForebearsBlade.java b/Mage.Sets/src/mage/cards/f/ForebearsBlade.java index 23d9ef04a46..5dd136e987d 100644 --- a/Mage.Sets/src/mage/cards/f/ForebearsBlade.java +++ b/Mage.Sets/src/mage/cards/f/ForebearsBlade.java @@ -34,7 +34,7 @@ public final class ForebearsBlade extends CardImpl { // Equipped creature gets +3/+0 Effect effect = new BoostEquippedEffect(3, 0); effect.setText("Equipped creature gets +3/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); // and has vigilance effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has vigilance"); diff --git a/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java b/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java index 663892fbe13..19336700494 100644 --- a/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java +++ b/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java @@ -31,7 +31,7 @@ public final class ForethoughtAmulet extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(3)))); // If an instant or sorcery source would deal 3 or more damage to you, it deals 2 damage to you instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ForethoughtAmuletEffect())); + this.addAbility(new SimpleStaticAbility(new ForethoughtAmuletEffect())); } private ForethoughtAmulet(final ForethoughtAmulet card) { diff --git a/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java b/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java index 9354d0b1498..f779ffd31e4 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java @@ -25,7 +25,7 @@ public final class ForiysianBrigade extends CardImpl { this.toughness = new MageInt(4); // Foriysian Brigade can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private ForiysianBrigade(final ForiysianBrigade card) { diff --git a/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java b/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java index dbdb1b55b04..5b283316514 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java @@ -31,7 +31,7 @@ public final class ForiysianInterceptor extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Foriysian Interceptor can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private ForiysianInterceptor(final ForiysianInterceptor card) { diff --git a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java index 5109f228407..17cd16d1ed6 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java @@ -39,7 +39,7 @@ public final class ForiysianTotem extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForiysianTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}"))); // As long as Foriysian Totem is a creature, it can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText))); } private ForiysianTotem(final ForiysianTotem card) { diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java index 7b6c1206419..ce83e760513 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java @@ -45,7 +45,7 @@ public final class FormOfTheDragon extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SetPlayerLifeSourceEffect(5), false)); // Creatures without flying can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter))); } private FormOfTheDragon(final FormOfTheDragon card) { diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java b/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java index 19b4877da46..420380c52e9 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java @@ -38,13 +38,13 @@ public final class FormOfTheSquirrel extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new FormOfTheSquirrelCreateTokenEffect())); // Creatures can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); // You have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(ShroudAbility.getInstance()))); // You can't cast spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FormOfTheSquirrelCantCastEffect())); + this.addAbility(new SimpleStaticAbility(new FormOfTheSquirrelCantCastEffect())); } private FormOfTheSquirrel(final FormOfTheSquirrel card) { diff --git a/Mage.Sets/src/mage/cards/f/ForsakenCity.java b/Mage.Sets/src/mage/cards/f/ForsakenCity.java index eb15ab1f38f..ef3dd567a8f 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenCity.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenCity.java @@ -27,7 +27,7 @@ public final class ForsakenCity extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Forsaken City doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may exile a card from your hand. If you do, untap Forsaken City. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(new UntapSourceEffect(), new ExileFromHandCost(new TargetCardInHand(filter))))); diff --git a/Mage.Sets/src/mage/cards/f/FortifiedArea.java b/Mage.Sets/src/mage/cards/f/FortifiedArea.java index 1348ef9421c..d07d668f0ba 100644 --- a/Mage.Sets/src/mage/cards/f/FortifiedArea.java +++ b/Mage.Sets/src/mage/cards/f/FortifiedArea.java @@ -32,7 +32,7 @@ public final class FortifiedArea extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); // Wall creatures you control get +1/+0 and have banding. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(BandingAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have banding"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FortuneThief.java b/Mage.Sets/src/mage/cards/f/FortuneThief.java index 1e2a0c03cc2..eb61db64799 100644 --- a/Mage.Sets/src/mage/cards/f/FortuneThief.java +++ b/Mage.Sets/src/mage/cards/f/FortuneThief.java @@ -35,7 +35,7 @@ public final class FortuneThief extends CardImpl { this.toughness = new MageInt(1); // Damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FortuneThiefReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new FortuneThiefReplacementEffect())); // Morph {R}{R} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FoulPresence.java b/Mage.Sets/src/mage/cards/f/FoulPresence.java index 230dd49d726..80c8a539480 100644 --- a/Mage.Sets/src/mage/cards/f/FoulPresence.java +++ b/Mage.Sets/src/mage/cards/f/FoulPresence.java @@ -35,7 +35,7 @@ public final class FoulPresence extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -1/-1 and has "{T}: Target creature gets -1/-1 until end of turn." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FoundryInspector.java b/Mage.Sets/src/mage/cards/f/FoundryInspector.java index 838a3cd31b9..90c705b3ec6 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryInspector.java +++ b/Mage.Sets/src/mage/cards/f/FoundryInspector.java @@ -31,7 +31,7 @@ public final class FoundryInspector extends CardImpl { this.toughness = new MageInt(2); // Artifact spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private FoundryInspector(final FoundryInspector card) { diff --git a/Mage.Sets/src/mage/cards/f/FoundryScreecher.java b/Mage.Sets/src/mage/cards/f/FoundryScreecher.java index ebad8cff777..e4ffdc54c22 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryScreecher.java +++ b/Mage.Sets/src/mage/cards/f/FoundryScreecher.java @@ -31,7 +31,7 @@ public final class FoundryScreecher extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Foundry Screecher gets +1/+0 as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), "{this} gets +1/+0 as long as you control an artifact"))); diff --git a/Mage.Sets/src/mage/cards/f/FountainWatch.java b/Mage.Sets/src/mage/cards/f/FountainWatch.java index c67faf31fdd..19b7d8f5280 100644 --- a/Mage.Sets/src/mage/cards/f/FountainWatch.java +++ b/Mage.Sets/src/mage/cards/f/FountainWatch.java @@ -28,7 +28,7 @@ public final class FountainWatch extends CardImpl { this.toughness = new MageInt(4); // Artifacts and enchantments you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS_AND_ENCHANTMENTS, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS_AND_ENCHANTMENTS, false))); } private FountainWatch(final FountainWatch card) { diff --git a/Mage.Sets/src/mage/cards/f/FreneticRaptor.java b/Mage.Sets/src/mage/cards/f/FreneticRaptor.java index 17e2e697486..c409671a11d 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticRaptor.java +++ b/Mage.Sets/src/mage/cards/f/FreneticRaptor.java @@ -30,7 +30,7 @@ public final class FreneticRaptor extends CardImpl { this.toughness = new MageInt(6); // Beasts can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); } private FreneticRaptor(final FreneticRaptor card) { diff --git a/Mage.Sets/src/mage/cards/f/FrenziedRage.java b/Mage.Sets/src/mage/cards/f/FrenziedRage.java index d64d1d5f8f6..215b56412d2 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedRage.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedRage.java @@ -39,7 +39,7 @@ public final class FrenziedRage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.AURA); effect.setText("and has menace. (It can't be blocked except by two or more creatures.)"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FrenzySliver.java b/Mage.Sets/src/mage/cards/f/FrenzySliver.java index 249c0b358fb..259b1f7c7e3 100644 --- a/Mage.Sets/src/mage/cards/f/FrenzySliver.java +++ b/Mage.Sets/src/mage/cards/f/FrenzySliver.java @@ -43,7 +43,7 @@ public final class FrenzySliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have frenzy 1. (Whenever a Sliver attacks and isn't blocked, it gets +1/+0 until end of turn.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new FrenzyAbility(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have frenzy 1. (Whenever a Sliver attacks and isn't blocked, it gets +1/+0 until end of turn.)"))); } @@ -95,4 +95,4 @@ class FrenzyAbility extends TriggeredAbilityImpl { public String getRule() { return "Frenzy 1. (Whenever this creature attacks and isn't blocked, it gets +1/+0 until end of turn.)"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java b/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java index c4b08978b6b..e63f4b4b03f 100644 --- a/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java +++ b/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java @@ -31,7 +31,7 @@ public final class FreyalisesWinds extends CardImpl { this.addAbility(new BecomesTappedTriggeredAbility(effect, false, new FilterPermanent("a permanent"), true)); // If a permanent with a wind counter on it would untap during its controller's untap step, remove all wind counters from it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FreyalisesWindsReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new FreyalisesWindsReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/f/FrogTongue.java b/Mage.Sets/src/mage/cards/f/FrogTongue.java index 61e1286c6b9..cd3981d8436 100644 --- a/Mage.Sets/src/mage/cards/f/FrogTongue.java +++ b/Mage.Sets/src/mage/cards/f/FrogTongue.java @@ -35,7 +35,7 @@ public final class FrogTongue extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); } private FrogTongue(final FrogTongue card) { diff --git a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java index 16c60ddbd76..3b88eba0eb9 100644 --- a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java +++ b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java @@ -39,7 +39,7 @@ public final class FrogtosserBanneret extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Goblin spells and Rogue spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private FrogtosserBanneret(final FrogtosserBanneret card) { diff --git a/Mage.Sets/src/mage/cards/f/Frostwielder.java b/Mage.Sets/src/mage/cards/f/Frostwielder.java index 17c369bf06d..7f0597231cc 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwielder.java +++ b/Mage.Sets/src/mage/cards/f/Frostwielder.java @@ -37,7 +37,7 @@ public final class Frostwielder extends CardImpl { ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Frostwielder this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); + this.addAbility(new SimpleStaticAbility(new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } diff --git a/Mage.Sets/src/mage/cards/f/FrozenSolid.java b/Mage.Sets/src/mage/cards/f/FrozenSolid.java index 1c12dc6461a..90e30f24e3f 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenSolid.java +++ b/Mage.Sets/src/mage/cards/f/FrozenSolid.java @@ -35,7 +35,7 @@ public final class FrozenSolid extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // When enchanted creature is dealt damage, destroy it. this.addAbility(new DealtDamageAttachedTriggeredAbility(new DestroyAttachedToEffect("it"), false) .setTriggerPhrase("When enchanted creature is dealt damage, ")); diff --git a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java index 71c8867e1f8..61ee050ef08 100644 --- a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java +++ b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java @@ -38,7 +38,7 @@ public final class FullMoonsRise extends CardImpl { // Werewolf creatures you control get +1/+0 and have trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FungalFortitude.java b/Mage.Sets/src/mage/cards/f/FungalFortitude.java index 609ebfb26a1..913ccf36b59 100644 --- a/Mage.Sets/src/mage/cards/f/FungalFortitude.java +++ b/Mage.Sets/src/mage/cards/f/FungalFortitude.java @@ -38,7 +38,7 @@ public final class FungalFortitude extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // When enchanted creature dies, return it to the battlefield tapped under its owner's control. this.addAbility(new DiesAttachedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/f/FungusSliver.java b/Mage.Sets/src/mage/cards/f/FungusSliver.java index a4d8f23c389..b1ecfcfbc75 100644 --- a/Mage.Sets/src/mage/cards/f/FungusSliver.java +++ b/Mage.Sets/src/mage/cards/f/FungusSliver.java @@ -35,7 +35,7 @@ public final class FungusSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have "Whenever this creature is dealt damage, put a +1/+1 counter on it." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new DealtDamageToSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false), Duration.WhileOnBattlefield, filter, diff --git a/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java b/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java index f8092f974c3..774271c00eb 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java @@ -26,7 +26,7 @@ public final class FurnaceOfRath extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}{R}"); // If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FurnaceOfRathEffect())); + this.addAbility(new SimpleStaticAbility(new FurnaceOfRathEffect())); } private FurnaceOfRath(final FurnaceOfRath card) { diff --git a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java index b1f0b3565fa..042f4c8df34 100644 --- a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java @@ -32,7 +32,7 @@ public final class FurorOfTheBitten extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and attacks each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FutureSight.java b/Mage.Sets/src/mage/cards/f/FutureSight.java index fa7cda7e9c3..7e83c7747ed 100644 --- a/Mage.Sets/src/mage/cards/f/FutureSight.java +++ b/Mage.Sets/src/mage/cards/f/FutureSight.java @@ -19,10 +19,10 @@ public final class FutureSight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}{U}"); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // You may play lands and cast spells from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayFromTopOfLibraryEffect())); + this.addAbility(new SimpleStaticAbility(new PlayFromTopOfLibraryEffect())); } private FutureSight(final FutureSight card) { -- 2.47.2 From 80ec5af4f52e04fcb22a04c3a45a8e3a055781cc Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:12:20 -0500 Subject: [PATCH 14/50] refactor: SimpleStaticAbility default zone (cards G) --- Mage.Sets/src/mage/cards/g/GaddockTeeg.java | 4 ++-- Mage.Sets/src/mage/cards/g/GaeasEmbrace.java | 2 +- Mage.Sets/src/mage/cards/g/GaeasHerald.java | 2 +- Mage.Sets/src/mage/cards/g/GaeasProtector.java | 2 +- Mage.Sets/src/mage/cards/g/GaeasRevenge.java | 2 +- Mage.Sets/src/mage/cards/g/GallowsWarden.java | 2 +- Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java | 2 +- Mage.Sets/src/mage/cards/g/GalvanicArc.java | 2 +- Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java | 2 +- Mage.Sets/src/mage/cards/g/GandalfTheWhite.java | 2 +- Mage.Sets/src/mage/cards/g/GaseousForm.java | 2 +- Mage.Sets/src/mage/cards/g/GateSmasher.java | 2 +- Mage.Sets/src/mage/cards/g/GathanRaiders.java | 2 +- Mage.Sets/src/mage/cards/g/GathererOfGraces.java | 2 +- Mage.Sets/src/mage/cards/g/GauntletOfMight.java | 2 +- Mage.Sets/src/mage/cards/g/GavonyIronwright.java | 2 +- Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java | 2 +- Mage.Sets/src/mage/cards/g/GeistTrappers.java | 2 +- Mage.Sets/src/mage/cards/g/GelidShackles.java | 2 +- Mage.Sets/src/mage/cards/g/GeneralsKabuto.java | 4 ++-- Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java | 2 +- Mage.Sets/src/mage/cards/g/GhalmasWarden.java | 2 +- Mage.Sets/src/mage/cards/g/GhastbarkTwins.java | 2 +- Mage.Sets/src/mage/cards/g/GhastlyHaunting.java | 2 +- Mage.Sets/src/mage/cards/g/GhirapurOrrery.java | 2 +- Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java | 2 +- Mage.Sets/src/mage/cards/g/GhostflameSliver.java | 2 +- Mage.Sets/src/mage/cards/g/GhostlyPossession.java | 4 ++-- Mage.Sets/src/mage/cards/g/GhostlyTouch.java | 2 +- Mage.Sets/src/mage/cards/g/GhostlyWings.java | 2 +- Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java | 2 +- Mage.Sets/src/mage/cards/g/GiantShark.java | 2 +- Mage.Sets/src/mage/cards/g/GiantSpectacle.java | 2 +- Mage.Sets/src/mage/cards/g/GiantStrength.java | 2 +- Mage.Sets/src/mage/cards/g/GiantTortoise.java | 2 +- Mage.Sets/src/mage/cards/g/GiantTurtle.java | 2 +- Mage.Sets/src/mage/cards/g/GibberingHyenas.java | 2 +- Mage.Sets/src/mage/cards/g/GideonsIntervention.java | 4 ++-- Mage.Sets/src/mage/cards/g/GideonsResolve.java | 2 +- Mage.Sets/src/mage/cards/g/GiftOfGranite.java | 2 +- Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java | 2 +- Mage.Sets/src/mage/cards/g/GiftOfParadise.java | 2 +- Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java | 4 ++-- Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java | 2 +- Mage.Sets/src/mage/cards/g/GiveNoGround.java | 2 +- Mage.Sets/src/mage/cards/g/GlacialChasm.java | 4 ++-- Mage.Sets/src/mage/cards/g/GlacialCrasher.java | 2 +- Mage.Sets/src/mage/cards/g/GlacialPlating.java | 2 +- Mage.Sets/src/mage/cards/g/Glaciers.java | 2 +- Mage.Sets/src/mage/cards/g/Glamdring.java | 2 +- Mage.Sets/src/mage/cards/g/GlaringAegis.java | 2 +- Mage.Sets/src/mage/cards/g/GlaringSpotlight.java | 2 +- Mage.Sets/src/mage/cards/g/GleamOfAuthority.java | 2 +- Mage.Sets/src/mage/cards/g/GlenElendraLiege.java | 4 ++-- Mage.Sets/src/mage/cards/g/GlidingLicid.java | 2 +- Mage.Sets/src/mage/cards/g/GlimmerdustNap.java | 2 +- Mage.Sets/src/mage/cards/g/GlisteningOil.java | 2 +- Mage.Sets/src/mage/cards/g/Gloom.java | 6 +++--- Mage.Sets/src/mage/cards/g/GloomSurgeon.java | 2 +- Mage.Sets/src/mage/cards/g/GloriousAnthem.java | 2 +- Mage.Sets/src/mage/cards/g/GloryOfWarfare.java | 4 ++-- Mage.Sets/src/mage/cards/g/Glowrider.java | 2 +- Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java | 2 +- Mage.Sets/src/mage/cards/g/GnarledScarhide.java | 2 +- Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java | 2 +- Mage.Sets/src/mage/cards/g/GobhobblerRats.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinBrawler.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinCaves.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinChieftain.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinCohort.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinDirigible.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinFireFiend.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinFurrier.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinGaveleer.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinGoon.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinKing.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinMutant.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinRockSled.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinShrine.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinSpy.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWarDrums.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWarPaint.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWarWagon.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWarchief.java | 4 ++-- Mage.Sets/src/mage/cards/g/GodEternalKefnet.java | 2 +- Mage.Sets/src/mage/cards/g/GodheadOfAwe.java | 2 +- Mage.Sets/src/mage/cards/g/GodhunterOctopus.java | 2 +- Mage.Sets/src/mage/cards/g/Godsend.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoldnightCastigator.java | 2 +- Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java | 4 ++-- Mage.Sets/src/mage/cards/g/GolgariDecoy.java | 2 +- Mage.Sets/src/mage/cards/g/GorgonsHead.java | 2 +- Mage.Sets/src/mage/cards/g/GorillaBerserkers.java | 2 +- Mage.Sets/src/mage/cards/g/GorillaPack.java | 2 +- Mage.Sets/src/mage/cards/g/GorillaTitan.java | 2 +- Mage.Sets/src/mage/cards/g/GormTheGreat.java | 2 +- Mage.Sets/src/mage/cards/g/GostaDirk.java | 2 +- Mage.Sets/src/mage/cards/g/GracebladeArtisan.java | 2 +- Mage.Sets/src/mage/cards/g/GracefulAdept.java | 2 +- Mage.Sets/src/mage/cards/g/GrafHarvest.java | 2 +- Mage.Sets/src/mage/cards/g/GrafdiggersCage.java | 4 ++-- Mage.Sets/src/mage/cards/g/GraftedWargear.java | 2 +- Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java | 6 +++--- Mage.Sets/src/mage/cards/g/GrandArchitect.java | 2 +- Mage.Sets/src/mage/cards/g/GrandMelee.java | 4 ++-- Mage.Sets/src/mage/cards/g/GrapplingHook.java | 2 +- Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java | 2 +- Mage.Sets/src/mage/cards/g/GratuitousViolence.java | 2 +- Mage.Sets/src/mage/cards/g/GraveServitude.java | 2 +- Mage.Sets/src/mage/cards/g/GravebaneZombie.java | 4 ++-- Mage.Sets/src/mage/cards/g/GravitationalShift.java | 4 ++-- Mage.Sets/src/mage/cards/g/GreatWall.java | 2 +- Mage.Sets/src/mage/cards/g/GreatbowDoyen.java | 2 +- Mage.Sets/src/mage/cards/g/GreaterAuramancy.java | 4 ++-- Mage.Sets/src/mage/cards/g/Greatsword.java | 2 +- Mage.Sets/src/mage/cards/g/GreelsCaress.java | 2 +- Mage.Sets/src/mage/cards/g/GreenScarab.java | 4 ++-- Mage.Sets/src/mage/cards/g/GridMonitor.java | 4 ++-- Mage.Sets/src/mage/cards/g/GriffinGuide.java | 2 +- Mage.Sets/src/mage/cards/g/GriftersBlade.java | 2 +- Mage.Sets/src/mage/cards/g/GrimMonolith.java | 2 +- Mage.Sets/src/mage/cards/g/GrimReapersSprint.java | 2 +- Mage.Sets/src/mage/cards/g/GrimStrider.java | 2 +- Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java | 4 ++-- Mage.Sets/src/mage/cards/g/GrislyTransformation.java | 2 +- Mage.Sets/src/mage/cards/g/GrixisGrimblade.java | 2 +- Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java | 2 +- Mage.Sets/src/mage/cards/g/GroundSeal.java | 2 +- Mage.Sets/src/mage/cards/g/Grounded.java | 2 +- Mage.Sets/src/mage/cards/g/GruesomeDeformity.java | 2 +- Mage.Sets/src/mage/cards/g/GruulWarPlow.java | 2 +- Mage.Sets/src/mage/cards/g/GryffsBoon.java | 2 +- Mage.Sets/src/mage/cards/g/GuardDuty.java | 2 +- Mage.Sets/src/mage/cards/g/GuardGomazoa.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianSeraph.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianZendikon.java | 2 +- Mage.Sets/src/mage/cards/g/GuardiansMagemark.java | 2 +- Mage.Sets/src/mage/cards/g/GuildscornWard.java | 2 +- Mage.Sets/src/mage/cards/g/Guile.java | 4 ++-- Mage.Sets/src/mage/cards/g/GuiseOfFire.java | 2 +- Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java | 4 ++-- Mage.Sets/src/mage/cards/g/GuulDrazVampire.java | 2 +- 146 files changed, 174 insertions(+), 174 deletions(-) diff --git a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java index c84d4251505..d7d25f683cf 100644 --- a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java +++ b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java @@ -29,9 +29,9 @@ public final class GaddockTeeg extends CardImpl { this.toughness = new MageInt(2); // Noncreature spells with converted mana cost 4 or greater can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GaddockTeegReplacementEffect4())); + this.addAbility(new SimpleStaticAbility(new GaddockTeegReplacementEffect4())); // Noncreature spells with {X} in their mana costs can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GaddockTeegReplacementEffectX())); + this.addAbility(new SimpleStaticAbility(new GaddockTeegReplacementEffectX())); } private GaddockTeeg(final GaddockTeeg card) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java index ad133730d03..030ac72c1c7 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java @@ -35,7 +35,7 @@ public final class GaeasEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GaeasHerald.java b/Mage.Sets/src/mage/cards/g/GaeasHerald.java index 23ee5e5ab64..c34728c3bb0 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasHerald.java +++ b/Mage.Sets/src/mage/cards/g/GaeasHerald.java @@ -31,7 +31,7 @@ public final class GaeasHerald extends CardImpl { this.toughness = new MageInt(1); // Creature spells can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCounterEffect())); + this.addAbility(new SimpleStaticAbility(new CantCounterEffect())); } private GaeasHerald(final GaeasHerald card) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasProtector.java b/Mage.Sets/src/mage/cards/g/GaeasProtector.java index fd8c86e988e..a448f5bd6dc 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasProtector.java +++ b/Mage.Sets/src/mage/cards/g/GaeasProtector.java @@ -27,7 +27,7 @@ public final class GaeasProtector extends CardImpl { this.toughness = new MageInt(2); // Gaea's Protector must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); } private GaeasProtector(final GaeasProtector card) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasRevenge.java b/Mage.Sets/src/mage/cards/g/GaeasRevenge.java index f57fcbc0a54..83b3115ec78 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasRevenge.java +++ b/Mage.Sets/src/mage/cards/g/GaeasRevenge.java @@ -40,7 +40,7 @@ public final class GaeasRevenge extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect())); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filter, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/g/GallowsWarden.java b/Mage.Sets/src/mage/cards/g/GallowsWarden.java index 3d6a0978a6e..d98d8c6619b 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsWarden.java +++ b/Mage.Sets/src/mage/cards/g/GallowsWarden.java @@ -35,7 +35,7 @@ public final class GallowsWarden extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Spirit creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } private GallowsWarden(final GallowsWarden card) { diff --git a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java index 3a6938dfd2a..64685afe7ff 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java @@ -36,7 +36,7 @@ public final class GalvanicAlchemist extends CardImpl { // As long as Galvanic Alchemist is paired with another creature, each of those creatures has "{2}{U}: Untap this creature." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private GalvanicAlchemist(final GalvanicAlchemist card) { diff --git a/Mage.Sets/src/mage/cards/g/GalvanicArc.java b/Mage.Sets/src/mage/cards/g/GalvanicArc.java index 0b1f71c3528..fe8772167c4 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicArc.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicArc.java @@ -43,7 +43,7 @@ public final class GalvanicArc extends CardImpl { triggeredAbility.addTarget(new TargetAnyTarget()); this.addAbility(triggeredAbility); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } private GalvanicArc(final GalvanicArc card) { diff --git a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java index cc6c4b61df5..defe4963b40 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java @@ -30,7 +30,7 @@ public final class GalvanicJuggernaut extends CardImpl { // Galvanic Juggernaut attacks each turn if able. this.addAbility(new AttacksEachCombatStaticAbility()); // Galvanic Juggernaut doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever another creature dies, untap Galvanic Juggernaut. this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false, true)); } diff --git a/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java b/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java index 54a959b1ed7..14154184692 100644 --- a/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java +++ b/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java @@ -48,7 +48,7 @@ public final class GandalfTheWhite extends CardImpl { new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter) )); // If a legendary permanent or an artifact entering or leaving the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GandalfTheWhiteDoublingEffect())); + this.addAbility(new SimpleStaticAbility(new GandalfTheWhiteDoublingEffect())); } private GandalfTheWhite(final GandalfTheWhite card) { diff --git a/Mage.Sets/src/mage/cards/g/GaseousForm.java b/Mage.Sets/src/mage/cards/g/GaseousForm.java index 61d1f00ebcb..c8c8fe1bef2 100644 --- a/Mage.Sets/src/mage/cards/g/GaseousForm.java +++ b/Mage.Sets/src/mage/cards/g/GaseousForm.java @@ -29,7 +29,7 @@ public final class GaseousForm extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Prevent all combat damage that would be dealt to and dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); } private GaseousForm(final GaseousForm card) { diff --git a/Mage.Sets/src/mage/cards/g/GateSmasher.java b/Mage.Sets/src/mage/cards/g/GateSmasher.java index c644bf05a62..add5d33975e 100644 --- a/Mage.Sets/src/mage/cards/g/GateSmasher.java +++ b/Mage.Sets/src/mage/cards/g/GateSmasher.java @@ -47,7 +47,7 @@ public final class GateSmasher extends CardImpl { // Equipped creature gets +3/+0 and has trample. Effect effect = new BoostEquippedEffect(3, 0); effect.setText("Equipped creature gets +3/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GathanRaiders.java b/Mage.Sets/src/mage/cards/g/GathanRaiders.java index c5e1678b598..32f8179179e 100644 --- a/Mage.Sets/src/mage/cards/g/GathanRaiders.java +++ b/Mage.Sets/src/mage/cards/g/GathanRaiders.java @@ -31,7 +31,7 @@ public final class GathanRaiders extends CardImpl { this.toughness = new MageInt(3); // Hellbent - Gathan Raiders gets +2/+2 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — {this} gets +2/+2 as long as you have no cards in hand"))); // Morph-Discard a card. diff --git a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java index 7d1a1890ada..01557edbd57 100644 --- a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java +++ b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java @@ -39,7 +39,7 @@ public final class GathererOfGraces extends CardImpl { // Gatherer of Graces gets +1/+1 for each Aura attached to it. AuraAttachedCount count = new AuraAttachedCount(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Sacrifice an Aura: Regenerate Gatherer of Graces this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java index 179cf1f3087..7e3754aa1a7 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java +++ b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java @@ -34,7 +34,7 @@ public final class GauntletOfMight extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Red creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // Whenever a Mountain is tapped for mana, its controller adds {R}. ManaEffect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "their"); diff --git a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java index 42e153eb044..ef65d908d85 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java +++ b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java @@ -28,7 +28,7 @@ public final class GavonyIronwright extends CardImpl { this.toughness = new MageInt(4); // Fateful hour - As long as you have 5 or less life, other creatures you control get +1/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, true), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, true), FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control get +1/+4"))); } diff --git a/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java b/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java index 5a9ad60fe05..bc4bbf53e9e 100644 --- a/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java +++ b/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java @@ -40,7 +40,7 @@ public final class GeistOfTheLonelyVigil extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), DeliriumCondition.instance); effect.setText("Delirium — {this} can attack as though it didn't have defender as long as there are four or more card types among cards in your graveyard"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CardTypesInGraveyardHint.YOU)); + this.addAbility(new SimpleStaticAbility(effect).addHint(CardTypesInGraveyardHint.YOU)); } private GeistOfTheLonelyVigil(final GeistOfTheLonelyVigil card) { diff --git a/Mage.Sets/src/mage/cards/g/GeistTrappers.java b/Mage.Sets/src/mage/cards/g/GeistTrappers.java index 8d63ae62d02..291c891b5ed 100644 --- a/Mage.Sets/src/mage/cards/g/GeistTrappers.java +++ b/Mage.Sets/src/mage/cards/g/GeistTrappers.java @@ -32,7 +32,7 @@ public final class GeistTrappers extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Geist Trappers is paired with another creature, both creatures have reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ReachAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ReachAbility.getInstance(), ruleText))); } private GeistTrappers(final GeistTrappers card) { diff --git a/Mage.Sets/src/mage/cards/g/GelidShackles.java b/Mage.Sets/src/mage/cards/g/GelidShackles.java index 7737421e0d9..aa62c4a9859 100644 --- a/Mage.Sets/src/mage/cards/g/GelidShackles.java +++ b/Mage.Sets/src/mage/cards/g/GelidShackles.java @@ -36,7 +36,7 @@ public final class GelidShackles extends CardImpl { this.addAbility(ability); // Enchanted creature can't block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockActivateAttachedEffect())); // {snow}: Enchanted creature gains defender until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java b/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java index fc0c560209d..6b7ea4b9c94 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java +++ b/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java @@ -23,10 +23,10 @@ public final class GeneralsKabuto extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has shroud. (It can't be the target of spells or abilities.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); // Prevent all combat damage that would be dealt to equipped creature - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageToAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT, true))); + this.addAbility(new SimpleStaticAbility(new PreventDamageToAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT, true))); // Equip {2} this.addAbility(new EquipAbility(Outcome.PreventDamage, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java b/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java index b4599142241..8a9f2d34e33 100644 --- a/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java +++ b/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java @@ -45,7 +45,7 @@ public final class GeralfsMasterpiece extends CardImpl { DynamicValue count = new SignInversionDynamicValue(CardsInControllerHandCount.instance); Effect effect = new BoostSourceEffect(count, count, Duration.WhileOnBattlefield); effect.setText("{this} gets -1/-1 for each card in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {3}{U}, Discard three cards: Return Geralf's Masterpiece from your graveyard to the battlefield tapped. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new ManaCostsImpl<>("{3}{U}")); diff --git a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java index b38ebfa6516..d2942bfb719 100644 --- a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java +++ b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java @@ -30,7 +30,7 @@ public final class GhalmasWarden extends CardImpl { // Metalcraft — Ghalma’s Warden gets +2/+2 as long as you control three or more artifacts. ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect) + this.addAbility(new SimpleStaticAbility(effect) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance) ); diff --git a/Mage.Sets/src/mage/cards/g/GhastbarkTwins.java b/Mage.Sets/src/mage/cards/g/GhastbarkTwins.java index bd7df72623b..5ff8a1154d5 100644 --- a/Mage.Sets/src/mage/cards/g/GhastbarkTwins.java +++ b/Mage.Sets/src/mage/cards/g/GhastbarkTwins.java @@ -28,7 +28,7 @@ public final class GhastbarkTwins extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Ghastbark Twins can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private GhastbarkTwins(final GhastbarkTwins card) { diff --git a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java index cda6355d838..75e1bcf6701 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java @@ -33,7 +33,7 @@ public final class GhastlyHaunting extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } private GhastlyHaunting(final GhastlyHaunting card) { diff --git a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java index bd933f125b8..6236d92407c 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java @@ -28,7 +28,7 @@ public final class GhirapurOrrery extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Each player may play an additional land on each of their turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsAllEffect())); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsAllEffect())); // At the beginning of each player's upkeep, if that player has no cards in hand, that player draws three cards. this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java b/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java index 2acdd08b7eb..9e80dccbd41 100644 --- a/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java +++ b/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java @@ -36,7 +36,7 @@ public final class GhostbladeEidolon extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // Enchanted creature gets +1/+1 and has double strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1)); Effect effect = new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has double strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GhostflameSliver.java b/Mage.Sets/src/mage/cards/g/GhostflameSliver.java index 4a6ff714b6f..d4d0aa7f557 100644 --- a/Mage.Sets/src/mage/cards/g/GhostflameSliver.java +++ b/Mage.Sets/src/mage/cards/g/GhostflameSliver.java @@ -27,7 +27,7 @@ public final class GhostflameSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers are colorless. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GhostflameSliverEffect())); + this.addAbility(new SimpleStaticAbility(new GhostflameSliverEffect())); } private GhostflameSliver(final GhostflameSliver card) { diff --git a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java index 854dc8e92e5..3ad0d6b6c61 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java @@ -32,10 +32,10 @@ public final class GhostlyPossession extends CardImpl { this.addAbility(ability); //Enchanted creature has flying - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); //Prevent all combat damage that would be dealt to and dealt by enchanted creature - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); } private GhostlyPossession(final GhostlyPossession card) { diff --git a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java index 61848e91677..624412a7f70 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java @@ -41,7 +41,7 @@ public final class GhostlyTouch extends CardImpl { // Enchanted creature has "Whenever this creature attacks, you may tap or untap target permanent." Ability gainedAbility = new AttacksTriggeredAbility(new MayTapOrUntapTargetEffect(), true); gainedAbility.addTarget(new TargetPermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } private GhostlyTouch(final GhostlyTouch card) { diff --git a/Mage.Sets/src/mage/cards/g/GhostlyWings.java b/Mage.Sets/src/mage/cards/g/GhostlyWings.java index 053427be8d3..b82e436c75f 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyWings.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyWings.java @@ -42,7 +42,7 @@ public final class GhostlyWings extends CardImpl { // Enchanted creature gets +1/+1 and has flying. Effect effect = new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +1/+1"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java b/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java index 9aaf07603ab..559b6f928cb 100644 --- a/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java +++ b/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java @@ -30,7 +30,7 @@ public final class GhostsOfTheInnocent extends CardImpl { this.toughness = new MageInt(5); // If a source would deal damage to a creature or player, it deals half that damage, rounded down, to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GhostsOfTheInnocentPreventDamageEffect())); + this.addAbility(new SimpleStaticAbility(new GhostsOfTheInnocentPreventDamageEffect())); } private GhostsOfTheInnocent(final GhostsOfTheInnocent card) { diff --git a/Mage.Sets/src/mage/cards/g/GiantShark.java b/Mage.Sets/src/mage/cards/g/GiantShark.java index 5d28dd48549..cba00276579 100644 --- a/Mage.Sets/src/mage/cards/g/GiantShark.java +++ b/Mage.Sets/src/mage/cards/g/GiantShark.java @@ -40,7 +40,7 @@ public final class GiantShark extends CardImpl { this.toughness = new MageInt(4); // Giant Shark can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); // Whenever Giant Shark blocks or becomes blocked by a creature that has been dealt damage this turn, Giant Shark gets +2/+0 and gains trample until end of turn. Ability ability = new BlocksOrBlockedByCreatureSourceTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn).setText("{this} gets +2/+0"), filter2); diff --git a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java index 530e4dfe0fd..4a33f5ae340 100644 --- a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java +++ b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java @@ -38,7 +38,7 @@ public final class GiantSpectacle extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.AURA); effect.setText("and has menace"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GiantStrength.java b/Mage.Sets/src/mage/cards/g/GiantStrength.java index 8a6e390f325..c883916fc5d 100644 --- a/Mage.Sets/src/mage/cards/g/GiantStrength.java +++ b/Mage.Sets/src/mage/cards/g/GiantStrength.java @@ -34,7 +34,7 @@ public final class GiantStrength extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } private GiantStrength(final GiantStrength card) { diff --git a/Mage.Sets/src/mage/cards/g/GiantTortoise.java b/Mage.Sets/src/mage/cards/g/GiantTortoise.java index 4fc00c04bd2..41de6bdbac4 100644 --- a/Mage.Sets/src/mage/cards/g/GiantTortoise.java +++ b/Mage.Sets/src/mage/cards/g/GiantTortoise.java @@ -29,7 +29,7 @@ public final class GiantTortoise extends CardImpl { this.toughness = new MageInt(1); // Giant Tortoise gets +0/+3 as long as it's untapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(0,3, Duration.WhileOnBattlefield), SourceTappedCondition.UNTAPPED, "{this} gets +0/+3 as long as it's untapped"))); diff --git a/Mage.Sets/src/mage/cards/g/GiantTurtle.java b/Mage.Sets/src/mage/cards/g/GiantTurtle.java index 697769e49c5..fadc5f0adf7 100644 --- a/Mage.Sets/src/mage/cards/g/GiantTurtle.java +++ b/Mage.Sets/src/mage/cards/g/GiantTurtle.java @@ -31,7 +31,7 @@ public final class GiantTurtle extends CardImpl { this.toughness = new MageInt(4); // Giant Turtle can't attack if it attacked during your last turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackIfAttackedLastTurnEffect()), new AttackedLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new CantAttackIfAttackedLastTurnEffect()), new AttackedLastTurnWatcher()); } private GiantTurtle(final GiantTurtle card) { diff --git a/Mage.Sets/src/mage/cards/g/GibberingHyenas.java b/Mage.Sets/src/mage/cards/g/GibberingHyenas.java index 76ffec15c1b..b79e5186ccb 100644 --- a/Mage.Sets/src/mage/cards/g/GibberingHyenas.java +++ b/Mage.Sets/src/mage/cards/g/GibberingHyenas.java @@ -34,7 +34,7 @@ public final class GibberingHyenas extends CardImpl { this.toughness = new MageInt(2); // Gibbering Hyenas can't block black creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } private GibberingHyenas(final GibberingHyenas card) { diff --git a/Mage.Sets/src/mage/cards/g/GideonsIntervention.java b/Mage.Sets/src/mage/cards/g/GideonsIntervention.java index 0cf188ec79e..c0e02db3487 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsIntervention.java +++ b/Mage.Sets/src/mage/cards/g/GideonsIntervention.java @@ -41,10 +41,10 @@ public final class GideonsIntervention extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(effect)); // Your opponents can't cast spells with the chosen name. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GideonsInterventionCantCastEffect())); + this.addAbility(new SimpleStaticAbility(new GideonsInterventionCantCastEffect())); // Prevent all damage that would be dealt to you and permanents you control by sources with the chosen name. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GideonsInterventionPreventAllDamageEffect())); + this.addAbility(new SimpleStaticAbility(new GideonsInterventionPreventAllDamageEffect())); } private GideonsIntervention(final GideonsIntervention card) { diff --git a/Mage.Sets/src/mage/cards/g/GideonsResolve.java b/Mage.Sets/src/mage/cards/g/GideonsResolve.java index 9e883141a1b..e1055ac11a7 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsResolve.java +++ b/Mage.Sets/src/mage/cards/g/GideonsResolve.java @@ -34,7 +34,7 @@ public final class GideonsResolve extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryGraveyardPutInHandEffect(filter), true)); // Creature you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); } private GideonsResolve(final GideonsResolve card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfGranite.java b/Mage.Sets/src/mage/cards/g/GiftOfGranite.java index 9cf67416120..9b60291adaf 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfGranite.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfGranite.java @@ -40,7 +40,7 @@ public final class GiftOfGranite extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); } private GiftOfGranite(final GiftOfGranite card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java index 65bed1e8405..9ec63fb50ba 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java @@ -34,7 +34,7 @@ public final class GiftOfOrzhova extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying and lifelink. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield) .setText("and has flying")); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield) diff --git a/Mage.Sets/src/mage/cards/g/GiftOfParadise.java b/Mage.Sets/src/mage/cards/g/GiftOfParadise.java index 7491937806f..57c0f164091 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfParadise.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfParadise.java @@ -48,7 +48,7 @@ public final class GiftOfParadise extends CardImpl { Ability gainedAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private GiftOfParadise(final GiftOfParadise card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java index 1eaa8ff7de4..f78a48aed5a 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java @@ -43,12 +43,12 @@ public final class GiftOfTheDeity extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has deathtouch. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has deathtouch")); this.addAbility(blackAbility); // As long as enchanted creature is green, it gets +1/+1 and all creatures able to block it do so. SimpleStaticAbility greenAbility; - greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), + greenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); Effect effect = new ConditionalRequirementEffect(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN)); effect.setText("and all creatures able to block it do so"); diff --git a/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java b/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java index 44990dd8848..8ad1f100229 100644 --- a/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java +++ b/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java @@ -34,7 +34,7 @@ public final class GimlisRecklessMight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // Formidable -- Whenever you attack, if creatures you control have total power 8 or greater, target attacking creature you control fights up to one target creature you don't control. TriggeredAbility ability = new AttacksWithCreaturesTriggeredAbility(new FightTargetsEffect(),1); diff --git a/Mage.Sets/src/mage/cards/g/GiveNoGround.java b/Mage.Sets/src/mage/cards/g/GiveNoGround.java index bc201e60a43..9afd170af58 100644 --- a/Mage.Sets/src/mage/cards/g/GiveNoGround.java +++ b/Mage.Sets/src/mage/cards/g/GiveNoGround.java @@ -27,7 +27,7 @@ public final class GiveNoGround extends CardImpl { // Target creature gets +2/+6 until end of turn and can block any number of creatures this turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 6, Duration.EndOfTurn)); - Ability gainedAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0)); + Ability gainedAbility = new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0)); Effect effect = new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn); effect.setText("and can block any number of creatures this turn"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GlacialChasm.java b/Mage.Sets/src/mage/cards/g/GlacialChasm.java index d3790bb7f58..169ffe5bf5a 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialChasm.java +++ b/Mage.Sets/src/mage/cards/g/GlacialChasm.java @@ -34,9 +34,9 @@ public final class GlacialChasm extends CardImpl { // Creatures you control can't attack. FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); filter.add(TargetController.YOU.getControllerPredicate()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); // Prevent all damage that would be dealt to you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PreventDamageToControllerEffect(Duration.WhileOnBattlefield))); } private GlacialChasm(final GlacialChasm card) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java index 4922f74565e..017dacae9ac 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java @@ -32,7 +32,7 @@ public final class GlacialCrasher extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Glacial Crasher can't attack unless there is a Mountain on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GlacialCrasherEffect())); + this.addAbility(new SimpleStaticAbility(new GlacialCrasherEffect())); } private GlacialCrasher(final GlacialCrasher card) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialPlating.java b/Mage.Sets/src/mage/cards/g/GlacialPlating.java index f174d187ef0..be0238f8383 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialPlating.java +++ b/Mage.Sets/src/mage/cards/g/GlacialPlating.java @@ -51,7 +51,7 @@ public final class GlacialPlating extends CardImpl { DynamicValue boostValue = new MultipliedValue(new CountersSourceCount(CounterType.AGE), 3); Effect effect = new BoostEnchantedEffect(boostValue, boostValue, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +3/+3 for each age counter on {this}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private GlacialPlating(final GlacialPlating card) { diff --git a/Mage.Sets/src/mage/cards/g/Glaciers.java b/Mage.Sets/src/mage/cards/g/Glaciers.java index 5f47206f52a..d13f9efb471 100644 --- a/Mage.Sets/src/mage/cards/g/Glaciers.java +++ b/Mage.Sets/src/mage/cards/g/Glaciers.java @@ -34,7 +34,7 @@ public final class Glaciers extends CardImpl { new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{U}")))); // All Mountains are Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GlaciersEffect())); + this.addAbility(new SimpleStaticAbility(new GlaciersEffect())); } private Glaciers(final Glaciers card) { diff --git a/Mage.Sets/src/mage/cards/g/Glamdring.java b/Mage.Sets/src/mage/cards/g/Glamdring.java index aba45ab7283..e79ed818a5c 100644 --- a/Mage.Sets/src/mage/cards/g/Glamdring.java +++ b/Mage.Sets/src/mage/cards/g/Glamdring.java @@ -43,7 +43,7 @@ public final class Glamdring extends CardImpl { new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY), StaticValue.get(0)) .setText(" and gets +1/+0 for each instant and sorcery card in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, firstStrike); + Ability ability = new SimpleStaticAbility(firstStrike); ability.addEffect(boost); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GlaringAegis.java b/Mage.Sets/src/mage/cards/g/GlaringAegis.java index dbd03e8673c..8fb0ab81b99 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringAegis.java +++ b/Mage.Sets/src/mage/cards/g/GlaringAegis.java @@ -39,7 +39,7 @@ public final class GlaringAegis extends CardImpl { this.addAbility(ability2); // Enchanted creature gets +1/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); } private GlaringAegis(final GlaringAegis card) { diff --git a/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java b/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java index dbebfae7724..38368767456 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java +++ b/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java @@ -35,7 +35,7 @@ public final class GlaringSpotlight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Creatures your opponents control with hexproof can be the targets of spells and abilities you control as though they didn't have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GlaringSpotlightEffect())); + this.addAbility(new SimpleStaticAbility(new GlaringSpotlightEffect())); // {3}, Sacrifice Glaring Spotlight: Creatures you control gain hexproof until end of turn and can't be blocked this turn. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java index d73aab1c354..68ac91aeb9e 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java @@ -48,7 +48,7 @@ public final class GleamOfAuthority extends CardImpl { )); // Enchanted creature has vigilance and "{W}, {T}: Bloster 1." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA)); + ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BolsterEffect(1), new ManaCostsImpl<>("{W}")); gainedAbility.addCost(new TapSourceCost()); ability.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA).setText("and \"{W}, {T}: Bolster 1.\"")); diff --git a/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java b/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java index 5b29e683e63..52320d91eb7 100644 --- a/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java +++ b/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java @@ -40,9 +40,9 @@ public final class GlenElendraLiege extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); // Other black creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); } private GlenElendraLiege(final GlenElendraLiege card) { diff --git a/Mage.Sets/src/mage/cards/g/GlidingLicid.java b/Mage.Sets/src/mage/cards/g/GlidingLicid.java index e3e90c77bc7..e922a220206 100644 --- a/Mage.Sets/src/mage/cards/g/GlidingLicid.java +++ b/Mage.Sets/src/mage/cards/g/GlidingLicid.java @@ -32,7 +32,7 @@ public final class GlidingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.U), new ColoredManaCost(ColoredManaSymbol.U))); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private GlidingLicid(final GlidingLicid card) { diff --git a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java index 9f43455a1e5..6291db3c059 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java @@ -40,7 +40,7 @@ public final class GlimmerdustNap extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private GlimmerdustNap(final GlimmerdustNap card) { diff --git a/Mage.Sets/src/mage/cards/g/GlisteningOil.java b/Mage.Sets/src/mage/cards/g/GlisteningOil.java index 2b401bb33da..0d35d107f50 100644 --- a/Mage.Sets/src/mage/cards/g/GlisteningOil.java +++ b/Mage.Sets/src/mage/cards/g/GlisteningOil.java @@ -40,7 +40,7 @@ public final class GlisteningOil extends CardImpl { this.addAbility(ability); // Enchanted creature has infect. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); // At the beginning of your upkeep, put a -1/-1 counter on enchanted creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect())); diff --git a/Mage.Sets/src/mage/cards/g/Gloom.java b/Mage.Sets/src/mage/cards/g/Gloom.java index b6935077e76..c2034666ddd 100644 --- a/Mage.Sets/src/mage/cards/g/Gloom.java +++ b/Mage.Sets/src/mage/cards/g/Gloom.java @@ -31,10 +31,10 @@ public final class Gloom extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // White spells cost {3} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(3, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(3, filter, TargetController.ANY))); // Activated abilities of white enchantments cost {3} more to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GloomCostIncreaseEffect())); + this.addAbility(new SimpleStaticAbility(new GloomCostIncreaseEffect())); } private Gloom(final Gloom card) { @@ -77,4 +77,4 @@ class GloomCostIncreaseEffect extends CostModificationEffectImpl { public GloomCostIncreaseEffect copy() { return new GloomCostIncreaseEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GloomSurgeon.java b/Mage.Sets/src/mage/cards/g/GloomSurgeon.java index f1c97d116ed..656c0b82069 100644 --- a/Mage.Sets/src/mage/cards/g/GloomSurgeon.java +++ b/Mage.Sets/src/mage/cards/g/GloomSurgeon.java @@ -26,7 +26,7 @@ public final class GloomSurgeon extends CardImpl { this.toughness = new MageInt(1); // If combat damage would be dealt to Gloom Surgeon, prevent that damage and exile that many cards from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GloomSurgeonEffect())); + this.addAbility(new SimpleStaticAbility(new GloomSurgeonEffect())); } private GloomSurgeon(final GloomSurgeon card) { diff --git a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java index bbc6c85a15c..334d6afecb6 100644 --- a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java +++ b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java @@ -21,7 +21,7 @@ public final class GloriousAnthem extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private GloriousAnthem(final GloriousAnthem card) { diff --git a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java index d643191a444..60d840e1745 100644 --- a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java +++ b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java @@ -23,14 +23,14 @@ public final class GloryOfWarfare extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{W}"); // As long as it’s your turn, creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, creatures you control get +2/+0")) .addHint(MyTurnHint.instance)); // As long as it’s not your turn, creatures you control get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, "During turns other than yours, creatures you control get +0/+2"))); diff --git a/Mage.Sets/src/mage/cards/g/Glowrider.java b/Mage.Sets/src/mage/cards/g/Glowrider.java index e67a1c98b10..c84e65b1ec2 100644 --- a/Mage.Sets/src/mage/cards/g/Glowrider.java +++ b/Mage.Sets/src/mage/cards/g/Glowrider.java @@ -33,7 +33,7 @@ public final class Glowrider extends CardImpl { this.toughness = new MageInt(1); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private Glowrider(final Glowrider card) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java index 4c05165af52..431d0f82bec 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java @@ -128,7 +128,7 @@ class GlyphOfDelusionEffect extends OneShotEffect { if (targetPermanent != null) { targetPermanent.addCounters(CounterType.GLYPH.createInstance(targetPermanent.getPower().getValue()), source.getControllerId(), source, game); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(), + SimpleStaticAbility ability = new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(), new SourceHasCounterCondition(CounterType.GLYPH)).setText("This creature doesn't untap during your untap step if it has a glyph counter on it")); GainAbilityTargetEffect effect = new GainAbilityTargetEffect(ability, Duration.Custom); effect.setTargetPointer(new FixedTarget(targetPermanent.getId(), game)); diff --git a/Mage.Sets/src/mage/cards/g/GnarledScarhide.java b/Mage.Sets/src/mage/cards/g/GnarledScarhide.java index f304e941252..e87126648c9 100644 --- a/Mage.Sets/src/mage/cards/g/GnarledScarhide.java +++ b/Mage.Sets/src/mage/cards/g/GnarledScarhide.java @@ -36,7 +36,7 @@ public final class GnarledScarhide extends CardImpl { // Gnarled Scarhide can't block. this.addAbility(new CantBlockAbility()); // Enchanted creature gets +2/+1 and can't block. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,1, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,1, Duration.WhileOnBattlefield)); Effect effect = new CantBlockAttachedEffect(AttachmentType.AURA); effect.setText("and can't block"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java b/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java index 7cc5a5050b5..0e28f5fbc9f 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java +++ b/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java @@ -36,7 +36,7 @@ public final class GnarlwoodDryad extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +2/+2 as long as there are four or more card types among cards in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java index 91ac8002e5d..dec3d9ceae0 100644 --- a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java +++ b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java @@ -33,7 +33,7 @@ public final class GobhobblerRats extends CardImpl { this.toughness = new MageInt(2); // Hellbent - As long as you have no cards in hand, Gobhobbler Rats gets +1/+0 and has "{B}: Regenerate Gobhobbler Rats." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — As long as you have no cards in hand, {this} gets +1/+0")); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java b/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java index 03fda6715bc..292260c1b12 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java @@ -33,7 +33,7 @@ public final class GoblinBowlingTeam extends CardImpl { this.toughness = new MageInt(1); // If Goblin Bowling Team would deal damage to a permanent or player, it deals that much damage plus the result of a six-sided die roll to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinBowlingTeamEffect())); + this.addAbility(new SimpleStaticAbility(new GoblinBowlingTeamEffect())); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBrawler.java b/Mage.Sets/src/mage/cards/g/GoblinBrawler.java index 6b676b3ef12..2313f13fa40 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBrawler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBrawler.java @@ -35,7 +35,7 @@ public final class GoblinBrawler extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Goblin Brawler can't be equipped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeEquippedSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeEquippedSourceEffect())); } private GoblinBrawler(final GoblinBrawler card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinCaves.java b/Mage.Sets/src/mage/cards/g/GoblinCaves.java index 144aed21f25..806e3b433f9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCaves.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCaves.java @@ -35,7 +35,7 @@ public final class GoblinCaves extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted land is a basic Mountain, Goblin creatures get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false), new AttachedToBasicMountainCondition(), "As long as enchanted land is a basic Mountain, Goblin creatures get +0/+2" diff --git a/Mage.Sets/src/mage/cards/g/GoblinChieftain.java b/Mage.Sets/src/mage/cards/g/GoblinChieftain.java index 26b4aa76e98..3cd57a8cbba 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChieftain.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChieftain.java @@ -36,7 +36,7 @@ public final class GoblinChieftain extends CardImpl { // Other Goblin creatures you control get +1/+1 and have haste. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("Other Goblin creatures you control get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("and have haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GoblinCohort.java b/Mage.Sets/src/mage/cards/g/GoblinCohort.java index fcd8afb0999..e10a804c5c0 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCohort.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCohort.java @@ -30,7 +30,7 @@ public final class GoblinCohort extends CardImpl { this.toughness = new MageInt(2); // Goblin Cohort can't attack unless you've cast a creature spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinCohortEffect()), new PlayerCastCreatureWatcher()); + this.addAbility(new SimpleStaticAbility(new GoblinCohortEffect()), new PlayerCastCreatureWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java index c0f611d2d2a..07235b2eb4c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java @@ -31,7 +31,7 @@ public final class GoblinDirigible extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Goblin Dirigible doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {4}. If you do, untap Goblin Dirigible. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid( new UntapSourceEffect(), new ManaCostsImpl<>("{4}")))); diff --git a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java index 1d388d9d95b..f10765f98ad 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java @@ -34,7 +34,7 @@ public final class GoblinFireFiend extends CardImpl { this.addAbility(HasteAbility.getInstance()); //Goblin Fire Fiend must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); //{R}: Goblin Fire Fiend gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/g/GoblinFurrier.java b/Mage.Sets/src/mage/cards/g/GoblinFurrier.java index 4f476b1df12..0aef1377fb7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFurrier.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFurrier.java @@ -30,7 +30,7 @@ public final class GoblinFurrier extends CardImpl { this.toughness = new MageInt(2); // Prevent all damage that Goblin Furrier would deal to snow creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinFurrierPreventEffectEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GoblinFurrierPreventEffectEffect(Duration.WhileOnBattlefield))); } private GoblinFurrier(final GoblinFurrier card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java b/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java index c160c40e7ca..ec3d1a01ccd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java @@ -32,7 +32,7 @@ public final class GoblinGaveleer extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Goblin Gaveleer gets +2/+0 for each Equipment attached to it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new EquipmentAttachedCount(2), + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new EquipmentAttachedCount(2), StaticValue.get(0), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java b/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java index 7fd4f6de771..0f965af1b8d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java @@ -40,7 +40,7 @@ public final class GoblinGloryChaser extends CardImpl { RenownedSourceCondition.instance, "As long as {this} is renowned, it has menace. " + "(It can't be blocked except by two or more creatures.)"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGoon.java b/Mage.Sets/src/mage/cards/g/GoblinGoon.java index 13bbf8f28d6..d2276041ed6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGoon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGoon.java @@ -30,10 +30,10 @@ public final class GoblinGoon extends CardImpl { this.toughness = new MageInt(6); // Goblin Goon can't attack unless you control more creatures than defending player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinGoonCantAttackEffect())); + this.addAbility(new SimpleStaticAbility(new GoblinGoonCantAttackEffect())); // Goblin Goon can't block unless you control more creatures than attacking player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinGoonCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new GoblinGoonCantBlockEffect())); } private GoblinGoon(final GoblinGoon card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinKing.java b/Mage.Sets/src/mage/cards/g/GoblinKing.java index 32fa90921b8..5d6a06ecef2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKing.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKing.java @@ -32,7 +32,7 @@ public final class GoblinKing extends CardImpl { // Other Goblin creatures get +1/+1 and have mountainwalk. Effect effect = new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("Other Goblins get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAllEffect(new MountainwalkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("and have mountainwalk"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GoblinMutant.java b/Mage.Sets/src/mage/cards/g/GoblinMutant.java index 9aeb0f48f24..180e051e2ab 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMutant.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMutant.java @@ -48,12 +48,12 @@ public final class GoblinMutant extends CardImpl { // Goblin Mutant can't attack if defending player controls an untapped creature with power 3 or greater. Effect effect = new CantAttackIfDefenderControlsPermanent(filter); effect.setText("{this} can't attack if defending player controls an untapped creature with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); //Goblin Mutant can't block creatures with power 3 or greater. Effect effectBlock = new CantBlockCreaturesSourceEffect(filter2); effectBlock.setText("{this} can't block creatures with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectBlock)); + this.addAbility(new SimpleStaticAbility(effectBlock)); } private GoblinMutant(final GoblinMutant card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRockSled.java b/Mage.Sets/src/mage/cards/g/GoblinRockSled.java index 5010fa2af9c..2c1158a20c6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRockSled.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRockSled.java @@ -47,10 +47,10 @@ public final class GoblinRockSled extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Goblin Rock Sled doesn't untap during your untap step if it attacked during your last turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapIfAttackedLastTurnSourceEffect()), new AttackedLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new DontUntapIfAttackedLastTurnSourceEffect()), new AttackedLastTurnWatcher()); // Goblin Rock Sled can't attack unless defending player controls a Mountain. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); } private GoblinRockSled(final GoblinRockSled card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java index ceb7c3576f6..ff9f1bb48d4 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java @@ -32,7 +32,7 @@ public final class GoblinSharpshooter extends CardImpl { this.toughness = new MageInt(1); // Goblin Sharpshooter doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever a creature dies, untap Goblin Sharpshooter. this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false)); // {T}: Goblin Sharpshooter deals 1 damage to any target. diff --git a/Mage.Sets/src/mage/cards/g/GoblinShrine.java b/Mage.Sets/src/mage/cards/g/GoblinShrine.java index ffac8e9b6e6..84db3600af8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinShrine.java +++ b/Mage.Sets/src/mage/cards/g/GoblinShrine.java @@ -52,7 +52,7 @@ public final class GoblinShrine extends CardImpl { // As long as enchanted land is a basic Mountain, Goblin creatures get +1/+0. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filterGoblin, false), new EnchantedPermanentSubtypeCondition(SubType.MOUNTAIN), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // When Goblin Shrine leaves the battlefield, it deals 1 damage to each Goblin creature. this.addAbility(new LeavesBattlefieldTriggeredAbility(new DamageAllEffect(1, "it", filterGoblin), false)); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSpy.java b/Mage.Sets/src/mage/cards/g/GoblinSpy.java index 35a5a8e4a03..c6b26efeee5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSpy.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSpy.java @@ -25,7 +25,7 @@ public final class GoblinSpy extends CardImpl { this.toughness = new MageInt(1); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); } private GoblinSpy(final GoblinSpy card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java index 3fc5992740e..0185aeac64f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java @@ -29,7 +29,7 @@ import mage.filter.common.FilterCreaturePermanent; // Creatures you control have menace. (They can't be blocked except by two or more creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter) + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter) .setText("creatures you control have menace. (They can't be blocked except by two or more creatures.)"))); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java index 9a519c6e557..a109087c94e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java @@ -41,7 +41,7 @@ public final class GoblinWarPaint extends CardImpl { // Enchanted creature gets +2/+2 and has haste. Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA); effect.setText("and has haste"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java index 30fa11f592a..cacd4bd1d4a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java @@ -28,7 +28,7 @@ public final class GoblinWarWagon extends CardImpl { this.toughness = new MageInt(3); // Goblin War Wagon doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {2}. If you do, untap Goblin War Wagon. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid( new UntapSourceEffect(), new ManaCostsImpl<>("{2}")))); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java index 50ec2253307..603cf8910e9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java @@ -36,10 +36,10 @@ public final class GoblinWarchief extends CardImpl { this.toughness = new MageInt(2); // Goblin spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterSpells, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterSpells, 1))); // Goblins you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.GOBLIN, "Goblins"), false))); } diff --git a/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java b/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java index 7b8b0e37fce..7eab64b0195 100644 --- a/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java +++ b/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java @@ -39,7 +39,7 @@ public final class GodEternalKefnet extends CardImpl { // You may reveal the first card you draw each turn as you draw it. Whenever you reveal an instant or sorcery card this way, // copy that card and you may cast the copy. That copy costs {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GodEternalKefnetDrawCardReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new GodEternalKefnetDrawCardReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); // When God-Eternal Kefnet dies or is put into exile from the battlefield, you may put it into its owner’s library third from the top. this.addAbility(new GodEternalDiesTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java index c60288fe591..ffc75cc8ab4 100644 --- a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java +++ b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java @@ -41,7 +41,7 @@ public final class GodheadOfAwe extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other creatures have base power and toughness 1/1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessAllEffect(1, 1, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessAllEffect(1, 1, Duration.WhileOnBattlefield, filter))); } private GodheadOfAwe(final GodheadOfAwe card) { diff --git a/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java b/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java index 9c593c46b00..54534638d96 100644 --- a/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java +++ b/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java @@ -36,7 +36,7 @@ public final class GodhunterOctopus extends CardImpl { this.toughness = new MageInt(5); // Godhunter Octopus can't attack unless defending player controls an enchantment or an enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); } private GodhunterOctopus(final GodhunterOctopus card) { diff --git a/Mage.Sets/src/mage/cards/g/Godsend.java b/Mage.Sets/src/mage/cards/g/Godsend.java index a14a9993897..7f07da8d55c 100644 --- a/Mage.Sets/src/mage/cards/g/Godsend.java +++ b/Mage.Sets/src/mage/cards/g/Godsend.java @@ -40,11 +40,11 @@ public final class Godsend extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 3, Duration.WhileOnBattlefield))); // Whenever equipped creature blocks or becomes blocked by one or more creatures, you may exile one of those creatures. this.addAbility(new GodsendTriggeredAbility()); // Opponents can't cast cards with the same name as cards exiled with Godsend. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GodsendRuleModifyingEffect())); + this.addAbility(new SimpleStaticAbility(new GodsendRuleModifyingEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), false)); } diff --git a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java index acf5ceef9f7..6c8373d9a9f 100644 --- a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java +++ b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java @@ -40,7 +40,7 @@ public final class GoldnightCastigator extends CardImpl { // If a source would deal damage to you, it deals double that damage to you instead. // If a source would deal damage to Goldnight Castigator, it deals double that damage to Goldkight Castigator instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoldnightCastigatorDoubleDamageEffect())); + this.addAbility(new SimpleStaticAbility(new GoldnightCastigatorDoubleDamageEffect())); } private GoldnightCastigator(final GoldnightCastigator card) { diff --git a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java index f47d2fc4c78..a61526367c8 100644 --- a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java +++ b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java @@ -30,7 +30,7 @@ public final class GolemSkinGauntlets extends CardImpl { // Equipped creature gets +1/+0 for each Equipment attached to it. // Equip 2 (2: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new GolemSkinGauntletsAttachedCount(), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(new GolemSkinGauntletsAttachedCount(), StaticValue.get(0), Duration.WhileOnBattlefield))); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } @@ -88,4 +88,4 @@ class GolemSkinGauntletsAttachedCount implements DynamicValue { public String getMessage() { return "Equipment attached to it"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GolgariDecoy.java b/Mage.Sets/src/mage/cards/g/GolgariDecoy.java index d0154889d87..cf538a74c36 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariDecoy.java +++ b/Mage.Sets/src/mage/cards/g/GolgariDecoy.java @@ -28,7 +28,7 @@ public final class GolgariDecoy extends CardImpl { this.toughness = new MageInt(2); // All creatures able to block Golgari Decoy do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); // Scavenge {3}{G}{G} ({3}{G}{G}, Exile this card from your graveyard: Put a number of +1/+1 counters equal to this card's power on target creature. Scavenge only as a sorcery.) this.addAbility(new ScavengeAbility(new ManaCostsImpl<>("{3}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GorgonsHead.java b/Mage.Sets/src/mage/cards/g/GorgonsHead.java index 8a4a00c69cc..3cde22af691 100644 --- a/Mage.Sets/src/mage/cards/g/GorgonsHead.java +++ b/Mage.Sets/src/mage/cards/g/GorgonsHead.java @@ -28,7 +28,7 @@ public final class GorgonsHead extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); } diff --git a/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java index d6131dfb503..ac6a5674c6b 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java +++ b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java @@ -31,7 +31,7 @@ public final class GorillaBerserkers extends CardImpl { // Rampage 2 this.addAbility(new RampageAbility(2)); // Gorilla Berserkers can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); } private GorillaBerserkers(final GorillaBerserkers card) { diff --git a/Mage.Sets/src/mage/cards/g/GorillaPack.java b/Mage.Sets/src/mage/cards/g/GorillaPack.java index 01cc638c3cb..cb11c877520 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaPack.java +++ b/Mage.Sets/src/mage/cards/g/GorillaPack.java @@ -28,7 +28,7 @@ public final class GorillaPack extends CardImpl { this.toughness = new MageInt(3); // Gorilla Pack can't attack unless defending player controls a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.FOREST, "a Forest")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.FOREST, "a Forest")))); // When you control no Forests, sacrifice Gorilla Pack. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/g/GorillaTitan.java b/Mage.Sets/src/mage/cards/g/GorillaTitan.java index 53b67c4ed9c..5392eeae2ae 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaTitan.java +++ b/Mage.Sets/src/mage/cards/g/GorillaTitan.java @@ -34,7 +34,7 @@ public final class GorillaTitan extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Gorilla Titan gets +4/+4 as long as there are no cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(4,4, Duration.WhileInGraveyard), new GorillaTitanCondition(), "{this} gets +4/+4 as long as there are no cards in your graveyard" diff --git a/Mage.Sets/src/mage/cards/g/GormTheGreat.java b/Mage.Sets/src/mage/cards/g/GormTheGreat.java index 6a097d7d70a..7e658a3f594 100644 --- a/Mage.Sets/src/mage/cards/g/GormTheGreat.java +++ b/Mage.Sets/src/mage/cards/g/GormTheGreat.java @@ -37,7 +37,7 @@ public final class GormTheGreat extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Gorm the Great must be blocked if able, and Gorm must be blocked by two or more creatures if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield, 2) + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield, 2) .setText("{this} must be blocked if able, and {this} must be blocked by two or more creatures if able"))); } diff --git a/Mage.Sets/src/mage/cards/g/GostaDirk.java b/Mage.Sets/src/mage/cards/g/GostaDirk.java index 2f100f7626b..33435949c34 100644 --- a/Mage.Sets/src/mage/cards/g/GostaDirk.java +++ b/Mage.Sets/src/mage/cards/g/GostaDirk.java @@ -30,7 +30,7 @@ public final class GostaDirk extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Creatures with islandwalk can be blocked as though they didn't have islandwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GostaDirkEffect())); + this.addAbility(new SimpleStaticAbility(new GostaDirkEffect())); } private GostaDirk(final GostaDirk card) { diff --git a/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java b/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java index 910296d6c37..11499f8a1fb 100644 --- a/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java +++ b/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java @@ -28,7 +28,7 @@ public final class GracebladeArtisan extends CardImpl { // Graceblade Artisan gets +2/+2 for each Aura attached to it. AuraAttachedCount count = new AuraAttachedCount(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } private GracebladeArtisan(final GracebladeArtisan card) { diff --git a/Mage.Sets/src/mage/cards/g/GracefulAdept.java b/Mage.Sets/src/mage/cards/g/GracefulAdept.java index a132a578340..456ca90a163 100644 --- a/Mage.Sets/src/mage/cards/g/GracefulAdept.java +++ b/Mage.Sets/src/mage/cards/g/GracefulAdept.java @@ -30,7 +30,7 @@ public final class GracefulAdept extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private GracefulAdept(final GracefulAdept card) { diff --git a/Mage.Sets/src/mage/cards/g/GrafHarvest.java b/Mage.Sets/src/mage/cards/g/GrafHarvest.java index 2b75e728052..5b0d75b5ada 100644 --- a/Mage.Sets/src/mage/cards/g/GrafHarvest.java +++ b/Mage.Sets/src/mage/cards/g/GrafHarvest.java @@ -40,7 +40,7 @@ public final class GrafHarvest extends CardImpl { // Zombies you control have menace. Effect effect = new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter); effect.setText("Zombies you control have menace. (They can't be blocked except by two or more creatures.)"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {3}{B}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{3}{B}")); diff --git a/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java b/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java index 1c7266f9249..bbae33a01d3 100644 --- a/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java +++ b/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java @@ -27,10 +27,10 @@ public final class GrafdiggersCage extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Creature cards can't enter the battlefield from graveyards or libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GrafdiggersCageEffect())); + this.addAbility(new SimpleStaticAbility(new GrafdiggersCageEffect())); // Players can't cast cards in graveyards or libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GrafdiggersCageEffect2())); + this.addAbility(new SimpleStaticAbility(new GrafdiggersCageEffect2())); } private GrafdiggersCage(final GrafdiggersCage card) { diff --git a/Mage.Sets/src/mage/cards/g/GraftedWargear.java b/Mage.Sets/src/mage/cards/g/GraftedWargear.java index 416b68cf710..3c98cae4c4d 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedWargear.java +++ b/Mage.Sets/src/mage/cards/g/GraftedWargear.java @@ -26,7 +26,7 @@ public final class GraftedWargear extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 2))); // Whenever Grafted Wargear becomes unattached from a permanent, sacrifice that permanent. this.addAbility(new UnattachedTriggeredAbility(new SacrificeTargetEffect().setText("sacrifice that permanent"), false)); diff --git a/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java b/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java index f9f155ce496..0ab0d118571 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java +++ b/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java @@ -36,13 +36,13 @@ public final class GrandArbiterAugustinIV extends CardImpl { this.toughness = new MageInt(3); // White spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterWhite, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterWhite, 1))); // Blue spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterBlue, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterBlue, 1))); // Spells your opponents cast cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, new FilterCard("Spells"), TargetController.OPPONENT))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, new FilterCard("Spells"), TargetController.OPPONENT))); } private GrandArbiterAugustinIV(final GrandArbiterAugustinIV card) { diff --git a/Mage.Sets/src/mage/cards/g/GrandArchitect.java b/Mage.Sets/src/mage/cards/g/GrandArchitect.java index a998ee5781c..a504b443aca 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArchitect.java +++ b/Mage.Sets/src/mage/cards/g/GrandArchitect.java @@ -50,7 +50,7 @@ public final class GrandArchitect extends CardImpl { this.toughness = new MageInt(3); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, true))); // {U}: Target artifact creature becomes blue until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrandArchitectEffect(), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/g/GrandMelee.java b/Mage.Sets/src/mage/cards/g/GrandMelee.java index 423518d9c63..4f4a8a02a1d 100644 --- a/Mage.Sets/src/mage/cards/g/GrandMelee.java +++ b/Mage.Sets/src/mage/cards/g/GrandMelee.java @@ -21,11 +21,11 @@ public final class GrandMelee extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // All creatures attack each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES)); + Ability ability = new SimpleStaticAbility(new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES)); this.addAbility(ability); // All creatures block each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); + this.addAbility(new SimpleStaticAbility(new BlocksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); } private GrandMelee(final GrandMelee card) { diff --git a/Mage.Sets/src/mage/cards/g/GrapplingHook.java b/Mage.Sets/src/mage/cards/g/GrapplingHook.java index 3aeba388bed..27094c795d4 100644 --- a/Mage.Sets/src/mage/cards/g/GrapplingHook.java +++ b/Mage.Sets/src/mage/cards/g/GrapplingHook.java @@ -28,7 +28,7 @@ public final class GrapplingHook extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature attacks, you may have target creature block it this turn if able. Ability ability = new AttacksAttachedTriggeredAbility(new GrapplingHookEffect(), true); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java b/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java index 9e0b73fcb46..13ce22155bc 100644 --- a/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java +++ b/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java @@ -44,7 +44,7 @@ public final class GraspOfTheHieromancer extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has "Whenever this creature attacks, tap target creature defending player controls." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Ability gainedAbility = new GraspOfTheHieromancerTriggeredAbility(new TapTargetEffect(), false); gainedAbility.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature defending player controls"))); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); diff --git a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java index 1b346553738..bddff4d71dd 100644 --- a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java +++ b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java @@ -26,7 +26,7 @@ public final class GratuitousViolence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}{R}"); // If a creature you control would deal damage to a creature or player, it deals double that damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GratuitousViolenceReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new GratuitousViolenceReplacementEffect())); } private GratuitousViolence(final GratuitousViolence card) { diff --git a/Mage.Sets/src/mage/cards/g/GraveServitude.java b/Mage.Sets/src/mage/cards/g/GraveServitude.java index b11f85a0f9d..a17edb76e26 100644 --- a/Mage.Sets/src/mage/cards/g/GraveServitude.java +++ b/Mage.Sets/src/mage/cards/g/GraveServitude.java @@ -38,7 +38,7 @@ public final class GraveServitude extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/-1 and is black. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield)); Effect effect = new SetCardColorAttachedEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and is black"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java index 87778c66025..2d95c6fc306 100644 --- a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java +++ b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java @@ -34,7 +34,7 @@ public final class GravebaneZombie extends CardImpl { this.toughness = new MageInt(2); // If Gravebane Zombie would die, put Gravebane Zombie on top of its owner's library instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GravebaneZombieEffect())); + this.addAbility(new SimpleStaticAbility(new GravebaneZombieEffect())); } private GravebaneZombie(final GravebaneZombie card) { @@ -82,4 +82,4 @@ class GravebaneZombieEffect extends ReplacementEffectImpl { public GravebaneZombieEffect copy() { return new GravebaneZombieEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GravitationalShift.java b/Mage.Sets/src/mage/cards/g/GravitationalShift.java index b8ef5cdf5e3..d91be72cccb 100644 --- a/Mage.Sets/src/mage/cards/g/GravitationalShift.java +++ b/Mage.Sets/src/mage/cards/g/GravitationalShift.java @@ -33,10 +33,10 @@ public final class GravitationalShift extends CardImpl { // Creatures with flying get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter1, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter1, false))); // Creatures without flying get -2/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-2, 0, Duration.WhileOnBattlefield, filter2, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-2, 0, Duration.WhileOnBattlefield, filter2, false))); } private GravitationalShift(final GravitationalShift card) { diff --git a/Mage.Sets/src/mage/cards/g/GreatWall.java b/Mage.Sets/src/mage/cards/g/GreatWall.java index 31c715fb652..43b962a571b 100644 --- a/Mage.Sets/src/mage/cards/g/GreatWall.java +++ b/Mage.Sets/src/mage/cards/g/GreatWall.java @@ -24,7 +24,7 @@ public final class GreatWall extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Creatures with plainswalk can be blocked as though they didn't have plainswalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GreatWallEffect())); + this.addAbility(new SimpleStaticAbility(new GreatWallEffect())); } private GreatWall(final GreatWall card) { diff --git a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java index df3ae5979cf..c91268b4b94 100644 --- a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java @@ -38,7 +38,7 @@ public final class GreatbowDoyen extends CardImpl { this.toughness = new MageInt(4); // Other Archer creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever an Archer you control deals damage to a creature, that Archer deals that much damage to that creature's controller. this.addAbility(new GreatbowDoyenTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java index 8d1b108f695..fb607a3e791 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java +++ b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java @@ -37,10 +37,10 @@ public final class GreaterAuramancy extends CardImpl { // Other enchantments you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); // Enchanted creatures you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); } diff --git a/Mage.Sets/src/mage/cards/g/Greatsword.java b/Mage.Sets/src/mage/cards/g/Greatsword.java index 0f65a52cce1..49cb4adfaa3 100644 --- a/Mage.Sets/src/mage/cards/g/Greatsword.java +++ b/Mage.Sets/src/mage/cards/g/Greatsword.java @@ -22,7 +22,7 @@ public final class Greatsword extends CardImpl { public Greatsword(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/g/GreelsCaress.java b/Mage.Sets/src/mage/cards/g/GreelsCaress.java index 9e87d8b2f61..40cdd7402d8 100644 --- a/Mage.Sets/src/mage/cards/g/GreelsCaress.java +++ b/Mage.Sets/src/mage/cards/g/GreelsCaress.java @@ -37,7 +37,7 @@ public final class GreelsCaress extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); } private GreelsCaress(final GreelsCaress card) { diff --git a/Mage.Sets/src/mage/cards/g/GreenScarab.java b/Mage.Sets/src/mage/cards/g/GreenScarab.java index af034eb068a..1d5a29031d8 100644 --- a/Mage.Sets/src/mage/cards/g/GreenScarab.java +++ b/Mage.Sets/src/mage/cards/g/GreenScarab.java @@ -48,11 +48,11 @@ public final class GreenScarab extends CardImpl { // Enchanted creature can't be blocked by green creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a green permanent"))); diff --git a/Mage.Sets/src/mage/cards/g/GridMonitor.java b/Mage.Sets/src/mage/cards/g/GridMonitor.java index dfafadc1aba..3593ac67dbb 100644 --- a/Mage.Sets/src/mage/cards/g/GridMonitor.java +++ b/Mage.Sets/src/mage/cards/g/GridMonitor.java @@ -30,7 +30,7 @@ public final class GridMonitor extends CardImpl { this.toughness = new MageInt(6); // You can't cast creature spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GridMonitorEffect())); + this.addAbility(new SimpleStaticAbility(new GridMonitorEffect())); } private GridMonitor(final GridMonitor card) { @@ -74,4 +74,4 @@ class GridMonitorEffect extends ContinuousRuleModifyingEffectImpl { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GriffinGuide.java b/Mage.Sets/src/mage/cards/g/GriffinGuide.java index fc4d04ac44b..2b30424257c 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinGuide.java +++ b/Mage.Sets/src/mage/cards/g/GriffinGuide.java @@ -35,7 +35,7 @@ public final class GriffinGuide extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, "and has flying")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GriftersBlade.java b/Mage.Sets/src/mage/cards/g/GriftersBlade.java index bffea85ed59..88e4e56da78 100644 --- a/Mage.Sets/src/mage/cards/g/GriftersBlade.java +++ b/Mage.Sets/src/mage/cards/g/GriftersBlade.java @@ -40,7 +40,7 @@ public final class GriftersBlade extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new GriftersBladeChooseCreatureEffect(Outcome.BoostCreature))); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/g/GrimMonolith.java b/Mage.Sets/src/mage/cards/g/GrimMonolith.java index 0c8094854c0..6992bdc77e7 100644 --- a/Mage.Sets/src/mage/cards/g/GrimMonolith.java +++ b/Mage.Sets/src/mage/cards/g/GrimMonolith.java @@ -25,7 +25,7 @@ public final class GrimMonolith extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Grim Monolith doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {tap}: Add {C}{C}{C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); // {4}: Untap Grim Monolith. diff --git a/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java b/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java index 8fe754c317d..987de512f41 100644 --- a/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java +++ b/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java @@ -65,7 +65,7 @@ public final class GrimReapersSprint extends CardImpl { // Enchanted creature gets +2/+2 and has haste. Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA); effect.setText("and has haste"); - Ability staticAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + Ability staticAbility = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); staticAbility.addEffect(effect); this.addAbility(staticAbility); } diff --git a/Mage.Sets/src/mage/cards/g/GrimStrider.java b/Mage.Sets/src/mage/cards/g/GrimStrider.java index 8826297d603..d1bea4bd1ee 100644 --- a/Mage.Sets/src/mage/cards/g/GrimStrider.java +++ b/Mage.Sets/src/mage/cards/g/GrimStrider.java @@ -32,7 +32,7 @@ public final class GrimStrider extends CardImpl { DynamicValue count = new SignInversionDynamicValue(CardsInControllerHandCount.instance); Effect effect = new BoostSourceEffect(count, count, Duration.WhileOnBattlefield); effect.setText("{this} gets -1/-1 for each card in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java index e1132c810ff..16c49734305 100644 --- a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java +++ b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java @@ -50,8 +50,8 @@ public final class GrimlockDinobotLeader extends CardImpl{ this.secondSideCardClazz = mage.cards.g.GrimlockFerociousKing.class; // Dinosaurs, Vehicles and other Transformers creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter, false))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter2, true))); // {2}: Grimlock, Dinobot Leader becomes Grimlock, Ferocious King. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java index 99beeebbcac..a039880f5ca 100644 --- a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java +++ b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java @@ -36,7 +36,7 @@ public final class GrislyTransformation extends CardImpl { // When Grisly Transformation enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature has intimidate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); } private GrislyTransformation(final GrislyTransformation card) { diff --git a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java index 3592ce751b9..352535407dd 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java +++ b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java @@ -45,7 +45,7 @@ public final class GrixisGrimblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Grixis Grimblade gets +1/+1 and has deathtouch. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java index 79dcf407b79..76598f8f73e 100644 --- a/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java +++ b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java @@ -43,7 +43,7 @@ public final class GrothamaAllDevouring extends CardImpl { this.toughness = new MageInt(8); // Other creatures have "Whenever this creature attacks, you may have it fight Grothama, All-Devouring." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GrothamaAllDevouringGainAbilityEffect())); + this.addAbility(new SimpleStaticAbility(new GrothamaAllDevouringGainAbilityEffect())); // When Grothama leaves the battlefield, each player draws cards equal to the amount of damage dealt to Grothama this turn by sources they controlled. this.addAbility(new LeavesBattlefieldTriggeredAbility(new GrothamaAllDevouringDrawCardsEffect(), false), new GrothamaAllDevouringWatcher()); diff --git a/Mage.Sets/src/mage/cards/g/GroundSeal.java b/Mage.Sets/src/mage/cards/g/GroundSeal.java index 1a3282db155..5da46328a80 100644 --- a/Mage.Sets/src/mage/cards/g/GroundSeal.java +++ b/Mage.Sets/src/mage/cards/g/GroundSeal.java @@ -23,7 +23,7 @@ public final class GroundSeal extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Cards in graveyards can't be the targets of spells or abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedCardsGraveyardsEffect())); } private GroundSeal(final GroundSeal card) { diff --git a/Mage.Sets/src/mage/cards/g/Grounded.java b/Mage.Sets/src/mage/cards/g/Grounded.java index ef140d8d470..d90311e72ed 100644 --- a/Mage.Sets/src/mage/cards/g/Grounded.java +++ b/Mage.Sets/src/mage/cards/g/Grounded.java @@ -36,7 +36,7 @@ public final class Grounded extends CardImpl { this.addAbility(ability); // Enchanted creature loses flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private Grounded(final Grounded card) { diff --git a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java index 952b8959774..82d3fb49742 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java @@ -36,7 +36,7 @@ public final class GruesomeDeformity extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has intimidate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA))); } private GruesomeDeformity(final GruesomeDeformity card) { diff --git a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java index 0dd5bc94603..9a3f83eae89 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java @@ -27,7 +27,7 @@ public final class GruulWarPlow extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {1}{R}{G}: Gruul War Plow becomes a 4/4 Juggernaut artifact creature until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GruulWarPlowToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{G}"))); diff --git a/Mage.Sets/src/mage/cards/g/GryffsBoon.java b/Mage.Sets/src/mage/cards/g/GryffsBoon.java index a059dcd3b2a..5f56a7ade08 100644 --- a/Mage.Sets/src/mage/cards/g/GryffsBoon.java +++ b/Mage.Sets/src/mage/cards/g/GryffsBoon.java @@ -40,7 +40,7 @@ public final class GryffsBoon extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+0 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GuardDuty.java b/Mage.Sets/src/mage/cards/g/GuardDuty.java index 321dc2cef9d..1874e039cbf 100644 --- a/Mage.Sets/src/mage/cards/g/GuardDuty.java +++ b/Mage.Sets/src/mage/cards/g/GuardDuty.java @@ -36,7 +36,7 @@ public final class GuardDuty extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA))); } private GuardDuty(final GuardDuty card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardGomazoa.java b/Mage.Sets/src/mage/cards/g/GuardGomazoa.java index 6b0d722e9c6..6684282d323 100644 --- a/Mage.Sets/src/mage/cards/g/GuardGomazoa.java +++ b/Mage.Sets/src/mage/cards/g/GuardGomazoa.java @@ -31,7 +31,7 @@ public final class GuardGomazoa extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Prevent all combat damage that would be dealt to Guard Gomazoa. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield))); } private GuardGomazoa(final GuardGomazoa card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java b/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java index bfac2d65281..685014104df 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java @@ -43,7 +43,7 @@ public final class GuardianOfTheGreatConduit extends CardImpl { this.addAbility(ReachAbility.getInstance()); // As long as you control a Nissa planeswalker, Guardian of the Great Conduit gets +2/+0 and has vigilance. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "and has vigilance")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GuardianSeraph.java b/Mage.Sets/src/mage/cards/g/GuardianSeraph.java index 341a445debc..e8204bd1a69 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianSeraph.java +++ b/Mage.Sets/src/mage/cards/g/GuardianSeraph.java @@ -32,7 +32,7 @@ public final class GuardianSeraph extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If a source an opponent controls would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GuardianSeraphEffect())); + this.addAbility(new SimpleStaticAbility(new GuardianSeraphEffect())); } private GuardianSeraph(final GuardianSeraph card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java index 9664c3998f9..2cf68154ce9 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java +++ b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java @@ -43,7 +43,7 @@ public final class GuardianZendikon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new GuardianZendikonWallToken(), "Enchanted land is a 2/6 white Wall creature with defender. It's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java index 3e3cfce06c2..bd3374c1d02 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java @@ -41,7 +41,7 @@ public final class GuardiansMagemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GuildscornWard.java b/Mage.Sets/src/mage/cards/g/GuildscornWard.java index 6770f8f7d0c..6164c22f938 100644 --- a/Mage.Sets/src/mage/cards/g/GuildscornWard.java +++ b/Mage.Sets/src/mage/cards/g/GuildscornWard.java @@ -40,7 +40,7 @@ public final class GuildscornWard extends CardImpl { this.addAbility(ability); // Enchanted creature has protection from multicolored. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.AURA, Duration.WhileOnBattlefield))); } private GuildscornWard(final GuildscornWard card) { diff --git a/Mage.Sets/src/mage/cards/g/Guile.java b/Mage.Sets/src/mage/cards/g/Guile.java index 2f5ff32feb5..8e00050f0e8 100644 --- a/Mage.Sets/src/mage/cards/g/Guile.java +++ b/Mage.Sets/src/mage/cards/g/Guile.java @@ -33,11 +33,11 @@ public final class Guile extends CardImpl { this.toughness = new MageInt(6); // Guile can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); // If a spell or ability you control would counter a spell, instead exile that // spell and you may play that card without paying its mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GuileReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new GuileReplacementEffect())); // When Guile is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java index 6cd72c40031..9d8b008c0e7 100644 --- a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java +++ b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java @@ -32,7 +32,7 @@ public final class GuiseOfFire extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/-1 and attacks each turn if able. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield)); Effect effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java b/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java index 43a277ba1d9..0836506f024 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java @@ -37,7 +37,7 @@ public final class GuulDrazSpecter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Guul Draz Specter gets +3/+3 as long as an opponent has no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), GuulDrazSpecterCondition.instance, ruleText))); @@ -70,4 +70,4 @@ enum GuulDrazSpecterCondition implements Condition { return result; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java b/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java index 95ec36c27c4..b8e7f138e48 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java @@ -36,7 +36,7 @@ public final class GuulDrazVampire extends CardImpl { // As long as an opponent has 10 or less life, Guul Draz Vampire gets +2/+1 and has intimidate. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.) ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), condition, rule1); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), condition, rule2)); this.addAbility(ability); -- 2.47.2 From ae7b88dc3b3889121b6d47c3ae3e7605531fc2f0 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:12:42 -0500 Subject: [PATCH 15/50] refactor: SimpleStaticAbility default zone (cards H) --- Mage.Sets/src/mage/cards/h/HallOfTriumph.java | 2 +- Mage.Sets/src/mage/cards/h/HallsOfMist.java | 2 +- Mage.Sets/src/mage/cards/h/HammerOfNazahn.java | 2 +- Mage.Sets/src/mage/cards/h/HammerOfRuin.java | 2 +- Mage.Sets/src/mage/cards/h/Hammerhand.java | 2 +- Mage.Sets/src/mage/cards/h/HammerheadShark.java | 2 +- Mage.Sets/src/mage/cards/h/HandToHand.java | 2 +- Mage.Sets/src/mage/cards/h/HanweirLancer.java | 2 +- Mage.Sets/src/mage/cards/h/HarborBandit.java | 2 +- Mage.Sets/src/mage/cards/h/HarborSerpent.java | 2 +- Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java | 2 +- Mage.Sets/src/mage/cards/h/HardyVeteran.java | 2 +- Mage.Sets/src/mage/cards/h/HarmonicSliver.java | 2 +- Mage.Sets/src/mage/cards/h/HarshJudgment.java | 2 +- Mage.Sets/src/mage/cards/h/HauntedCloak.java | 2 +- Mage.Sets/src/mage/cards/h/HauntedPlateMail.java | 2 +- Mage.Sets/src/mage/cards/h/HaunterOfNightveil.java | 2 +- Mage.Sets/src/mage/cards/h/HavocFestival.java | 2 +- Mage.Sets/src/mage/cards/h/HazardTrooper.java | 2 +- Mage.Sets/src/mage/cards/h/HazoretsMonument.java | 2 +- Mage.Sets/src/mage/cards/h/HazyHomunculus.java | 2 +- Mage.Sets/src/mage/cards/h/HealersHeaddress.java | 2 +- Mage.Sets/src/mage/cards/h/HeartOfLight.java | 2 +- Mage.Sets/src/mage/cards/h/HeartflameDuelist.java | 2 +- Mage.Sets/src/mage/cards/h/HeartlessSummoning.java | 4 ++-- Mage.Sets/src/mage/cards/h/Heartstone.java | 2 +- Mage.Sets/src/mage/cards/h/HeartwoodDryad.java | 4 ++-- Mage.Sets/src/mage/cards/h/HeatWave.java | 4 ++-- Mage.Sets/src/mage/cards/h/HeavyArbalest.java | 4 ++-- Mage.Sets/src/mage/cards/h/HeavyMattock.java | 4 ++-- Mage.Sets/src/mage/cards/h/HeavyTrooper.java | 2 +- Mage.Sets/src/mage/cards/h/HedgeTroll.java | 2 +- Mage.Sets/src/mage/cards/h/HedronBlade.java | 2 +- Mage.Sets/src/mage/cards/h/HedronFieldPurists.java | 4 ++-- Mage.Sets/src/mage/cards/h/HedronMatrix.java | 2 +- Mage.Sets/src/mage/cards/h/HeirloomBlade.java | 2 +- Mage.Sets/src/mage/cards/h/HeliodsEmissary.java | 2 +- Mage.Sets/src/mage/cards/h/HeliodsPunishment.java | 2 +- Mage.Sets/src/mage/cards/h/HelmOfAwakening.java | 2 +- Mage.Sets/src/mage/cards/h/HelmOfKaldra.java | 2 +- Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java | 4 ++-- Mage.Sets/src/mage/cards/h/HelmOfTheGods.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfSecretStreams.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfThePantheon.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfTorment.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfWar.java | 2 +- Mage.Sets/src/mage/cards/h/HermeticStudy.java | 2 +- Mage.Sets/src/mage/cards/h/HeroOfIroas.java | 2 +- Mage.Sets/src/mage/cards/h/HerosBlade.java | 2 +- Mage.Sets/src/mage/cards/h/HerosResolve.java | 2 +- Mage.Sets/src/mage/cards/h/HexplateWallbreaker.java | 2 +- Mage.Sets/src/mage/cards/h/HighGround.java | 2 +- Mage.Sets/src/mage/cards/h/HighSeas.java | 2 +- Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java | 2 +- Mage.Sets/src/mage/cards/h/HinterlandDrake.java | 2 +- Mage.Sets/src/mage/cards/h/HinterlandScourge.java | 2 +- Mage.Sets/src/mage/cards/h/Hipparion.java | 2 +- Mage.Sets/src/mage/cards/h/Hivestone.java | 2 +- Mage.Sets/src/mage/cards/h/Hobble.java | 4 ++-- Mage.Sets/src/mage/cards/h/HollowWarrior.java | 2 +- Mage.Sets/src/mage/cards/h/HolyMantle.java | 2 +- Mage.Sets/src/mage/cards/h/HolyStrength.java | 2 +- Mage.Sets/src/mage/cards/h/Homarid.java | 4 ++-- Mage.Sets/src/mage/cards/h/HomingSliver.java | 2 +- Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java | 2 +- Mage.Sets/src/mage/cards/h/HonedKhopesh.java | 2 +- Mage.Sets/src/mage/cards/h/HonorOfThePure.java | 2 +- Mage.Sets/src/mage/cards/h/HonoredHierarch.java | 2 +- Mage.Sets/src/mage/cards/h/HoodedHydra.java | 2 +- Mage.Sets/src/mage/cards/h/HopeAgainstHope.java | 4 ++-- Mage.Sets/src/mage/cards/h/HopefulEidolon.java | 2 +- Mage.Sets/src/mage/cards/h/HornedHelm.java | 2 +- Mage.Sets/src/mage/cards/h/HornedSliver.java | 2 +- Mage.Sets/src/mage/cards/h/HostileRealm.java | 2 +- Mage.Sets/src/mage/cards/h/Hostility.java | 2 +- Mage.Sets/src/mage/cards/h/HotPursuitStarWars.java | 2 +- Mage.Sets/src/mage/cards/h/HotSoup.java | 2 +- Mage.Sets/src/mage/cards/h/HotSprings.java | 2 +- Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java | 2 +- Mage.Sets/src/mage/cards/h/Howlgeist.java | 2 +- Mage.Sets/src/mage/cards/h/HowlingChorus.java | 2 +- Mage.Sets/src/mage/cards/h/HowlpackResurgence.java | 2 +- Mage.Sets/src/mage/cards/h/HowlpackWolf.java | 2 +- Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java | 2 +- Mage.Sets/src/mage/cards/h/HundredHandedOne.java | 2 +- Mage.Sets/src/mage/cards/h/HungryLynx.java | 2 +- Mage.Sets/src/mage/cards/h/HypersonicDragon.java | 2 +- Mage.Sets/src/mage/cards/h/HypervoltGrasp.java | 2 +- Mage.Sets/src/mage/cards/h/HypnoticSiren.java | 4 ++-- 92 files changed, 103 insertions(+), 103 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/HallOfTriumph.java b/Mage.Sets/src/mage/cards/h/HallOfTriumph.java index 6b79485db69..7108a654f4b 100644 --- a/Mage.Sets/src/mage/cards/h/HallOfTriumph.java +++ b/Mage.Sets/src/mage/cards/h/HallOfTriumph.java @@ -28,7 +28,7 @@ public final class HallOfTriumph extends CardImpl { // As Hall of Triumph enters the battlefield choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); // Creatures you control of the chosen color get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HallOfTriumphBoostControlledEffect())); + this.addAbility(new SimpleStaticAbility(new HallOfTriumphBoostControlledEffect())); } private HallOfTriumph(final HallOfTriumph card) { diff --git a/Mage.Sets/src/mage/cards/h/HallsOfMist.java b/Mage.Sets/src/mage/cards/h/HallsOfMist.java index 408215dfbe7..71b0c9e84af 100644 --- a/Mage.Sets/src/mage/cards/h/HallsOfMist.java +++ b/Mage.Sets/src/mage/cards/h/HallsOfMist.java @@ -30,7 +30,7 @@ public final class HallsOfMist extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new GenericManaCost(1))); // Creatures that attacked during their controller's last turn can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackIfAttackedLastTurnAllEffect()), new AttackedLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new CantAttackIfAttackedLastTurnAllEffect()), new AttackedLastTurnWatcher()); } private HallsOfMist(final HallsOfMist card) { diff --git a/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java b/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java index ca5cffc31d9..ccb39fa4839 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java @@ -40,7 +40,7 @@ public final class HammerOfNazahn extends CardImpl { this.addAbility(ability); // Equipped creature gets +2/+0 and has indestructible. - Ability abilityEquipped = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0)); + Ability abilityEquipped = new SimpleStaticAbility(new BoostEquippedEffect(2, 0)); Effect effect = new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has indestructible"); abilityEquipped.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HammerOfRuin.java b/Mage.Sets/src/mage/cards/h/HammerOfRuin.java index 2beadb5aeef..9992e039c5d 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfRuin.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfRuin.java @@ -34,7 +34,7 @@ public final class HammerOfRuin extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Whenever equipped creature deals combat damage to a player, you may destroy target Equipment that player controls. Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility(new DestroyTargetEffect(), "equipped creature", true, true); diff --git a/Mage.Sets/src/mage/cards/h/Hammerhand.java b/Mage.Sets/src/mage/cards/h/Hammerhand.java index e95626f7c9a..b93cf341bb2 100644 --- a/Mage.Sets/src/mage/cards/h/Hammerhand.java +++ b/Mage.Sets/src/mage/cards/h/Hammerhand.java @@ -49,7 +49,7 @@ public final class Hammerhand extends CardImpl { // Enchanted creature gets +1/+1 and has haste. Effect effect = new BoostEnchantedEffect(1, 1); effect.setText("Enchanted creature gets +1/+1"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA); effect.setText("and has haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HammerheadShark.java b/Mage.Sets/src/mage/cards/h/HammerheadShark.java index 217c645ed82..ce3f3a9abd4 100644 --- a/Mage.Sets/src/mage/cards/h/HammerheadShark.java +++ b/Mage.Sets/src/mage/cards/h/HammerheadShark.java @@ -25,7 +25,7 @@ public final class HammerheadShark extends CardImpl { this.toughness = new MageInt(3); // Hammerhead Shark can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); } private HammerheadShark(final HammerheadShark card) { diff --git a/Mage.Sets/src/mage/cards/h/HandToHand.java b/Mage.Sets/src/mage/cards/h/HandToHand.java index 4ed6137bd98..c1a17d14435 100644 --- a/Mage.Sets/src/mage/cards/h/HandToHand.java +++ b/Mage.Sets/src/mage/cards/h/HandToHand.java @@ -23,7 +23,7 @@ public final class HandToHand extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // During combat, players can't cast instant spells or activate abilities that aren't mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HandToHandEffect())); + this.addAbility(new SimpleStaticAbility(new HandToHandEffect())); } private HandToHand(final HandToHand card) { diff --git a/Mage.Sets/src/mage/cards/h/HanweirLancer.java b/Mage.Sets/src/mage/cards/h/HanweirLancer.java index 3744275e80e..74c9696021d 100644 --- a/Mage.Sets/src/mage/cards/h/HanweirLancer.java +++ b/Mage.Sets/src/mage/cards/h/HanweirLancer.java @@ -32,7 +32,7 @@ public final class HanweirLancer extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Hanweir Lancer is paired with another creature, both creatures have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(FirstStrikeAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(FirstStrikeAbility.getInstance(), ruleText))); } private HanweirLancer(final HanweirLancer card) { diff --git a/Mage.Sets/src/mage/cards/h/HarborBandit.java b/Mage.Sets/src/mage/cards/h/HarborBandit.java index cc43e2a3998..f25c30cd42b 100644 --- a/Mage.Sets/src/mage/cards/h/HarborBandit.java +++ b/Mage.Sets/src/mage/cards/h/HarborBandit.java @@ -42,7 +42,7 @@ public final class HarborBandit extends CardImpl { // Harbor Bandit gets +1/+1 as long as you control an Island. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {1}{U}: Harbor Bandit can't be blocked this turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/h/HarborSerpent.java b/Mage.Sets/src/mage/cards/h/HarborSerpent.java index d1befe01315..7ecdaf4829c 100644 --- a/Mage.Sets/src/mage/cards/h/HarborSerpent.java +++ b/Mage.Sets/src/mage/cards/h/HarborSerpent.java @@ -34,7 +34,7 @@ public final class HarborSerpent extends CardImpl { this.addAbility(new IslandwalkAbility()); // Harbor Serpent can't attack unless there are five or more Islands on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HarborSerpentEffect())); + this.addAbility(new SimpleStaticAbility(new HarborSerpentEffect())); } private HarborSerpent(final HarborSerpent card) { diff --git a/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java b/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java index 627e2c63710..07ab1b7bb3d 100644 --- a/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java +++ b/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java @@ -35,7 +35,7 @@ public final class HardenedScaleArmor extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); } private HardenedScaleArmor(final HardenedScaleArmor card) { diff --git a/Mage.Sets/src/mage/cards/h/HardyVeteran.java b/Mage.Sets/src/mage/cards/h/HardyVeteran.java index 50abe5c9816..a46a893e8b2 100644 --- a/Mage.Sets/src/mage/cards/h/HardyVeteran.java +++ b/Mage.Sets/src/mage/cards/h/HardyVeteran.java @@ -35,7 +35,7 @@ public final class HardyVeteran extends CardImpl { new BoostSourceEffect(0, 2, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, {this} gets +0/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); + Ability ability = new SimpleStaticAbility(boostEffect); ability.addHint(MyTurnHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HarmonicSliver.java b/Mage.Sets/src/mage/cards/h/HarmonicSliver.java index b265782ad4d..f2ce3648090 100644 --- a/Mage.Sets/src/mage/cards/h/HarmonicSliver.java +++ b/Mage.Sets/src/mage/cards/h/HarmonicSliver.java @@ -41,7 +41,7 @@ public final class HarmonicSliver extends CardImpl { TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT); ability.addTarget(target); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, filterSliver, "All Slivers have \"When this permanent enters the battlefield, destroy target artifact or enchantment.\""))); } diff --git a/Mage.Sets/src/mage/cards/h/HarshJudgment.java b/Mage.Sets/src/mage/cards/h/HarshJudgment.java index 1ef061f598a..70eabedeb4e 100755 --- a/Mage.Sets/src/mage/cards/h/HarshJudgment.java +++ b/Mage.Sets/src/mage/cards/h/HarshJudgment.java @@ -36,7 +36,7 @@ public final class HarshJudgment extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // If an instant or sorcery spell of the chosen color would deal damage to you, it deals that damage to its controller instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HarshJudgmentEffect())); + this.addAbility(new SimpleStaticAbility(new HarshJudgmentEffect())); } private HarshJudgment(final HarshJudgment card) { diff --git a/Mage.Sets/src/mage/cards/h/HauntedCloak.java b/Mage.Sets/src/mage/cards/h/HauntedCloak.java index c6188419031..b62c6ea60c0 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedCloak.java +++ b/Mage.Sets/src/mage/cards/h/HauntedCloak.java @@ -31,7 +31,7 @@ public final class HauntedCloak extends CardImpl { // Equipped creature has vigilance, trample, and haste. Effect effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("Equipped creature has vigilance"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText(", trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java b/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java index 57a7c6fc9b6..4fdf4194e4b 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java +++ b/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java @@ -33,7 +33,7 @@ public final class HauntedPlateMail extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 4))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 4))); // {0}: Until end of turn, Haunted Plate Mail becomes a 4/4 Spirit artifact creature that's no longer an Equipment. Activate this ability only if you control no creatures. Ability ability = new ConditionalActivatedAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/h/HaunterOfNightveil.java b/Mage.Sets/src/mage/cards/h/HaunterOfNightveil.java index 4f4aee08aae..e46a6280d72 100644 --- a/Mage.Sets/src/mage/cards/h/HaunterOfNightveil.java +++ b/Mage.Sets/src/mage/cards/h/HaunterOfNightveil.java @@ -26,7 +26,7 @@ public final class HaunterOfNightveil extends CardImpl { this.toughness = new MageInt(4); // Creatures your opponents control get -1/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-1,0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostOpponentsEffect(-1,0, Duration.WhileOnBattlefield))); } private HaunterOfNightveil(final HaunterOfNightveil card) { diff --git a/Mage.Sets/src/mage/cards/h/HavocFestival.java b/Mage.Sets/src/mage/cards/h/HavocFestival.java index a02c770e43c..0bcfd27a2ff 100644 --- a/Mage.Sets/src/mage/cards/h/HavocFestival.java +++ b/Mage.Sets/src/mage/cards/h/HavocFestival.java @@ -22,7 +22,7 @@ public final class HavocFestival extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{R}"); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantGainLifeAllEffect())); // At the beginning of each player's upkeep, that player loses half their life, rounded up. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.EACH_PLAYER, new LoseHalfLifeTargetEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/h/HazardTrooper.java b/Mage.Sets/src/mage/cards/h/HazardTrooper.java index fd41f2e133b..d98ae11f732 100644 --- a/Mage.Sets/src/mage/cards/h/HazardTrooper.java +++ b/Mage.Sets/src/mage/cards/h/HazardTrooper.java @@ -35,7 +35,7 @@ public final class HazardTrooper extends CardImpl { this.toughness = new MageInt(3); // Trooper creatures you control have intimidate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/h/HazoretsMonument.java b/Mage.Sets/src/mage/cards/h/HazoretsMonument.java index 851d76adee5..049ea10a9f5 100644 --- a/Mage.Sets/src/mage/cards/h/HazoretsMonument.java +++ b/Mage.Sets/src/mage/cards/h/HazoretsMonument.java @@ -41,7 +41,7 @@ public final class HazoretsMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Red creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast a creature spell, you may discard a card. If you do, draw a card. this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new DiscardCardCost()), filter2, false)); diff --git a/Mage.Sets/src/mage/cards/h/HazyHomunculus.java b/Mage.Sets/src/mage/cards/h/HazyHomunculus.java index 0e2da313d78..415cfdf5217 100644 --- a/Mage.Sets/src/mage/cards/h/HazyHomunculus.java +++ b/Mage.Sets/src/mage/cards/h/HazyHomunculus.java @@ -42,7 +42,7 @@ public final class HazyHomunculus extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(filter)); effect.setText("{this} can't be blocked as long as defending player controls an untapped land"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private HazyHomunculus(final HazyHomunculus card) { diff --git a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java index e8f80fc6ed0..e8648c7e4ae 100644 --- a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java +++ b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java @@ -40,7 +40,7 @@ public final class HealersHeaddress extends CardImpl { gainAbility.addTarget(new TargetAnyTarget()); Effect effect = new BoostEquippedEffect(0, 2); effect.setText("Equipped creature gets +0/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(gainAbility, AttachmentType.EQUIPMENT); effect.setText("and has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HeartOfLight.java b/Mage.Sets/src/mage/cards/h/HeartOfLight.java index c325a8e9af9..a8ec748ad66 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfLight.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfLight.java @@ -37,7 +37,7 @@ public final class HeartOfLight extends CardImpl { this.addAbility(ability); // Prevent all damage that would be dealt to and dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeartOfLightEffect())); + this.addAbility(new SimpleStaticAbility(new HeartOfLightEffect())); } private HeartOfLight(final HeartOfLight card) { diff --git a/Mage.Sets/src/mage/cards/h/HeartflameDuelist.java b/Mage.Sets/src/mage/cards/h/HeartflameDuelist.java index 655d68af1fc..33ab30d4184 100644 --- a/Mage.Sets/src/mage/cards/h/HeartflameDuelist.java +++ b/Mage.Sets/src/mage/cards/h/HeartflameDuelist.java @@ -38,7 +38,7 @@ public final class HeartflameDuelist extends AdventureCard { // Instant and sorcery spells you control have lifelink. Effect effect = new GainAbilityControlledSpellsEffect(LifelinkAbility.getInstance(), filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Heartflame Slash // Heartflame Slash deals 3 damage to any target. diff --git a/Mage.Sets/src/mage/cards/h/HeartlessSummoning.java b/Mage.Sets/src/mage/cards/h/HeartlessSummoning.java index 0d12b48b7a1..8d4ebdb3702 100644 --- a/Mage.Sets/src/mage/cards/h/HeartlessSummoning.java +++ b/Mage.Sets/src/mage/cards/h/HeartlessSummoning.java @@ -23,10 +23,10 @@ public final class HeartlessSummoning extends CardImpl { // Creature spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterCreatureCard("Creature spells"), 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterCreatureCard("Creature spells"), 2))); // Creatures you control get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(-1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(-1, -1, Duration.WhileOnBattlefield))); } private HeartlessSummoning(final HeartlessSummoning card) { diff --git a/Mage.Sets/src/mage/cards/h/Heartstone.java b/Mage.Sets/src/mage/cards/h/Heartstone.java index b4ffd932c4f..42ca7da08e1 100644 --- a/Mage.Sets/src/mage/cards/h/Heartstone.java +++ b/Mage.Sets/src/mage/cards/h/Heartstone.java @@ -24,7 +24,7 @@ public final class Heartstone extends CardImpl { // Activated abilities of creatures cost {1} less to activate. // This effect can't reduce the amount of mana an ability // costs to activate to less than one mana. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeartstoneEffect())); + this.addAbility(new SimpleStaticAbility(new HeartstoneEffect())); } private Heartstone(final Heartstone card) { diff --git a/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java b/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java index 9c5212b2fb3..fbe90cf6e55 100644 --- a/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java +++ b/Mage.Sets/src/mage/cards/h/HeartwoodDryad.java @@ -25,7 +25,7 @@ public final class HeartwoodDryad extends CardImpl { this.toughness = new MageInt(1); // Heartwood Dryad can block creatures with shadow as though Heartwood Dryad had shadow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield))); } private HeartwoodDryad(final HeartwoodDryad card) { @@ -36,4 +36,4 @@ public final class HeartwoodDryad extends CardImpl { public HeartwoodDryad copy() { return new HeartwoodDryad(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/h/HeatWave.java b/Mage.Sets/src/mage/cards/h/HeatWave.java index 0c803d75be2..3a3b4182c9e 100644 --- a/Mage.Sets/src/mage/cards/h/HeatWave.java +++ b/Mage.Sets/src/mage/cards/h/HeatWave.java @@ -32,10 +32,10 @@ public final class HeatWave extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{R}"))); // Blue creatures can't block creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeatWaveEffect1())); + this.addAbility(new SimpleStaticAbility(new HeatWaveEffect1())); // Nonblue creatures can't block creatures you control unless their controller pays 1 life for each blocking creature they control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeatWaveEffect2())); + this.addAbility(new SimpleStaticAbility(new HeatWaveEffect2())); } diff --git a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java index 8904316d958..16ff458c06c 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java +++ b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java @@ -37,12 +37,12 @@ public final class HeavyArbalest extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeavyArbalestEffect())); + this.addAbility(new SimpleStaticAbility(new HeavyArbalestEffect())); // Equipped creature has "{T}: This creature deals 2 damage to any target." SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability2.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); // Equip {4) this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4), false)); diff --git a/Mage.Sets/src/mage/cards/h/HeavyMattock.java b/Mage.Sets/src/mage/cards/h/HeavyMattock.java index 4f25a0ec320..5b3822bae27 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyMattock.java +++ b/Mage.Sets/src/mage/cards/h/HeavyMattock.java @@ -28,9 +28,9 @@ public final class HeavyMattock extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // As long as equipped creature is a Human, it gets an additional +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/h/HeavyTrooper.java b/Mage.Sets/src/mage/cards/h/HeavyTrooper.java index 2c637a1d9a2..9bae386e95b 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyTrooper.java +++ b/Mage.Sets/src/mage/cards/h/HeavyTrooper.java @@ -33,7 +33,7 @@ public final class HeavyTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, false))); } private HeavyTrooper(final HeavyTrooper card) { diff --git a/Mage.Sets/src/mage/cards/h/HedgeTroll.java b/Mage.Sets/src/mage/cards/h/HedgeTroll.java index 032393ff1de..21afffa2b29 100644 --- a/Mage.Sets/src/mage/cards/h/HedgeTroll.java +++ b/Mage.Sets/src/mage/cards/h/HedgeTroll.java @@ -35,7 +35,7 @@ public final class HedgeTroll extends CardImpl { this.toughness = new MageInt(2); // Hedge Troll gets +1/+1 as long as you control a Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {W}: Regenerate Hedge Troll. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/h/HedronBlade.java b/Mage.Sets/src/mage/cards/h/HedronBlade.java index 42a731011c3..41ceab002ff 100644 --- a/Mage.Sets/src/mage/cards/h/HedronBlade.java +++ b/Mage.Sets/src/mage/cards/h/HedronBlade.java @@ -35,7 +35,7 @@ public final class HedronBlade extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Whenever equipped creature becomes blocked by one or more colorless creatures, it gains deathtouch until end of turn. this.addAbility(new HedronBladeTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/h/HedronFieldPurists.java b/Mage.Sets/src/mage/cards/h/HedronFieldPurists.java index b5e634b0198..eba268e9756 100644 --- a/Mage.Sets/src/mage/cards/h/HedronFieldPurists.java +++ b/Mage.Sets/src/mage/cards/h/HedronFieldPurists.java @@ -42,12 +42,12 @@ public final class HedronFieldPurists extends LevelerCard { // 1/4 // If a source would deal damage to you or a creature you control, prevent 1 of that damage. Abilities abilities1 = new AbilitiesImpl<>(); - abilities1.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new HedronFieldPuristsEffect(1))); + abilities1.add(new SimpleStaticAbility(new HedronFieldPuristsEffect(1))); // LEVEL 5+ // 2/5 // If a source would deal damage to you or a creature you control, prevent 2 of that damage. Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new HedronFieldPuristsEffect(2))); + abilities2.add(new SimpleStaticAbility(new HedronFieldPuristsEffect(2))); this.addAbilities(LevelerCardBuilder.construct( new LevelerCardBuilder.LevelAbility(1, 4, abilities1, 1, 4), diff --git a/Mage.Sets/src/mage/cards/h/HedronMatrix.java b/Mage.Sets/src/mage/cards/h/HedronMatrix.java index 3a01b163a9a..57ca4fd301b 100644 --- a/Mage.Sets/src/mage/cards/h/HedronMatrix.java +++ b/Mage.Sets/src/mage/cards/h/HedronMatrix.java @@ -32,7 +32,7 @@ public final class HedronMatrix extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +X/+X, where X is its mana value. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HedronMatrixEffect())); + this.addAbility(new SimpleStaticAbility(new HedronMatrixEffect())); // Equip {4} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/h/HeirloomBlade.java b/Mage.Sets/src/mage/cards/h/HeirloomBlade.java index 599d1390f49..de7e9c8586f 100644 --- a/Mage.Sets/src/mage/cards/h/HeirloomBlade.java +++ b/Mage.Sets/src/mage/cards/h/HeirloomBlade.java @@ -33,7 +33,7 @@ public final class HeirloomBlade extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1))); // Whenever equipped creature dies, you may reveal cards from the top of your library until you reveal a creature card that shares a creature type with it. // Put that card into your hand and the rest on the bottom of your library in a random order. diff --git a/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java b/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java index d8178145eeb..39c1aac2ece 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java +++ b/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java @@ -46,7 +46,7 @@ public final class HeliodsEmissary extends CardImpl { ability.addTarget(target); this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield))); } private HeliodsEmissary(final HeliodsEmissary card) { diff --git a/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java b/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java index b115917c985..7c28b385890 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java +++ b/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java @@ -43,7 +43,7 @@ public final class HeliodsPunishment extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.TASK.createInstance(4)), "with four task counters on it")); // Enchanted creature can't attack or block. It loses all abilities and has "{T}: Remove a task counter from Heliod's Punishment. Then if it has no task counters on it, destroy Heliod's Punishment." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA)); + ability = new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA)); ability.addEffect(new HeliodsPunishmentLoseAllAbilitiesEnchantedEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HelmOfAwakening.java b/Mage.Sets/src/mage/cards/h/HelmOfAwakening.java index 87cda5a0794..1e930302914 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfAwakening.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfAwakening.java @@ -18,7 +18,7 @@ public final class HelmOfAwakening extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Spells cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionAllEffect(1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionAllEffect(1))); } private HelmOfAwakening(final HelmOfAwakening card) { diff --git a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java b/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java index 09592badcb7..b8b92c6c6b9 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java @@ -47,7 +47,7 @@ public final class HelmOfKaldra extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has first strike, trample, and haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText(", trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java b/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java index 80f07922d3b..e3fbf126742 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java @@ -42,11 +42,11 @@ public final class HelmOfTheGhastlord extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is blue, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, draw a card." - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); blueAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(new DealsDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1),false), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has \"Whenever this creature deals damage to an opponent, draw a card.\"")); this.addAbility(blueAbility); // As long as enchanted creature is black, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, that player discards a card." - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(new DealsDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has \"Whenever this creature deals damage to an opponent, that player discards a card.\"")); this.addAbility(blackAbility); } diff --git a/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java b/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java index ebf961b0465..c6a1428e3ec 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java @@ -33,7 +33,7 @@ public final class HelmOfTheGods extends CardImpl { PermanentsOnBattlefieldCount countEnchantments = new PermanentsOnBattlefieldCount(filter); Effect effect = new BoostEquippedEffect(countEnchantments, countEnchantments); effect.setText("Equipped creature gets +1/+1 for each enchantment you control"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java index 3d9ec22cb20..715c4b5606d 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java @@ -40,7 +40,7 @@ public final class HeraldOfDromoka extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Other Warrior creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect (VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java b/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java index d6f0d541d1b..ecd06a262ac 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java @@ -37,7 +37,7 @@ public final class HeraldOfKozilek extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // Colorless spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private HeraldOfKozilek(final HeraldOfKozilek card) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java index 91d76e5faef..f10d27c29af 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java @@ -54,7 +54,7 @@ public final class HeraldOfLeshrac extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new HeraldOfLeshracCumulativeCost())); // Herald of Leshrac gets +1/+1 for each land you control but don't own. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); // When Herald of Leshrac leaves the battlefield, each player gains control of each land they own that you control. this.addAbility(new LeavesBattlefieldTriggeredAbility(new HeraldOfLeshracLeavesEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfSecretStreams.java b/Mage.Sets/src/mage/cards/h/HeraldOfSecretStreams.java index 8285d57dbf2..3046c01e2d6 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfSecretStreams.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfSecretStreams.java @@ -35,7 +35,7 @@ public final class HeraldOfSecretStreams extends CardImpl { this.toughness = new MageInt(3); // Creatures you control with +1/+1 counters on them can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield))); } private HeraldOfSecretStreams(final HeraldOfSecretStreams card) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfThePantheon.java b/Mage.Sets/src/mage/cards/h/HeraldOfThePantheon.java index a26c0fef7be..0bd3a94d5df 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfThePantheon.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfThePantheon.java @@ -34,7 +34,7 @@ public final class HeraldOfThePantheon extends CardImpl { this.toughness = new MageInt(2); // Enchantment spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast an enchantment spell, you gain 1 life. this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(1), StaticFilters.FILTER_SPELL_AN_ENCHANTMENT, false)); diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfTorment.java b/Mage.Sets/src/mage/cards/h/HeraldOfTorment.java index e4d74039e4b..167f2cc8079 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfTorment.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfTorment.java @@ -42,7 +42,7 @@ public final class HeraldOfTorment extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1))); // Enchanted creature gets +3/+3 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfWar.java b/Mage.Sets/src/mage/cards/h/HeraldOfWar.java index 5d3ec40c62e..1242d963f65 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfWar.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfWar.java @@ -36,7 +36,7 @@ public final class HeraldOfWar extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).setText("put a +1/+1 counter on it"), false)); // Angel spells and Human spells you cast cost {1} less to cast for each +1/+1 counter on Herald of War. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeraldOfWarCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new HeraldOfWarCostReductionEffect())); } private HeraldOfWar(final HeraldOfWar card) { diff --git a/Mage.Sets/src/mage/cards/h/HermeticStudy.java b/Mage.Sets/src/mage/cards/h/HermeticStudy.java index 5e7a1a5bd9e..70efb6bdb96 100644 --- a/Mage.Sets/src/mage/cards/h/HermeticStudy.java +++ b/Mage.Sets/src/mage/cards/h/HermeticStudy.java @@ -40,7 +40,7 @@ public final class HermeticStudy extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to any target." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); } diff --git a/Mage.Sets/src/mage/cards/h/HeroOfIroas.java b/Mage.Sets/src/mage/cards/h/HeroOfIroas.java index 6e766928287..b177271e2e7 100644 --- a/Mage.Sets/src/mage/cards/h/HeroOfIroas.java +++ b/Mage.Sets/src/mage/cards/h/HeroOfIroas.java @@ -35,7 +35,7 @@ public final class HeroOfIroas extends CardImpl { this.toughness = new MageInt(2); // Aura spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Heroic — Whenever you cast a spell that targets Hero of Iroas, put a +1/+1 counter on Hero of Iroas. this.addAbility(new HeroicAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/h/HerosBlade.java b/Mage.Sets/src/mage/cards/h/HerosBlade.java index 9434922dbee..084c3e61d1c 100644 --- a/Mage.Sets/src/mage/cards/h/HerosBlade.java +++ b/Mage.Sets/src/mage/cards/h/HerosBlade.java @@ -31,7 +31,7 @@ public final class HerosBlade extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 2))); // Whenever a legendary creature you control enters, you may attach Hero's Blade to it. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/h/HerosResolve.java b/Mage.Sets/src/mage/cards/h/HerosResolve.java index 409be046ac6..cc4b908d9a3 100644 --- a/Mage.Sets/src/mage/cards/h/HerosResolve.java +++ b/Mage.Sets/src/mage/cards/h/HerosResolve.java @@ -28,7 +28,7 @@ TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 5, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 5, Duration.WhileOnBattlefield))); } private HerosResolve(final HerosResolve card) { diff --git a/Mage.Sets/src/mage/cards/h/HexplateWallbreaker.java b/Mage.Sets/src/mage/cards/h/HexplateWallbreaker.java index ffd518b9134..3ad31995635 100644 --- a/Mage.Sets/src/mage/cards/h/HexplateWallbreaker.java +++ b/Mage.Sets/src/mage/cards/h/HexplateWallbreaker.java @@ -34,7 +34,7 @@ public final class HexplateWallbreaker extends CardImpl { this.addAbility(new ForMirrodinAbility()); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // Whenever equipped creature attacks, if it's the first combat phase of the turn, untap // each attacking creature. After this phase, there is an additional combat phase. diff --git a/Mage.Sets/src/mage/cards/h/HighGround.java b/Mage.Sets/src/mage/cards/h/HighGround.java index be13d3147bd..e05ecdcd787 100644 --- a/Mage.Sets/src/mage/cards/h/HighGround.java +++ b/Mage.Sets/src/mage/cards/h/HighGround.java @@ -21,7 +21,7 @@ public final class HighGround extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); // Each creature you control can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield))); } private HighGround(final HighGround card) { diff --git a/Mage.Sets/src/mage/cards/h/HighSeas.java b/Mage.Sets/src/mage/cards/h/HighSeas.java index 2094b483c92..575008ce325 100644 --- a/Mage.Sets/src/mage/cards/h/HighSeas.java +++ b/Mage.Sets/src/mage/cards/h/HighSeas.java @@ -30,7 +30,7 @@ public final class HighSeas extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // Red creature spells and green creature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private HighSeas(final HighSeas card) { diff --git a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java index 8e36375c7ca..3bb6ec9511c 100644 --- a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java +++ b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java @@ -41,7 +41,7 @@ public final class HighSentinelsOfArashin extends CardImpl { // High Sentinels of Arashin gets +1/+1 for each other creature you control with a +1/+1 counter on it. DynamicValue count = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_OTHER_CONTROLLED_CREATURE_P1P1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // {3}{W}: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}{W}")); diff --git a/Mage.Sets/src/mage/cards/h/HinterlandDrake.java b/Mage.Sets/src/mage/cards/h/HinterlandDrake.java index dc136208efc..bc6eb2578dd 100644 --- a/Mage.Sets/src/mage/cards/h/HinterlandDrake.java +++ b/Mage.Sets/src/mage/cards/h/HinterlandDrake.java @@ -33,7 +33,7 @@ public final class HinterlandDrake extends CardImpl { // Hinterland Drake can't block artifact creatures. Effect effect = new CantBlockCreaturesSourceEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE); effect.setText("{this} can't block artifact creatures"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private HinterlandDrake(final HinterlandDrake card) { diff --git a/Mage.Sets/src/mage/cards/h/HinterlandScourge.java b/Mage.Sets/src/mage/cards/h/HinterlandScourge.java index 942dfb7e1ef..cd0c9e0c8ba 100644 --- a/Mage.Sets/src/mage/cards/h/HinterlandScourge.java +++ b/Mage.Sets/src/mage/cards/h/HinterlandScourge.java @@ -30,7 +30,7 @@ public final class HinterlandScourge extends CardImpl { this.toughness = new MageInt(2); // Hinterland Scourge must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Hinterland Scourge. this.addAbility(new WerewolfBackTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/h/Hipparion.java b/Mage.Sets/src/mage/cards/h/Hipparion.java index 7282a980a40..0daade71e2a 100644 --- a/Mage.Sets/src/mage/cards/h/Hipparion.java +++ b/Mage.Sets/src/mage/cards/h/Hipparion.java @@ -29,7 +29,7 @@ public final class Hipparion extends CardImpl { this.toughness = new MageInt(3); // Hipparion can't block creatures with power 3 or greater unless you pay {1}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HipparionEffect())); + this.addAbility(new SimpleStaticAbility(new HipparionEffect())); } private Hipparion(final Hipparion card) { diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java index ca3ac4e6c6f..e7c4105de14 100644 --- a/Mage.Sets/src/mage/cards/h/Hivestone.java +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -28,7 +28,7 @@ public final class Hivestone extends CardImpl { // Creatures you control are Slivers in addition to their other creature types. Effect effect = new BecomesSubtypeAllEffect(Duration.WhileOnBattlefield, Arrays.asList(SubType.SLIVER), filter, false); effect.setText("Creatures you control are Slivers in addition to their other creature types"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Hivestone(final Hivestone card) { diff --git a/Mage.Sets/src/mage/cards/h/Hobble.java b/Mage.Sets/src/mage/cards/h/Hobble.java index c1c6865492b..3ab268f2d72 100644 --- a/Mage.Sets/src/mage/cards/h/Hobble.java +++ b/Mage.Sets/src/mage/cards/h/Hobble.java @@ -43,12 +43,12 @@ public final class Hobble extends CardImpl { // When Hobble enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // Enchanted creature can't block if it's black. Effect effect = new ConditionalRestrictionEffect(new CantBlockAttachedEffect(AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK)); effect.setText("Enchanted creature can't block if it's black."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Hobble(final Hobble card) { diff --git a/Mage.Sets/src/mage/cards/h/HollowWarrior.java b/Mage.Sets/src/mage/cards/h/HollowWarrior.java index 54613ba437f..9d7f4814d19 100644 --- a/Mage.Sets/src/mage/cards/h/HollowWarrior.java +++ b/Mage.Sets/src/mage/cards/h/HollowWarrior.java @@ -37,7 +37,7 @@ public final class HollowWarrior extends CardImpl { this.toughness = new MageInt(4); // Hollow Warrior can't attack or block unless you tap an untapped creature you control not declared as an attacking or blocking creature this combat. (This cost is paid as attackers are declared.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HollowWarriorCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new HollowWarriorCostToAttackBlockEffect())); } diff --git a/Mage.Sets/src/mage/cards/h/HolyMantle.java b/Mage.Sets/src/mage/cards/h/HolyMantle.java index 13a805e3c80..3079c8d9c01 100644 --- a/Mage.Sets/src/mage/cards/h/HolyMantle.java +++ b/Mage.Sets/src/mage/cards/h/HolyMantle.java @@ -40,7 +40,7 @@ public final class HolyMantle extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has protection from creatures. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(new ProtectionAbility(StaticFilters.FILTER_PERMANENT_CREATURES), AttachmentType.AURA, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HolyStrength.java b/Mage.Sets/src/mage/cards/h/HolyStrength.java index e48a87fc51e..f81b9982053 100644 --- a/Mage.Sets/src/mage/cards/h/HolyStrength.java +++ b/Mage.Sets/src/mage/cards/h/HolyStrength.java @@ -34,7 +34,7 @@ public final class HolyStrength extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } private HolyStrength(final HolyStrength card) { diff --git a/Mage.Sets/src/mage/cards/h/Homarid.java b/Mage.Sets/src/mage/cards/h/Homarid.java index 04fa998034e..6bac43f3795 100644 --- a/Mage.Sets/src/mage/cards/h/Homarid.java +++ b/Mage.Sets/src/mage/cards/h/Homarid.java @@ -43,11 +43,11 @@ public final class Homarid extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.TIDE.createInstance()) )); // As long as there is exactly one tide counter on Homarid, it gets -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(-1, -1, Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.TIDE, 1, 1), "As long as there is exactly one tide counter on {this}, it gets -1/-1."))); // As long as there are exactly three tide counters on Homarid, it gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.TIDE, 3, 3), "As long as there are exactly three tide counters on {this}, it gets +1/+1."))); // Whenever there are four or more tide counters on Homarid, remove all tide counters from it. diff --git a/Mage.Sets/src/mage/cards/h/HomingSliver.java b/Mage.Sets/src/mage/cards/h/HomingSliver.java index af09c3e5c6a..a830b3d645e 100644 --- a/Mage.Sets/src/mage/cards/h/HomingSliver.java +++ b/Mage.Sets/src/mage/cards/h/HomingSliver.java @@ -37,7 +37,7 @@ public final class HomingSliver extends CardImpl { this.toughness = new MageInt(2); // Each Sliver card in each player's hand has slivercycling {3}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HomingSliverEffect())); + this.addAbility(new SimpleStaticAbility(new HomingSliverEffect())); // Slivercycling {3} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}"), filter, "Slivercycling")); diff --git a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java index 5ea6f4ac9f9..c20a481be04 100644 --- a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java +++ b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java @@ -111,7 +111,7 @@ class HomurasEssence2 extends TokenImpl { color.setRed(true); // Creatures you control get +2/+2 and have flying and "{R}: This creature gets +1/+0 until end of turn." FilterCreaturePermanent filter = new FilterCreaturePermanent(); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false)); Effect effect = new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HonedKhopesh.java b/Mage.Sets/src/mage/cards/h/HonedKhopesh.java index 87484544520..990d3a482e8 100644 --- a/Mage.Sets/src/mage/cards/h/HonedKhopesh.java +++ b/Mage.Sets/src/mage/cards/h/HonedKhopesh.java @@ -25,7 +25,7 @@ public final class HonedKhopesh extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/cards/h/HonorOfThePure.java b/Mage.Sets/src/mage/cards/h/HonorOfThePure.java index 76300ae0abe..24cdb090c2a 100644 --- a/Mage.Sets/src/mage/cards/h/HonorOfThePure.java +++ b/Mage.Sets/src/mage/cards/h/HonorOfThePure.java @@ -29,7 +29,7 @@ public final class HonorOfThePure extends CardImpl { public HonorOfThePure(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private HonorOfThePure(final HonorOfThePure card) { diff --git a/Mage.Sets/src/mage/cards/h/HonoredHierarch.java b/Mage.Sets/src/mage/cards/h/HonoredHierarch.java index b142799529d..ee5d1b50931 100644 --- a/Mage.Sets/src/mage/cards/h/HonoredHierarch.java +++ b/Mage.Sets/src/mage/cards/h/HonoredHierarch.java @@ -40,7 +40,7 @@ public final class HonoredHierarch extends CardImpl { new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield), RenownedSourceCondition.instance, "As long as {this} is renowned, it has vigilance"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield), RenownedSourceCondition.instance, diff --git a/Mage.Sets/src/mage/cards/h/HoodedHydra.java b/Mage.Sets/src/mage/cards/h/HoodedHydra.java index c63e5a67216..582bebde458 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedHydra.java +++ b/Mage.Sets/src/mage/cards/h/HoodedHydra.java @@ -49,7 +49,7 @@ public final class HoodedHydra extends CardImpl { // As Hooded Hydra is turned face up, put five +1/+1 counters on it. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)); effect.setText("put five +1/+1 counters on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AsTurnedFaceUpEffect(effect, false)); + Ability ability = new SimpleStaticAbility(new AsTurnedFaceUpEffect(effect, false)); ability.setWorksFaceDown(true); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java b/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java index 9bb3891b204..a1bb601b38c 100644 --- a/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java +++ b/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java @@ -36,10 +36,10 @@ public final class HopeAgainstHope extends CardImpl { // Enchanted creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE, 1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield))); // As long as enchanted creature is a Human, it has first strike. - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + SimpleStaticAbility ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureSubtypeCondition(SubType.HUMAN), "As long as enchanted creature is a Human, it has first strike")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HopefulEidolon.java b/Mage.Sets/src/mage/cards/h/HopefulEidolon.java index e7c6a3b8148..cf366fc5f86 100644 --- a/Mage.Sets/src/mage/cards/h/HopefulEidolon.java +++ b/Mage.Sets/src/mage/cards/h/HopefulEidolon.java @@ -35,7 +35,7 @@ public final class HopefulEidolon extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); // Echanted creature gets +1/+1 and has lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, "and has lifelink")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HornedHelm.java b/Mage.Sets/src/mage/cards/h/HornedHelm.java index 16daf8b93fd..c757acb4a00 100644 --- a/Mage.Sets/src/mage/cards/h/HornedHelm.java +++ b/Mage.Sets/src/mage/cards/h/HornedHelm.java @@ -35,7 +35,7 @@ public final class HornedHelm extends CardImpl { // Equipped creature gets +1/+1 and has trample. Effect effect = new BoostEquippedEffect(1, 1); effect.setText("Equipped creature gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HornedSliver.java b/Mage.Sets/src/mage/cards/h/HornedSliver.java index fb2a4d54460..567b7a6bde4 100644 --- a/Mage.Sets/src/mage/cards/h/HornedSliver.java +++ b/Mage.Sets/src/mage/cards/h/HornedSliver.java @@ -31,7 +31,7 @@ public final class HornedSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private HornedSliver(final HornedSliver card) { diff --git a/Mage.Sets/src/mage/cards/h/HostileRealm.java b/Mage.Sets/src/mage/cards/h/HostileRealm.java index 973a0c8ead1..bd5b062d1a6 100644 --- a/Mage.Sets/src/mage/cards/h/HostileRealm.java +++ b/Mage.Sets/src/mage/cards/h/HostileRealm.java @@ -45,7 +45,7 @@ public final class HostileRealm extends CardImpl { gainedAbility.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Target creature can't block this turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private HostileRealm(final HostileRealm card) { diff --git a/Mage.Sets/src/mage/cards/h/Hostility.java b/Mage.Sets/src/mage/cards/h/Hostility.java index 16aaee19e07..09eddb24bb5 100644 --- a/Mage.Sets/src/mage/cards/h/Hostility.java +++ b/Mage.Sets/src/mage/cards/h/Hostility.java @@ -40,7 +40,7 @@ public final class Hostility extends CardImpl { // If a spell you control would deal damage to an opponent, prevent that damage. // Create a 3/1 red Elemental Shaman creature token with haste for each 1 damage prevented this way. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HostilityEffect())); + this.addAbility(new SimpleStaticAbility(new HostilityEffect())); // When Hostility is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/h/HotPursuitStarWars.java b/Mage.Sets/src/mage/cards/h/HotPursuitStarWars.java index 630b02ff30e..2fae0bf26d8 100644 --- a/Mage.Sets/src/mage/cards/h/HotPursuitStarWars.java +++ b/Mage.Sets/src/mage/cards/h/HotPursuitStarWars.java @@ -32,7 +32,7 @@ public final class HotPursuitStarWars extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{R}{G}"); // Each creature your opponent's control with a bounty counter on it gets -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-1, -1, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new BoostOpponentsEffect(-1, -1, Duration.WhileOnBattlefield, filter))); // Bounty — Whenever a creature an opponent controls with a bounty counter on it dies, you may put a bounty counter on target creature an opponent controls. Ability ability = new BountyAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), true); diff --git a/Mage.Sets/src/mage/cards/h/HotSoup.java b/Mage.Sets/src/mage/cards/h/HotSoup.java index 3f1bc1d2141..0c8d50bab85 100644 --- a/Mage.Sets/src/mage/cards/h/HotSoup.java +++ b/Mage.Sets/src/mage/cards/h/HotSoup.java @@ -31,7 +31,7 @@ public final class HotSoup extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAttachedEffect(AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedAttachedEffect(AttachmentType.EQUIPMENT))); // Whenever equipped creature is dealt damage, destroy it. this.addAbility(new HotSoupTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/h/HotSprings.java b/Mage.Sets/src/mage/cards/h/HotSprings.java index 20173df89ef..0742f0595a6 100644 --- a/Mage.Sets/src/mage/cards/h/HotSprings.java +++ b/Mage.Sets/src/mage/cards/h/HotSprings.java @@ -44,7 +44,7 @@ public final class HotSprings extends CardImpl { ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private HotSprings(final HotSprings card) { diff --git a/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java b/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java index fe24f795529..ff306d916ab 100644 --- a/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java +++ b/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java @@ -31,7 +31,7 @@ public final class HoundOfTheFarbogs extends CardImpl { this.toughness = new MageInt(3); // Delirium — Hound of the Farborgs has menace as long as there are four or more card types among cards in your graveyard. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new MenaceAbility(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "{this} has menace as long as there are four or more card types among cards in your graveyard. " + diff --git a/Mage.Sets/src/mage/cards/h/Howlgeist.java b/Mage.Sets/src/mage/cards/h/Howlgeist.java index 72f9e3e1c8d..6a18cf9913b 100644 --- a/Mage.Sets/src/mage/cards/h/Howlgeist.java +++ b/Mage.Sets/src/mage/cards/h/Howlgeist.java @@ -27,7 +27,7 @@ public final class Howlgeist extends CardImpl { this.toughness = new MageInt(2); // Creatures with power less than Howlgeist's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); this.addAbility(new UndyingAbility()); } diff --git a/Mage.Sets/src/mage/cards/h/HowlingChorus.java b/Mage.Sets/src/mage/cards/h/HowlingChorus.java index 48df57c987f..5d0a033e27b 100644 --- a/Mage.Sets/src/mage/cards/h/HowlingChorus.java +++ b/Mage.Sets/src/mage/cards/h/HowlingChorus.java @@ -31,7 +31,7 @@ public final class HowlingChorus extends CardImpl { this.nightCard = true; // Creatures with power less than Howling Chorus's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); // Whenever Howling Chorus deals combat damage to a player, create a 3/2 colorless Eldrazi Horror creature token. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); diff --git a/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java b/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java index e984e13695c..6c19055a3ad 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java @@ -40,7 +40,7 @@ public final class HowlpackResurgence extends CardImpl { // Each creature you control that's a Wolf or a Werewolf gets +1/+1 and has trample. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter); effect.setText("Each creature you control that's a Wolf or a Werewolf gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java index b5c1038e2fc..327daa7e569 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java @@ -34,7 +34,7 @@ public final class HowlpackWolf extends CardImpl { this.toughness = new MageInt(3); // Howlpack Wolf can't block unless you control another Wolf or Werewolf. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockUnlessYouControlSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockUnlessYouControlSourceEffect(filter))); } private HowlpackWolf(final HowlpackWolf card) { diff --git a/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java b/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java index f53fb43111d..0402e6e9892 100644 --- a/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java +++ b/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java @@ -27,7 +27,7 @@ public final class HuangZhongShuGeneral extends CardImpl { this.toughness = new MageInt(3); // Huang Zhong, Shu General can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private HuangZhongShuGeneral(final HuangZhongShuGeneral card) { diff --git a/Mage.Sets/src/mage/cards/h/HundredHandedOne.java b/Mage.Sets/src/mage/cards/h/HundredHandedOne.java index 4aadd2243e9..2ce2d04b673 100644 --- a/Mage.Sets/src/mage/cards/h/HundredHandedOne.java +++ b/Mage.Sets/src/mage/cards/h/HundredHandedOne.java @@ -47,7 +47,7 @@ public final class HundredHandedOne extends CardImpl { new CanBlockAdditionalCreatureEffect(99), MonstrousCondition.instance, "and can block an additional ninety-nine creatures each combat"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(effect2); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HungryLynx.java b/Mage.Sets/src/mage/cards/h/HungryLynx.java index 7bf025439e0..19ea32be0f7 100644 --- a/Mage.Sets/src/mage/cards/h/HungryLynx.java +++ b/Mage.Sets/src/mage/cards/h/HungryLynx.java @@ -46,7 +46,7 @@ public final class HungryLynx extends CardImpl { // Cats you control have protection from Rats. Effect effect = new GainAbilityAllEffect(new ProtectionAbility(filterProRat), Duration.WhileOnBattlefield, filterCat); effect.setText("Cats you control have protection from Rats. (They can't be blocked, targeted, or dealt damage by Rats.)"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // At the beginning of your end step, target opponent creates a 1/1 black Rat creature token with deathtouch. Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new CreateTokenTargetEffect(new DeathtouchRatToken()), false, null); diff --git a/Mage.Sets/src/mage/cards/h/HypersonicDragon.java b/Mage.Sets/src/mage/cards/h/HypersonicDragon.java index 3ca2f6af44d..3d515451ed3 100644 --- a/Mage.Sets/src/mage/cards/h/HypersonicDragon.java +++ b/Mage.Sets/src/mage/cards/h/HypersonicDragon.java @@ -38,7 +38,7 @@ public final class HypersonicDragon extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // You may cast sorcery spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } private HypersonicDragon(final HypersonicDragon card) { diff --git a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java index 5b95dc323d6..2e20e7a8f2d 100644 --- a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java @@ -41,7 +41,7 @@ public final class HypervoltGrasp extends CardImpl { // Enchanted creature has "Tap: This creature deals 1 damage to any target." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); // {1}{U}: Return Hypervolt Grasp to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); diff --git a/Mage.Sets/src/mage/cards/h/HypnoticSiren.java b/Mage.Sets/src/mage/cards/h/HypnoticSiren.java index 9e70abb72bf..173c9ff6961 100644 --- a/Mage.Sets/src/mage/cards/h/HypnoticSiren.java +++ b/Mage.Sets/src/mage/cards/h/HypnoticSiren.java @@ -37,11 +37,11 @@ public final class HypnoticSiren extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Enchanted creature gets +1/+1 and has flying. Effect effect = new BoostEnchantedEffect(1,1,Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); -- 2.47.2 From e26fa56d69b388caffcab00948b3cffd5aaf21f6 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:13:17 -0500 Subject: [PATCH 16/50] refactor: SimpleStaticAbility default zone (cards I J K) --- Mage.Sets/src/mage/cards/i/IceCage.java | 2 +- Mage.Sets/src/mage/cards/i/IceOver.java | 2 +- Mage.Sets/src/mage/cards/i/IchorplateGolem.java | 2 +- Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java | 2 +- Mage.Sets/src/mage/cards/i/IlluminatedWings.java | 2 +- Mage.Sets/src/mage/cards/i/IllusionaryArmor.java | 2 +- Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java | 2 +- Mage.Sets/src/mage/cards/i/IllusoryGains.java | 2 +- Mage.Sets/src/mage/cards/i/IllusoryWrappings.java | 2 +- Mage.Sets/src/mage/cards/i/ImiStatue.java | 2 +- Mage.Sets/src/mage/cards/i/ImmobilizingInk.java | 6 +++--- Mage.Sets/src/mage/cards/i/Immolation.java | 2 +- Mage.Sets/src/mage/cards/i/ImpendingDoom.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialMask.java | 2 +- Mage.Sets/src/mage/cards/i/ImperiousPerfect.java | 2 +- Mage.Sets/src/mage/cards/i/ImprovisedArmor.java | 2 +- Mage.Sets/src/mage/cards/i/InBolassClutches.java | 2 +- Mage.Sets/src/mage/cards/i/IndenturedOaf.java | 2 +- Mage.Sets/src/mage/cards/i/IndomitableArchangel.java | 2 +- Mage.Sets/src/mage/cards/i/IndomitableWill.java | 2 +- Mage.Sets/src/mage/cards/i/IndrikUmbra.java | 2 +- Mage.Sets/src/mage/cards/i/InertiaBubble.java | 2 +- Mage.Sets/src/mage/cards/i/InescapableBrute.java | 2 +- Mage.Sets/src/mage/cards/i/InfectiousCurse.java | 2 +- Mage.Sets/src/mage/cards/i/InfectiousRage.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalScarring.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalSovereign.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoFist.java | 2 +- Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java | 2 +- Mage.Sets/src/mage/cards/i/InfiniteReflection.java | 2 +- Mage.Sets/src/mage/cards/i/InnerDemon.java | 2 +- Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java | 2 +- Mage.Sets/src/mage/cards/i/InquisitorsFlail.java | 2 +- Mage.Sets/src/mage/cards/i/InquisitorsOx.java | 2 +- Mage.Sets/src/mage/cards/i/InsidiousMist.java | 2 +- Mage.Sets/src/mage/cards/i/InspiringStatuary.java | 2 +- Mage.Sets/src/mage/cards/i/InstillEnergy.java | 2 +- Mage.Sets/src/mage/cards/i/InstillFuror.java | 2 +- Mage.Sets/src/mage/cards/i/Intimidation.java | 2 +- Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java | 2 +- Mage.Sets/src/mage/cards/i/InvasionPlans.java | 4 ++-- Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java | 2 +- Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java | 2 +- Mage.Sets/src/mage/cards/i/IonasBlessing.java | 2 +- Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java | 2 +- Mage.Sets/src/mage/cards/i/IronclawCurse.java | 4 ++-- Mage.Sets/src/mage/cards/i/IronclawOrcs.java | 2 +- Mage.Sets/src/mage/cards/i/IronfistCrusher.java | 2 +- Mage.Sets/src/mage/cards/i/IronhoofOx.java | 2 +- Mage.Sets/src/mage/cards/i/IslandFishJasconius.java | 4 ++-- Mage.Sets/src/mage/cards/i/IslandSanctuary.java | 2 +- Mage.Sets/src/mage/cards/i/IvoryGuardians.java | 2 +- Mage.Sets/src/mage/cards/i/IvoryMask.java | 2 +- Mage.Sets/src/mage/cards/i/IxalansBinding.java | 2 +- Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java | 2 +- Mage.Sets/src/mage/cards/j/JacesSanctum.java | 2 +- Mage.Sets/src/mage/cards/j/JacesSentinel.java | 2 +- Mage.Sets/src/mage/cards/j/Jackhammer.java | 2 +- Mage.Sets/src/mage/cards/j/JacquesLeVert.java | 2 +- Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java | 2 +- Mage.Sets/src/mage/cards/j/JediTraining.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaiRunemark.java | 2 +- Mage.Sets/src/mage/cards/j/JetMedallion.java | 2 +- Mage.Sets/src/mage/cards/j/Jihad.java | 4 ++-- Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java | 2 +- Mage.Sets/src/mage/cards/j/JoinerAdept.java | 2 +- Mage.Sets/src/mage/cards/j/Jokulmorder.java | 2 +- Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java | 2 +- Mage.Sets/src/mage/cards/j/JoragaWarcaller.java | 4 ++-- Mage.Sets/src/mage/cards/j/JoustingLance.java | 4 ++-- Mage.Sets/src/mage/cards/j/JundHackblade.java | 2 +- Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java | 2 +- Mage.Sets/src/mage/cards/k/KabiraVindicator.java | 4 ++-- Mage.Sets/src/mage/cards/k/KagemarosClutch.java | 2 +- Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java | 2 +- Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java | 2 +- Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java | 2 +- Mage.Sets/src/mage/cards/k/KarametrasFavor.java | 2 +- Mage.Sets/src/mage/cards/k/KarlovWatchdog.java | 2 +- Mage.Sets/src/mage/cards/k/KarplusanStrider.java | 2 +- Mage.Sets/src/mage/cards/k/KashiTribeElite.java | 4 ++-- Mage.Sets/src/mage/cards/k/KatabaticWinds.java | 2 +- Mage.Sets/src/mage/cards/k/KatakiWarsWage.java | 2 +- Mage.Sets/src/mage/cards/k/KavuMonarch.java | 2 +- Mage.Sets/src/mage/cards/k/KavuScout.java | 2 +- Mage.Sets/src/mage/cards/k/Kaysa.java | 2 +- Mage.Sets/src/mage/cards/k/KefnetTheMindful.java | 2 +- Mage.Sets/src/mage/cards/k/KefnetsMonument.java | 2 +- Mage.Sets/src/mage/cards/k/KembasBanner.java | 2 +- Mage.Sets/src/mage/cards/k/KembasLegion.java | 2 +- Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java | 4 ++-- Mage.Sets/src/mage/cards/k/KhenraCharioteer.java | 2 +- Mage.Sets/src/mage/cards/k/KheruMindEater.java | 2 +- Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java | 2 +- Mage.Sets/src/mage/cards/k/KindredBoon.java | 2 +- Mage.Sets/src/mage/cards/k/KinjallisCaller.java | 2 +- Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java | 2 +- Mage.Sets/src/mage/cards/k/KiteShield.java | 2 +- Mage.Sets/src/mage/cards/k/KitesailCorsair.java | 4 ++-- Mage.Sets/src/mage/cards/k/KithkinArmor.java | 2 +- Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java | 2 +- Mage.Sets/src/mage/cards/k/KjeldoranPride.java | 2 +- Mage.Sets/src/mage/cards/k/KnightOfGrace.java | 2 +- Mage.Sets/src/mage/cards/k/KnightOfMalice.java | 2 +- Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java | 2 +- Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java | 2 +- Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java | 2 +- Mage.Sets/src/mage/cards/k/Knighthood.java | 2 +- Mage.Sets/src/mage/cards/k/KnightlyValor.java | 2 +- Mage.Sets/src/mage/cards/k/KnightsPledge.java | 2 +- Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java | 2 +- Mage.Sets/src/mage/cards/k/KoboldOverlord.java | 2 +- Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java | 2 +- Mage.Sets/src/mage/cards/k/KondasBanner.java | 4 ++-- Mage.Sets/src/mage/cards/k/KondasHatamoto.java | 4 ++-- Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java | 2 +- Mage.Sets/src/mage/cards/k/KorDuelist.java | 2 +- Mage.Sets/src/mage/cards/k/KorScythemaster.java | 2 +- Mage.Sets/src/mage/cards/k/KorSpiritdancer.java | 2 +- Mage.Sets/src/mage/cards/k/KormusBell.java | 2 +- Mage.Sets/src/mage/cards/k/KragmaWarcaller.java | 2 +- Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java | 2 +- Mage.Sets/src/mage/cards/k/KrasisIncubation.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanDrover.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanVorine.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanWarchief.java | 2 +- Mage.Sets/src/mage/cards/k/KrovikanFetish.java | 2 +- Mage.Sets/src/mage/cards/k/KrovikanWhispers.java | 2 +- Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java | 2 +- Mage.Sets/src/mage/cards/k/KukemssaSerpent.java | 2 +- Mage.Sets/src/mage/cards/k/KulrathKnight.java | 2 +- Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java | 2 +- Mage.Sets/src/mage/cards/k/KumanosBlessing.java | 2 +- Mage.Sets/src/mage/cards/k/KumanosPupils.java | 2 +- Mage.Sets/src/mage/cards/k/KusariGama.java | 2 +- Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java | 2 +- 137 files changed, 151 insertions(+), 151 deletions(-) diff --git a/Mage.Sets/src/mage/cards/i/IceCage.java b/Mage.Sets/src/mage/cards/i/IceCage.java index 11a3d50b4d8..316d800eb84 100644 --- a/Mage.Sets/src/mage/cards/i/IceCage.java +++ b/Mage.Sets/src/mage/cards/i/IceCage.java @@ -33,7 +33,7 @@ public final class IceCage extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // When enchanted creature becomes the target of a spell or ability, destroy Ice Cage. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new DestroySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/i/IceOver.java b/Mage.Sets/src/mage/cards/i/IceOver.java index 5919fc5cc33..fbf3f3727e1 100644 --- a/Mage.Sets/src/mage/cards/i/IceOver.java +++ b/Mage.Sets/src/mage/cards/i/IceOver.java @@ -35,7 +35,7 @@ public final class IceOver extends CardImpl { this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); } diff --git a/Mage.Sets/src/mage/cards/i/IchorplateGolem.java b/Mage.Sets/src/mage/cards/i/IchorplateGolem.java index b696cc004d2..6d5ab494bc9 100644 --- a/Mage.Sets/src/mage/cards/i/IchorplateGolem.java +++ b/Mage.Sets/src/mage/cards/i/IchorplateGolem.java @@ -43,7 +43,7 @@ public final class IchorplateGolem extends CardImpl { this.addAbility(new IchorplateGolemTriggeredAbility()); // Creatures you control with oil counters on them get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false) + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false) .setText("Creatures you control with oil counters on them get +1/+1"))); } diff --git a/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java b/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java index 5d798e221b5..b0aa5469f37 100644 --- a/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java +++ b/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java @@ -28,7 +28,7 @@ public final class IllnessInTheRanks extends CardImpl { // Creature tokens get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1,-1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1,-1, Duration.WhileOnBattlefield, filter, false))); } private IllnessInTheRanks(final IllnessInTheRanks card) { diff --git a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java index b1f3aa18e53..cfa6cfb05f9 100644 --- a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java +++ b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java @@ -39,7 +39,7 @@ public final class IlluminatedWings extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {2}, Sacrifice Illuminated Wings: Draw a card. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java b/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java index d749d5f2f88..59126643e78 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java @@ -35,7 +35,7 @@ public final class IllusionaryArmor extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +4/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield))); // When enchanted creature becomes the target of a spell or ability, sacrifice Illusionary Armor. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new SacrificeSourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java b/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java index bb68fb822e9..e23652c01bf 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java @@ -43,7 +43,7 @@ public final class IllusionaryTerrain extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseTwoBasicLandTypesEffect(Outcome.Neutral))); // Basic lands of the first chosen type are the second chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IllusionaryTerrainEffect())); + this.addAbility(new SimpleStaticAbility(new IllusionaryTerrainEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/IllusoryGains.java b/Mage.Sets/src/mage/cards/i/IllusoryGains.java index 31f2cb32a60..212f5bee16b 100644 --- a/Mage.Sets/src/mage/cards/i/IllusoryGains.java +++ b/Mage.Sets/src/mage/cards/i/IllusoryGains.java @@ -37,7 +37,7 @@ public final class IllusoryGains extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Whenever a creature enters the battlefield under an opponent's control, attach Illusory Gains to that creature. this.addAbility(new EntersBattlefieldOpponentTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java b/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java index 957969541b2..e39e7e9b80a 100644 --- a/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java +++ b/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java @@ -35,7 +35,7 @@ public final class IllusoryWrappings extends CardImpl { this.addAbility(ability); // Enchanted creature has base power and toughness 0/2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/ImiStatue.java b/Mage.Sets/src/mage/cards/i/ImiStatue.java index 17404222269..012349a7568 100644 --- a/Mage.Sets/src/mage/cards/i/ImiStatue.java +++ b/Mage.Sets/src/mage/cards/i/ImiStatue.java @@ -25,7 +25,7 @@ public final class ImiStatue extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Players can't untap more than one artifact during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ImiStatueEffect())); + this.addAbility(new SimpleStaticAbility(new ImiStatueEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java index 29a3fb6ee55..8ba5dc40e6f 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java @@ -43,15 +43,15 @@ public final class ImmobilizingInk extends CardImpl { this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new GainAbilityAttachedEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect()), + this.addAbility(new SimpleStaticAbility( + new GainAbilityAttachedEffect(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect()), AttachmentType.AURA, Duration.WhileOnBattlefield,"Enchanted creature doesn't untap during its controller's untap step."))); // Enchanted creature has "{1}, Discard a card: Untap this creature." Ability untapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); untapAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(untapAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{1}, Discard a card: Untap this creature.\""))); diff --git a/Mage.Sets/src/mage/cards/i/Immolation.java b/Mage.Sets/src/mage/cards/i/Immolation.java index f78a7160f11..c3dbafaa780 100644 --- a/Mage.Sets/src/mage/cards/i/Immolation.java +++ b/Mage.Sets/src/mage/cards/i/Immolation.java @@ -34,7 +34,7 @@ public final class Immolation extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -2))); } private Immolation(final Immolation card) { diff --git a/Mage.Sets/src/mage/cards/i/ImpendingDoom.java b/Mage.Sets/src/mage/cards/i/ImpendingDoom.java index 42bb1a93a92..78a5687e66d 100644 --- a/Mage.Sets/src/mage/cards/i/ImpendingDoom.java +++ b/Mage.Sets/src/mage/cards/i/ImpendingDoom.java @@ -42,7 +42,7 @@ public final class ImpendingDoom extends CardImpl { // Enchanted creature gets +3/+3 and attacks each combat if able. Effect effect = new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +3/+3"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/ImperialMask.java b/Mage.Sets/src/mage/cards/i/ImperialMask.java index 2ee57b0feb0..fca7bfa7cce 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialMask.java +++ b/Mage.Sets/src/mage/cards/i/ImperialMask.java @@ -40,7 +40,7 @@ public final class ImperialMask extends CardImpl { )); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance()))); } private ImperialMask(final ImperialMask card) { diff --git a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java index 5fd55ee922c..23038a6f48a 100644 --- a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java @@ -34,7 +34,7 @@ public final class ImperiousPerfect extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfWarriorToken(), 1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java index 5da684ea2d2..43942424f22 100644 --- a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java +++ b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java @@ -36,7 +36,7 @@ public final class ImprovisedArmor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+5. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 5, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 5, Duration.WhileOnBattlefield))); // Cycling {3} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}"))); } diff --git a/Mage.Sets/src/mage/cards/i/InBolassClutches.java b/Mage.Sets/src/mage/cards/i/InBolassClutches.java index 8385e4634b8..38fb6b8ceb4 100644 --- a/Mage.Sets/src/mage/cards/i/InBolassClutches.java +++ b/Mage.Sets/src/mage/cards/i/InBolassClutches.java @@ -39,7 +39,7 @@ public final class InBolassClutches extends CardImpl { this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); // Enchanted permanent is legendary. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/i/IndenturedOaf.java b/Mage.Sets/src/mage/cards/i/IndenturedOaf.java index 285a4bc6fa9..fec1b34d518 100644 --- a/Mage.Sets/src/mage/cards/i/IndenturedOaf.java +++ b/Mage.Sets/src/mage/cards/i/IndenturedOaf.java @@ -31,7 +31,7 @@ public final class IndenturedOaf extends CardImpl { this.toughness = new MageInt(3); // Prevent all damage that Indentured Oaf would deal to red creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IndenturedOafPreventEffectEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new IndenturedOafPreventEffectEffect(Duration.WhileOnBattlefield))); } private IndenturedOaf(final IndenturedOaf card) { diff --git a/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java b/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java index a89daa819a9..e62354188c4 100644 --- a/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java +++ b/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java @@ -41,7 +41,7 @@ public final class IndomitableArchangel extends CardImpl { // Metalcraft — Artifacts you control have shroud as long as you control three or more artifacts. (An artifact with shroud can’t be the target of spells or abilities.) ContinuousEffect gainAbilityEffect = new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(gainAbilityEffect, MetalcraftCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect) + this.addAbility(new SimpleStaticAbility(effect) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance) ); diff --git a/Mage.Sets/src/mage/cards/i/IndomitableWill.java b/Mage.Sets/src/mage/cards/i/IndomitableWill.java index a7a3621fc96..7cdbecea903 100644 --- a/Mage.Sets/src/mage/cards/i/IndomitableWill.java +++ b/Mage.Sets/src/mage/cards/i/IndomitableWill.java @@ -32,7 +32,7 @@ public final class IndomitableWill extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } private IndomitableWill(final IndomitableWill card) { diff --git a/Mage.Sets/src/mage/cards/i/IndrikUmbra.java b/Mage.Sets/src/mage/cards/i/IndrikUmbra.java index 4445c6c8051..0b3fc265ab7 100644 --- a/Mage.Sets/src/mage/cards/i/IndrikUmbra.java +++ b/Mage.Sets/src/mage/cards/i/IndrikUmbra.java @@ -40,7 +40,7 @@ public final class IndrikUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +4/+4 and has first strike, and all creatures able to block it do so. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA) .setText("and has first strike")); ability.addEffect(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA) diff --git a/Mage.Sets/src/mage/cards/i/InertiaBubble.java b/Mage.Sets/src/mage/cards/i/InertiaBubble.java index a1886cff994..e7d17385d71 100644 --- a/Mage.Sets/src/mage/cards/i/InertiaBubble.java +++ b/Mage.Sets/src/mage/cards/i/InertiaBubble.java @@ -31,7 +31,7 @@ public final class InertiaBubble extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted artifact doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("artifact"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("artifact"))); } private InertiaBubble(final InertiaBubble card) { diff --git a/Mage.Sets/src/mage/cards/i/InescapableBrute.java b/Mage.Sets/src/mage/cards/i/InescapableBrute.java index 71ae685cd55..79b7ada3d22 100644 --- a/Mage.Sets/src/mage/cards/i/InescapableBrute.java +++ b/Mage.Sets/src/mage/cards/i/InescapableBrute.java @@ -30,7 +30,7 @@ public final class InescapableBrute extends CardImpl { this.addAbility(WitherAbility.getInstance()); // Inescapable Brute must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java index ba90315de95..8df074292f5 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java @@ -41,7 +41,7 @@ public final class InfectiousCurse extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Spells you cast that target enchanted player cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfectiousCurseCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new InfectiousCurseCostReductionEffect())); // At the beginning of enchanted player's upkeep, that player loses 1 life and you gain 1 life. Ability ability = new BeginningOfUpkeepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/InfectiousRage.java b/Mage.Sets/src/mage/cards/i/InfectiousRage.java index 6bbc0044acc..7d07b642f06 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousRage.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousRage.java @@ -41,7 +41,7 @@ public final class InfectiousRage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -1))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -1))); // When enchanted creature dies, choose a creature at random Infectious Rage can enchant. // Return Infectious Rage to the battlefield attached to that creature. diff --git a/Mage.Sets/src/mage/cards/i/InfernalScarring.java b/Mage.Sets/src/mage/cards/i/InfernalScarring.java index 44c8587ac91..a7724fb0af6 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalScarring.java +++ b/Mage.Sets/src/mage/cards/i/InfernalScarring.java @@ -42,7 +42,7 @@ public final class InfernalScarring extends CardImpl { // Enchanted creature gets +2/+0 and has "When this creature dies, draw a card." Effect effect = new BoostEnchantedEffect(2, 0, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1)), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"When this creature dies, draw a card.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/InfernalSovereign.java b/Mage.Sets/src/mage/cards/i/InfernalSovereign.java index 7289ae079f7..05615210eeb 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalSovereign.java +++ b/Mage.Sets/src/mage/cards/i/InfernalSovereign.java @@ -36,7 +36,7 @@ public final class InfernalSovereign extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you play a land or cast a spell, you draw a card and you lose 1 life. this.addAbility(new InfernalSovereignTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/i/InfernoFist.java b/Mage.Sets/src/mage/cards/i/InfernoFist.java index 99eb03aedcb..35ff9854743 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoFist.java +++ b/Mage.Sets/src/mage/cards/i/InfernoFist.java @@ -40,7 +40,7 @@ public final class InfernoFist extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // {R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); diff --git a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java index 150a281669f..a03c2616bf1 100644 --- a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java +++ b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java @@ -45,7 +45,7 @@ public final class InfiltratorsMagemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1 and can't be blocked except by creatures with defender. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); Effect effect = new InfiltratorsMagemarkCantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InfiniteReflection.java b/Mage.Sets/src/mage/cards/i/InfiniteReflection.java index ce1b22c79c6..8d44f0f8065 100644 --- a/Mage.Sets/src/mage/cards/i/InfiniteReflection.java +++ b/Mage.Sets/src/mage/cards/i/InfiniteReflection.java @@ -50,7 +50,7 @@ public final class InfiniteReflection extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new InfiniteReflectionTriggeredEffect())); // Nontoken creatures you control enter the battlefield as a copy of enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfiniteReflectionEntersBattlefieldEffect())); + this.addAbility(new SimpleStaticAbility(new InfiniteReflectionEntersBattlefieldEffect())); } private InfiniteReflection(final InfiniteReflection card) { diff --git a/Mage.Sets/src/mage/cards/i/InnerDemon.java b/Mage.Sets/src/mage/cards/i/InnerDemon.java index 6c1a98a9ce9..5cfa906d9ca 100644 --- a/Mage.Sets/src/mage/cards/i/InnerDemon.java +++ b/Mage.Sets/src/mage/cards/i/InnerDemon.java @@ -51,7 +51,7 @@ public final class InnerDemon extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2, has flying, and is a Demon in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(", has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java b/Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java index 50798d98ac3..c97f1caa1a5 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java @@ -36,7 +36,7 @@ public final class InquisitorEisenhorn extends CardImpl { // You may reveal the first card you draw each turn as you draw it. Whenever you reveal an instant or // sorcery card this way, create Cherubael, a legendary 4/4 black Demon creature token with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InquisitorEisenhornReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new InquisitorEisenhornReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); // Whenever Inquisitor Eisenhorn deals combat damage to a player, investigate that many times. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java b/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java index 330db31706e..03205bc4cf1 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java @@ -29,7 +29,7 @@ public final class InquisitorsFlail extends CardImpl { // If equipped creature would deal combat damage, it deals double that damage instead. // If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InquisitorsFlailEffect())); + this.addAbility(new SimpleStaticAbility(new InquisitorsFlailEffect())); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/i/InquisitorsOx.java b/Mage.Sets/src/mage/cards/i/InquisitorsOx.java index 91b63256fa9..c568db0a6ec 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorsOx.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorsOx.java @@ -32,7 +32,7 @@ public final class InquisitorsOx extends CardImpl { // Delirium — Inquisitor's Ox gets +1/+0 and has vigilance as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), DeliriumCondition.instance, "and has vigilance as long as there are four or more card types among cards in your graveyard.")); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InsidiousMist.java b/Mage.Sets/src/mage/cards/i/InsidiousMist.java index e4bd1287e9a..fee4e67eaf6 100644 --- a/Mage.Sets/src/mage/cards/i/InsidiousMist.java +++ b/Mage.Sets/src/mage/cards/i/InsidiousMist.java @@ -44,7 +44,7 @@ public final class InsidiousMist extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Insideous Mist can't block and can't be blocked. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new CantBlockSourceEffect(Duration.WhileOnBattlefield)); Effect effect = new CantBeBlockedSourceEffect(); effect.setText("and can't be blocked"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/InspiringStatuary.java b/Mage.Sets/src/mage/cards/i/InspiringStatuary.java index 30a631bb751..907b33130ac 100644 --- a/Mage.Sets/src/mage/cards/i/InspiringStatuary.java +++ b/Mage.Sets/src/mage/cards/i/InspiringStatuary.java @@ -31,7 +31,7 @@ public final class InspiringStatuary extends CardImpl { // Non-artifact spells you cast have improvise. ImproviseAbility improviseAbility = new ImproviseAbility(); improviseAbility.setRuleAtTheTop(false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(improviseAbility, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect(improviseAbility, filter))); } diff --git a/Mage.Sets/src/mage/cards/i/InstillEnergy.java b/Mage.Sets/src/mage/cards/i/InstillEnergy.java index adb8479a176..c64923b68e3 100644 --- a/Mage.Sets/src/mage/cards/i/InstillEnergy.java +++ b/Mage.Sets/src/mage/cards/i/InstillEnergy.java @@ -37,7 +37,7 @@ public final class InstillEnergy extends CardImpl { this.addAbility(ability); // Enchanted creature can attack as though it had haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItHadHasteEnchantedEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanAttackAsThoughItHadHasteEnchantedEffect(Duration.WhileOnBattlefield))); // {0}: Untap enchanted creature. Activate this ability only during your turn and only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/i/InstillFuror.java b/Mage.Sets/src/mage/cards/i/InstillFuror.java index 8919d256f28..631468009da 100644 --- a/Mage.Sets/src/mage/cards/i/InstillFuror.java +++ b/Mage.Sets/src/mage/cards/i/InstillFuror.java @@ -48,7 +48,7 @@ public final class InstillFuror extends CardImpl { "sacrifice this creature unless it attacked this turn")); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"At the beginning of your end step, sacrifice this creature unless it attacked this turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/i/Intimidation.java b/Mage.Sets/src/mage/cards/i/Intimidation.java index a9ba1b749e8..b52d035c6db 100644 --- a/Mage.Sets/src/mage/cards/i/Intimidation.java +++ b/Mage.Sets/src/mage/cards/i/Intimidation.java @@ -22,7 +22,7 @@ public final class Intimidation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}{B}"); // Creatures you control have fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } private Intimidation(final Intimidation card) { diff --git a/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java b/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java index de4cabb6d40..33696029c1c 100644 --- a/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java +++ b/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java @@ -50,7 +50,7 @@ public final class IntrepidPaleontologist extends CardImpl { this.addAbility(exileAbility); // You may cast Dinosaur creature spells from among cards you own exiled with Intrepid Paleontologist. If you cast a spell this way, that creature enters the battlefield with a finality counter on it. - Ability castAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new IntrepidPaleontologistPlayEffect()); + Ability castAbility = new SimpleStaticAbility(new IntrepidPaleontologistPlayEffect()); castAbility.setIdentifier(MageIdentifier.IntrepidPaleontologistWatcher); castAbility.addWatcher(new IntrepidPaleontologistWatcher()); this.addAbility(castAbility); diff --git a/Mage.Sets/src/mage/cards/i/InvasionPlans.java b/Mage.Sets/src/mage/cards/i/InvasionPlans.java index 0c003f6ce68..3fab1b60950 100644 --- a/Mage.Sets/src/mage/cards/i/InvasionPlans.java +++ b/Mage.Sets/src/mage/cards/i/InvasionPlans.java @@ -24,9 +24,9 @@ public final class InvasionPlans extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // All creatures block each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); + this.addAbility(new SimpleStaticAbility(new BlocksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); // The attacking player chooses how each creature blocks each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InvasionPlansEffect())); + this.addAbility(new SimpleStaticAbility(new InvasionPlansEffect())); } private InvasionPlans(final InvasionPlans card) { diff --git a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java index 2ae58fa14bd..d5742a4bff4 100644 --- a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java +++ b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java @@ -43,7 +43,7 @@ public final class InvocationOfSaintTraft extends CardImpl { // Enchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying tapped // and attacking. Exile that token at end of combat." Ability gainedAbility = new AttacksTriggeredAbility(new InvocationOfSaintTraftEffect(), false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } private InvocationOfSaintTraft(final InvocationOfSaintTraft card) { diff --git a/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java index 72f2f333dd2..1d1c33005e3 100644 --- a/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java +++ b/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java @@ -39,7 +39,7 @@ public final class IonaShieldOfEmeria extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Your opponents can't cast spells of the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IonaShieldOfEmeriaReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new IonaShieldOfEmeriaReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/IonasBlessing.java b/Mage.Sets/src/mage/cards/i/IonasBlessing.java index 1008ea0aa41..a47321b36f6 100644 --- a/Mage.Sets/src/mage/cards/i/IonasBlessing.java +++ b/Mage.Sets/src/mage/cards/i/IonasBlessing.java @@ -44,7 +44,7 @@ public final class IonasBlessing extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2, has vigilance, and can block an additional creature. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText(", has vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java index ea7c5b26f76..38bf68dd02d 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java +++ b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java @@ -39,7 +39,7 @@ public final class IronclawBuzzardiers extends CardImpl { this.toughness = new MageInt(2); // Ironclaw Buzzardiers can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // {R}: Ironclaw Buzzardiers gains flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/i/IronclawCurse.java b/Mage.Sets/src/mage/cards/i/IronclawCurse.java index 3eb4618d7f1..ddfc59ee57c 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawCurse.java +++ b/Mage.Sets/src/mage/cards/i/IronclawCurse.java @@ -33,10 +33,10 @@ public final class IronclawCurse extends CardImpl { this.addAbility(ability); // Enchanted creature gets 0/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, -1, Duration.WhileOnBattlefield))); // Enchanted creature can't block creatures with power equal to or greater than the enchanted creature's toughness. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IronclawCurseEffect())); + this.addAbility(new SimpleStaticAbility(new IronclawCurseEffect())); } private IronclawCurse(final IronclawCurse card) { diff --git a/Mage.Sets/src/mage/cards/i/IronclawOrcs.java b/Mage.Sets/src/mage/cards/i/IronclawOrcs.java index ed9d3523c18..71800e9386f 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawOrcs.java +++ b/Mage.Sets/src/mage/cards/i/IronclawOrcs.java @@ -33,7 +33,7 @@ public final class IronclawOrcs extends CardImpl { this.toughness = new MageInt(2); // Ironclaw Orcs can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } private IronclawOrcs(final IronclawOrcs card) { diff --git a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java index 38481b81afb..b74e217f13f 100644 --- a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java +++ b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java @@ -27,7 +27,7 @@ public final class IronfistCrusher extends CardImpl { this.toughness = new MageInt(4); // Ironfist Crusher can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); // Morph {3}{W} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); diff --git a/Mage.Sets/src/mage/cards/i/IronhoofOx.java b/Mage.Sets/src/mage/cards/i/IronhoofOx.java index 26aa7e961ce..aed15525fce 100644 --- a/Mage.Sets/src/mage/cards/i/IronhoofOx.java +++ b/Mage.Sets/src/mage/cards/i/IronhoofOx.java @@ -24,7 +24,7 @@ public final class IronhoofOx extends CardImpl { this.toughness = new MageInt(4); // Ironhoof Ox can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private IronhoofOx(final IronhoofOx card) { diff --git a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java index 29626fbc283..bd0914f927b 100644 --- a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java +++ b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java @@ -30,7 +30,7 @@ public final class IslandFishJasconius extends CardImpl { this.toughness = new MageInt(8); // Island Fish Jasconius doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap Island Fish Jasconius. this.addAbility(new BeginningOfUpkeepTriggeredAbility( @@ -38,7 +38,7 @@ public final class IslandFishJasconius extends CardImpl { )); // Island Fish Jasconius can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // When you control no Islands, sacrifice Island Fish Jasconius. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java index 77db45fdaa5..0cc35ad0316 100644 --- a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java +++ b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java @@ -32,7 +32,7 @@ public final class IslandSanctuary extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // If you would draw a card during your draw step, instead you may skip that draw. If you do, until your next turn, you can't be attacked except by creatures with flying and/or islandwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IslandSanctuaryEffect())); + this.addAbility(new SimpleStaticAbility(new IslandSanctuaryEffect())); } private IslandSanctuary(final IslandSanctuary card) { diff --git a/Mage.Sets/src/mage/cards/i/IvoryGuardians.java b/Mage.Sets/src/mage/cards/i/IvoryGuardians.java index 8a45da86bd1..da1ff8b6163 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryGuardians.java +++ b/Mage.Sets/src/mage/cards/i/IvoryGuardians.java @@ -46,7 +46,7 @@ public final class IvoryGuardians extends CardImpl { // Protection from red this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, false), new OpponentControlsPermanentCondition(controlFilter), "Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent"))); diff --git a/Mage.Sets/src/mage/cards/i/IvoryMask.java b/Mage.Sets/src/mage/cards/i/IvoryMask.java index 2dc46fff944..1d8d3eb5d0c 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryMask.java +++ b/Mage.Sets/src/mage/cards/i/IvoryMask.java @@ -21,7 +21,7 @@ public final class IvoryMask extends CardImpl { // You have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(ShroudAbility.getInstance()))); } private IvoryMask(final IvoryMask card) { diff --git a/Mage.Sets/src/mage/cards/i/IxalansBinding.java b/Mage.Sets/src/mage/cards/i/IxalansBinding.java index 38138bc80e2..76da782b496 100644 --- a/Mage.Sets/src/mage/cards/i/IxalansBinding.java +++ b/Mage.Sets/src/mage/cards/i/IxalansBinding.java @@ -37,7 +37,7 @@ public final class IxalansBinding extends CardImpl { this.addAbility(ability); // Your opponents can't cast spells with the same name as the exiled card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IxalansBindingReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new IxalansBindingReplacementEffect())); } private IxalansBinding(final IxalansBinding card) { diff --git a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java index 2d8299314d3..ff6a51a4633 100644 --- a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java +++ b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java @@ -40,7 +40,7 @@ public final class IxidorRealitySculptor extends CardImpl { this.toughness = new MageInt(4); // Face-down creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {2}{U}: Turn target face-down creature face up. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TurnFaceUpTargetEffect(), new ManaCostsImpl<>("{2}{U}")); diff --git a/Mage.Sets/src/mage/cards/j/JacesSanctum.java b/Mage.Sets/src/mage/cards/j/JacesSanctum.java index e08a4647d82..7da00af8a48 100644 --- a/Mage.Sets/src/mage/cards/j/JacesSanctum.java +++ b/Mage.Sets/src/mage/cards/j/JacesSanctum.java @@ -37,7 +37,7 @@ public final class JacesSanctum extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}"); // Instant and sorcery spells you cast cost {1} less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast an instant or sorcery spell, scry 1. this.addAbility(new SpellCastControllerTriggeredAbility(new ScryEffect(1, false), filter2, false)); diff --git a/Mage.Sets/src/mage/cards/j/JacesSentinel.java b/Mage.Sets/src/mage/cards/j/JacesSentinel.java index 7f18fa59376..920e928a895 100644 --- a/Mage.Sets/src/mage/cards/j/JacesSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JacesSentinel.java @@ -37,7 +37,7 @@ public final class JacesSentinel extends CardImpl { this.toughness = new MageInt(3); // As long as you control a Jace planeswalker, Jace's Sentinel gets +1/+0 and can't be blocked. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a Jace planeswalker, {this} gets +1/+0")); diff --git a/Mage.Sets/src/mage/cards/j/Jackhammer.java b/Mage.Sets/src/mage/cards/j/Jackhammer.java index 13e6b59b089..5359a8d6373 100644 --- a/Mage.Sets/src/mage/cards/j/Jackhammer.java +++ b/Mage.Sets/src/mage/cards/j/Jackhammer.java @@ -29,7 +29,7 @@ public final class Jackhammer extends CardImpl { this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/j/JacquesLeVert.java b/Mage.Sets/src/mage/cards/j/JacquesLeVert.java index 79b603a505f..7c3fb304c77 100644 --- a/Mage.Sets/src/mage/cards/j/JacquesLeVert.java +++ b/Mage.Sets/src/mage/cards/j/JacquesLeVert.java @@ -37,7 +37,7 @@ public final class JacquesLeVert extends CardImpl { this.toughness = new MageInt(2); // Green creatures you control get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0,2, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0,2, Duration.WhileOnBattlefield, filter))); } private JacquesLeVert(final JacquesLeVert card) { diff --git a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java index a20b6b6b9da..bb9254cd211 100644 --- a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java @@ -46,7 +46,7 @@ public final class JaradGolgariLichLord extends CardImpl { // Jarad, Golgari Lich Lord gets +1/+1 for each creature card in your graveyard. DynamicValue amount = new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_CREATURE); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); // {1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power. diff --git a/Mage.Sets/src/mage/cards/j/JediTraining.java b/Mage.Sets/src/mage/cards/j/JediTraining.java index da472aee0b9..debaf748e3f 100644 --- a/Mage.Sets/src/mage/cards/j/JediTraining.java +++ b/Mage.Sets/src/mage/cards/j/JediTraining.java @@ -34,7 +34,7 @@ public final class JediTraining extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); // Meditate abilities you activate costs {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(MeditateAbility.class, "Meditate"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(MeditateAbility.class, "Meditate"))); // Whenever a Jedi creature you control meditates, scry 1. this.addAbility(new JediTrainingTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java b/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java index 043f29fadce..5fac4f4ff9a 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java @@ -36,7 +36,7 @@ public final class JeskaiInfiltrator extends CardImpl { // Jeskai Infiltrator can't be blocked as long as you control no other creatures. Effect effect = new ConditionalRestrictionEffect(new CantBeBlockedSourceEffect(), new CreatureCountCondition(1, TargetController.YOU)); effect.setText("{this} can't be blocked as long as you control no other creatures"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever Jeskai Infiltrator deals combat damage to a player, exile it and the top card of your library in a face-down pile, shuffle that pile, then manifest those cards. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new JeskaiInfiltratorEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java index 18d2266a205..71e0f2475ef 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java @@ -49,7 +49,7 @@ public final class JeskaiRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has flying as long as you control a red or white permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/j/JetMedallion.java b/Mage.Sets/src/mage/cards/j/JetMedallion.java index 76d1a6d8331..9c9aff58a63 100644 --- a/Mage.Sets/src/mage/cards/j/JetMedallion.java +++ b/Mage.Sets/src/mage/cards/j/JetMedallion.java @@ -27,7 +27,7 @@ public final class JetMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Black spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private JetMedallion(final JetMedallion card) { diff --git a/Mage.Sets/src/mage/cards/j/Jihad.java b/Mage.Sets/src/mage/cards/j/Jihad.java index 3acf77a5c4e..8fcd1b3ff13 100644 --- a/Mage.Sets/src/mage/cards/j/Jihad.java +++ b/Mage.Sets/src/mage/cards/j/Jihad.java @@ -47,7 +47,7 @@ public final class Jihad extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseOpponentEffect(Outcome.Detriment))); // White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostAllEffect(2, 1, Duration.WhileOnBattlefield, filter, false), new JihadOpponentCondition(), "White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color."))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostAllEffect(2, 1, Duration.WhileOnBattlefield, filter, false), new JihadOpponentCondition(), "White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color."))); // When the chosen player controls no nontoken permanents of the chosen color, sacrifice Jihad. this.addAbility(new JihadTriggeredAbility(new SacrificeSourceEffect())); @@ -99,4 +99,4 @@ class JihadOpponentCondition implements Condition { filter.add(TokenPredicate.FALSE); return game.getBattlefield().countAll(filter, chosenOpponent, game) > 0; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java b/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java index c9782a1f335..20cb39d8bca 100644 --- a/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java +++ b/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java @@ -29,7 +29,7 @@ public final class JodahArchmageEternal extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // You may pay WUBRG rather than pay the mana cost for spells that you cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WUBRGInsteadEffect())); + this.addAbility(new SimpleStaticAbility(new WUBRGInsteadEffect())); } private JodahArchmageEternal(final JodahArchmageEternal card) { diff --git a/Mage.Sets/src/mage/cards/j/JoinerAdept.java b/Mage.Sets/src/mage/cards/j/JoinerAdept.java index dcfbb2fdf69..2d924822e8e 100644 --- a/Mage.Sets/src/mage/cards/j/JoinerAdept.java +++ b/Mage.Sets/src/mage/cards/j/JoinerAdept.java @@ -27,7 +27,7 @@ public final class JoinerAdept extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false))); } private JoinerAdept(final JoinerAdept card) { diff --git a/Mage.Sets/src/mage/cards/j/Jokulmorder.java b/Mage.Sets/src/mage/cards/j/Jokulmorder.java index e216be516b3..47fe4caa8a6 100644 --- a/Mage.Sets/src/mage/cards/j/Jokulmorder.java +++ b/Mage.Sets/src/mage/cards/j/Jokulmorder.java @@ -50,7 +50,7 @@ public final class Jokulmorder extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); // Jokulmorder doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you play an Island, you may untap Jokulmorder. this.addAbility(new JokulmorderTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java index abede3ec54b..408f5c819b5 100644 --- a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java +++ b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java @@ -36,7 +36,7 @@ public final class JorKadeenThePrevailer extends CardImpl { // Metalcraft — Creatures you control get +3/+0 as long as you control three or more artifacts. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostControlledEffect(3, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false), MetalcraftCondition.instance, effectText); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect) + this.addAbility(new SimpleStaticAbility(effect) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java index 27d71d108c7..e7bc1f28bd7 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java @@ -51,7 +51,7 @@ public final class JoragaWarcaller extends CardImpl { // Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostAllEffect( new CountersSourceCount(CounterType.P1P1), new CountersSourceCount(CounterType.P1P1), Duration.WhileOnBattlefield, filter, true, rule))); } @@ -64,4 +64,4 @@ public final class JoragaWarcaller extends CardImpl { public JoragaWarcaller copy() { return new JoragaWarcaller(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JoustingLance.java b/Mage.Sets/src/mage/cards/j/JoustingLance.java index e264682dd0f..3748d16456a 100644 --- a/Mage.Sets/src/mage/cards/j/JoustingLance.java +++ b/Mage.Sets/src/mage/cards/j/JoustingLance.java @@ -26,10 +26,10 @@ public final class JoustingLance extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // As long as it's your turn, equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, equipped creature has first strike.")) diff --git a/Mage.Sets/src/mage/cards/j/JundHackblade.java b/Mage.Sets/src/mage/cards/j/JundHackblade.java index c52fe1306a7..a12f92fea4b 100644 --- a/Mage.Sets/src/mage/cards/j/JundHackblade.java +++ b/Mage.Sets/src/mage/cards/j/JundHackblade.java @@ -45,7 +45,7 @@ public final class JundHackblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Jund Hackblade gets +1/+1 and has haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java b/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java index a11ea7f36bd..e533745a8bb 100644 --- a/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java +++ b/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java @@ -40,7 +40,7 @@ public final class JuniperOrderAdvocate extends CardImpl { this.toughness = new MageInt(2); // As long as Juniper Order Advocate is untapped, green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false), SourceTappedCondition.UNTAPPED, "As long as {this} is untapped, green creatures you control get +1/+1."))); diff --git a/Mage.Sets/src/mage/cards/k/KabiraVindicator.java b/Mage.Sets/src/mage/cards/k/KabiraVindicator.java index 6cf173ed873..77d96af0961 100644 --- a/Mage.Sets/src/mage/cards/k/KabiraVindicator.java +++ b/Mage.Sets/src/mage/cards/k/KabiraVindicator.java @@ -37,10 +37,10 @@ public final class KabiraVindicator extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{2}{W}"))); Abilities abilities1 = new AbilitiesImpl<>(); - abilities1.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); + abilities1.add(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); + abilities2.add(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); this.addAbilities(LevelerCardBuilder.construct( new LevelerCardBuilder.LevelAbility(2, 4, abilities1, 3, 6), diff --git a/Mage.Sets/src/mage/cards/k/KagemarosClutch.java b/Mage.Sets/src/mage/cards/k/KagemarosClutch.java index ab569040113..e90a6ef1026 100644 --- a/Mage.Sets/src/mage/cards/k/KagemarosClutch.java +++ b/Mage.Sets/src/mage/cards/k/KagemarosClutch.java @@ -43,7 +43,7 @@ public final class KagemarosClutch extends CardImpl { DynamicValue xMinusValue = new SignInversionDynamicValue(CardsInControllerHandCount.instance); Effect effect = new BoostEnchantedEffect(xMinusValue, xMinusValue, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets -X/-X, where X is the number of cards in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java b/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java index 7a9f1d8e5bb..5830ad878e6 100644 --- a/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java +++ b/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java @@ -54,7 +54,7 @@ public final class KaghaShadowArchdruid extends CardImpl { this.addAbility(ability); // Once during each of your turns, you may play a land or cast a permanent spell from among cards in your graveyard that were put there from your library this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KaghaShadowArchdruidEffect()) + this.addAbility(new SimpleStaticAbility(new KaghaShadowArchdruidEffect()) .setIdentifier(MageIdentifier.KaghaShadowArchdruidWatcher), new KaghaShadowArchdruidWatcher()); } diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index f1aeda522b9..f49c6eb3217 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -52,7 +52,7 @@ public final class KalitasTraitorOfGhet extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // If a nontoken creature an opponent controls would die, instead exile that card and create a 2/2 black Zombie creature token. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KalitasTraitorOfGhetEffect())); + this.addAbility(new SimpleStaticAbility(new KalitasTraitorOfGhetEffect())); // {2}{B}, Sacrifice another Vampire or Zombie: Put two +1/+1 counters on Kalitas, Traitor of Ghet. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{2}{B}")); diff --git a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java index 9986f0c8163..f33970abf0a 100644 --- a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java @@ -53,7 +53,7 @@ public final class KangeeAerieKeeper extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, KickedCondition.ONCE, "When {this} enters, if it was kicked, put X feather counters on it.")); // Other Bird creatures get +1/+1 for each feather counter on Kangee, Aerie Keeper. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new CountersSourceCount(CounterType.FEATHER), new CountersSourceCount(CounterType.FEATHER), Duration.WhileOnBattlefield, filter, true, "Other Bird creatures get +1/+1 for each feather counter on {this}."))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(new CountersSourceCount(CounterType.FEATHER), new CountersSourceCount(CounterType.FEATHER), Duration.WhileOnBattlefield, filter, true, "Other Bird creatures get +1/+1 for each feather counter on {this}."))); } private KangeeAerieKeeper(final KangeeAerieKeeper card) { diff --git a/Mage.Sets/src/mage/cards/k/KarametrasFavor.java b/Mage.Sets/src/mage/cards/k/KarametrasFavor.java index eefdd4bf9cc..0ab8fa3219e 100644 --- a/Mage.Sets/src/mage/cards/k/KarametrasFavor.java +++ b/Mage.Sets/src/mage/cards/k/KarametrasFavor.java @@ -46,7 +46,7 @@ public final class KarametrasFavor extends CardImpl { // Enchanted creature has "{T}: Add one mana of any color." Effect effect = new GainAbilityAttachedEffect(new AnyColorManaAbility(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"{T}: Add one mana of any color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java b/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java index 1166eef2bc7..337ac8c9f6d 100644 --- a/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java +++ b/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java @@ -36,7 +36,7 @@ public final class KarlovWatchdog extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Permanents your opponents control can't be turned face up during your turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KarlovWatchdogEffect())); + this.addAbility(new SimpleStaticAbility(new KarlovWatchdogEffect())); // Whenever you attack with three or more creatures, creatures you control get +1/+1 until end of turn. this.addAbility(new AttacksWithCreaturesTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/k/KarplusanStrider.java b/Mage.Sets/src/mage/cards/k/KarplusanStrider.java index b4548e168be..dae5d89b9d0 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanStrider.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanStrider.java @@ -31,7 +31,7 @@ public final class KarplusanStrider extends CardImpl { this.toughness = new MageInt(4); // Karplusan Strider can't be the target of blue or black spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KarplusanStriderEffect())); + this.addAbility(new SimpleStaticAbility(new KarplusanStriderEffect())); } private KarplusanStrider(final KarplusanStrider card) { diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java index 71dd8341af0..458cd360a61 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java @@ -37,7 +37,7 @@ public final class KashiTribeElite extends CardImpl { this.toughness = new MageInt(3); // Legendary Snakes you control have shroud. (They can't be the targets of spells or abilities.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // Whenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; @@ -55,4 +55,4 @@ public final class KashiTribeElite extends CardImpl { public KashiTribeElite copy() { return new KashiTribeElite(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KatabaticWinds.java b/Mage.Sets/src/mage/cards/k/KatabaticWinds.java index fb4ee538cea..c5a912bb0dc 100644 --- a/Mage.Sets/src/mage/cards/k/KatabaticWinds.java +++ b/Mage.Sets/src/mage/cards/k/KatabaticWinds.java @@ -34,7 +34,7 @@ public final class KatabaticWinds extends CardImpl { this.addAbility(PhasingAbility.getInstance()); // Creatures with flying can't attack or block, and their activated abilities with {tap} in their costs can't be activated. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new KatabaticWindsRestrictionEffect()); + Ability ability = new SimpleStaticAbility(new KatabaticWindsRestrictionEffect()); ability.addEffect(new KatabaticWindsRuleModifyingEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java b/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java index f4c61775508..427b847a0b6 100644 --- a/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java +++ b/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java @@ -38,7 +38,7 @@ public final class KatakiWarsWage extends CardImpl { Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1))); Effect effect = new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, false); effect.setText("All artifacts have \"At the beginning of your upkeep, sacrifice this artifact unless you pay {1}.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KatakiWarsWage(final KatakiWarsWage card) { diff --git a/Mage.Sets/src/mage/cards/k/KavuMonarch.java b/Mage.Sets/src/mage/cards/k/KavuMonarch.java index 05a3a361124..b62f8b5a56f 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMonarch.java +++ b/Mage.Sets/src/mage/cards/k/KavuMonarch.java @@ -40,7 +40,7 @@ public final class KavuMonarch extends CardImpl { this.toughness = new MageInt(3); // Kavu creatures have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter1))); // Whenever another Kavu enters the battlefield, put a +1/+1 counter on Kavu Monarch. diff --git a/Mage.Sets/src/mage/cards/k/KavuScout.java b/Mage.Sets/src/mage/cards/k/KavuScout.java index 81778331d5a..b560c686a01 100644 --- a/Mage.Sets/src/mage/cards/k/KavuScout.java +++ b/Mage.Sets/src/mage/cards/k/KavuScout.java @@ -32,7 +32,7 @@ public final class KavuScout extends CardImpl { this.toughness = new MageInt(2); // Domain - Kavu Scout gets +1/+0 for each basic land type among lands you control. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(DomainValue.REGULAR, StaticValue.get(0), Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(DomainValue.REGULAR, StaticValue.get(0), Duration.WhileOnBattlefield)); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/k/Kaysa.java b/Mage.Sets/src/mage/cards/k/Kaysa.java index be5a60c9b53..237f59bbdf0 100644 --- a/Mage.Sets/src/mage/cards/k/Kaysa.java +++ b/Mage.Sets/src/mage/cards/k/Kaysa.java @@ -38,7 +38,7 @@ public final class Kaysa extends CardImpl { this.toughness = new MageInt(3); // Green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter))); } private Kaysa(final Kaysa card) { diff --git a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java index 4b34dbf84aa..69231633b92 100644 --- a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java +++ b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java @@ -41,7 +41,7 @@ public final class KefnetTheMindful extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Kefnet the Mindful can't attack or block unless you have seven or more cards in your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KefnetTheMindfulRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new KefnetTheMindfulRestrictionEffect())); // {3}{U}: Draw a card, then you may return a land you control to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KefnetTheMindfulEffect(), new ManaCostsImpl<>("{3}{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KefnetsMonument.java b/Mage.Sets/src/mage/cards/k/KefnetsMonument.java index 65b34413824..1350482e94f 100644 --- a/Mage.Sets/src/mage/cards/k/KefnetsMonument.java +++ b/Mage.Sets/src/mage/cards/k/KefnetsMonument.java @@ -40,7 +40,7 @@ public final class KefnetsMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Blue creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast a creature spell, target creature an opponent controls doesn't untap during its controller's next untap step. Ability ability = new SpellCastControllerTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect(), filter2, false); diff --git a/Mage.Sets/src/mage/cards/k/KembasBanner.java b/Mage.Sets/src/mage/cards/k/KembasBanner.java index 90c545a4711..6852d13450a 100644 --- a/Mage.Sets/src/mage/cards/k/KembasBanner.java +++ b/Mage.Sets/src/mage/cards/k/KembasBanner.java @@ -30,7 +30,7 @@ public final class KembasBanner extends CardImpl { // Equipped creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip {2}{W} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{2}{W}"), false)); diff --git a/Mage.Sets/src/mage/cards/k/KembasLegion.java b/Mage.Sets/src/mage/cards/k/KembasLegion.java index acb27275693..f78395340d9 100644 --- a/Mage.Sets/src/mage/cards/k/KembasLegion.java +++ b/Mage.Sets/src/mage/cards/k/KembasLegion.java @@ -31,7 +31,7 @@ public final class KembasLegion extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KembasLegionEffect())); + this.addAbility(new SimpleStaticAbility(new KembasLegionEffect())); } private KembasLegion(final KembasLegion card) { diff --git a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java index 88bed33dcd9..6bdb30e3265 100644 --- a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java +++ b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java @@ -37,7 +37,7 @@ public final class KentaroTheSmilingCat extends CardImpl { this.addAbility(new BushidoAbility(1)); // You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's converted mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KentaroTheSmilingCatCastingEffect())); + this.addAbility(new SimpleStaticAbility(new KentaroTheSmilingCatCastingEffect())); } @@ -115,4 +115,4 @@ class ColorlessManaValue implements DynamicCost { public String getText(Ability ability, Game game) { return "Pay " + getCost(ability, game).getText() + " rather than " + ability.getManaCosts().getText() + " for Samurai card?"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java b/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java index 94b3372d549..b7e34326fd2 100644 --- a/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java +++ b/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java @@ -32,7 +32,7 @@ public final class KhenraCharioteer extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Other creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); } diff --git a/Mage.Sets/src/mage/cards/k/KheruMindEater.java b/Mage.Sets/src/mage/cards/k/KheruMindEater.java index 78e16f7c8ad..08e33f61fda 100644 --- a/Mage.Sets/src/mage/cards/k/KheruMindEater.java +++ b/Mage.Sets/src/mage/cards/k/KheruMindEater.java @@ -47,7 +47,7 @@ public final class KheruMindEater extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new KheruMindEaterExileEffect(), false, true)); // You may look at and play cards exiled with Kheru Mind-Eater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KheruMindEaterEffect())); + this.addAbility(new SimpleStaticAbility(new KheruMindEaterEffect())); this.addAbility(new SimpleStaticAbility(Zone.ALL, new KheruMindEaterLookAtCardEffect())); } diff --git a/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java b/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java index 3cfc6779b77..ceb3a56466f 100644 --- a/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java +++ b/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java @@ -44,7 +44,7 @@ public final class KhorvathBrightflame extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Knights your team controls have flying and haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter)); ability.addEffect(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter).setText("and haste")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KindredBoon.java b/Mage.Sets/src/mage/cards/k/KindredBoon.java index 8fa63f19190..f3e5e783820 100644 --- a/Mage.Sets/src/mage/cards/k/KindredBoon.java +++ b/Mage.Sets/src/mage/cards/k/KindredBoon.java @@ -49,7 +49,7 @@ public final class KindredBoon extends CardImpl { // Each creature you control with a divinity counter on it has indestructible. Effect effect = new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filterDivinity); effect.setText("Each creature you control with a divinity counter on it has indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KindredBoon(final KindredBoon card) { diff --git a/Mage.Sets/src/mage/cards/k/KinjallisCaller.java b/Mage.Sets/src/mage/cards/k/KinjallisCaller.java index 8ae2ed47008..a7ab89cdaee 100644 --- a/Mage.Sets/src/mage/cards/k/KinjallisCaller.java +++ b/Mage.Sets/src/mage/cards/k/KinjallisCaller.java @@ -33,7 +33,7 @@ public final class KinjallisCaller extends CardImpl { this.toughness = new MageInt(3); // Dinosaur spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private KinjallisCaller(final KinjallisCaller card) { diff --git a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java index 3ed23a06209..ed7c80a11a9 100644 --- a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java +++ b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java @@ -33,7 +33,7 @@ public final class KinsbaileCavalier extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private KinsbaileCavalier(final KinsbaileCavalier card) { diff --git a/Mage.Sets/src/mage/cards/k/KiteShield.java b/Mage.Sets/src/mage/cards/k/KiteShield.java index 11f52dadb7e..75b98f55dec 100644 --- a/Mage.Sets/src/mage/cards/k/KiteShield.java +++ b/Mage.Sets/src/mage/cards/k/KiteShield.java @@ -23,7 +23,7 @@ public final class KiteShield extends CardImpl { public KiteShield (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(0, 3))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/k/KitesailCorsair.java b/Mage.Sets/src/mage/cards/k/KitesailCorsair.java index e39d32c426a..39964514566 100644 --- a/Mage.Sets/src/mage/cards/k/KitesailCorsair.java +++ b/Mage.Sets/src/mage/cards/k/KitesailCorsair.java @@ -29,7 +29,7 @@ public final class KitesailCorsair extends CardImpl { // Kitesail Corsair has flying as long as it's attacking. ContinuousEffect gainEffect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( gainEffect, SourceAttackingCondition.instance, "{this} has flying as long as it's attacking." @@ -44,4 +44,4 @@ public final class KitesailCorsair extends CardImpl { public KitesailCorsair copy() { return new KitesailCorsair(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KithkinArmor.java b/Mage.Sets/src/mage/cards/k/KithkinArmor.java index 2351ca64a24..b451c0d1d85 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinArmor.java +++ b/Mage.Sets/src/mage/cards/k/KithkinArmor.java @@ -44,7 +44,7 @@ public final class KithkinArmor extends CardImpl { this.addAbility(ability); // Enchanted creature can't be blocked by creatures with power 3 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KithkinArmorRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new KithkinArmorRestrictionEffect())); // 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( diff --git a/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java b/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java index 700faeb48ef..302728cd3a3 100644 --- a/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java +++ b/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java @@ -47,7 +47,7 @@ public final class KiyomaroFirstToStand extends CardImpl { // As long as you have four or more cards in hand, Kiyomaro has vigilance. Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,3); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield), condition, "As long as you have four or more cards in hand, {this} has vigilance")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranPride.java b/Mage.Sets/src/mage/cards/k/KjeldoranPride.java index 850b4029160..e952292516b 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranPride.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranPride.java @@ -44,7 +44,7 @@ public final class KjeldoranPride extends CardImpl { this.addAbility(enchantAbility); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2))); // 2U: Attach Kjeldoran Pride to target creature other than enchanted creature. Ability ability = new SimpleActivatedAbility(new AttachEffect(Outcome.Benefit, "attach {this} to target " + filter.getMessage()), new ManaCostsImpl<>("{2}{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfGrace.java b/Mage.Sets/src/mage/cards/k/KnightOfGrace.java index 4ea69a91f6c..06a165bf25f 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfGrace.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfGrace.java @@ -38,7 +38,7 @@ public final class KnightOfGrace extends CardImpl { //Knight of Grace gets +1/+0 as long as any player controls a black permanent. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new AnyPlayerControlsCondition(filter), "{this} gets +1/+0 as long as any player controls a black permanent."))); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfMalice.java b/Mage.Sets/src/mage/cards/k/KnightOfMalice.java index a1d79f5e9aa..c0922965ded 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfMalice.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfMalice.java @@ -36,7 +36,7 @@ public final class KnightOfMalice extends CardImpl { addAbility(HexproofFromWhiteAbility.getInstance()); //Knight of Malice gets +1/+0 as long as any player controls a white permanent. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new AnyPlayerControlsCondition(filter), "{this} gets +1/+0 as long as any player controls a white permanent."))); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java b/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java index 947eebaacbc..111a2c7b259 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java @@ -37,7 +37,7 @@ public final class KnightOfNewAlara extends CardImpl { this.toughness = new MageInt(2); // Each other multicolored creature you control gets +1/+1 for each of its colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KnightOfNewAlaraEffect())); + this.addAbility(new SimpleStaticAbility(new KnightOfNewAlaraEffect())); } diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java index a869aa0b104..5771ee61306 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java @@ -43,7 +43,7 @@ public final class KnightOfTheReliquary extends CardImpl { // Knight of the Reliquary gets +1/+1 for each land card in your graveyard. CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterLandCard()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); // {T}, Sacrifice a Forest or Plains: Search your library for a land card, put it onto the battlefield, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_LAND); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java b/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java index b2fbdd77409..2bd765c9242 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java @@ -32,7 +32,7 @@ public final class KnightOfTheStampede extends CardImpl { this.toughness = new MageInt(4); // Dinosaur spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2))); } private KnightOfTheStampede(final KnightOfTheStampede card) { diff --git a/Mage.Sets/src/mage/cards/k/Knighthood.java b/Mage.Sets/src/mage/cards/k/Knighthood.java index 5210add0e04..1988b19de56 100644 --- a/Mage.Sets/src/mage/cards/k/Knighthood.java +++ b/Mage.Sets/src/mage/cards/k/Knighthood.java @@ -22,7 +22,7 @@ public final class Knighthood extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } diff --git a/Mage.Sets/src/mage/cards/k/KnightlyValor.java b/Mage.Sets/src/mage/cards/k/KnightlyValor.java index ed9652d1d1b..01c191c6fc5 100644 --- a/Mage.Sets/src/mage/cards/k/KnightlyValor.java +++ b/Mage.Sets/src/mage/cards/k/KnightlyValor.java @@ -49,7 +49,7 @@ public final class KnightlyValor extends CardImpl { // Enchanted creature gets +2/+2 and has vigilance. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability2 = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText("and has vigilance"); ability2.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/k/KnightsPledge.java b/Mage.Sets/src/mage/cards/k/KnightsPledge.java index 9bf195075e8..4def81ae326 100644 --- a/Mage.Sets/src/mage/cards/k/KnightsPledge.java +++ b/Mage.Sets/src/mage/cards/k/KnightsPledge.java @@ -35,7 +35,7 @@ public final class KnightsPledge extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2))); } private KnightsPledge(final KnightsPledge card) { diff --git a/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java b/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java index 9eeffdef696..115f92d0886 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java +++ b/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java @@ -37,7 +37,7 @@ public final class KoboldDrillSergeant extends CardImpl { this.toughness = new MageInt(2); // Other Kobold creatures you control get +0/+1 and have trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true)); Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, true); effect.setText("and have trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/k/KoboldOverlord.java b/Mage.Sets/src/mage/cards/k/KoboldOverlord.java index 59697efb0b0..90402b16fba 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldOverlord.java +++ b/Mage.Sets/src/mage/cards/k/KoboldOverlord.java @@ -35,7 +35,7 @@ public final class KoboldOverlord extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Other Kobold creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } private KoboldOverlord(final KoboldOverlord card) { diff --git a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java index 1f2d06f72bc..99ab0d94f73 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java +++ b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java @@ -30,7 +30,7 @@ public final class KoboldTaskmaster extends CardImpl { this.toughness = new MageInt(2); // Other Kobold creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/k/KondasBanner.java b/Mage.Sets/src/mage/cards/k/KondasBanner.java index c291ef7f33b..137f405895d 100644 --- a/Mage.Sets/src/mage/cards/k/KondasBanner.java +++ b/Mage.Sets/src/mage/cards/k/KondasBanner.java @@ -39,10 +39,10 @@ public final class KondasBanner extends CardImpl { this.addAbility(new AttachableToRestrictedAbility(target)); // Creatures that share a color with equipped creature get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerColorBoostEffect())); + this.addAbility(new SimpleStaticAbility(new KondasBannerColorBoostEffect())); // Creatures that share a creature type with equipped creature get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerTypeBoostEffect())); + this.addAbility(new SimpleStaticAbility(new KondasBannerTypeBoostEffect())); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), target, false)); diff --git a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java index 813b73df08d..679fbc45080 100644 --- a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java +++ b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java @@ -40,9 +40,9 @@ public final class KondasHatamoto extends CardImpl { this.addAbility(new BushidoAbility(1)); ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(effect1)); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(effect2)); } diff --git a/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java b/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java index 8e7dea0209b..6e7becd2893 100644 --- a/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java +++ b/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java @@ -29,7 +29,7 @@ public final class KongmingSleepingDragon extends CardImpl { this.toughness = new MageInt(2); // Other creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1,Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1,Duration.WhileOnBattlefield, true))); } private KongmingSleepingDragon(final KongmingSleepingDragon card) { diff --git a/Mage.Sets/src/mage/cards/k/KorDuelist.java b/Mage.Sets/src/mage/cards/k/KorDuelist.java index 9542040e9bb..f35a918b5a2 100644 --- a/Mage.Sets/src/mage/cards/k/KorDuelist.java +++ b/Mage.Sets/src/mage/cards/k/KorDuelist.java @@ -35,7 +35,7 @@ public final class KorDuelist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); GainAbilitySourceEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new SourceIsEquiped(), ruleText))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new SourceIsEquiped(), ruleText))); } private KorDuelist(final KorDuelist card) { diff --git a/Mage.Sets/src/mage/cards/k/KorScythemaster.java b/Mage.Sets/src/mage/cards/k/KorScythemaster.java index edd160929ae..02787479676 100644 --- a/Mage.Sets/src/mage/cards/k/KorScythemaster.java +++ b/Mage.Sets/src/mage/cards/k/KorScythemaster.java @@ -29,7 +29,7 @@ public final class KorScythemaster extends CardImpl { this.toughness = new MageInt(1); // Kor Scythemaster has first strike as long as its attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); } private KorScythemaster(final KorScythemaster card) { diff --git a/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java b/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java index 37d010cefa5..21df2602136 100644 --- a/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java +++ b/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java @@ -38,7 +38,7 @@ public final class KorSpiritdancer extends CardImpl { // Kor Spiritdancer gets +2/+2 for each Aura attached to it. AuraAttachedCount count = new AuraAttachedCount(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Whenever you cast an Aura spell, you may draw a card. this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filter, true)); } diff --git a/Mage.Sets/src/mage/cards/k/KormusBell.java b/Mage.Sets/src/mage/cards/k/KormusBell.java index 56cf51079d0..84bbcf7abdc 100644 --- a/Mage.Sets/src/mage/cards/k/KormusBell.java +++ b/Mage.Sets/src/mage/cards/k/KormusBell.java @@ -32,7 +32,7 @@ public final class KormusBell extends CardImpl { effect.addDependedToType(DependencyType.BecomeForest); effect.addDependedToType(DependencyType.BecomeMountain); effect.addDependedToType(DependencyType.BecomePlains); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KormusBell(final KormusBell card) { diff --git a/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java b/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java index 244c14ba996..b95e795088b 100644 --- a/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java +++ b/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java @@ -39,7 +39,7 @@ public final class KragmaWarcaller extends CardImpl { this.toughness = new MageInt(3); // Minotaur creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter1, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter1, false))); // Whenever a Minotaur you control attacks, it gets +2/+0 until end of turn. Effect effect = new BoostTargetEffect(2,0, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java b/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java index 41e3aa17c5f..83c0f9713eb 100644 --- a/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java +++ b/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java @@ -31,7 +31,7 @@ public final class KrakenOfTheStraits extends CardImpl { this.toughness = new MageInt(6); // Creatures with power less than the number of Islands you control can't block Kraken of the Straits. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private KrakenOfTheStraits(final KrakenOfTheStraits card) { diff --git a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java index f1aded7e177..f321fc3b281 100644 --- a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java +++ b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java @@ -39,7 +39,7 @@ public final class KrasisIncubation extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // {1}{G}{U}, Return Krasis Incubation to its owner's hand: Put two +1/+1 counters on enchanted creature. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(2), new ManaCostsImpl<>("{1}{G}{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KrosanDrover.java b/Mage.Sets/src/mage/cards/k/KrosanDrover.java index b6d3819f0c0..55a77a0b1c1 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanDrover.java +++ b/Mage.Sets/src/mage/cards/k/KrosanDrover.java @@ -36,7 +36,7 @@ public final class KrosanDrover extends CardImpl { // Creature spells you cast with converted mana cost 6 or greater cost {2} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filter, 2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KrosanDrover(final KrosanDrover card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanVorine.java b/Mage.Sets/src/mage/cards/k/KrosanVorine.java index 51c9e8f68f5..120e8bf263b 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanVorine.java +++ b/Mage.Sets/src/mage/cards/k/KrosanVorine.java @@ -29,7 +29,7 @@ public final class KrosanVorine extends CardImpl { // Provoke this.addAbility(new ProvokeAbility()); // Krosan Vorine can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private KrosanVorine(final KrosanVorine card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java index 6e973aceb44..e5a256d19c2 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java @@ -40,7 +40,7 @@ public final class KrosanWarchief extends CardImpl { this.toughness = new MageInt(2); // Beast spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // {1}{G}: Regenerate target Beast. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), diff --git a/Mage.Sets/src/mage/cards/k/KrovikanFetish.java b/Mage.Sets/src/mage/cards/k/KrovikanFetish.java index 4b0ab67c8e9..645b4872c03 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanFetish.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanFetish.java @@ -44,7 +44,7 @@ public final class KrovikanFetish extends CardImpl { .setText("draw a card at the beginning of the next turn's upkeep"), false)); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); } private KrovikanFetish(final KrovikanFetish card) { diff --git a/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java b/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java index 23ab7e93a65..3b659687081 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java @@ -45,7 +45,7 @@ public final class KrovikanWhispers extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new OrCost("{U} or {B}", new ManaCostsImpl<>("{U}"), new ManaCostsImpl<>("{B}")))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // When Krovikan Whispers is put into a graveyard from the battlefield, you lose 2 life for each age counter on it. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new LoseLifeSourceControllerEffect(new MultipliedValue(new CountersSourceCount(CounterType.AGE), 2)) diff --git a/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java b/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java index 06b92392d0e..626bbdb561d 100644 --- a/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java +++ b/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java @@ -55,7 +55,7 @@ public final class KrrikSonOfYawgmoth extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // For each {B} in a cost, you may pay 2 life rather than pay that mana. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KrrikSonOfYawgmothPhyrexianEffect())); + this.addAbility(new SimpleStaticAbility(new KrrikSonOfYawgmothPhyrexianEffect())); // Whenever you cast a black spell, put a +1/+1 counter on K'rrik, Son of Yawgmoth. this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filterSpell, false)); diff --git a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java index 85881e30bab..5dfa0f80147 100644 --- a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java +++ b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java @@ -42,7 +42,7 @@ public final class KukemssaSerpent extends CardImpl { this.toughness = new MageInt(3); // Kukemssa Serpent can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {U}, Sacrifice an Island: Target land an opponent controls becomes an Island until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KulrathKnight.java b/Mage.Sets/src/mage/cards/k/KulrathKnight.java index e6955ecf72b..1572f9c31c3 100644 --- a/Mage.Sets/src/mage/cards/k/KulrathKnight.java +++ b/Mage.Sets/src/mage/cards/k/KulrathKnight.java @@ -35,7 +35,7 @@ public final class KulrathKnight extends CardImpl { this.addAbility(WitherAbility.getInstance()); // Creatures your opponents control with counters on them can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KulrathKnightRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new KulrathKnightRestrictionEffect())); } diff --git a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java index 89910f0fe23..6415801d3a5 100644 --- a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java @@ -34,7 +34,7 @@ public final class KumanoMasterYamabushi extends CardImpl { ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Kumano this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); + this.addAbility(new SimpleStaticAbility(new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } diff --git a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java index 05b21097209..4fc60abf1ae 100644 --- a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java +++ b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java @@ -43,7 +43,7 @@ public final class KumanosBlessing extends CardImpl { this.addAbility(ability); // If a creature dealt damage by enchanted creature this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KumanosBlessingEffect()), new DamagedByEnchantedWatcher()); + this.addAbility(new SimpleStaticAbility(new KumanosBlessingEffect()), new DamagedByEnchantedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/k/KumanosPupils.java b/Mage.Sets/src/mage/cards/k/KumanosPupils.java index 10a87ea9341..2172e2864dc 100644 --- a/Mage.Sets/src/mage/cards/k/KumanosPupils.java +++ b/Mage.Sets/src/mage/cards/k/KumanosPupils.java @@ -28,7 +28,7 @@ public final class KumanosPupils extends CardImpl { this.toughness = new MageInt(3); // If a creature dealt damage by Kumano's Pupils this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); + this.addAbility(new SimpleStaticAbility(new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } private KumanosPupils(final KumanosPupils card) { diff --git a/Mage.Sets/src/mage/cards/k/KusariGama.java b/Mage.Sets/src/mage/cards/k/KusariGama.java index 7453c9a7b4d..ec3b687b642 100644 --- a/Mage.Sets/src/mage/cards/k/KusariGama.java +++ b/Mage.Sets/src/mage/cards/k/KusariGama.java @@ -42,7 +42,7 @@ public final class KusariGama extends CardImpl { Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{2}: This creature gets +1/+0 until end of turn.\""); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Whenever equipped creature deals damage to a blocking creature, Kusari-Gama deals that much damage to each other creature defending player controls. this.addAbility(new KusariGamaAbility()); diff --git a/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java b/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java index f4e38730253..1c336b133ea 100644 --- a/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java +++ b/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java @@ -47,7 +47,7 @@ public final class KwendePrideOfFemeref extends CardImpl { ContinuousEffect effect = new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("Creatures you control with first strike have double strike"); effect.setDependedToType(DependencyType.AddingAbility); // effects that add first strike need to be executed first - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KwendePrideOfFemeref(final KwendePrideOfFemeref card) { -- 2.47.2 From ee2b430479a9f07d6e13759225b0ee0b7b38ac44 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:13:46 -0500 Subject: [PATCH 17/50] refactor: SimpleStaticAbility default zone (cards L M) --- Mage.Sets/src/mage/cards/l/LaboratoryManiac.java | 2 +- Mage.Sets/src/mage/cards/l/LairwatchGiant.java | 2 +- Mage.Sets/src/mage/cards/l/LambholtPacifist.java | 3 +-- Mage.Sets/src/mage/cards/l/Lance.java | 2 +- Mage.Sets/src/mage/cards/l/LandCap.java | 2 +- Mage.Sets/src/mage/cards/l/Lashknife.java | 2 +- Mage.Sets/src/mage/cards/l/LashknifeBarrier.java | 2 +- Mage.Sets/src/mage/cards/l/Lashwrithe.java | 2 +- Mage.Sets/src/mage/cards/l/Launch.java | 2 +- Mage.Sets/src/mage/cards/l/LavaTubes.java | 2 +- Mage.Sets/src/mage/cards/l/LavamancersSkill.java | 4 ++-- Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java | 2 +- Mage.Sets/src/mage/cards/l/LawmagesBinding.java | 2 +- Mage.Sets/src/mage/cards/l/LayClaim.java | 2 +- Mage.Sets/src/mage/cards/l/LeadenFists.java | 2 +- Mage.Sets/src/mage/cards/l/LeafcrownDryad.java | 2 +- Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java | 2 +- Mage.Sets/src/mage/cards/l/LegionLieutenant.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninAbunas.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninArbiter.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninDenGuard.java | 4 ++-- Mage.Sets/src/mage/cards/l/LeoninScimitar.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninShikari.java | 2 +- Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java | 2 +- Mage.Sets/src/mage/cards/l/LeshracsRite.java | 2 +- Mage.Sets/src/mage/cards/l/Leviathan.java | 2 +- Mage.Sets/src/mage/cards/l/Levitation.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java | 4 ++-- Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java | 3 +-- Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfVitality.java | 2 +- Mage.Sets/src/mage/cards/l/LibraryOfLeng.java | 4 ++-- Mage.Sets/src/mage/cards/l/Lich.java | 4 ++-- Mage.Sets/src/mage/cards/l/Lichenthrope.java | 2 +- Mage.Sets/src/mage/cards/l/LichsMastery.java | 2 +- Mage.Sets/src/mage/cards/l/LichsMirror.java | 2 +- Mage.Sets/src/mage/cards/l/LichsTomb.java | 2 +- Mage.Sets/src/mage/cards/l/LifeAndLimb.java | 2 +- Mage.Sets/src/mage/cards/l/Lifelink.java | 2 +- Mage.Sets/src/mage/cards/l/LightOfDay.java | 2 +- Mage.Sets/src/mage/cards/l/LightOfSanction.java | 2 +- Mage.Sets/src/mage/cards/l/Lightform.java | 4 +--- Mage.Sets/src/mage/cards/l/LightningDiadem.java | 2 +- Mage.Sets/src/mage/cards/l/LightningGreaves.java | 2 +- Mage.Sets/src/mage/cards/l/LightningMauler.java | 2 +- Mage.Sets/src/mage/cards/l/LightningProwess.java | 4 ++-- Mage.Sets/src/mage/cards/l/LightningReflexes.java | 2 +- Mage.Sets/src/mage/cards/l/LightningTalons.java | 2 +- Mage.Sets/src/mage/cards/l/Lightwalker.java | 2 +- Mage.Sets/src/mage/cards/l/LilianasElite.java | 2 +- Mage.Sets/src/mage/cards/l/LilianasMastery.java | 2 +- Mage.Sets/src/mage/cards/l/LingeringMirage.java | 2 +- Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java | 2 +- Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java | 2 +- Mage.Sets/src/mage/cards/l/LivingLands.java | 2 +- Mage.Sets/src/mage/cards/l/LivingPlane.java | 2 +- Mage.Sets/src/mage/cards/l/LivingTerrain.java | 2 +- Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java | 2 +- Mage.Sets/src/mage/cards/l/LobeLobber.java | 2 +- Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java | 2 +- Mage.Sets/src/mage/cards/l/LodestoneGolem.java | 2 +- Mage.Sets/src/mage/cards/l/LongForgottenGohei.java | 4 ++-- Mage.Sets/src/mage/cards/l/LordMagnus.java | 4 ++-- Mage.Sets/src/mage/cards/l/LordOfAtlantis.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfLineage.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java | 4 ++-- Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java | 2 +- Mage.Sets/src/mage/cards/l/LostInThought.java | 2 +- Mage.Sets/src/mage/cards/l/LovisaColdeyes.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonPunisher.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java | 2 +- Mage.Sets/src/mage/cards/l/LumberingSatyr.java | 2 +- Mage.Sets/src/mage/cards/l/LuminousBonds.java | 2 +- Mage.Sets/src/mage/cards/l/LumithreadField.java | 2 +- Mage.Sets/src/mage/cards/l/LunarchMantle.java | 2 +- Mage.Sets/src/mage/cards/l/Lure.java | 2 +- Mage.Sets/src/mage/cards/l/Lurker.java | 2 +- Mage.Sets/src/mage/cards/l/LushGrowth.java | 2 +- Mage.Sets/src/mage/cards/l/LymphSliver.java | 4 ++-- Mage.Sets/src/mage/cards/l/LyraDawnbringer.java | 2 +- Mage.Sets/src/mage/cards/m/MadAuntie.java | 2 +- Mage.Sets/src/mage/cards/m/MaelstromNexus.java | 2 +- Mage.Sets/src/mage/cards/m/MageRingResponder.java | 2 +- Mage.Sets/src/mage/cards/m/MagebaneArmor.java | 2 +- Mage.Sets/src/mage/cards/m/MagetasBoon.java | 2 +- Mage.Sets/src/mage/cards/m/MaggotTherapy.java | 2 +- Mage.Sets/src/mage/cards/m/MagistratesVeto.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java | 4 ++-- Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java | 2 +- Mage.Sets/src/mage/cards/m/MaintenanceHangar.java | 2 +- Mage.Sets/src/mage/cards/m/MairsilThePretender.java | 2 +- Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java | 2 +- Mage.Sets/src/mage/cards/m/Malfunction.java | 2 +- Mage.Sets/src/mage/cards/m/MaliciousIntent.java | 2 +- Mage.Sets/src/mage/cards/m/Malignus.java | 2 +- Mage.Sets/src/mage/cards/m/ManaChains.java | 2 +- Mage.Sets/src/mage/cards/m/ManaMatrix.java | 2 +- Mage.Sets/src/mage/cards/m/ManaMaze.java | 2 +- Mage.Sets/src/mage/cards/m/ManaVault.java | 2 +- Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java | 2 +- Mage.Sets/src/mage/cards/m/ManaweftSliver.java | 2 +- Mage.Sets/src/mage/cards/m/ManiacalRage.java | 2 +- Mage.Sets/src/mage/cards/m/ManorGargoyle.java | 2 +- Mage.Sets/src/mage/cards/m/ManrikiGusari.java | 4 ++-- Mage.Sets/src/mage/cards/m/MantaRay.java | 2 +- Mage.Sets/src/mage/cards/m/MantellianSavrip.java | 2 +- Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java | 2 +- Mage.Sets/src/mage/cards/m/MarangRiverProwler.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudersAxe.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudingKnight.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java | 2 +- Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java | 2 +- Mage.Sets/src/mage/cards/m/MarduRunemark.java | 2 +- Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java | 2 +- Mage.Sets/src/mage/cards/m/Marjhan.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarkOfFury.java | 2 +- Mage.Sets/src/mage/cards/m/MarkOfSakiko.java | 2 +- Mage.Sets/src/mage/cards/m/MarkOfTheOni.java | 2 +- Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java | 2 +- Mage.Sets/src/mage/cards/m/MarkedByHonor.java | 2 +- Mage.Sets/src/mage/cards/m/MarkovCrusader.java | 2 +- Mage.Sets/src/mage/cards/m/MarrowGnawer.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java | 2 +- Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java | 2 +- Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java | 2 +- Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java | 2 +- Mage.Sets/src/mage/cards/m/MaskOfRiddles.java | 2 +- Mage.Sets/src/mage/cards/m/MassHysteria.java | 2 +- Mage.Sets/src/mage/cards/m/MasterOfEtherium.java | 2 +- Mage.Sets/src/mage/cards/m/MasterSplicer.java | 2 +- Mage.Sets/src/mage/cards/m/MaulSplicer.java | 2 +- Mage.Sets/src/mage/cards/m/MazeAbomination.java | 2 +- Mage.Sets/src/mage/cards/m/MazeBehemoth.java | 2 +- Mage.Sets/src/mage/cards/m/MazeGlider.java | 2 +- Mage.Sets/src/mage/cards/m/MazeRusher.java | 2 +- Mage.Sets/src/mage/cards/m/MazeSentinel.java | 2 +- Mage.Sets/src/mage/cards/m/MazesMantle.java | 2 +- Mage.Sets/src/mage/cards/m/MeddlingMage.java | 2 +- Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java | 2 +- Mage.Sets/src/mage/cards/m/MegatronTyrant.java | 2 +- Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java | 2 +- Mage.Sets/src/mage/cards/m/Melancholy.java | 2 +- Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java | 4 ++-- Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java | 2 +- Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java | 6 +++--- Mage.Sets/src/mage/cards/m/MelirasKeepers.java | 2 +- Mage.Sets/src/mage/cards/m/Melting.java | 2 +- Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java | 2 +- Mage.Sets/src/mage/cards/m/MephidrossVampire.java | 2 +- Mage.Sets/src/mage/cards/m/MephiticOoze.java | 2 +- Mage.Sets/src/mage/cards/m/MercenaryInformer.java | 2 +- Mage.Sets/src/mage/cards/m/MerchantShip.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkSovereign.java | 2 +- Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java | 2 +- Mage.Sets/src/mage/cards/m/MerrowReejerey.java | 2 +- Mage.Sets/src/mage/cards/m/Merseine.java | 2 +- Mage.Sets/src/mage/cards/m/MetallicMimic.java | 4 ++-- Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java | 2 +- Mage.Sets/src/mage/cards/m/MetathranElite.java | 2 +- Mage.Sets/src/mage/cards/m/MidnightCovenant.java | 2 +- Mage.Sets/src/mage/cards/m/MidnightEntourage.java | 2 +- Mage.Sets/src/mage/cards/m/MightSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MilitantInquisitor.java | 2 +- Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java | 2 +- Mage.Sets/src/mage/cards/m/MindControl.java | 3 +-- Mage.Sets/src/mage/cards/m/MindHarness.java | 2 +- Mage.Sets/src/mage/cards/m/MindbenderSpores.java | 2 +- Mage.Sets/src/mage/cards/m/MindlashSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MindlessNull.java | 2 +- Mage.Sets/src/mage/cards/m/MindlockOrb.java | 2 +- Mage.Sets/src/mage/cards/m/MindwrackLiege.java | 4 ++-- Mage.Sets/src/mage/cards/m/MineMineMine.java | 4 ++-- Mage.Sets/src/mage/cards/m/MinotaurTactician.java | 4 ++-- Mage.Sets/src/mage/cards/m/MiragePhalanx.java | 2 +- Mage.Sets/src/mage/cards/m/MirarisWake.java | 2 +- Mage.Sets/src/mage/cards/m/MireKavu.java | 2 +- Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java | 4 ++-- Mage.Sets/src/mage/cards/m/MirrorGolem.java | 2 +- Mage.Sets/src/mage/cards/m/MistformWall.java | 2 +- Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java | 2 +- Mage.Sets/src/mage/cards/m/Moat.java | 2 +- Mage.Sets/src/mage/cards/m/MobMentality.java | 2 +- Mage.Sets/src/mage/cards/m/Mobilization.java | 2 +- Mage.Sets/src/mage/cards/m/MoggConscripts.java | 2 +- Mage.Sets/src/mage/cards/m/MoggJailer.java | 2 +- Mage.Sets/src/mage/cards/m/MoggSquad.java | 2 +- Mage.Sets/src/mage/cards/m/MoggToady.java | 4 ++-- Mage.Sets/src/mage/cards/m/MogissWarhound.java | 2 +- Mage.Sets/src/mage/cards/m/MoldervineCloak.java | 2 +- Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java | 2 +- Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java | 2 +- Mage.Sets/src/mage/cards/m/Momentum.java | 2 +- Mage.Sets/src/mage/cards/m/MonasterySiege.java | 2 +- Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java | 2 +- Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java | 2 +- Mage.Sets/src/mage/cards/m/MoonsilverSpear.java | 2 +- Mage.Sets/src/mage/cards/m/MoorlandDrifter.java | 2 +- Mage.Sets/src/mage/cards/m/MortalObstinacy.java | 3 +-- Mage.Sets/src/mage/cards/m/Mortarpod.java | 2 +- Mage.Sets/src/mage/cards/m/MountainStronghold.java | 2 +- Mage.Sets/src/mage/cards/m/Mourning.java | 2 +- Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java | 2 +- Mage.Sets/src/mage/cards/m/MulDayaChannelers.java | 6 +++--- Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java | 2 +- Mage.Sets/src/mage/cards/m/MultanisHarmony.java | 2 +- Mage.Sets/src/mage/cards/m/MunghaWurm.java | 2 +- Mage.Sets/src/mage/cards/m/MurderersAxe.java | 2 +- Mage.Sets/src/mage/cards/m/MurkfiendLiege.java | 6 +++--- Mage.Sets/src/mage/cards/m/MuscleSliver.java | 2 +- Mage.Sets/src/mage/cards/m/Muzzle.java | 2 +- Mage.Sets/src/mage/cards/m/MycosynthFiend.java | 2 +- Mage.Sets/src/mage/cards/m/MycosynthGolem.java | 2 +- Mage.Sets/src/mage/cards/m/MycosynthLattice.java | 6 +++--- Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java | 2 +- Mage.Sets/src/mage/cards/m/MyrAdapter.java | 2 +- Mage.Sets/src/mage/cards/m/MyrMatrix.java | 2 +- Mage.Sets/src/mage/cards/m/MyrPrototype.java | 2 +- Mage.Sets/src/mage/cards/m/MyrWelder.java | 2 +- Mage.Sets/src/mage/cards/m/MysticMight.java | 2 +- Mage.Sets/src/mage/cards/m/MysticPenitent.java | 2 +- Mage.Sets/src/mage/cards/m/MysticRestraints.java | 2 +- Mage.Sets/src/mage/cards/m/MysticVeil.java | 2 +- Mage.Sets/src/mage/cards/m/MythicProportions.java | 2 +- 233 files changed, 261 insertions(+), 267 deletions(-) diff --git a/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java b/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java index 0f809207cd8..75a5100a69e 100644 --- a/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java +++ b/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java @@ -33,7 +33,7 @@ public final class LaboratoryManiac extends CardImpl { this.toughness = new MageInt(2); // If you would draw a card while your library has no cards in it, you win the game instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LaboratoryManiacEffect())); + this.addAbility(new SimpleStaticAbility(new LaboratoryManiacEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/LairwatchGiant.java b/Mage.Sets/src/mage/cards/l/LairwatchGiant.java index 8ace748e68c..f4aa0406d1e 100644 --- a/Mage.Sets/src/mage/cards/l/LairwatchGiant.java +++ b/Mage.Sets/src/mage/cards/l/LairwatchGiant.java @@ -33,7 +33,7 @@ public final class LairwatchGiant extends CardImpl { this.toughness = new MageInt(3); // Lairwatch Giant can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(1))); // Whenever Lairwatch Giant blocks two or more creatures, it gains first strike until end of turn. this.addAbility(new LairwatchGiantTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/LambholtPacifist.java b/Mage.Sets/src/mage/cards/l/LambholtPacifist.java index 7a3a06bd20b..baf535a3d1d 100644 --- a/Mage.Sets/src/mage/cards/l/LambholtPacifist.java +++ b/Mage.Sets/src/mage/cards/l/LambholtPacifist.java @@ -32,7 +32,7 @@ public final class LambholtPacifist extends CardImpl { this.secondSideCardClazz = mage.cards.l.LambholtButcher.class; // Lambholt Pacifist can't attack unless you control a creature with power 4 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LambholtPacifistEffect())); + this.addAbility(new SimpleStaticAbility(new LambholtPacifistEffect())); // At the beginning of each upkeep, if no spells were cast last turn, transform Lambholt Pacifist. this.addAbility(new TransformAbility()); @@ -84,4 +84,3 @@ class LambholtPacifistEffect extends RestrictionEffect { return false; } } - diff --git a/Mage.Sets/src/mage/cards/l/Lance.java b/Mage.Sets/src/mage/cards/l/Lance.java index 528f878d5e3..17d588872a2 100644 --- a/Mage.Sets/src/mage/cards/l/Lance.java +++ b/Mage.Sets/src/mage/cards/l/Lance.java @@ -36,7 +36,7 @@ public final class Lance extends CardImpl { this.addAbility(ability); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } private Lance(final Lance card) { diff --git a/Mage.Sets/src/mage/cards/l/LandCap.java b/Mage.Sets/src/mage/cards/l/LandCap.java index 8715406dcf4..b0e41ca6f37 100644 --- a/Mage.Sets/src/mage/cards/l/LandCap.java +++ b/Mage.Sets/src/mage/cards/l/LandCap.java @@ -33,7 +33,7 @@ public final class LandCap extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from Land Cap. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/l/Lashknife.java b/Mage.Sets/src/mage/cards/l/Lashknife.java index ba5adc8e2f9..f00119b1896 100644 --- a/Mage.Sets/src/mage/cards/l/Lashknife.java +++ b/Mage.Sets/src/mage/cards/l/Lashknife.java @@ -55,7 +55,7 @@ public final class Lashknife extends CardImpl { this.addAbility(ability); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } private Lashknife(final Lashknife card) { diff --git a/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java b/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java index f4e061f3a2c..a1f450ac17b 100644 --- a/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java +++ b/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java @@ -29,7 +29,7 @@ public final class LashknifeBarrier extends CardImpl { // When Lashknife Barrier enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // If a source would deal damage to a creature you control, it deals that much damage minus 1 to that creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LashknifeBarrierEffect())); + this.addAbility(new SimpleStaticAbility(new LashknifeBarrierEffect())); } private LashknifeBarrier(final LashknifeBarrier card) { diff --git a/Mage.Sets/src/mage/cards/l/Lashwrithe.java b/Mage.Sets/src/mage/cards/l/Lashwrithe.java index 6d3546936a9..527bd74589d 100644 --- a/Mage.Sets/src/mage/cards/l/Lashwrithe.java +++ b/Mage.Sets/src/mage/cards/l/Lashwrithe.java @@ -35,7 +35,7 @@ public final class Lashwrithe extends CardImpl { // Equipped creature gets +1/+1 for each Swamp you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip {B/P}{B/P} (Phyrexian Black can be paid with either Black or 2 life.) this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{B/P}{B/P}"), false)); diff --git a/Mage.Sets/src/mage/cards/l/Launch.java b/Mage.Sets/src/mage/cards/l/Launch.java index 9238c767de1..f3dc626d324 100644 --- a/Mage.Sets/src/mage/cards/l/Launch.java +++ b/Mage.Sets/src/mage/cards/l/Launch.java @@ -30,7 +30,7 @@ public final class Launch extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // When Launch is put into a graveyard from the battlefield, return Launch to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/l/LavaTubes.java b/Mage.Sets/src/mage/cards/l/LavaTubes.java index bd934a28c11..78de147fb20 100644 --- a/Mage.Sets/src/mage/cards/l/LavaTubes.java +++ b/Mage.Sets/src/mage/cards/l/LavaTubes.java @@ -33,7 +33,7 @@ public final class LavaTubes extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from Lava Tubes. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java index e3e35f56418..d027fd8908b 100644 --- a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java +++ b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java @@ -40,14 +40,14 @@ public final class LavamancersSkill extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to target creature." Ability pingAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); pingAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(pingAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(pingAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to target creature.\""))); // As long as enchanted creature is a Wizard, it has "{tap}: This creature deals 2 damage to target creature." Ability pingTwoAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); pingTwoAbility.addTarget(new TargetCreaturePermanent()); ContinuousEffect isWizardEffect = new GainAbilityAttachedEffect(pingTwoAbility, AttachmentType.AURA); - SimpleStaticAbility ifWizardAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(isWizardEffect, new EnchantedCreatureSubtypeCondition(SubType.WIZARD), + SimpleStaticAbility ifWizardAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(isWizardEffect, new EnchantedCreatureSubtypeCondition(SubType.WIZARD), "As long as enchanted creature is a Wizard, it has \"{T}: This creature deals 2 damage to target creature.\"")); this.addAbility(ifWizardAbility); diff --git a/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java b/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java index fecffdcf513..5820d24f257 100644 --- a/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java +++ b/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java @@ -39,7 +39,7 @@ public final class LaviniaAzoriusRenegade extends CardImpl { this.toughness = new MageInt(2); // Each opponent can't cast noncreature spells with converted mana cost greater than the number of lands that player controls. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LaviniaAzoriusRenegadeReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new LaviniaAzoriusRenegadeReplacementEffect())); // Whenever an opponent casts a spell, if no mana was spent to cast it, counter that spell. this.addAbility(new SpellCastOpponentNoManaSpentTriggeredAbility(new CounterTargetEffect().setText("counter that spell"))); diff --git a/Mage.Sets/src/mage/cards/l/LawmagesBinding.java b/Mage.Sets/src/mage/cards/l/LawmagesBinding.java index fb6fac14478..13678ff6138 100644 --- a/Mage.Sets/src/mage/cards/l/LawmagesBinding.java +++ b/Mage.Sets/src/mage/cards/l/LawmagesBinding.java @@ -38,7 +38,7 @@ public final class LawmagesBinding extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activate abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); } private LawmagesBinding(final LawmagesBinding card) { diff --git a/Mage.Sets/src/mage/cards/l/LayClaim.java b/Mage.Sets/src/mage/cards/l/LayClaim.java index 81577f464d6..dc76b297904 100644 --- a/Mage.Sets/src/mage/cards/l/LayClaim.java +++ b/Mage.Sets/src/mage/cards/l/LayClaim.java @@ -36,7 +36,7 @@ public final class LayClaim extends CardImpl { this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/l/LeadenFists.java b/Mage.Sets/src/mage/cards/l/LeadenFists.java index 804e33b49ec..40c74a6a894 100644 --- a/Mage.Sets/src/mage/cards/l/LeadenFists.java +++ b/Mage.Sets/src/mage/cards/l/LeadenFists.java @@ -41,7 +41,7 @@ public final class LeadenFists extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 and doesn't untap during its controller's untap step. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); Effect effect = new DontUntapInControllersUntapStepEnchantedEffect(); effect.setText("and doesn't untap during its controller's untap step"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java b/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java index da0644a5e48..abf4d678917 100644 --- a/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java +++ b/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java @@ -36,7 +36,7 @@ public final class LeafcrownDryad extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Enchanted creature gets +2/+2 and has reach. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2)); Effect effect = new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA); effect.setText("and has reach"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java index 8461baea806..4ebdaee66e6 100644 --- a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java +++ b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java @@ -43,7 +43,7 @@ public final class LeafdrakeRoost extends CardImpl { // Enchanted land has "{G}{U}, {tap}: Create a 2/2 green and blue Drake creature token with flying." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LeafdrakeRoostDrakeToken()), new ManaCostsImpl<>("{G}{U}")); abilityToGain.addCost(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{G}{U}, {T}: Create a 2/2 green and blue Drake creature token with flying.\""))); } diff --git a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java index 7e313d3d861..7d749f3ded3 100644 --- a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java +++ b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java @@ -36,7 +36,7 @@ public final class LegionLieutenant extends CardImpl { this.toughness = new MageInt(2); // Other Vampires you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private LegionLieutenant(final LegionLieutenant card) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninAbunas.java b/Mage.Sets/src/mage/cards/l/LeoninAbunas.java index 077f2575546..68649ba7118 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninAbunas.java +++ b/Mage.Sets/src/mage/cards/l/LeoninAbunas.java @@ -28,7 +28,7 @@ public final class LeoninAbunas extends CardImpl { this.toughness = new MageInt(5); // Artifacts you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS, false))); } private LeoninAbunas(final LeoninAbunas card) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninArbiter.java b/Mage.Sets/src/mage/cards/l/LeoninArbiter.java index 2d837484baa..6bd7856cae5 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninArbiter.java +++ b/Mage.Sets/src/mage/cards/l/LeoninArbiter.java @@ -34,7 +34,7 @@ public final class LeoninArbiter extends CardImpl { this.toughness = new MageInt(2); // Players can't search libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeoninArbiterCantSearchEffect(KEY_STRING))); + this.addAbility(new SimpleStaticAbility(new LeoninArbiterCantSearchEffect(KEY_STRING))); // Any player may pay {2} for that player to ignore this effect until end of turn. this.addAbility(new LeoninArbiterSpecialAction(KEY_STRING)); diff --git a/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java b/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java index db61405e6f0..8ac510c0d9e 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java +++ b/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java @@ -36,9 +36,9 @@ public final class LeoninDenGuard extends CardImpl { // As long as Leonin Den-Guard is equipped, it gets +1/+1 and has vigilance. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedSourceCondition.instance, rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(effect1)); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), EquippedSourceCondition.instance, rule2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(effect2)); } diff --git a/Mage.Sets/src/mage/cards/l/LeoninScimitar.java b/Mage.Sets/src/mage/cards/l/LeoninScimitar.java index f7c4374a72f..724a154acc3 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninScimitar.java +++ b/Mage.Sets/src/mage/cards/l/LeoninScimitar.java @@ -23,7 +23,7 @@ public final class LeoninScimitar extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/l/LeoninShikari.java b/Mage.Sets/src/mage/cards/l/LeoninShikari.java index 7fd2ff1ca48..bb4e3bab3e4 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninShikari.java +++ b/Mage.Sets/src/mage/cards/l/LeoninShikari.java @@ -26,7 +26,7 @@ public final class LeoninShikari extends CardImpl { this.toughness = new MageInt(2); // You may activate equip abilities any time you could cast an instant. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(EquipAbility.class, "equip abilities"))); + this.addAbility(new SimpleStaticAbility(new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(EquipAbility.class, "equip abilities"))); } private LeoninShikari(final LeoninShikari card) { diff --git a/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java b/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java index 699b9364879..dd3dc1d6258 100644 --- a/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java +++ b/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java @@ -32,7 +32,7 @@ public final class LeovoldEmissaryOfTrest extends CardImpl { this.toughness = new MageInt(3); // Each opponent can't draw more than one card each turn. (Based on SpiritOfTheLabyrinth) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeovoldEmissaryOfTrestEffect()), new CardsAmountDrawnThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new LeovoldEmissaryOfTrestEffect()), new CardsAmountDrawnThisTurnWatcher()); // Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card. this.addAbility(new BecomesTargetControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), diff --git a/Mage.Sets/src/mage/cards/l/LeshracsRite.java b/Mage.Sets/src/mage/cards/l/LeshracsRite.java index dde906fe68f..0c0c7957d86 100644 --- a/Mage.Sets/src/mage/cards/l/LeshracsRite.java +++ b/Mage.Sets/src/mage/cards/l/LeshracsRite.java @@ -36,7 +36,7 @@ public final class LeshracsRite extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has swampwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SwampwalkAbility(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SwampwalkAbility(), AttachmentType.AURA))); } private LeshracsRite(final LeshracsRite card) { diff --git a/Mage.Sets/src/mage/cards/l/Leviathan.java b/Mage.Sets/src/mage/cards/l/Leviathan.java index b3ec3625bd8..38384efd5da 100644 --- a/Mage.Sets/src/mage/cards/l/Leviathan.java +++ b/Mage.Sets/src/mage/cards/l/Leviathan.java @@ -61,7 +61,7 @@ public final class Leviathan extends CardImpl { )); // Leviathan can't attack unless you sacrifice two Islands. (This cost is paid as attackers are declared.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeviathanCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new LeviathanCostToAttackBlockEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/Levitation.java b/Mage.Sets/src/mage/cards/l/Levitation.java index 72068134548..925fe64636b 100644 --- a/Mage.Sets/src/mage/cards/l/Levitation.java +++ b/Mage.Sets/src/mage/cards/l/Levitation.java @@ -22,7 +22,7 @@ public final class Levitation extends CardImpl { public Levitation (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private Levitation(final Levitation card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java b/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java index 59d79a8eb02..344eebd8b62 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java @@ -32,7 +32,7 @@ public final class LeylineOfAnticipation extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // You may cast spells as though they had flash. (You may cast them any time you could cast an instant.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } private LeylineOfAnticipation(final LeylineOfAnticipation card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java b/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java index 394fdc95a9d..d16a3bc9f9b 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java @@ -30,7 +30,7 @@ public final class LeylineOfLifeforce extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // Creature spells can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeylineOfLifeforceEffect())); + this.addAbility(new SimpleStaticAbility(new LeylineOfLifeforceEffect())); } private LeylineOfLifeforce(final LeylineOfLifeforce card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java b/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java index de2d2d47642..e7672d52edb 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java @@ -30,9 +30,9 @@ public final class LeylineOfPunishment extends CardImpl { // If Leyline of Punishment is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantGainLifeAllEffect())); // Damage can't be prevented. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeylineOfPunishmentEffect2())); + this.addAbility(new SimpleStaticAbility(new LeylineOfPunishmentEffect2())); } private LeylineOfPunishment(final LeylineOfPunishment card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java b/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java index 7f723fab67c..61625c8a049 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java @@ -34,7 +34,7 @@ public final class LeylineOfSanctity extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // You have hexproof. (You can't be the target of spells or abilities your opponents control.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance()))); } private LeylineOfSanctity(final LeylineOfSanctity card) { @@ -47,4 +47,3 @@ public final class LeylineOfSanctity extends CardImpl { } } - diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java index 952cb9d945b..e2fd00ab094 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java @@ -27,7 +27,7 @@ public final class LeylineOfSingularity extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // All nonland permanents are legendary. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetSupertypeAllEffect())); + this.addAbility(new SimpleStaticAbility(new SetSupertypeAllEffect())); } private LeylineOfSingularity(final LeylineOfSingularity card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java b/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java index 7d0f7dea421..6443008edc8 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java @@ -32,7 +32,7 @@ public final class LeylineOfTheVoid extends CardImpl { // If Leyline of the Void is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); // If a card would be put into an opponent's graveyard from anywhere, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeylineOfTheVoidEffect())); + this.addAbility(new SimpleStaticAbility(new LeylineOfTheVoidEffect())); } private LeylineOfTheVoid(final LeylineOfTheVoid card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java b/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java index 7f22fc2053c..f16ee6fe700 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java @@ -27,7 +27,7 @@ public final class LeylineOfVitality extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); // Whenever a creature you control enters, you may gain 1 life. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java b/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java index eeacdb17a15..59910c3782c 100644 --- a/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java +++ b/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java @@ -28,10 +28,10 @@ public final class LibraryOfLeng extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + addAbility(new SimpleStaticAbility(effect)); // If an effect causes you to discard a card, discard it, but you may put it on top of your library instead of into your graveyard. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LibraryOfLengEffect())); + addAbility(new SimpleStaticAbility(new LibraryOfLengEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/Lich.java b/Mage.Sets/src/mage/cards/l/Lich.java index 4be19bb51ee..da1e22d33d2 100644 --- a/Mage.Sets/src/mage/cards/l/Lich.java +++ b/Mage.Sets/src/mage/cards/l/Lich.java @@ -43,10 +43,10 @@ public final class Lich extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new LoseLifeSourceControllerEffect(ControllerLifeCount.instance), null, "As Lich enters the battlefield, you lose life equal to your life total.", null)); // You don't lose the game for having 0 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); // If you would gain life, draw that many cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichLifeGainReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new LichLifeGainReplacementEffect())); // Whenever you're dealt damage, sacrifice that many nontoken permanents. If you can't, you lose the game. this.addAbility(new LichDamageTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/Lichenthrope.java b/Mage.Sets/src/mage/cards/l/Lichenthrope.java index 40dc576460a..15ff902b797 100644 --- a/Mage.Sets/src/mage/cards/l/Lichenthrope.java +++ b/Mage.Sets/src/mage/cards/l/Lichenthrope.java @@ -36,7 +36,7 @@ public final class Lichenthrope extends CardImpl { this.toughness = new MageInt(5); // If damage would be dealt to Lichenthrope, put that many -1/-1 counters on it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichenthropeEffect())); + this.addAbility(new SimpleStaticAbility(new LichenthropeEffect())); // At the beginning of your upkeep, remove a -1/-1 counter from Lichenthrope. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/l/LichsMastery.java b/Mage.Sets/src/mage/cards/l/LichsMastery.java index 516590290d2..c62db9e6f64 100644 --- a/Mage.Sets/src/mage/cards/l/LichsMastery.java +++ b/Mage.Sets/src/mage/cards/l/LichsMastery.java @@ -47,7 +47,7 @@ public final class LichsMastery extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // You can't lose the game. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichsMasteryCantLoseEffect())); + this.addAbility(new SimpleStaticAbility(new LichsMasteryCantLoseEffect())); // Whenever you gain life, draw that many cards. this.addAbility(new GainLifeControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/l/LichsMirror.java b/Mage.Sets/src/mage/cards/l/LichsMirror.java index b6373798bcd..60e6a57859a 100644 --- a/Mage.Sets/src/mage/cards/l/LichsMirror.java +++ b/Mage.Sets/src/mage/cards/l/LichsMirror.java @@ -27,7 +27,7 @@ public final class LichsMirror extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // If you would lose the game, instead shuffle your hand, your graveyard, and all permanents you own into your library, then draw seven cards and your life total becomes 20. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichsMirrorEffect())); + this.addAbility(new SimpleStaticAbility(new LichsMirrorEffect())); } private LichsMirror(final LichsMirror card) { diff --git a/Mage.Sets/src/mage/cards/l/LichsTomb.java b/Mage.Sets/src/mage/cards/l/LichsTomb.java index 44727140f34..f1991509497 100644 --- a/Mage.Sets/src/mage/cards/l/LichsTomb.java +++ b/Mage.Sets/src/mage/cards/l/LichsTomb.java @@ -28,7 +28,7 @@ public final class LichsTomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // You don't lose the game for having 0 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); // Whenever you lose life, sacrifice a permanent for each 1 life you lost. this.addAbility(new LichsTombTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java index 28217daaffa..28847dcff26 100644 --- a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java +++ b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java @@ -25,7 +25,7 @@ public final class LifeAndLimb extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // All Forests and all Saprolings are 1/1 green Saproling creatures and Forest lands in addition to their other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LifeAndLimbEffect())); + this.addAbility(new SimpleStaticAbility(new LifeAndLimbEffect())); } private LifeAndLimb(final LifeAndLimb card) { diff --git a/Mage.Sets/src/mage/cards/l/Lifelink.java b/Mage.Sets/src/mage/cards/l/Lifelink.java index 170d5ba5e5c..69ac98bd64a 100644 --- a/Mage.Sets/src/mage/cards/l/Lifelink.java +++ b/Mage.Sets/src/mage/cards/l/Lifelink.java @@ -30,7 +30,7 @@ public final class Lifelink extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); } private Lifelink(final Lifelink card) { diff --git a/Mage.Sets/src/mage/cards/l/LightOfDay.java b/Mage.Sets/src/mage/cards/l/LightOfDay.java index 5754eca4fcf..63c2d94db81 100644 --- a/Mage.Sets/src/mage/cards/l/LightOfDay.java +++ b/Mage.Sets/src/mage/cards/l/LightOfDay.java @@ -29,7 +29,7 @@ public final class LightOfDay extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // Black creatures can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/l/LightOfSanction.java b/Mage.Sets/src/mage/cards/l/LightOfSanction.java index f60d2efb876..1d2e056afa3 100644 --- a/Mage.Sets/src/mage/cards/l/LightOfSanction.java +++ b/Mage.Sets/src/mage/cards/l/LightOfSanction.java @@ -27,7 +27,7 @@ public final class LightOfSanction extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); // Prevent all damage that would be dealt to creatures you control by sources you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LightOfSanctionEffect())); + this.addAbility(new SimpleStaticAbility(new LightOfSanctionEffect())); } private LightOfSanction(final LightOfSanction card) { diff --git a/Mage.Sets/src/mage/cards/l/Lightform.java b/Mage.Sets/src/mage/cards/l/Lightform.java index 0a2aa7afd92..7c9b403d4de 100644 --- a/Mage.Sets/src/mage/cards/l/Lightform.java +++ b/Mage.Sets/src/mage/cards/l/Lightform.java @@ -30,7 +30,7 @@ public final class Lightform extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesAuraAttachToManifestSourceEffect())); // Enchanted creature has flying and lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and lifelink"); ability.addEffect(effect); @@ -46,5 +46,3 @@ public final class Lightform extends CardImpl { return new Lightform(this); } } - - diff --git a/Mage.Sets/src/mage/cards/l/LightningDiadem.java b/Mage.Sets/src/mage/cards/l/LightningDiadem.java index 8d72627bbcc..fa31371938f 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDiadem.java +++ b/Mage.Sets/src/mage/cards/l/LightningDiadem.java @@ -44,7 +44,7 @@ public final class LightningDiadem extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield))); } private LightningDiadem(final LightningDiadem card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningGreaves.java b/Mage.Sets/src/mage/cards/l/LightningGreaves.java index 8f26b95960d..5792a3ee0c7 100644 --- a/Mage.Sets/src/mage/cards/l/LightningGreaves.java +++ b/Mage.Sets/src/mage/cards/l/LightningGreaves.java @@ -29,7 +29,7 @@ public final class LightningGreaves extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has haste and shroud. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and shroud"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LightningMauler.java b/Mage.Sets/src/mage/cards/l/LightningMauler.java index ae78a9bd4a1..6e5384b609d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningMauler.java +++ b/Mage.Sets/src/mage/cards/l/LightningMauler.java @@ -34,7 +34,7 @@ public final class LightningMauler extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Lightning Mauler is paired with another creature, both creatures have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(HasteAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(HasteAbility.getInstance(), ruleText))); } private LightningMauler(final LightningMauler card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningProwess.java b/Mage.Sets/src/mage/cards/l/LightningProwess.java index 260bb9a1437..e66746e8e4d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningProwess.java +++ b/Mage.Sets/src/mage/cards/l/LightningProwess.java @@ -36,10 +36,10 @@ public final class LightningProwess extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste and "{tap}: This creature deals 1 damage to any target." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } private LightningProwess(final LightningProwess card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningReflexes.java b/Mage.Sets/src/mage/cards/l/LightningReflexes.java index 14c03640dd8..4e969e5d9b5 100644 --- a/Mage.Sets/src/mage/cards/l/LightningReflexes.java +++ b/Mage.Sets/src/mage/cards/l/LightningReflexes.java @@ -43,7 +43,7 @@ public final class LightningReflexes extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has first strike. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LightningTalons.java b/Mage.Sets/src/mage/cards/l/LightningTalons.java index e6dde22cd88..ad0e2a58e0d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningTalons.java +++ b/Mage.Sets/src/mage/cards/l/LightningTalons.java @@ -39,7 +39,7 @@ public final class LightningTalons extends CardImpl { Effect effect2 = new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield); effect2.setText("Enchanted creature gets +3/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); effect2 = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect2.setText("and has first strike"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/l/Lightwalker.java b/Mage.Sets/src/mage/cards/l/Lightwalker.java index 9a496fa57d2..3ddc8f25aef 100644 --- a/Mage.Sets/src/mage/cards/l/Lightwalker.java +++ b/Mage.Sets/src/mage/cards/l/Lightwalker.java @@ -29,7 +29,7 @@ public final class Lightwalker extends CardImpl { this.toughness = new MageInt(1); // Lightwalker has flying as long as it has a +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1),"Lightwalker has flying as long as it has a +1/+1 counter on it"))); } diff --git a/Mage.Sets/src/mage/cards/l/LilianasElite.java b/Mage.Sets/src/mage/cards/l/LilianasElite.java index aba15727ae5..c2f67ad69f5 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasElite.java +++ b/Mage.Sets/src/mage/cards/l/LilianasElite.java @@ -29,7 +29,7 @@ public final class LilianasElite extends CardImpl { // Liliana's Elite gets +1/+1 for each creature card in your graveyard. DynamicValue amount = new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_CREATURE); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LilianasMastery.java b/Mage.Sets/src/mage/cards/l/LilianasMastery.java index b41616fb495..3bf6c0bb9af 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasMastery.java +++ b/Mage.Sets/src/mage/cards/l/LilianasMastery.java @@ -31,7 +31,7 @@ public final class LilianasMastery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); // Zombies creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // When Liliana's Army enters the battlefield, create two 2/2 black Zombie creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 2))); diff --git a/Mage.Sets/src/mage/cards/l/LingeringMirage.java b/Mage.Sets/src/mage/cards/l/LingeringMirage.java index 44870c1976b..1c37cece4e7 100644 --- a/Mage.Sets/src/mage/cards/l/LingeringMirage.java +++ b/Mage.Sets/src/mage/cards/l/LingeringMirage.java @@ -37,7 +37,7 @@ public final class LingeringMirage extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java b/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java index 643c6ba7a80..ce78e0d98b5 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java @@ -30,7 +30,7 @@ public final class LinvalaKeeperOfSilence extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Activated abilities of creatures your opponents control can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LinvalaKeeperOfSilenceCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new LinvalaKeeperOfSilenceCantActivateEffect())); } private LinvalaKeeperOfSilence(final LinvalaKeeperOfSilence card) { diff --git a/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java b/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java index 7888e804eaa..35ec583cab0 100644 --- a/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java +++ b/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java @@ -43,7 +43,7 @@ public final class LiuBeiLordOfShu extends CardImpl { // Horsemanship this.addAbility(HorsemanshipAbility.getInstance()); // Liu Bei, Lord of Shu gets +2/+2 as long as you control a permanent named Guan Yu, Sainted Warrior or a permanent named Zhang Fei, Fierce Warrior. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} gets +2/+2 as long as you control a permanent named Guan Yu, Sainted Warrior or a permanent named Zhang Fei, Fierce Warrior"))); diff --git a/Mage.Sets/src/mage/cards/l/LivingLands.java b/Mage.Sets/src/mage/cards/l/LivingLands.java index 0b1d5368644..fee8a2eadcf 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLands.java +++ b/Mage.Sets/src/mage/cards/l/LivingLands.java @@ -27,7 +27,7 @@ public final class LivingLands extends CardImpl { new CreatureToken(1, 1, "1/1 creatures"), "lands", filter, Duration.WhileOnBattlefield, false); effect.getDependencyTypes().add(DependencyType.BecomeForest); // TODO: are these dependencies correct/complete? - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private LivingLands(final LivingLands card) { diff --git a/Mage.Sets/src/mage/cards/l/LivingPlane.java b/Mage.Sets/src/mage/cards/l/LivingPlane.java index 9b0a098b773..3ad0b887dcd 100644 --- a/Mage.Sets/src/mage/cards/l/LivingPlane.java +++ b/Mage.Sets/src/mage/cards/l/LivingPlane.java @@ -25,7 +25,7 @@ public final class LivingPlane extends CardImpl { this.supertype.add(SuperType.WORLD); // All lands are 1/1 creatures that are still lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAllEffect( new CreatureToken(1, 1, "1/1 creatures"), "lands", filter, Duration.WhileOnBattlefield, false))); } diff --git a/Mage.Sets/src/mage/cards/l/LivingTerrain.java b/Mage.Sets/src/mage/cards/l/LivingTerrain.java index a55ff8acf82..9cc0309c621 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTerrain.java +++ b/Mage.Sets/src/mage/cards/l/LivingTerrain.java @@ -34,7 +34,7 @@ public final class LivingTerrain extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a 5/6 green Treefolk creature that's still a land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new TreefolkToken(), "Enchanted land is a 5/6 green Treefolk creature that's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR))); } diff --git a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java index 28135200652..fb1032599f5 100644 --- a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java @@ -47,7 +47,7 @@ public final class LlawanCephalidEmpress extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandFromBattlefieldAllEffect(filter), false)); // Your opponents can't cast blue creature spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LlawanCephalidRuleModifyingEffect())); + this.addAbility(new SimpleStaticAbility(new LlawanCephalidRuleModifyingEffect())); } private LlawanCephalidEmpress(final LlawanCephalidEmpress card) { diff --git a/Mage.Sets/src/mage/cards/l/LobeLobber.java b/Mage.Sets/src/mage/cards/l/LobeLobber.java index 281fa788431..fdb7813f8be 100644 --- a/Mage.Sets/src/mage/cards/l/LobeLobber.java +++ b/Mage.Sets/src/mage/cards/l/LobeLobber.java @@ -33,7 +33,7 @@ public final class LobeLobber extends CardImpl { Effect effect = new LobeLobberEffect(); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // Equip 2 this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java b/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java index 24662243bc5..6a336627168 100644 --- a/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java +++ b/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java @@ -24,7 +24,7 @@ public final class LocketOfYesterdays extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Spells you cast cost {1} less to cast for each card with the same name as that spell in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LocketOfYesterdaysCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new LocketOfYesterdaysCostReductionEffect())); } private LocketOfYesterdays(final LocketOfYesterdays card) { diff --git a/Mage.Sets/src/mage/cards/l/LodestoneGolem.java b/Mage.Sets/src/mage/cards/l/LodestoneGolem.java index 0a5d66aed0e..e8109ca0f44 100644 --- a/Mage.Sets/src/mage/cards/l/LodestoneGolem.java +++ b/Mage.Sets/src/mage/cards/l/LodestoneGolem.java @@ -33,7 +33,7 @@ public final class LodestoneGolem extends CardImpl { this.toughness = new MageInt(3); // Nonartifact spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private LodestoneGolem(final LodestoneGolem card) { diff --git a/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java b/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java index 1c94ca1801a..802a5ec44a2 100644 --- a/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java +++ b/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java @@ -31,10 +31,10 @@ public final class LongForgottenGohei extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Arcane spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(arcaneFilter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(arcaneFilter, 1))); // Spirit creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, spiritFilter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, spiritFilter, false))); } private LongForgottenGohei(final LongForgottenGohei card) { diff --git a/Mage.Sets/src/mage/cards/l/LordMagnus.java b/Mage.Sets/src/mage/cards/l/LordMagnus.java index 5f2e883add4..619c9ee1ddf 100644 --- a/Mage.Sets/src/mage/cards/l/LordMagnus.java +++ b/Mage.Sets/src/mage/cards/l/LordMagnus.java @@ -30,10 +30,10 @@ public final class LordMagnus extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Creatures with plainswalk can be blocked as though they didn't have plainswalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LordMagnusFirstEffect())); + this.addAbility(new SimpleStaticAbility(new LordMagnusFirstEffect())); // Creatures with forestwalk can be blocked as though they didn't have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LordMagnusSecondEffect())); + this.addAbility(new SimpleStaticAbility(new LordMagnusSecondEffect())); } private LordMagnus(final LordMagnus card) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java b/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java index da152ddbe49..8a70d443071 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java +++ b/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java @@ -35,7 +35,7 @@ public final class LordOfAtlantis extends CardImpl { // Other Merfolk creatures get +1/+1 and have islandwalk. Effect effect = new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true); effect.setText("Other Merfolk get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAllEffect(new IslandwalkAbility(), Duration.WhileOnBattlefield, filter, true); effect.setText("and have islandwalk"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LordOfLineage.java b/Mage.Sets/src/mage/cards/l/LordOfLineage.java index 33a576955e8..544ede58b4d 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfLineage.java +++ b/Mage.Sets/src/mage/cards/l/LordOfLineage.java @@ -40,7 +40,7 @@ public final class LordOfLineage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Vampire creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); // {T}: Create a 2/2 black Vampire creature token with flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java b/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java index 865c56683ab..bab7384e2d8 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java @@ -35,7 +35,7 @@ public final class LordOfTheAccursed extends CardImpl { this.toughness = new MageInt(3); // Other Zombie creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); //{2}{B}, Tap: All Zombies gain menace until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( @@ -55,4 +55,4 @@ public final class LordOfTheAccursed extends CardImpl { public LordOfTheAccursed copy() { return new LordOfTheAccursed(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java b/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java index ce07d072a9b..85706c2fa89 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java @@ -54,7 +54,7 @@ public final class LordOfTheNazgul extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Wraiths you control have protection from Ring-bearers. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new ProtectionAbility(filterRingBearer), Duration.WhileOnBattlefield, filterWraith ))); diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java b/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java index 26a13fadd63..83fc418edfb 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java @@ -37,7 +37,7 @@ public final class LordOfTheUnreal extends CardImpl { this.toughness = new MageInt(2); // Illusion creatures you control get +1/+1 and have hexproof - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); ability.addEffect(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter, false) .setText("and have hexproof")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LostInThought.java b/Mage.Sets/src/mage/cards/l/LostInThought.java index 9e89b4e6572..703d907f8d2 100644 --- a/Mage.Sets/src/mage/cards/l/LostInThought.java +++ b/Mage.Sets/src/mage/cards/l/LostInThought.java @@ -44,7 +44,7 @@ public final class LostInThought extends CardImpl { // Enchanted creature can't attack or block, and its activated abilities can't be activated. // Its controller may exile three cards from their graveyard for that player to ignore this effect until end of turn. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new LostInThoughtRestrictionEffect()); + ability = new SimpleStaticAbility(new LostInThoughtRestrictionEffect()); ability.addEffect(new LostInThoughtCantActivateAbilitiesEffect()); this.addAbility(ability); this.addAbility(new LostInThoughtSpecialAction()); diff --git a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java index 39b1e4cafd7..228ffd0613d 100644 --- a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java +++ b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java @@ -37,7 +37,7 @@ public final class LovisaColdeyes extends CardImpl { // Each creature that's a Barbarian, a Warrior, or a Berserker gets +2/+2 and has haste. Effect effect = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false); effect.setText("Each creature that's a Barbarian, a Warrior, or a Berserker gets +2/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("and has haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java b/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java index 678e3fc07cc..3c628b87756 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java @@ -29,7 +29,7 @@ public final class LoxodonPunisher extends CardImpl { // Loxodon Punisher gets +2/+2 for each Equipment attached to it EquipmentAttachedCount amount = new EquipmentAttachedCount(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); } private LoxodonPunisher(final LoxodonPunisher card) { diff --git a/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java b/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java index 0e54713ba90..974396f4621 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java @@ -28,7 +28,7 @@ public final class LoxodonWarhammer extends CardImpl { // Equipped creature gets +3/+0 and has trample and lifelink. (If the creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker. Damage dealt by the creature also causes its controller to gain that much life.) Effect effect = new BoostEquippedEffect(3, 0); effect.setText("Equipped creature gets +3/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LumberingSatyr.java b/Mage.Sets/src/mage/cards/l/LumberingSatyr.java index 49545ea51b5..79e655905db 100644 --- a/Mage.Sets/src/mage/cards/l/LumberingSatyr.java +++ b/Mage.Sets/src/mage/cards/l/LumberingSatyr.java @@ -27,7 +27,7 @@ public final class LumberingSatyr extends CardImpl { this.toughness = new MageInt(4); // All creatures have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/l/LuminousBonds.java b/Mage.Sets/src/mage/cards/l/LuminousBonds.java index c7fd1a69ede..f9ae5a9d540 100644 --- a/Mage.Sets/src/mage/cards/l/LuminousBonds.java +++ b/Mage.Sets/src/mage/cards/l/LuminousBonds.java @@ -36,7 +36,7 @@ public final class LuminousBonds extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/l/LumithreadField.java b/Mage.Sets/src/mage/cards/l/LumithreadField.java index b5868a8c5bd..9ac90205ba9 100644 --- a/Mage.Sets/src/mage/cards/l/LumithreadField.java +++ b/Mage.Sets/src/mage/cards/l/LumithreadField.java @@ -22,7 +22,7 @@ public final class LumithreadField extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); // Morph {1}{W} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"))); diff --git a/Mage.Sets/src/mage/cards/l/LunarchMantle.java b/Mage.Sets/src/mage/cards/l/LunarchMantle.java index 05b6b51874f..d699d39d9bd 100644 --- a/Mage.Sets/src/mage/cards/l/LunarchMantle.java +++ b/Mage.Sets/src/mage/cards/l/LunarchMantle.java @@ -46,7 +46,7 @@ public final class LunarchMantle extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{1}, Sacrifice a permanent: This creature gains flying until end of turn." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); abilityToGain.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/l/Lure.java b/Mage.Sets/src/mage/cards/l/Lure.java index 3469c118c8e..dec53e7c515 100644 --- a/Mage.Sets/src/mage/cards/l/Lure.java +++ b/Mage.Sets/src/mage/cards/l/Lure.java @@ -37,7 +37,7 @@ public final class Lure extends CardImpl { this.addAbility(ability); // All creatures able to block enchanted creature do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); } private Lure(final Lure card) { diff --git a/Mage.Sets/src/mage/cards/l/Lurker.java b/Mage.Sets/src/mage/cards/l/Lurker.java index e49aa6bfe47..3252f667135 100644 --- a/Mage.Sets/src/mage/cards/l/Lurker.java +++ b/Mage.Sets/src/mage/cards/l/Lurker.java @@ -38,7 +38,7 @@ public final class Lurker extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect( new CantBeTargetedSourceEffect(new FilterSpell(), Duration.WhileOnBattlefield), new InvertCondition(new OrCondition(AttackedThisTurnSourceCondition.instance, BlockedThisTurnSourceCondition.instance))); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect.setText("{this} can't be the target of spells unless it attacked or blocked this turn")); + Ability ability = new SimpleStaticAbility(effect.setText("{this} can't be the target of spells unless it attacked or blocked this turn")); ability.addWatcher(new BlockedThisTurnWatcher()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LushGrowth.java b/Mage.Sets/src/mage/cards/l/LushGrowth.java index 1f3318f6114..cd768c01c9e 100644 --- a/Mage.Sets/src/mage/cards/l/LushGrowth.java +++ b/Mage.Sets/src/mage/cards/l/LushGrowth.java @@ -34,7 +34,7 @@ public final class LushGrowth extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a Mountain, Forest, and Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.MOUNTAIN, SubType.FOREST, SubType.PLAINS))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.MOUNTAIN, SubType.FOREST, SubType.PLAINS))); } private LushGrowth(final LushGrowth card) { diff --git a/Mage.Sets/src/mage/cards/l/LymphSliver.java b/Mage.Sets/src/mage/cards/l/LymphSliver.java index d1699b376b4..550a7dd45f8 100644 --- a/Mage.Sets/src/mage/cards/l/LymphSliver.java +++ b/Mage.Sets/src/mage/cards/l/LymphSliver.java @@ -32,8 +32,8 @@ public final class LymphSliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have absorb 1. - Ability absorb = new SimpleStaticAbility(Zone.BATTLEFIELD, new SliverAbsorbEffect()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(absorb, + Ability absorb = new SimpleStaticAbility(new SliverAbsorbEffect()); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(absorb, Duration.WhileOnBattlefield, filter, "All Sliver creatures have absorb 1. (If a source would deal damage to a Sliver, prevent 1 of that damage.)"))); } diff --git a/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java b/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java index 0c5c75c77e9..d5b9de5b6cb 100644 --- a/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java +++ b/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java @@ -37,7 +37,7 @@ public final class LyraDawnbringer extends CardImpl { // Other Angels you control get +1/+1 and have lifelink. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, AngelFilter, true); effect.setText("Other Angels you control get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); Effect effect2 = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, AngelFilter, true); effect2.setText("and have lifelink"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/m/MadAuntie.java b/Mage.Sets/src/mage/cards/m/MadAuntie.java index 87fc95fefd5..ac5bfeb3d2a 100644 --- a/Mage.Sets/src/mage/cards/m/MadAuntie.java +++ b/Mage.Sets/src/mage/cards/m/MadAuntie.java @@ -42,7 +42,7 @@ public final class MadAuntie extends CardImpl { this.toughness = new MageInt(2); // Other Goblin creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true))); // {T}: Regenerate another target Goblin. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MaelstromNexus.java b/Mage.Sets/src/mage/cards/m/MaelstromNexus.java index 1879563f991..8611f038655 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromNexus.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromNexus.java @@ -30,7 +30,7 @@ public final class MaelstromNexus extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}{U}{B}{R}{G}"); // The first spell you cast each turn has cascade. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaelstromNexusGainCascadeFirstSpellEffect()), new FirstSpellCastThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new MaelstromNexusGainCascadeFirstSpellEffect()), new FirstSpellCastThisTurnWatcher()); } private MaelstromNexus(final MaelstromNexus card) { diff --git a/Mage.Sets/src/mage/cards/m/MageRingResponder.java b/Mage.Sets/src/mage/cards/m/MageRingResponder.java index 24a48636abf..9401a4a33a8 100644 --- a/Mage.Sets/src/mage/cards/m/MageRingResponder.java +++ b/Mage.Sets/src/mage/cards/m/MageRingResponder.java @@ -35,7 +35,7 @@ public final class MageRingResponder extends CardImpl { this.toughness = new MageInt(7); // Mage-Ring Responder doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {7}: Untap Mage-Ring Responder. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{7}"))); diff --git a/Mage.Sets/src/mage/cards/m/MagebaneArmor.java b/Mage.Sets/src/mage/cards/m/MagebaneArmor.java index fb1a6fdd0db..a34fa10a68d 100644 --- a/Mage.Sets/src/mage/cards/m/MagebaneArmor.java +++ b/Mage.Sets/src/mage/cards/m/MagebaneArmor.java @@ -33,7 +33,7 @@ public final class MagebaneArmor extends CardImpl { // Equipped creature gets +2/+4 and loses flying. this.addAbility(new MagebaneArmorAbility()); // Prevent all noncombat damage that would be dealt to equipped creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MagebaneArmorPreventionEffect())); + this.addAbility(new SimpleStaticAbility(new MagebaneArmorPreventionEffect())); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/m/MagetasBoon.java b/Mage.Sets/src/mage/cards/m/MagetasBoon.java index f2ca51046c8..b01f730615d 100644 --- a/Mage.Sets/src/mage/cards/m/MagetasBoon.java +++ b/Mage.Sets/src/mage/cards/m/MagetasBoon.java @@ -37,7 +37,7 @@ public final class MagetasBoon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } private MagetasBoon(final MagetasBoon card) { diff --git a/Mage.Sets/src/mage/cards/m/MaggotTherapy.java b/Mage.Sets/src/mage/cards/m/MaggotTherapy.java index 4d811b7ec61..9677e02c239 100644 --- a/Mage.Sets/src/mage/cards/m/MaggotTherapy.java +++ b/Mage.Sets/src/mage/cards/m/MaggotTherapy.java @@ -34,7 +34,7 @@ public final class MaggotTherapy extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield))); } private MaggotTherapy(final MaggotTherapy card) { diff --git a/Mage.Sets/src/mage/cards/m/MagistratesVeto.java b/Mage.Sets/src/mage/cards/m/MagistratesVeto.java index 8c4f10c71fd..4721eff8cf1 100644 --- a/Mage.Sets/src/mage/cards/m/MagistratesVeto.java +++ b/Mage.Sets/src/mage/cards/m/MagistratesVeto.java @@ -32,7 +32,7 @@ public final class MagistratesVeto extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // White creatures and blue creatures can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); } private MagistratesVeto(final MagistratesVeto card) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java b/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java index a5988407338..3bf98804eb0 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java @@ -26,10 +26,10 @@ public final class MagusOfTheFuture extends CardImpl { this.toughness = new MageInt(3); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // You may play lands and cast spells from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayFromTopOfLibraryEffect())); + this.addAbility(new SimpleStaticAbility(new PlayFromTopOfLibraryEffect())); } private MagusOfTheFuture(final MagusOfTheFuture card) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java index 96f070e81a3..6e866b4810a 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java @@ -36,7 +36,7 @@ public final class MagusOfTheMoat extends CardImpl { this.toughness = new MageInt(3); // Creatures without flying can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); } private MagusOfTheMoat(final MagusOfTheMoat card) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java b/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java index 5982f92390e..cc13ad4f745 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java @@ -36,7 +36,7 @@ public final class MagusOfTheTabernacle extends CardImpl { // All creatures have "At the beginning of your upkeep, sacrifice this creature unless you pay {1}." Ability abilityToGain = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(abilityToGain, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, rule))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(abilityToGain, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, rule))); } private MagusOfTheTabernacle(final MagusOfTheTabernacle card) { diff --git a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java index 82d67cbcc0e..3a8db07a23d 100644 --- a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java +++ b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java @@ -42,7 +42,7 @@ public final class MaintenanceHangar extends CardImpl { // Starship creatures you control and starship creatures in your graveyard have Repair 6. Effect effect = new GainAbilityControlledEffect(new RepairAbility(6), Duration.WhileOnBattlefield, filterPermanent); effect.setText("Starship creatures you control"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new MaintenanceHangarEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MairsilThePretender.java b/Mage.Sets/src/mage/cards/m/MairsilThePretender.java index 598d0d6af34..1df506dee92 100644 --- a/Mage.Sets/src/mage/cards/m/MairsilThePretender.java +++ b/Mage.Sets/src/mage/cards/m/MairsilThePretender.java @@ -45,7 +45,7 @@ public final class MairsilThePretender extends CardImpl { // Mairsil, the Pretender has all activated abilities of all cards you own in exile with cage counters on them. // You may activate each of those abilities only once each turn. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new MairsilThePretenderGainAbilitiesEffect()); + Ability ability = new SimpleStaticAbility(new MairsilThePretenderGainAbilitiesEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java b/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java index d152ee8a24e..a075c356e47 100644 --- a/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java +++ b/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java @@ -88,7 +88,7 @@ class MakeshiftMannequinEffect extends OneShotEffect { if (permanent != null) { ContinuousEffect gainedEffect = new MakeshiftMannequinGainAbilityEffect(); // Bug #6885 Fixed when owner/controller leaves the game the effect still applies - SimpleStaticAbility gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, gainedEffect); + SimpleStaticAbility gainAbility = new SimpleStaticAbility(gainedEffect); gainAbility.setSourceId(cardId); gainAbility.getTargets().add(source.getTargets().get(0)); game.addEffect(gainedEffect, gainAbility); diff --git a/Mage.Sets/src/mage/cards/m/Malfunction.java b/Mage.Sets/src/mage/cards/m/Malfunction.java index 43e5099ab11..923defaf62e 100644 --- a/Mage.Sets/src/mage/cards/m/Malfunction.java +++ b/Mage.Sets/src/mage/cards/m/Malfunction.java @@ -38,7 +38,7 @@ public final class Malfunction extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect("permanent"))); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); } private Malfunction(final Malfunction card) { diff --git a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java index eea51f29b1a..e2242f02218 100644 --- a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java +++ b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java @@ -38,7 +38,7 @@ public final class MaliciousIntent extends CardImpl { // Enchanted creature has "{tap}: Target creature can't block this turn." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } private MaliciousIntent(final MaliciousIntent card) { diff --git a/Mage.Sets/src/mage/cards/m/Malignus.java b/Mage.Sets/src/mage/cards/m/Malignus.java index 989d779bb39..a0d51a95248 100644 --- a/Mage.Sets/src/mage/cards/m/Malignus.java +++ b/Mage.Sets/src/mage/cards/m/Malignus.java @@ -38,7 +38,7 @@ public final class Malignus extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new HighestLifeTotalAmongOpponentsCount()))); // Damage that would be dealt by Malignus can't be prevented. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MalignusEffect())); + this.addAbility(new SimpleStaticAbility(new MalignusEffect())); } private Malignus(final Malignus card) { diff --git a/Mage.Sets/src/mage/cards/m/ManaChains.java b/Mage.Sets/src/mage/cards/m/ManaChains.java index 11c4436bd55..1d6718dedbc 100644 --- a/Mage.Sets/src/mage/cards/m/ManaChains.java +++ b/Mage.Sets/src/mage/cards/m/ManaChains.java @@ -36,7 +36,7 @@ public final class ManaChains extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Cumulative upkeep {1}." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/m/ManaMatrix.java b/Mage.Sets/src/mage/cards/m/ManaMatrix.java index a3dbe0516bb..5b08594ac58 100644 --- a/Mage.Sets/src/mage/cards/m/ManaMatrix.java +++ b/Mage.Sets/src/mage/cards/m/ManaMatrix.java @@ -30,7 +30,7 @@ public final class ManaMatrix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // Instant and enchantment spells you cast cost up to {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2, true))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2, true))); } private ManaMatrix(final ManaMatrix card) { diff --git a/Mage.Sets/src/mage/cards/m/ManaMaze.java b/Mage.Sets/src/mage/cards/m/ManaMaze.java index e7d85a34037..a9c2a44584f 100644 --- a/Mage.Sets/src/mage/cards/m/ManaMaze.java +++ b/Mage.Sets/src/mage/cards/m/ManaMaze.java @@ -26,7 +26,7 @@ public final class ManaMaze extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // Players can't cast spells that share a color with the spell most recently cast this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaMazeEffect()), new LastSpellCastWatcher()); + this.addAbility(new SimpleStaticAbility(new ManaMazeEffect()), new LastSpellCastWatcher()); } private ManaMaze(final ManaMaze card) { diff --git a/Mage.Sets/src/mage/cards/m/ManaVault.java b/Mage.Sets/src/mage/cards/m/ManaVault.java index 358589941d4..007f4fbbf10 100644 --- a/Mage.Sets/src/mage/cards/m/ManaVault.java +++ b/Mage.Sets/src/mage/cards/m/ManaVault.java @@ -28,7 +28,7 @@ public final class ManaVault extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Mana Vault doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {4}. If you do, untap Mana Vault. this.addAbility(new BeginningOfUpkeepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java index 1e755df1264..09b8265f03e 100644 --- a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java @@ -35,7 +35,7 @@ public final class ManaclesOfDecay extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // {B}: Enchanted creature gets -1/-1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); // {R}: Enchanted creature can't block this turn. diff --git a/Mage.Sets/src/mage/cards/m/ManaweftSliver.java b/Mage.Sets/src/mage/cards/m/ManaweftSliver.java index d6aaf85fc59..65acada1c50 100644 --- a/Mage.Sets/src/mage/cards/m/ManaweftSliver.java +++ b/Mage.Sets/src/mage/cards/m/ManaweftSliver.java @@ -30,7 +30,7 @@ public final class ManaweftSliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control have "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new AnyColorManaAbility(), Duration.WhileOnBattlefield, filter diff --git a/Mage.Sets/src/mage/cards/m/ManiacalRage.java b/Mage.Sets/src/mage/cards/m/ManiacalRage.java index 4cfb9309ba5..22a5d7d53e5 100644 --- a/Mage.Sets/src/mage/cards/m/ManiacalRage.java +++ b/Mage.Sets/src/mage/cards/m/ManiacalRage.java @@ -31,7 +31,7 @@ public final class ManiacalRage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and can't block. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new CantBlockAttachedEffect(AttachmentType.AURA).setText("and can't block")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/ManorGargoyle.java b/Mage.Sets/src/mage/cards/m/ManorGargoyle.java index f0101955cb8..98c9c9c83e4 100644 --- a/Mage.Sets/src/mage/cards/m/ManorGargoyle.java +++ b/Mage.Sets/src/mage/cards/m/ManorGargoyle.java @@ -64,7 +64,7 @@ public final class ManorGargoyle extends CardImpl { gainEffect.setDependedToType(DependencyType.LooseDefenderEffect); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(gainEffect, HasDefenderCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {1}: Until end of turn, Manor Gargoyle loses defender and gains flying. ContinuousEffect effect2 = new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java index 36b3710e969..8bb16afc199 100644 --- a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java +++ b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java @@ -33,10 +33,10 @@ public final class ManrikiGusari extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+2 and has "{tap}: Destroy target Equipment." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 2))); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/m/MantaRay.java b/Mage.Sets/src/mage/cards/m/MantaRay.java index 31053378689..58c7bb45bbc 100644 --- a/Mage.Sets/src/mage/cards/m/MantaRay.java +++ b/Mage.Sets/src/mage/cards/m/MantaRay.java @@ -37,7 +37,7 @@ public final class MantaRay extends CardImpl { this.toughness = new MageInt(3); // Manta Ray can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // Manta Ray can't be blocked except by blue creatures. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/m/MantellianSavrip.java b/Mage.Sets/src/mage/cards/m/MantellianSavrip.java index 5dc2fb9e627..409db7ccc02 100644 --- a/Mage.Sets/src/mage/cards/m/MantellianSavrip.java +++ b/Mage.Sets/src/mage/cards/m/MantellianSavrip.java @@ -32,7 +32,7 @@ public final class MantellianSavrip extends CardImpl { this.addAbility(new MonstrosityAbility("{5}{G}{G}", 2)); // Creatures with power less than Mantellian Savrip's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MantellianSavripRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new MantellianSavripRestrictionEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java index 88590c5ece5..ef4c28d7eb8 100644 --- a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java +++ b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java @@ -32,7 +32,7 @@ public final class MaralenOfTheMornsong extends CardImpl { this.toughness = new MageInt(3); // Players can't draw cards. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaralenOfTheMornsongEffect())); + this.addAbility(new SimpleStaticAbility(new MaralenOfTheMornsongEffect())); // At the beginning of each player's draw step, that player loses 3 life, searches their library for a card, puts it into their hand, then shuffles their library. this.addAbility(new BeginningOfDrawTriggeredAbility(TargetController.EACH_PLAYER, new MaralenOfTheMornsongEffect2(), false)); diff --git a/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java b/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java index 05600c3f4a6..9abd9c27b6b 100644 --- a/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java +++ b/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java @@ -33,7 +33,7 @@ public final class MarangRiverProwler extends CardImpl { this.toughness = new MageInt(1); // Marang River Prowler can't block and can't be blocked. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new CantBlockSourceEffect(Duration.WhileOnBattlefield)); Effect effect = new CantBeBlockedSourceEffect(); effect.setText("and can't be blocked"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MaraudersAxe.java b/Mage.Sets/src/mage/cards/m/MaraudersAxe.java index 0d62e62dd0b..c13e28737e2 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudersAxe.java +++ b/Mage.Sets/src/mage/cards/m/MaraudersAxe.java @@ -22,7 +22,7 @@ public final class MaraudersAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {2} this.addAbility(new EquipAbility(2)); diff --git a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java index 53b1f98a0bb..b271f505b61 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java @@ -35,7 +35,7 @@ public final class MaraudingBoneslasher extends CardImpl { this.toughness = new MageInt(3); // Marauding Boneslasher can't block unless you control another Zombie. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockUnlessYouControlSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockUnlessYouControlSourceEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java index 1f36f49624d..45ab826aaa6 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java @@ -38,7 +38,7 @@ public final class MaraudingKnight extends CardImpl { // Marauding Knight gets +1/+1 for each Plains your opponents control. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(plainsFilter, 1); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java index 64f79cdbe71..7bbaea8ce60 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java @@ -38,7 +38,7 @@ public final class MaraudingMaulhorn extends CardImpl { new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true), new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 1)); effect.setText("{this} attacks each combat if able unless you control a creature named Advocate of the Beast"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MaraudingMaulhorn(final MaraudingMaulhorn card) { diff --git a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java index 7bf7233ac8b..6c22ed486b9 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java @@ -25,7 +25,7 @@ public final class MarchOfTheMachines extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MarchOfTheMachinesEffect())); + this.addAbility(new SimpleStaticAbility(new MarchOfTheMachinesEffect())); } private MarchOfTheMachines(final MarchOfTheMachines card) { diff --git a/Mage.Sets/src/mage/cards/m/MarduRunemark.java b/Mage.Sets/src/mage/cards/m/MarduRunemark.java index 152abe3c1a3..f89367f59f3 100644 --- a/Mage.Sets/src/mage/cards/m/MarduRunemark.java +++ b/Mage.Sets/src/mage/cards/m/MarduRunemark.java @@ -49,7 +49,7 @@ public final class MarduRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has first strike as long as you control a white or black permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java b/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java index d96f26f8348..70f9e008ffc 100644 --- a/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java +++ b/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java @@ -64,7 +64,7 @@ public class MariTheKillingQuill extends CardImpl { // "Whenever this creature deals combat damage to a player, you may remove a hit counter from a card that player owns in exile. // If you do, draw a card and create two Treasure tokens." GainAbilityControlledEffect gainDeathTouchEffect = new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter); - Ability mainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, gainDeathTouchEffect); + Ability mainAbility = new SimpleStaticAbility(gainDeathTouchEffect); // NOTE: Optional part is handled inside the effect Ability dealsDamageAbility = new DealsCombatDamageToAPlayerTriggeredAbility(new MariTheKillingQuillDealsDamageEffect(), false, true); diff --git a/Mage.Sets/src/mage/cards/m/Marjhan.java b/Mage.Sets/src/mage/cards/m/Marjhan.java index e192ee914aa..3f92a5a1480 100644 --- a/Mage.Sets/src/mage/cards/m/Marjhan.java +++ b/Mage.Sets/src/mage/cards/m/Marjhan.java @@ -49,7 +49,7 @@ public final class Marjhan extends CardImpl { this.toughness = new MageInt(8); // Marjhan doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {U}{U}, Sacrifice a creature: Untap Marjhan. Activate this ability only during your upkeep. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, @@ -58,7 +58,7 @@ public final class Marjhan extends CardImpl { this.addAbility(ability); // Marjhan can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {U}{U}: Marjhan gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{U}")); diff --git a/Mage.Sets/src/mage/cards/m/MarkOfFury.java b/Mage.Sets/src/mage/cards/m/MarkOfFury.java index 4767497ef43..63f0742414e 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfFury.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfFury.java @@ -38,7 +38,7 @@ public final class MarkOfFury extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); // At the beginning of the end step, return Mark of Fury to its owner's hand. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new ReturnToHandSourceEffect(true), false)); } diff --git a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java index e503f0fd5bc..851606bd38b 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java @@ -46,7 +46,7 @@ public final class MarkOfSakiko extends CardImpl { // Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end." Effect effect = new GainAbilityAttachedEffect(new MarkOfSakikoTriggeredAbility(), AttachmentType.AURA); effect.setText("Enchanted creature has \"Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java index cd6f2909d89..368ab8e5975 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java @@ -37,7 +37,7 @@ public final class MarkOfTheOni extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of the end step, if you control no Demons, sacrifice Mark of the Oni. this.addAbility(new BeginningOfEndStepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java b/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java index 25951f46c22..2e7193304b3 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java @@ -37,7 +37,7 @@ public final class MarkOfTheVampire extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and has lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA).setText("and has lifelink")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MarkedByHonor.java b/Mage.Sets/src/mage/cards/m/MarkedByHonor.java index d01cdc7e9b4..30368268ef1 100644 --- a/Mage.Sets/src/mage/cards/m/MarkedByHonor.java +++ b/Mage.Sets/src/mage/cards/m/MarkedByHonor.java @@ -42,7 +42,7 @@ public final class MarkedByHonor extends CardImpl { // Enchanted creature gets +2/+2 and has vigilance. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability2 = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText("and has vigilance"); ability2.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java index ecbdd0e46fe..a12b536b096 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java +++ b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java @@ -43,7 +43,7 @@ public final class MarkovCrusader extends CardImpl { // Markov Crusader has haste as long as you control another Vampire. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MarkovCrusader(final MarkovCrusader card) { diff --git a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java index 930733a9516..72a9404f973 100644 --- a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java +++ b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java @@ -42,7 +42,7 @@ public final class MarrowGnawer extends CardImpl { this.toughness = new MageInt(3); // All Rats have fear. (They can't be blocked except by artifact creatures and/or black creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, filterFear))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, filterFear))); // {T}, Sacrifice a Rat: create X 1/1 black Rat creature tokens, where X is the number of Rats you control. Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new RatToken(), xValue), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java b/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java index 5aaaad5e602..778e98731d7 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java +++ b/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java @@ -38,7 +38,7 @@ public final class MartyrsOfKorlis extends CardImpl { SourceTappedCondition.UNTAPPED, null); effect.setText("{this} redirects artifact damage from controller as long as it's untapped"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MartyrsOfKorlis(final MartyrsOfKorlis card) { diff --git a/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java b/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java index a1bc7b277ce..7b5c87f6cd7 100644 --- a/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java +++ b/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java @@ -31,7 +31,7 @@ public final class MasakoTheHumorless extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Tapped creatures you control can block as though they were untapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlockTappedEffect())); + this.addAbility(new SimpleStaticAbility(new BlockTappedEffect())); } private MasakoTheHumorless(final MasakoTheHumorless card) { diff --git a/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java b/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java index 1b30324fae6..11ffbdf0db5 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java @@ -24,7 +24,7 @@ public final class MaskOfAvacyn extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+2 and has hexproof. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(1, 2)); Effect effect = new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has hexproof"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java b/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java index 80360c3817c..278d0c17c0c 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java @@ -37,7 +37,7 @@ public final class MaskOfLawAndGrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has protection from black and from red. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java b/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java index 61d5b75130c..51a0dfeea32 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java @@ -24,7 +24,7 @@ public final class MaskOfRiddles extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature deals combat damage to a player, you may draw a card. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "equipped", true)); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/m/MassHysteria.java b/Mage.Sets/src/mage/cards/m/MassHysteria.java index 278576bf93b..7c4053b00f4 100644 --- a/Mage.Sets/src/mage/cards/m/MassHysteria.java +++ b/Mage.Sets/src/mage/cards/m/MassHysteria.java @@ -21,7 +21,7 @@ public final class MassHysteria extends CardImpl { public MassHysteria(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{R}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES, false))); } private MassHysteria(final MassHysteria card) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java b/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java index 6a11918fb11..20eb072c811 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java @@ -40,7 +40,7 @@ public final class MasterOfEtherium extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterCounted)))); // Other artifact creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoosted, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoosted, true))); } private MasterOfEtherium(final MasterOfEtherium card) { diff --git a/Mage.Sets/src/mage/cards/m/MasterSplicer.java b/Mage.Sets/src/mage/cards/m/MasterSplicer.java index febf3da2cd0..b3708715386 100644 --- a/Mage.Sets/src/mage/cards/m/MasterSplicer.java +++ b/Mage.Sets/src/mage/cards/m/MasterSplicer.java @@ -33,7 +33,7 @@ public final class MasterSplicer extends CardImpl { this.toughness = new MageInt(1); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private MasterSplicer(final MasterSplicer card) { diff --git a/Mage.Sets/src/mage/cards/m/MaulSplicer.java b/Mage.Sets/src/mage/cards/m/MaulSplicer.java index 366ad87e8c1..e030f28d7b1 100644 --- a/Mage.Sets/src/mage/cards/m/MaulSplicer.java +++ b/Mage.Sets/src/mage/cards/m/MaulSplicer.java @@ -42,7 +42,7 @@ public final class MaulSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken(), 2))); // Golem creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private MaulSplicer(final MaulSplicer card) { diff --git a/Mage.Sets/src/mage/cards/m/MazeAbomination.java b/Mage.Sets/src/mage/cards/m/MazeAbomination.java index e3614764cf4..97f5ef9d54b 100644 --- a/Mage.Sets/src/mage/cards/m/MazeAbomination.java +++ b/Mage.Sets/src/mage/cards/m/MazeAbomination.java @@ -40,7 +40,7 @@ public final class MazeAbomination extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Multicolored creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeBehemoth.java b/Mage.Sets/src/mage/cards/m/MazeBehemoth.java index de6ad6fbd2b..9e6a66237f9 100644 --- a/Mage.Sets/src/mage/cards/m/MazeBehemoth.java +++ b/Mage.Sets/src/mage/cards/m/MazeBehemoth.java @@ -40,7 +40,7 @@ public final class MazeBehemoth extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Multicolored creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeGlider.java b/Mage.Sets/src/mage/cards/m/MazeGlider.java index c4d274f40dd..79939f06648 100644 --- a/Mage.Sets/src/mage/cards/m/MazeGlider.java +++ b/Mage.Sets/src/mage/cards/m/MazeGlider.java @@ -40,7 +40,7 @@ public final class MazeGlider extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Multicolored creatures you control have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeRusher.java b/Mage.Sets/src/mage/cards/m/MazeRusher.java index d00a3982500..2a854b3a01a 100644 --- a/Mage.Sets/src/mage/cards/m/MazeRusher.java +++ b/Mage.Sets/src/mage/cards/m/MazeRusher.java @@ -40,7 +40,7 @@ public final class MazeRusher extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Multicolored creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeSentinel.java b/Mage.Sets/src/mage/cards/m/MazeSentinel.java index bc1eb053e63..9525fe679ef 100644 --- a/Mage.Sets/src/mage/cards/m/MazeSentinel.java +++ b/Mage.Sets/src/mage/cards/m/MazeSentinel.java @@ -40,7 +40,7 @@ public final class MazeSentinel extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Multicolored creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazesMantle.java b/Mage.Sets/src/mage/cards/m/MazesMantle.java index 5d78e8a610a..3970420af8c 100644 --- a/Mage.Sets/src/mage/cards/m/MazesMantle.java +++ b/Mage.Sets/src/mage/cards/m/MazesMantle.java @@ -48,7 +48,7 @@ public class MazesMantle extends CardImpl { )); //Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } private MazesMantle(final MazesMantle card) { diff --git a/Mage.Sets/src/mage/cards/m/MeddlingMage.java b/Mage.Sets/src/mage/cards/m/MeddlingMage.java index f7780b329bc..d4bfe35fa66 100644 --- a/Mage.Sets/src/mage/cards/m/MeddlingMage.java +++ b/Mage.Sets/src/mage/cards/m/MeddlingMage.java @@ -35,7 +35,7 @@ public final class MeddlingMage extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME))); // Spells with the chosen name can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeddlingMageReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new MeddlingMageReplacementEffect())); } private MeddlingMage(final MeddlingMage card) { diff --git a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java index 208ce35dfe3..b93a0ed4114 100644 --- a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java +++ b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java @@ -38,7 +38,7 @@ public final class MedomaiTheAgeless extends CardImpl { // Medomai the Ageless can't attack during extra turns. Effect effect = new ConditionalRestrictionEffect(new CantAttackSourceEffect(Duration.WhileOnBattlefield), ExtraTurnCondition.instance); effect.setText("{this} can't attack during extra turns"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MedomaiTheAgeless(final MedomaiTheAgeless card) { diff --git a/Mage.Sets/src/mage/cards/m/MegatronTyrant.java b/Mage.Sets/src/mage/cards/m/MegatronTyrant.java index 91ccb4d179f..967a92f1f22 100644 --- a/Mage.Sets/src/mage/cards/m/MegatronTyrant.java +++ b/Mage.Sets/src/mage/cards/m/MegatronTyrant.java @@ -38,7 +38,7 @@ public final class MegatronTyrant extends CardImpl { this.addAbility(new MoreThanMeetsTheEyeAbility(this, "{1}{R}{W}{B}")); // Your opponents can't cast spells during combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MegatronTyrantCantCastSpellsEffect())); + this.addAbility(new SimpleStaticAbility(new MegatronTyrantCantCastSpellsEffect())); // At the beginning of your postcombat main phase, you may convert Megatron. If you do, add {C} for each 1 life your opponents have lost this turn. TriggeredAbility trigger = new BeginningOfPostcombatMainTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java b/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java index 98887be80ee..2261a7e6a4b 100644 --- a/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java +++ b/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java @@ -26,7 +26,7 @@ public final class MeishinTheMindCage extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // All creatures get -X/-0, where X is the number of cards in your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new SignInversionDynamicValue(CardsInControllerHandCount.instance), StaticValue.get(0), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false, "All creatures get -X/-0, where X is the number of cards in your hand"))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(new SignInversionDynamicValue(CardsInControllerHandCount.instance), StaticValue.get(0), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false, "All creatures get -X/-0, where X is the number of cards in your hand"))); } private MeishinTheMindCage(final MeishinTheMindCage card) { diff --git a/Mage.Sets/src/mage/cards/m/Melancholy.java b/Mage.Sets/src/mage/cards/m/Melancholy.java index 52c170add89..aab5ec51763 100644 --- a/Mage.Sets/src/mage/cards/m/Melancholy.java +++ b/Mage.Sets/src/mage/cards/m/Melancholy.java @@ -37,7 +37,7 @@ public final class Melancholy extends CardImpl { // When Melancholy enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // At the beginning of your upkeep, sacrifice Melancholy unless you pay {B}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}")) )); diff --git a/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java b/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java index 51395a1c26c..781464c7f1c 100644 --- a/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java +++ b/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java @@ -43,10 +43,10 @@ public final class MelekIzzetParagon extends CardImpl { this.toughness = new MageInt(4); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // You may cast instant and sorcery spells from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayFromTopOfLibraryEffect(filter))); + this.addAbility(new SimpleStaticAbility(new PlayFromTopOfLibraryEffect(filter))); // Whenever you cast an instant or sorcery spell from your library, copy it. You may choose new targets for the copy. this.addAbility(new MelekIzzetParagonTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java b/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java index 6fde3c71897..abc9317c610 100644 --- a/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java +++ b/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java @@ -57,7 +57,7 @@ public final class MelekReforgedResearcher extends CardImpl { // The first instant or sorcery spell you cast each turn costs {3} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filter, 3); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), + this.addAbility(new SimpleStaticAbility(effect), new MelekReforgedResearcherWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java index 86c902f33c5..b2fae29c25f 100644 --- a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java +++ b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java @@ -33,13 +33,13 @@ public final class MeliraSylvokOutcast extends CardImpl { this.toughness = new MageInt(2); // You can't get poison counters. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeliraSylvokOutcastEffect())); + this.addAbility(new SimpleStaticAbility(new MeliraSylvokOutcastEffect())); // Creatures you control can't have -1/-1 counters put on them. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeliraSylvokOutcastEffect2())); + this.addAbility(new SimpleStaticAbility(new MeliraSylvokOutcastEffect2())); // Creatures your opponents control lose infect. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeliraSylvokOutcastEffect3())); + this.addAbility(new SimpleStaticAbility(new MeliraSylvokOutcastEffect3())); } diff --git a/Mage.Sets/src/mage/cards/m/MelirasKeepers.java b/Mage.Sets/src/mage/cards/m/MelirasKeepers.java index 3f14992ba1b..9ad3be48776 100644 --- a/Mage.Sets/src/mage/cards/m/MelirasKeepers.java +++ b/Mage.Sets/src/mage/cards/m/MelirasKeepers.java @@ -26,7 +26,7 @@ public final class MelirasKeepers extends CardImpl { this.toughness = new MageInt(4); // Melira's Keepers can't have counters put on it - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantHaveCountersSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantHaveCountersSourceEffect())); } private MelirasKeepers(final MelirasKeepers card) { diff --git a/Mage.Sets/src/mage/cards/m/Melting.java b/Mage.Sets/src/mage/cards/m/Melting.java index 80ca0686085..d72ded8a51b 100644 --- a/Mage.Sets/src/mage/cards/m/Melting.java +++ b/Mage.Sets/src/mage/cards/m/Melting.java @@ -21,7 +21,7 @@ public final class Melting extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // All lands are no longer snow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeltingEffect())); + this.addAbility(new SimpleStaticAbility(new MeltingEffect())); } private Melting(final Melting card) { diff --git a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java index b2375fa4cf2..3661089c388 100644 --- a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java +++ b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java @@ -35,7 +35,7 @@ public final class MengHuoBarbarianKing extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); } private MengHuoBarbarianKing(final MengHuoBarbarianKing card) { diff --git a/Mage.Sets/src/mage/cards/m/MephidrossVampire.java b/Mage.Sets/src/mage/cards/m/MephidrossVampire.java index 1bf077b9cfa..d803179525d 100644 --- a/Mage.Sets/src/mage/cards/m/MephidrossVampire.java +++ b/Mage.Sets/src/mage/cards/m/MephidrossVampire.java @@ -33,7 +33,7 @@ public final class MephidrossVampire extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Each creature you control is a Vampire in addition to its other creature types and has "Whenever this creature deals damage to a creature, put a +1/+1 counter on this creature." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MephidrossVampireEffect())); + this.addAbility(new SimpleStaticAbility(new MephidrossVampireEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MephiticOoze.java b/Mage.Sets/src/mage/cards/m/MephiticOoze.java index 9352a1052c3..3419261e220 100644 --- a/Mage.Sets/src/mage/cards/m/MephiticOoze.java +++ b/Mage.Sets/src/mage/cards/m/MephiticOoze.java @@ -31,7 +31,7 @@ public final class MephiticOoze extends CardImpl { // Mephitic Ooze gets +1/+0 for each artifact you control. Effect effect = new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(ArtifactYouControlHint.instance)); + this.addAbility(new SimpleStaticAbility(effect).addHint(ArtifactYouControlHint.instance)); // Whenever Mephitic Ooze deals combat damage to a creature, destroy that creature. The creature can't be regenerated. this.addAbility(new DealsCombatDamageToACreatureTriggeredAbility(new DestroyTargetEffect(true), false, true)); diff --git a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java index bcdc06f5530..8293a54f2c2 100644 --- a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java +++ b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java @@ -47,7 +47,7 @@ public final class MercenaryInformer extends CardImpl { this.toughness = new MageInt(1); // Mercenary Informer can't be the target of black spells or abilities from black sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filterBlack, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterBlack, Duration.WhileOnBattlefield))); // {2}{W}: Put target nontoken Mercenary on the bottom of its owner's library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new ManaCostsImpl<>("{2}{W}")); diff --git a/Mage.Sets/src/mage/cards/m/MerchantShip.java b/Mage.Sets/src/mage/cards/m/MerchantShip.java index 238787f76dd..3bf67b2a234 100644 --- a/Mage.Sets/src/mage/cards/m/MerchantShip.java +++ b/Mage.Sets/src/mage/cards/m/MerchantShip.java @@ -30,7 +30,7 @@ public final class MerchantShip extends CardImpl { this.toughness = new MageInt(2); // Merchant Ship can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // Whenever Merchant Ship attacks and isn't blocked, you gain 2 life. this.addAbility(new AttacksAndIsNotBlockedTriggeredAbility(new GainLifeEffect(2))); // When you control no Islands, sacrifice Merchant Ship. diff --git a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java index 8ee8308a3c9..12cc8677fba 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java @@ -36,7 +36,7 @@ public final class MerfolkMistbinder extends CardImpl { this.toughness = new MageInt(2); // Other Merfolk you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private MerfolkMistbinder(final MerfolkMistbinder card) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java index 188249c5bd5..dd6ded2f5f6 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java @@ -39,7 +39,7 @@ public final class MerfolkSovereign extends CardImpl { this.toughness = new MageInt(2); // Other Merfolk creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // {tap}: Target Merfolk creature can't be blocked this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java index 7bdc72cbd5d..346391f88f9 100644 --- a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java +++ b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java @@ -37,7 +37,7 @@ public final class MeriekeRiBerit extends CardImpl { this.toughness = new MageInt(1); // Merieke Ri Berit doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {tap}: Gain control of target creature for as long as you control Merieke Ri Berit. When Merieke Ri Berit leaves the battlefield or becomes untapped, destroy that creature. It can't be regenerated. Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.WhileControlled), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java index c729be9312d..130b8a40d98 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java +++ b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java @@ -40,7 +40,7 @@ public final class MerrowReejerey extends CardImpl { this.toughness = new MageInt(2); // Other Merfolk creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Whenever you cast a Merfolk spell, you may tap or untap target permanent. Ability ability = new SpellCastControllerTriggeredAbility(new MayTapOrUntapTargetEffect(), filter2, true); Target target = new TargetPermanent(); diff --git a/Mage.Sets/src/mage/cards/m/Merseine.java b/Mage.Sets/src/mage/cards/m/Merseine.java index 7e91ecb96d5..504e36fc3f1 100644 --- a/Mage.Sets/src/mage/cards/m/Merseine.java +++ b/Mage.Sets/src/mage/cards/m/Merseine.java @@ -47,7 +47,7 @@ public final class Merseine extends CardImpl { this.addAbility(new EntersBattlefieldAbility(effect)); // Enchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), new SourceHasCounterCondition(CounterType.NET)).setText("Enchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it"))); // Pay enchanted creature's mana cost: Remove a net counter from Merseine. Any player may activate this ability, but only if they control the enchanted creature. diff --git a/Mage.Sets/src/mage/cards/m/MetallicMimic.java b/Mage.Sets/src/mage/cards/m/MetallicMimic.java index c5f005afc92..f9041e595b1 100644 --- a/Mage.Sets/src/mage/cards/m/MetallicMimic.java +++ b/Mage.Sets/src/mage/cards/m/MetallicMimic.java @@ -37,10 +37,10 @@ public final class MetallicMimic extends CardImpl { // Metallic Mimic is the chosen type in addition to its other types. ability.addEffect(new EnterAttributeAddChosenSubtypeEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // Each other creature you control of the chosen type enters the battlefield with an additional +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MetallicMimicReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new MetallicMimicReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java index 2d5c8df407e..35e5807c955 100644 --- a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java +++ b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java @@ -42,7 +42,7 @@ public final class MetamorphicAlteration extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACreature())); // Enchanted creature is a copy of the chosen creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MetamorphicAlterationEffect())); + this.addAbility(new SimpleStaticAbility(new MetamorphicAlterationEffect())); } private MetamorphicAlteration(final MetamorphicAlteration card) { diff --git a/Mage.Sets/src/mage/cards/m/MetathranElite.java b/Mage.Sets/src/mage/cards/m/MetathranElite.java index 71c9c360655..ee1b819a504 100644 --- a/Mage.Sets/src/mage/cards/m/MetathranElite.java +++ b/Mage.Sets/src/mage/cards/m/MetathranElite.java @@ -32,7 +32,7 @@ public final class MetathranElite extends CardImpl { ConditionalRestrictionEffect effect = new ConditionalRestrictionEffect( new CantBeBlockedSourceEffect(), new EnchantedSourceCondition()); effect.setText(rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java index baa33f0275e..b98e1a84a0f 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java +++ b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java @@ -33,7 +33,7 @@ public final class MidnightCovenant extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); } private MidnightCovenant(final MidnightCovenant card) { diff --git a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java index cd4a2409985..29f1031a942 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java +++ b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java @@ -36,7 +36,7 @@ public final class MidnightEntourage extends CardImpl { this.toughness = new MageInt(3); // Other Aetherborn you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever Midnight Entourage or another Aetherborn you control dies, you draw a card and you lose 1 life. Ability ability = new DiesThisOrAnotherTriggeredAbility(new DrawCardSourceControllerEffect(1, true), false, filter); diff --git a/Mage.Sets/src/mage/cards/m/MightSliver.java b/Mage.Sets/src/mage/cards/m/MightSliver.java index 02e201f54ce..ba0912bb9f7 100644 --- a/Mage.Sets/src/mage/cards/m/MightSliver.java +++ b/Mage.Sets/src/mage/cards/m/MightSliver.java @@ -33,7 +33,7 @@ public final class MightSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } private MightSliver(final MightSliver card) { diff --git a/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java b/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java index 45935bd45bb..3a342dad7b4 100644 --- a/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java +++ b/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java @@ -36,7 +36,7 @@ public final class MilitantInquisitor extends CardImpl { this.toughness = new MageInt(3); // Miltant Inquisitor gets +1/+0 for each Equipment you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); } private MilitantInquisitor(final MilitantInquisitor card) { diff --git a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java index 976f7e0a66b..f907c1884e2 100644 --- a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java +++ b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java @@ -39,7 +39,7 @@ public final class MinaAndDennWildborn extends CardImpl { this.toughness = new MageInt(4); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // {R}{G}, Return a land you control to its owner's hand: Target creature gains trample until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); diff --git a/Mage.Sets/src/mage/cards/m/MindControl.java b/Mage.Sets/src/mage/cards/m/MindControl.java index eb0eca3bc2a..9826ebc5135 100644 --- a/Mage.Sets/src/mage/cards/m/MindControl.java +++ b/Mage.Sets/src/mage/cards/m/MindControl.java @@ -35,7 +35,7 @@ public final class MindControl extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } @@ -48,4 +48,3 @@ public final class MindControl extends CardImpl { return new MindControl(this); } } - diff --git a/Mage.Sets/src/mage/cards/m/MindHarness.java b/Mage.Sets/src/mage/cards/m/MindHarness.java index b9a73294e59..a9c354f0c41 100644 --- a/Mage.Sets/src/mage/cards/m/MindHarness.java +++ b/Mage.Sets/src/mage/cards/m/MindHarness.java @@ -49,7 +49,7 @@ public final class MindHarness extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } private MindHarness(final MindHarness card) { diff --git a/Mage.Sets/src/mage/cards/m/MindbenderSpores.java b/Mage.Sets/src/mage/cards/m/MindbenderSpores.java index 5285ec10bef..21bbaf9b217 100644 --- a/Mage.Sets/src/mage/cards/m/MindbenderSpores.java +++ b/Mage.Sets/src/mage/cards/m/MindbenderSpores.java @@ -44,7 +44,7 @@ public final class MindbenderSpores extends CardImpl { // and "At the beginning of your upkeep, remove a fungus counter from this creature." Ability ability = new BlocksCreatureTriggeredAbility(new AddCountersTargetEffect(CounterType.FUNGUS.createInstance(4))); - SimpleStaticAbility doesntUntapAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect( + SimpleStaticAbility doesntUntapAbility = new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect( new DontUntapInControllersUntapStepSourceEffect(), new SourceHasCounterCondition(CounterType.FUNGUS)) .setText("{this} doesn't untap during your untap step if it has a fungus counter on it")); ability.addEffect(new GainAbilityTargetEffect(doesntUntapAbility, Duration.Custom) diff --git a/Mage.Sets/src/mage/cards/m/MindlashSliver.java b/Mage.Sets/src/mage/cards/m/MindlashSliver.java index 3b14b633026..aa4e1a1340d 100644 --- a/Mage.Sets/src/mage/cards/m/MindlashSliver.java +++ b/Mage.Sets/src/mage/cards/m/MindlashSliver.java @@ -39,7 +39,7 @@ public final class MindlashSliver extends CardImpl { // All Slivers have "{1}, Sacrifice this permanent: Each player discards a card." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardEachPlayerEffect(),new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{1}, Sacrifice this permanent: Each player discards a card.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MindlessNull.java b/Mage.Sets/src/mage/cards/m/MindlessNull.java index 15e2dd604e5..7072bdaff26 100644 --- a/Mage.Sets/src/mage/cards/m/MindlessNull.java +++ b/Mage.Sets/src/mage/cards/m/MindlessNull.java @@ -29,7 +29,7 @@ public final class MindlessNull extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockUnlessYouControlSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockUnlessYouControlSourceEffect(filter))); } private MindlessNull(final MindlessNull card) { diff --git a/Mage.Sets/src/mage/cards/m/MindlockOrb.java b/Mage.Sets/src/mage/cards/m/MindlockOrb.java index 043593aeb5f..d08980a85a6 100644 --- a/Mage.Sets/src/mage/cards/m/MindlockOrb.java +++ b/Mage.Sets/src/mage/cards/m/MindlockOrb.java @@ -26,7 +26,7 @@ public final class MindlockOrb extends CardImpl { // Players can't search libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MindlockRuleModifyingEffect())); + this.addAbility(new SimpleStaticAbility(new MindlockRuleModifyingEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java index 3dcdb086a48..30936273e72 100644 --- a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java +++ b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java @@ -48,10 +48,10 @@ public final class MindwrackLiege extends CardImpl { this.toughness = new MageInt(4); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); // {UR}{UR}{UR}{UR}: You may put a blue or red creature card from your hand onto the battlefield. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter3), new ManaCostsImpl<>("{U/R}{U/R}{U/R}{U/R}"))); diff --git a/Mage.Sets/src/mage/cards/m/MineMineMine.java b/Mage.Sets/src/mage/cards/m/MineMineMine.java index ae286cf6275..12da0746793 100644 --- a/Mage.Sets/src/mage/cards/m/MineMineMine.java +++ b/Mage.Sets/src/mage/cards/m/MineMineMine.java @@ -40,10 +40,10 @@ public final class MineMineMine extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET, TargetController.ANY) .setText("Players have no maximum hand size and don't lose the game for drawing from an empty library"))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MineMineMineDontLoseEffect())); + this.addAbility(new SimpleStaticAbility(new MineMineMineDontLoseEffect())); // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.ANY))); // When Mine, Mine, Mine leaves the battlefield, each player shuffles their hand and graveyard into their library. this.addAbility(new LeavesBattlefieldTriggeredAbility(new ShuffleHandGraveyardAllEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/m/MinotaurTactician.java b/Mage.Sets/src/mage/cards/m/MinotaurTactician.java index ea22e8546f8..dc571ac9486 100644 --- a/Mage.Sets/src/mage/cards/m/MinotaurTactician.java +++ b/Mage.Sets/src/mage/cards/m/MinotaurTactician.java @@ -51,12 +51,12 @@ public final class MinotaurTactician extends CardImpl { // Minotaur Tactician gets +1/+1 as long as you control a white creature. Condition conditionWhite = new PermanentsOnTheBattlefieldCondition(filterWhite); Effect effectWhite = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), conditionWhite, ruleWhite); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectWhite)); + this.addAbility(new SimpleStaticAbility(effectWhite)); // Minotaur Tactician gets +1/+1 as long as you control a blue creature. Condition conditionBlue = new PermanentsOnTheBattlefieldCondition(filterBlue); Effect effectBlue = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), conditionBlue, ruleBlue); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectBlue)); + this.addAbility(new SimpleStaticAbility(effectBlue)); } private MinotaurTactician(final MinotaurTactician card) { diff --git a/Mage.Sets/src/mage/cards/m/MiragePhalanx.java b/Mage.Sets/src/mage/cards/m/MiragePhalanx.java index 5b958d7c16b..aa74aa821be 100644 --- a/Mage.Sets/src/mage/cards/m/MiragePhalanx.java +++ b/Mage.Sets/src/mage/cards/m/MiragePhalanx.java @@ -44,7 +44,7 @@ public class MiragePhalanx extends CardImpl { // except it has haste and loses soulbond. // Exile it at end of combat.” Ability ability = new BeginningOfCombatTriggeredAbility(new MiragePhalanxEffect()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private MiragePhalanx(final MiragePhalanx card) { diff --git a/Mage.Sets/src/mage/cards/m/MirarisWake.java b/Mage.Sets/src/mage/cards/m/MirarisWake.java index 2d41a642c9d..65dc7ed108d 100644 --- a/Mage.Sets/src/mage/cards/m/MirarisWake.java +++ b/Mage.Sets/src/mage/cards/m/MirarisWake.java @@ -24,7 +24,7 @@ public final class MirarisWake extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}{W}"); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); // Whenever you tap a land for mana, add one mana of any type that land produced. AddManaOfAnyTypeProducedEffect effect = new AddManaOfAnyTypeProducedEffect(); diff --git a/Mage.Sets/src/mage/cards/m/MireKavu.java b/Mage.Sets/src/mage/cards/m/MireKavu.java index b596317b817..9f870af381d 100644 --- a/Mage.Sets/src/mage/cards/m/MireKavu.java +++ b/Mage.Sets/src/mage/cards/m/MireKavu.java @@ -31,7 +31,7 @@ public final class MireKavu extends CardImpl { this.toughness = new MageInt(2); // Mire Kavu gets +1/+1 as long as you control a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); } private MireKavu(final MireKavu card) { diff --git a/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java b/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java index ec75b9288f6..352b57f7875 100644 --- a/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java +++ b/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java @@ -41,7 +41,7 @@ public final class MirriWeatherlightDuelist extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new AddContinuousEffectToGame(new MirriWeatherlightDuelistBlockRestrictionEffect()), false)); // As long as Mirri, Weatherlight Duelist is tapped, no more than one creature can attack you each combat. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new ChangeMaxNumberThatCanAttackSourceEffect(1), SourceTappedCondition.TAPPED, "As long as {this} is tapped, no more than one creature can attack you each combat.")); this.addAbility(ability); @@ -100,4 +100,4 @@ class MirriWeatherlightDuelistBlockRestrictionEffect extends RestrictionEffect { } return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MirrorGolem.java b/Mage.Sets/src/mage/cards/m/MirrorGolem.java index 0f172cc7318..731db559799 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorGolem.java +++ b/Mage.Sets/src/mage/cards/m/MirrorGolem.java @@ -40,7 +40,7 @@ public final class MirrorGolem extends CardImpl { this.addAbility(ability); // Mirror Golem has protection from each of the exiled card's card types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MirrorGolemEffect())); + this.addAbility(new SimpleStaticAbility(new MirrorGolemEffect())); } private MirrorGolem(final MirrorGolem card) { diff --git a/Mage.Sets/src/mage/cards/m/MistformWall.java b/Mage.Sets/src/mage/cards/m/MistformWall.java index adf3e40aa7e..d7c2110536e 100644 --- a/Mage.Sets/src/mage/cards/m/MistformWall.java +++ b/Mage.Sets/src/mage/cards/m/MistformWall.java @@ -33,7 +33,7 @@ public final class MistformWall extends CardImpl { this.toughness = new MageInt(4); // Mistform Wall has defender as long as it's a Wall. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasSubtypeCondition(SubType.WALL), "{this} has defender as long as it's a Wall" diff --git a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java index 6ff0f984bec..133c6724b9b 100644 --- a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java +++ b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java @@ -48,7 +48,7 @@ public final class MizzixOfTheIzmagnus extends CardImpl { ), filter, false)); // Instant and sorcery spells you cast cost {1} less to cast for each experience counter you have. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MizzixOfTheIzmagnusCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new MizzixOfTheIzmagnusCostReductionEffect())); } private MizzixOfTheIzmagnus(final MizzixOfTheIzmagnus card) { diff --git a/Mage.Sets/src/mage/cards/m/Moat.java b/Mage.Sets/src/mage/cards/m/Moat.java index 6263b56fe2b..4fedadb2da8 100644 --- a/Mage.Sets/src/mage/cards/m/Moat.java +++ b/Mage.Sets/src/mage/cards/m/Moat.java @@ -31,7 +31,7 @@ public final class Moat extends CardImpl { // Creatures without flying can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); } private Moat(final Moat card) { diff --git a/Mage.Sets/src/mage/cards/m/MobMentality.java b/Mage.Sets/src/mage/cards/m/MobMentality.java index d2cc8f0f697..676f89eab71 100644 --- a/Mage.Sets/src/mage/cards/m/MobMentality.java +++ b/Mage.Sets/src/mage/cards/m/MobMentality.java @@ -41,7 +41,7 @@ public final class MobMentality extends CardImpl { this.addAbility(ability); // Enchanted creature has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); // Whenever all non-Wall creatures you control attack, enchanted creature gets +X/+0 until end of turn, where X is the number of attacking creatures. this.addAbility(new MobMentalityTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/m/Mobilization.java b/Mage.Sets/src/mage/cards/m/Mobilization.java index 65774b02edf..468af208f4a 100644 --- a/Mage.Sets/src/mage/cards/m/Mobilization.java +++ b/Mage.Sets/src/mage/cards/m/Mobilization.java @@ -32,7 +32,7 @@ public final class Mobilization extends CardImpl { public Mobilization(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken(), 1), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MoggConscripts.java b/Mage.Sets/src/mage/cards/m/MoggConscripts.java index 4d43f96772f..ee5b43c3917 100644 --- a/Mage.Sets/src/mage/cards/m/MoggConscripts.java +++ b/Mage.Sets/src/mage/cards/m/MoggConscripts.java @@ -29,7 +29,7 @@ public final class MoggConscripts extends CardImpl { this.toughness = new MageInt(2); // Mogg Conscripts can't attack unless you've cast a creature spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggConscriptsEffect()), new PlayerCastCreatureWatcher()); + this.addAbility(new SimpleStaticAbility(new MoggConscriptsEffect()), new PlayerCastCreatureWatcher()); } private MoggConscripts(final MoggConscripts card) { diff --git a/Mage.Sets/src/mage/cards/m/MoggJailer.java b/Mage.Sets/src/mage/cards/m/MoggJailer.java index 7bc7b29fe23..455abd71cb0 100644 --- a/Mage.Sets/src/mage/cards/m/MoggJailer.java +++ b/Mage.Sets/src/mage/cards/m/MoggJailer.java @@ -37,7 +37,7 @@ public final class MoggJailer extends CardImpl { // Mogg Jailer can't attack if defending player controls an untapped creature with power 2 or less. Effect effect = new CantAttackIfDefenderControlsPermanent(filter); effect.setText("Mogg Jailer can't attack if defending player controls an untapped creature with power 2 or less."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MoggJailer(final MoggJailer card) { diff --git a/Mage.Sets/src/mage/cards/m/MoggSquad.java b/Mage.Sets/src/mage/cards/m/MoggSquad.java index 188a1176870..2eeaed0e6e7 100644 --- a/Mage.Sets/src/mage/cards/m/MoggSquad.java +++ b/Mage.Sets/src/mage/cards/m/MoggSquad.java @@ -39,7 +39,7 @@ public final class MoggSquad extends CardImpl { // Mogg Squad gets -1/-1 for each other creature on the battlefield. DynamicValue amount = new SignInversionDynamicValue(new PermanentsOnBattlefieldCount(filter)); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoggToady.java b/Mage.Sets/src/mage/cards/m/MoggToady.java index 3a6371c12d5..5a7afdedee8 100644 --- a/Mage.Sets/src/mage/cards/m/MoggToady.java +++ b/Mage.Sets/src/mage/cards/m/MoggToady.java @@ -29,10 +29,10 @@ public final class MoggToady extends CardImpl { this.toughness = new MageInt(2); // Mogg Toady can't attack unless you control more creatures than defending player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggToadyCantAttackEffect())); + this.addAbility(new SimpleStaticAbility(new MoggToadyCantAttackEffect())); // Mogg Toady can't block unless you control more creatures than attacking player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggToadyCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new MoggToadyCantBlockEffect())); } private MoggToady(final MoggToady card) { diff --git a/Mage.Sets/src/mage/cards/m/MogissWarhound.java b/Mage.Sets/src/mage/cards/m/MogissWarhound.java index 91d04dc59f5..5240639d5bf 100644 --- a/Mage.Sets/src/mage/cards/m/MogissWarhound.java +++ b/Mage.Sets/src/mage/cards/m/MogissWarhound.java @@ -38,7 +38,7 @@ public final class MogissWarhound extends CardImpl { // Enchanted creature gets +2/+2 and attacks each turn if able. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MoldervineCloak.java b/Mage.Sets/src/mage/cards/m/MoldervineCloak.java index 6681efbd7b4..0981f328a20 100644 --- a/Mage.Sets/src/mage/cards/m/MoldervineCloak.java +++ b/Mage.Sets/src/mage/cards/m/MoldervineCloak.java @@ -34,7 +34,7 @@ public final class MoldervineCloak extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // Dredge 2 this.addAbility(new DredgeAbility(2)); } diff --git a/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java b/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java index 330d135460c..b6842794785 100644 --- a/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java +++ b/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java @@ -27,7 +27,7 @@ public final class MoldgrafScavenger extends CardImpl { this.toughness = new MageInt(4); // Delirium — Moldgraf Scavenger gets +3/+0 as long as there are four or more card types among cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +3/+0 as long as there are four or more card types among cards in your graveyard")) diff --git a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java index 1afcbfd47c8..342a730e1de 100644 --- a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java +++ b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java @@ -41,7 +41,7 @@ public final class MoltingSnakeskin extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0 and has "{2}{B}: Regenerate this creature." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 0)); Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}")), AttachmentType.AURA); effect.setText("and has \"{2}{B}: Regenerate this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/Momentum.java b/Mage.Sets/src/mage/cards/m/Momentum.java index 98f197864d4..ce4010e725b 100644 --- a/Mage.Sets/src/mage/cards/m/Momentum.java +++ b/Mage.Sets/src/mage/cards/m/Momentum.java @@ -42,7 +42,7 @@ public final class Momentum extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.GROWTH.createInstance(), true), true)); // Enchanted creature gets +1/+1 for each growth counter on Momentum. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new CountersSourceCount(CounterType.GROWTH), new CountersSourceCount(CounterType.GROWTH)))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(new CountersSourceCount(CounterType.GROWTH), new CountersSourceCount(CounterType.GROWTH)))); } private Momentum(final Momentum card) { diff --git a/Mage.Sets/src/mage/cards/m/MonasterySiege.java b/Mage.Sets/src/mage/cards/m/MonasterySiege.java index 31ad5df0908..ab0074437dd 100644 --- a/Mage.Sets/src/mage/cards/m/MonasterySiege.java +++ b/Mage.Sets/src/mage/cards/m/MonasterySiege.java @@ -41,7 +41,7 @@ public final class MonasterySiege extends CardImpl { "• Khans — At the beginning of your draw step, draw an additional card, then discard a card.")); // * Dragons - Spells your opponents cast that target you or a permanent you control cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MonasterySiegeCostIncreaseEffect())); + this.addAbility(new SimpleStaticAbility(new MonasterySiegeCostIncreaseEffect())); } private MonasterySiege(final MonasterySiege card) { diff --git a/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java b/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java index 73186cb514f..96851a099be 100644 --- a/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java +++ b/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java @@ -46,7 +46,7 @@ public final class MondrakGloryDominus extends CardImpl { this.toughness = new MageInt(4); // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CreateTwiceThatManyTokensEffect())); + this.addAbility(new SimpleStaticAbility(new CreateTwiceThatManyTokensEffect())); // {1}{W/P}{W/P}, Sacrifice two other artifacts and/or creatures: Put an indestructible counter on Mondrak, Glory Dominus. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java b/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java index 553c26ed393..488f47d4375 100644 --- a/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java +++ b/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java @@ -45,7 +45,7 @@ public final class MonkeyMonkeyMonkey extends CardImpl { // Monkey Monkey Monkey gets +1/+1 for each nonland permanent whose name begins with the chosen letter. MonkeyMonkeyMonkeyCount count = new MonkeyMonkeyMonkeyCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java b/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java index 35f4424cd8e..4ae3a461a11 100644 --- a/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java +++ b/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java @@ -24,7 +24,7 @@ public final class MoonsilverSpear extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature attacks, create a 4/4 white Angel creature token with flying. this.addAbility(new AttacksAttachedTriggeredAbility(new CreateTokenEffect(new AngelToken()))); diff --git a/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java b/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java index 3ea588d0e4d..2ac12774623 100644 --- a/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java +++ b/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java @@ -28,7 +28,7 @@ public final class MoorlandDrifter extends CardImpl { // Delirium — Moorland Drifter has flying as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), DeliriumCondition.instance, "Delirium — Moorland Drifter has flying as long as there are four or more card types among cards in your graveyard."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CardTypesInGraveyardHint.YOU)); + this.addAbility(new SimpleStaticAbility(effect).addHint(CardTypesInGraveyardHint.YOU)); } private MoorlandDrifter(final MoorlandDrifter card) { diff --git a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java index b52929c1e9b..52a2565d93d 100644 --- a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java +++ b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java @@ -46,7 +46,7 @@ public final class MortalObstinacy extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals combat damage to a player, you may sacrifice Mortal Obstinacy. If you do, destroy target enchantment. this.addAbility(new MortalObstinacyAbility()); @@ -91,4 +91,3 @@ class MortalObstinacyAbility extends TriggeredAbilityImpl { return damageEvent.isCombatDamage() && damageMakingCreature != null && damageMakingCreature.getAttachments().contains(this.getSourceId()); } } - diff --git a/Mage.Sets/src/mage/cards/m/Mortarpod.java b/Mage.Sets/src/mage/cards/m/Mortarpod.java index 886cff471e4..2344a3902e7 100644 --- a/Mage.Sets/src/mage/cards/m/Mortarpod.java +++ b/Mage.Sets/src/mage/cards/m/Mortarpod.java @@ -36,7 +36,7 @@ public final class Mortarpod extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to any target." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 1)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(0, 1)); SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MountainStronghold.java b/Mage.Sets/src/mage/cards/m/MountainStronghold.java index a02af4d88c8..96c206defe8 100644 --- a/Mage.Sets/src/mage/cards/m/MountainStronghold.java +++ b/Mage.Sets/src/mage/cards/m/MountainStronghold.java @@ -31,7 +31,7 @@ public final class MountainStronghold extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Red legendary creatures you control have "bands with other legendary creatures." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter) .withForceQuotes() )); diff --git a/Mage.Sets/src/mage/cards/m/Mourning.java b/Mage.Sets/src/mage/cards/m/Mourning.java index 51219e2464e..5e4b8de0111 100644 --- a/Mage.Sets/src/mage/cards/m/Mourning.java +++ b/Mage.Sets/src/mage/cards/m/Mourning.java @@ -34,7 +34,7 @@ public final class Mourning extends CardImpl { this.addAbility(ability); // Enchanted creature gets -2/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, 0))); // {B}: Return Mourning to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}"))); diff --git a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java index 43bbc351f89..a453cec7cf4 100644 --- a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java +++ b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java @@ -51,7 +51,7 @@ public final class MudbrawlerCohort extends CardImpl { // Mudbrawler Cohort gets +1/+1 as long as you control another red creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MudbrawlerCohort(final MudbrawlerCohort card) { diff --git a/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java b/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java index 6544b7ccbd7..2ad815a2701 100644 --- a/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java +++ b/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java @@ -38,18 +38,18 @@ public final class MulDayaChannelers extends CardImpl { this.toughness = new MageInt(2); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is a creature card, Mul Daya Channelers gets +3/+3. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(CardType.CREATURE), rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // As long as the top card of your library is a land card, Mul Daya Channelers has "T: Add two mana of any one color." SimpleManaAbility manaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(manaAbility, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(CardType.LAND), "As long as the top card of your library is a land card, Mul Daya Channelers has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java b/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java index 043ec2c4501..25a974f5b09 100644 --- a/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java +++ b/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java @@ -48,7 +48,7 @@ public final class MuldrothaTheGravetide extends CardImpl { this.toughness = new MageInt(6); // During each of your turns, you may play up to one permanent card of each permanent type from your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MuldrothaTheGravetideCastFromGraveyardEffect()) + this.addAbility(new SimpleStaticAbility(new MuldrothaTheGravetideCastFromGraveyardEffect()) .setIdentifier(MageIdentifier.MuldrothaTheGravetideWatcher), new MuldrothaTheGravetideWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MultanisHarmony.java b/Mage.Sets/src/mage/cards/m/MultanisHarmony.java index 42215041625..85a9ee70d94 100644 --- a/Mage.Sets/src/mage/cards/m/MultanisHarmony.java +++ b/Mage.Sets/src/mage/cards/m/MultanisHarmony.java @@ -37,7 +37,7 @@ public final class MultanisHarmony extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AnyColorManaAbility(), + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new AnyColorManaAbility(), AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: Add one mana of any color.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MunghaWurm.java b/Mage.Sets/src/mage/cards/m/MunghaWurm.java index 809b7633093..a60da7bdb8c 100644 --- a/Mage.Sets/src/mage/cards/m/MunghaWurm.java +++ b/Mage.Sets/src/mage/cards/m/MunghaWurm.java @@ -32,7 +32,7 @@ public final class MunghaWurm extends CardImpl { this.toughness = new MageInt(5); // You can't untap more than one land during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MunghaWurmEffect())); + this.addAbility(new SimpleStaticAbility(new MunghaWurmEffect())); } private MunghaWurm(final MunghaWurm card) { diff --git a/Mage.Sets/src/mage/cards/m/MurderersAxe.java b/Mage.Sets/src/mage/cards/m/MurderersAxe.java index 8f38fd93707..5dc98fa364f 100644 --- a/Mage.Sets/src/mage/cards/m/MurderersAxe.java +++ b/Mage.Sets/src/mage/cards/m/MurderersAxe.java @@ -24,7 +24,7 @@ public final class MurderersAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // Equip — Discard a card. this.addAbility(new EquipAbility(Outcome.AddAbility, new DiscardCardCost(), false)); diff --git a/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java b/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java index 27e6e1826dc..896124b7cb0 100644 --- a/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java +++ b/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java @@ -40,13 +40,13 @@ public final class MurkfiendLiege extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterGreen, true))); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterBlue, true))); // Untap all green and/or blue creatures you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); + this.addAbility(new SimpleStaticAbility(new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MuscleSliver.java b/Mage.Sets/src/mage/cards/m/MuscleSliver.java index 8872ba64f3b..c67f236ff09 100644 --- a/Mage.Sets/src/mage/cards/m/MuscleSliver.java +++ b/Mage.Sets/src/mage/cards/m/MuscleSliver.java @@ -32,7 +32,7 @@ public final class MuscleSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private MuscleSliver(final MuscleSliver card) { diff --git a/Mage.Sets/src/mage/cards/m/Muzzle.java b/Mage.Sets/src/mage/cards/m/Muzzle.java index 2321caf2a6a..4be568b60ce 100644 --- a/Mage.Sets/src/mage/cards/m/Muzzle.java +++ b/Mage.Sets/src/mage/cards/m/Muzzle.java @@ -35,7 +35,7 @@ public final class Muzzle extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Prevent all damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); } diff --git a/Mage.Sets/src/mage/cards/m/MycosynthFiend.java b/Mage.Sets/src/mage/cards/m/MycosynthFiend.java index e13007a36b0..525a97bfa7f 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthFiend.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthFiend.java @@ -29,7 +29,7 @@ public final class MycosynthFiend extends CardImpl { this.toughness = new MageInt(2); DynamicValue value = OpponentsPoisonCountersCount.instance; - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); } private MycosynthFiend(final MycosynthFiend card) { diff --git a/Mage.Sets/src/mage/cards/m/MycosynthGolem.java b/Mage.Sets/src/mage/cards/m/MycosynthGolem.java index 233a5a05250..343f56d43a3 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthGolem.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthGolem.java @@ -36,7 +36,7 @@ public final class MycosynthGolem extends CardImpl { this.addAbility(new AffinityForArtifactsAbility()); // Artifact creature spells you cast have affinity for artifacts. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(new AffinityForArtifactsAbility(), filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect(new AffinityForArtifactsAbility(), filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java index 3b73e82ef3c..f9980c60f77 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java @@ -29,13 +29,13 @@ public final class MycosynthLattice extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // All permanents are artifacts in addition to their other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PermanentsAreArtifactsEffect())); + this.addAbility(new SimpleStaticAbility(new PermanentsAreArtifactsEffect())); // All cards that aren't on the battlefield, spells, and permanents are colorless. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EverythingIsColorlessEffect())); + this.addAbility(new SimpleStaticAbility(new EverythingIsColorlessEffect())); // Players may spend mana as though it were mana of any color. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaCanBeSpentAsAnyColorEffect()); + Ability ability = new SimpleStaticAbility(new ManaCanBeSpentAsAnyColorEffect()); ability.addHint(new StaticHint("(XMage hint: You can use floating mana by clicking on the related symbol of the needed mana type in your mana pool player area.)")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java index 5592bfee97b..4b726e19de2 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java @@ -50,7 +50,7 @@ public final class MyojinOfCleansingFire extends CardImpl { // Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Cleansing Fire has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Cleansing Fire: Destroy all other creatures. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java index 0d357802861..2e27b5c0ed7 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java @@ -44,7 +44,7 @@ public final class MyojinOfInfiniteRage extends CardImpl { // Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Infinite Rage has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(StaticFilters.FILTER_LANDS), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java index 72d5f81c22e..3949c5c80c2 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java @@ -42,7 +42,7 @@ public final class MyojinOfNightsReach extends CardImpl { // Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Night's Reach has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards their hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java index 050b50bb2eb..15f45e0210d 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java @@ -47,7 +47,7 @@ public final class MyojinOfSeeingWinds extends CardImpl { // Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Seeing Winds has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); diff --git a/Mage.Sets/src/mage/cards/m/MyrAdapter.java b/Mage.Sets/src/mage/cards/m/MyrAdapter.java index 4446cd9baca..74e1872e563 100644 --- a/Mage.Sets/src/mage/cards/m/MyrAdapter.java +++ b/Mage.Sets/src/mage/cards/m/MyrAdapter.java @@ -28,7 +28,7 @@ public final class MyrAdapter extends CardImpl { // Myr Adapter gets +1/+1 for each Equipment attached to it. EquipmentAttachedCount amount = new EquipmentAttachedCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); } private MyrAdapter(final MyrAdapter card) { diff --git a/Mage.Sets/src/mage/cards/m/MyrMatrix.java b/Mage.Sets/src/mage/cards/m/MyrMatrix.java index d1d7b106a57..b51b04913d3 100644 --- a/Mage.Sets/src/mage/cards/m/MyrMatrix.java +++ b/Mage.Sets/src/mage/cards/m/MyrMatrix.java @@ -33,7 +33,7 @@ public final class MyrMatrix extends CardImpl { public MyrMatrix (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); this.addAbility(IndestructibleAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MyrToken()), new GenericManaCost(5))); } diff --git a/Mage.Sets/src/mage/cards/m/MyrPrototype.java b/Mage.Sets/src/mage/cards/m/MyrPrototype.java index 876fe944317..068124baae6 100644 --- a/Mage.Sets/src/mage/cards/m/MyrPrototype.java +++ b/Mage.Sets/src/mage/cards/m/MyrPrototype.java @@ -36,7 +36,7 @@ public final class MyrPrototype extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); // Myr Prototype can't attack or block unless you pay {1} for each +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MyrPrototypeCantAttackUnlessYouPayEffect())); + this.addAbility(new SimpleStaticAbility(new MyrPrototypeCantAttackUnlessYouPayEffect())); } private MyrPrototype(final MyrPrototype card) { diff --git a/Mage.Sets/src/mage/cards/m/MyrWelder.java b/Mage.Sets/src/mage/cards/m/MyrWelder.java index 802256bcd18..c48b3c2bb69 100644 --- a/Mage.Sets/src/mage/cards/m/MyrWelder.java +++ b/Mage.Sets/src/mage/cards/m/MyrWelder.java @@ -37,7 +37,7 @@ public final class MyrWelder extends CardImpl { this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); // Myr Welder has all activated abilities of all cards exiled with it - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MyrWelderContinuousEffect())); + this.addAbility(new SimpleStaticAbility(new MyrWelderContinuousEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MysticMight.java b/Mage.Sets/src/mage/cards/m/MysticMight.java index c7de6548bc0..ad13a0a720e 100644 --- a/Mage.Sets/src/mage/cards/m/MysticMight.java +++ b/Mage.Sets/src/mage/cards/m/MysticMight.java @@ -45,7 +45,7 @@ public final class MysticMight extends CardImpl { // Enchanted land has "{tap}: Target creature gets +2/+2 until end of turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +2/+2 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MysticPenitent.java b/Mage.Sets/src/mage/cards/m/MysticPenitent.java index 37e88f8b6ac..76fd5d2b364 100644 --- a/Mage.Sets/src/mage/cards/m/MysticPenitent.java +++ b/Mage.Sets/src/mage/cards/m/MysticPenitent.java @@ -33,7 +33,7 @@ public final class MysticPenitent extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Mystic Penitent gets +1/+1 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), ThresholdCondition.instance, "As long as seven or more cards are in your graveyard, {this} gets +1/+1" )); diff --git a/Mage.Sets/src/mage/cards/m/MysticRestraints.java b/Mage.Sets/src/mage/cards/m/MysticRestraints.java index 9ca463218d5..27da7a1efe6 100644 --- a/Mage.Sets/src/mage/cards/m/MysticRestraints.java +++ b/Mage.Sets/src/mage/cards/m/MysticRestraints.java @@ -38,7 +38,7 @@ public final class MysticRestraints extends CardImpl { // When Mystic Restraints enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private MysticRestraints(final MysticRestraints card) { diff --git a/Mage.Sets/src/mage/cards/m/MysticVeil.java b/Mage.Sets/src/mage/cards/m/MysticVeil.java index ba4d6e2ae31..eb974ddf57c 100644 --- a/Mage.Sets/src/mage/cards/m/MysticVeil.java +++ b/Mage.Sets/src/mage/cards/m/MysticVeil.java @@ -42,7 +42,7 @@ public final class MysticVeil extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private MysticVeil(final MysticVeil card) { diff --git a/Mage.Sets/src/mage/cards/m/MythicProportions.java b/Mage.Sets/src/mage/cards/m/MythicProportions.java index 66e5dcdd8b3..d1365e6cb7e 100644 --- a/Mage.Sets/src/mage/cards/m/MythicProportions.java +++ b/Mage.Sets/src/mage/cards/m/MythicProportions.java @@ -38,7 +38,7 @@ public final class MythicProportions extends CardImpl { this.addAbility(ability); // Enchanted creature gets +8/+8 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(8, 8)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(8, 8)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); -- 2.47.2 From 701896bd817d4ebff3d7c24bad67edd47ffb12f1 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:14:29 -0500 Subject: [PATCH 18/50] refactor: SimpleStaticAbility default zone (cards N O P) --- Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java | 2 +- Mage.Sets/src/mage/cards/n/NathsElite.java | 2 +- Mage.Sets/src/mage/cards/n/NaturesRevolt.java | 2 +- Mage.Sets/src/mage/cards/n/NayaHushblade.java | 2 +- Mage.Sets/src/mage/cards/n/NazgulBattleMace.java | 2 +- Mage.Sets/src/mage/cards/n/NearheathPilgrim.java | 2 +- Mage.Sets/src/mage/cards/n/NecromancersMagemark.java | 4 ++-- Mage.Sets/src/mage/cards/n/Necropotence.java | 2 +- Mage.Sets/src/mage/cards/n/Necropouncer.java | 4 ++-- Mage.Sets/src/mage/cards/n/NecroticPlague.java | 2 +- Mage.Sets/src/mage/cards/n/NefariousLich.java | 4 ++-- Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java | 4 ++-- Mage.Sets/src/mage/cards/n/NehebTheWorthy.java | 4 ++-- Mage.Sets/src/mage/cards/n/NephaliaAcademy.java | 4 ++-- Mage.Sets/src/mage/cards/n/NerfHerder.java | 4 ++-- Mage.Sets/src/mage/cards/n/NettleSentinel.java | 2 +- Mage.Sets/src/mage/cards/n/NeurokHoversail.java | 2 +- Mage.Sets/src/mage/cards/n/NeurokSpy.java | 2 +- Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java | 2 +- Mage.Sets/src/mage/cards/n/Nevermore.java | 2 +- Mage.Sets/src/mage/cards/n/NewHorizons.java | 2 +- Mage.Sets/src/mage/cards/n/NewPerspectives.java | 2 +- Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java | 2 +- Mage.Sets/src/mage/cards/n/NightMarketGuard.java | 2 +- Mage.Sets/src/mage/cards/n/NightRevelers.java | 2 +- Mage.Sets/src/mage/cards/n/NightfireGiant.java | 2 +- Mage.Sets/src/mage/cards/n/NightmareLash.java | 2 +- Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/n/NightshadePeddler.java | 2 +- Mage.Sets/src/mage/cards/n/NightveilSpecter.java | 2 +- Mage.Sets/src/mage/cards/n/NimLasher.java | 2 +- Mage.Sets/src/mage/cards/n/NimShambler.java | 2 +- Mage.Sets/src/mage/cards/n/NimShrieker.java | 2 +- Mage.Sets/src/mage/cards/n/NimbusNaiad.java | 2 +- Mage.Sets/src/mage/cards/n/NimbusWings.java | 2 +- Mage.Sets/src/mage/cards/n/NissasChosen.java | 2 +- Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java | 4 ++-- Mage.Sets/src/mage/cards/n/NobleQuarry.java | 4 ++-- Mage.Sets/src/mage/cards/n/NogiDracoZealot.java | 2 +- Mage.Sets/src/mage/cards/n/NorwoodRiders.java | 2 +- Mage.Sets/src/mage/cards/n/NotionThief.java | 2 +- Mage.Sets/src/mage/cards/n/NoviceKnight.java | 2 +- Mage.Sets/src/mage/cards/n/NoxiousField.java | 2 +- Mage.Sets/src/mage/cards/n/NullChamber.java | 2 +- Mage.Sets/src/mage/cards/n/NullProfusion.java | 4 ++-- Mage.Sets/src/mage/cards/n/NullRod.java | 2 +- Mage.Sets/src/mage/cards/n/NumbingDose.java | 2 +- Mage.Sets/src/mage/cards/n/NyleasEmissary.java | 2 +- Mage.Sets/src/mage/cards/n/NyxInfusion.java | 2 +- Mage.Sets/src/mage/cards/n/Nyxathid.java | 2 +- Mage.Sets/src/mage/cards/n/NyxbornEidolon.java | 2 +- Mage.Sets/src/mage/cards/n/NyxbornRollicker.java | 2 +- Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java | 2 +- Mage.Sets/src/mage/cards/n/NyxbornTriton.java | 2 +- Mage.Sets/src/mage/cards/n/NyxbornWolf.java | 2 +- Mage.Sets/src/mage/cards/o/ONaginata.java | 2 +- Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java | 2 +- Mage.Sets/src/mage/cards/o/Oakenform.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfAjani.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfNissa.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfTeferi.java | 2 +- Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java | 2 +- Mage.Sets/src/mage/cards/o/OathswornGiant.java | 2 +- Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java | 2 +- Mage.Sets/src/mage/cards/o/OblivionCrown.java | 2 +- Mage.Sets/src/mage/cards/o/ObscuringAether.java | 2 +- Mage.Sets/src/mage/cards/o/ObservantAlseid.java | 2 +- Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java | 2 +- Mage.Sets/src/mage/cards/o/ObsidianFireheart.java | 2 +- Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java | 2 +- Mage.Sets/src/mage/cards/o/Occupation.java | 2 +- Mage.Sets/src/mage/cards/o/OcularHalo.java | 2 +- Mage.Sets/src/mage/cards/o/OgreJailbreaker.java | 2 +- Mage.Sets/src/mage/cards/o/OgreSlumlord.java | 2 +- Mage.Sets/src/mage/cards/o/OgresCleaver.java | 2 +- Mage.Sets/src/mage/cards/o/OhabiCaleria.java | 2 +- Mage.Sets/src/mage/cards/o/OketraTheTrue.java | 2 +- Mage.Sets/src/mage/cards/o/OketrasMonument.java | 2 +- Mage.Sets/src/mage/cards/o/OkinaNightwatch.java | 2 +- Mage.Sets/src/mage/cards/o/Okk.java | 4 ++-- Mage.Sets/src/mage/cards/o/OmenMachine.java | 2 +- Mage.Sets/src/mage/cards/o/Omniscience.java | 3 +-- Mage.Sets/src/mage/cards/o/OnSerrasWings.java | 2 +- Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java | 2 +- Mage.Sets/src/mage/cards/o/OneThousandLashes.java | 2 +- Mage.Sets/src/mage/cards/o/OneWithTheWind.java | 2 +- Mage.Sets/src/mage/cards/o/Opalescence.java | 2 +- Mage.Sets/src/mage/cards/o/OpalineBracers.java | 2 +- Mage.Sets/src/mage/cards/o/OpenSeason.java | 2 +- Mage.Sets/src/mage/cards/o/OppressiveRays.java | 4 ++-- Mage.Sets/src/mage/cards/o/OraclesInsight.java | 2 +- Mage.Sets/src/mage/cards/o/OrbsOfWarding.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrcishOriflamme.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishVeteran.java | 2 +- Mage.Sets/src/mage/cards/o/OrderOfTheStars.java | 2 +- Mage.Sets/src/mage/cards/o/Orgg.java | 4 ++-- Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java | 2 +- Mage.Sets/src/mage/cards/o/OutlandColossus.java | 2 +- Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java | 4 ++-- Mage.Sets/src/mage/cards/p/Pacifism.java | 2 +- Mage.Sets/src/mage/cards/p/PaintersServant.java | 2 +- Mage.Sets/src/mage/cards/p/PalaceGuard.java | 2 +- Mage.Sets/src/mage/cards/p/PalisadeGiant.java | 2 +- Mage.Sets/src/mage/cards/p/Panharmonicon.java | 2 +- Mage.Sets/src/mage/cards/p/PaperTiger.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java | 2 +- Mage.Sets/src/mage/cards/p/ParallaxDementia.java | 2 +- Mage.Sets/src/mage/cards/p/ParallelLives.java | 2 +- Mage.Sets/src/mage/cards/p/ParallelThoughts.java | 2 +- Mage.Sets/src/mage/cards/p/Paralyze.java | 2 +- Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java | 2 +- Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java | 2 +- Mage.Sets/src/mage/cards/p/Parapet.java | 2 +- Mage.Sets/src/mage/cards/p/Pariah.java | 2 +- Mage.Sets/src/mage/cards/p/PariahsShield.java | 2 +- Mage.Sets/src/mage/cards/p/PathbreakerWurm.java | 2 +- Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java | 2 +- Mage.Sets/src/mage/cards/p/PathwayArrows.java | 2 +- Mage.Sets/src/mage/cards/p/Peacekeeper.java | 2 +- Mage.Sets/src/mage/cards/p/PearlMedallion.java | 2 +- Mage.Sets/src/mage/cards/p/PendrellFlux.java | 2 +- Mage.Sets/src/mage/cards/p/PendrellMists.java | 2 +- Mage.Sets/src/mage/cards/p/PennonBlade.java | 2 +- Mage.Sets/src/mage/cards/p/PentarchWard.java | 2 +- Mage.Sets/src/mage/cards/p/PeregrineMask.java | 2 +- Mage.Sets/src/mage/cards/p/PersonalSanctuary.java | 2 +- Mage.Sets/src/mage/cards/p/Persuasion.java | 2 +- Mage.Sets/src/mage/cards/p/PetrifiedPlating.java | 2 +- Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java | 2 +- Mage.Sets/src/mage/cards/p/PhantomGeneral.java | 2 +- Mage.Sets/src/mage/cards/p/PheresBandWarchief.java | 2 +- Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java | 4 ++-- Mage.Sets/src/mage/cards/p/Phyresis.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianColossus.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhyrexianHydra.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianIngester.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java | 2 +- Mage.Sets/src/mage/cards/p/Phytohydra.java | 2 +- Mage.Sets/src/mage/cards/p/Piety.java | 2 +- Mage.Sets/src/mage/cards/p/PillarOfWar.java | 2 +- Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java | 4 ++-- Mage.Sets/src/mage/cards/p/PinToTheEarth.java | 2 +- Mage.Sets/src/mage/cards/p/PiousInterdiction.java | 2 +- Mage.Sets/src/mage/cards/p/PirateShip.java | 2 +- Mage.Sets/src/mage/cards/p/PiratesCutlass.java | 2 +- Mage.Sets/src/mage/cards/p/PistonSledge.java | 2 +- Mage.Sets/src/mage/cards/p/PithingNeedle.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueDrone.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueSliver.java | 2 +- Mage.Sets/src/mage/cards/p/PlanarGate.java | 2 +- Mage.Sets/src/mage/cards/p/PlasmaElemental.java | 2 +- Mage.Sets/src/mage/cards/p/PlatedPegasus.java | 2 +- Mage.Sets/src/mage/cards/p/PlatedSliver.java | 2 +- Mage.Sets/src/mage/cards/p/PlatinumEmperion.java | 2 +- Mage.Sets/src/mage/cards/p/PloKoon.java | 2 +- Mage.Sets/src/mage/cards/p/PlumesOfPeace.java | 2 +- Mage.Sets/src/mage/cards/p/PossessedPortal.java | 2 +- Mage.Sets/src/mage/cards/p/PowerArtifact.java | 2 +- Mage.Sets/src/mage/cards/p/PowerFist.java | 2 +- Mage.Sets/src/mage/cards/p/PowerOfFire.java | 3 +-- Mage.Sets/src/mage/cards/p/PraetorianTrooper.java | 2 +- Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java | 2 +- Mage.Sets/src/mage/cards/p/PredatoryUrge.java | 2 +- Mage.Sets/src/mage/cards/p/PresenceOfGond.java | 2 +- Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java | 2 +- Mage.Sets/src/mage/cards/p/Prickleboar.java | 2 +- Mage.Sets/src/mage/cards/p/PrideSovereign.java | 2 +- Mage.Sets/src/mage/cards/p/PrimalAmulet.java | 2 +- Mage.Sets/src/mage/cards/p/PrimalFrenzy.java | 2 +- Mage.Sets/src/mage/cards/p/PrimalRage.java | 2 +- Mage.Sets/src/mage/cards/p/PrimalVigor.java | 4 ++-- Mage.Sets/src/mage/cards/p/PrimalWhisperer.java | 2 +- Mage.Sets/src/mage/cards/p/PrincessLeia.java | 4 ++-- Mage.Sets/src/mage/cards/p/PrismaticWard.java | 2 +- Mage.Sets/src/mage/cards/p/PrisonTerm.java | 2 +- Mage.Sets/src/mage/cards/p/PrivilegedPosition.java | 2 +- Mage.Sets/src/mage/cards/p/PrizedUnicorn.java | 2 +- Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java | 4 ++-- Mage.Sets/src/mage/cards/p/PropheticRavings.java | 2 +- Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java | 2 +- Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java | 2 +- Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java | 2 +- Mage.Sets/src/mage/cards/p/PryingBlade.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicGift.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicSliver.java | 2 +- Mage.Sets/src/mage/cards/p/PsychicOverload.java | 4 ++-- Mage.Sets/src/mage/cards/p/PsychicPossession.java | 2 +- Mage.Sets/src/mage/cards/p/PulmonicSliver.java | 4 ++-- Mage.Sets/src/mage/cards/p/Purity.java | 2 +- Mage.Sets/src/mage/cards/p/PurphorossEmissary.java | 2 +- Mage.Sets/src/mage/cards/p/PursuitOfFlight.java | 2 +- Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java | 2 +- Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java | 2 +- Mage.Sets/src/mage/cards/p/PyromancersSwath.java | 2 +- 200 files changed, 223 insertions(+), 225 deletions(-) diff --git a/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java b/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java index 18dc6b42585..c951a482827 100644 --- a/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java +++ b/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java @@ -59,7 +59,7 @@ public final class NaruMehaMasterWizard extends CardImpl { this.addAbility(ability); //Other Wizards you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, wizardFilter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, wizardFilter, true))); } private NaruMehaMasterWizard(final NaruMehaMasterWizard card) { diff --git a/Mage.Sets/src/mage/cards/n/NathsElite.java b/Mage.Sets/src/mage/cards/n/NathsElite.java index be06aad9b39..384cf36fec1 100644 --- a/Mage.Sets/src/mage/cards/n/NathsElite.java +++ b/Mage.Sets/src/mage/cards/n/NathsElite.java @@ -31,7 +31,7 @@ public final class NathsElite extends CardImpl { this.toughness = new MageInt(2); // All creatures able to block Nath's Elite do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); // When Nath's Elite enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Nath's Elite. this.addAbility(new EntersBattlefieldTriggeredAbility(new DoIfClashWonEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())))); diff --git a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java index b1e609b262b..b4f8b3d9df3 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java +++ b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java @@ -24,7 +24,7 @@ public final class NaturesRevolt extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // All lands are 2/2 creatures that are still lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAllEffect( new CreatureToken(2, 2, "2/2 creatures"), "lands", filter, Duration.WhileOnBattlefield, false))); } diff --git a/Mage.Sets/src/mage/cards/n/NayaHushblade.java b/Mage.Sets/src/mage/cards/n/NayaHushblade.java index 5a517da0ad8..e42a0764a67 100644 --- a/Mage.Sets/src/mage/cards/n/NayaHushblade.java +++ b/Mage.Sets/src/mage/cards/n/NayaHushblade.java @@ -45,7 +45,7 @@ public final class NayaHushblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Naya Hushblade gets +1/+1 and has shroud. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, Naya Hushblade gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java b/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java index 71530e1acd0..3c2c35c3c84 100644 --- a/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java +++ b/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java @@ -37,7 +37,7 @@ public final class NazgulBattleMace extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has menace, deathtouch, annihilator 1, and // "Whenever an opponent sacrifices a nontoken permanent, put that card onto the battlefield under your control unless that player pays 3 life." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new MenaceAbility(false), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(new MenaceAbility(false), AttachmentType.EQUIPMENT)); ability.addEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", deathtouch")); ability.addEffect(new GainAbilityAttachedEffect(new AnnihilatorAbility(1), AttachmentType.EQUIPMENT).setText(", annihilator 1")); Ability sacTriggerAbility = new SacrificePermanentTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java b/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java index 2fbead4d6e3..b43c96320fe 100644 --- a/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java +++ b/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java @@ -32,7 +32,7 @@ public final class NearheathPilgrim extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Nearheath Pilgrim is paired with another creature, both creatures have lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(LifelinkAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(LifelinkAbility.getInstance(), ruleText))); } private NearheathPilgrim(final NearheathPilgrim card) { diff --git a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java index c5cee4a9c47..cc06e02b374 100644 --- a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java +++ b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java @@ -51,11 +51,11 @@ public final class NecromancersMagemark extends CardImpl { this.addAbility(ability); // Creatures you control that are enchanted get +1/+1. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); this.addAbility(ability); // If a creature you control that's enchanted would die, return it to its owner's hand instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NecromancersMagemarkEffect())); + this.addAbility(new SimpleStaticAbility(new NecromancersMagemarkEffect())); } private NecromancersMagemark(final NecromancersMagemark card) { diff --git a/Mage.Sets/src/mage/cards/n/Necropotence.java b/Mage.Sets/src/mage/cards/n/Necropotence.java index aa1d5d01af0..b274067b770 100644 --- a/Mage.Sets/src/mage/cards/n/Necropotence.java +++ b/Mage.Sets/src/mage/cards/n/Necropotence.java @@ -37,7 +37,7 @@ public final class Necropotence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}{B}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you discard a card, exile that card from your graveyard. Effect effect = new ExileTargetEffect(null, "", Zone.GRAVEYARD); effect.setText("exile that card from your graveyard"); diff --git a/Mage.Sets/src/mage/cards/n/Necropouncer.java b/Mage.Sets/src/mage/cards/n/Necropouncer.java index e6039571923..8608720f3e0 100644 --- a/Mage.Sets/src/mage/cards/n/Necropouncer.java +++ b/Mage.Sets/src/mage/cards/n/Necropouncer.java @@ -28,8 +28,8 @@ public final class Necropouncer extends CardImpl { this.subtype.add(SubType.EQUIPMENT); this.addAbility(new LivingWeaponAbility()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); } diff --git a/Mage.Sets/src/mage/cards/n/NecroticPlague.java b/Mage.Sets/src/mage/cards/n/NecroticPlague.java index 1ec867a870c..3827b308fc9 100644 --- a/Mage.Sets/src/mage/cards/n/NecroticPlague.java +++ b/Mage.Sets/src/mage/cards/n/NecroticPlague.java @@ -47,7 +47,7 @@ public final class NecroticPlague extends CardImpl { ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceEffect()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"At the beginning of your upkeep, sacrifice this creature.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); ability = new DiesAttachedTriggeredAbility(new NecroticPlagueEffect(), "enchanted creature", false); ability.setTargetAdjuster(NecroticPlagueAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/n/NefariousLich.java b/Mage.Sets/src/mage/cards/n/NefariousLich.java index ca78e08e44e..0fb414f2f4b 100644 --- a/Mage.Sets/src/mage/cards/n/NefariousLich.java +++ b/Mage.Sets/src/mage/cards/n/NefariousLich.java @@ -33,10 +33,10 @@ public final class NefariousLich extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}{B}{B}"); // If damage would be dealt to you, exile that many cards from your graveyard instead. If you can't, you lose the game. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NefariousLichDamageReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new NefariousLichDamageReplacementEffect())); // If you would gain life, draw that many cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NefariousLichLifeGainReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new NefariousLichLifeGainReplacementEffect())); // When Nefarious Lich leaves the battlefield, you lose the game. this.addAbility(new LeavesBattlefieldTriggeredAbility(new LoseGameSourceControllerEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java b/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java index de6abb74770..695aa58165a 100644 --- a/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java +++ b/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java @@ -32,7 +32,7 @@ public final class NeglectedHeirloom extends CardImpl { this.secondSideCardClazz = mage.cards.a.AshmouthBlade.class; // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // When equipped creature transforms, transform Neglected Heirloom. this.addAbility(new TransformAbility()); @@ -87,4 +87,4 @@ class NeglectedHeirloomTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { return "When equipped creature transforms, transform Neglected Heirloom."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java index da8cf9a3def..d43b8c12297 100644 --- a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java +++ b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java @@ -44,11 +44,11 @@ public final class NehebTheWorthy extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Other Minotaurs you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); // As long as you have one or fewer cards in hand, Minotaurs you control get +2/+0. Condition condition = new CardsInHandCondition(ComparisonType.FEWER_THAN, 2); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter), condition, "As long as you have one or fewer cards in hand, Minotaurs you control get +2/+0")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java b/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java index 5561f010295..015e6ccd6f9 100644 --- a/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java +++ b/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java @@ -33,7 +33,7 @@ public final class NephaliaAcademy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); // If a spell or ability an opponent controls causes you to discard a card, you may reveal that card and put it on top of your library instead of putting it anywhere else. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NephaliaAcademyEffect())); + this.addAbility(new SimpleStaticAbility(new NephaliaAcademyEffect())); // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); @@ -135,4 +135,4 @@ class NephaliaAcademyEffect extends ReplacementEffectImpl { return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NerfHerder.java b/Mage.Sets/src/mage/cards/n/NerfHerder.java index 4125fb53966..ca46cfaf483 100644 --- a/Mage.Sets/src/mage/cards/n/NerfHerder.java +++ b/Mage.Sets/src/mage/cards/n/NerfHerder.java @@ -29,10 +29,10 @@ public final class NerfHerder extends CardImpl { this.toughness = new MageInt(3); // Monstrosity abilities you activate cost {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); // Each creature you control with a +1/+1 counter on it has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURE_P1P1)) diff --git a/Mage.Sets/src/mage/cards/n/NettleSentinel.java b/Mage.Sets/src/mage/cards/n/NettleSentinel.java index bfabea226f9..508273ce673 100644 --- a/Mage.Sets/src/mage/cards/n/NettleSentinel.java +++ b/Mage.Sets/src/mage/cards/n/NettleSentinel.java @@ -37,7 +37,7 @@ public final class NettleSentinel extends CardImpl { this.toughness = new MageInt(2); // Nettle Sentinel doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you cast a green spell, you may untap Nettle Sentinel. this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); } diff --git a/Mage.Sets/src/mage/cards/n/NeurokHoversail.java b/Mage.Sets/src/mage/cards/n/NeurokHoversail.java index 6a0609e91a0..9d68dac88fe 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokHoversail.java +++ b/Mage.Sets/src/mage/cards/n/NeurokHoversail.java @@ -22,7 +22,7 @@ public final class NeurokHoversail extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/n/NeurokSpy.java b/Mage.Sets/src/mage/cards/n/NeurokSpy.java index 57659344b4b..5e36d76ebb0 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokSpy.java +++ b/Mage.Sets/src/mage/cards/n/NeurokSpy.java @@ -34,7 +34,7 @@ public final class NeurokSpy extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(new FilterArtifactPermanent())); effect.setText("{this} can't be blocked as long as defending player controls an artifact"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NeurokSpy(final NeurokSpy card) { diff --git a/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java b/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java index 38224f1f8c4..1d6d5f62e3d 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java +++ b/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java @@ -31,7 +31,7 @@ public final class NeurokStealthsuit extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); // {U}{U}: Attach Neurok Stealthsuit to target creature you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/n/Nevermore.java b/Mage.Sets/src/mage/cards/n/Nevermore.java index a43c9036d69..e56992d7d39 100644 --- a/Mage.Sets/src/mage/cards/n/Nevermore.java +++ b/Mage.Sets/src/mage/cards/n/Nevermore.java @@ -30,7 +30,7 @@ public final class Nevermore extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME))); // The named card can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NevermoreEffect2())); + this.addAbility(new SimpleStaticAbility(new NevermoreEffect2())); } diff --git a/Mage.Sets/src/mage/cards/n/NewHorizons.java b/Mage.Sets/src/mage/cards/n/NewHorizons.java index 634f76cf786..e75698ce720 100644 --- a/Mage.Sets/src/mage/cards/n/NewHorizons.java +++ b/Mage.Sets/src/mage/cards/n/NewHorizons.java @@ -52,7 +52,7 @@ public final class NewHorizons extends CardImpl { Ability gainedAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NewHorizons(final NewHorizons card) { diff --git a/Mage.Sets/src/mage/cards/n/NewPerspectives.java b/Mage.Sets/src/mage/cards/n/NewPerspectives.java index 5c5974e6bed..5d939edb1ee 100644 --- a/Mage.Sets/src/mage/cards/n/NewPerspectives.java +++ b/Mage.Sets/src/mage/cards/n/NewPerspectives.java @@ -31,7 +31,7 @@ public final class NewPerspectives extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(3))); // As long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NewPerspectivesCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new NewPerspectivesCostModificationEffect())); } private NewPerspectives(final NewPerspectives card) { diff --git a/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java b/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java index cbefd0bb256..5bfbdf46d97 100644 --- a/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java +++ b/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java @@ -43,7 +43,7 @@ public final class NezahalPrimalTide extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever an opponent casts a noncreature spell, draw a card. this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/n/NightMarketGuard.java b/Mage.Sets/src/mage/cards/n/NightMarketGuard.java index 3b560ac06a7..e07ec4859db 100644 --- a/Mage.Sets/src/mage/cards/n/NightMarketGuard.java +++ b/Mage.Sets/src/mage/cards/n/NightMarketGuard.java @@ -26,7 +26,7 @@ public final class NightMarketGuard extends CardImpl { this.toughness = new MageInt(1); // Night Market Guard can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); } private NightMarketGuard(final NightMarketGuard card) { diff --git a/Mage.Sets/src/mage/cards/n/NightRevelers.java b/Mage.Sets/src/mage/cards/n/NightRevelers.java index f4cf1cec503..14b188d4cb5 100644 --- a/Mage.Sets/src/mage/cards/n/NightRevelers.java +++ b/Mage.Sets/src/mage/cards/n/NightRevelers.java @@ -32,7 +32,7 @@ public final class NightRevelers extends CardImpl { this.toughness = new MageInt(4); // Night Revelers has haste as long as an opponent controls a Human. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance()), new OpponentControlsPermanentCondition(filter), "{this} has haste as long as an opponent controls a Human."))); diff --git a/Mage.Sets/src/mage/cards/n/NightfireGiant.java b/Mage.Sets/src/mage/cards/n/NightfireGiant.java index 52dc31cd9fb..812bb86f0cb 100644 --- a/Mage.Sets/src/mage/cards/n/NightfireGiant.java +++ b/Mage.Sets/src/mage/cards/n/NightfireGiant.java @@ -38,7 +38,7 @@ public final class NightfireGiant extends CardImpl { this.toughness = new MageInt(3); // Nightfire Giant gets +1/+1 as long as you control a Mountain. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {4}{R}: Nightfire Giant deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); diff --git a/Mage.Sets/src/mage/cards/n/NightmareLash.java b/Mage.Sets/src/mage/cards/n/NightmareLash.java index 0a01d2a4fba..9fcf2bf59ce 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareLash.java +++ b/Mage.Sets/src/mage/cards/n/NightmareLash.java @@ -30,7 +30,7 @@ public final class NightmareLash extends CardImpl { // Equipped creature gets +1/+1 for each Swamp you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip-Pay 3 life. this.addAbility(new EquipAbility(Outcome.BoostCreature, new PayLifeCost(3))); } diff --git a/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java b/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java index 1965741a116..81129d9e843 100644 --- a/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java @@ -39,7 +39,7 @@ public final class NightscapeFamiliar extends CardImpl { this.toughness = new MageInt(1); // Blue spells and red spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // {1}{B}: Regenerate Nightscape Familiar. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); diff --git a/Mage.Sets/src/mage/cards/n/NightshadePeddler.java b/Mage.Sets/src/mage/cards/n/NightshadePeddler.java index e3a429ef041..5fd43bc61cf 100644 --- a/Mage.Sets/src/mage/cards/n/NightshadePeddler.java +++ b/Mage.Sets/src/mage/cards/n/NightshadePeddler.java @@ -32,7 +32,7 @@ public final class NightshadePeddler extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Nightshade Peddler is paired with another creature, both creatures have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(DeathtouchAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(DeathtouchAbility.getInstance(), ruleText))); } private NightshadePeddler(final NightshadePeddler card) { diff --git a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java index 7029580f915..11a910f50bb 100644 --- a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java +++ b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java @@ -53,7 +53,7 @@ public final class NightveilSpecter extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new NightveilSpecterExileEffect(), false, true)); // You may play cards exiled with Nightveil Specter. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NightveilSpecterEffect())); + this.addAbility(new SimpleStaticAbility(new NightveilSpecterEffect())); } private NightveilSpecter(final NightveilSpecter card) { diff --git a/Mage.Sets/src/mage/cards/n/NimLasher.java b/Mage.Sets/src/mage/cards/n/NimLasher.java index 0cca4b2fdcf..db265e19ed0 100644 --- a/Mage.Sets/src/mage/cards/n/NimLasher.java +++ b/Mage.Sets/src/mage/cards/n/NimLasher.java @@ -32,7 +32,7 @@ public final class NimLasher extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); } private NimLasher(final NimLasher card) { diff --git a/Mage.Sets/src/mage/cards/n/NimShambler.java b/Mage.Sets/src/mage/cards/n/NimShambler.java index 418134f8a0f..7c5f4c5b515 100644 --- a/Mage.Sets/src/mage/cards/n/NimShambler.java +++ b/Mage.Sets/src/mage/cards/n/NimShambler.java @@ -37,7 +37,7 @@ public final class NimShambler extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/n/NimShrieker.java b/Mage.Sets/src/mage/cards/n/NimShrieker.java index 1234bcc8f2a..c7700856b0c 100644 --- a/Mage.Sets/src/mage/cards/n/NimShrieker.java +++ b/Mage.Sets/src/mage/cards/n/NimShrieker.java @@ -34,7 +34,7 @@ public final class NimShrieker extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); } private NimShrieker(final NimShrieker card) { diff --git a/Mage.Sets/src/mage/cards/n/NimbusNaiad.java b/Mage.Sets/src/mage/cards/n/NimbusNaiad.java index a3a7671e27d..a255f4c634a 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusNaiad.java +++ b/Mage.Sets/src/mage/cards/n/NimbusNaiad.java @@ -35,7 +35,7 @@ public final class NimbusNaiad extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Enchanted creature gets +2/+2 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/n/NimbusWings.java b/Mage.Sets/src/mage/cards/n/NimbusWings.java index 09ac2f17441..c8cff2bf615 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusWings.java +++ b/Mage.Sets/src/mage/cards/n/NimbusWings.java @@ -37,7 +37,7 @@ public final class NimbusWings extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+2 and has flying. - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA).setText("and has flying")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NissasChosen.java b/Mage.Sets/src/mage/cards/n/NissasChosen.java index 4a3480227d0..828d8e5495a 100644 --- a/Mage.Sets/src/mage/cards/n/NissasChosen.java +++ b/Mage.Sets/src/mage/cards/n/NissasChosen.java @@ -35,7 +35,7 @@ public final class NissasChosen extends CardImpl { this.toughness = new MageInt(3); // If Nissa's Chosen would be put into a graveyard from the battlefield, put it on the bottom of its owner's library instead - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NissasChosenEffect())); + this.addAbility(new SimpleStaticAbility(new NissasChosenEffect())); } private NissasChosen(final NissasChosen card) { diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java b/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java index a2643509218..226519cb674 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java @@ -37,7 +37,7 @@ public final class NivMizzetVisionary extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever a source you control deals noncombat damage to an opponent, you draw that many cards. this.addAbility(new NivMizzetVisionaryAbility()); @@ -89,4 +89,4 @@ class NivMizzetVisionaryAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever a source you control deals noncombat damage to an opponent, you draw that many cards."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NobleQuarry.java b/Mage.Sets/src/mage/cards/n/NobleQuarry.java index ad3c5df9201..b80487bf4bf 100644 --- a/Mage.Sets/src/mage/cards/n/NobleQuarry.java +++ b/Mage.Sets/src/mage/cards/n/NobleQuarry.java @@ -36,14 +36,14 @@ public final class NobleQuarry extends CardImpl { // All creatures able to block Noble Quarry or enchanted creature do so. Effect effect = new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield); effect.setText("All creatures able to block Noble Quarry"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new MustBeBlockedByAllAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("or enchanted creature do so"); ability.addEffect(effect); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); } private NobleQuarry(final NobleQuarry card) { diff --git a/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java b/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java index 26a5b8a1096..3c4d704ea80 100644 --- a/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java +++ b/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java @@ -50,7 +50,7 @@ public final class NogiDracoZealot extends CardImpl { this.toughness = new MageInt(3); // Dragon spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter2, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter2, 1))); // Whenever Nogi, Draco-Zealot attacks, if you control three or more Dragons, until end // of turn, Nogi becomes a Dragon with base power and toughness 5/5 and gains flying. diff --git a/Mage.Sets/src/mage/cards/n/NorwoodRiders.java b/Mage.Sets/src/mage/cards/n/NorwoodRiders.java index 09c9fbefbb7..49b102d4d21 100644 --- a/Mage.Sets/src/mage/cards/n/NorwoodRiders.java +++ b/Mage.Sets/src/mage/cards/n/NorwoodRiders.java @@ -24,7 +24,7 @@ public final class NorwoodRiders extends CardImpl { this.toughness = new MageInt(3); // Norwood Riders can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private NorwoodRiders(final NorwoodRiders card) { diff --git a/Mage.Sets/src/mage/cards/n/NotionThief.java b/Mage.Sets/src/mage/cards/n/NotionThief.java index 53e0fa17ffa..fce9badb5df 100644 --- a/Mage.Sets/src/mage/cards/n/NotionThief.java +++ b/Mage.Sets/src/mage/cards/n/NotionThief.java @@ -37,7 +37,7 @@ public final class NotionThief extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // If an opponent would draw a card except the first one they draw in each of their draw steps, instead that player skips that draw and you draw a card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NotionThiefReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); + this.addAbility(new SimpleStaticAbility(new NotionThiefReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); } diff --git a/Mage.Sets/src/mage/cards/n/NoviceKnight.java b/Mage.Sets/src/mage/cards/n/NoviceKnight.java index 2144a112ae4..a8f6adfd686 100644 --- a/Mage.Sets/src/mage/cards/n/NoviceKnight.java +++ b/Mage.Sets/src/mage/cards/n/NoviceKnight.java @@ -40,7 +40,7 @@ public final class NoviceKnight extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), EnchantedOrEquippedSourceCondition.instance); effect.setText("As long as {this} is enchanted or equipped, it can attack as though it didn't have defender"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NoviceKnight(final NoviceKnight card) { diff --git a/Mage.Sets/src/mage/cards/n/NoxiousField.java b/Mage.Sets/src/mage/cards/n/NoxiousField.java index 9e538f6d818..684ce2056db 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousField.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousField.java @@ -41,7 +41,7 @@ public final class NoxiousField extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: This land deals 1 damage to each creature and each player.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NoxiousField(final NoxiousField card) { diff --git a/Mage.Sets/src/mage/cards/n/NullChamber.java b/Mage.Sets/src/mage/cards/n/NullChamber.java index 8aff04eb4b2..d3ef25d652c 100644 --- a/Mage.Sets/src/mage/cards/n/NullChamber.java +++ b/Mage.Sets/src/mage/cards/n/NullChamber.java @@ -32,7 +32,7 @@ public final class NullChamber extends CardImpl { // As Null Chamber enters the battlefield, you and an opponent each name a card other than a basic land card. // The named cards can't be played. this.addAbility(new AsEntersBattlefieldAbility(new NullChamberChooseEffect())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NullChamberReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new NullChamberReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/n/NullProfusion.java b/Mage.Sets/src/mage/cards/n/NullProfusion.java index 2b4847a26d8..67dc0a9641e 100644 --- a/Mage.Sets/src/mage/cards/n/NullProfusion.java +++ b/Mage.Sets/src/mage/cards/n/NullProfusion.java @@ -26,7 +26,7 @@ public final class NullProfusion extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you play a card, draw a card. this.addAbility(new PlayCardTriggeredAbility(TargetController.YOU, Zone.BATTLEFIELD, @@ -51,4 +51,4 @@ public final class NullProfusion extends CardImpl { public NullProfusion copy() { return new NullProfusion(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NullRod.java b/Mage.Sets/src/mage/cards/n/NullRod.java index 999ef46af54..c0e1e5c0af1 100644 --- a/Mage.Sets/src/mage/cards/n/NullRod.java +++ b/Mage.Sets/src/mage/cards/n/NullRod.java @@ -22,7 +22,7 @@ public final class NullRod extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Activated abilities of artifacts can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NullRodCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new NullRodCantActivateEffect())); } private NullRod(final NullRod card) { diff --git a/Mage.Sets/src/mage/cards/n/NumbingDose.java b/Mage.Sets/src/mage/cards/n/NumbingDose.java index 278aa4b95e4..08ce379b385 100644 --- a/Mage.Sets/src/mage/cards/n/NumbingDose.java +++ b/Mage.Sets/src/mage/cards/n/NumbingDose.java @@ -39,7 +39,7 @@ public final class NumbingDose extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); // At the beginning of the upkeep of enchanted permanent's controller, that player loses 1 life. this.addAbility(new NumbingDoseTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/n/NyleasEmissary.java b/Mage.Sets/src/mage/cards/n/NyleasEmissary.java index 947bdfa00b9..d13b4bdba44 100644 --- a/Mage.Sets/src/mage/cards/n/NyleasEmissary.java +++ b/Mage.Sets/src/mage/cards/n/NyleasEmissary.java @@ -35,7 +35,7 @@ public final class NyleasEmissary extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Enchanted creature gets +3/+3 and has trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield,"and has trample")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NyxInfusion.java b/Mage.Sets/src/mage/cards/n/NyxInfusion.java index 8caf2a5c94b..d749ce11797 100644 --- a/Mage.Sets/src/mage/cards/n/NyxInfusion.java +++ b/Mage.Sets/src/mage/cards/n/NyxInfusion.java @@ -46,7 +46,7 @@ public final class NyxInfusion extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 as long as it's an enchantment. Otherwise, it gets -2/-2. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield), new BoostEnchantedEffect(-2,-2,Duration.WhileOnBattlefield), new AttachedToMatchesFilterCondition(filter), diff --git a/Mage.Sets/src/mage/cards/n/Nyxathid.java b/Mage.Sets/src/mage/cards/n/Nyxathid.java index 2b460eacaaa..2453b35746c 100644 --- a/Mage.Sets/src/mage/cards/n/Nyxathid.java +++ b/Mage.Sets/src/mage/cards/n/Nyxathid.java @@ -39,7 +39,7 @@ public final class Nyxathid extends CardImpl { // Nyxathid gets -1/-1 for each card in the chosen player's hand. DynamicValue chosenPlayerHand = new SignInversionDynamicValue(new CardsInChosenPlayerHandCount()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(chosenPlayerHand, chosenPlayerHand, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(chosenPlayerHand, chosenPlayerHand, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java b/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java index 55cb300e8a9..50e945a1639 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java @@ -29,7 +29,7 @@ public final class NyxbornEidolon extends CardImpl { // Bestow {4}{B} this.addAbility(new BestowAbility(this, "{4}{B}")); // Enchanted creature gets +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield))); } private NyxbornEidolon(final NyxbornEidolon card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java b/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java index 5da1b383cd7..249e72c4a6a 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java @@ -29,7 +29,7 @@ public final class NyxbornRollicker extends CardImpl { // Bestow {1}{R} this.addAbility(new BestowAbility(this, "{1}{R}")); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield ))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield ))); } private NyxbornRollicker(final NyxbornRollicker card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java b/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java index 8f27bb34798..ba46e110fce 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java @@ -30,7 +30,7 @@ public final class NyxbornShieldmate extends CardImpl { // Bestow {2}{W} this.addAbility(new BestowAbility(this, "{2}{W}")); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,2, Duration.WhileOnBattlefield))); } private NyxbornShieldmate(final NyxbornShieldmate card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornTriton.java b/Mage.Sets/src/mage/cards/n/NyxbornTriton.java index e3972525a70..9028643d777 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornTriton.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornTriton.java @@ -29,7 +29,7 @@ public final class NyxbornTriton extends CardImpl { // Bestow {4}{U} this.addAbility(new BestowAbility(this, "{4}{U}")); // Enchanted creature gets +2/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2,3, Duration.WhileOnBattlefield))); } private NyxbornTriton(final NyxbornTriton card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornWolf.java b/Mage.Sets/src/mage/cards/n/NyxbornWolf.java index 4ba9f807bf1..1c0fa312ede 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornWolf.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornWolf.java @@ -29,7 +29,7 @@ public final class NyxbornWolf extends CardImpl { // Bestow {4}{G} this.addAbility(new BestowAbility(this, "{4}{G}")); // Enchanted creature gets +3/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3,1, Duration.WhileOnBattlefield))); } private NyxbornWolf(final NyxbornWolf card) { diff --git a/Mage.Sets/src/mage/cards/o/ONaginata.java b/Mage.Sets/src/mage/cards/o/ONaginata.java index 9b82ea987d0..c34f02b7fd9 100644 --- a/Mage.Sets/src/mage/cards/o/ONaginata.java +++ b/Mage.Sets/src/mage/cards/o/ONaginata.java @@ -47,7 +47,7 @@ public final class ONaginata extends CardImpl { // Equipped creature gets +3/+0 and has trample. Effect effect = new BoostEquippedEffect(3, 0); effect.setText("Equipped creature gets +3/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java index c88a42b0b68..d023ef9ba24 100644 --- a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java @@ -38,7 +38,7 @@ public final class OakStreetInnkeeper extends CardImpl { this.toughness = new MageInt(2); // As long as it's not your turn, tapped creatures you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter), NotMyTurnCondition.instance, "During turns other than yours, tapped creatures you control have hexproof")) diff --git a/Mage.Sets/src/mage/cards/o/Oakenform.java b/Mage.Sets/src/mage/cards/o/Oakenform.java index 22097f6314e..ee558157a6c 100644 --- a/Mage.Sets/src/mage/cards/o/Oakenform.java +++ b/Mage.Sets/src/mage/cards/o/Oakenform.java @@ -38,7 +38,7 @@ public final class Oakenform extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OakenformEffect())); + this.addAbility(new SimpleStaticAbility(new OakenformEffect())); } private Oakenform(final Oakenform card) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfAjani.java b/Mage.Sets/src/mage/cards/o/OathOfAjani.java index 820aa6d7c0d..5bec9a370ce 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfAjani.java +++ b/Mage.Sets/src/mage/cards/o/OathOfAjani.java @@ -29,7 +29,7 @@ public final class OathOfAjani extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE))); // Planeswalker spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterPlaneswalkerCard("Planeswalker spells"), 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterPlaneswalkerCard("Planeswalker spells"), 1))); } private OathOfAjani(final OathOfAjani card) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfNissa.java b/Mage.Sets/src/mage/cards/o/OathOfNissa.java index 26d8f05d3de..c4427eb8e16 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfNissa.java +++ b/Mage.Sets/src/mage/cards/o/OathOfNissa.java @@ -43,7 +43,7 @@ public final class OathOfNissa extends CardImpl { 3, 1, filter, PutCards.HAND, PutCards.BOTTOM_ANY))); // You may spend mana as though it were mana of any color to cast planeswalker spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OathOfNissaSpendAnyManaEffect())); + this.addAbility(new SimpleStaticAbility(new OathOfNissaSpendAnyManaEffect())); } private OathOfNissa(final OathOfNissa card) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java index f95d59b4f3e..1c98d5841ae 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java +++ b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java @@ -31,7 +31,7 @@ public final class OathOfTeferi extends CardImpl { this.addAbility(ability); // You may activate the loyalty abilities of planeswalkers you control twice each turn rather than only once. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OathOfTeferiLoyaltyEffect())); + this.addAbility(new SimpleStaticAbility(new OathOfTeferiLoyaltyEffect())); } private OathOfTeferi(final OathOfTeferi card) { diff --git a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java index 40b82057b97..394111d2089 100644 --- a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java +++ b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java @@ -32,7 +32,7 @@ public final class OathkeeperTakenosDaisho extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1, Duration.WhileOnBattlefield))); // Whenever equipped creature dies, return that card to the battlefield under your control if it's a Samurai card. this.addAbility(new DiesAttachedTriggeredAbility(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/cards/o/OathswornGiant.java b/Mage.Sets/src/mage/cards/o/OathswornGiant.java index 73517a5ce1d..791919a1eb1 100644 --- a/Mage.Sets/src/mage/cards/o/OathswornGiant.java +++ b/Mage.Sets/src/mage/cards/o/OathswornGiant.java @@ -32,7 +32,7 @@ public final class OathswornGiant extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Other creatures you control get +0/+2 and have vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true)); ability.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true).setText("and have vigilance")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java b/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java index 12f00cc5427..085dc47f923 100644 --- a/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java +++ b/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java @@ -31,7 +31,7 @@ public final class ObeliskOfUrd extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); // Creatures you control of the chosen type get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ObeliskOfUrdBoostEffect())); + this.addAbility(new SimpleStaticAbility(new ObeliskOfUrdBoostEffect())); } private ObeliskOfUrd(final ObeliskOfUrd card) { diff --git a/Mage.Sets/src/mage/cards/o/OblivionCrown.java b/Mage.Sets/src/mage/cards/o/OblivionCrown.java index efd853c6ad4..a604e4a9b03 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionCrown.java +++ b/Mage.Sets/src/mage/cards/o/OblivionCrown.java @@ -41,7 +41,7 @@ public final class OblivionCrown extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "Discard a card: This creature gets +1/+1 until end of turn." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn),new DiscardCardCost()), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn),new DiscardCardCost()), AttachmentType.AURA))); } private OblivionCrown(final OblivionCrown card) { diff --git a/Mage.Sets/src/mage/cards/o/ObscuringAether.java b/Mage.Sets/src/mage/cards/o/ObscuringAether.java index 1cf0f4c7792..1cdd14ad479 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuringAether.java +++ b/Mage.Sets/src/mage/cards/o/ObscuringAether.java @@ -23,7 +23,7 @@ public final class ObscuringAether extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}"); // Face-down creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FaceDownSpellsCostReductionControllerEffect(1))); + this.addAbility(new SimpleStaticAbility(new FaceDownSpellsCostReductionControllerEffect(1))); // {1}{G}: Turn Obscuring Aether face down. Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL); diff --git a/Mage.Sets/src/mage/cards/o/ObservantAlseid.java b/Mage.Sets/src/mage/cards/o/ObservantAlseid.java index 298d6b44b66..96427ded201 100644 --- a/Mage.Sets/src/mage/cards/o/ObservantAlseid.java +++ b/Mage.Sets/src/mage/cards/o/ObservantAlseid.java @@ -38,7 +38,7 @@ public final class ObservantAlseid extends CardImpl { // Enchanted creature gets +2/+2 and has vigilance. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText("and has vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java index b6777ae5581..75a92620d1e 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java @@ -31,7 +31,7 @@ public final class ObsidianBattleAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+1 and has haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 1)); ability.addEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has haste")); this.addAbility(ability); // Whenever a Warrior creature enters the battlefield, you may attach Obsidian Battle-Axe to it. diff --git a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java index ff90c215b1a..8e0b87090d6 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java @@ -104,7 +104,7 @@ class ObsidianFireheartOneShotEffect extends OneShotEffect { Duration.Custom, ""); // add a new independent ability that is not reliant on the source ability - SimpleStaticAbility gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility gainAbility = new SimpleStaticAbility(effect); // set sourcecard of the independent ability to the targeted permanent of the source ability gainAbility.setSourceId(targetLand.getId()); diff --git a/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java b/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java index 04f6bc15fb0..4a74b908057 100644 --- a/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java +++ b/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java @@ -32,7 +32,7 @@ public final class ObstinateFamiliar extends CardImpl { this.toughness = new MageInt(1); // If you would draw a card, you may skip that draw instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ObstinateFamiliarReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ObstinateFamiliarReplacementEffect())); } private ObstinateFamiliar(final ObstinateFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/o/Occupation.java b/Mage.Sets/src/mage/cards/o/Occupation.java index 8b4e10f5a2c..bd4c7e121be 100644 --- a/Mage.Sets/src/mage/cards/o/Occupation.java +++ b/Mage.Sets/src/mage/cards/o/Occupation.java @@ -29,7 +29,7 @@ public final class Occupation extends CardImpl { // Creatures your opponents control enter the battlefield tapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OccupationTapEffect())); + this.addAbility(new SimpleStaticAbility(new OccupationTapEffect())); // {W}{B}: Target creature can't attack or block this turn, and its activated abilities can't be activated until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/o/OcularHalo.java b/Mage.Sets/src/mage/cards/o/OcularHalo.java index 640c82217fb..85da48fdf04 100644 --- a/Mage.Sets/src/mage/cards/o/OcularHalo.java +++ b/Mage.Sets/src/mage/cards/o/OcularHalo.java @@ -42,7 +42,7 @@ public final class OcularHalo extends CardImpl { // Enchanted creature has "{tap}: Draw a card." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); // {W}: Enchanted creature gains vigilance until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java b/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java index 63d1d29377b..08a9b831a7a 100644 --- a/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java +++ b/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java @@ -41,7 +41,7 @@ public final class OgreJailbreaker extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter)); effect.setText("{this} can attack as though it didn't have defender as long as you control a Gate"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java index 79682ce7275..701c477bef7 100644 --- a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java +++ b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java @@ -46,7 +46,7 @@ public final class OgreSlumlord extends CardImpl { this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new RatToken()), true, filter)); // Rats you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); } diff --git a/Mage.Sets/src/mage/cards/o/OgresCleaver.java b/Mage.Sets/src/mage/cards/o/OgresCleaver.java index 88afb52bcf4..4112b987608 100644 --- a/Mage.Sets/src/mage/cards/o/OgresCleaver.java +++ b/Mage.Sets/src/mage/cards/o/OgresCleaver.java @@ -26,7 +26,7 @@ public final class OgresCleaver extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +5/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(5, 0))); // Equip {5} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(5), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/o/OhabiCaleria.java b/Mage.Sets/src/mage/cards/o/OhabiCaleria.java index 927510fb7f5..b92281782d9 100644 --- a/Mage.Sets/src/mage/cards/o/OhabiCaleria.java +++ b/Mage.Sets/src/mage/cards/o/OhabiCaleria.java @@ -35,7 +35,7 @@ public final class OhabiCaleria extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Untap all Archers you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); + this.addAbility(new SimpleStaticAbility(new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); // Whenever an Archer you control deals damage to a creature, you may pay {2}. If you do, draw a card. this.addAbility(new DealsDamageToACreatureAllTriggeredAbility(new DoIfCostPaid( diff --git a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java index d4ac2891ff4..bc570530c79 100644 --- a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java +++ b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java @@ -41,7 +41,7 @@ public final class OketraTheTrue extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Oketra the True can't attack or block unless you control three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OketraTheTrueRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new OketraTheTrueRestrictionEffect())); // {3}{W}: Create a 1/1 white Warrior creature token with vigilance. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WarriorVigilantToken()), new ManaCostsImpl<>("{3}{W}"))); diff --git a/Mage.Sets/src/mage/cards/o/OketrasMonument.java b/Mage.Sets/src/mage/cards/o/OketrasMonument.java index f94e0fbf0d3..5a78c71b598 100644 --- a/Mage.Sets/src/mage/cards/o/OketrasMonument.java +++ b/Mage.Sets/src/mage/cards/o/OketrasMonument.java @@ -40,7 +40,7 @@ public final class OketrasMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // White creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast a creature spell, create a 1/1 white Warrior creature token with vigilance. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new WarriorVigilantToken()), filter2, false)); diff --git a/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java b/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java index 89f0a47decd..1657a2ac65b 100644 --- a/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java +++ b/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java @@ -30,7 +30,7 @@ public final class OkinaNightwatch extends CardImpl { this.toughness = new MageInt(3); // As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3,3, Duration.WhileOnBattlefield), MoreCardsInHandThanOpponentsCondition.instance, "As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3")); diff --git a/Mage.Sets/src/mage/cards/o/Okk.java b/Mage.Sets/src/mage/cards/o/Okk.java index 2227dc166bd..231e1ee5fee 100644 --- a/Mage.Sets/src/mage/cards/o/Okk.java +++ b/Mage.Sets/src/mage/cards/o/Okk.java @@ -29,10 +29,10 @@ public final class Okk extends CardImpl { this.toughness = new MageInt(4); // Okk can't attack unless a creature with greater power also attacks. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OkkAttackEffect())); + this.addAbility(new SimpleStaticAbility(new OkkAttackEffect())); // Okk can't block unless a creature with greater power also blocks. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OkkBlockEffect())); + this.addAbility(new SimpleStaticAbility(new OkkBlockEffect())); } private Okk(final Okk card) { diff --git a/Mage.Sets/src/mage/cards/o/OmenMachine.java b/Mage.Sets/src/mage/cards/o/OmenMachine.java index 8bf43b24b11..a2ce373418a 100644 --- a/Mage.Sets/src/mage/cards/o/OmenMachine.java +++ b/Mage.Sets/src/mage/cards/o/OmenMachine.java @@ -30,7 +30,7 @@ public final class OmenMachine extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // Players can't draw cards. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OmenMachineEffect())); + this.addAbility(new SimpleStaticAbility(new OmenMachineEffect())); // At the beginning of each player's draw step, that player exiles the top card of their library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able. this.addAbility(new BeginningOfDrawTriggeredAbility(TargetController.EACH_PLAYER, new OmenMachineEffect2(), false)); diff --git a/Mage.Sets/src/mage/cards/o/Omniscience.java b/Mage.Sets/src/mage/cards/o/Omniscience.java index 9d70d342846..bc7b05d2395 100644 --- a/Mage.Sets/src/mage/cards/o/Omniscience.java +++ b/Mage.Sets/src/mage/cards/o/Omniscience.java @@ -19,7 +19,7 @@ public final class Omniscience extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{7}{U}{U}{U}"); // You may cast nonland cards from your hand without paying their mana costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastFromHandWithoutPayingManaCostEffect())); + this.addAbility(new SimpleStaticAbility(new CastFromHandWithoutPayingManaCostEffect())); } private Omniscience(final Omniscience card) { @@ -31,4 +31,3 @@ public final class Omniscience extends CardImpl { return new Omniscience(this); } } - diff --git a/Mage.Sets/src/mage/cards/o/OnSerrasWings.java b/Mage.Sets/src/mage/cards/o/OnSerrasWings.java index 0cc6637979d..9a41de28d10 100644 --- a/Mage.Sets/src/mage/cards/o/OnSerrasWings.java +++ b/Mage.Sets/src/mage/cards/o/OnSerrasWings.java @@ -47,7 +47,7 @@ public final class OnSerrasWings extends CardImpl { // Enchanted creature is legendary, gets +1/+1, and has flying, vigilance, and lifelink. Effect effect = new AddCardSuperTypeAttachedEffect(SuperType.LEGENDARY, Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("Enchanted creature is legendary"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield); effect.setText(", gets +1/+1"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java b/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java index 31458be4075..380a34fdf9d 100644 --- a/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java +++ b/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java @@ -39,7 +39,7 @@ public final class OneEyedScarecrow extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Creatures with flying your opponents control get -1/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, 0, Duration.WhileOnBattlefield, filter, false))); } private OneEyedScarecrow(final OneEyedScarecrow card) { diff --git a/Mage.Sets/src/mage/cards/o/OneThousandLashes.java b/Mage.Sets/src/mage/cards/o/OneThousandLashes.java index 5bd53433bbc..a3ae444aae9 100644 --- a/Mage.Sets/src/mage/cards/o/OneThousandLashes.java +++ b/Mage.Sets/src/mage/cards/o/OneThousandLashes.java @@ -38,7 +38,7 @@ public final class OneThousandLashes extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // At the beginning of the upkeep of enchanted creature's controller, that player loses 1 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new LoseLifeTargetEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/o/OneWithTheWind.java b/Mage.Sets/src/mage/cards/o/OneWithTheWind.java index 521542a0089..91bfc4703c5 100644 --- a/Mage.Sets/src/mage/cards/o/OneWithTheWind.java +++ b/Mage.Sets/src/mage/cards/o/OneWithTheWind.java @@ -39,7 +39,7 @@ public final class OneWithTheWind extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA) .setText("and has flying")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/Opalescence.java b/Mage.Sets/src/mage/cards/o/Opalescence.java index c4eae3c9c63..f295d59c2ea 100644 --- a/Mage.Sets/src/mage/cards/o/Opalescence.java +++ b/Mage.Sets/src/mage/cards/o/Opalescence.java @@ -24,7 +24,7 @@ public final class Opalescence extends CardImpl { // Each other non-Aura enchantment is a creature with power and // toughness each equal to its converted mana cost. It's still an enchantment. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpalescenceEffect())); + this.addAbility(new SimpleStaticAbility(new OpalescenceEffect())); } diff --git a/Mage.Sets/src/mage/cards/o/OpalineBracers.java b/Mage.Sets/src/mage/cards/o/OpalineBracers.java index cb56e1a9d35..cfe4f44471f 100644 --- a/Mage.Sets/src/mage/cards/o/OpalineBracers.java +++ b/Mage.Sets/src/mage/cards/o/OpalineBracers.java @@ -29,7 +29,7 @@ public final class OpalineBracers extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Equipped creature gets +X/+X, where X is the number of charge counters on Opaline Bracers. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new CountersSourceCount(CounterType.CHARGE), new CountersSourceCount(CounterType.CHARGE)))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(new CountersSourceCount(CounterType.CHARGE), new CountersSourceCount(CounterType.CHARGE)))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/o/OpenSeason.java b/Mage.Sets/src/mage/cards/o/OpenSeason.java index 0208ee94356..e9dc1a2d342 100644 --- a/Mage.Sets/src/mage/cards/o/OpenSeason.java +++ b/Mage.Sets/src/mage/cards/o/OpenSeason.java @@ -40,7 +40,7 @@ public final class OpenSeason extends CardImpl { this.addAbility(ability); // Creatures your opponent control with bounty counters on them can't activate abilities - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpenSeasonRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new OpenSeasonRestrictionEffect())); // Bounty - Whenever a creature an opponent controls with a bounty counter on it dies, that creature's controller loses 2 life. Each other player gains 2 life. this.addAbility(new BountyAbility(new OpenSeasonEffect(), false, true)); diff --git a/Mage.Sets/src/mage/cards/o/OppressiveRays.java b/Mage.Sets/src/mage/cards/o/OppressiveRays.java index 5545f8c7ca0..42e7d097d7c 100644 --- a/Mage.Sets/src/mage/cards/o/OppressiveRays.java +++ b/Mage.Sets/src/mage/cards/o/OppressiveRays.java @@ -36,10 +36,10 @@ public final class OppressiveRays extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block unless its controller pays {3}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); // Activated abilities of enchanted creature cost {3} more to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OppressiveRaysCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new OppressiveRaysCostModificationEffect())); } private OppressiveRays(final OppressiveRays card) { diff --git a/Mage.Sets/src/mage/cards/o/OraclesInsight.java b/Mage.Sets/src/mage/cards/o/OraclesInsight.java index 639c77606c9..acd12b07cd1 100644 --- a/Mage.Sets/src/mage/cards/o/OraclesInsight.java +++ b/Mage.Sets/src/mage/cards/o/OraclesInsight.java @@ -43,7 +43,7 @@ public final class OraclesInsight extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new TapSourceCost()); Effect effect = new DrawCardSourceControllerEffect(1).concatBy(", then"); ability.addEffect(effect); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } private OraclesInsight(final OraclesInsight card) { diff --git a/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java b/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java index 987dce9141d..d17df355e55 100644 --- a/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java +++ b/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java @@ -26,10 +26,10 @@ public final class OrbsOfWarding extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); // If a creature would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OrbsOfWardingEffect())); + this.addAbility(new SimpleStaticAbility(new OrbsOfWardingEffect())); } private OrbsOfWarding(final OrbsOfWarding card) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java b/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java index 8602a2a49f8..d950f8c5d2a 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java +++ b/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java @@ -24,7 +24,7 @@ public final class OrcishOriflamme extends CardImpl { // Attacking creatures you control get +1/+0. BoostControlledEffect boostEffect = new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_ATTACKING_CREATURES, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect)); + this.addAbility(new SimpleStaticAbility(boostEffect)); } private OrcishOriflamme(final OrcishOriflamme card) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java index b741b6f0a27..f9f2397b8fe 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java +++ b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java @@ -41,7 +41,7 @@ public final class OrcishVeteran extends CardImpl { this.toughness = new MageInt(2); // Orcish Veteran can't block white creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // {R}: Orcish Veteran gains first strike until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java b/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java index 847bf439a57..509da316d69 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java @@ -35,7 +35,7 @@ public final class OrderOfTheStars extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Order of the Stars has protection from the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorSourceEffect())); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorSourceEffect())); } private OrderOfTheStars(final OrderOfTheStars card) { diff --git a/Mage.Sets/src/mage/cards/o/Orgg.java b/Mage.Sets/src/mage/cards/o/Orgg.java index b4fb3b71b5b..c250eafdc0f 100644 --- a/Mage.Sets/src/mage/cards/o/Orgg.java +++ b/Mage.Sets/src/mage/cards/o/Orgg.java @@ -43,11 +43,11 @@ public final class Orgg extends CardImpl { // Orgg can't attack if defending player controls an untapped creature with power 3 or greater. Effect effect = new CantAttackIfDefenderControlsPermanent(filter); effect.setText("{this} can't attack if defending player controls an untapped creature with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Orgg can't block creatures with power 3 or greater. Effect effectBlock = new CantBlockCreaturesSourceEffect(filter2); effectBlock.setText("{this} can't block creatures with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectBlock)); + this.addAbility(new SimpleStaticAbility(effectBlock)); } private Orgg(final Orgg card) { diff --git a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java index 74ccee959ce..60c0b6d85fd 100644 --- a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java +++ b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java @@ -43,7 +43,7 @@ public final class OtepecHuntmaster extends CardImpl { this.toughness = new MageInt(2); // Dinosaur spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // {T}: Target Dinosaur gains haste until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/o/OutlandColossus.java b/Mage.Sets/src/mage/cards/o/OutlandColossus.java index f0868c4a6cc..1e1753ed441 100644 --- a/Mage.Sets/src/mage/cards/o/OutlandColossus.java +++ b/Mage.Sets/src/mage/cards/o/OutlandColossus.java @@ -28,7 +28,7 @@ public final class OutlandColossus extends CardImpl { this.addAbility(new RenownAbility(6)); // Outland Colossus can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private OutlandColossus(final OutlandColossus card) { diff --git a/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java b/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java index 5db8c104d1b..b4486f285ad 100644 --- a/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java +++ b/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java @@ -39,10 +39,10 @@ public final class OverwhelmingSplendor extends CardImpl { this.addAbility(ability); // Creatures enchanted player controls lose all abilities and have base power and toughness 1/1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OverwhelmingSplendorLoseAbilitiesEffect())); + this.addAbility(new SimpleStaticAbility(new OverwhelmingSplendorLoseAbilitiesEffect())); // Enchanted player can't activate abilities that aren't mana abilities or loyalty abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OverwhelmingSplendorCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new OverwhelmingSplendorCantActivateEffect())); } private OverwhelmingSplendor(final OverwhelmingSplendor card) { diff --git a/Mage.Sets/src/mage/cards/p/Pacifism.java b/Mage.Sets/src/mage/cards/p/Pacifism.java index 00097749539..9abfde0bf86 100644 --- a/Mage.Sets/src/mage/cards/p/Pacifism.java +++ b/Mage.Sets/src/mage/cards/p/Pacifism.java @@ -35,7 +35,7 @@ public final class Pacifism extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/p/PaintersServant.java b/Mage.Sets/src/mage/cards/p/PaintersServant.java index 224b437c726..b61327c63c6 100644 --- a/Mage.Sets/src/mage/cards/p/PaintersServant.java +++ b/Mage.Sets/src/mage/cards/p/PaintersServant.java @@ -35,7 +35,7 @@ public final class PaintersServant extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment))); // All cards that aren't on the battlefield, spells, and permanents are the chosen color in addition to their other colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PaintersServantEffect())); + this.addAbility(new SimpleStaticAbility(new PaintersServantEffect())); } private PaintersServant(final PaintersServant card) { diff --git a/Mage.Sets/src/mage/cards/p/PalaceGuard.java b/Mage.Sets/src/mage/cards/p/PalaceGuard.java index f6784d89170..0e7c4c39496 100644 --- a/Mage.Sets/src/mage/cards/p/PalaceGuard.java +++ b/Mage.Sets/src/mage/cards/p/PalaceGuard.java @@ -27,7 +27,7 @@ public final class PalaceGuard extends CardImpl { this.toughness = new MageInt(4); // Palace Guard can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private PalaceGuard(final PalaceGuard card) { diff --git a/Mage.Sets/src/mage/cards/p/PalisadeGiant.java b/Mage.Sets/src/mage/cards/p/PalisadeGiant.java index f0c3c92f6d0..9b9744866f9 100644 --- a/Mage.Sets/src/mage/cards/p/PalisadeGiant.java +++ b/Mage.Sets/src/mage/cards/p/PalisadeGiant.java @@ -48,7 +48,7 @@ public final class PalisadeGiant extends CardImpl { this.toughness = new MageInt(7); // All damage that would be dealt to you or another permanent you control is dealt to Palisade Giant instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PalisadeGiantReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PalisadeGiantReplacementEffect())); } private PalisadeGiant(final PalisadeGiant card) { diff --git a/Mage.Sets/src/mage/cards/p/Panharmonicon.java b/Mage.Sets/src/mage/cards/p/Panharmonicon.java index 4702d070fef..239825fbfaa 100644 --- a/Mage.Sets/src/mage/cards/p/Panharmonicon.java +++ b/Mage.Sets/src/mage/cards/p/Panharmonicon.java @@ -26,7 +26,7 @@ public final class Panharmonicon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // If an artifact or creature entering the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PanharmoniconEffect())); + this.addAbility(new SimpleStaticAbility(new PanharmoniconEffect())); } private Panharmonicon(final Panharmonicon card) { diff --git a/Mage.Sets/src/mage/cards/p/PaperTiger.java b/Mage.Sets/src/mage/cards/p/PaperTiger.java index 5e6e7aafbaf..e94a32d5304 100644 --- a/Mage.Sets/src/mage/cards/p/PaperTiger.java +++ b/Mage.Sets/src/mage/cards/p/PaperTiger.java @@ -34,7 +34,7 @@ public final class PaperTiger extends CardImpl { this.toughness = new MageInt(3); // Creatures named Rock Lobster can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); } private PaperTiger(final PaperTiger card) { diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java index 0c7a0249789..ad94079ac81 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java @@ -50,7 +50,7 @@ public final class ParagonOfEternalWilds extends CardImpl { this.toughness = new MageInt(2); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // {G}, {t}: Another target green creature you control gains trample until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java index 82526174dbc..51746395bc3 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java @@ -48,7 +48,7 @@ public final class ParagonOfFierceDefiance extends CardImpl { this.toughness = new MageInt(2); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {R}, {T}: Another target red creature you control gains haste until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java index 181afc118bf..c1152c91359 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java @@ -50,7 +50,7 @@ public final class ParagonOfGatheringMists extends CardImpl { this.toughness = new MageInt(2); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); // {U}, {T}: Another target blue creature you control gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java index 29bad7770ee..95dc97cb3c7 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java @@ -50,7 +50,7 @@ public final class ParagonOfNewDawns extends CardImpl { this.toughness = new MageInt(2); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter, true))); // {W}, {T}: Another target white creature you control gains vigilance until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java index 50165bfe0ee..76607767b8b 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java @@ -48,7 +48,7 @@ public final class ParagonOfOpenGraves extends CardImpl { this.toughness = new MageInt(2); // Other black creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {2}{B}, {T}: Another target black creature you control gains deathtouch until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxDementia.java b/Mage.Sets/src/mage/cards/p/ParallaxDementia.java index 453a3e3fac5..e4ccd023069 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxDementia.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxDementia.java @@ -39,7 +39,7 @@ public final class ParallaxDementia extends CardImpl { // Fading 1 this.addAbility(new FadingAbility(1, this)); // Enchanted creature gets +3/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield))); // When Parallax Dementia leaves the battlefield, destroy enchanted creature. That creature can't be regenerated. this.addAbility(new LeavesBattlefieldTriggeredAbility(new DestroyAttachedToEffect("enchanted creature", true), false)); } diff --git a/Mage.Sets/src/mage/cards/p/ParallelLives.java b/Mage.Sets/src/mage/cards/p/ParallelLives.java index fe9202525b9..685a251ec8e 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelLives.java +++ b/Mage.Sets/src/mage/cards/p/ParallelLives.java @@ -19,7 +19,7 @@ public final class ParallelLives extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CreateTwiceThatManyTokensEffect())); + this.addAbility(new SimpleStaticAbility(new CreateTwiceThatManyTokensEffect())); } private ParallelLives(final ParallelLives card) { diff --git a/Mage.Sets/src/mage/cards/p/ParallelThoughts.java b/Mage.Sets/src/mage/cards/p/ParallelThoughts.java index f07d1c71809..8d8e5c29245 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelThoughts.java +++ b/Mage.Sets/src/mage/cards/p/ParallelThoughts.java @@ -37,7 +37,7 @@ public final class ParallelThoughts extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ParallelThoughtsSearchEffect())); // If you would draw a card, you may instead put the top card of the pile you exiled into your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ParallelThoughtsReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ParallelThoughtsReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/p/Paralyze.java b/Mage.Sets/src/mage/cards/p/Paralyze.java index 5636aa850c1..2001a3a5e5a 100644 --- a/Mage.Sets/src/mage/cards/p/Paralyze.java +++ b/Mage.Sets/src/mage/cards/p/Paralyze.java @@ -38,7 +38,7 @@ public final class Paralyze extends CardImpl { // When Paralyze enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // At the beginning of the upkeep of enchanted creature's controller, that player may pay {4}. If they do, untap the creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new ParalyzeEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java b/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java index 7f023cfd984..d4c188a8caf 100644 --- a/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java +++ b/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java @@ -32,7 +32,7 @@ public final class ParalyzingGrasp extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private ParalyzingGrasp(final ParalyzingGrasp card) { diff --git a/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java b/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java index 88c827fd11d..fe65991fa3f 100644 --- a/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java +++ b/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java @@ -34,7 +34,7 @@ public final class ParanoidParishBlade extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+0 "); effect.setText("Delirium — {this} gets +1/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "and has first strike as long as there are four or more card types among cards in your graveyard."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/Parapet.java b/Mage.Sets/src/mage/cards/p/Parapet.java index 17cdad773ac..fa524f5c9fd 100644 --- a/Mage.Sets/src/mage/cards/p/Parapet.java +++ b/Mage.Sets/src/mage/cards/p/Parapet.java @@ -25,7 +25,7 @@ public final class Parapet extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new CastAsThoughItHadFlashSourceEffect(Duration.EndOfGame))); this.addAbility(new SacrificeIfCastAtInstantTimeTriggeredAbility()); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); } private Parapet(final Parapet card) { diff --git a/Mage.Sets/src/mage/cards/p/Pariah.java b/Mage.Sets/src/mage/cards/p/Pariah.java index 52cf22f9186..08aef9f7a12 100644 --- a/Mage.Sets/src/mage/cards/p/Pariah.java +++ b/Mage.Sets/src/mage/cards/p/Pariah.java @@ -38,7 +38,7 @@ public final class Pariah extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // All damage that would be dealt to you is dealt to enchanted creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PariahEffect())); + this.addAbility(new SimpleStaticAbility(new PariahEffect())); } private Pariah(final Pariah card) { diff --git a/Mage.Sets/src/mage/cards/p/PariahsShield.java b/Mage.Sets/src/mage/cards/p/PariahsShield.java index c5b86b302bb..7781598f30e 100644 --- a/Mage.Sets/src/mage/cards/p/PariahsShield.java +++ b/Mage.Sets/src/mage/cards/p/PariahsShield.java @@ -31,7 +31,7 @@ public final class PariahsShield extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // All damage that would be dealt to you is dealt to equipped creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PariahsShieldEffect())); + this.addAbility(new SimpleStaticAbility(new PariahsShieldEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java b/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java index 6cd03162f76..a700d8d3ba4 100644 --- a/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java +++ b/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java @@ -31,7 +31,7 @@ public final class PathbreakerWurm extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Pathbreaker Wurm is paired with another creature, both creatures have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(TrampleAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(TrampleAbility.getInstance(), ruleText))); } diff --git a/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java b/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java index 58aea58cd4e..7a9d6c7bac4 100644 --- a/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java +++ b/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java @@ -27,7 +27,7 @@ public final class PathrazerOfUlamog extends CardImpl { this.addAbility(new AnnihilatorAbility(3)); // Pathrazer of Ulamog can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); } private PathrazerOfUlamog(final PathrazerOfUlamog card) { diff --git a/Mage.Sets/src/mage/cards/p/PathwayArrows.java b/Mage.Sets/src/mage/cards/p/PathwayArrows.java index 1868b561f6a..fd7ad2eebe1 100644 --- a/Mage.Sets/src/mage/cards/p/PathwayArrows.java +++ b/Mage.Sets/src/mage/cards/p/PathwayArrows.java @@ -36,7 +36,7 @@ public final class PathwayArrows extends CardImpl { SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PathwayArrowsEffect(), new GenericManaCost(2)); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/p/Peacekeeper.java b/Mage.Sets/src/mage/cards/p/Peacekeeper.java index ae8ef2e8759..499ddc7e95b 100644 --- a/Mage.Sets/src/mage/cards/p/Peacekeeper.java +++ b/Mage.Sets/src/mage/cards/p/Peacekeeper.java @@ -31,7 +31,7 @@ public final class Peacekeeper extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{W}")))); // Creatures can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PeacekeeperCantAttackEffect())); + this.addAbility(new SimpleStaticAbility(new PeacekeeperCantAttackEffect())); } private Peacekeeper(final Peacekeeper card) { diff --git a/Mage.Sets/src/mage/cards/p/PearlMedallion.java b/Mage.Sets/src/mage/cards/p/PearlMedallion.java index d73b4db6f82..1542761f63b 100644 --- a/Mage.Sets/src/mage/cards/p/PearlMedallion.java +++ b/Mage.Sets/src/mage/cards/p/PearlMedallion.java @@ -27,7 +27,7 @@ public final class PearlMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // White spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private PearlMedallion(final PearlMedallion card) { diff --git a/Mage.Sets/src/mage/cards/p/PendrellFlux.java b/Mage.Sets/src/mage/cards/p/PendrellFlux.java index 22934917988..6ee339cde61 100644 --- a/Mage.Sets/src/mage/cards/p/PendrellFlux.java +++ b/Mage.Sets/src/mage/cards/p/PendrellFlux.java @@ -42,7 +42,7 @@ public final class PendrellFlux extends CardImpl { ability = new BeginningOfUpkeepTriggeredAbility(new PendrellFluxEffect()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted creature has \"At the beginning of your upkeep, sacrifice this creature unless you pay its mana cost.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private PendrellFlux(final PendrellFlux card) { diff --git a/Mage.Sets/src/mage/cards/p/PendrellMists.java b/Mage.Sets/src/mage/cards/p/PendrellMists.java index 24067280037..0dc75abf753 100644 --- a/Mage.Sets/src/mage/cards/p/PendrellMists.java +++ b/Mage.Sets/src/mage/cards/p/PendrellMists.java @@ -26,7 +26,7 @@ public final class PendrellMists extends CardImpl { // All creatures have "At the beginning of your upkeep, sacrifice this creature unless you pay {1}." Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, "All creatures have \"At the beginning of your upkeep, sacrifice this creature unless you pay {1}.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PennonBlade.java b/Mage.Sets/src/mage/cards/p/PennonBlade.java index 84891c2f587..fe3b9d79412 100644 --- a/Mage.Sets/src/mage/cards/p/PennonBlade.java +++ b/Mage.Sets/src/mage/cards/p/PennonBlade.java @@ -26,7 +26,7 @@ public final class PennonBlade extends CardImpl { // Equipped creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip {4} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4))); diff --git a/Mage.Sets/src/mage/cards/p/PentarchWard.java b/Mage.Sets/src/mage/cards/p/PentarchWard.java index df956aca09a..89ab9eabcd4 100644 --- a/Mage.Sets/src/mage/cards/p/PentarchWard.java +++ b/Mage.Sets/src/mage/cards/p/PentarchWard.java @@ -42,7 +42,7 @@ public final class PentarchWard extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Enchanted creature has protection from the chosen color. This effect doesn't remove Pentarch Ward. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); } private PentarchWard(final PentarchWard card) { diff --git a/Mage.Sets/src/mage/cards/p/PeregrineMask.java b/Mage.Sets/src/mage/cards/p/PeregrineMask.java index 885eed83312..675478a18b8 100644 --- a/Mage.Sets/src/mage/cards/p/PeregrineMask.java +++ b/Mage.Sets/src/mage/cards/p/PeregrineMask.java @@ -24,7 +24,7 @@ public final class PeregrineMask extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); this.subtype.add(SubType.EQUIPMENT); // Equipped creature has defender, flying, and first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", flying")); ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", and first strike")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java b/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java index 19e0037df37..6dc513854e7 100644 --- a/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java +++ b/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java @@ -26,7 +26,7 @@ public final class PersonalSanctuary extends CardImpl { // During your turn, prevent all damage that would be dealt to you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PersonalSanctuaryEffect())); + this.addAbility(new SimpleStaticAbility(new PersonalSanctuaryEffect())); } private PersonalSanctuary(final PersonalSanctuary card) { diff --git a/Mage.Sets/src/mage/cards/p/Persuasion.java b/Mage.Sets/src/mage/cards/p/Persuasion.java index 508515296ab..defc79c27ad 100644 --- a/Mage.Sets/src/mage/cards/p/Persuasion.java +++ b/Mage.Sets/src/mage/cards/p/Persuasion.java @@ -35,7 +35,7 @@ public final class Persuasion extends CardImpl { this.addAbility(ability); // You control enchanted creature. - Ability controlAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect()); + Ability controlAbility = new SimpleStaticAbility(new ControlEnchantedEffect()); this.addAbility(controlAbility); } diff --git a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java index 1fdd666580f..c9de657f668 100644 --- a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java +++ b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java @@ -37,7 +37,7 @@ public final class PetrifiedPlating extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Suspend 2-{G} this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{G}"), this)); diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java b/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java index 65008b845e7..f0954f5b7b9 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java @@ -37,7 +37,7 @@ public final class PhantasmalTerrain extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseBasicLandTypeEffect(Outcome.Neutral))); // Enchanted land is the chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhantasmalTerrainContinuousEffect())); + this.addAbility(new SimpleStaticAbility(new PhantasmalTerrainContinuousEffect())); } private PhantasmalTerrain(final PhantasmalTerrain card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java index d15214f8364..726cebdc41a 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java +++ b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java @@ -36,7 +36,7 @@ public final class PhantomGeneral extends CardImpl { this.toughness = new MageInt(3); // Creature tokens you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private PhantomGeneral(final PhantomGeneral card) { diff --git a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java index 38e52edf414..50494fdba52 100644 --- a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java +++ b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java @@ -43,7 +43,7 @@ public final class PheresBandWarchief extends CardImpl { // Other Centaur creatures you control get +1/+1 and have vigilance and trample. Effect effect = new BoostControlledEffect(1,1,Duration.WhileOnBattlefield, filter, true); effect.setText("Other Centaur creatures you control get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, true); effect.setText("and have vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java b/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java index 6be2f001124..c91fa0fdc2f 100644 --- a/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java +++ b/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java @@ -26,9 +26,9 @@ public final class PhialOfGaladriel extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // If you would draw a card while you have no cards in hand, draw two cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhialOfGaladrielDrawEffect())); + this.addAbility(new SimpleStaticAbility(new PhialOfGaladrielDrawEffect())); // If you would gain life while you have 5 or less life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhialOfGaladrielLifeEffect())); + this.addAbility(new SimpleStaticAbility(new PhialOfGaladrielLifeEffect())); // {T}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); diff --git a/Mage.Sets/src/mage/cards/p/Phyresis.java b/Mage.Sets/src/mage/cards/p/Phyresis.java index 159289380fc..529713114ac 100644 --- a/Mage.Sets/src/mage/cards/p/Phyresis.java +++ b/Mage.Sets/src/mage/cards/p/Phyresis.java @@ -36,7 +36,7 @@ public final class Phyresis extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); } private Phyresis(final Phyresis card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java index 41efa4e30eb..25ceb423688 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java @@ -29,12 +29,12 @@ public final class PhyrexianColossus extends CardImpl { this.toughness = new MageInt(8); // {this} doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Pay 8 life: Untap {this}. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new PayLifeCost(8))); // {this} can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java b/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java index 0b0f709c5a4..e5007931682 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java @@ -35,7 +35,7 @@ public final class PhyrexianHydra extends CardImpl { this.toughness = new MageInt(7); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianHydraEffect())); + this.addAbility(new SimpleStaticAbility(new PhyrexianHydraEffect())); } private PhyrexianHydra(final PhyrexianHydra card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java b/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java index a87d0520b24..1c762f83a4b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java @@ -46,7 +46,7 @@ public final class PhyrexianIngester extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); // Phyrexian Ingester gets +X/+Y, where X is the exiled creature card's power and Y is its toughness. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianIngesterBoostEffect())); + this.addAbility(new SimpleStaticAbility(new PhyrexianIngesterBoostEffect())); } private PhyrexianIngester(final PhyrexianIngester card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java index 38c33bae450..f9279a3717b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java @@ -30,7 +30,7 @@ public final class PhyrexianIronfoot extends CardImpl { this.toughness = new MageInt(4); // Phyrexian Ironfoot doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {1}{S}: Untap Phyrexian Ironfoot. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}{S}"))); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java b/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java index 92f78dd6861..23b31535119 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java @@ -41,7 +41,7 @@ public final class PhyrexianMarauder extends CardImpl { this.addAbility(new CantBlockAbility()); // Phyrexian Marauder can't attack unless you pay {1} for each +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianMarauderCantAttackUnlessYouPayEffect())); + this.addAbility(new SimpleStaticAbility(new PhyrexianMarauderCantAttackUnlessYouPayEffect())); } private PhyrexianMarauder(final PhyrexianMarauder card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java b/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java index 9965bac5cb2..8b46b429c85 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java @@ -34,7 +34,7 @@ public final class PhyrexianRevoker extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME))); // Activated abilities of sources with the chosen name can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianRevokerEffect2())); + this.addAbility(new SimpleStaticAbility(new PhyrexianRevokerEffect2())); } private PhyrexianRevoker(final PhyrexianRevoker card) { diff --git a/Mage.Sets/src/mage/cards/p/Phytohydra.java b/Mage.Sets/src/mage/cards/p/Phytohydra.java index 0c7c02f48f6..3a38bfc4c23 100644 --- a/Mage.Sets/src/mage/cards/p/Phytohydra.java +++ b/Mage.Sets/src/mage/cards/p/Phytohydra.java @@ -30,7 +30,7 @@ public final class Phytohydra extends CardImpl { this.toughness = new MageInt(1); // If damage would be dealt to Phytohydra, put that many +1/+1 counters on it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhytohydraEffect())); + this.addAbility(new SimpleStaticAbility(new PhytohydraEffect())); } private Phytohydra(final Phytohydra card) { diff --git a/Mage.Sets/src/mage/cards/p/Piety.java b/Mage.Sets/src/mage/cards/p/Piety.java index 4f3002407ff..c72682382ed 100644 --- a/Mage.Sets/src/mage/cards/p/Piety.java +++ b/Mage.Sets/src/mage/cards/p/Piety.java @@ -23,7 +23,7 @@ public final class Piety extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); // Blocking creatures get +0/+3 until end of turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false))); } private Piety(final Piety card) { diff --git a/Mage.Sets/src/mage/cards/p/PillarOfWar.java b/Mage.Sets/src/mage/cards/p/PillarOfWar.java index 4b44cd5a64f..2f3e17cc245 100644 --- a/Mage.Sets/src/mage/cards/p/PillarOfWar.java +++ b/Mage.Sets/src/mage/cards/p/PillarOfWar.java @@ -36,7 +36,7 @@ public final class PillarOfWar extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), new EnchantedSourceCondition()); effect.setText("As long as {this} is enchanted, it can attack as though it didn't have defender"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java b/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java index e0b131fcebd..d93acb4894a 100644 --- a/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java +++ b/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java @@ -38,10 +38,10 @@ public final class PilloryOfTheSleepless extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // Enchanted creature has "At the beginning of your upkeep, you lose 1 life." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1)), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/p/PinToTheEarth.java b/Mage.Sets/src/mage/cards/p/PinToTheEarth.java index 2133aed83da..03ebf30b165 100644 --- a/Mage.Sets/src/mage/cards/p/PinToTheEarth.java +++ b/Mage.Sets/src/mage/cards/p/PinToTheEarth.java @@ -36,7 +36,7 @@ public final class PinToTheEarth extends CardImpl { this.addAbility(ability); // Enchanted creature gets -6/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-6,-0,Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-6,-0,Duration.WhileOnBattlefield))); } private PinToTheEarth(final PinToTheEarth card) { diff --git a/Mage.Sets/src/mage/cards/p/PiousInterdiction.java b/Mage.Sets/src/mage/cards/p/PiousInterdiction.java index ce7769ef551..a38b7c0f8ea 100644 --- a/Mage.Sets/src/mage/cards/p/PiousInterdiction.java +++ b/Mage.Sets/src/mage/cards/p/PiousInterdiction.java @@ -41,7 +41,7 @@ public final class PiousInterdiction extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2))); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } private PiousInterdiction(final PiousInterdiction card) { diff --git a/Mage.Sets/src/mage/cards/p/PirateShip.java b/Mage.Sets/src/mage/cards/p/PirateShip.java index c19d5d82269..c18df14e5a1 100644 --- a/Mage.Sets/src/mage/cards/p/PirateShip.java +++ b/Mage.Sets/src/mage/cards/p/PirateShip.java @@ -34,7 +34,7 @@ public final class PirateShip extends CardImpl { this.toughness = new MageInt(3); // Pirate Ship can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {tap}: Pirate Ship deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java index b5036ff0401..297261171d2 100644 --- a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java +++ b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java @@ -33,7 +33,7 @@ public final class PiratesCutlass extends CardImpl { this.addAbility(new EntersBattlefieldAttachToTarget(filter)); // Equipped creature gets +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 1))); // Equip 2 this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/p/PistonSledge.java b/Mage.Sets/src/mage/cards/p/PistonSledge.java index 980e6e44ac4..735855e836c 100644 --- a/Mage.Sets/src/mage/cards/p/PistonSledge.java +++ b/Mage.Sets/src/mage/cards/p/PistonSledge.java @@ -37,7 +37,7 @@ public final class PistonSledge extends CardImpl { this.addAbility(new EntersBattlefieldAttachToTarget()); // Equipped creature gets +3/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1))); // Equip—Sacrifice an artifact. this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(filter), false)); diff --git a/Mage.Sets/src/mage/cards/p/PithingNeedle.java b/Mage.Sets/src/mage/cards/p/PithingNeedle.java index 29ece3c81d2..28f9ce04f5a 100644 --- a/Mage.Sets/src/mage/cards/p/PithingNeedle.java +++ b/Mage.Sets/src/mage/cards/p/PithingNeedle.java @@ -31,7 +31,7 @@ public final class PithingNeedle extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL))); // Activated abilities of sources with the chosen name can't be activated unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PithingNeedleEffect())); + this.addAbility(new SimpleStaticAbility(new PithingNeedleEffect())); } private PithingNeedle(final PithingNeedle card) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueDrone.java b/Mage.Sets/src/mage/cards/p/PlagueDrone.java index dbdfe851bca..200169cb1f6 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueDrone.java +++ b/Mage.Sets/src/mage/cards/p/PlagueDrone.java @@ -29,7 +29,7 @@ public final class PlagueDrone extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Rot Fly — If an opponent would gain life, that player loses that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlagueDroneReplacementEffect()).withFlavorWord("Rot Fly")); + this.addAbility(new SimpleStaticAbility(new PlagueDroneReplacementEffect()).withFlavorWord("Rot Fly")); } private PlagueDrone(final PlagueDrone card) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueSliver.java b/Mage.Sets/src/mage/cards/p/PlagueSliver.java index 3f01d4a3973..3ee4def66ec 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueSliver.java +++ b/Mage.Sets/src/mage/cards/p/PlagueSliver.java @@ -34,7 +34,7 @@ public final class PlagueSliver extends CardImpl { // All Slivers have "At the beginning of your upkeep, this permanent deals 1 damage to you." Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, filterSliver, "All Slivers have \"At the beginning of your upkeep, this permanent deals 1 damage to you.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PlanarGate.java b/Mage.Sets/src/mage/cards/p/PlanarGate.java index 6ab399325a3..8e6419e3965 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarGate.java +++ b/Mage.Sets/src/mage/cards/p/PlanarGate.java @@ -20,7 +20,7 @@ public final class PlanarGate extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // Creature spells you cast cost up to {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterCreatureCard("Creature spells"), 2, true))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterCreatureCard("Creature spells"), 2, true))); } private PlanarGate(final PlanarGate card) { diff --git a/Mage.Sets/src/mage/cards/p/PlasmaElemental.java b/Mage.Sets/src/mage/cards/p/PlasmaElemental.java index e9ac7ffa7f1..4dc9ab1ae33 100644 --- a/Mage.Sets/src/mage/cards/p/PlasmaElemental.java +++ b/Mage.Sets/src/mage/cards/p/PlasmaElemental.java @@ -25,7 +25,7 @@ public final class PlasmaElemental extends CardImpl { this.toughness = new MageInt(1); // Plasma Elemental can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedSourceEffect())); } private PlasmaElemental(final PlasmaElemental card) { diff --git a/Mage.Sets/src/mage/cards/p/PlatedPegasus.java b/Mage.Sets/src/mage/cards/p/PlatedPegasus.java index e213a87b570..2734e1f63ef 100644 --- a/Mage.Sets/src/mage/cards/p/PlatedPegasus.java +++ b/Mage.Sets/src/mage/cards/p/PlatedPegasus.java @@ -38,7 +38,7 @@ public final class PlatedPegasus extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If a spell would deal damage to a permanent or player, prevent 1 damage that spell would deal to that permanent or player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlatedPegasusEffect())); + this.addAbility(new SimpleStaticAbility(new PlatedPegasusEffect())); } private PlatedPegasus(final PlatedPegasus card) { diff --git a/Mage.Sets/src/mage/cards/p/PlatedSliver.java b/Mage.Sets/src/mage/cards/p/PlatedSliver.java index 6511c894db6..5ad21ef7e9c 100644 --- a/Mage.Sets/src/mage/cards/p/PlatedSliver.java +++ b/Mage.Sets/src/mage/cards/p/PlatedSliver.java @@ -27,7 +27,7 @@ public final class PlatedSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } private PlatedSliver(final PlatedSliver card) { diff --git a/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java b/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java index 0c3bf4e2158..2fe8d57cbdf 100644 --- a/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java +++ b/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java @@ -26,7 +26,7 @@ public final class PlatinumEmperion extends CardImpl { this.toughness = new MageInt(8); // Your life total can't change. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LifeTotalCantChangeControllerEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new LifeTotalCantChangeControllerEffect(Duration.WhileOnBattlefield))); } private PlatinumEmperion(final PlatinumEmperion card) { diff --git a/Mage.Sets/src/mage/cards/p/PloKoon.java b/Mage.Sets/src/mage/cards/p/PloKoon.java index bad18cbd1f8..ba717efdfa1 100644 --- a/Mage.Sets/src/mage/cards/p/PloKoon.java +++ b/Mage.Sets/src/mage/cards/p/PloKoon.java @@ -29,7 +29,7 @@ public final class PloKoon extends CardImpl { this.toughness = new MageInt(4); // You may activate meditate abilities any time you could cast an instant. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(MeditateAbility.class, "meditate abilities"))); + this.addAbility(new SimpleStaticAbility(new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(MeditateAbility.class, "meditate abilities"))); // Meditate {1}{W} this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{W}"))); diff --git a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java index 0769b0c6cc7..c2b2d3eef6e 100644 --- a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java +++ b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java @@ -35,7 +35,7 @@ public final class PlumesOfPeace extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Forecast - {W}{U}, Reveal Plumes of Peace from your hand: Tap target creature. ForecastAbility ability = new ForecastAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}{U}")); diff --git a/Mage.Sets/src/mage/cards/p/PossessedPortal.java b/Mage.Sets/src/mage/cards/p/PossessedPortal.java index 1d5b8f10fe4..aa4c8b8ea53 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedPortal.java +++ b/Mage.Sets/src/mage/cards/p/PossessedPortal.java @@ -27,7 +27,7 @@ public final class PossessedPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{8}"); // If a player would draw a card, that player skips that draw instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PossessedPortalReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PossessedPortalReplacementEffect())); // At the beginning of each end step, each player sacrifices a permanent unless they discard a card. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new PossessedPortalEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/p/PowerArtifact.java b/Mage.Sets/src/mage/cards/p/PowerArtifact.java index 647c5e0a2d2..d5e19d04c89 100644 --- a/Mage.Sets/src/mage/cards/p/PowerArtifact.java +++ b/Mage.Sets/src/mage/cards/p/PowerArtifact.java @@ -35,7 +35,7 @@ public final class PowerArtifact extends CardImpl { // Enchanted artifact's activated abilities cost {2} less to activate. // This effect can't reduce the mana in that cost to less than one mana. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PowerArtifactCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new PowerArtifactCostModificationEffect())); } private PowerArtifact(final PowerArtifact card) { diff --git a/Mage.Sets/src/mage/cards/p/PowerFist.java b/Mage.Sets/src/mage/cards/p/PowerFist.java index b4d40f22d0e..2ec01bb2138 100644 --- a/Mage.Sets/src/mage/cards/p/PowerFist.java +++ b/Mage.Sets/src/mage/cards/p/PowerFist.java @@ -26,7 +26,7 @@ public final class PowerFist extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has trample and "Whenever this creature deals combat damage to a player, put that many +1/+1 counters on it." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT)); ability.addEffect(new GainAbilityAttachedEffect( new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect( CounterType.P1P1.createInstance(), SavedDamageValue.MANY, false diff --git a/Mage.Sets/src/mage/cards/p/PowerOfFire.java b/Mage.Sets/src/mage/cards/p/PowerOfFire.java index db79218c0d5..76c6441f783 100644 --- a/Mage.Sets/src/mage/cards/p/PowerOfFire.java +++ b/Mage.Sets/src/mage/cards/p/PowerOfFire.java @@ -43,7 +43,7 @@ public final class PowerOfFire extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to any target." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); } @@ -57,4 +57,3 @@ public final class PowerOfFire extends CardImpl { return new PowerOfFire(this); } } - diff --git a/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java b/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java index 912ea52b818..69f8d73b1b6 100644 --- a/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java +++ b/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java @@ -34,7 +34,7 @@ public final class PraetorianTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private PraetorianTrooper(final PraetorianTrooper card) { diff --git a/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java b/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java index 926b73062ea..832ff6468fa 100644 --- a/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java +++ b/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java @@ -26,7 +26,7 @@ public final class PrecipiceOfMortis extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}{U}{W}"); // If a Jedi entering or leaving the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers additional time - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrecipiceOfMortisEffect())); + this.addAbility(new SimpleStaticAbility(new PrecipiceOfMortisEffect())); } diff --git a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java index 4bab2a4ae5f..6d259fe78db 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java @@ -44,7 +44,7 @@ public final class PredatoryUrge extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted creature has \"{T}: This creature deals damage equal to its power to target creature. That creature deals damage equal to its power to this creature.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private PredatoryUrge(final PredatoryUrge card) { diff --git a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java index e6e064a808c..86c7a127be8 100644 --- a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java +++ b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java @@ -36,7 +36,7 @@ public final class PresenceOfGond extends CardImpl { // Enchanted creature has "{tap}: Create a 1/1 green Elf Warrior creature token." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfWarriorToken()), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: Create a 1/1 green Elf Warrior creature token.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java index 2a6816b6eb6..0c263660762 100644 --- a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java @@ -26,7 +26,7 @@ public final class PriceOfKnowledge extends CardImpl { // Players have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET, TargetController.ANY); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // At the beginning of each opponent's upkeep, Price of Knowledge deals damage to that player equal to the number of cards in that player's hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.OPPONENT, new PriceOfKnowledgeEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/p/Prickleboar.java b/Mage.Sets/src/mage/cards/p/Prickleboar.java index 6dc8c8198a9..1d3e91a1317 100644 --- a/Mage.Sets/src/mage/cards/p/Prickleboar.java +++ b/Mage.Sets/src/mage/cards/p/Prickleboar.java @@ -40,7 +40,7 @@ public final class Prickleboar extends CardImpl { new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.instance, "and has first strike"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); + Ability ability = new SimpleStaticAbility(boostEffect); ability.addEffect(gainAbilityEffect); ability.addHint(MyTurnHint.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java index 0cc53452844..f080fc3bd68 100644 --- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java +++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java @@ -42,7 +42,7 @@ public final class PrideSovereign extends CardImpl { // Pride Sovereign gets +1/+1 for each other Cat you control. DynamicValue otherCats = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); // {W}, {t}, Exert Pride Sovereign: Create two 1/1 white Cat creature tokens with lifelink. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/PrimalAmulet.java b/Mage.Sets/src/mage/cards/p/PrimalAmulet.java index 5dbd7ce2ce2..a687c4d3aba 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalAmulet.java +++ b/Mage.Sets/src/mage/cards/p/PrimalAmulet.java @@ -41,7 +41,7 @@ public final class PrimalAmulet extends CardImpl { this.secondSideCardClazz = mage.cards.p.PrimalWellspring.class; // Instant and sorcery spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast an instant or sorcery spell, put a charge counter on Primal Amulet. Then if there are four or more charge counters on it, you may remove those counters and transform it. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java b/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java index ad4d645669c..c6e2da2e2d2 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java +++ b/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java @@ -37,7 +37,7 @@ public final class PrimalFrenzy extends CardImpl { this.addAbility(ability); // Enchanted creature has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); } private PrimalFrenzy(final PrimalFrenzy card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalRage.java b/Mage.Sets/src/mage/cards/p/PrimalRage.java index cd68d38138f..507938b63b6 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalRage.java +++ b/Mage.Sets/src/mage/cards/p/PrimalRage.java @@ -20,7 +20,7 @@ public final class PrimalRage extends CardImpl { public PrimalRage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private PrimalRage(final PrimalRage card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalVigor.java b/Mage.Sets/src/mage/cards/p/PrimalVigor.java index 9a35fea4760..4066b42fb5c 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalVigor.java +++ b/Mage.Sets/src/mage/cards/p/PrimalVigor.java @@ -27,9 +27,9 @@ public final class PrimalVigor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}"); // If one or more tokens would be created, twice that many of those tokens are created instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrimalVigorTokenEffect())); + this.addAbility(new SimpleStaticAbility(new PrimalVigorTokenEffect())); // If one or more +1/+1 counters would be put on a creature, twice that many +1/+1 counters are put on that creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrimalVigorCounterEffect())); + this.addAbility(new SimpleStaticAbility(new PrimalVigorCounterEffect())); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java index 22d59d5f5bd..65a9eb9ff0a 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java +++ b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java @@ -38,7 +38,7 @@ public final class PrimalWhisperer extends CardImpl { // Primal Whisperer gets +2/+2 for each face-down creature on the battlefield. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); // Morph {3}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/p/PrincessLeia.java b/Mage.Sets/src/mage/cards/p/PrincessLeia.java index b6924e989e9..cc0ff001ec9 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLeia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLeia.java @@ -46,10 +46,10 @@ public final class PrincessLeia extends CardImpl { // Princess Leia gets +1/+1 for each other Rebel creature you control. DynamicValue count = new PermanentsOnBattlefieldCount(filter1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Other Rebel creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); } diff --git a/Mage.Sets/src/mage/cards/p/PrismaticWard.java b/Mage.Sets/src/mage/cards/p/PrismaticWard.java index 366d594aa77..8c7165dac24 100644 --- a/Mage.Sets/src/mage/cards/p/PrismaticWard.java +++ b/Mage.Sets/src/mage/cards/p/PrismaticWard.java @@ -46,7 +46,7 @@ public final class PrismaticWard extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Prevent all damage that would be dealt to enchanted creature by sources of the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrismaticWardPreventDamageEffect())); + this.addAbility(new SimpleStaticAbility(new PrismaticWardPreventDamageEffect())); } private PrismaticWard(final PrismaticWard card) { diff --git a/Mage.Sets/src/mage/cards/p/PrisonTerm.java b/Mage.Sets/src/mage/cards/p/PrisonTerm.java index 458f1a9ff13..b6433693ab2 100644 --- a/Mage.Sets/src/mage/cards/p/PrisonTerm.java +++ b/Mage.Sets/src/mage/cards/p/PrisonTerm.java @@ -50,7 +50,7 @@ public final class PrisonTerm extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // Whenever a creature enters the battlefield under an opponent's control, you may attach Prison Term to that creature. this.addAbility(new EntersBattlefieldOpponentTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java b/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java index 235dbd24222..1073bfa6f71 100644 --- a/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java +++ b/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java @@ -23,7 +23,7 @@ public final class PrivilegedPosition extends CardImpl { // Other permanents you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENTS, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENTS, true))); } private PrivilegedPosition(final PrivilegedPosition card) { diff --git a/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java b/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java index b506e789e83..3afbee7d4ca 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java +++ b/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java @@ -25,7 +25,7 @@ public final class PrizedUnicorn extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); } private PrizedUnicorn(final PrizedUnicorn card) { diff --git a/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java b/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java index 74c62651468..2f76ba32859 100644 --- a/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java +++ b/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java @@ -39,9 +39,9 @@ public final class ProphetOfKruphix extends CardImpl { this.toughness = new MageInt(3); // Untap all creatures and lands you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); + this.addAbility(new SimpleStaticAbility(new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); // You may cast creature spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterCreatureCard("creature spells")))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterCreatureCard("creature spells")))); } diff --git a/Mage.Sets/src/mage/cards/p/PropheticRavings.java b/Mage.Sets/src/mage/cards/p/PropheticRavings.java index e8562c7130c..d8f4788270d 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticRavings.java +++ b/Mage.Sets/src/mage/cards/p/PropheticRavings.java @@ -41,7 +41,7 @@ public final class PropheticRavings extends CardImpl { this.addAbility(ability); // Enchanted creature has haste and "{T}, Discard a card: Draw a card." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA)); + ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA)); Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); abilityToGain.addCost(new DiscardCardCost()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA); diff --git a/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java b/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java index 556df2a0094..a1c5db42e54 100644 --- a/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java +++ b/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java @@ -24,7 +24,7 @@ public final class ProtectionOfTheHekma extends CardImpl { // If a source an opponent controls would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionOfTheHekmaEffect())); + this.addAbility(new SimpleStaticAbility(new ProtectionOfTheHekmaEffect())); } private ProtectionOfTheHekma(final ProtectionOfTheHekma card) { diff --git a/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java b/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java index ee478072370..743f04a7117 100644 --- a/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java +++ b/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java @@ -39,7 +39,7 @@ public final class ProtectorOfTheCrown extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesMonarchSourceEffect()).addHint(MonarchHint.instance)); // All damage would be dealt to you is dealt to Protector of the Crown instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectorOfTheCrownEffect())); + this.addAbility(new SimpleStaticAbility(new ProtectorOfTheCrownEffect())); } private ProtectorOfTheCrown(final ProtectorOfTheCrown card) { diff --git a/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java b/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java index 98e1b3472ca..7764ad489a0 100644 --- a/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java +++ b/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java @@ -38,7 +38,7 @@ public final class ProwlingSerpopard extends CardImpl { this.addAbility(new CantBeCounteredSourceAbility()); // Creature spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); } private ProwlingSerpopard(final ProwlingSerpopard card) { diff --git a/Mage.Sets/src/mage/cards/p/PryingBlade.java b/Mage.Sets/src/mage/cards/p/PryingBlade.java index 1af9b337758..c88d063b956 100644 --- a/Mage.Sets/src/mage/cards/p/PryingBlade.java +++ b/Mage.Sets/src/mage/cards/p/PryingBlade.java @@ -28,7 +28,7 @@ public final class PryingBlade extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature deals combat damage to a player, create a colorless Treasure artifact token with "{t}, Sacrifice this artifact: Add one mana of any color." this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new CreateTokenEffect(new TreasureToken()), "equipped creature", false)); diff --git a/Mage.Sets/src/mage/cards/p/PsionicGift.java b/Mage.Sets/src/mage/cards/p/PsionicGift.java index 36064d5910d..ef1c7f684bb 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicGift.java +++ b/Mage.Sets/src/mage/cards/p/PsionicGift.java @@ -42,7 +42,7 @@ public final class PsionicGift extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to any target." Ability psiAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); psiAbility.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); } private PsionicGift(final PsionicGift card) { diff --git a/Mage.Sets/src/mage/cards/p/PsionicSliver.java b/Mage.Sets/src/mage/cards/p/PsionicSliver.java index 3af3d9f843f..24fffdccfd3 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicSliver.java +++ b/Mage.Sets/src/mage/cards/p/PsionicSliver.java @@ -43,7 +43,7 @@ public final class PsionicSliver extends CardImpl { ability.addEffect(new DamageSelfEffect(3).setText("3 damage to itself.")); ability.addTarget(new TargetAnyTarget()); this.addAbility( - new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, + new SimpleStaticAbility(new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"{T}: This creature deals 2 damage to any target and 3 damage to itself.\"") ) ); diff --git a/Mage.Sets/src/mage/cards/p/PsychicOverload.java b/Mage.Sets/src/mage/cards/p/PsychicOverload.java index 726908c56bb..ff09a5c8924 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicOverload.java +++ b/Mage.Sets/src/mage/cards/p/PsychicOverload.java @@ -45,12 +45,12 @@ public final class PsychicOverload extends CardImpl { // When Psychic Overload enters the battlefield, tap enchanted permanent. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect("permanent"))); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); // Enchanted permanent has "Discard two artifact cards: Untap this permanent." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new DiscardTargetCost(new TargetCardInHand(2, new FilterArtifactCard("two artifact cards")))); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted permanent has \"Discard two artifact cards: Untap this permanent.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility( effect)); } private PsychicOverload(final PsychicOverload card) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicPossession.java b/Mage.Sets/src/mage/cards/p/PsychicPossession.java index c15da55721e..4c11b3a6ecd 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicPossession.java +++ b/Mage.Sets/src/mage/cards/p/PsychicPossession.java @@ -40,7 +40,7 @@ public final class PsychicPossession extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever enchanted opponent draws a card, you may draw a card. this.addAbility(new PsychicPossessionTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PulmonicSliver.java b/Mage.Sets/src/mage/cards/p/PulmonicSliver.java index a798ba39b5b..8802e2ed0f7 100644 --- a/Mage.Sets/src/mage/cards/p/PulmonicSliver.java +++ b/Mage.Sets/src/mage/cards/p/PulmonicSliver.java @@ -34,11 +34,11 @@ public final class PulmonicSliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have flying."))); // All Slivers have "If this permanent would be put into a graveyard, you may put it on top of its owner's library instead." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new PutIntoGraveFromAnywhereSourceAbility(new ReturnToLibraryPermanentEffect(true), null, null, false, true), Duration.WhileOnBattlefield, filterSlivers, "All Slivers have \"If this permanent would be put into a graveyard, you may put it on top of its owner's library instead.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/Purity.java b/Mage.Sets/src/mage/cards/p/Purity.java index 346eecbb48f..70aab97b5fc 100644 --- a/Mage.Sets/src/mage/cards/p/Purity.java +++ b/Mage.Sets/src/mage/cards/p/Purity.java @@ -39,7 +39,7 @@ public final class Purity extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If noncombat damage would be dealt to you, prevent that damage. You gain life equal to the damage prevented this way. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PurityEffect())); + this.addAbility(new SimpleStaticAbility(new PurityEffect())); // When Purity is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java b/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java index a3bb75b4107..cdc1721d517 100644 --- a/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java +++ b/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java @@ -37,7 +37,7 @@ public final class PurphorossEmissary extends CardImpl { this.addAbility(new MenaceAbility()); // Enchanted creature gets +3/+3 and and has menace. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(3,3)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.AURA); effect.setText("and has menace"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java index 00ef7723637..70bcf57d5cb 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java @@ -40,7 +40,7 @@ public final class PursuitOfFlight extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{U}: This creature gains flying until end of turn." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java b/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java index dbf4bbfc9a9..6ae0fe8dcf0 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java @@ -31,7 +31,7 @@ public final class PursuitOfKnowledge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // If you would draw a card, you may put a study counter on Pursuit of Knowledge instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PursuitOfKnowledgeEffect())); + this.addAbility(new SimpleStaticAbility(new PursuitOfKnowledgeEffect())); // Remove three study counters from Pursuit of Knowledge, Sacrifice Pursuit of Knowledge: Draw seven cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(7), diff --git a/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java b/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java index a4954c9adae..9815e9b07dd 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java @@ -27,7 +27,7 @@ public final class PyromancersGauntlet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // If a red instant or sorcery spell you control or a red planeswalker you control would deal damage to a permanent or player, it deals that much damage plus 2 to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PyromancersGauntletReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PyromancersGauntletReplacementEffect())); } private PyromancersGauntlet(final PyromancersGauntlet card) { diff --git a/Mage.Sets/src/mage/cards/p/PyromancersSwath.java b/Mage.Sets/src/mage/cards/p/PyromancersSwath.java index 139ba6408a5..2e2443397c1 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersSwath.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersSwath.java @@ -25,7 +25,7 @@ public final class PyromancersSwath extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // If an instant or sorcery source you control would deal damage to a creature or player, it deals that much damage plus 2 to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PyromancersSwathReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PyromancersSwathReplacementEffect())); // At the beginning of each end step, discard your hand. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new DiscardHandControllerEffect(), false, null)); -- 2.47.2 From b02898093fee7f41bcbae6235032576e14382d20 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:15:13 -0500 Subject: [PATCH 19/50] refactor: SimpleStaticAbility default zone (cards Q R) --- Mage.Sets/src/mage/cards/q/QalSismaBehemoth.java | 2 +- Mage.Sets/src/mage/cards/q/QuagSickness.java | 2 +- Mage.Sets/src/mage/cards/q/Quagmire.java | 2 +- Mage.Sets/src/mage/cards/q/QuestForRenewal.java | 2 +- Mage.Sets/src/mage/cards/q/QuickSliver.java | 2 +- Mage.Sets/src/mage/cards/q/QuickeningLicid.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverFountain.java | 2 +- Mage.Sets/src/mage/cards/q/QuietusSpike.java | 2 +- Mage.Sets/src/mage/cards/r/RabidWombat.java | 2 +- Mage.Sets/src/mage/cards/r/RacecourseFury.java | 2 +- Mage.Sets/src/mage/cards/r/RadiantArchangel.java | 2 +- Mage.Sets/src/mage/cards/r/RaffinesGuidance.java | 2 +- Mage.Sets/src/mage/cards/r/RageReflection.java | 2 +- Mage.Sets/src/mage/cards/r/Ragemonger.java | 2 +- Mage.Sets/src/mage/cards/r/RaidersSpoils.java | 2 +- Mage.Sets/src/mage/cards/r/RaidingParty.java | 2 +- Mage.Sets/src/mage/cards/r/RainOfGore.java | 2 +- Mage.Sets/src/mage/cards/r/RainOfRiches.java | 4 ++-- Mage.Sets/src/mage/cards/r/RaisedByWolves.java | 2 +- Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java | 2 +- Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java | 2 +- Mage.Sets/src/mage/cards/r/RampagingFerocidon.java | 2 +- Mage.Sets/src/mage/cards/r/Ramroller.java | 2 +- Mage.Sets/src/mage/cards/r/RamunapHydra.java | 4 ++-- Mage.Sets/src/mage/cards/r/Rancor.java | 2 +- Mage.Sets/src/mage/cards/r/RattleblazeScarecrow.java | 4 ++-- Mage.Sets/src/mage/cards/r/Rattlechains.java | 2 +- Mage.Sets/src/mage/cards/r/RavosSoultender.java | 2 +- Mage.Sets/src/mage/cards/r/RazorfieldRhino.java | 2 +- Mage.Sets/src/mage/cards/r/RazorgrassScreen.java | 2 +- Mage.Sets/src/mage/cards/r/RazorjawOni.java | 2 +- Mage.Sets/src/mage/cards/r/Realmwright.java | 2 +- Mage.Sets/src/mage/cards/r/ReaperKing.java | 2 +- Mage.Sets/src/mage/cards/r/RebelInformer.java | 2 +- Mage.Sets/src/mage/cards/r/RecklessCohort.java | 2 +- Mage.Sets/src/mage/cards/r/Reclamation.java | 2 +- Mage.Sets/src/mage/cards/r/Recycle.java | 6 +++--- Mage.Sets/src/mage/cards/r/RedCliffsArmada.java | 2 +- Mage.Sets/src/mage/cards/r/RedScarab.java | 5 ++--- Mage.Sets/src/mage/cards/r/RedemptionArc.java | 2 +- Mage.Sets/src/mage/cards/r/ReduceInStature.java | 2 +- Mage.Sets/src/mage/cards/r/ReflexSliver.java | 2 +- Mage.Sets/src/mage/cards/r/Reflexes.java | 2 +- Mage.Sets/src/mage/cards/r/RegalCaracal.java | 2 +- Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java | 2 +- Mage.Sets/src/mage/cards/r/RelentlessRaptor.java | 2 +- Mage.Sets/src/mage/cards/r/RelentlessRats.java | 2 +- Mage.Sets/src/mage/cards/r/RelicBane.java | 2 +- Mage.Sets/src/mage/cards/r/RelicWard.java | 2 +- Mage.Sets/src/mage/cards/r/ReliquaryTower.java | 2 +- Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java | 2 +- Mage.Sets/src/mage/cards/r/ResplendentMentor.java | 2 +- Mage.Sets/src/mage/cards/r/Revelation.java | 2 +- Mage.Sets/src/mage/cards/r/Reverence.java | 2 +- Mage.Sets/src/mage/cards/r/RevokePrivileges.java | 2 +- Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java | 2 +- Mage.Sets/src/mage/cards/r/RhonassMonument.java | 2 +- Mage.Sets/src/mage/cards/r/RhoxFaithmender.java | 2 +- Mage.Sets/src/mage/cards/r/RhoxPikemaster.java | 2 +- Mage.Sets/src/mage/cards/r/RidersOfGavony.java | 2 +- Mage.Sets/src/mage/cards/r/RidingRonto.java | 2 +- Mage.Sets/src/mage/cards/r/RighteousAuthority.java | 2 +- Mage.Sets/src/mage/cards/r/RimeTransfusion.java | 2 +- Mage.Sets/src/mage/cards/r/RimefeatherOwl.java | 2 +- Mage.Sets/src/mage/cards/r/RiotGear.java | 2 +- Mage.Sets/src/mage/cards/r/RiotSpikes.java | 2 +- Mage.Sets/src/mage/cards/r/RisenExecutioner.java | 4 ++-- Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java | 2 +- Mage.Sets/src/mage/cards/r/RitualOfSteel.java | 2 +- Mage.Sets/src/mage/cards/r/RiverDelta.java | 2 +- Mage.Sets/src/mage/cards/r/RiverSerpent.java | 4 ++-- Mage.Sets/src/mage/cards/r/RiversFavor.java | 2 +- Mage.Sets/src/mage/cards/r/RoamingThrone.java | 2 +- Mage.Sets/src/mage/cards/r/RobeOfMirrors.java | 2 +- Mage.Sets/src/mage/cards/r/RocHatchling.java | 2 +- Mage.Sets/src/mage/cards/r/RockHydra.java | 2 +- Mage.Sets/src/mage/cards/r/RockLobster.java | 2 +- Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java | 2 +- Mage.Sets/src/mage/cards/r/RollingStones.java | 2 +- Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java | 2 +- Mage.Sets/src/mage/cards/r/RonomSerpent.java | 2 +- Mage.Sets/src/mage/cards/r/RooftopStorm.java | 2 +- Mage.Sets/src/mage/cards/r/RootSliver.java | 2 +- Mage.Sets/src/mage/cards/r/Roots.java | 2 +- Mage.Sets/src/mage/cards/r/RootwaterShaman.java | 2 +- Mage.Sets/src/mage/cards/r/RoughshodMentor.java | 2 +- Mage.Sets/src/mage/cards/r/RubyMedallion.java | 2 +- Mage.Sets/src/mage/cards/r/RuinationGuide.java | 2 +- Mage.Sets/src/mage/cards/r/RuleOfLaw.java | 2 +- Mage.Sets/src/mage/cards/r/RuleOfTwo.java | 2 +- Mage.Sets/src/mage/cards/r/RunechantersPike.java | 2 +- Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java | 4 ++-- Mage.Sets/src/mage/cards/r/Runesword.java | 2 +- Mage.Sets/src/mage/cards/r/RunnersBane.java | 2 +- 94 files changed, 103 insertions(+), 104 deletions(-) diff --git a/Mage.Sets/src/mage/cards/q/QalSismaBehemoth.java b/Mage.Sets/src/mage/cards/q/QalSismaBehemoth.java index cbcd34d9f3c..61d0ae002a1 100644 --- a/Mage.Sets/src/mage/cards/q/QalSismaBehemoth.java +++ b/Mage.Sets/src/mage/cards/q/QalSismaBehemoth.java @@ -27,7 +27,7 @@ public final class QalSismaBehemoth extends CardImpl { this.toughness = new MageInt(5); // Qal Sisma Behemoth can't attack or block unless you pay {2}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessPaysSourceEffect(new ManaCostsImpl<>("{2}"), PayCostToAttackBlockEffectImpl.RestrictType.ATTACK_AND_BLOCK))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockUnlessPaysSourceEffect(new ManaCostsImpl<>("{2}"), PayCostToAttackBlockEffectImpl.RestrictType.ATTACK_AND_BLOCK))); } diff --git a/Mage.Sets/src/mage/cards/q/QuagSickness.java b/Mage.Sets/src/mage/cards/q/QuagSickness.java index 9868ad4445e..196f41d16f6 100644 --- a/Mage.Sets/src/mage/cards/q/QuagSickness.java +++ b/Mage.Sets/src/mage/cards/q/QuagSickness.java @@ -39,7 +39,7 @@ public final class QuagSickness extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, -1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/q/Quagmire.java b/Mage.Sets/src/mage/cards/q/Quagmire.java index 7b8f7b48771..80e19e7a70e 100644 --- a/Mage.Sets/src/mage/cards/q/Quagmire.java +++ b/Mage.Sets/src/mage/cards/q/Quagmire.java @@ -24,7 +24,7 @@ public final class Quagmire extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // Creatures with swampwalk can be blocked as though they didn't have swampwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new QuagmireEffect())); + this.addAbility(new SimpleStaticAbility(new QuagmireEffect())); } private Quagmire(final Quagmire card) { diff --git a/Mage.Sets/src/mage/cards/q/QuestForRenewal.java b/Mage.Sets/src/mage/cards/q/QuestForRenewal.java index 293e8c7d997..c149b9cd6ca 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForRenewal.java +++ b/Mage.Sets/src/mage/cards/q/QuestForRenewal.java @@ -29,7 +29,7 @@ public final class QuestForRenewal extends CardImpl { true, StaticFilters.FILTER_CONTROLLED_A_CREATURE)); // As long as there are four or more quest counters on Quest for Renewal, untap all creatures you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new UntapAllDuringEachOtherPlayersUntapStepEffect(StaticFilters.FILTER_CONTROLLED_CREATURES), new SourceHasCounterCondition(CounterType.QUEST, 4, Integer.MAX_VALUE), "As long as there are four or more quest counters on {this}, untap all creatures you control during each other player's untap step."))); diff --git a/Mage.Sets/src/mage/cards/q/QuickSliver.java b/Mage.Sets/src/mage/cards/q/QuickSliver.java index 97ac74de838..7cab2ce6f9e 100644 --- a/Mage.Sets/src/mage/cards/q/QuickSliver.java +++ b/Mage.Sets/src/mage/cards/q/QuickSliver.java @@ -35,7 +35,7 @@ public final class QuickSliver extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Any player may play Sliver cards as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, true))); } private QuickSliver(final QuickSliver card) { diff --git a/Mage.Sets/src/mage/cards/q/QuickeningLicid.java b/Mage.Sets/src/mage/cards/q/QuickeningLicid.java index 13254c642d3..c78867faa3c 100644 --- a/Mage.Sets/src/mage/cards/q/QuickeningLicid.java +++ b/Mage.Sets/src/mage/cards/q/QuickeningLicid.java @@ -33,7 +33,7 @@ public final class QuickeningLicid extends CardImpl { this.addAbility(new LicidAbility(new ManaCostsImpl<>("{1}{W}"), new ColoredManaCost(ColoredManaSymbol.W))); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } private QuickeningLicid(final QuickeningLicid card) { diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java index bd1cc5662ac..bb41b51fe1a 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java @@ -100,7 +100,7 @@ class QuicksilverFountainEffect extends OneShotEffect { = new ConditionalContinuousEffect(becomesBasicLandTargetEffect, LandHasFloodCounterCondition.instance, staticText); // Bug #6885 Fixed when owner/controller leaves the game the effect still applies - SimpleStaticAbility gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility gainAbility = new SimpleStaticAbility(effect); gainAbility.setSourceId(landChosen.getId()); gainAbility.getTargets().add(source.getTargets().get(0)); game.addEffect(effect, gainAbility); diff --git a/Mage.Sets/src/mage/cards/q/QuietusSpike.java b/Mage.Sets/src/mage/cards/q/QuietusSpike.java index ba3ce8bf873..e0218631ce0 100644 --- a/Mage.Sets/src/mage/cards/q/QuietusSpike.java +++ b/Mage.Sets/src/mage/cards/q/QuietusSpike.java @@ -28,7 +28,7 @@ public final class QuietusSpike extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature deals combat damage to a player, that player loses half their life, rounded up. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new LoseHalfLifeTargetEffect(), "equipped creature", false, true)); diff --git a/Mage.Sets/src/mage/cards/r/RabidWombat.java b/Mage.Sets/src/mage/cards/r/RabidWombat.java index ec2b9d7a9b5..e5fed189d97 100644 --- a/Mage.Sets/src/mage/cards/r/RabidWombat.java +++ b/Mage.Sets/src/mage/cards/r/RabidWombat.java @@ -32,7 +32,7 @@ public final class RabidWombat extends CardImpl { // Rabid Wombat gets +2/+2 for each Aura attached to it. AuraAttachedCount count = new AuraAttachedCount(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/r/RacecourseFury.java b/Mage.Sets/src/mage/cards/r/RacecourseFury.java index d3bde40b28a..d5ec8eb54cc 100644 --- a/Mage.Sets/src/mage/cards/r/RacecourseFury.java +++ b/Mage.Sets/src/mage/cards/r/RacecourseFury.java @@ -47,7 +47,7 @@ public final class RacecourseFury extends CardImpl { // Enchanted land has "{T}: Target creature gains haste until end of turn." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } private RacecourseFury(final RacecourseFury card) { diff --git a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java index 8d526443ba0..ad469a2f7bd 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java @@ -49,7 +49,7 @@ public final class RadiantArchangel extends CardImpl { // Radiant, Archangel gets +1/+1 for each other creature with flying on the battlefield. DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield))); } private RadiantArchangel(final RadiantArchangel card) { diff --git a/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java b/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java index 3632feb167e..d8bb060b189 100644 --- a/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java +++ b/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java @@ -38,7 +38,7 @@ public final class RaffinesGuidance extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // You may cast Raffine's Guidance from your graveyard by paying {2}{W} instead of its mana cost. this.addAbility(new SimpleStaticAbility(Zone.ALL, new RafinnesGuidancePlayEffect()) diff --git a/Mage.Sets/src/mage/cards/r/RageReflection.java b/Mage.Sets/src/mage/cards/r/RageReflection.java index f0879bbd541..679f81be763 100644 --- a/Mage.Sets/src/mage/cards/r/RageReflection.java +++ b/Mage.Sets/src/mage/cards/r/RageReflection.java @@ -23,7 +23,7 @@ public final class RageReflection extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}{R}"); // Creatures you control have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private RageReflection(final RageReflection card) { diff --git a/Mage.Sets/src/mage/cards/r/Ragemonger.java b/Mage.Sets/src/mage/cards/r/Ragemonger.java index 2ef6f8e172d..419cfbf16ae 100644 --- a/Mage.Sets/src/mage/cards/r/Ragemonger.java +++ b/Mage.Sets/src/mage/cards/r/Ragemonger.java @@ -33,7 +33,7 @@ public final class Ragemonger extends CardImpl { this.toughness = new MageInt(3); // Minotaur spells you cast cost {B}{R} less to cast. This effect reduces only the amount of colored mana you pay. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, new ManaCostsImpl<>("{B}{R}")))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, new ManaCostsImpl<>("{B}{R}")))); } private Ragemonger(final Ragemonger card) { diff --git a/Mage.Sets/src/mage/cards/r/RaidersSpoils.java b/Mage.Sets/src/mage/cards/r/RaidersSpoils.java index 79c33631452..9eea3a7c233 100644 --- a/Mage.Sets/src/mage/cards/r/RaidersSpoils.java +++ b/Mage.Sets/src/mage/cards/r/RaidersSpoils.java @@ -28,7 +28,7 @@ public final class RaidersSpoils extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); // Creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield))); // Whenever a Warrior you control deals combat damage to a player, you may pay 1 life. If you do, draw a card. this.addAbility(new RaidersSpoilsTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/r/RaidingParty.java b/Mage.Sets/src/mage/cards/r/RaidingParty.java index 177e814d2b0..aefa5d7112b 100644 --- a/Mage.Sets/src/mage/cards/r/RaidingParty.java +++ b/Mage.Sets/src/mage/cards/r/RaidingParty.java @@ -48,7 +48,7 @@ public final class RaidingParty extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // Raiding Party can't be the target of white spells or abilities from white sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); // Sacrifice an Orc: Each player may tap any number of untapped white creatures they control. For each creature tapped this way, that player chooses up to two Plains. Then destroy all Plains that weren't chosen this way by any player. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RaidingPartyEffect(), new SacrificeTargetCost(filterOrc))); diff --git a/Mage.Sets/src/mage/cards/r/RainOfGore.java b/Mage.Sets/src/mage/cards/r/RainOfGore.java index 954ed54ec09..dc769b3a515 100644 --- a/Mage.Sets/src/mage/cards/r/RainOfGore.java +++ b/Mage.Sets/src/mage/cards/r/RainOfGore.java @@ -27,7 +27,7 @@ public final class RainOfGore extends CardImpl { // If a spell or ability would cause its controller to gain life, that player loses that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RainOfGoreEffect())); + this.addAbility(new SimpleStaticAbility(new RainOfGoreEffect())); } diff --git a/Mage.Sets/src/mage/cards/r/RainOfRiches.java b/Mage.Sets/src/mage/cards/r/RainOfRiches.java index 7f3daec5057..b15dcdaee2f 100644 --- a/Mage.Sets/src/mage/cards/r/RainOfRiches.java +++ b/Mage.Sets/src/mage/cards/r/RainOfRiches.java @@ -40,7 +40,7 @@ public class RainOfRiches extends CardImpl { // You may cast it without paying its mana cost. // Put the exiled cards on the bottom of your library in a random order.) this.addAbility( - new SimpleStaticAbility(Zone.BATTLEFIELD, new RainOfRichesGainsCascadeEffect()), + new SimpleStaticAbility(new RainOfRichesGainsCascadeEffect()), new RainOfRichesWatcher() ); } @@ -157,4 +157,4 @@ class RainOfRichesWatcher extends Watcher { return watcher.playerMap.containsKey(stackObject.getControllerId()) && watcher.playerMap.get(stackObject.getControllerId()).refersTo(((Spell) stackObject).getMainCard(), game); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java index ea427308603..c34127be1f0 100644 --- a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java +++ b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java @@ -42,7 +42,7 @@ public final class RaisedByWolves extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken(), 2))); // Enchanted creature gets +1/+1 for each Wolf you control. DynamicValue amountOfWolves = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amountOfWolves, amountOfWolves, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(amountOfWolves, amountOfWolves, Duration.WhileOnBattlefield))); } private RaisedByWolves(final RaisedByWolves card) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java b/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java index 00ef019484e..ee8f0027036 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java +++ b/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java @@ -41,7 +41,7 @@ public final class RakdosLordOfRiots extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Creature spells you cast cost {1} less to cast for each 1 life your opponents have lost this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RakdosLordOfRiotsCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new RakdosLordOfRiotsCostReductionEffect())); } private RakdosLordOfRiots(final RakdosLordOfRiots card) { diff --git a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java index fc2674c79d2..9093de46d3b 100644 --- a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java +++ b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java @@ -52,7 +52,7 @@ public final class RakshaGoldenCub extends CardImpl { effect2.setText("and have double strike"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(effect2); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java b/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java index 2c6be8bde26..131cab77f3d 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java +++ b/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java @@ -40,7 +40,7 @@ public final class RampagingFerocidon extends CardImpl { this.addAbility(new MenaceAbility(false)); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantGainLifeAllEffect())); // Whenever another creature enters the battlefield, Rampaging Ferocidon deals 1 damage to that creature's controller. this.addAbility(new EntersBattlefieldAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/r/Ramroller.java b/Mage.Sets/src/mage/cards/r/Ramroller.java index 5aa1b8b6cd7..6e98b7cc1c6 100644 --- a/Mage.Sets/src/mage/cards/r/Ramroller.java +++ b/Mage.Sets/src/mage/cards/r/Ramroller.java @@ -42,7 +42,7 @@ public final class Ramroller extends CardImpl { Condition condition = new PermanentsOnTheBattlefieldCondition(filter); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), condition, "{this} gets +2/+0 as long as you control another artifact."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Ramroller(final Ramroller card) { diff --git a/Mage.Sets/src/mage/cards/r/RamunapHydra.java b/Mage.Sets/src/mage/cards/r/RamunapHydra.java index 871ad6dd832..cd1fae31fa7 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapHydra.java +++ b/Mage.Sets/src/mage/cards/r/RamunapHydra.java @@ -50,10 +50,10 @@ public final class RamunapHydra extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Ramunap Hydra gets +1/+1 as long as you control a Desert. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(new FilterPermanent(SubType.DESERT, "Desert"), 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(new FilterPermanent(SubType.DESERT, "Desert"), 1, 1))); // Ramunap Hydra gets +1/+1 as long as there is a Desert card in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RamunapHydraBoostEffect(1, 1)).addHint(DesertControlledOrGraveyardCondition.getHint())); + this.addAbility(new SimpleStaticAbility(new RamunapHydraBoostEffect(1, 1)).addHint(DesertControlledOrGraveyardCondition.getHint())); } private RamunapHydra(final RamunapHydra card) { diff --git a/Mage.Sets/src/mage/cards/r/Rancor.java b/Mage.Sets/src/mage/cards/r/Rancor.java index 52ac1fb40ca..ccc47ccb6e0 100644 --- a/Mage.Sets/src/mage/cards/r/Rancor.java +++ b/Mage.Sets/src/mage/cards/r/Rancor.java @@ -36,7 +36,7 @@ public final class Rancor extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 0)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RattleblazeScarecrow.java b/Mage.Sets/src/mage/cards/r/RattleblazeScarecrow.java index 7965c05f25e..8e2a3405505 100644 --- a/Mage.Sets/src/mage/cards/r/RattleblazeScarecrow.java +++ b/Mage.Sets/src/mage/cards/r/RattleblazeScarecrow.java @@ -45,11 +45,11 @@ public final class RattleblazeScarecrow extends CardImpl { // Rattleblaze Scarecrow has persist as long as you control a black creature. ContinuousEffect effect = new GainAbilitySourceEffect(new PersistAbility(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Rattleblaze Scarecrow has haste as long as you control a red creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/r/Rattlechains.java b/Mage.Sets/src/mage/cards/r/Rattlechains.java index 343d13b0d80..d26b1938ae8 100644 --- a/Mage.Sets/src/mage/cards/r/Rattlechains.java +++ b/Mage.Sets/src/mage/cards/r/Rattlechains.java @@ -53,7 +53,7 @@ public final class Rattlechains extends CardImpl { this.addAbility(ability); // You may cast Spirit spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filterCard, false))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filterCard, false))); } private Rattlechains(final Rattlechains card) { diff --git a/Mage.Sets/src/mage/cards/r/RavosSoultender.java b/Mage.Sets/src/mage/cards/r/RavosSoultender.java index 716ad8ed0a7..f9c43ebee8c 100644 --- a/Mage.Sets/src/mage/cards/r/RavosSoultender.java +++ b/Mage.Sets/src/mage/cards/r/RavosSoultender.java @@ -35,7 +35,7 @@ public final class RavosSoultender extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); // At the beginning of your upkeep, you may return target creature card from your graveyard to your hand. Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect(), true); diff --git a/Mage.Sets/src/mage/cards/r/RazorfieldRhino.java b/Mage.Sets/src/mage/cards/r/RazorfieldRhino.java index 92502e35c98..b68bf51b587 100644 --- a/Mage.Sets/src/mage/cards/r/RazorfieldRhino.java +++ b/Mage.Sets/src/mage/cards/r/RazorfieldRhino.java @@ -26,7 +26,7 @@ public final class RazorfieldRhino extends CardImpl { // Metalcraft — Razorfield Rhino gets +2/+2 as long as you control three or more artifacts. ContinuousEffect effect1 = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect1, MetalcraftCondition.instance, "{this} gets +2/+2 as long as you control three or more artifacts")) + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect1, MetalcraftCondition.instance, "{this} gets +2/+2 as long as you control three or more artifacts")) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/r/RazorgrassScreen.java b/Mage.Sets/src/mage/cards/r/RazorgrassScreen.java index 4f14d6f364e..ab81758e1c0 100644 --- a/Mage.Sets/src/mage/cards/r/RazorgrassScreen.java +++ b/Mage.Sets/src/mage/cards/r/RazorgrassScreen.java @@ -29,7 +29,7 @@ public final class RazorgrassScreen extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Razorgrass Screen blocks each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); } private RazorgrassScreen(final RazorgrassScreen card) { diff --git a/Mage.Sets/src/mage/cards/r/RazorjawOni.java b/Mage.Sets/src/mage/cards/r/RazorjawOni.java index 027efe083b8..bfe7f7e2060 100644 --- a/Mage.Sets/src/mage/cards/r/RazorjawOni.java +++ b/Mage.Sets/src/mage/cards/r/RazorjawOni.java @@ -36,7 +36,7 @@ public final class RazorjawOni extends CardImpl { this.toughness = new MageInt(5); // Black creatures can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); } private RazorjawOni(final RazorjawOni card) { diff --git a/Mage.Sets/src/mage/cards/r/Realmwright.java b/Mage.Sets/src/mage/cards/r/Realmwright.java index 3e1d18ad70e..41d5a7a9ef0 100644 --- a/Mage.Sets/src/mage/cards/r/Realmwright.java +++ b/Mage.Sets/src/mage/cards/r/Realmwright.java @@ -33,7 +33,7 @@ public final class Realmwright extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseBasicLandTypeEffect(Outcome.Neutral))); // Lands you control are the chosen type in addition to their other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RealmwrightEffect())); + this.addAbility(new SimpleStaticAbility(new RealmwrightEffect())); } private Realmwright(final Realmwright card) { diff --git a/Mage.Sets/src/mage/cards/r/ReaperKing.java b/Mage.Sets/src/mage/cards/r/ReaperKing.java index d57f2143f44..f6a20508209 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperKing.java +++ b/Mage.Sets/src/mage/cards/r/ReaperKing.java @@ -39,7 +39,7 @@ public final class ReaperKing extends CardImpl { this.toughness = new MageInt(6); // Other Scarecrow creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever another Scarecrow you control enters, destroy target permanent. Ability ability = new EntersBattlefieldControlledTriggeredAbility(new DestroyTargetEffect(), filterTrigger); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/r/RebelInformer.java b/Mage.Sets/src/mage/cards/r/RebelInformer.java index 2801819b2ed..7dfd244380f 100644 --- a/Mage.Sets/src/mage/cards/r/RebelInformer.java +++ b/Mage.Sets/src/mage/cards/r/RebelInformer.java @@ -47,7 +47,7 @@ public final class RebelInformer extends CardImpl { this.toughness = new MageInt(2); // Rebel Informer can't be the target of white spells or abilities from white sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); // {3}: Put target nontoken Rebel on the bottom of its owner's library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); diff --git a/Mage.Sets/src/mage/cards/r/RecklessCohort.java b/Mage.Sets/src/mage/cards/r/RecklessCohort.java index fbec66db691..a3c4c8778c0 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessCohort.java +++ b/Mage.Sets/src/mage/cards/r/RecklessCohort.java @@ -39,7 +39,7 @@ public final class RecklessCohort extends CardImpl { new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true), new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 1)); effect.setText("{this} attacks each combat if able unless you control another Ally"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private RecklessCohort(final RecklessCohort card) { diff --git a/Mage.Sets/src/mage/cards/r/Reclamation.java b/Mage.Sets/src/mage/cards/r/Reclamation.java index df1de0c7d88..ccc9a8ed06e 100644 --- a/Mage.Sets/src/mage/cards/r/Reclamation.java +++ b/Mage.Sets/src/mage/cards/r/Reclamation.java @@ -26,7 +26,7 @@ public final class Reclamation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{W}"); // Black creatures can't attack unless their controller sacrifices a land for each black creature they control that's attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ReclamationCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new ReclamationCostToAttackBlockEffect())); } diff --git a/Mage.Sets/src/mage/cards/r/Recycle.java b/Mage.Sets/src/mage/cards/r/Recycle.java index fa126a62021..d81739041cd 100644 --- a/Mage.Sets/src/mage/cards/r/Recycle.java +++ b/Mage.Sets/src/mage/cards/r/Recycle.java @@ -25,14 +25,14 @@ public final class Recycle extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{G}{G}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you play a card, draw a card. this.addAbility(new PlayCardTriggeredAbility(TargetController.YOU, Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1))); // Your maximum hand size is two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.SET))); + this.addAbility(new SimpleStaticAbility(new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.SET))); } private Recycle(final Recycle card) { @@ -43,4 +43,4 @@ public final class Recycle extends CardImpl { public Recycle copy() { return new Recycle(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RedCliffsArmada.java b/Mage.Sets/src/mage/cards/r/RedCliffsArmada.java index ec15417e5ba..011aedb04f2 100644 --- a/Mage.Sets/src/mage/cards/r/RedCliffsArmada.java +++ b/Mage.Sets/src/mage/cards/r/RedCliffsArmada.java @@ -26,7 +26,7 @@ public final class RedCliffsArmada extends CardImpl { this.toughness = new MageInt(4); // Red Cliffs Armada can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private RedCliffsArmada(final RedCliffsArmada card) { diff --git a/Mage.Sets/src/mage/cards/r/RedScarab.java b/Mage.Sets/src/mage/cards/r/RedScarab.java index 610f5777c1b..6bdb0a7b77d 100644 --- a/Mage.Sets/src/mage/cards/r/RedScarab.java +++ b/Mage.Sets/src/mage/cards/r/RedScarab.java @@ -53,11 +53,11 @@ public final class RedScarab extends CardImpl { // Enchanted creature can't be blocked by red creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a red permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a red permanent"))); @@ -72,4 +72,3 @@ public final class RedScarab extends CardImpl { return new RedScarab(this); } } - diff --git a/Mage.Sets/src/mage/cards/r/RedemptionArc.java b/Mage.Sets/src/mage/cards/r/RedemptionArc.java index 845c59ddf80..da1968a08b2 100644 --- a/Mage.Sets/src/mage/cards/r/RedemptionArc.java +++ b/Mage.Sets/src/mage/cards/r/RedemptionArc.java @@ -42,7 +42,7 @@ public final class RedemptionArc extends CardImpl { Effect effect2 = new GoadAttachedEffect(); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(effect2); ability.addCustomOutcome(Outcome.Protect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ReduceInStature.java b/Mage.Sets/src/mage/cards/r/ReduceInStature.java index 2c41bcd6445..061512ec3f8 100644 --- a/Mage.Sets/src/mage/cards/r/ReduceInStature.java +++ b/Mage.Sets/src/mage/cards/r/ReduceInStature.java @@ -34,7 +34,7 @@ public final class ReduceInStature extends CardImpl { this.addAbility(ability); // Enchanted creature has base power and toughness 0/2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/r/ReflexSliver.java b/Mage.Sets/src/mage/cards/r/ReflexSliver.java index 2103da0cd81..2be1af91fc2 100644 --- a/Mage.Sets/src/mage/cards/r/ReflexSliver.java +++ b/Mage.Sets/src/mage/cards/r/ReflexSliver.java @@ -34,7 +34,7 @@ public final class ReflexSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have haste."))); } diff --git a/Mage.Sets/src/mage/cards/r/Reflexes.java b/Mage.Sets/src/mage/cards/r/Reflexes.java index 3a97e5ba3a2..5b148488e31 100644 --- a/Mage.Sets/src/mage/cards/r/Reflexes.java +++ b/Mage.Sets/src/mage/cards/r/Reflexes.java @@ -33,7 +33,7 @@ public final class Reflexes extends CardImpl { this.addAbility(ability); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/r/RegalCaracal.java b/Mage.Sets/src/mage/cards/r/RegalCaracal.java index fc0ac59dbb2..3640cd71b42 100644 --- a/Mage.Sets/src/mage/cards/r/RegalCaracal.java +++ b/Mage.Sets/src/mage/cards/r/RegalCaracal.java @@ -38,7 +38,7 @@ public final class RegalCaracal extends CardImpl { this.toughness = new MageInt(3); // Other Cats you control get +1/+1 and have lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true)); GainAbilityControlledEffect effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, filter, true); effect.setText("and have lifelink"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java index 77b9ae7db32..922fa44dedf 100644 --- a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java +++ b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java @@ -39,7 +39,7 @@ public final class ReinsOfTheVinesteed extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // When enchanted creature dies, you may return Reins of the Vinesteed from your graveyard to the battlefield attached to a creature that shares a creature type with that creature. this.addAbility(new DiesAttachedTriggeredAbility(new ReinsOfTheVinesteedEffect(), "enchanted creature", true)); diff --git a/Mage.Sets/src/mage/cards/r/RelentlessRaptor.java b/Mage.Sets/src/mage/cards/r/RelentlessRaptor.java index 10a12684417..dbc1a85097a 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessRaptor.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessRaptor.java @@ -32,7 +32,7 @@ public final class RelentlessRaptor extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Relentless Raptor attacks or blocks each combat if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true).setText("{this} attacks")); + Ability ability = new SimpleStaticAbility(new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true).setText("{this} attacks")); ability.addEffect(new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield).setText("or blocks each combat if able")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RelentlessRats.java b/Mage.Sets/src/mage/cards/r/RelentlessRats.java index f260b560044..69daf7de770 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessRats.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessRats.java @@ -36,7 +36,7 @@ public final class RelentlessRats extends CardImpl { this.toughness = new MageInt(2); // Relentless Rats gets +1/+1 for each other creature on the battlefield named Relentless Rats. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RelentlessRatsEffect())); + this.addAbility(new SimpleStaticAbility(new RelentlessRatsEffect())); // A deck can have any number of cards named Relentless Rats. this.getSpellAbility().addEffect(new InfoEffect("A deck can have any number of cards named Relentless Rats.")); diff --git a/Mage.Sets/src/mage/cards/r/RelicBane.java b/Mage.Sets/src/mage/cards/r/RelicBane.java index 124055cb41d..4fe114741f3 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBane.java +++ b/Mage.Sets/src/mage/cards/r/RelicBane.java @@ -34,7 +34,7 @@ public final class RelicBane extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted artifact has "At the beginning of your upkeep, you lose 2 life." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(2) ), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/r/RelicWard.java b/Mage.Sets/src/mage/cards/r/RelicWard.java index 9e747bb992d..155fc95a4a0 100644 --- a/Mage.Sets/src/mage/cards/r/RelicWard.java +++ b/Mage.Sets/src/mage/cards/r/RelicWard.java @@ -40,7 +40,7 @@ public final class RelicWard extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted artifact has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private RelicWard(final RelicWard card) { diff --git a/Mage.Sets/src/mage/cards/r/ReliquaryTower.java b/Mage.Sets/src/mage/cards/r/ReliquaryTower.java index e01e13f62f8..d7800efd5d2 100644 --- a/Mage.Sets/src/mage/cards/r/ReliquaryTower.java +++ b/Mage.Sets/src/mage/cards/r/ReliquaryTower.java @@ -24,7 +24,7 @@ public final class ReliquaryTower extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java b/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java index 9a2b2c72268..0e73da561ae 100644 --- a/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java +++ b/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java @@ -41,7 +41,7 @@ public final class RenegadeFirebrand extends CardImpl { // As long as you control a Chandra planeswalker, Renegade Firebrand gets +1/+0 and has first strike. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "and has first strike")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ResplendentMentor.java b/Mage.Sets/src/mage/cards/r/ResplendentMentor.java index 23c170cd31c..d47b2d7f711 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentMentor.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentMentor.java @@ -41,7 +41,7 @@ public final class ResplendentMentor extends CardImpl { // White creatures you control have {tap}: You gain 1 life. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter))); } private ResplendentMentor(final ResplendentMentor card) { diff --git a/Mage.Sets/src/mage/cards/r/Revelation.java b/Mage.Sets/src/mage/cards/r/Revelation.java index e8fba505e6a..b30295bf140 100644 --- a/Mage.Sets/src/mage/cards/r/Revelation.java +++ b/Mage.Sets/src/mage/cards/r/Revelation.java @@ -22,7 +22,7 @@ public final class Revelation extends CardImpl { this.supertype.add(SuperType.WORLD); // Players play with their hands revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithHandRevealedEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new PlayWithHandRevealedEffect(TargetController.ANY))); } private Revelation(final Revelation card) { diff --git a/Mage.Sets/src/mage/cards/r/Reverence.java b/Mage.Sets/src/mage/cards/r/Reverence.java index b4bb265dbc8..bd7d6c0d50b 100644 --- a/Mage.Sets/src/mage/cards/r/Reverence.java +++ b/Mage.Sets/src/mage/cards/r/Reverence.java @@ -29,7 +29,7 @@ public final class Reverence extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); // Creatures with power 2 or less can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter))); } private Reverence(final Reverence card) { diff --git a/Mage.Sets/src/mage/cards/r/RevokePrivileges.java b/Mage.Sets/src/mage/cards/r/RevokePrivileges.java index d3cdd96658e..770aeb8acf5 100644 --- a/Mage.Sets/src/mage/cards/r/RevokePrivileges.java +++ b/Mage.Sets/src/mage/cards/r/RevokePrivileges.java @@ -45,7 +45,7 @@ public final class RevokePrivileges extends CardImpl { // Enchanted creature can't attack, block, or crew Vehicles. Effect effect = new CantAttackBlockAttachedEffect(AttachmentType.AURA); effect.setText("Enchanted creature can't attack, block"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); ability.addEffect(new RevokePrivilegeCantCrewEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java index 4b4f98d9382..460661c28f5 100644 --- a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java +++ b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java @@ -46,7 +46,7 @@ public final class RhonasTheIndomitable extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Rhonas, the Indomitable can't attack or block unless you control another creature with power 4 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RhonasTheIndomitableRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new RhonasTheIndomitableRestrictionEffect())); // {2}{G}: Another target creature gets +2/+0 and gains trample until end of turn. Effect effect = new BoostTargetEffect(2, 0, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/r/RhonassMonument.java b/Mage.Sets/src/mage/cards/r/RhonassMonument.java index a24e0a3b715..7c3db3a68d3 100644 --- a/Mage.Sets/src/mage/cards/r/RhonassMonument.java +++ b/Mage.Sets/src/mage/cards/r/RhonassMonument.java @@ -45,7 +45,7 @@ public final class RhonassMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Green creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast a creature spell, target creature you control gets +2/+2 and gains trample until end of turn. Ability ability = new SpellCastControllerTriggeredAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/r/RhoxFaithmender.java b/Mage.Sets/src/mage/cards/r/RhoxFaithmender.java index ff2e77b5512..72266f131b0 100644 --- a/Mage.Sets/src/mage/cards/r/RhoxFaithmender.java +++ b/Mage.Sets/src/mage/cards/r/RhoxFaithmender.java @@ -37,7 +37,7 @@ public final class RhoxFaithmender extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // If you would gain life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RhoxFaithmenderEffect())); + this.addAbility(new SimpleStaticAbility(new RhoxFaithmenderEffect())); } private RhoxFaithmender(final RhoxFaithmender card) { diff --git a/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java b/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java index ba3b2583839..7efb50100ef 100644 --- a/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java +++ b/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java @@ -35,7 +35,7 @@ public final class RhoxPikemaster extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } private RhoxPikemaster(final RhoxPikemaster card) { diff --git a/Mage.Sets/src/mage/cards/r/RidersOfGavony.java b/Mage.Sets/src/mage/cards/r/RidersOfGavony.java index 4218e583983..d2e277dd961 100644 --- a/Mage.Sets/src/mage/cards/r/RidersOfGavony.java +++ b/Mage.Sets/src/mage/cards/r/RidersOfGavony.java @@ -37,7 +37,7 @@ public final class RidersOfGavony extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Protect))); // Human creatures you control have protection from creatures of the chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RidersOfGavonyGainAbilityControlledEffect())); + this.addAbility(new SimpleStaticAbility(new RidersOfGavonyGainAbilityControlledEffect())); } private RidersOfGavony(final RidersOfGavony card) { diff --git a/Mage.Sets/src/mage/cards/r/RidingRonto.java b/Mage.Sets/src/mage/cards/r/RidingRonto.java index f49a4589dfa..c1cbd7c6a65 100644 --- a/Mage.Sets/src/mage/cards/r/RidingRonto.java +++ b/Mage.Sets/src/mage/cards/r/RidingRonto.java @@ -33,7 +33,7 @@ public final class RidingRonto extends CardImpl { this.addAbility(new MonstrosityAbility("{3}{W}{W}", 3)); // As long as Riding Ronto is monstrous, it has vigilance - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as Riding Ronto is monstrous, it has vigilance") diff --git a/Mage.Sets/src/mage/cards/r/RighteousAuthority.java b/Mage.Sets/src/mage/cards/r/RighteousAuthority.java index 6bb6f6f61e5..d87c12ca24f 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousAuthority.java +++ b/Mage.Sets/src/mage/cards/r/RighteousAuthority.java @@ -41,7 +41,7 @@ public final class RighteousAuthority extends CardImpl { // Enchanted creature gets +1/+1 for each card in its controller's hand. CardsInEnchantedControllerHandCount boost = new CardsInEnchantedControllerHandCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(boost, boost, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(boost, boost, Duration.WhileOnBattlefield))); // At the beginning of the draw step of enchanted creature's controller, that player draws an additional card. this.addAbility(new BeginningOfDrawTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new DrawCardTargetEffect(1) diff --git a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java index f28815cdf51..71e1ab12fef 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java +++ b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java @@ -48,7 +48,7 @@ public final class RimeTransfusion extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has "{S}: This creature can't be blocked this turn except by snow creatures." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn))),new ManaCostsImpl<>("{S}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java b/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java index 56248ba2dcb..666326b0793 100644 --- a/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java +++ b/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java @@ -67,7 +67,7 @@ public final class RimefeatherOwl extends CardImpl { this.addAbility(ability); // Permanents with ice counters on them are snow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RimefeatherOwlEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new RimefeatherOwlEffect(Duration.WhileOnBattlefield, filter))); } private RimefeatherOwl(final RimefeatherOwl card) { diff --git a/Mage.Sets/src/mage/cards/r/RiotGear.java b/Mage.Sets/src/mage/cards/r/RiotGear.java index 6cd9dff6e7b..a471afc5b40 100644 --- a/Mage.Sets/src/mage/cards/r/RiotGear.java +++ b/Mage.Sets/src/mage/cards/r/RiotGear.java @@ -24,7 +24,7 @@ public final class RiotGear extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 2))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/r/RiotSpikes.java b/Mage.Sets/src/mage/cards/r/RiotSpikes.java index a14d3828272..d93e6a74407 100644 --- a/Mage.Sets/src/mage/cards/r/RiotSpikes.java +++ b/Mage.Sets/src/mage/cards/r/RiotSpikes.java @@ -29,7 +29,7 @@ public final class RiotSpikes extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -1, Duration.WhileOnBattlefield))); } private RiotSpikes(final RiotSpikes card) { diff --git a/Mage.Sets/src/mage/cards/r/RisenExecutioner.java b/Mage.Sets/src/mage/cards/r/RisenExecutioner.java index a8654c1b8ca..f9360653ced 100644 --- a/Mage.Sets/src/mage/cards/r/RisenExecutioner.java +++ b/Mage.Sets/src/mage/cards/r/RisenExecutioner.java @@ -45,7 +45,7 @@ public final class RisenExecutioner extends CardImpl { this.addAbility(new CantBlockAbility()); // Other Zombie creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // You may cast Risen Executioner from your graveyard if you pay {1} more to cast it for each other creature card in your graveyard. Ability ability = new SimpleStaticAbility(Zone.ALL, new RisenExecutionerCastEffect()) @@ -112,4 +112,4 @@ class RisenExecutionerCastEffect extends AsThoughEffectImpl { controller.setCastSourceIdWithAlternateMana(card.getId(), adjustedCost, null, MageIdentifier.RisenExectutionerAlternateCast); return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java b/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java index bf7cc7eeadc..fe463171ca0 100644 --- a/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java +++ b/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java @@ -28,7 +28,7 @@ public final class RitesOfFlourishing extends CardImpl { this.addAbility(new RitesOfFlourishingAbility()); // Each player may play an additional land on each of their turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsAllEffect())); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsAllEffect())); } private RitesOfFlourishing(final RitesOfFlourishing card) { diff --git a/Mage.Sets/src/mage/cards/r/RitualOfSteel.java b/Mage.Sets/src/mage/cards/r/RitualOfSteel.java index 5e1adf6e8c5..d552de8572f 100644 --- a/Mage.Sets/src/mage/cards/r/RitualOfSteel.java +++ b/Mage.Sets/src/mage/cards/r/RitualOfSteel.java @@ -44,7 +44,7 @@ public final class RitualOfSteel extends CardImpl { .setText("draw a card at the beginning of the next turn's upkeep"))); // Enchanted creature gets +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); } private RitualOfSteel(final RitualOfSteel card) { diff --git a/Mage.Sets/src/mage/cards/r/RiverDelta.java b/Mage.Sets/src/mage/cards/r/RiverDelta.java index bdf0697ebe6..2c310984a79 100644 --- a/Mage.Sets/src/mage/cards/r/RiverDelta.java +++ b/Mage.Sets/src/mage/cards/r/RiverDelta.java @@ -33,7 +33,7 @@ public final class RiverDelta extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from River Delta. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/r/RiverSerpent.java b/Mage.Sets/src/mage/cards/r/RiverSerpent.java index 9e20a41e2ea..be7c701bbd5 100644 --- a/Mage.Sets/src/mage/cards/r/RiverSerpent.java +++ b/Mage.Sets/src/mage/cards/r/RiverSerpent.java @@ -31,7 +31,7 @@ public final class RiverSerpent extends CardImpl { this.toughness = new MageInt(5); // River Serpent can't attack unless there are five or more cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RiverSerpentEffect())); + this.addAbility(new SimpleStaticAbility(new RiverSerpentEffect())); // Cycling {U} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{U}"))); @@ -75,4 +75,4 @@ class RiverSerpentEffect extends RestrictionEffect { return false; } } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RiversFavor.java b/Mage.Sets/src/mage/cards/r/RiversFavor.java index ca49fa065c8..2365df28da6 100644 --- a/Mage.Sets/src/mage/cards/r/RiversFavor.java +++ b/Mage.Sets/src/mage/cards/r/RiversFavor.java @@ -33,7 +33,7 @@ public final class RiversFavor extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1))); } private RiversFavor(final RiversFavor card) { diff --git a/Mage.Sets/src/mage/cards/r/RoamingThrone.java b/Mage.Sets/src/mage/cards/r/RoamingThrone.java index 08a8c7ce511..c430986a40c 100644 --- a/Mage.Sets/src/mage/cards/r/RoamingThrone.java +++ b/Mage.Sets/src/mage/cards/r/RoamingThrone.java @@ -44,7 +44,7 @@ public final class RoamingThrone extends CardImpl { // Roaming Throne is the chosen type in addition to its other types. ability.addEffect(new EnterAttributeAddChosenSubtypeEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // If a triggered ability of another creature you control of the chosen type triggers, it triggers an additional time. this.addAbility(new SimpleStaticAbility(new RoamingThroneReplacementEffect())); diff --git a/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java b/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java index f3f527d1e34..262eadd74de 100644 --- a/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java +++ b/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java @@ -33,7 +33,7 @@ public final class RobeOfMirrors extends CardImpl { this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private RobeOfMirrors(final RobeOfMirrors card) { diff --git a/Mage.Sets/src/mage/cards/r/RocHatchling.java b/Mage.Sets/src/mage/cards/r/RocHatchling.java index 04dc9fa566b..cab0fa6b356 100644 --- a/Mage.Sets/src/mage/cards/r/RocHatchling.java +++ b/Mage.Sets/src/mage/cards/r/RocHatchling.java @@ -39,7 +39,7 @@ public final class RocHatchling extends CardImpl { // At the beginning of your upkeep, remove a shell counter from Roc Hatchling. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.SHELL.createInstance()))); // As long as Roc Hatchling has no shell counters on it, it gets +3/+2 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3, 2, Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.SHELL, 0, 0), "As long as {this} has no shell counters on it, it gets +3/+2")); diff --git a/Mage.Sets/src/mage/cards/r/RockHydra.java b/Mage.Sets/src/mage/cards/r/RockHydra.java index 380ba951d17..77c48f5d9fe 100644 --- a/Mage.Sets/src/mage/cards/r/RockHydra.java +++ b/Mage.Sets/src/mage/cards/r/RockHydra.java @@ -41,7 +41,7 @@ public final class RockHydra extends CardImpl { // Rock Hydra enters the battlefield with X +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // For each 1 damage that would be dealt to Rock Hydra, if it has a +1/+1 counter on it, remove a +1/+1 counter from it and prevent that 1 damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RockHydraEffect())); + this.addAbility(new SimpleStaticAbility(new RockHydraEffect())); // {R}: Prevent the next 1 damage that would be dealt to Rock Hydra this turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{R}"))); // {R}{R}{R}: Put a +1/+1 counter on Rock Hydra. Activate this ability only during your upkeep. diff --git a/Mage.Sets/src/mage/cards/r/RockLobster.java b/Mage.Sets/src/mage/cards/r/RockLobster.java index d6eec94af78..9f9cbc1e855 100644 --- a/Mage.Sets/src/mage/cards/r/RockLobster.java +++ b/Mage.Sets/src/mage/cards/r/RockLobster.java @@ -34,7 +34,7 @@ public final class RockLobster extends CardImpl { this.toughness = new MageInt(3); // Creatures named Scissors Lizard can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); } private RockLobster(final RockLobster card) { diff --git a/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java b/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java index d01dad0f49e..afa44f6ae90 100644 --- a/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java +++ b/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java @@ -55,7 +55,7 @@ public final class RohgahhOfKherKeep extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new RohgahhOfKherKeepEffect())); // Creatures you control named Kobolds of Kher Keep get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } private RohgahhOfKherKeep(final RohgahhOfKherKeep card) { diff --git a/Mage.Sets/src/mage/cards/r/RollingStones.java b/Mage.Sets/src/mage/cards/r/RollingStones.java index 0739f45422e..8c3a869d3c4 100644 --- a/Mage.Sets/src/mage/cards/r/RollingStones.java +++ b/Mage.Sets/src/mage/cards/r/RollingStones.java @@ -29,7 +29,7 @@ public final class RollingStones extends CardImpl { // Wall creatures can attack as though they didn't have defender. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CanAttackAsThoughItDidntHaveDefenderAllEffect(Duration.WhileOnBattlefield, filter))); } private RollingStones(final RollingStones card) { diff --git a/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java b/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java index 83ff859c8e9..50592e2b7c4 100644 --- a/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java +++ b/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java @@ -49,7 +49,7 @@ public final class RonaDiscipleOfGix extends CardImpl { this.addAbility(ability); // You may cast nonland cards exiled with Rona. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RonaDiscipleOfGixPlayNonLandEffect())); + this.addAbility(new SimpleStaticAbility(new RonaDiscipleOfGixPlayNonLandEffect())); // {4}, {T}: Exile the top card of your library. ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/r/RonomSerpent.java b/Mage.Sets/src/mage/cards/r/RonomSerpent.java index d684b27340a..305a9141f68 100644 --- a/Mage.Sets/src/mage/cards/r/RonomSerpent.java +++ b/Mage.Sets/src/mage/cards/r/RonomSerpent.java @@ -39,7 +39,7 @@ public final class RonomSerpent extends CardImpl { this.toughness = new MageInt(6); // Ronom Serpent can't attack unless defending player controls a snow land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); // When you control no snow lands, sacrifice Ronom Serpent. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/r/RooftopStorm.java b/Mage.Sets/src/mage/cards/r/RooftopStorm.java index e9a6f8a4243..543a611dac5 100644 --- a/Mage.Sets/src/mage/cards/r/RooftopStorm.java +++ b/Mage.Sets/src/mage/cards/r/RooftopStorm.java @@ -25,7 +25,7 @@ public final class RooftopStorm extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{5}{U}"); // You may pay {0} rather than pay the mana cost for Zombie creature spells you cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RooftopStormRuleEffect())); + this.addAbility(new SimpleStaticAbility(new RooftopStormRuleEffect())); } diff --git a/Mage.Sets/src/mage/cards/r/RootSliver.java b/Mage.Sets/src/mage/cards/r/RootSliver.java index a623e152a1f..db2548ccff0 100644 --- a/Mage.Sets/src/mage/cards/r/RootSliver.java +++ b/Mage.Sets/src/mage/cards/r/RootSliver.java @@ -35,7 +35,7 @@ public final class RootSliver extends CardImpl { // Root Sliver can't be countered. this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect())); // Sliver spells can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RootSliverEffect())); + this.addAbility(new SimpleStaticAbility(new RootSliverEffect())); } diff --git a/Mage.Sets/src/mage/cards/r/Roots.java b/Mage.Sets/src/mage/cards/r/Roots.java index 46ce4548ccc..de83cbf0074 100644 --- a/Mage.Sets/src/mage/cards/r/Roots.java +++ b/Mage.Sets/src/mage/cards/r/Roots.java @@ -47,7 +47,7 @@ public final class Roots extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private Roots(final Roots card) { diff --git a/Mage.Sets/src/mage/cards/r/RootwaterShaman.java b/Mage.Sets/src/mage/cards/r/RootwaterShaman.java index 9fbf788a847..71286605355 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterShaman.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterShaman.java @@ -39,7 +39,7 @@ public final class RootwaterShaman extends CardImpl { this.toughness = new MageInt(2); // You may cast Aura spells with enchant creature as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, false))); } private RootwaterShaman(final RootwaterShaman card) { diff --git a/Mage.Sets/src/mage/cards/r/RoughshodMentor.java b/Mage.Sets/src/mage/cards/r/RoughshodMentor.java index 693d558ae4d..fc21bdd7489 100644 --- a/Mage.Sets/src/mage/cards/r/RoughshodMentor.java +++ b/Mage.Sets/src/mage/cards/r/RoughshodMentor.java @@ -37,7 +37,7 @@ public final class RoughshodMentor extends CardImpl { this.toughness = new MageInt(4); // Green creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private RoughshodMentor(final RoughshodMentor card) { diff --git a/Mage.Sets/src/mage/cards/r/RubyMedallion.java b/Mage.Sets/src/mage/cards/r/RubyMedallion.java index 26e6c8c4692..ba219f0fbef 100644 --- a/Mage.Sets/src/mage/cards/r/RubyMedallion.java +++ b/Mage.Sets/src/mage/cards/r/RubyMedallion.java @@ -27,7 +27,7 @@ public final class RubyMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Red spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private RubyMedallion(final RubyMedallion card) { diff --git a/Mage.Sets/src/mage/cards/r/RuinationGuide.java b/Mage.Sets/src/mage/cards/r/RuinationGuide.java index 71f9bb97768..46abb7d8517 100644 --- a/Mage.Sets/src/mage/cards/r/RuinationGuide.java +++ b/Mage.Sets/src/mage/cards/r/RuinationGuide.java @@ -40,7 +40,7 @@ public final class RuinationGuide extends CardImpl { // Ingest this.addAbility(new IngestAbility()); // Other colorless creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } private RuinationGuide(final RuinationGuide card) { diff --git a/Mage.Sets/src/mage/cards/r/RuleOfLaw.java b/Mage.Sets/src/mage/cards/r/RuleOfLaw.java index 414bd477f3a..a04a04b5a26 100644 --- a/Mage.Sets/src/mage/cards/r/RuleOfLaw.java +++ b/Mage.Sets/src/mage/cards/r/RuleOfLaw.java @@ -21,7 +21,7 @@ public final class RuleOfLaw extends CardImpl { // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.ANY))); } diff --git a/Mage.Sets/src/mage/cards/r/RuleOfTwo.java b/Mage.Sets/src/mage/cards/r/RuleOfTwo.java index d37e3c1bde3..cb0a2dd9e5d 100644 --- a/Mage.Sets/src/mage/cards/r/RuleOfTwo.java +++ b/Mage.Sets/src/mage/cards/r/RuleOfTwo.java @@ -33,7 +33,7 @@ public final class RuleOfTwo extends CardImpl { ContinuousEffect boostEffect = new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield); Effect effect = new ConditionalContinuousEffect(boostEffect, new CreatureCountCondition(2, TargetController.YOU), "As long as you control exactly two creatures, those creatures get +2/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ContinuousEffect deathtouchEffect = new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()); effect = new ConditionalContinuousEffect(deathtouchEffect, new CreatureCountCondition(2, TargetController.YOU), "and have deathtouch"); diff --git a/Mage.Sets/src/mage/cards/r/RunechantersPike.java b/Mage.Sets/src/mage/cards/r/RunechantersPike.java index fc7895ee534..685e9005633 100644 --- a/Mage.Sets/src/mage/cards/r/RunechantersPike.java +++ b/Mage.Sets/src/mage/cards/r/RunechantersPike.java @@ -42,7 +42,7 @@ public final class RunechantersPike extends CardImpl { Effect effect2 = new BoostEquippedEffect(new RunechantersPikeValue(), StaticValue.get(0)); effect.setText("Equipped creature has first strike"); effect2.setText(" and gets +X/+0 where X is the number of instant and sorcery cards in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(effect2); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java b/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java index ccc416c7f40..df72d8d9d77 100644 --- a/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java +++ b/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java @@ -41,11 +41,11 @@ public final class RunesOfTheDeus extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is red, it gets +1/+1 and has double strike. - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has double strike")); this.addAbility(redAbility); // As long as enchanted creature is green, it gets +1/+1 and has trample. - SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); + SimpleStaticAbility greenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); greenAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has trample")); this.addAbility(greenAbility); } diff --git a/Mage.Sets/src/mage/cards/r/Runesword.java b/Mage.Sets/src/mage/cards/r/Runesword.java index c171002797f..8f225fe4b90 100644 --- a/Mage.Sets/src/mage/cards/r/Runesword.java +++ b/Mage.Sets/src/mage/cards/r/Runesword.java @@ -46,7 +46,7 @@ public final class Runesword extends CardImpl { // If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn. ability.addEffect(new RuneswordCantBeRegeneratedEffect()); // If a creature dealt damage by the targeted creature would die this turn, exile that creature instead. - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.Custom)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new DealtDamageToCreatureBySourceDies(this, Duration.Custom)); ability2.addWatcher(new DamagedByWatcher(false)); ability2.setRuleVisible(false); ability.addEffect(new GainAbilityTargetEffect(ability2, Duration.EndOfTurn, null, false).setText( diff --git a/Mage.Sets/src/mage/cards/r/RunnersBane.java b/Mage.Sets/src/mage/cards/r/RunnersBane.java index 4cc6df5fef5..3de7e89bb96 100644 --- a/Mage.Sets/src/mage/cards/r/RunnersBane.java +++ b/Mage.Sets/src/mage/cards/r/RunnersBane.java @@ -46,7 +46,7 @@ public final class RunnersBane extends CardImpl { // When Runner's Bane enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's the untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private RunnersBane(final RunnersBane card) { -- 2.47.2 From 8f25e65d77da946b279354140043edb8933aca8e Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:15:24 -0500 Subject: [PATCH 20/50] refactor: SimpleStaticAbility default zone (cards S) --- Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java | 4 ++-- Mage.Sets/src/mage/cards/s/SagesOfTheAnima.java | 2 +- Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java | 2 +- Mage.Sets/src/mage/cards/s/SalvageSlasher.java | 2 +- Mage.Sets/src/mage/cards/s/SamiteBlessing.java | 2 +- Mage.Sets/src/mage/cards/s/SamuraiOfThePaleCurtain.java | 2 +- Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java | 2 +- Mage.Sets/src/mage/cards/s/SanctuaryBlade.java | 2 +- Mage.Sets/src/mage/cards/s/SanctumPrelate.java | 2 +- Mage.Sets/src/mage/cards/s/SandTrooper.java | 2 +- Mage.Sets/src/mage/cards/s/SandsOfTime.java | 2 +- Mage.Sets/src/mage/cards/s/Sandskin.java | 2 +- Mage.Sets/src/mage/cards/s/SangriteBacklash.java | 2 +- Mage.Sets/src/mage/cards/s/SapphireMedallion.java | 2 +- Mage.Sets/src/mage/cards/s/SavingGrace.java | 2 +- Mage.Sets/src/mage/cards/s/SawhornNemesis.java | 2 +- Mage.Sets/src/mage/cards/s/ScarredPuma.java | 2 +- Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java | 2 +- Mage.Sets/src/mage/cards/s/ScionOfOona.java | 4 ++-- Mage.Sets/src/mage/cards/s/ScissorsLizard.java | 2 +- Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java | 4 ++-- Mage.Sets/src/mage/cards/s/ScourgeWolf.java | 2 +- Mage.Sets/src/mage/cards/s/Scourgemark.java | 2 +- Mage.Sets/src/mage/cards/s/ScoutTrooper.java | 2 +- Mage.Sets/src/mage/cards/s/ScrapdiverSerpent.java | 2 +- Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java | 2 +- Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java | 2 +- Mage.Sets/src/mage/cards/s/ScroungedScythe.java | 4 ++-- Mage.Sets/src/mage/cards/s/ScytheOfTheWretched.java | 2 +- Mage.Sets/src/mage/cards/s/Scytheclaw.java | 2 +- Mage.Sets/src/mage/cards/s/SeaMonster.java | 2 +- Mage.Sets/src/mage/cards/s/SeaSerpent.java | 2 +- Mage.Sets/src/mage/cards/s/SeafarersQuay.java | 2 +- Mage.Sets/src/mage/cards/s/SealOfTheGuildpact.java | 2 +- Mage.Sets/src/mage/cards/s/SeasClaim.java | 2 +- Mage.Sets/src/mage/cards/s/Secretkeeper.java | 2 +- Mage.Sets/src/mage/cards/s/SecurityBlockade.java | 2 +- Mage.Sets/src/mage/cards/s/SedgeSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SedgeTroll.java | 2 +- Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java | 2 +- Mage.Sets/src/mage/cards/s/SeeRed.java | 2 +- Mage.Sets/src/mage/cards/s/SeedbornMuse.java | 2 +- Mage.Sets/src/mage/cards/s/SeekerOfSlaanesh.java | 2 +- Mage.Sets/src/mage/cards/s/SeersVision.java | 2 +- Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java | 2 +- Mage.Sets/src/mage/cards/s/SelesnyaSagittars.java | 2 +- Mage.Sets/src/mage/cards/s/SemblanceAnvil.java | 2 +- Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java | 2 +- Mage.Sets/src/mage/cards/s/SenatorLottDod.java | 4 ++-- Mage.Sets/src/mage/cards/s/SenselessRage.java | 2 +- Mage.Sets/src/mage/cards/s/SensorSplicer.java | 2 +- Mage.Sets/src/mage/cards/s/SensoryDeprivation.java | 2 +- Mage.Sets/src/mage/cards/s/SeraphOfTheSword.java | 2 +- Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java | 2 +- Mage.Sets/src/mage/cards/s/SerpentSkin.java | 2 +- Mage.Sets/src/mage/cards/s/SerraAscendant.java | 2 +- Mage.Sets/src/mage/cards/s/SerraAviary.java | 2 +- Mage.Sets/src/mage/cards/s/SerraBestiary.java | 2 +- Mage.Sets/src/mage/cards/s/SerrasBlessing.java | 2 +- Mage.Sets/src/mage/cards/s/SerrasBoon.java | 2 +- Mage.Sets/src/mage/cards/s/SerrasEmbrace.java | 2 +- Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java | 4 ++-- Mage.Sets/src/mage/cards/s/Shackles.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowInTheWarp.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowLance.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowSliver.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowTrooper.java | 2 +- Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java | 2 +- Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java | 2 +- Mage.Sets/src/mage/cards/s/ShardOfBrokenGlass.java | 2 +- Mage.Sets/src/mage/cards/s/SharedFate.java | 6 +++--- Mage.Sets/src/mage/cards/s/SharedTriumph.java | 2 +- Mage.Sets/src/mage/cards/s/SharkeyTyrantOfTheShire.java | 2 +- Mage.Sets/src/mage/cards/s/SharpenedPitchfork.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java | 2 +- Mage.Sets/src/mage/cards/s/ShelteredAerie.java | 2 +- Mage.Sets/src/mage/cards/s/ShelteringPrayers.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShieldedByFaith.java | 2 +- Mage.Sets/src/mage/cards/s/ShiftingSky.java | 2 +- Mage.Sets/src/mage/cards/s/ShiftingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/ShimmerMyr.java | 2 +- Mage.Sets/src/mage/cards/s/ShimmeringWings.java | 2 +- Mage.Sets/src/mage/cards/s/ShinenOfFearsChill.java | 2 +- Mage.Sets/src/mage/cards/s/ShinenOfLifesRoar.java | 2 +- Mage.Sets/src/mage/cards/s/ShivsEmbrace.java | 2 +- Mage.Sets/src/mage/cards/s/ShockTrooper.java | 2 +- Mage.Sets/src/mage/cards/s/ShortSword.java | 2 +- Mage.Sets/src/mage/cards/s/ShrillHowler.java | 4 ++-- Mage.Sets/src/mage/cards/s/Shuko.java | 2 +- Mage.Sets/src/mage/cards/s/Sicken.java | 2 +- Mage.Sets/src/mage/cards/s/Sickleslicer.java | 2 +- Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java | 2 +- Mage.Sets/src/mage/cards/s/SiegeBehemoth.java | 2 +- Mage.Sets/src/mage/cards/s/SiegeModification.java | 4 ++-- Mage.Sets/src/mage/cards/s/Siegecraft.java | 2 +- Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java | 2 +- Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java | 2 +- Mage.Sets/src/mage/cards/s/SigardasAid.java | 2 +- Mage.Sets/src/mage/cards/s/SightlessBrawler.java | 2 +- Mage.Sets/src/mage/cards/s/SigilOfDistinction.java | 2 +- Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java | 2 +- Mage.Sets/src/mage/cards/s/SilburlindSnapper.java | 2 +- Mage.Sets/src/mage/cards/s/SilentArbiter.java | 6 +++--- Mage.Sets/src/mage/cards/s/SilentGravestone.java | 2 +- Mage.Sets/src/mage/cards/s/SilumgarAssassin.java | 2 +- Mage.Sets/src/mage/cards/s/SilverInlaidDagger.java | 4 ++-- Mage.Sets/src/mage/cards/s/SilverbladePaladin.java | 2 +- Mage.Sets/src/mage/cards/s/SinewSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java | 2 +- Mage.Sets/src/mage/cards/s/SingingBellStrike.java | 4 ++-- Mage.Sets/src/mage/cards/s/SinisterStrength.java | 2 +- Mage.Sets/src/mage/cards/s/SinkingFeeling.java | 4 ++-- Mage.Sets/src/mage/cards/s/SinuousPredator.java | 2 +- Mage.Sets/src/mage/cards/s/SirenSongLyre.java | 2 +- Mage.Sets/src/mage/cards/s/SisaysIngenuity.java | 2 +- Mage.Sets/src/mage/cards/s/SixthSense.java | 2 +- Mage.Sets/src/mage/cards/s/SkarrganPitSkulk.java | 2 +- Mage.Sets/src/mage/cards/s/SkeletonKey.java | 2 +- Mage.Sets/src/mage/cards/s/SkillBorrower.java | 3 +-- Mage.Sets/src/mage/cards/s/SkirkOutrider.java | 2 +- Mage.Sets/src/mage/cards/s/Skullclamp.java | 2 +- Mage.Sets/src/mage/cards/s/SkyblinderStaff.java | 2 +- Mage.Sets/src/mage/cards/s/Skygames.java | 2 +- Mage.Sets/src/mage/cards/s/SkyhunterCub.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java | 2 +- Mage.Sets/src/mage/cards/s/SkyshroudElite.java | 2 +- Mage.Sets/src/mage/cards/s/SlagwurmArmor.java | 2 +- Mage.Sets/src/mage/cards/s/SlayersCleaver.java | 2 +- Mage.Sets/src/mage/cards/s/SlayersPlate.java | 2 +- Mage.Sets/src/mage/cards/s/SleepParalysis.java | 2 +- Mage.Sets/src/mage/cards/s/SleepersGuile.java | 2 +- Mage.Sets/src/mage/cards/s/SleepersRobe.java | 2 +- Mage.Sets/src/mage/cards/s/SleepingPotion.java | 2 +- Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java | 2 +- Mage.Sets/src/mage/cards/s/SlipstreamEel.java | 2 +- Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java | 2 +- Mage.Sets/src/mage/cards/s/SlitheringShade.java | 2 +- Mage.Sets/src/mage/cards/s/SliverLegion.java | 2 +- Mage.Sets/src/mage/cards/s/Sluggishness.java | 2 +- Mage.Sets/src/mage/cards/s/SlumberingDragon.java | 2 +- Mage.Sets/src/mage/cards/s/SmogElemental.java | 2 +- Mage.Sets/src/mage/cards/s/Smoke.java | 2 +- Mage.Sets/src/mage/cards/s/SnakeUmbra.java | 2 +- Mage.Sets/src/mage/cards/s/SnapsailGlider.java | 2 +- Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java | 2 +- Mage.Sets/src/mage/cards/s/SnowDevil.java | 2 +- Mage.Sets/src/mage/cards/s/SnubhornSentry.java | 2 +- Mage.Sets/src/mage/cards/s/Soar.java | 2 +- Mage.Sets/src/mage/cards/s/SoaringHope.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviGolem.java | 2 +- Mage.Sets/src/mage/cards/s/Solemnity.java | 4 ++-- Mage.Sets/src/mage/cards/s/SolitaryConfinement.java | 6 +++--- Mage.Sets/src/mage/cards/s/SoltariLancer.java | 2 +- Mage.Sets/src/mage/cards/s/SongOfSerenity.java | 2 +- Mage.Sets/src/mage/cards/s/SongOfTheDryads.java | 2 +- Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java | 2 +- Mage.Sets/src/mage/cards/s/SorcerersWand.java | 2 +- Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java | 2 +- Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java | 2 +- Mage.Sets/src/mage/cards/s/SoulEcho.java | 2 +- Mage.Sets/src/mage/cards/s/SoulRansom.java | 2 +- Mage.Sets/src/mage/cards/s/SoulScarMage.java | 2 +- Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java | 2 +- Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java | 2 +- Mage.Sets/src/mage/cards/s/Soulflayer.java | 2 +- Mage.Sets/src/mage/cards/s/SparringCollar.java | 2 +- Mage.Sets/src/mage/cards/s/SpawningGrounds.java | 2 +- Mage.Sets/src/mage/cards/s/SpearpointOread.java | 2 +- Mage.Sets/src/mage/cards/s/SpectersShroud.java | 2 +- Mage.Sets/src/mage/cards/s/SpectraWard.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralGateguards.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralGrasp.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpectralGuardian.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralPrison.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralShield.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpectralSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SpeederTrooper.java | 2 +- Mage.Sets/src/mage/cards/s/Spellbook.java | 2 +- Mage.Sets/src/mage/cards/s/SpellbreakerBehemoth.java | 2 +- Mage.Sets/src/mage/cards/s/SphereOfDuty.java | 2 +- Mage.Sets/src/mage/cards/s/SphereOfGrace.java | 2 +- Mage.Sets/src/mage/cards/s/SphereOfLaw.java | 2 +- Mage.Sets/src/mage/cards/s/SphereOfPurity.java | 2 +- Mage.Sets/src/mage/cards/s/SphereOfReason.java | 2 +- Mage.Sets/src/mage/cards/s/SphereOfSafety.java | 4 ++-- Mage.Sets/src/mage/cards/s/SphereOfTruth.java | 2 +- Mage.Sets/src/mage/cards/s/SphinxOfTheFinalWord.java | 2 +- Mage.Sets/src/mage/cards/s/SpiderClimb.java | 2 +- Mage.Sets/src/mage/cards/s/SpikeTailedCeratops.java | 2 +- Mage.Sets/src/mage/cards/s/SpinalGraft.java | 2 +- Mage.Sets/src/mage/cards/s/SpinneretSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SpiralingDuelist.java | 2 +- Mage.Sets/src/mage/cards/s/SpireSerpent.java | 2 +- Mage.Sets/src/mage/cards/s/SpireWinder.java | 2 +- Mage.Sets/src/mage/cards/s/Spirespine.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpiritOfResistance.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritOfTheHearth.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritOfTheLabyrinth.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritualAsylum.java | 2 +- Mage.Sets/src/mage/cards/s/SpitefulMotives.java | 2 +- Mage.Sets/src/mage/cards/s/SpitefulReturned.java | 2 +- Mage.Sets/src/mage/cards/s/SpitfireHandler.java | 2 +- Mage.Sets/src/mage/cards/s/SplinterTwin.java | 2 +- Mage.Sets/src/mage/cards/s/SporecrownThallid.java | 2 +- Mage.Sets/src/mage/cards/s/SporolothAncient.java | 2 +- Mage.Sets/src/mage/cards/s/SpreadingSeas.java | 2 +- Mage.Sets/src/mage/cards/s/SqueesEmbrace.java | 2 +- Mage.Sets/src/mage/cards/s/SquiresDevotion.java | 2 +- Mage.Sets/src/mage/cards/s/SquirrelNest.java | 2 +- Mage.Sets/src/mage/cards/s/SquirrelPoweredScheme.java | 2 +- Mage.Sets/src/mage/cards/s/StabWound.java | 2 +- Mage.Sets/src/mage/cards/s/StaffOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/s/StalkingTiger.java | 2 +- Mage.Sets/src/mage/cards/s/Stamina.java | 2 +- Mage.Sets/src/mage/cards/s/StampedingHorncrest.java | 2 +- Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java | 2 +- Mage.Sets/src/mage/cards/s/Stasis.java | 2 +- Mage.Sets/src/mage/cards/s/StasisCell.java | 2 +- Mage.Sets/src/mage/cards/s/StasisCocoon.java | 2 +- Mage.Sets/src/mage/cards/s/Statecraft.java | 2 +- Mage.Sets/src/mage/cards/s/StaticOrb.java | 2 +- Mage.Sets/src/mage/cards/s/StealArtifact.java | 2 +- Mage.Sets/src/mage/cards/s/StealEnchantment.java | 2 +- Mage.Sets/src/mage/cards/s/SteamFrigate.java | 2 +- Mage.Sets/src/mage/cards/s/SteelGolem.java | 2 +- Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java | 4 ++-- Mage.Sets/src/mage/cards/s/SteelcladSerpent.java | 4 ++-- Mage.Sets/src/mage/cards/s/SteelyResolve.java | 2 +- Mage.Sets/src/mage/cards/s/StensiaMasquerade.java | 2 +- Mage.Sets/src/mage/cards/s/SterlingGrove.java | 2 +- Mage.Sets/src/mage/cards/s/SternMentor.java | 2 +- Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java | 2 +- Mage.Sets/src/mage/cards/s/StitchersGraft.java | 2 +- Mage.Sets/src/mage/cards/s/StoicAngel.java | 2 +- Mage.Sets/src/mage/cards/s/StoneCalendar.java | 2 +- Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java | 2 +- Mage.Sets/src/mage/cards/s/StoneforgeMasterwork.java | 2 +- Mage.Sets/src/mage/cards/s/Stonehands.java | 2 +- Mage.Sets/src/mage/cards/s/Stonewright.java | 2 +- Mage.Sets/src/mage/cards/s/StonySilence.java | 2 +- Mage.Sets/src/mage/cards/s/StonybrookBanneret.java | 2 +- Mage.Sets/src/mage/cards/s/StormCauldron.java | 2 +- Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java | 2 +- Mage.Sets/src/mage/cards/s/StormriderRig.java | 2 +- Mage.Sets/src/mage/cards/s/StormscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/s/StrangeAugmentation.java | 4 ++-- Mage.Sets/src/mage/cards/s/Stranglehold.java | 2 +- Mage.Sets/src/mage/cards/s/StrataScythe.java | 2 +- Mage.Sets/src/mage/cards/s/StratusWalk.java | 4 ++-- Mage.Sets/src/mage/cards/s/StreetSavvy.java | 2 +- Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java | 2 +- Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java | 2 +- Mage.Sets/src/mage/cards/s/StrengthOfUnity.java | 2 +- Mage.Sets/src/mage/cards/s/StrongholdTaskmaster.java | 2 +- Mage.Sets/src/mage/cards/s/StupefyingTouch.java | 2 +- Mage.Sets/src/mage/cards/s/SulfurElemental.java | 2 +- Mage.Sets/src/mage/cards/s/SulfuricVapors.java | 2 +- Mage.Sets/src/mage/cards/s/SulfuricVortex.java | 2 +- Mage.Sets/src/mage/cards/s/SultaiRunemark.java | 2 +- Mage.Sets/src/mage/cards/s/SunClasp.java | 2 +- Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java | 2 +- Mage.Sets/src/mage/cards/s/Sunbond.java | 4 ++-- Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java | 2 +- Mage.Sets/src/mage/cards/s/SunkenCity.java | 2 +- Mage.Sets/src/mage/cards/s/SunkenField.java | 2 +- Mage.Sets/src/mage/cards/s/SunscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/s/SunspearShikari.java | 2 +- Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java | 2 +- Mage.Sets/src/mage/cards/s/Sunweb.java | 2 +- Mage.Sets/src/mage/cards/s/SuppressionField.java | 2 +- Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java | 2 +- Mage.Sets/src/mage/cards/s/SurgingMight.java | 2 +- Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java | 2 +- Mage.Sets/src/mage/cards/s/SustainingSpirit.java | 2 +- Mage.Sets/src/mage/cards/s/SwansOfBrynArgoll.java | 2 +- Mage.Sets/src/mage/cards/s/Swashbuckling.java | 2 +- Mage.Sets/src/mage/cards/s/SwiftfootBoots.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfKaldra.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfTheMeek.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java | 4 ++-- Mage.Sets/src/mage/cards/s/SwordOfVengeance.java | 2 +- Mage.Sets/src/mage/cards/s/SylvanAdvocate.java | 2 +- Mage.Sets/src/mage/cards/s/SylviaBrightspear.java | 2 +- Mage.Sets/src/mage/cards/s/SylvokLifestaff.java | 2 +- Mage.Sets/src/mage/cards/s/SymbioticDeployment.java | 2 +- Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java | 2 +- 293 files changed, 325 insertions(+), 326 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java b/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java index 2826ce3f699..14c92d2f9a8 100644 --- a/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java +++ b/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java @@ -38,9 +38,9 @@ public final class SachiDaughterOfSeshiro extends CardImpl { this.toughness = new MageInt(3); // Other Snake creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, snakeFilter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, snakeFilter, true))); // Shamans you control have "{T}: Add {G}{G}." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new TapSourceCost()), Duration.WhileOnBattlefield, shamanFilter, false))); } diff --git a/Mage.Sets/src/mage/cards/s/SagesOfTheAnima.java b/Mage.Sets/src/mage/cards/s/SagesOfTheAnima.java index 82ddf02f9de..e8fea8f7073 100644 --- a/Mage.Sets/src/mage/cards/s/SagesOfTheAnima.java +++ b/Mage.Sets/src/mage/cards/s/SagesOfTheAnima.java @@ -34,7 +34,7 @@ public final class SagesOfTheAnima extends CardImpl { this.toughness = new MageInt(4); // If you would draw a card, instead reveal the top three cards of your library. Put all creature cards revealed this way into your hand and the rest on the bottom of your library in any order. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SagesOfTheAnimaReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new SagesOfTheAnimaReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java b/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java index 22667417bb5..2ee8bc01fe2 100644 --- a/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java +++ b/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java @@ -24,7 +24,7 @@ public final class SaiOfTheShinobi extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Whenever a creature you control enters, you may attach Sai of the Shinobi to it. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/SalvageSlasher.java b/Mage.Sets/src/mage/cards/s/SalvageSlasher.java index 22967f70088..7e38935b7f9 100644 --- a/Mage.Sets/src/mage/cards/s/SalvageSlasher.java +++ b/Mage.Sets/src/mage/cards/s/SalvageSlasher.java @@ -33,7 +33,7 @@ public final class SalvageSlasher extends CardImpl { BoostSourceEffect effect = new BoostSourceEffect(new CardsInControllerGraveyardCount(new FilterArtifactCard()), StaticValue.get(0), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private SalvageSlasher(final SalvageSlasher card) { diff --git a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java index f69dd82b500..d5d382f01cb 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java +++ b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java @@ -43,7 +43,7 @@ public final class SamiteBlessing extends CardImpl { // Enchanted creature has "{tap}: The next time a source of your choice would deal damage to target creature this turn, prevent that damage." Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/cards/s/SamuraiOfThePaleCurtain.java b/Mage.Sets/src/mage/cards/s/SamuraiOfThePaleCurtain.java index 659466ee940..8e45327910d 100644 --- a/Mage.Sets/src/mage/cards/s/SamuraiOfThePaleCurtain.java +++ b/Mage.Sets/src/mage/cards/s/SamuraiOfThePaleCurtain.java @@ -34,7 +34,7 @@ public final class SamuraiOfThePaleCurtain extends CardImpl { this.addAbility(new BushidoAbility(1)); // If a permanent would be put into a graveyard, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SamuraiOfThePaleCurtainEffect())); + this.addAbility(new SimpleStaticAbility(new SamuraiOfThePaleCurtainEffect())); } private SamuraiOfThePaleCurtain(final SamuraiOfThePaleCurtain card) { diff --git a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java index f37205bdc59..589997d2a19 100644 --- a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java +++ b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java @@ -61,7 +61,7 @@ public final class SamutVoiceOfDissent extends CardImpl { this.addAbility(HasteAbility.getInstance()); //Other creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); //W, Tap: Untap another target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{W}")); diff --git a/Mage.Sets/src/mage/cards/s/SanctuaryBlade.java b/Mage.Sets/src/mage/cards/s/SanctuaryBlade.java index f75e2ff4e38..5237292639e 100644 --- a/Mage.Sets/src/mage/cards/s/SanctuaryBlade.java +++ b/Mage.Sets/src/mage/cards/s/SanctuaryBlade.java @@ -34,7 +34,7 @@ public final class SanctuaryBlade extends CardImpl { // Equipped creature gets +2/+0 and has protection from the last chosen color. Effect boostEffect = new BoostEquippedEffect(2, 0); boostEffect.concatBy("."); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); + SimpleStaticAbility ability = new SimpleStaticAbility(boostEffect); ProtectionChosenColorAttachedEffect protectionEfect = new ProtectionChosenColorAttachedEffect(false); protectionEfect.setText("and has protection from the last chosen color."); ability.addEffect(protectionEfect); diff --git a/Mage.Sets/src/mage/cards/s/SanctumPrelate.java b/Mage.Sets/src/mage/cards/s/SanctumPrelate.java index 25120a5a404..04249ece695 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumPrelate.java +++ b/Mage.Sets/src/mage/cards/s/SanctumPrelate.java @@ -34,7 +34,7 @@ public final class SanctumPrelate extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseNumberEffect())); // Noncreature spells with converted mana cost equal to the chosen number can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SanctumPrelateReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new SanctumPrelateReplacementEffect())); } private SanctumPrelate(final SanctumPrelate card) { diff --git a/Mage.Sets/src/mage/cards/s/SandTrooper.java b/Mage.Sets/src/mage/cards/s/SandTrooper.java index 7b2c9c76b32..01f9c234f3f 100644 --- a/Mage.Sets/src/mage/cards/s/SandTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SandTrooper.java @@ -34,7 +34,7 @@ public final class SandTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/s/SandsOfTime.java b/Mage.Sets/src/mage/cards/s/SandsOfTime.java index 2ab09131700..75f826bf88b 100644 --- a/Mage.Sets/src/mage/cards/s/SandsOfTime.java +++ b/Mage.Sets/src/mage/cards/s/SandsOfTime.java @@ -29,7 +29,7 @@ public final class SandsOfTime extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Each player skips their untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipUntapStepEffect())); // At the beginning of each player's upkeep, that player simultaneously untaps each tapped artifact, creature, and land they control and taps each untapped artifact, creature, and land they control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.EACH_PLAYER, new SandsOfTimeEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/s/Sandskin.java b/Mage.Sets/src/mage/cards/s/Sandskin.java index 77d17c5cb3e..e4dfef9436e 100644 --- a/Mage.Sets/src/mage/cards/s/Sandskin.java +++ b/Mage.Sets/src/mage/cards/s/Sandskin.java @@ -34,7 +34,7 @@ public final class Sandskin extends CardImpl { this.addAbility(ability); // Prevent all combat damage that would be dealt to and dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); } private Sandskin(final Sandskin card) { diff --git a/Mage.Sets/src/mage/cards/s/SangriteBacklash.java b/Mage.Sets/src/mage/cards/s/SangriteBacklash.java index 0a0ee1760d3..8624389529a 100644 --- a/Mage.Sets/src/mage/cards/s/SangriteBacklash.java +++ b/Mage.Sets/src/mage/cards/s/SangriteBacklash.java @@ -38,7 +38,7 @@ public final class SangriteBacklash extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/-3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -3))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, -3))); } diff --git a/Mage.Sets/src/mage/cards/s/SapphireMedallion.java b/Mage.Sets/src/mage/cards/s/SapphireMedallion.java index 109bb8ea4bc..021b0bc3686 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireMedallion.java +++ b/Mage.Sets/src/mage/cards/s/SapphireMedallion.java @@ -27,7 +27,7 @@ public final class SapphireMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Blue spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private SapphireMedallion(final SapphireMedallion card) { diff --git a/Mage.Sets/src/mage/cards/s/SavingGrace.java b/Mage.Sets/src/mage/cards/s/SavingGrace.java index 4c0cfd41a12..a9fee5bcc46 100644 --- a/Mage.Sets/src/mage/cards/s/SavingGrace.java +++ b/Mage.Sets/src/mage/cards/s/SavingGrace.java @@ -50,7 +50,7 @@ public final class SavingGrace extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SavingGraceReplacementEffect(), false)); // Enchanted creature gets +0/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 3, Duration.WhileOnBattlefield))); } private SavingGrace(final SavingGrace card) { diff --git a/Mage.Sets/src/mage/cards/s/SawhornNemesis.java b/Mage.Sets/src/mage/cards/s/SawhornNemesis.java index dde1c347e2e..7361b13e695 100644 --- a/Mage.Sets/src/mage/cards/s/SawhornNemesis.java +++ b/Mage.Sets/src/mage/cards/s/SawhornNemesis.java @@ -37,7 +37,7 @@ public final class SawhornNemesis extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChoosePlayerEffect(Outcome.Detriment))); // If a source would deal damage to the chosen player or a permanent they // control, it deals double that damage instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SawhornNemesisEffect())); + this.addAbility(new SimpleStaticAbility(new SawhornNemesisEffect())); } private SawhornNemesis(final SawhornNemesis card) { diff --git a/Mage.Sets/src/mage/cards/s/ScarredPuma.java b/Mage.Sets/src/mage/cards/s/ScarredPuma.java index 1e9a6e5286c..a0fd22dd74c 100644 --- a/Mage.Sets/src/mage/cards/s/ScarredPuma.java +++ b/Mage.Sets/src/mage/cards/s/ScarredPuma.java @@ -30,7 +30,7 @@ public final class ScarredPuma extends CardImpl { this.toughness = new MageInt(1); // Scarred Puma can't attack unless a black or green creature also attacks. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ScarredPumaEffect())); + this.addAbility(new SimpleStaticAbility(new ScarredPumaEffect())); } private ScarredPuma(final ScarredPuma card) { diff --git a/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java b/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java index c192e2a82ea..1bb6501cbf1 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java +++ b/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java @@ -40,7 +40,7 @@ public final class ScavengedWeaponry extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); } private ScavengedWeaponry(final ScavengedWeaponry card) { diff --git a/Mage.Sets/src/mage/cards/s/ScionOfOona.java b/Mage.Sets/src/mage/cards/s/ScionOfOona.java index 58876001ac5..92e24ac1c5b 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfOona.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfOona.java @@ -44,9 +44,9 @@ public final class ScionOfOona extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Faerie creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreature, true))); // Other Faeries you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } private ScionOfOona(final ScionOfOona card) { diff --git a/Mage.Sets/src/mage/cards/s/ScissorsLizard.java b/Mage.Sets/src/mage/cards/s/ScissorsLizard.java index e29f8ef0875..6e65f79f059 100644 --- a/Mage.Sets/src/mage/cards/s/ScissorsLizard.java +++ b/Mage.Sets/src/mage/cards/s/ScissorsLizard.java @@ -34,7 +34,7 @@ public final class ScissorsLizard extends CardImpl { this.toughness = new MageInt(3); // Creatures named Paper Tiger can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); } private ScissorsLizard(final ScissorsLizard card) { diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java index 1a6393f3759..16e547b24dd 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java @@ -39,14 +39,14 @@ public final class ScourgeOfTheNobilis extends CardImpl { this.addAbility(ability); // As long as enchanted creature is red, it gets +1/+1 and has "{RW}: This creature gets +1/+0 until end of turn." - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect( new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}")), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has \"{R/W}: This creature gets +1/+0 until end of turn.\"")); this.addAbility(redAbility); // As long as enchanted creature is white, it gets +1/+1 and has lifelink. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); whiteAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has lifelink")); this.addAbility(whiteAbility); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeWolf.java b/Mage.Sets/src/mage/cards/s/ScourgeWolf.java index c8b7dbc612c..66ac9fd185e 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeWolf.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeWolf.java @@ -35,7 +35,7 @@ public final class ScourgeWolf extends CardImpl { // Delirium — Scourge Wolf has double strike as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} has double strike as long as there are four or more card types among cards in your graveyard."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CardTypesInGraveyardHint.YOU)); + this.addAbility(new SimpleStaticAbility(effect).addHint(CardTypesInGraveyardHint.YOU)); } private ScourgeWolf(final ScourgeWolf card) { diff --git a/Mage.Sets/src/mage/cards/s/Scourgemark.java b/Mage.Sets/src/mage/cards/s/Scourgemark.java index 817dabb9ae6..c6c459d6b68 100644 --- a/Mage.Sets/src/mage/cards/s/Scourgemark.java +++ b/Mage.Sets/src/mage/cards/s/Scourgemark.java @@ -39,7 +39,7 @@ public final class Scourgemark extends CardImpl { // When Scourgemark enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,0, Duration.WhileOnBattlefield))); } private Scourgemark(final Scourgemark card) { diff --git a/Mage.Sets/src/mage/cards/s/ScoutTrooper.java b/Mage.Sets/src/mage/cards/s/ScoutTrooper.java index 957fbd5b7fe..46b0063a086 100644 --- a/Mage.Sets/src/mage/cards/s/ScoutTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ScoutTrooper.java @@ -34,7 +34,7 @@ public final class ScoutTrooper extends CardImpl { this.toughness = new MageInt(1); // Trooper creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/s/ScrapdiverSerpent.java b/Mage.Sets/src/mage/cards/s/ScrapdiverSerpent.java index 23b290ebc08..d783834cf75 100644 --- a/Mage.Sets/src/mage/cards/s/ScrapdiverSerpent.java +++ b/Mage.Sets/src/mage/cards/s/ScrapdiverSerpent.java @@ -34,7 +34,7 @@ public final class ScrapdiverSerpent extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(new FilterArtifactPermanent())); effect.setText("{this} can't be blocked as long as defending player controls an artifact"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private ScrapdiverSerpent(final ScrapdiverSerpent card) { diff --git a/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java b/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java index 095d7eeceb6..412a5a5581e 100644 --- a/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java +++ b/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java @@ -41,7 +41,7 @@ public final class ScrapyardMongrel extends CardImpl { new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), "and has trample"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); + Ability ability = new SimpleStaticAbility(boostEffect); ability.addEffect(gainAbilityEffect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java b/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java index af7f919633b..e0826275125 100644 --- a/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java +++ b/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java @@ -43,7 +43,7 @@ public final class ScreamsFromWithin extends CardImpl { this.addAbility(ability); // Enchanted creature gets -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); // When enchanted creature dies, return Screams from Within from your graveyard to the battlefield. this.addAbility(new DiesAttachedTriggeredAbility(new ScreamsFromWithinEffect(), "enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/s/ScroungedScythe.java b/Mage.Sets/src/mage/cards/s/ScroungedScythe.java index f082407865e..6abb9df81ca 100644 --- a/Mage.Sets/src/mage/cards/s/ScroungedScythe.java +++ b/Mage.Sets/src/mage/cards/s/ScroungedScythe.java @@ -29,7 +29,7 @@ public final class ScroungedScythe extends CardImpl { this.nightCard = true; // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // As long as equipped creature is a Human, it has menace. this.addAbility(new SimpleStaticAbility( @@ -52,4 +52,4 @@ public final class ScroungedScythe extends CardImpl { public ScroungedScythe copy() { return new ScroungedScythe(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ScytheOfTheWretched.java b/Mage.Sets/src/mage/cards/s/ScytheOfTheWretched.java index b6bab55ab17..71a8c01de33 100644 --- a/Mage.Sets/src/mage/cards/s/ScytheOfTheWretched.java +++ b/Mage.Sets/src/mage/cards/s/ScytheOfTheWretched.java @@ -31,7 +31,7 @@ public final class ScytheOfTheWretched extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2, Duration.WhileOnBattlefield))); // Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach Scythe of the Wretched to that creature. this.addAbility(new DealtDamageAttachedAndDiedTriggeredAbility(new ScytheOfTheWretchedReanimateEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/s/Scytheclaw.java b/Mage.Sets/src/mage/cards/s/Scytheclaw.java index 1609256cea1..88622e4a6dc 100644 --- a/Mage.Sets/src/mage/cards/s/Scytheclaw.java +++ b/Mage.Sets/src/mage/cards/s/Scytheclaw.java @@ -30,7 +30,7 @@ public final class Scytheclaw extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Whenever equipped creature deals combat damage to a player, that player loses half of their life, round up. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new LoseHalfLifeTargetEffect(), "equipped creature", false, true)); diff --git a/Mage.Sets/src/mage/cards/s/SeaMonster.java b/Mage.Sets/src/mage/cards/s/SeaMonster.java index 26cdddd4b71..e78664f5e63 100644 --- a/Mage.Sets/src/mage/cards/s/SeaMonster.java +++ b/Mage.Sets/src/mage/cards/s/SeaMonster.java @@ -26,7 +26,7 @@ import mage.filter.common.FilterLandPermanent; this.toughness = new MageInt(6); // Sea Monster can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private SeaMonster(final SeaMonster card) { diff --git a/Mage.Sets/src/mage/cards/s/SeaSerpent.java b/Mage.Sets/src/mage/cards/s/SeaSerpent.java index 3c6685d17bd..4b2c0e684e4 100644 --- a/Mage.Sets/src/mage/cards/s/SeaSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SeaSerpent.java @@ -36,7 +36,7 @@ public final class SeaSerpent extends CardImpl { this.toughness = new MageInt(5); // Sea Serpent can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); // When you control no Islands, sacrifice Sea Serpent. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( new FilterLandPermanent(SubType.ISLAND, "no Islands"), ComparisonType.EQUAL_TO, 0, diff --git a/Mage.Sets/src/mage/cards/s/SeafarersQuay.java b/Mage.Sets/src/mage/cards/s/SeafarersQuay.java index d56be5bab51..79ac6f4b974 100644 --- a/Mage.Sets/src/mage/cards/s/SeafarersQuay.java +++ b/Mage.Sets/src/mage/cards/s/SeafarersQuay.java @@ -31,7 +31,7 @@ public final class SeafarersQuay extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Blue legendary creatures you control have "bands with other legendary creatures." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter) .withForceQuotes() )); diff --git a/Mage.Sets/src/mage/cards/s/SealOfTheGuildpact.java b/Mage.Sets/src/mage/cards/s/SealOfTheGuildpact.java index 9271565faa9..2b96142e052 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfTheGuildpact.java +++ b/Mage.Sets/src/mage/cards/s/SealOfTheGuildpact.java @@ -37,7 +37,7 @@ public final class SealOfTheGuildpact extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new SealOfTheGuildpactChooseColorEffect())); // Each spell you cast costs {1} less to cast for each of the chosen colors it is. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SealOfTheGuildpactCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new SealOfTheGuildpactCostReductionEffect())); } private SealOfTheGuildpact(final SealOfTheGuildpact card) { diff --git a/Mage.Sets/src/mage/cards/s/SeasClaim.java b/Mage.Sets/src/mage/cards/s/SeasClaim.java index dc4439b59a3..64b2f4aeb37 100644 --- a/Mage.Sets/src/mage/cards/s/SeasClaim.java +++ b/Mage.Sets/src/mage/cards/s/SeasClaim.java @@ -35,7 +35,7 @@ public final class SeasClaim extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); } private SeasClaim(final SeasClaim card) { diff --git a/Mage.Sets/src/mage/cards/s/Secretkeeper.java b/Mage.Sets/src/mage/cards/s/Secretkeeper.java index f01d171adbe..6ab1105526c 100644 --- a/Mage.Sets/src/mage/cards/s/Secretkeeper.java +++ b/Mage.Sets/src/mage/cards/s/Secretkeeper.java @@ -31,7 +31,7 @@ public final class Secretkeeper extends CardImpl { this.toughness = new MageInt(2); // As long as you have more cards in hand than each opponent, Secretkeeper gets +2/+2 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,2, Duration.WhileOnBattlefield), MoreCardsInHandThanOpponentsCondition.instance, "As long as you have more cards in hand than each opponent, Secretkeeper gets +2/+2")); diff --git a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java index d411a072b66..995adfd3f2c 100644 --- a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java +++ b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java @@ -49,7 +49,7 @@ public final class SecurityBlockade extends CardImpl { // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to you this turn." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } private SecurityBlockade(final SecurityBlockade card) { diff --git a/Mage.Sets/src/mage/cards/s/SedgeSliver.java b/Mage.Sets/src/mage/cards/s/SedgeSliver.java index 08a3dd4acb8..c70007555ba 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeSliver.java +++ b/Mage.Sets/src/mage/cards/s/SedgeSliver.java @@ -38,7 +38,7 @@ public final class SedgeSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have "This creature gets +1/+1 as long as you control a Swamp." - Ability boost = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filterSwamp, 1, 1)); + Ability boost = new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filterSwamp, 1, 1)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(boost, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"This creature gets +1/+1 as long as you control a Swamp.\""))); diff --git a/Mage.Sets/src/mage/cards/s/SedgeTroll.java b/Mage.Sets/src/mage/cards/s/SedgeTroll.java index 4a618a03d51..2ee30c17062 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeTroll.java +++ b/Mage.Sets/src/mage/cards/s/SedgeTroll.java @@ -34,7 +34,7 @@ public final class SedgeTroll extends CardImpl { this.toughness = new MageInt(2); // Sedge Troll gets +1/+1 as long as you control a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {B}: Regenerate Sedge Troll. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java b/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java index 57044ecfca2..1401034ed85 100644 --- a/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java +++ b/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java @@ -30,7 +30,7 @@ public final class SedrisTheTraitorKing extends CardImpl { this.toughness = new MageInt(5); // Each creature card in your graveyard has unearth {2}{B}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SedrisTheTraitorKingEffect())); + this.addAbility(new SimpleStaticAbility(new SedrisTheTraitorKingEffect())); } private SedrisTheTraitorKing(final SedrisTheTraitorKing card) { diff --git a/Mage.Sets/src/mage/cards/s/SeeRed.java b/Mage.Sets/src/mage/cards/s/SeeRed.java index f2c706af023..f0aa47dddde 100644 --- a/Mage.Sets/src/mage/cards/s/SeeRed.java +++ b/Mage.Sets/src/mage/cards/s/SeeRed.java @@ -47,7 +47,7 @@ public final class SeeRed extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has first strike. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SeedbornMuse.java b/Mage.Sets/src/mage/cards/s/SeedbornMuse.java index 9cdfc776b6c..a40b6f61fc3 100644 --- a/Mage.Sets/src/mage/cards/s/SeedbornMuse.java +++ b/Mage.Sets/src/mage/cards/s/SeedbornMuse.java @@ -26,7 +26,7 @@ public final class SeedbornMuse extends CardImpl { this.toughness = new MageInt(4); // Untap all permanents you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(new FilterControlledPermanent("permanents you control")))); + this.addAbility(new SimpleStaticAbility(new UntapAllDuringEachOtherPlayersUntapStepEffect(new FilterControlledPermanent("permanents you control")))); } private SeedbornMuse(final SeedbornMuse card) { diff --git a/Mage.Sets/src/mage/cards/s/SeekerOfSlaanesh.java b/Mage.Sets/src/mage/cards/s/SeekerOfSlaanesh.java index ccc90381a50..d28ed9634fb 100644 --- a/Mage.Sets/src/mage/cards/s/SeekerOfSlaanesh.java +++ b/Mage.Sets/src/mage/cards/s/SeekerOfSlaanesh.java @@ -33,7 +33,7 @@ public final class SeekerOfSlaanesh extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Allure of Slaanesh -- Each opponent must attack with at least one creature each combat if able. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SeekerOfSlaaneshForceAttackEffect(Duration.WhileOnBattlefield)) + addAbility(new SimpleStaticAbility(new SeekerOfSlaaneshForceAttackEffect(Duration.WhileOnBattlefield)) .withFlavorWord("Allure of Slaanesh")); } diff --git a/Mage.Sets/src/mage/cards/s/SeersVision.java b/Mage.Sets/src/mage/cards/s/SeersVision.java index 07b6ffd30e3..0f5d3174a1c 100644 --- a/Mage.Sets/src/mage/cards/s/SeersVision.java +++ b/Mage.Sets/src/mage/cards/s/SeersVision.java @@ -24,7 +24,7 @@ public final class SeersVision extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{B}"); // Your opponents play with their hands revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithHandRevealedEffect(TargetController.OPPONENT))); + this.addAbility(new SimpleStaticAbility(new PlayWithHandRevealedEffect(TargetController.OPPONENT))); // Sacrifice Seer's Vision: Look at target player's hand and choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new LookTargetHandChooseDiscardEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java index 1b7b3b1476c..cffae4db16e 100644 --- a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java +++ b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java @@ -42,7 +42,7 @@ public final class SekkiSeasonsGuide extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(8)), "with eight +1/+1 counters on it")); // If damage would be dealt to Sekki, prevent that damage, remove that many +1/+1 counters from Sekki, and create that many 1/1 colorless Spirit creature tokens. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SekkiSeasonsGuideEffect())); + this.addAbility(new SimpleStaticAbility(new SekkiSeasonsGuideEffect())); // Sacrifice eight Spirits: Return Sekki from your graveyard to the battlefield. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaSagittars.java b/Mage.Sets/src/mage/cards/s/SelesnyaSagittars.java index 5222f2844ab..d982a0dc8af 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaSagittars.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaSagittars.java @@ -28,7 +28,7 @@ public final class SelesnyaSagittars extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Selesnya Sagittars can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private SelesnyaSagittars(final SelesnyaSagittars card) { diff --git a/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java b/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java index 5fae63a7c87..f8c84eb9efc 100644 --- a/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java +++ b/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java @@ -32,7 +32,7 @@ public final class SemblanceAnvil extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SemblanceAnvilEffect(), true).setAbilityWord(AbilityWord.IMPRINT)); // Spells you cast that share a card type with the exiled card cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SemblanceAnvilCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new SemblanceAnvilCostReductionEffect())); } private SemblanceAnvil(final SemblanceAnvil card) { diff --git a/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java b/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java index a3dab6d5794..ae8477ef0a4 100644 --- a/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java +++ b/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java @@ -32,7 +32,7 @@ public final class SenatorBailOrgana extends CardImpl { this.toughness = new MageInt(2); // As long as you control four or more creatures, creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledCreaturePermanent(), ComparisonType.MORE_THAN, 3), "As long as you control four or more creatures, creatures you control get +1/+1") diff --git a/Mage.Sets/src/mage/cards/s/SenatorLottDod.java b/Mage.Sets/src/mage/cards/s/SenatorLottDod.java index 432893f0269..c2024be3b1a 100644 --- a/Mage.Sets/src/mage/cards/s/SenatorLottDod.java +++ b/Mage.Sets/src/mage/cards/s/SenatorLottDod.java @@ -31,10 +31,10 @@ public final class SenatorLottDod extends CardImpl { this.toughness = new MageInt(2); // Spells your opponents cast that target you cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SenatorLottDodSpellsTargetingYouCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new SenatorLottDodSpellsTargetingYouCostModificationEffect())); // Spell your opponents cast that target a creature you control cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SenatorLottDodSpellsTargetingCreatureCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new SenatorLottDodSpellsTargetingCreatureCostModificationEffect())); } private SenatorLottDod(final SenatorLottDod card) { diff --git a/Mage.Sets/src/mage/cards/s/SenselessRage.java b/Mage.Sets/src/mage/cards/s/SenselessRage.java index 49471defebf..1490408b5dc 100644 --- a/Mage.Sets/src/mage/cards/s/SenselessRage.java +++ b/Mage.Sets/src/mage/cards/s/SenselessRage.java @@ -36,7 +36,7 @@ public final class SenselessRage extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Madness {1}{R} this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{R}"))); diff --git a/Mage.Sets/src/mage/cards/s/SensorSplicer.java b/Mage.Sets/src/mage/cards/s/SensorSplicer.java index e48902ca1b2..d2a3abb1829 100644 --- a/Mage.Sets/src/mage/cards/s/SensorSplicer.java +++ b/Mage.Sets/src/mage/cards/s/SensorSplicer.java @@ -41,7 +41,7 @@ public final class SensorSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); // Golem creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private SensorSplicer(final SensorSplicer card) { diff --git a/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java b/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java index 5180cdccec6..420cbc80a20 100644 --- a/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java +++ b/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java @@ -33,7 +33,7 @@ public final class SensoryDeprivation extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets -3/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); } private SensoryDeprivation(final SensoryDeprivation card) { diff --git a/Mage.Sets/src/mage/cards/s/SeraphOfTheSword.java b/Mage.Sets/src/mage/cards/s/SeraphOfTheSword.java index 58fd4d9325d..01f904d29ed 100644 --- a/Mage.Sets/src/mage/cards/s/SeraphOfTheSword.java +++ b/Mage.Sets/src/mage/cards/s/SeraphOfTheSword.java @@ -29,7 +29,7 @@ public final class SeraphOfTheSword extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Prevent all combat damage that would be dealt to Seraph of the Sword. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield))); } private SeraphOfTheSword(final SeraphOfTheSword card) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java b/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java index 657a8b34290..81d420b5e8d 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java +++ b/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java @@ -37,7 +37,7 @@ public final class SerpentOfTheEndlessSea extends CardImpl { // Serpent of the Endless Sea's power and toughness are each equal to the number of Islands you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter)))); // Serpent of the Endless Sea can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private SerpentOfTheEndlessSea(final SerpentOfTheEndlessSea card) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentSkin.java b/Mage.Sets/src/mage/cards/s/SerpentSkin.java index f078d9b81dc..ccc9576ba20 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentSkin.java +++ b/Mage.Sets/src/mage/cards/s/SerpentSkin.java @@ -35,7 +35,7 @@ public final class SerpentSkin extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {G}: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA),new ColoredManaCost(ColoredManaSymbol.G))); diff --git a/Mage.Sets/src/mage/cards/s/SerraAscendant.java b/Mage.Sets/src/mage/cards/s/SerraAscendant.java index 3ed340f49d7..bb98aa10cec 100644 --- a/Mage.Sets/src/mage/cards/s/SerraAscendant.java +++ b/Mage.Sets/src/mage/cards/s/SerraAscendant.java @@ -39,7 +39,7 @@ public final class SerraAscendant extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // As long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SerraAscendantEffect())); + this.addAbility(new SimpleStaticAbility(new SerraAscendantEffect())); } private SerraAscendant(final SerraAscendant card) { diff --git a/Mage.Sets/src/mage/cards/s/SerraAviary.java b/Mage.Sets/src/mage/cards/s/SerraAviary.java index 96eff9c4458..86ae7679fd3 100644 --- a/Mage.Sets/src/mage/cards/s/SerraAviary.java +++ b/Mage.Sets/src/mage/cards/s/SerraAviary.java @@ -31,7 +31,7 @@ public final class SerraAviary extends CardImpl { this.supertype.add(SuperType.WORLD); // Creatures with flying get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, false))); } private SerraAviary(final SerraAviary card) { diff --git a/Mage.Sets/src/mage/cards/s/SerraBestiary.java b/Mage.Sets/src/mage/cards/s/SerraBestiary.java index bab420d3cf4..c07b301f701 100644 --- a/Mage.Sets/src/mage/cards/s/SerraBestiary.java +++ b/Mage.Sets/src/mage/cards/s/SerraBestiary.java @@ -47,7 +47,7 @@ public final class SerraBestiary extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{W}")))); // Enchanted creature can't attack or block, and its activated abilities with {T} in their costs can't be activated. - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA)); + Ability ability2 = new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA)); ability2.addEffect(new SerraBestiaryRuleModifyingEffect()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SerrasBlessing.java b/Mage.Sets/src/mage/cards/s/SerrasBlessing.java index 788b40d8d83..0dd73c18052 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasBlessing.java +++ b/Mage.Sets/src/mage/cards/s/SerrasBlessing.java @@ -23,7 +23,7 @@ public final class SerrasBlessing extends CardImpl { // Creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); } private SerrasBlessing(final SerrasBlessing card) { diff --git a/Mage.Sets/src/mage/cards/s/SerrasBoon.java b/Mage.Sets/src/mage/cards/s/SerrasBoon.java index 9d59ad87655..b09b94546d8 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasBoon.java +++ b/Mage.Sets/src/mage/cards/s/SerrasBoon.java @@ -46,7 +46,7 @@ public final class SerrasBoon extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+2 as long as it's white. Otherwise, it gets -2/-1. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield), new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield), new AttachedToMatchesFilterCondition(filter), diff --git a/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java b/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java index 71ba3c02997..a620fe67e21 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java @@ -38,7 +38,7 @@ public final class SerrasEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying and vigilance. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java b/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java index f650f74b702..331f90b8812 100644 --- a/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java +++ b/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java @@ -40,7 +40,7 @@ public final class SeshiroTheAnointed extends CardImpl { this.toughness = new MageInt(4); // Other Snake creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); // Whenever a Snake you control deals combat damage to a player, you may draw a card. this.addAbility(new SeshiroTheAnointedAbility()); } @@ -90,4 +90,4 @@ class SeshiroTheAnointedAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever a Snake you control deals combat damage to a player, you may draw a card."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/Shackles.java b/Mage.Sets/src/mage/cards/s/Shackles.java index f45a7f1425f..2b4fbe28204 100644 --- a/Mage.Sets/src/mage/cards/s/Shackles.java +++ b/Mage.Sets/src/mage/cards/s/Shackles.java @@ -37,7 +37,7 @@ public final class Shackles extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // {W}: Return Shackles to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/s/ShadowInTheWarp.java b/Mage.Sets/src/mage/cards/s/ShadowInTheWarp.java index adb6eecdab8..2670cc3f137 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowInTheWarp.java +++ b/Mage.Sets/src/mage/cards/s/ShadowInTheWarp.java @@ -42,7 +42,7 @@ public final class ShadowInTheWarp extends CardImpl { // The first creature spell you cast each turn costs {2} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filterCost, 2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), new ShadowInTheWarpWatcher()); + this.addAbility(new SimpleStaticAbility(effect), new ShadowInTheWarpWatcher()); // Whenever an opponent casts their first noncreature spell each turn, Shadow in the Warp deals 2 damage to that player. this.addAbility(new ShadowInTheWarpTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/s/ShadowLance.java b/Mage.Sets/src/mage/cards/s/ShadowLance.java index 8102704e360..b2eb4b89745 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowLance.java +++ b/Mage.Sets/src/mage/cards/s/ShadowLance.java @@ -33,7 +33,7 @@ public final class ShadowLance extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShadowSliver.java b/Mage.Sets/src/mage/cards/s/ShadowSliver.java index 807301a29ba..25e947298d5 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowSliver.java +++ b/Mage.Sets/src/mage/cards/s/ShadowSliver.java @@ -33,7 +33,7 @@ public final class ShadowSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have shadow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ShadowAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have shadow."))); } diff --git a/Mage.Sets/src/mage/cards/s/ShadowTrooper.java b/Mage.Sets/src/mage/cards/s/ShadowTrooper.java index eeb5423659c..e3eaf05d62a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ShadowTrooper.java @@ -37,7 +37,7 @@ public final class ShadowTrooper extends CardImpl { this.addAbility(FlashAbility.getInstance()); // You may cast Trooper creature cards as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java b/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java index cd582389a21..df3142c642e 100644 --- a/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java +++ b/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java @@ -50,7 +50,7 @@ public final class ShalaiVoiceOfPlenty extends CardImpl { // You, planeswalkers you control, and other creatures you control have hexproof. Effect effect = new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield); effect.setText("You"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter1); effect.setText(", planeswalkers you control"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java b/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java index 67131fe6e7d..cf552fc7b80 100644 --- a/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java +++ b/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java @@ -40,7 +40,7 @@ public final class ShannaSisaysLegacy extends CardImpl { this.toughness = new MageInt(0); // Shanna, Sisay's Legacy can't be the target of abilities your opponents control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShannaSisaysLegacyEffect())); + this.addAbility(new SimpleStaticAbility(new ShannaSisaysLegacyEffect())); // Shanna gets +1/+1 for each creature you control. DynamicValue value = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURES); diff --git a/Mage.Sets/src/mage/cards/s/ShardOfBrokenGlass.java b/Mage.Sets/src/mage/cards/s/ShardOfBrokenGlass.java index e824e5e2f39..2f9c369c674 100644 --- a/Mage.Sets/src/mage/cards/s/ShardOfBrokenGlass.java +++ b/Mage.Sets/src/mage/cards/s/ShardOfBrokenGlass.java @@ -26,7 +26,7 @@ public final class ShardOfBrokenGlass extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature attacks, you may put the top two cards of your library into your graveyard. this.addAbility(new AttacksAttachedTriggeredAbility(new MillCardsControllerEffect(2), true)); diff --git a/Mage.Sets/src/mage/cards/s/SharedFate.java b/Mage.Sets/src/mage/cards/s/SharedFate.java index b4a1e212f49..c66c6ee93e8 100644 --- a/Mage.Sets/src/mage/cards/s/SharedFate.java +++ b/Mage.Sets/src/mage/cards/s/SharedFate.java @@ -28,11 +28,11 @@ public final class SharedFate extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}"); // If a player would draw a card, that player exiles the top card of one of their opponents' libraries face down instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SharedFateReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new SharedFateReplacementEffect())); // Each player may look at and play cards they exiled with Shared Fate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SharedFatePlayEffect())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SharedFateLookEffect())); + this.addAbility(new SimpleStaticAbility(new SharedFatePlayEffect())); + this.addAbility(new SimpleStaticAbility(new SharedFateLookEffect())); } private SharedFate(final SharedFate card) { diff --git a/Mage.Sets/src/mage/cards/s/SharedTriumph.java b/Mage.Sets/src/mage/cards/s/SharedTriumph.java index 508b7b54acb..10c2ffc558b 100644 --- a/Mage.Sets/src/mage/cards/s/SharedTriumph.java +++ b/Mage.Sets/src/mage/cards/s/SharedTriumph.java @@ -25,7 +25,7 @@ public final class SharedTriumph extends CardImpl { // As Shared Triumph enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); // Creatures of the chosen type get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, false))); } private SharedTriumph(final SharedTriumph card) { diff --git a/Mage.Sets/src/mage/cards/s/SharkeyTyrantOfTheShire.java b/Mage.Sets/src/mage/cards/s/SharkeyTyrantOfTheShire.java index df7752b38be..79f1829237d 100644 --- a/Mage.Sets/src/mage/cards/s/SharkeyTyrantOfTheShire.java +++ b/Mage.Sets/src/mage/cards/s/SharkeyTyrantOfTheShire.java @@ -45,7 +45,7 @@ public final class SharkeyTyrantOfTheShire extends CardImpl { this.toughness = new MageInt(4); // Activated abilities of lands your opponents control can't be activated unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SharkeyTyrantOfTheShireReplacementEffect(filter))); + this.addAbility(new SimpleStaticAbility(new SharkeyTyrantOfTheShireReplacementEffect(filter))); // Sharkey, Tyrant of the Shire has all activated abilities of lands your opponents control except mana abilities. this.addAbility(new SimpleStaticAbility(new SharkeyTyrantOfTheShireContinousEffect(filter))); diff --git a/Mage.Sets/src/mage/cards/s/SharpenedPitchfork.java b/Mage.Sets/src/mage/cards/s/SharpenedPitchfork.java index f801c5eb180..faaa9080077 100644 --- a/Mage.Sets/src/mage/cards/s/SharpenedPitchfork.java +++ b/Mage.Sets/src/mage/cards/s/SharpenedPitchfork.java @@ -28,10 +28,10 @@ public final class SharpenedPitchfork extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // As long as equipped creature is a Human, it gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java index 798e39e6167..db831872fff 100644 --- a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java +++ b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java @@ -38,7 +38,7 @@ public final class ShaukuEndbringer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Shauku, Endbringer can't attack if there's another creature on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShaukuEndbringerEffect())); + this.addAbility(new SimpleStaticAbility(new ShaukuEndbringerEffect())); // At the beginning of your upkeep, you lose 3 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(3))); diff --git a/Mage.Sets/src/mage/cards/s/ShelteredAerie.java b/Mage.Sets/src/mage/cards/s/ShelteredAerie.java index 09572da8038..56c90002969 100644 --- a/Mage.Sets/src/mage/cards/s/ShelteredAerie.java +++ b/Mage.Sets/src/mage/cards/s/ShelteredAerie.java @@ -42,7 +42,7 @@ public final class ShelteredAerie extends CardImpl { Ability gainedAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/s/ShelteringPrayers.java b/Mage.Sets/src/mage/cards/s/ShelteringPrayers.java index 10afe62eb6e..e95b3659381 100644 --- a/Mage.Sets/src/mage/cards/s/ShelteringPrayers.java +++ b/Mage.Sets/src/mage/cards/s/ShelteringPrayers.java @@ -29,7 +29,7 @@ public final class ShelteringPrayers extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}"); // Basic lands each player controls have shroud as long as that player controls three or fewer lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShelteringPrayersEffect())); + this.addAbility(new SimpleStaticAbility(new ShelteringPrayersEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java b/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java index 1bb1d4350a7..cc65f2d7813 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java @@ -37,7 +37,7 @@ public final class ShieldOfDutyAndReason extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has protection from green and from blue. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.BLUE), + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.BLUE), AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java b/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java index 2ed4dce2eef..ae5c54b4166 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java @@ -40,11 +40,11 @@ public final class ShieldOfKaldra extends CardImpl { // Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra have indestructible. Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra have indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Equipped creature has indestructible. effect = new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield); effect.setText("Equipped creature has indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Equip {4} this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(4), false)); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java index 7ffb438b491..457a96ffd5c 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheAvatar.java @@ -30,7 +30,7 @@ public final class ShieldOfTheAvatar extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // If a source would deal damage to equipped creature, prevent X of that damage, where X is the number of creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShieldOfTheAvatarPreventionEffect()) + this.addAbility(new SimpleStaticAbility(new ShieldOfTheAvatarPreventionEffect()) .addHint(CreaturesYouControlHint.instance)); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java index eaf1038d266..40544b1ecac 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java @@ -41,11 +41,11 @@ public final class ShieldOfTheOversoul extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is green, it gets +1/+1 and is indestructible. - SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); + SimpleStaticAbility greenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); greenAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(IndestructibleAbility.getInstance() ,AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has indestructible")); this.addAbility(greenAbility); // As long as enchanted creature is white, it gets +1/+1 and has flying. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); whiteAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has flying")); this.addAbility(whiteAbility); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java b/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java index bbc280b9700..4f9e09e2f42 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java +++ b/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java @@ -43,7 +43,7 @@ public final class ShieldedByFaith extends CardImpl { AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has indestructible"); effect.setOutcome(Outcome.Benefit); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever a creature enters the battlefield, you may attach Shielded by Faith to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/ShiftingSky.java b/Mage.Sets/src/mage/cards/s/ShiftingSky.java index c9ff5bd52d3..c10b4dd42b9 100644 --- a/Mage.Sets/src/mage/cards/s/ShiftingSky.java +++ b/Mage.Sets/src/mage/cards/s/ShiftingSky.java @@ -35,7 +35,7 @@ public final class ShiftingSky extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment))); // All nonland permanents are the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShiftingSkyEffect())); + this.addAbility(new SimpleStaticAbility(new ShiftingSkyEffect())); } private ShiftingSky(final ShiftingSky card) { diff --git a/Mage.Sets/src/mage/cards/s/ShiftingSliver.java b/Mage.Sets/src/mage/cards/s/ShiftingSliver.java index fdf085f4d37..a78cfb2ca2a 100644 --- a/Mage.Sets/src/mage/cards/s/ShiftingSliver.java +++ b/Mage.Sets/src/mage/cards/s/ShiftingSliver.java @@ -36,7 +36,7 @@ public final class ShiftingSliver extends CardImpl { this.toughness = new MageInt(2); // Slivers can't be blocked except by Slivers. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesAllEffect(filterCreatures, filterBlockedBy, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesAllEffect(filterCreatures, filterBlockedBy, Duration.WhileOnBattlefield))); } private ShiftingSliver(final ShiftingSliver card) { diff --git a/Mage.Sets/src/mage/cards/s/ShimmerMyr.java b/Mage.Sets/src/mage/cards/s/ShimmerMyr.java index 926c6640e63..afd3f3a274a 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmerMyr.java +++ b/Mage.Sets/src/mage/cards/s/ShimmerMyr.java @@ -30,7 +30,7 @@ public final class ShimmerMyr extends CardImpl { this.addAbility(FlashAbility.getInstance()); // You may cast artifact spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterArtifactCard("artifact spells"), false))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterArtifactCard("artifact spells"), false))); } private ShimmerMyr(final ShimmerMyr card) { diff --git a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java index 5655e544121..b9880e5ac36 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java +++ b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java @@ -36,7 +36,7 @@ public final class ShimmeringWings extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. (It can't be blocked except by creatures with flying or reach.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {U}: Return Shimmering Wings to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.U))); diff --git a/Mage.Sets/src/mage/cards/s/ShinenOfFearsChill.java b/Mage.Sets/src/mage/cards/s/ShinenOfFearsChill.java index 688823ab5ea..02a7500e5e3 100644 --- a/Mage.Sets/src/mage/cards/s/ShinenOfFearsChill.java +++ b/Mage.Sets/src/mage/cards/s/ShinenOfFearsChill.java @@ -30,7 +30,7 @@ public final class ShinenOfFearsChill extends CardImpl { this.toughness = new MageInt(2); // Shinen of Fear's Chill can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockSourceEffect(Duration.WhileOnBattlefield))); // Channel - {1}{B}, Discard Shinen of Fear's Chill: Target creature can't block this turn. Ability ability = new ChannelAbility("{1}{B}", new CantBlockTargetEffect(Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ShinenOfLifesRoar.java b/Mage.Sets/src/mage/cards/s/ShinenOfLifesRoar.java index beb3474244a..dfa4b4a8b72 100644 --- a/Mage.Sets/src/mage/cards/s/ShinenOfLifesRoar.java +++ b/Mage.Sets/src/mage/cards/s/ShinenOfLifesRoar.java @@ -30,7 +30,7 @@ public final class ShinenOfLifesRoar extends CardImpl { this.toughness = new MageInt(2); // All creatures able to block Shinen of Life's Roar do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); // Channel - {2}{G}{G}, Discard Shinen of Life's Roar: All creatures able to block target creature this turn do so. Ability ability = new ChannelAbility("{2}{G}{G}", new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java index d6b09d33968..649c01dc229 100644 --- a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java @@ -41,7 +41,7 @@ public final class ShivsEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/ShockTrooper.java b/Mage.Sets/src/mage/cards/s/ShockTrooper.java index c8dffeccd3b..ee3becfff7e 100644 --- a/Mage.Sets/src/mage/cards/s/ShockTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ShockTrooper.java @@ -33,7 +33,7 @@ public final class ShockTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/s/ShortSword.java b/Mage.Sets/src/mage/cards/s/ShortSword.java index 6cd8329c645..de00c801892 100644 --- a/Mage.Sets/src/mage/cards/s/ShortSword.java +++ b/Mage.Sets/src/mage/cards/s/ShortSword.java @@ -25,7 +25,7 @@ public final class ShortSword extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/s/ShrillHowler.java b/Mage.Sets/src/mage/cards/s/ShrillHowler.java index b08fa88df95..ac54bf8be79 100644 --- a/Mage.Sets/src/mage/cards/s/ShrillHowler.java +++ b/Mage.Sets/src/mage/cards/s/ShrillHowler.java @@ -31,7 +31,7 @@ public final class ShrillHowler extends CardImpl { this.secondSideCardClazz = mage.cards.h.HowlingChorus.class; // Creatures with power less than Shrill Howler's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); // {5}{G}: Transform Shrill Howler. this.addAbility(new TransformAbility()); @@ -47,4 +47,4 @@ public final class ShrillHowler extends CardImpl { public ShrillHowler copy() { return new ShrillHowler(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/Shuko.java b/Mage.Sets/src/mage/cards/s/Shuko.java index 1c67a280253..5f861844b68 100644 --- a/Mage.Sets/src/mage/cards/s/Shuko.java +++ b/Mage.Sets/src/mage/cards/s/Shuko.java @@ -23,7 +23,7 @@ public final class Shuko extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Equip {0} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(0))); } diff --git a/Mage.Sets/src/mage/cards/s/Sicken.java b/Mage.Sets/src/mage/cards/s/Sicken.java index cd5ec50c84b..f99092cd30c 100644 --- a/Mage.Sets/src/mage/cards/s/Sicken.java +++ b/Mage.Sets/src/mage/cards/s/Sicken.java @@ -33,7 +33,7 @@ public final class Sicken extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); //Cycling this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/s/Sickleslicer.java b/Mage.Sets/src/mage/cards/s/Sickleslicer.java index e57114afdf4..077b3f1ec53 100644 --- a/Mage.Sets/src/mage/cards/s/Sickleslicer.java +++ b/Mage.Sets/src/mage/cards/s/Sickleslicer.java @@ -29,7 +29,7 @@ public final class Sickleslicer extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // Equip {4} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4), false)); diff --git a/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java b/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java index 86b99b7b1e3..61cbc4eebc4 100644 --- a/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java +++ b/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java @@ -42,7 +42,7 @@ public final class SidarKondoOfJamuraa extends CardImpl { this.addAbility(new FlankingAbility()); // Creatures your opponents control without flying or reach can't block creatures with power 2 or less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SidarKondoOfJamuraaCantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new SidarKondoOfJamuraaCantBlockCreaturesSourceEffect(filter))); // Partner this.addAbility(PartnerAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java b/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java index 5695191f9e3..cef2498db65 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java +++ b/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java @@ -34,7 +34,7 @@ public final class SiegeBehemoth extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // As long as Siege Behemoth is attacking, for each creature you control, you may have that creature assign its combat damage as though it weren't blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SiegeBehemothEffect())); + this.addAbility(new SimpleStaticAbility(new SiegeBehemothEffect())); } private SiegeBehemoth(final SiegeBehemoth card) { diff --git a/Mage.Sets/src/mage/cards/s/SiegeModification.java b/Mage.Sets/src/mage/cards/s/SiegeModification.java index d0858047c33..484f5a87b8e 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeModification.java +++ b/Mage.Sets/src/mage/cards/s/SiegeModification.java @@ -43,12 +43,12 @@ public final class SiegeModification extends CardImpl { this.addAbility(ability); // As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureIfVehicleEffect())); + this.addAbility(new SimpleStaticAbility(new BecomesCreatureIfVehicleEffect())); // Enchanted creature gets +3/+0 and has first strike. Effect effect = new BoostEnchantedEffect(3, 0); effect.setText("Enchanted creature gets +3/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText(" and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/Siegecraft.java b/Mage.Sets/src/mage/cards/s/Siegecraft.java index 0dceceb7cce..594213da2f6 100644 --- a/Mage.Sets/src/mage/cards/s/Siegecraft.java +++ b/Mage.Sets/src/mage/cards/s/Siegecraft.java @@ -36,7 +36,7 @@ public final class Siegecraft extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 4, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 4, Duration.WhileOnBattlefield))); } private Siegecraft(final Siegecraft card) { diff --git a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java index a0ed946d81d..cb503d95772 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java @@ -45,7 +45,7 @@ public final class SigardaHeronsGrace extends CardImpl { // You and Humans you control have hexproof. Effect effect = new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield); effect.setText("You"); - Ability ability =new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability =new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.concatBy("and"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java b/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java index b753e2c82f3..ec0f71497fb 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java @@ -33,7 +33,7 @@ public final class SigardaHostOfHerons extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // Spells and abilities your opponents control can't cause you to sacrifice permanents. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SigardaHostOfHeronsEffect())); + this.addAbility(new SimpleStaticAbility(new SigardaHostOfHeronsEffect())); } private SigardaHostOfHerons(final SigardaHostOfHerons card) { diff --git a/Mage.Sets/src/mage/cards/s/SigardasAid.java b/Mage.Sets/src/mage/cards/s/SigardasAid.java index fb673b4239a..e2e14abf450 100644 --- a/Mage.Sets/src/mage/cards/s/SigardasAid.java +++ b/Mage.Sets/src/mage/cards/s/SigardasAid.java @@ -36,7 +36,7 @@ public final class SigardasAid extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); // You may cast Aura and Equipment spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filterCard, false))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filterCard, false))); // Whenever an Equipment you control enters, you may attach it to target creature you control. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new SigardasAidEffect(), filter, true, SetTargetPointer.PERMANENT); diff --git a/Mage.Sets/src/mage/cards/s/SightlessBrawler.java b/Mage.Sets/src/mage/cards/s/SightlessBrawler.java index d7736a8a6c8..c7edb114474 100644 --- a/Mage.Sets/src/mage/cards/s/SightlessBrawler.java +++ b/Mage.Sets/src/mage/cards/s/SightlessBrawler.java @@ -39,7 +39,7 @@ public final class SightlessBrawler extends CardImpl { // Enchanted creature gets +3/+2 and can't attack alone. Effect effect = new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +3/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new CantAttackAloneAttachedEffect(AttachmentType.AURA); effect.setText("and can't attack alone"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SigilOfDistinction.java b/Mage.Sets/src/mage/cards/s/SigilOfDistinction.java index ce2a3d08274..ac848d2e545 100644 --- a/Mage.Sets/src/mage/cards/s/SigilOfDistinction.java +++ b/Mage.Sets/src/mage/cards/s/SigilOfDistinction.java @@ -31,7 +31,7 @@ public final class SigilOfDistinction extends CardImpl { // Equipped creature gets +1/+1 for each charge counter on Sigil of Distinction. BoostEquippedEffect effect = new BoostEquippedEffect(new CountersSourceCount(CounterType.CHARGE), new CountersSourceCount(CounterType.CHARGE)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Equip—Remove a charge counter from Sigil of Distinction. this.addAbility(new EquipAbility(Outcome.AddAbility, new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()), false)); diff --git a/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java b/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java index 1f94b4192fa..e2476b0be11 100644 --- a/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java +++ b/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java @@ -38,7 +38,7 @@ public final class SigilOfTheNayanGods extends CardImpl { // Enchanted creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE, 1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield))); // Cycling {G/W} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{G/W}"))); diff --git a/Mage.Sets/src/mage/cards/s/SilburlindSnapper.java b/Mage.Sets/src/mage/cards/s/SilburlindSnapper.java index 3249f25c365..f3910e6bd7c 100644 --- a/Mage.Sets/src/mage/cards/s/SilburlindSnapper.java +++ b/Mage.Sets/src/mage/cards/s/SilburlindSnapper.java @@ -30,7 +30,7 @@ public final class SilburlindSnapper extends CardImpl { this.toughness = new MageInt(6); // Silburlind Snapper can't attack unless you've cast a noncreature spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SilburlindSnapperEffect())); + this.addAbility(new SimpleStaticAbility(new SilburlindSnapperEffect())); } private SilburlindSnapper(final SilburlindSnapper card) { diff --git a/Mage.Sets/src/mage/cards/s/SilentArbiter.java b/Mage.Sets/src/mage/cards/s/SilentArbiter.java index 6166d39559d..5ad785d1b60 100644 --- a/Mage.Sets/src/mage/cards/s/SilentArbiter.java +++ b/Mage.Sets/src/mage/cards/s/SilentArbiter.java @@ -27,10 +27,10 @@ public final class SilentArbiter extends CardImpl { this.toughness = new MageInt(5); // No more than one creature can attack each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SilentArbiterAttackRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new SilentArbiterAttackRestrictionEffect())); // No more than one creature can block each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SilentArbiterBlockRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new SilentArbiterBlockRestrictionEffect())); } private SilentArbiter(final SilentArbiter card) { @@ -104,4 +104,4 @@ class SilentArbiterBlockRestrictionEffect extends RestrictionEffect { } return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SilentGravestone.java b/Mage.Sets/src/mage/cards/s/SilentGravestone.java index bfde1ab9800..d6468b6df42 100644 --- a/Mage.Sets/src/mage/cards/s/SilentGravestone.java +++ b/Mage.Sets/src/mage/cards/s/SilentGravestone.java @@ -26,7 +26,7 @@ public final class SilentGravestone extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Cards in graveyards can't be the targets of spells or abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedCardsGraveyardsEffect())); // {4}, {t}: Exile Silent Gravestone and all cards from all graveyards. Draw a card. Ability ability = new SimpleActivatedAbility(new ExileSourceEffect(), new GenericManaCost(4)); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java index a91b3a7d476..b5df7d8bec5 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java @@ -42,7 +42,7 @@ public final class SilumgarAssassin extends CardImpl { this.toughness = new MageInt(1); // Creatures with power greater than Silumgar Assassin's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithGreaterPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithGreaterPowerEffect())); // Megamorph {2}{B} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{B}"), true)); diff --git a/Mage.Sets/src/mage/cards/s/SilverInlaidDagger.java b/Mage.Sets/src/mage/cards/s/SilverInlaidDagger.java index eb3a57cbe69..889ad4467b8 100644 --- a/Mage.Sets/src/mage/cards/s/SilverInlaidDagger.java +++ b/Mage.Sets/src/mage/cards/s/SilverInlaidDagger.java @@ -28,10 +28,10 @@ public final class SilverInlaidDagger extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // As long as equipped creature is a Human, it gets an additional +1/+0 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/s/SilverbladePaladin.java b/Mage.Sets/src/mage/cards/s/SilverbladePaladin.java index 521e58f2358..0fbfbde6ba4 100644 --- a/Mage.Sets/src/mage/cards/s/SilverbladePaladin.java +++ b/Mage.Sets/src/mage/cards/s/SilverbladePaladin.java @@ -32,7 +32,7 @@ public final class SilverbladePaladin extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Silverblade Paladin is paired with another creature, both creatures have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(DoubleStrikeAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(DoubleStrikeAbility.getInstance(), ruleText))); } private SilverbladePaladin(final SilverbladePaladin card) { diff --git a/Mage.Sets/src/mage/cards/s/SinewSliver.java b/Mage.Sets/src/mage/cards/s/SinewSliver.java index ee02e7f5390..500728302ec 100644 --- a/Mage.Sets/src/mage/cards/s/SinewSliver.java +++ b/Mage.Sets/src/mage/cards/s/SinewSliver.java @@ -27,7 +27,7 @@ public final class SinewSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.SLIVER, "All Sliver creatures"), false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.SLIVER, "All Sliver creatures"), false))); } private SinewSliver(final SinewSliver card) { diff --git a/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java b/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java index 77eae659653..aa5e1909757 100644 --- a/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java +++ b/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java @@ -49,7 +49,7 @@ public final class SingerOfSwiftRivers extends CardImpl { this.addAbility(ability); // You may cast Merfolk spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, false))); } private SingerOfSwiftRivers(final SingerOfSwiftRivers card) { diff --git a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java index f9566f503a9..e25f287f012 100644 --- a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java +++ b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java @@ -46,12 +46,12 @@ public final class SingingBellStrike extends CardImpl { // When Singing Bell Strike enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Enchanted creature has "{6}: Untap this creature." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new GenericManaCost(6)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"{6}: Untap this creature.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private SingingBellStrike(final SingingBellStrike card) { diff --git a/Mage.Sets/src/mage/cards/s/SinisterStrength.java b/Mage.Sets/src/mage/cards/s/SinisterStrength.java index 9584a37d733..43c31ba4c0e 100644 --- a/Mage.Sets/src/mage/cards/s/SinisterStrength.java +++ b/Mage.Sets/src/mage/cards/s/SinisterStrength.java @@ -41,7 +41,7 @@ public final class SinisterStrength extends CardImpl { // Enchanted creature gets +3/+1 and is black. Effect effect = new BoostEnchantedEffect(3, 1); effect.setText("Enchanted creature gets +3/+1"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new SetCardColorAttachedEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and is black"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java index 29ca330c5ac..5c787a8527e 100644 --- a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java +++ b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java @@ -43,12 +43,12 @@ public final class SinkingFeeling extends CardImpl { this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Enchanted creature has "{1}, Put a -1/-1 counter on this creature: Untap this creature. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); ability2.addCost(new PutCountersSourceCost(CounterType.M1M1.createInstance()).setText("put a -1/-1 counter on this creature")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.Custom, "Enchanted creature has \"{1}, Put a -1/-1 counter on this creature: Untap this creature.\""))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.Custom, "Enchanted creature has \"{1}, Put a -1/-1 counter on this creature: Untap this creature.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SinuousPredator.java b/Mage.Sets/src/mage/cards/s/SinuousPredator.java index d40dcd273b7..d96130e866e 100644 --- a/Mage.Sets/src/mage/cards/s/SinuousPredator.java +++ b/Mage.Sets/src/mage/cards/s/SinuousPredator.java @@ -28,7 +28,7 @@ public final class SinuousPredator extends CardImpl { this.nightCard = true; // Sinuous Predator can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private SinuousPredator(final SinuousPredator card) { diff --git a/Mage.Sets/src/mage/cards/s/SirenSongLyre.java b/Mage.Sets/src/mage/cards/s/SirenSongLyre.java index 75269966e97..2ce1344f656 100644 --- a/Mage.Sets/src/mage/cards/s/SirenSongLyre.java +++ b/Mage.Sets/src/mage/cards/s/SirenSongLyre.java @@ -34,7 +34,7 @@ public final class SirenSongLyre extends CardImpl { Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); grantedAbility.addCost(new TapSourceCost()); grantedAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(grantedAbility, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(grantedAbility, AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new ManaCostsImpl<>("{2}"), false)); } diff --git a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java index 6c8c0206346..532fe9cb4fc 100644 --- a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java +++ b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java @@ -48,7 +48,7 @@ public final class SisaysIngenuity extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted creature has \"{2}{U}: Target creature becomes the color of your choice until end of turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private SisaysIngenuity(final SisaysIngenuity card) { diff --git a/Mage.Sets/src/mage/cards/s/SixthSense.java b/Mage.Sets/src/mage/cards/s/SixthSense.java index fda2a3c63d0..f0a83262a84 100644 --- a/Mage.Sets/src/mage/cards/s/SixthSense.java +++ b/Mage.Sets/src/mage/cards/s/SixthSense.java @@ -45,7 +45,7 @@ public final class SixthSense extends CardImpl { // Enchanted creature has "Whenever this creature deals combat damage to a player, you may draw a card." Effect effect = new GainAbilityAttachedEffect(new SixthSenseTriggeredAbility(), AttachmentType.AURA); effect.setText("Enchanted creature has \"Whenever this creature deals combat damage to a player, you may draw a card.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private SixthSense(final SixthSense card) { diff --git a/Mage.Sets/src/mage/cards/s/SkarrganPitSkulk.java b/Mage.Sets/src/mage/cards/s/SkarrganPitSkulk.java index 703135c5ff6..a3632c56903 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrganPitSkulk.java +++ b/Mage.Sets/src/mage/cards/s/SkarrganPitSkulk.java @@ -28,7 +28,7 @@ public final class SkarrganPitSkulk extends CardImpl { this.addAbility(new BloodthirstAbility(1)); // Creatures with power less than Skarrgan Pit-Skulk's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private SkarrganPitSkulk(final SkarrganPitSkulk card) { diff --git a/Mage.Sets/src/mage/cards/s/SkeletonKey.java b/Mage.Sets/src/mage/cards/s/SkeletonKey.java index 671df86a264..4785ea4bcdc 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletonKey.java +++ b/Mage.Sets/src/mage/cards/s/SkeletonKey.java @@ -32,7 +32,7 @@ public final class SkeletonKey extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has skulk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SkulkAbility(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SkulkAbility(), AttachmentType.EQUIPMENT))); // Whenever equipped creature deals combat damage to a player, you may draw a card. if you do, discard a card. Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "equipped creature", true); diff --git a/Mage.Sets/src/mage/cards/s/SkillBorrower.java b/Mage.Sets/src/mage/cards/s/SkillBorrower.java index d222228fccc..e974496cd00 100644 --- a/Mage.Sets/src/mage/cards/s/SkillBorrower.java +++ b/Mage.Sets/src/mage/cards/s/SkillBorrower.java @@ -30,7 +30,7 @@ public final class SkillBorrower extends CardImpl { this.toughness = new MageInt(3); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is an artifact or creature card, Skill Borrower has all activated abilities of that card. this.addAbility(new SkillBorrowerAbility()); } @@ -66,4 +66,3 @@ class SkillBorrowerAbility extends StaticAbility { return new SkillBorrowerAbility(this); } } - diff --git a/Mage.Sets/src/mage/cards/s/SkirkOutrider.java b/Mage.Sets/src/mage/cards/s/SkirkOutrider.java index e0ccb19b9ec..f4736f42e6c 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkOutrider.java +++ b/Mage.Sets/src/mage/cards/s/SkirkOutrider.java @@ -37,7 +37,7 @@ public final class SkirkOutrider extends CardImpl { this.toughness = new MageInt(2); // As long as you control a Beast, Skirk Outrider gets +2/+2 and has trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a Beast, {this} gets +2/+2")); diff --git a/Mage.Sets/src/mage/cards/s/Skullclamp.java b/Mage.Sets/src/mage/cards/s/Skullclamp.java index e2dd09e8d7f..aa190f28d20 100644 --- a/Mage.Sets/src/mage/cards/s/Skullclamp.java +++ b/Mage.Sets/src/mage/cards/s/Skullclamp.java @@ -26,7 +26,7 @@ public final class Skullclamp extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, -1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, -1))); // Whenever equipped creature dies, draw two cards. this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(2), "equipped creature")); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/s/SkyblinderStaff.java b/Mage.Sets/src/mage/cards/s/SkyblinderStaff.java index 9512661e2b7..42dfc912da8 100644 --- a/Mage.Sets/src/mage/cards/s/SkyblinderStaff.java +++ b/Mage.Sets/src/mage/cards/s/SkyblinderStaff.java @@ -25,7 +25,7 @@ public final class SkyblinderStaff extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0 and can't be blocked by creatures with flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(1, 0)); ability.addEffect(new CantBeBlockedByCreaturesWithFlyingAttachedEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Skygames.java b/Mage.Sets/src/mage/cards/s/Skygames.java index 7f163d86ef5..510dbd49e08 100644 --- a/Mage.Sets/src/mage/cards/s/Skygames.java +++ b/Mage.Sets/src/mage/cards/s/Skygames.java @@ -39,7 +39,7 @@ public final class Skygames extends CardImpl { // Enchanted land has "{tap}: Target creature gains flying until end of turn. Activate this ability only any time you could cast a sorcery." Ability gainAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gains flying until end of turn. Activate only as a sorcery.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SkyhunterCub.java b/Mage.Sets/src/mage/cards/s/SkyhunterCub.java index 5f4823acb76..e23a982d8b6 100644 --- a/Mage.Sets/src/mage/cards/s/SkyhunterCub.java +++ b/Mage.Sets/src/mage/cards/s/SkyhunterCub.java @@ -34,9 +34,9 @@ public final class SkyhunterCub extends CardImpl { // As long as Skyhunter Cub is equipped, it gets +1/+1 and has flying. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedSourceCondition.instance, rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(effect1)); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), EquippedSourceCondition.instance, rule2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(effect2)); } private SkyhunterCub(final SkyhunterCub card) { diff --git a/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java b/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java index 67cedf043a0..4e20c1b9ec3 100644 --- a/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java +++ b/Mage.Sets/src/mage/cards/s/SkymarcherAspirant.java @@ -39,7 +39,7 @@ public final class SkymarcherAspirant extends CardImpl { ContinuousEffect boostSource = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} has flying as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); + Ability ability = new SimpleStaticAbility(effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudElite.java b/Mage.Sets/src/mage/cards/s/SkyshroudElite.java index 72d8a84740c..ef305a3ffa1 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudElite.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudElite.java @@ -28,7 +28,7 @@ public final class SkyshroudElite extends CardImpl { this.toughness = new MageInt(1); // Skyshroud Elite gets +1/+2 as long as an opponent controls a nonbasic land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(FilterLandPermanent.nonbasicLand()), "{this} gets +1/+2 as long as an opponent controls a nonbasic land"))); diff --git a/Mage.Sets/src/mage/cards/s/SlagwurmArmor.java b/Mage.Sets/src/mage/cards/s/SlagwurmArmor.java index 4526cf365ae..30fd8965856 100644 --- a/Mage.Sets/src/mage/cards/s/SlagwurmArmor.java +++ b/Mage.Sets/src/mage/cards/s/SlagwurmArmor.java @@ -21,7 +21,7 @@ public final class SlagwurmArmor extends CardImpl { public SlagwurmArmor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 6))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(0, 6))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/s/SlayersCleaver.java b/Mage.Sets/src/mage/cards/s/SlayersCleaver.java index cc6707d1ac5..54ebbf0f0f0 100644 --- a/Mage.Sets/src/mage/cards/s/SlayersCleaver.java +++ b/Mage.Sets/src/mage/cards/s/SlayersCleaver.java @@ -30,7 +30,7 @@ public final class SlayersCleaver extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+1 and must be blocked by an Eldrazi if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 1)); ability.addEffect(new MustBeBlockedByAtLeastOneAttachedEffect(filter).concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SlayersPlate.java b/Mage.Sets/src/mage/cards/s/SlayersPlate.java index 23327dec446..0eba2e6116d 100644 --- a/Mage.Sets/src/mage/cards/s/SlayersPlate.java +++ b/Mage.Sets/src/mage/cards/s/SlayersPlate.java @@ -33,7 +33,7 @@ public final class SlayersPlate extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 2))); // Whenever equipped creature dies, if it was a Human, create a 1/1 white Spirit creature token with flying. this.addAbility(new SlayersPlateTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/s/SleepParalysis.java b/Mage.Sets/src/mage/cards/s/SleepParalysis.java index f4f713dd274..402739b9181 100644 --- a/Mage.Sets/src/mage/cards/s/SleepParalysis.java +++ b/Mage.Sets/src/mage/cards/s/SleepParalysis.java @@ -37,7 +37,7 @@ public final class SleepParalysis extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private SleepParalysis(final SleepParalysis card) { diff --git a/Mage.Sets/src/mage/cards/s/SleepersGuile.java b/Mage.Sets/src/mage/cards/s/SleepersGuile.java index 445e5afe000..915ac622839 100644 --- a/Mage.Sets/src/mage/cards/s/SleepersGuile.java +++ b/Mage.Sets/src/mage/cards/s/SleepersGuile.java @@ -39,7 +39,7 @@ public final class SleepersGuile extends CardImpl { this.addAbility(ability); // Enchanted creature has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); // When Sleeper's Guile is put into a graveyard from the battlefield, return Sleeper's Guile to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/s/SleepersRobe.java b/Mage.Sets/src/mage/cards/s/SleepersRobe.java index 1e128585650..6ea5ee6265b 100644 --- a/Mage.Sets/src/mage/cards/s/SleepersRobe.java +++ b/Mage.Sets/src/mage/cards/s/SleepersRobe.java @@ -39,7 +39,7 @@ public final class SleepersRobe extends CardImpl { this.addAbility(ability); // Enchanted creature has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); // Whenever enchanted creature deals combat damage to an opponent, you may draw a card. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "enchanted creature", true, false, true, TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/s/SleepingPotion.java b/Mage.Sets/src/mage/cards/s/SleepingPotion.java index 3ff32888412..652948556a0 100644 --- a/Mage.Sets/src/mage/cards/s/SleepingPotion.java +++ b/Mage.Sets/src/mage/cards/s/SleepingPotion.java @@ -38,7 +38,7 @@ public final class SleepingPotion extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // When enchanted creature becomes the target of a spell or ability, sacrifice Sleeping Potion. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new SacrificeSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java b/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java index 05e77adb126..f33f45bd67f 100644 --- a/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java +++ b/Mage.Sets/src/mage/cards/s/SlipperyScoundrel.java @@ -43,7 +43,7 @@ public final class SlipperyScoundrel extends CardImpl { ContinuousEffect boostSource = new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "As long as you have the city's blessing, {this} has hexproof"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); RestrictionEffect restrictionEffect = new CantBeBlockedSourceEffect(Duration.WhileOnBattlefield); Effect effect2 = new ConditionalRestrictionEffect(restrictionEffect, CitysBlessingCondition.instance) .setText("and can't be blocked"); diff --git a/Mage.Sets/src/mage/cards/s/SlipstreamEel.java b/Mage.Sets/src/mage/cards/s/SlipstreamEel.java index 5f8564b57cf..9ccb4aa675f 100644 --- a/Mage.Sets/src/mage/cards/s/SlipstreamEel.java +++ b/Mage.Sets/src/mage/cards/s/SlipstreamEel.java @@ -28,7 +28,7 @@ public final class SlipstreamEel extends CardImpl { this.toughness = new MageInt(6); // Slipstream Eel can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); // Cycling {1}{U} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{U}"))); diff --git a/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java b/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java index a4d53e0547d..66ad8a8c1f4 100644 --- a/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java @@ -30,7 +30,7 @@ public final class SlipstreamSerpent extends CardImpl { this.toughness = new MageInt(6); // Slipstream Serpent can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // When you control no Islands, sacrifice Slipstream Serpent. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/SlitheringShade.java b/Mage.Sets/src/mage/cards/s/SlitheringShade.java index 9128fcb2353..5ddb67e0159 100644 --- a/Mage.Sets/src/mage/cards/s/SlitheringShade.java +++ b/Mage.Sets/src/mage/cards/s/SlitheringShade.java @@ -43,7 +43,7 @@ public final class SlitheringShade extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), HellbentCondition.instance); effect.setText("Hellbent — {this} can attack as though it didn't have defender as long as you have no cards in hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/s/SliverLegion.java b/Mage.Sets/src/mage/cards/s/SliverLegion.java index d32874293bf..e2e2413a30b 100644 --- a/Mage.Sets/src/mage/cards/s/SliverLegion.java +++ b/Mage.Sets/src/mage/cards/s/SliverLegion.java @@ -36,7 +36,7 @@ public final class SliverLegion extends CardImpl { this.toughness = new MageInt(7); // All Sliver creatures get +1/+1 for each other Sliver on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new PermanentsOnBattlefieldCount(countfilter) , new PermanentsOnBattlefieldCount(countfilter), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(new PermanentsOnBattlefieldCount(countfilter) , new PermanentsOnBattlefieldCount(countfilter), Duration.WhileOnBattlefield, filter, false))); } private SliverLegion(final SliverLegion card) { diff --git a/Mage.Sets/src/mage/cards/s/Sluggishness.java b/Mage.Sets/src/mage/cards/s/Sluggishness.java index c5a6ade1337..790e545c8fe 100644 --- a/Mage.Sets/src/mage/cards/s/Sluggishness.java +++ b/Mage.Sets/src/mage/cards/s/Sluggishness.java @@ -38,7 +38,7 @@ public final class Sluggishness extends CardImpl { this.addAbility(ability); // Enchanted creature can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantBlockAttachedEffect(AttachmentType.AURA))); // When Sluggishness is put into a graveyard from the battlefield, return Sluggishness to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/s/SlumberingDragon.java b/Mage.Sets/src/mage/cards/s/SlumberingDragon.java index c51c41a2968..1c9bb666362 100644 --- a/Mage.Sets/src/mage/cards/s/SlumberingDragon.java +++ b/Mage.Sets/src/mage/cards/s/SlumberingDragon.java @@ -33,7 +33,7 @@ public final class SlumberingDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Slumbering Dragon can't attack or block unless it has five or more +1/+1 counters on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SlumberingDragonEffect())); + this.addAbility(new SimpleStaticAbility(new SlumberingDragonEffect())); // Whenever a creature attacks you or a planeswalker you control, put a +1/+1 counter on Slumbering Dragon. this.addAbility(new AttacksAllTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, StaticFilters.FILTER_PERMANENT_CREATURE, SetTargetPointer.PERMANENT, true)); diff --git a/Mage.Sets/src/mage/cards/s/SmogElemental.java b/Mage.Sets/src/mage/cards/s/SmogElemental.java index 19bd91ba205..be8e1f36bb7 100644 --- a/Mage.Sets/src/mage/cards/s/SmogElemental.java +++ b/Mage.Sets/src/mage/cards/s/SmogElemental.java @@ -35,7 +35,7 @@ public final class SmogElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creatures with flying your opponents control get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1,-1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1,-1, Duration.WhileOnBattlefield, filter, false))); } private SmogElemental(final SmogElemental card) { diff --git a/Mage.Sets/src/mage/cards/s/Smoke.java b/Mage.Sets/src/mage/cards/s/Smoke.java index 0a2784f7d8e..8387b4c655d 100644 --- a/Mage.Sets/src/mage/cards/s/Smoke.java +++ b/Mage.Sets/src/mage/cards/s/Smoke.java @@ -24,7 +24,7 @@ public final class Smoke extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}{R}"); // Players can't untap more than one creature during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SmokeEffect())); + this.addAbility(new SimpleStaticAbility(new SmokeEffect())); } private Smoke(final Smoke card) { diff --git a/Mage.Sets/src/mage/cards/s/SnakeUmbra.java b/Mage.Sets/src/mage/cards/s/SnakeUmbra.java index c5e5c4d7fc2..d7103e5bc0f 100644 --- a/Mage.Sets/src/mage/cards/s/SnakeUmbra.java +++ b/Mage.Sets/src/mage/cards/s/SnakeUmbra.java @@ -36,7 +36,7 @@ public final class SnakeUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); // and has "Whenever this creature deals damage to an opponent, you may draw a card." Ability gainedAbility = new DealsDamageToOpponentTriggeredAbility(new DrawCardSourceControllerEffect(1), true); diff --git a/Mage.Sets/src/mage/cards/s/SnapsailGlider.java b/Mage.Sets/src/mage/cards/s/SnapsailGlider.java index 87112631742..6667d9b04b6 100644 --- a/Mage.Sets/src/mage/cards/s/SnapsailGlider.java +++ b/Mage.Sets/src/mage/cards/s/SnapsailGlider.java @@ -29,7 +29,7 @@ public final class SnapsailGlider extends CardImpl { // Metalcraft — Snapsail Glider has flying as long as you control three or more artifacts. ContinuousEffect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, rule)) + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, rule)) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java b/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java index 9a1cd584353..2254a01bd8c 100644 --- a/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java +++ b/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java @@ -28,7 +28,7 @@ public final class SnickeringSquirrel extends CardImpl { this.toughness = new MageInt(1); // You may tap Snickering Squirrel to increase the result of a die any player rolled by 1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SnickeringSquirrelEffect())); + this.addAbility(new SimpleStaticAbility(new SnickeringSquirrelEffect())); } private SnickeringSquirrel(final SnickeringSquirrel card) { diff --git a/Mage.Sets/src/mage/cards/s/SnowDevil.java b/Mage.Sets/src/mage/cards/s/SnowDevil.java index a8f06c82d28..12abdb83e88 100644 --- a/Mage.Sets/src/mage/cards/s/SnowDevil.java +++ b/Mage.Sets/src/mage/cards/s/SnowDevil.java @@ -46,7 +46,7 @@ public final class SnowDevil extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // Enchanted creature has first strike as long as it's blocking and you control a snow land. this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/s/SnubhornSentry.java b/Mage.Sets/src/mage/cards/s/SnubhornSentry.java index 6e222f2dba2..950dc93e241 100644 --- a/Mage.Sets/src/mage/cards/s/SnubhornSentry.java +++ b/Mage.Sets/src/mage/cards/s/SnubhornSentry.java @@ -37,7 +37,7 @@ public final class SnubhornSentry extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} gets +3/+0 as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); + Ability ability = new SimpleStaticAbility(effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Soar.java b/Mage.Sets/src/mage/cards/s/Soar.java index 321cde44e04..f32252eeccb 100644 --- a/Mage.Sets/src/mage/cards/s/Soar.java +++ b/Mage.Sets/src/mage/cards/s/Soar.java @@ -43,7 +43,7 @@ public final class Soar extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+1 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(0, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SoaringHope.java b/Mage.Sets/src/mage/cards/s/SoaringHope.java index 3d9a081e1df..a243b491527 100644 --- a/Mage.Sets/src/mage/cards/s/SoaringHope.java +++ b/Mage.Sets/src/mage/cards/s/SoaringHope.java @@ -44,7 +44,7 @@ public final class SoaringHope extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {W}: Put Soaring Hope on top of it's owner's library this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/s/SoldeviGolem.java b/Mage.Sets/src/mage/cards/s/SoldeviGolem.java index 2d2fa6666ce..0afde0f12f1 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviGolem.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviGolem.java @@ -40,7 +40,7 @@ public final class SoldeviGolem extends CardImpl { this.toughness = new MageInt(3); // Soldevi Golem doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may untap target tapped creature an opponent controls. If you do, untap Soldevi Golem. Ability ability = new BeginningOfUpkeepTriggeredAbility(new UntapTargetEffect().setText("untap target tapped creature an opponent controls"), true); diff --git a/Mage.Sets/src/mage/cards/s/Solemnity.java b/Mage.Sets/src/mage/cards/s/Solemnity.java index 0ca0f6cb184..7ca616615ca 100644 --- a/Mage.Sets/src/mage/cards/s/Solemnity.java +++ b/Mage.Sets/src/mage/cards/s/Solemnity.java @@ -29,10 +29,10 @@ public final class Solemnity extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Players can't get counters. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SolemnityEffect())); + this.addAbility(new SimpleStaticAbility(new SolemnityEffect())); // Counters can't be put on artifacts, creatures, enchantments, or lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SolemnityEffect2())); + this.addAbility(new SimpleStaticAbility(new SolemnityEffect2())); } private Solemnity(final Solemnity card) { diff --git a/Mage.Sets/src/mage/cards/s/SolitaryConfinement.java b/Mage.Sets/src/mage/cards/s/SolitaryConfinement.java index adb261a4b69..d390eeeb41b 100644 --- a/Mage.Sets/src/mage/cards/s/SolitaryConfinement.java +++ b/Mage.Sets/src/mage/cards/s/SolitaryConfinement.java @@ -30,13 +30,13 @@ public final class SolitaryConfinement extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand())))); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // You have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(ShroudAbility.getInstance()))); // Prevent all damage that would be dealt to you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PreventDamageToControllerEffect(Duration.WhileOnBattlefield))); } private SolitaryConfinement(final SolitaryConfinement card) { diff --git a/Mage.Sets/src/mage/cards/s/SoltariLancer.java b/Mage.Sets/src/mage/cards/s/SoltariLancer.java index ee78ac7107c..d91ce15405f 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariLancer.java +++ b/Mage.Sets/src/mage/cards/s/SoltariLancer.java @@ -32,7 +32,7 @@ public final class SoltariLancer extends CardImpl { this.addAbility(ShadowAbility.getInstance()); // Soltari Lancer has first strike as long as it's attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); } private SoltariLancer(final SoltariLancer card) { diff --git a/Mage.Sets/src/mage/cards/s/SongOfSerenity.java b/Mage.Sets/src/mage/cards/s/SongOfSerenity.java index bd74c99188e..ae1dde9d141 100644 --- a/Mage.Sets/src/mage/cards/s/SongOfSerenity.java +++ b/Mage.Sets/src/mage/cards/s/SongOfSerenity.java @@ -24,7 +24,7 @@ public final class SongOfSerenity extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); // Creatures that are enchanted can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SongOfSerenityRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new SongOfSerenityRestrictionEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java index d0b1de494cf..d34577f660f 100644 --- a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java +++ b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java @@ -32,7 +32,7 @@ public final class SongOfTheDryads extends CardImpl { this.addAbility(ability); // Enchanted permanent is a colorless Forest land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesColorlessForestLandEffect())); + this.addAbility(new SimpleStaticAbility(new BecomesColorlessForestLandEffect())); } private SongOfTheDryads(final SongOfTheDryads card) { diff --git a/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java b/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java index 62445605b4e..665923a8f20 100644 --- a/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java +++ b/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java @@ -34,7 +34,7 @@ public final class SorayaTheFalconer extends CardImpl { this.toughness = new MageInt(2); // Bird creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.BIRD, "Bird creatures"), false))); // {1}{W}: Target Bird creature gains banding until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/SorcerersWand.java b/Mage.Sets/src/mage/cards/s/SorcerersWand.java index 6c8b48bb57d..12f518a082e 100644 --- a/Mage.Sets/src/mage/cards/s/SorcerersWand.java +++ b/Mage.Sets/src/mage/cards/s/SorcerersWand.java @@ -44,7 +44,7 @@ public final class SorcerersWand extends CardImpl { ), new TapSourceCost() ); ability.addTarget(new TargetPlayerOrPlaneswalker()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java b/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java index 447d4976171..ddeb958e7b6 100644 --- a/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java +++ b/Mage.Sets/src/mage/cards/s/SorcerousSpyglass.java @@ -31,7 +31,7 @@ public final class SorcerousSpyglass extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL, true))); // Activated abilities of sources with the chosen name can't be activated unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SorcerousSpyglassActivationEffect())); + this.addAbility(new SimpleStaticAbility(new SorcerousSpyglassActivationEffect())); } private SorcerousSpyglass(final SorcerousSpyglass card) { diff --git a/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java b/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java index 3036c7c8edd..3d6d5fc1630 100644 --- a/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java +++ b/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java @@ -42,7 +42,7 @@ public final class SosukeSonOfSeshiro extends CardImpl { this.toughness = new MageInt(4); // Other Snake creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); // Whenever a Warrior you control deals combat damage to a creature, destroy that creature at end of combat. Effect effect = new CreateDelayedTriggeredAbilityEffect( new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect()), true); diff --git a/Mage.Sets/src/mage/cards/s/SoulEcho.java b/Mage.Sets/src/mage/cards/s/SoulEcho.java index 3a7742b72e1..08162fb7a2a 100644 --- a/Mage.Sets/src/mage/cards/s/SoulEcho.java +++ b/Mage.Sets/src/mage/cards/s/SoulEcho.java @@ -39,7 +39,7 @@ public final class SoulEcho extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.ECHO.createInstance()))); // You don't lose the game for having 0 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); // At the beginning of your upkeep, sacrifice Soul Echo if there are no echo counters on it. // Otherwise, target opponent may choose that for each 1 damage that would be dealt to you until your next upkeep, you remove an echo counter from Soul Echo instead. diff --git a/Mage.Sets/src/mage/cards/s/SoulRansom.java b/Mage.Sets/src/mage/cards/s/SoulRansom.java index c6ea15df6db..42fe8a1bbca 100644 --- a/Mage.Sets/src/mage/cards/s/SoulRansom.java +++ b/Mage.Sets/src/mage/cards/s/SoulRansom.java @@ -38,7 +38,7 @@ public final class SoulRansom extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Discard two cards: Soul Ransom's controller sacrifices it, then draws two cards. Only any opponent may activate this ability. SimpleActivatedAbility ability2 = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/s/SoulScarMage.java b/Mage.Sets/src/mage/cards/s/SoulScarMage.java index 6dc9033b100..b43ab51b45d 100644 --- a/Mage.Sets/src/mage/cards/s/SoulScarMage.java +++ b/Mage.Sets/src/mage/cards/s/SoulScarMage.java @@ -36,7 +36,7 @@ public final class SoulScarMage extends CardImpl { this.addAbility(new ProwessAbility()); // If a source you control would deal noncombat damage to a creature an opponent controls, put that many -1/-1 counters on that creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SoulScarMageDamageReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new SoulScarMageDamageReplacementEffect())); } private SoulScarMage(final SoulScarMage card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java b/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java index 9c48e683072..7a4f900a40b 100644 --- a/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java +++ b/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java @@ -38,7 +38,7 @@ public final class SoulcatchersAerie extends CardImpl { false, filter, false, true)); // Bird creatures get +1/+1 for each feather counter on Soulcatchers' Aerie. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new CountersSourceCount(CounterType.FEATHER), + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(new CountersSourceCount(CounterType.FEATHER), new CountersSourceCount(CounterType.FEATHER), Duration.WhileOnBattlefield, filter2, false, "Bird creatures get +1/+1 for each feather counter on {this}."))); } diff --git a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java index 588df99b9b3..fba280ab757 100644 --- a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java +++ b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java @@ -49,7 +49,7 @@ public final class SoulfireGrandMaster extends CardImpl { // Instant and sorcery spells you control have lifelink. Effect effect = new GainAbilityControlledSpellsEffect(LifelinkAbility.getInstance(), filter); effect.setText("Instant and sorcery spells you control have lifelink"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {2}{U/R}{U/R}: The next time you cast an instant or sorcery spell from your hand this turn, put that card into your hand instead of your graveyard as it resolves. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulfireGrandMasterCastFromHandReplacementEffect(), new ManaCostsImpl<>("{2}{U/R}{U/R}"))); diff --git a/Mage.Sets/src/mage/cards/s/Soulflayer.java b/Mage.Sets/src/mage/cards/s/Soulflayer.java index d89cd47ec99..269177ae832 100644 --- a/Mage.Sets/src/mage/cards/s/Soulflayer.java +++ b/Mage.Sets/src/mage/cards/s/Soulflayer.java @@ -34,7 +34,7 @@ public final class Soulflayer extends CardImpl { this.addAbility(new DelveAbility()); // If a creature card with flying was exiled with Soulflayer's delve ability, Soulflayer has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, reach, trample, and vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SoulflayerEffect())); + this.addAbility(new SimpleStaticAbility(new SoulflayerEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/SparringCollar.java b/Mage.Sets/src/mage/cards/s/SparringCollar.java index 4266cd6d568..78326ab733b 100644 --- a/Mage.Sets/src/mage/cards/s/SparringCollar.java +++ b/Mage.Sets/src/mage/cards/s/SparringCollar.java @@ -31,7 +31,7 @@ public final class SparringCollar extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // {R}{R}: Attach Sparring Collar to target creature you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{R}{R}")); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java index 7d0eb0f517f..dce5724f80f 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java +++ b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java @@ -41,7 +41,7 @@ public final class SpawningGrounds extends CardImpl { // Enchanted land has "{tap}: Create a 5/5 green Beast creature token with trample." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningGroundsBeastToken(), 1), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Create a 5/5 green Beast creature token with trample.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SpearpointOread.java b/Mage.Sets/src/mage/cards/s/SpearpointOread.java index e473c9a6712..c5c8c926c75 100644 --- a/Mage.Sets/src/mage/cards/s/SpearpointOread.java +++ b/Mage.Sets/src/mage/cards/s/SpearpointOread.java @@ -35,7 +35,7 @@ public final class SpearpointOread extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Enchanted creature gets +2/+2 and has first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2)); Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SpectersShroud.java b/Mage.Sets/src/mage/cards/s/SpectersShroud.java index 923328c5751..79e9eb62ede 100644 --- a/Mage.Sets/src/mage/cards/s/SpectersShroud.java +++ b/Mage.Sets/src/mage/cards/s/SpectersShroud.java @@ -28,7 +28,7 @@ public final class SpectersShroud extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature deals combat damage to a player, that player discards a card. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new DiscardTargetEffect(1), "equipped creature", false, true, true)); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/s/SpectraWard.java b/Mage.Sets/src/mage/cards/s/SpectraWard.java index 6da03d53222..d73065e292e 100644 --- a/Mage.Sets/src/mage/cards/s/SpectraWard.java +++ b/Mage.Sets/src/mage/cards/s/SpectraWard.java @@ -54,7 +54,7 @@ public final class SpectraWard extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has protection from all colors. This effect doesn't remove auras. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield)); ProtectionAbility protectionAbility = new ProtectionAbility(filter); protectionAbility.setRemovesAuras(false); ability.addEffect(new GainAbilityAttachedEffect(protectionAbility, AttachmentType.AURA, Duration.WhileOnBattlefield) diff --git a/Mage.Sets/src/mage/cards/s/SpectralGateguards.java b/Mage.Sets/src/mage/cards/s/SpectralGateguards.java index e7431f58e14..15b94a6c9f2 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralGateguards.java +++ b/Mage.Sets/src/mage/cards/s/SpectralGateguards.java @@ -32,7 +32,7 @@ public final class SpectralGateguards extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Spectral Gateguards is paired with another creature, both creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(VigilanceAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(VigilanceAbility.getInstance(), ruleText))); } private SpectralGateguards(final SpectralGateguards card) { diff --git a/Mage.Sets/src/mage/cards/s/SpectralGrasp.java b/Mage.Sets/src/mage/cards/s/SpectralGrasp.java index c61773ba515..ce7d3c70bae 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralGrasp.java +++ b/Mage.Sets/src/mage/cards/s/SpectralGrasp.java @@ -45,10 +45,10 @@ public final class SpectralGrasp extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack you or a planeswalker you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackControllerAttachedEffect(AttachmentType.AURA, true))); + this.addAbility(new SimpleStaticAbility(new CantAttackControllerAttachedEffect(AttachmentType.AURA, true))); // Enchanted creature can't block creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.AURA, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockAttachedEffect(AttachmentType.AURA, Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/s/SpectralGuardian.java b/Mage.Sets/src/mage/cards/s/SpectralGuardian.java index 4a93bd39fb8..1cf2be7ac06 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralGuardian.java +++ b/Mage.Sets/src/mage/cards/s/SpectralGuardian.java @@ -38,7 +38,7 @@ public final class SpectralGuardian extends CardImpl { this.toughness = new MageInt(3); // As long as Spectral Guardian is untapped, noncreature artifacts have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false), SourceTappedCondition.UNTAPPED, "as long as {this} is untapped, noncreature artifacts have shroud."))); diff --git a/Mage.Sets/src/mage/cards/s/SpectralPrison.java b/Mage.Sets/src/mage/cards/s/SpectralPrison.java index 2268f6ac827..542d28c93f0 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralPrison.java +++ b/Mage.Sets/src/mage/cards/s/SpectralPrison.java @@ -31,7 +31,7 @@ public final class SpectralPrison extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // When enchanted creature becomes the target of a spell, sacrifice Spectral Prison. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new SacrificeSourceEffect(), StaticFilters.FILTER_SPELL_A, SetTargetPointer.NONE, false)); diff --git a/Mage.Sets/src/mage/cards/s/SpectralShield.java b/Mage.Sets/src/mage/cards/s/SpectralShield.java index c8465609a3a..f2443ce55a7 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralShield.java +++ b/Mage.Sets/src/mage/cards/s/SpectralShield.java @@ -33,11 +33,11 @@ public final class SpectralShield extends CardImpl { this.addAbility(ability); // Enchanted creature get's +0/+2 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); // Enchanted creature can't be the target of spells. CantBeTargetedAttachedEffect cantTargetEffect = new CantBeTargetedAttachedEffect(new FilterSpell("spells"), Duration.WhileOnBattlefield, AttachmentType.AURA, TargetController.ANY); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, cantTargetEffect); + Ability ability2 = new SimpleStaticAbility(cantTargetEffect); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SpectralSliver.java b/Mage.Sets/src/mage/cards/s/SpectralSliver.java index 7c9d9f88edf..2f15918713c 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralSliver.java +++ b/Mage.Sets/src/mage/cards/s/SpectralSliver.java @@ -33,7 +33,7 @@ public final class SpectralSliver extends CardImpl { // All Sliver creatures have "{2}: This creature gets +1/+1 until end of turn." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn).setText("this creature gets +1/+1 until end of turn"), new ManaCostsImpl<>("{2}")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS))); } private SpectralSliver(final SpectralSliver card) { diff --git a/Mage.Sets/src/mage/cards/s/SpeederTrooper.java b/Mage.Sets/src/mage/cards/s/SpeederTrooper.java index a83c4d70d6c..3990a5dfae8 100644 --- a/Mage.Sets/src/mage/cards/s/SpeederTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SpeederTrooper.java @@ -34,7 +34,7 @@ public final class SpeederTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/s/Spellbook.java b/Mage.Sets/src/mage/cards/s/Spellbook.java index 8afea138f4d..f3ffa147086 100644 --- a/Mage.Sets/src/mage/cards/s/Spellbook.java +++ b/Mage.Sets/src/mage/cards/s/Spellbook.java @@ -23,7 +23,7 @@ public final class Spellbook extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Spellbook(final Spellbook card) { diff --git a/Mage.Sets/src/mage/cards/s/SpellbreakerBehemoth.java b/Mage.Sets/src/mage/cards/s/SpellbreakerBehemoth.java index c3e5de3dfe7..4de358ff682 100644 --- a/Mage.Sets/src/mage/cards/s/SpellbreakerBehemoth.java +++ b/Mage.Sets/src/mage/cards/s/SpellbreakerBehemoth.java @@ -40,7 +40,7 @@ public final class SpellbreakerBehemoth extends CardImpl { this.toughness = new MageInt(5); this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filter, Duration.WhileOnBattlefield))); } private SpellbreakerBehemoth(final SpellbreakerBehemoth card) { diff --git a/Mage.Sets/src/mage/cards/s/SphereOfDuty.java b/Mage.Sets/src/mage/cards/s/SphereOfDuty.java index f0cc75d21cd..166a1cbe81a 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfDuty.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfDuty.java @@ -20,7 +20,7 @@ public final class SphereOfDuty extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If a green source would deal damage to you, prevent 2 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageByColorEffect(ObjectColor.GREEN, 2))); + this.addAbility(new SimpleStaticAbility(new PreventDamageByColorEffect(ObjectColor.GREEN, 2))); } private SphereOfDuty(final SphereOfDuty card) { diff --git a/Mage.Sets/src/mage/cards/s/SphereOfGrace.java b/Mage.Sets/src/mage/cards/s/SphereOfGrace.java index 4855a85e2b4..4fa75f361f6 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfGrace.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfGrace.java @@ -20,7 +20,7 @@ public final class SphereOfGrace extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If a black source would deal damage to you, prevent 2 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageByColorEffect(ObjectColor.BLACK, 2))); + this.addAbility(new SimpleStaticAbility(new PreventDamageByColorEffect(ObjectColor.BLACK, 2))); } private SphereOfGrace(final SphereOfGrace card) { diff --git a/Mage.Sets/src/mage/cards/s/SphereOfLaw.java b/Mage.Sets/src/mage/cards/s/SphereOfLaw.java index 3002bef2b09..70475180ebc 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfLaw.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfLaw.java @@ -20,7 +20,7 @@ public final class SphereOfLaw extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If a red source would deal damage to you, prevent 2 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageByColorEffect(ObjectColor.RED, 2))); + this.addAbility(new SimpleStaticAbility(new PreventDamageByColorEffect(ObjectColor.RED, 2))); } private SphereOfLaw(final SphereOfLaw card) { diff --git a/Mage.Sets/src/mage/cards/s/SphereOfPurity.java b/Mage.Sets/src/mage/cards/s/SphereOfPurity.java index 6bdd71e8807..6e3e3348896 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfPurity.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfPurity.java @@ -24,7 +24,7 @@ public final class SphereOfPurity extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If an artifact would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SphereOfPurityEffect())); + this.addAbility(new SimpleStaticAbility(new SphereOfPurityEffect())); } private SphereOfPurity(final SphereOfPurity card) { diff --git a/Mage.Sets/src/mage/cards/s/SphereOfReason.java b/Mage.Sets/src/mage/cards/s/SphereOfReason.java index 0131c4d61d6..9b495deda3b 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfReason.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfReason.java @@ -20,7 +20,7 @@ public final class SphereOfReason extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If a blue source would deal damage to you, prevent 2 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageByColorEffect(ObjectColor.BLUE, 2))); + this.addAbility(new SimpleStaticAbility(new PreventDamageByColorEffect(ObjectColor.BLUE, 2))); } private SphereOfReason(final SphereOfReason card) { diff --git a/Mage.Sets/src/mage/cards/s/SphereOfSafety.java b/Mage.Sets/src/mage/cards/s/SphereOfSafety.java index c7e2e84aba9..9d92debc3e6 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfSafety.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfSafety.java @@ -30,7 +30,7 @@ public final class SphereOfSafety extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{W}"); // Creatures can't attack you or a planeswalker you control unless their controller pays {X} for each of those creatures, where X is the number of enchantments you control. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new SphereOfSafetyPayManaToAttackAllEffect()); + Ability ability = new SimpleStaticAbility(new SphereOfSafetyPayManaToAttackAllEffect()); ability.addHint(new ValueHint( NumberOfEnchantmentsYouControl.instance.getMessage(), NumberOfEnchantmentsYouControl.instance) @@ -98,4 +98,4 @@ enum NumberOfEnchantmentsYouControl implements DynamicValue { public String getMessage() { return "Number of enchantments controlled by controller"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SphereOfTruth.java b/Mage.Sets/src/mage/cards/s/SphereOfTruth.java index 41518d6c6b6..e6415704ceb 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfTruth.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfTruth.java @@ -20,7 +20,7 @@ public final class SphereOfTruth extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If a white source would deal damage to you, prevent 2 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageByColorEffect(ObjectColor.WHITE, 2))); + this.addAbility(new SimpleStaticAbility(new PreventDamageByColorEffect(ObjectColor.WHITE, 2))); } private SphereOfTruth(final SphereOfTruth card) { diff --git a/Mage.Sets/src/mage/cards/s/SphinxOfTheFinalWord.java b/Mage.Sets/src/mage/cards/s/SphinxOfTheFinalWord.java index 4e4a6f732f3..851e3815f3f 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxOfTheFinalWord.java +++ b/Mage.Sets/src/mage/cards/s/SphinxOfTheFinalWord.java @@ -46,7 +46,7 @@ public final class SphinxOfTheFinalWord extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // Instant and sorcery spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); } private SphinxOfTheFinalWord(final SphinxOfTheFinalWord card) { diff --git a/Mage.Sets/src/mage/cards/s/SpiderClimb.java b/Mage.Sets/src/mage/cards/s/SpiderClimb.java index d9dedc8e48c..0206f478a9f 100644 --- a/Mage.Sets/src/mage/cards/s/SpiderClimb.java +++ b/Mage.Sets/src/mage/cards/s/SpiderClimb.java @@ -43,7 +43,7 @@ public final class SpiderClimb extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+3 and has reach. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 3, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(0, 3, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA); effect.setText("and has reach"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SpikeTailedCeratops.java b/Mage.Sets/src/mage/cards/s/SpikeTailedCeratops.java index ca7ffd3658b..b24b3260711 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeTailedCeratops.java +++ b/Mage.Sets/src/mage/cards/s/SpikeTailedCeratops.java @@ -26,7 +26,7 @@ public final class SpikeTailedCeratops extends CardImpl { this.toughness = new MageInt(4); // Spike-Tailed Ceratops can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); } private SpikeTailedCeratops(final SpikeTailedCeratops card) { diff --git a/Mage.Sets/src/mage/cards/s/SpinalGraft.java b/Mage.Sets/src/mage/cards/s/SpinalGraft.java index 0f0cff4bdc9..fa1a457547f 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalGraft.java +++ b/Mage.Sets/src/mage/cards/s/SpinalGraft.java @@ -34,7 +34,7 @@ public final class SpinalGraft extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // When enchanted creature becomes the target of a spell or ability, destroy that creature. It can't be regenerated. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new DestroyAttachedToEffect("that creature", true))); diff --git a/Mage.Sets/src/mage/cards/s/SpinneretSliver.java b/Mage.Sets/src/mage/cards/s/SpinneretSliver.java index 5c4b1d46316..a499ae705b1 100644 --- a/Mage.Sets/src/mage/cards/s/SpinneretSliver.java +++ b/Mage.Sets/src/mage/cards/s/SpinneretSliver.java @@ -34,7 +34,7 @@ public final class SpinneretSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ReachAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have reach."))); } diff --git a/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java b/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java index 91974047010..c30fe0c5ea6 100644 --- a/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java +++ b/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java @@ -30,7 +30,7 @@ public final class SpiralingDuelist extends CardImpl { // Metalcraft — Spiraling Duelist has double strike as long as you control three or more artifacts. ContinuousEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, effectText)) + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, effectText)) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SpireSerpent.java b/Mage.Sets/src/mage/cards/s/SpireSerpent.java index 81c34fc7a1a..ba4d62dedd4 100644 --- a/Mage.Sets/src/mage/cards/s/SpireSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SpireSerpent.java @@ -36,7 +36,7 @@ public final class SpireSerpent extends CardImpl { // Metalcraft — As long as you control three or more artifacts, Spire Serpent gets +2/+2 and can attack as though it didn’t have defender. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), MetalcraftCondition.instance, abilityText1); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); Effect effect = new ConditionalAsThoughEffect(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), MetalcraftCondition.instance); effect.setText("and can attack as though it didn't have defender"); diff --git a/Mage.Sets/src/mage/cards/s/SpireWinder.java b/Mage.Sets/src/mage/cards/s/SpireWinder.java index 86c403a93e4..d4a47c2f619 100644 --- a/Mage.Sets/src/mage/cards/s/SpireWinder.java +++ b/Mage.Sets/src/mage/cards/s/SpireWinder.java @@ -41,7 +41,7 @@ public final class SpireWinder extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} gets +1/+1 as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); + Ability ability = new SimpleStaticAbility(effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Spirespine.java b/Mage.Sets/src/mage/cards/s/Spirespine.java index d5b25e82436..6d218f242ac 100644 --- a/Mage.Sets/src/mage/cards/s/Spirespine.java +++ b/Mage.Sets/src/mage/cards/s/Spirespine.java @@ -34,11 +34,11 @@ public final class Spirespine extends CardImpl { // Bestow 4G (If you cast this card for its bestow cost, it's an Aura spell with enchant creature. It becomes a creature again if it's not attached to a creature.) this.addAbility(new BestowAbility(this, "{4}{G}")); // Spirespine blocks each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); // Enchanted creature gets +4/+1 and blocks each combat if able. Effect effect = new BoostEnchantedEffect(4, 1, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +4/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new BlocksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and blocks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java b/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java index b3431e2c210..b567c3cacbf 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java @@ -34,7 +34,7 @@ public final class SpiritOfResistance extends CardImpl { new PreventDamageToControllerEffect(Duration.WhileOnBattlefield), SpiritOfResistanceCondition.instance); effect.setText("As long as you control a permanent of each color, prevent all damage that would be dealt to you."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private SpiritOfResistance(final SpiritOfResistance card) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfTheHearth.java b/Mage.Sets/src/mage/cards/s/SpiritOfTheHearth.java index 4c083046d28..ef4f5848d70 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfTheHearth.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfTheHearth.java @@ -32,7 +32,7 @@ public final class SpiritOfTheHearth extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfTheLabyrinth.java b/Mage.Sets/src/mage/cards/s/SpiritOfTheLabyrinth.java index 7e8013f638e..254f45f99d1 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfTheLabyrinth.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfTheLabyrinth.java @@ -31,7 +31,7 @@ public final class SpiritOfTheLabyrinth extends CardImpl { this.toughness = new MageInt(1); // Each player can't draw more than one card each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpiritOfTheLabyrinthEffect()), new SpiritOfTheLabyrinthWatcher()); + this.addAbility(new SimpleStaticAbility(new SpiritOfTheLabyrinthEffect()), new SpiritOfTheLabyrinthWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java b/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java index 9bc2ca90446..b7c26c11df8 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java @@ -44,7 +44,7 @@ public final class SpiritOfTheNight extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // Spirit of the Night has first strike as long as it's attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); } private SpiritOfTheNight(final SpiritOfTheNight card) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java b/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java index 26b7b79734e..a3aeb8de514 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java +++ b/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java @@ -36,7 +36,7 @@ public final class SpiritualAsylum extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); // Creatures and lands you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter))); // When a creature you control attacks, sacrifice Spiritual Asylum. diff --git a/Mage.Sets/src/mage/cards/s/SpitefulMotives.java b/Mage.Sets/src/mage/cards/s/SpitefulMotives.java index dd8bee4a958..c61a5078b4c 100644 --- a/Mage.Sets/src/mage/cards/s/SpitefulMotives.java +++ b/Mage.Sets/src/mage/cards/s/SpitefulMotives.java @@ -43,7 +43,7 @@ public final class SpitefulMotives extends CardImpl { // Enchanted creature gets +3/+0 and has first strike. Effect effect = new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +3/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SpitefulReturned.java b/Mage.Sets/src/mage/cards/s/SpitefulReturned.java index 5746130b21d..b29cb1cddb7 100644 --- a/Mage.Sets/src/mage/cards/s/SpitefulReturned.java +++ b/Mage.Sets/src/mage/cards/s/SpitefulReturned.java @@ -40,7 +40,7 @@ public final class SpitefulReturned extends CardImpl { effect.setText("defending player loses 2 life"); this.addAbility(new SpitefulReturnedTriggeredAbility(effect)); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); } private SpitefulReturned(final SpitefulReturned card) { diff --git a/Mage.Sets/src/mage/cards/s/SpitfireHandler.java b/Mage.Sets/src/mage/cards/s/SpitfireHandler.java index f16a8e0ff3f..1b3c11cfcdf 100644 --- a/Mage.Sets/src/mage/cards/s/SpitfireHandler.java +++ b/Mage.Sets/src/mage/cards/s/SpitfireHandler.java @@ -28,7 +28,7 @@ public final class SpitfireHandler extends CardImpl { this.toughness = new MageInt(1); // Spitfire Handler can't block creatures with power greater than Spitfire Handler's power. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpitfireHandlerCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new SpitfireHandlerCantBlockEffect())); // {R}: Spitfire Handler gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); diff --git a/Mage.Sets/src/mage/cards/s/SplinterTwin.java b/Mage.Sets/src/mage/cards/s/SplinterTwin.java index 1f6b38e7709..af0df452683 100644 --- a/Mage.Sets/src/mage/cards/s/SplinterTwin.java +++ b/Mage.Sets/src/mage/cards/s/SplinterTwin.java @@ -45,7 +45,7 @@ public final class SplinterTwin extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: Create a token that's a copy of this creature, except it has haste. Exile it at the beginning of the next end step." SimpleActivatedAbility gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SplinterTwinEffect(), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } private SplinterTwin(final SplinterTwin card) { diff --git a/Mage.Sets/src/mage/cards/s/SporecrownThallid.java b/Mage.Sets/src/mage/cards/s/SporecrownThallid.java index 0eb07abab3d..8714756dacc 100644 --- a/Mage.Sets/src/mage/cards/s/SporecrownThallid.java +++ b/Mage.Sets/src/mage/cards/s/SporecrownThallid.java @@ -38,7 +38,7 @@ public final class SporecrownThallid extends CardImpl { // Each other creature you control that's a Fungus or Saproling gets +1/+1. this.addAbility( - new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true) + new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true) .setText("Each other creature you control that's a Fungus or Saproling gets +1/+1")) ); } diff --git a/Mage.Sets/src/mage/cards/s/SporolothAncient.java b/Mage.Sets/src/mage/cards/s/SporolothAncient.java index 7fe20e02e06..9c833fd1166 100644 --- a/Mage.Sets/src/mage/cards/s/SporolothAncient.java +++ b/Mage.Sets/src/mage/cards/s/SporolothAncient.java @@ -43,7 +43,7 @@ public final class SporolothAncient extends CardImpl { new FilterCreaturePermanent("Creatures you control") ); effect.setText("Creatures you control have \"Remove two spore counters from this creature: Create a 1/1 green Saproling creature token.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private SporolothAncient(final SporolothAncient card) { diff --git a/Mage.Sets/src/mage/cards/s/SpreadingSeas.java b/Mage.Sets/src/mage/cards/s/SpreadingSeas.java index 2be0086a1c4..c94609ebdaa 100644 --- a/Mage.Sets/src/mage/cards/s/SpreadingSeas.java +++ b/Mage.Sets/src/mage/cards/s/SpreadingSeas.java @@ -45,7 +45,7 @@ public final class SpreadingSeas extends CardImpl { // Enchanted land is an Island. ContinuousEffect effect = new BecomesBasicLandEnchantedEffect(SubType.ISLAND); effect.addDependencyType(DependencyType.BecomeIsland); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java b/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java index de32385da3a..53d30176a07 100644 --- a/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java @@ -37,7 +37,7 @@ public final class SqueesEmbrace extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // When enchanted creature dies, return that card to its owner's hand. this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/s/SquiresDevotion.java b/Mage.Sets/src/mage/cards/s/SquiresDevotion.java index 61e5aaced72..47274e3f6f6 100644 --- a/Mage.Sets/src/mage/cards/s/SquiresDevotion.java +++ b/Mage.Sets/src/mage/cards/s/SquiresDevotion.java @@ -43,7 +43,7 @@ public final class SquiresDevotion extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has lifelink. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA); effect.setText("and has lifelink"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SquirrelNest.java b/Mage.Sets/src/mage/cards/s/SquirrelNest.java index ba45007c77c..905425f11cf 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelNest.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelNest.java @@ -42,7 +42,7 @@ public final class SquirrelNest extends CardImpl { // Enchanted land has "{tap}: Create a 1/1 green Squirrel creature token." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken()), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Create a 1/1 green Squirrel creature token.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SquirrelPoweredScheme.java b/Mage.Sets/src/mage/cards/s/SquirrelPoweredScheme.java index 07768dcb557..37da9a8e114 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelPoweredScheme.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelPoweredScheme.java @@ -21,7 +21,7 @@ public final class SquirrelPoweredScheme extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // Increase the result of each die you roll by 2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SquirrelPoweredSchemeEffect())); + this.addAbility(new SimpleStaticAbility(new SquirrelPoweredSchemeEffect())); } private SquirrelPoweredScheme(final SquirrelPoweredScheme card) { diff --git a/Mage.Sets/src/mage/cards/s/StabWound.java b/Mage.Sets/src/mage/cards/s/StabWound.java index 658bfda5ee6..4bebee79f35 100644 --- a/Mage.Sets/src/mage/cards/s/StabWound.java +++ b/Mage.Sets/src/mage/cards/s/StabWound.java @@ -42,7 +42,7 @@ public final class StabWound extends CardImpl { this.addAbility(ability); // Enchanted creature gets -2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2,-2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2,-2, Duration.WhileOnBattlefield))); // At the beginning of the upkeep of enchanted creature's controller, that player loses 2 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new LoseLifeTargetEffect(2), false)); diff --git a/Mage.Sets/src/mage/cards/s/StaffOfTheAges.java b/Mage.Sets/src/mage/cards/s/StaffOfTheAges.java index e3f94a27d9a..fa2fab8ca41 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfTheAges.java @@ -24,7 +24,7 @@ public final class StaffOfTheAges extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Creatures with landwalk abilities can be blocked as though they didn't have those abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StaffOfTheAgesEffect())); + this.addAbility(new SimpleStaticAbility(new StaffOfTheAgesEffect())); } private StaffOfTheAges(final StaffOfTheAges card) { diff --git a/Mage.Sets/src/mage/cards/s/StalkingTiger.java b/Mage.Sets/src/mage/cards/s/StalkingTiger.java index 4ccced8b6a5..02ae167c4bf 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingTiger.java +++ b/Mage.Sets/src/mage/cards/s/StalkingTiger.java @@ -25,7 +25,7 @@ public final class StalkingTiger extends CardImpl { this.toughness = new MageInt(3); // Stalking Tiger can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private StalkingTiger(final StalkingTiger card) { diff --git a/Mage.Sets/src/mage/cards/s/Stamina.java b/Mage.Sets/src/mage/cards/s/Stamina.java index c4cfc32a417..9b046750f1d 100644 --- a/Mage.Sets/src/mage/cards/s/Stamina.java +++ b/Mage.Sets/src/mage/cards/s/Stamina.java @@ -40,7 +40,7 @@ public final class Stamina extends CardImpl { this.addAbility(ability); // Enchanted creature has vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); // Sacrifice Stamina: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); diff --git a/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java b/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java index 80b0a0c3e62..786e3779807 100644 --- a/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java +++ b/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java @@ -40,7 +40,7 @@ public final class StampedingHorncrest extends CardImpl { // Stampeding Horncrest has haste as long as you control another Dinosaur. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), "{this} has haste as long as you control another Dinosaur"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private StampedingHorncrest(final StampedingHorncrest card) { diff --git a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java index b71641e9ba4..871a49022d8 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java @@ -59,7 +59,7 @@ public final class StarfieldOfNyx extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new StarfieldOfNyxEffect(), new PermanentsOnTheBattlefieldCondition( filterEnchantmentYouControl, ComparisonType.MORE_THAN, 4), rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private StarfieldOfNyx(final StarfieldOfNyx card) { diff --git a/Mage.Sets/src/mage/cards/s/Stasis.java b/Mage.Sets/src/mage/cards/s/Stasis.java index 9fdd1fe5003..3f511bfcb67 100644 --- a/Mage.Sets/src/mage/cards/s/Stasis.java +++ b/Mage.Sets/src/mage/cards/s/Stasis.java @@ -22,7 +22,7 @@ public final class Stasis extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); // Players skip their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipUntapStepEffect())); // At the beginning of your upkeep, sacrifice Stasis unless you pay {U}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{U}")))); diff --git a/Mage.Sets/src/mage/cards/s/StasisCell.java b/Mage.Sets/src/mage/cards/s/StasisCell.java index 73da358ddcc..7fd85f3d85d 100644 --- a/Mage.Sets/src/mage/cards/s/StasisCell.java +++ b/Mage.Sets/src/mage/cards/s/StasisCell.java @@ -36,7 +36,7 @@ public final class StasisCell extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // {3}{U}: Attach Stasis Cell to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature"), new ManaCostsImpl<>("{3}{U}")); diff --git a/Mage.Sets/src/mage/cards/s/StasisCocoon.java b/Mage.Sets/src/mage/cards/s/StasisCocoon.java index 24b917a0d1b..18d5b186ffa 100644 --- a/Mage.Sets/src/mage/cards/s/StasisCocoon.java +++ b/Mage.Sets/src/mage/cards/s/StasisCocoon.java @@ -38,7 +38,7 @@ public final class StasisCocoon extends CardImpl { // Enchanted artifact can't attack or block, and its activated abilities can't be activated. Effect effect = new CantBlockAttackActivateAttachedEffect(); effect.setText("Enchanted artifact can't attack or block, and its activated abilities can't be activated"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/s/Statecraft.java b/Mage.Sets/src/mage/cards/s/Statecraft.java index 5689cdf7f24..690e0c29ee5 100644 --- a/Mage.Sets/src/mage/cards/s/Statecraft.java +++ b/Mage.Sets/src/mage/cards/s/Statecraft.java @@ -26,7 +26,7 @@ public final class Statecraft extends CardImpl { // Prevent all combat damage that would be dealt to and dealt by creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StatecraftPreventionEffect())); + this.addAbility(new SimpleStaticAbility(new StatecraftPreventionEffect())); } private Statecraft(final Statecraft card) { diff --git a/Mage.Sets/src/mage/cards/s/StaticOrb.java b/Mage.Sets/src/mage/cards/s/StaticOrb.java index f1d0c433e02..f5027681dd5 100644 --- a/Mage.Sets/src/mage/cards/s/StaticOrb.java +++ b/Mage.Sets/src/mage/cards/s/StaticOrb.java @@ -25,7 +25,7 @@ public final class StaticOrb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // As long as Static Orb is untapped, players can't untap more than two permanents during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StaticOrbEffect())); + this.addAbility(new SimpleStaticAbility(new StaticOrbEffect())); } private StaticOrb(final StaticOrb card) { diff --git a/Mage.Sets/src/mage/cards/s/StealArtifact.java b/Mage.Sets/src/mage/cards/s/StealArtifact.java index 6804502f19a..0bdb9d40bf8 100644 --- a/Mage.Sets/src/mage/cards/s/StealArtifact.java +++ b/Mage.Sets/src/mage/cards/s/StealArtifact.java @@ -33,7 +33,7 @@ public final class StealArtifact extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("artifact"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("artifact"))); } private StealArtifact(final StealArtifact card) { diff --git a/Mage.Sets/src/mage/cards/s/StealEnchantment.java b/Mage.Sets/src/mage/cards/s/StealEnchantment.java index a4154a460e7..a6b1c318fbc 100644 --- a/Mage.Sets/src/mage/cards/s/StealEnchantment.java +++ b/Mage.Sets/src/mage/cards/s/StealEnchantment.java @@ -35,7 +35,7 @@ public final class StealEnchantment extends CardImpl { this.addAbility(ability); // You control enchanted enchantment. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("enchantment"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("enchantment"))); } private StealEnchantment(final StealEnchantment card) { diff --git a/Mage.Sets/src/mage/cards/s/SteamFrigate.java b/Mage.Sets/src/mage/cards/s/SteamFrigate.java index 5e251fa8b4c..e45f95f096f 100644 --- a/Mage.Sets/src/mage/cards/s/SteamFrigate.java +++ b/Mage.Sets/src/mage/cards/s/SteamFrigate.java @@ -26,7 +26,7 @@ public final class SteamFrigate extends CardImpl { this.toughness = new MageInt(3); // Steam Frigate can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private SteamFrigate(final SteamFrigate card) { diff --git a/Mage.Sets/src/mage/cards/s/SteelGolem.java b/Mage.Sets/src/mage/cards/s/SteelGolem.java index 175d388842c..fe7808f7a2d 100644 --- a/Mage.Sets/src/mage/cards/s/SteelGolem.java +++ b/Mage.Sets/src/mage/cards/s/SteelGolem.java @@ -27,7 +27,7 @@ public final class SteelGolem extends CardImpl { this.toughness = new MageInt(4); // You can't cast creature spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SteelGolemEffect())); + this.addAbility(new SimpleStaticAbility(new SteelGolemEffect())); } private SteelGolem(final SteelGolem card) { diff --git a/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java b/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java index c6149f5bce5..507f8e36782 100644 --- a/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java +++ b/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java @@ -43,11 +43,11 @@ public final class SteelOfTheGodhead extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is white, it gets +1/+1 and has lifelink. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); whiteAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has lifelink")); this.addAbility(whiteAbility); // As long as enchanted creature is blue, it gets +1/+1 and can't be blocked. - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); Effect effect = new ConditionalRestrictionEffect(new CantBeBlockedAttachedEffect(AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE)); effect.setText("and can't be blocked"); blueAbility.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java index ade7fd77f9a..8ed2665770b 100644 --- a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java @@ -30,7 +30,7 @@ public final class SteelcladSerpent extends CardImpl { this.toughness = new MageInt(5); // Steelclad Serpent can't attack unless you control another artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SteelcladSerpentEffect())); + this.addAbility(new SimpleStaticAbility(new SteelcladSerpentEffect())); } private SteelcladSerpent(final SteelcladSerpent card) { @@ -78,4 +78,4 @@ class SteelcladSerpentEffect extends RestrictionEffect { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SteelyResolve.java b/Mage.Sets/src/mage/cards/s/SteelyResolve.java index 4337ded3054..73329a6c4d2 100644 --- a/Mage.Sets/src/mage/cards/s/SteelyResolve.java +++ b/Mage.Sets/src/mage/cards/s/SteelyResolve.java @@ -28,7 +28,7 @@ public final class SteelyResolve extends CardImpl { // As Steely Resolve enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.AddAbility))); // Creatures of the chosen type have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterSteelyResolve()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterSteelyResolve()))); } private SteelyResolve(final SteelyResolve card) { diff --git a/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java b/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java index 5a5e0514df7..4e96c615e0a 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java +++ b/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java @@ -43,7 +43,7 @@ public final class StensiaMasquerade extends CardImpl { // Attacking creatures you control have first strike. Effect effect = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("Attacking creatures you control have first strike"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever a Vampire you control deals combat damage to a player, put a +1/+1 counter on it. this.addAbility(new StensiaMasqueradeTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/s/SterlingGrove.java b/Mage.Sets/src/mage/cards/s/SterlingGrove.java index 9a5c13da6c9..bc40b994165 100644 --- a/Mage.Sets/src/mage/cards/s/SterlingGrove.java +++ b/Mage.Sets/src/mage/cards/s/SterlingGrove.java @@ -29,7 +29,7 @@ public final class SterlingGrove extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}{W}"); // Other enchantments you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterEnchantmentPermanent("enchantments"), true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterEnchantmentPermanent("enchantments"), true))); // {1}, Sacrifice Sterling Grove: Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(new FilterEnchantmentCard("enchantment card")), true), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/s/SternMentor.java b/Mage.Sets/src/mage/cards/s/SternMentor.java index 44d850d5eb7..616b2289999 100644 --- a/Mage.Sets/src/mage/cards/s/SternMentor.java +++ b/Mage.Sets/src/mage/cards/s/SternMentor.java @@ -39,7 +39,7 @@ public final class SternMentor extends CardImpl { // As long as Stern Mentor is paired with another creature, each of those creatures has "{T}: Target player puts the top two cards of their library into their graveyard." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private SternMentor(final SternMentor card) { diff --git a/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java b/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java index 26bfaadee4a..6143363dcf6 100644 --- a/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java +++ b/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java @@ -33,7 +33,7 @@ public final class StinkdrinkerDaredevil extends CardImpl { this.toughness = new MageInt(3); // Giant spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2))); } private StinkdrinkerDaredevil(final StinkdrinkerDaredevil card) { diff --git a/Mage.Sets/src/mage/cards/s/StitchersGraft.java b/Mage.Sets/src/mage/cards/s/StitchersGraft.java index d79115410c0..e0f40185e0a 100644 --- a/Mage.Sets/src/mage/cards/s/StitchersGraft.java +++ b/Mage.Sets/src/mage/cards/s/StitchersGraft.java @@ -34,7 +34,7 @@ public final class StitchersGraft extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 3))); // Whenever equipped creature attacks, it doesn't untap during its controller's next untap step. this.addAbility(new StitchersGraftTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/s/StoicAngel.java b/Mage.Sets/src/mage/cards/s/StoicAngel.java index 8f07538efa1..0a89c23a377 100644 --- a/Mage.Sets/src/mage/cards/s/StoicAngel.java +++ b/Mage.Sets/src/mage/cards/s/StoicAngel.java @@ -35,7 +35,7 @@ public final class StoicAngel extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Players can't untap more than one creature during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StoicAngelEffect())); + this.addAbility(new SimpleStaticAbility(new StoicAngelEffect())); } private StoicAngel(final StoicAngel card) { diff --git a/Mage.Sets/src/mage/cards/s/StoneCalendar.java b/Mage.Sets/src/mage/cards/s/StoneCalendar.java index ad60d653056..65d20822bbd 100644 --- a/Mage.Sets/src/mage/cards/s/StoneCalendar.java +++ b/Mage.Sets/src/mage/cards/s/StoneCalendar.java @@ -20,7 +20,7 @@ public final class StoneCalendar extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // Spells you cast cost up to {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterCard("spells"), 1, true))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterCard("spells"), 1, true))); } diff --git a/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java b/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java index 86c1cb2aa13..5f156d58ec2 100644 --- a/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java +++ b/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java @@ -38,7 +38,7 @@ public final class StoneHavenOutfitter extends CardImpl { this.toughness = new MageInt(2); // Equipped creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // Whenever an equipped creature you control dies, draw a card. this.addAbility(new DiesCreatureTriggeredAbility(new DrawCardSourceControllerEffect(1), false, filter) diff --git a/Mage.Sets/src/mage/cards/s/StoneforgeMasterwork.java b/Mage.Sets/src/mage/cards/s/StoneforgeMasterwork.java index 33e8b60cc85..d0cc3da9fa1 100644 --- a/Mage.Sets/src/mage/cards/s/StoneforgeMasterwork.java +++ b/Mage.Sets/src/mage/cards/s/StoneforgeMasterwork.java @@ -33,7 +33,7 @@ public final class StoneforgeMasterwork extends CardImpl { StoneforgeMasterworkDynamicValue countEnchantments = new StoneforgeMasterworkDynamicValue(); Effect effect = new BoostEquippedEffect(countEnchantments, countEnchantments); effect.setText("Equipped creature gets +1/+1 for each other creature you control that shares a creature type with it"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/s/Stonehands.java b/Mage.Sets/src/mage/cards/s/Stonehands.java index c95515000db..3ccafa57429 100644 --- a/Mage.Sets/src/mage/cards/s/Stonehands.java +++ b/Mage.Sets/src/mage/cards/s/Stonehands.java @@ -38,7 +38,7 @@ public final class Stonehands extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); // {R}: Enchanted creature gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); diff --git a/Mage.Sets/src/mage/cards/s/Stonewright.java b/Mage.Sets/src/mage/cards/s/Stonewright.java index 6cc3f81bf56..60d8c29db32 100644 --- a/Mage.Sets/src/mage/cards/s/Stonewright.java +++ b/Mage.Sets/src/mage/cards/s/Stonewright.java @@ -37,7 +37,7 @@ public final class Stonewright extends CardImpl { // As long as Stonewright is paired with another creature, each of those creatures has "{R}: This creature gets +1/+0 until end of turn." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private Stonewright(final Stonewright card) { diff --git a/Mage.Sets/src/mage/cards/s/StonySilence.java b/Mage.Sets/src/mage/cards/s/StonySilence.java index eb74bd328fd..d7037b5ab11 100644 --- a/Mage.Sets/src/mage/cards/s/StonySilence.java +++ b/Mage.Sets/src/mage/cards/s/StonySilence.java @@ -23,7 +23,7 @@ public final class StonySilence extends CardImpl { // Activated abilities of artifacts can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StonySilenceCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new StonySilenceCantActivateEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java b/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java index 05629e11ca7..dd08e8a3d6c 100644 --- a/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java +++ b/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java @@ -39,7 +39,7 @@ public final class StonybrookBanneret extends CardImpl { this.addAbility(new IslandwalkAbility()); // Merfolk spells and Wizard spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private StonybrookBanneret(final StonybrookBanneret card) { diff --git a/Mage.Sets/src/mage/cards/s/StormCauldron.java b/Mage.Sets/src/mage/cards/s/StormCauldron.java index 85719888951..07633eaeb62 100644 --- a/Mage.Sets/src/mage/cards/s/StormCauldron.java +++ b/Mage.Sets/src/mage/cards/s/StormCauldron.java @@ -22,7 +22,7 @@ public final class StormCauldron extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // Each player may play an additional land during each of their turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsAllEffect())); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsAllEffect())); // Whenever a land is tapped for mana, return it to its owner's hand. this.addAbility(new TapForManaAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java b/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java index ddf28871ec1..38673193ccf 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetSwashbuckler.java @@ -39,7 +39,7 @@ public final class StormFleetSwashbuckler extends CardImpl { ContinuousEffect boostSource = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} has double strike as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); + Ability ability = new SimpleStaticAbility(effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StormriderRig.java b/Mage.Sets/src/mage/cards/s/StormriderRig.java index 5b35f6496db..7ffebb8027d 100644 --- a/Mage.Sets/src/mage/cards/s/StormriderRig.java +++ b/Mage.Sets/src/mage/cards/s/StormriderRig.java @@ -27,7 +27,7 @@ public final class StormriderRig extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Whenever a creature you control enters, you may attach Stormrider Rig to it. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/StormscapeFamiliar.java b/Mage.Sets/src/mage/cards/s/StormscapeFamiliar.java index adb07f14d78..9a395a60441 100644 --- a/Mage.Sets/src/mage/cards/s/StormscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/s/StormscapeFamiliar.java @@ -40,7 +40,7 @@ public final class StormscapeFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // White spells and black spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private StormscapeFamiliar(final StormscapeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java b/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java index b83601b25b7..f4bc4494ea1 100644 --- a/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java +++ b/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java @@ -36,10 +36,10 @@ public final class StrangeAugmentation extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1))); // Delirium &mdash Enchanted creature gets an additional +2/+2 as long as there are four or more card types among cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 2), DeliriumCondition.instance, + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 2), DeliriumCondition.instance, "Delirium — Enchanted creature gets an additional +2/+2 as long as there are four or more card types among cards in your graveyard.")) .addHint(CardTypesInGraveyardHint.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/Stranglehold.java b/Mage.Sets/src/mage/cards/s/Stranglehold.java index f0d42ce4821..440f2f93c6e 100644 --- a/Mage.Sets/src/mage/cards/s/Stranglehold.java +++ b/Mage.Sets/src/mage/cards/s/Stranglehold.java @@ -27,7 +27,7 @@ public final class Stranglehold extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); // Your opponents can't search libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpponentsCantSearchLibrariesEffect())); + this.addAbility(new SimpleStaticAbility(new OpponentsCantSearchLibrariesEffect())); // If an opponent would begin an extra turn, that player skips that turn instead. this.addAbility(new SkipExtraTurnsAbility(true)); diff --git a/Mage.Sets/src/mage/cards/s/StrataScythe.java b/Mage.Sets/src/mage/cards/s/StrataScythe.java index 6dd075e6d01..af8bac9abc9 100644 --- a/Mage.Sets/src/mage/cards/s/StrataScythe.java +++ b/Mage.Sets/src/mage/cards/s/StrataScythe.java @@ -37,7 +37,7 @@ public final class StrataScythe extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new StrataScytheImprintEffect()).setAbilityWord(AbilityWord.IMPRINT)); // Equipped creature gets +1/+1 for each land on the battlefield with the same name as the exiled card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(SameNameAsExiledCountValue.getInstance(), SameNameAsExiledCountValue.getInstance()))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(SameNameAsExiledCountValue.getInstance(), SameNameAsExiledCountValue.getInstance()))); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), false)); diff --git a/Mage.Sets/src/mage/cards/s/StratusWalk.java b/Mage.Sets/src/mage/cards/s/StratusWalk.java index e455bb5dd7d..234a4e95848 100644 --- a/Mage.Sets/src/mage/cards/s/StratusWalk.java +++ b/Mage.Sets/src/mage/cards/s/StratusWalk.java @@ -42,9 +42,9 @@ public final class StratusWalk extends CardImpl { // When Stratus Walk enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // Enchanted creature can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockOnlyFlyingAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CanBlockOnlyFlyingAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/s/StreetSavvy.java b/Mage.Sets/src/mage/cards/s/StreetSavvy.java index ed4d24382c7..bf8829a9c38 100644 --- a/Mage.Sets/src/mage/cards/s/StreetSavvy.java +++ b/Mage.Sets/src/mage/cards/s/StreetSavvy.java @@ -35,7 +35,7 @@ public final class StreetSavvy extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+2 and can block creatures with landwalk abilities as though they didn't have those abilities. - SimpleStaticAbility staticAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0 ,2) + SimpleStaticAbility staticAbility = new SimpleStaticAbility(new BoostEnchantedEffect(0 ,2) .setText("Enchanted creature gets +0/+2 and can block creatures with landwalk abilities as though they didn't have those abilities.")); staticAbility.addEffect(new StreetSavvyEffect()); this.addAbility(staticAbility); diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java b/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java index 983f1b24163..e74f4ab980d 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java @@ -41,7 +41,7 @@ public final class StrengthOfIsolation extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2 and has protection from black. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.BLACK), AttachmentType.AURA); effect.setText("and has protection from black"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java b/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java index 0878ce04a0b..959f2eaa524 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java @@ -41,7 +41,7 @@ public final class StrengthOfLunacy extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has protection from white. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.WHITE), AttachmentType.AURA); effect.setText("and has protection from white"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java b/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java index 26310161392..80b7a50837c 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java @@ -37,7 +37,7 @@ public final class StrengthOfUnity extends CardImpl { // Domain - Enchanted creature gets +1/+1 for each basic land type among lands you control. Effect effect = new BoostEnchantedEffect(DomainValue.REGULAR, DomainValue.REGULAR); effect.setText("Domain — Enchanted creature gets +1/+1 for each basic land type among lands you control."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(DomainHint.instance)); + this.addAbility(new SimpleStaticAbility(effect).addHint(DomainHint.instance)); } private StrengthOfUnity(final StrengthOfUnity card) { diff --git a/Mage.Sets/src/mage/cards/s/StrongholdTaskmaster.java b/Mage.Sets/src/mage/cards/s/StrongholdTaskmaster.java index 7d2d317acc0..af5019ec559 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdTaskmaster.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdTaskmaster.java @@ -36,7 +36,7 @@ public final class StrongholdTaskmaster extends CardImpl { this.toughness = new MageInt(3); // Other black creatures get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/s/StupefyingTouch.java b/Mage.Sets/src/mage/cards/s/StupefyingTouch.java index 0b458d25822..e593ee8bd48 100644 --- a/Mage.Sets/src/mage/cards/s/StupefyingTouch.java +++ b/Mage.Sets/src/mage/cards/s/StupefyingTouch.java @@ -37,7 +37,7 @@ public final class StupefyingTouch extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature's activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantActivateAbilitiesAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantActivateAbilitiesAttachedEffect())); } private StupefyingTouch(final StupefyingTouch card) { diff --git a/Mage.Sets/src/mage/cards/s/SulfurElemental.java b/Mage.Sets/src/mage/cards/s/SulfurElemental.java index c66b24e44e2..f8d5586013a 100644 --- a/Mage.Sets/src/mage/cards/s/SulfurElemental.java +++ b/Mage.Sets/src/mage/cards/s/SulfurElemental.java @@ -43,7 +43,7 @@ public final class SulfurElemental extends CardImpl { this.addAbility(FlashAbility.getInstance()); // White creatures get +1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, -1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, -1, Duration.WhileOnBattlefield, filter, false))); } private SulfurElemental(final SulfurElemental card) { diff --git a/Mage.Sets/src/mage/cards/s/SulfuricVapors.java b/Mage.Sets/src/mage/cards/s/SulfuricVapors.java index d099cce75b9..14a56536482 100644 --- a/Mage.Sets/src/mage/cards/s/SulfuricVapors.java +++ b/Mage.Sets/src/mage/cards/s/SulfuricVapors.java @@ -27,7 +27,7 @@ public final class SulfuricVapors extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); // If a red spell would deal damage to a permanent or player, it deals that much damage plus 1 to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SulfuricVaporsEffect())); + this.addAbility(new SimpleStaticAbility(new SulfuricVaporsEffect())); } private SulfuricVapors(final SulfuricVapors card) { diff --git a/Mage.Sets/src/mage/cards/s/SulfuricVortex.java b/Mage.Sets/src/mage/cards/s/SulfuricVortex.java index 0104a61e7b1..caadd18288e 100644 --- a/Mage.Sets/src/mage/cards/s/SulfuricVortex.java +++ b/Mage.Sets/src/mage/cards/s/SulfuricVortex.java @@ -31,7 +31,7 @@ public final class SulfuricVortex extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.EACH_PLAYER, new DamageTargetEffect(2, true, "that player"), false)); // If a player would gain life, that player gains no life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SulfuricVortexReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new SulfuricVortexReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java index 344f4b01cd8..8c8fe881900 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java +++ b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java @@ -49,7 +49,7 @@ public final class SultaiRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has deathtouch as long as you control a green or blue permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/s/SunClasp.java b/Mage.Sets/src/mage/cards/s/SunClasp.java index 8bcb0e72a7f..afb4684b3e0 100644 --- a/Mage.Sets/src/mage/cards/s/SunClasp.java +++ b/Mage.Sets/src/mage/cards/s/SunClasp.java @@ -38,7 +38,7 @@ public final class SunClasp extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); // {W}: Return enchanted creature to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SunClaspReturnEffect(), new ColoredManaCost(ColoredManaSymbol.W))); } diff --git a/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java b/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java index 52b6a2c6852..2cd7306b678 100644 --- a/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java +++ b/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java @@ -31,7 +31,7 @@ public final class SunQuanLordOfWu extends CardImpl { this.toughness = new MageInt(4); // Creatures you control have horsemanship. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HorsemanshipAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HorsemanshipAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/s/Sunbond.java b/Mage.Sets/src/mage/cards/s/Sunbond.java index c90bcac66ae..1beb5143431 100644 --- a/Mage.Sets/src/mage/cards/s/Sunbond.java +++ b/Mage.Sets/src/mage/cards/s/Sunbond.java @@ -43,7 +43,7 @@ public final class Sunbond extends CardImpl { false, true ), AttachmentType.AURA, Duration.WhileOnBattlefield ); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } @@ -55,4 +55,4 @@ public final class Sunbond extends CardImpl { public Sunbond copy() { return new Sunbond(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java b/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java index d60f2ef88b8..2a1f92ba616 100644 --- a/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java +++ b/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java @@ -21,7 +21,7 @@ public final class SunglassesOfUrza extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // You may spend white mana as though it were red mana. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SunglassesOfUrzaManaAsThoughtEffect())); + this.addAbility(new SimpleStaticAbility(new SunglassesOfUrzaManaAsThoughtEffect())); } private SunglassesOfUrza(final SunglassesOfUrza card) { diff --git a/Mage.Sets/src/mage/cards/s/SunkenCity.java b/Mage.Sets/src/mage/cards/s/SunkenCity.java index e1f56ed73ed..020d8bb9967 100644 --- a/Mage.Sets/src/mage/cards/s/SunkenCity.java +++ b/Mage.Sets/src/mage/cards/s/SunkenCity.java @@ -34,7 +34,7 @@ public final class SunkenCity extends CardImpl { // At the beginning of your upkeep, sacrifice Sunken City unless you pay {U}{U}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{U}{U}")))); // Blue creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private SunkenCity(final SunkenCity card) { diff --git a/Mage.Sets/src/mage/cards/s/SunkenField.java b/Mage.Sets/src/mage/cards/s/SunkenField.java index 8c789e2817f..b0633c291c0 100644 --- a/Mage.Sets/src/mage/cards/s/SunkenField.java +++ b/Mage.Sets/src/mage/cards/s/SunkenField.java @@ -44,7 +44,7 @@ public final class SunkenField extends CardImpl { ability.addTarget(new TargetSpell()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Counter target spell unless its controller pays {1}.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private SunkenField(final SunkenField card) { diff --git a/Mage.Sets/src/mage/cards/s/SunscapeFamiliar.java b/Mage.Sets/src/mage/cards/s/SunscapeFamiliar.java index 37bc86511da..9137ba56674 100644 --- a/Mage.Sets/src/mage/cards/s/SunscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/s/SunscapeFamiliar.java @@ -40,7 +40,7 @@ public final class SunscapeFamiliar extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Green spells and blue spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private SunscapeFamiliar(final SunscapeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/s/SunspearShikari.java b/Mage.Sets/src/mage/cards/s/SunspearShikari.java index 682c0aa2e9f..91e4c57869a 100644 --- a/Mage.Sets/src/mage/cards/s/SunspearShikari.java +++ b/Mage.Sets/src/mage/cards/s/SunspearShikari.java @@ -33,7 +33,7 @@ public final class SunspearShikari extends CardImpl { // As long as Sunspear Shikari is equipped, it has first strike and lifelink. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedSourceCondition.instance, "As long as {this} is equipped, it has first strike"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance()), EquippedSourceCondition.instance, "and lifelink"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java index d64b43d1a9d..dc3844a54af 100644 --- a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java +++ b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java @@ -44,7 +44,7 @@ public final class SunstrikeLegionnaire extends CardImpl { this.toughness = new MageInt(2); // Sunstrike Legionnaire doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever another creature enters the battlefield, untap Sunstrike Legionnaire. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), untapFilter, false)); // {tap}: Tap target creature with converted mana cost 3 or less. diff --git a/Mage.Sets/src/mage/cards/s/Sunweb.java b/Mage.Sets/src/mage/cards/s/Sunweb.java index 65e0a52da24..eb048333df1 100644 --- a/Mage.Sets/src/mage/cards/s/Sunweb.java +++ b/Mage.Sets/src/mage/cards/s/Sunweb.java @@ -39,7 +39,7 @@ public final class Sunweb extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sunweb can't block creatures with power 2 or less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } private Sunweb(final Sunweb card) { diff --git a/Mage.Sets/src/mage/cards/s/SuppressionField.java b/Mage.Sets/src/mage/cards/s/SuppressionField.java index 27efad5b4d9..57ed461cc14 100644 --- a/Mage.Sets/src/mage/cards/s/SuppressionField.java +++ b/Mage.Sets/src/mage/cards/s/SuppressionField.java @@ -21,7 +21,7 @@ public final class SuppressionField extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); // Activated abilities cost {2} more to activate unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SuppressionFieldCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new SuppressionFieldCostReductionEffect())); } private SuppressionField(final SuppressionField card) { diff --git a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java index 521b8ec62d6..5e904f668d9 100644 --- a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java +++ b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java @@ -41,7 +41,7 @@ public final class SuqAtaFirewalker extends CardImpl { color.setBlue(true); // Suq'Ata Firewalker can't be the target of red spells or abilities from red sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filterRed, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterRed, Duration.WhileOnBattlefield))); //{T}: Suq'Ata Firewalker deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SurgingMight.java b/Mage.Sets/src/mage/cards/s/SurgingMight.java index 21e815ee2d1..c06af7f4792 100644 --- a/Mage.Sets/src/mage/cards/s/SurgingMight.java +++ b/Mage.Sets/src/mage/cards/s/SurgingMight.java @@ -35,7 +35,7 @@ public final class SurgingMight extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Ripple 4 this.addAbility(new RippleAbility(4)); } diff --git a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java index 40801c736d3..450ba30e121 100644 --- a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java +++ b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java @@ -47,7 +47,7 @@ public final class SurrakDragonclaw extends CardImpl { this.addAbility(new CantBeCounteredSourceAbility()); // Creature spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); // Other creatures you control have trample. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/s/SustainingSpirit.java b/Mage.Sets/src/mage/cards/s/SustainingSpirit.java index 9096dcfe3e9..d37fb241977 100644 --- a/Mage.Sets/src/mage/cards/s/SustainingSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SustainingSpirit.java @@ -33,7 +33,7 @@ public final class SustainingSpirit extends CardImpl { // Cumulative upkeep {1}{W} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}{W}"))); // Damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SustainingSpiritReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new SustainingSpiritReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/SwansOfBrynArgoll.java b/Mage.Sets/src/mage/cards/s/SwansOfBrynArgoll.java index eb9247fcb44..1e8cbc35feb 100644 --- a/Mage.Sets/src/mage/cards/s/SwansOfBrynArgoll.java +++ b/Mage.Sets/src/mage/cards/s/SwansOfBrynArgoll.java @@ -42,7 +42,7 @@ public final class SwansOfBrynArgoll extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If a source would deal damage to Swans of Bryn Argoll, prevent that damage. The source's controller draws cards equal to the damage prevented this way. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SwansOfBrynArgollEffect())); + this.addAbility(new SimpleStaticAbility(new SwansOfBrynArgollEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/Swashbuckling.java b/Mage.Sets/src/mage/cards/s/Swashbuckling.java index e467e6b7d7b..76a1947da9f 100644 --- a/Mage.Sets/src/mage/cards/s/Swashbuckling.java +++ b/Mage.Sets/src/mage/cards/s/Swashbuckling.java @@ -39,7 +39,7 @@ public final class Swashbuckling extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has haste. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA) .setText("and has haste")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SwiftfootBoots.java b/Mage.Sets/src/mage/cards/s/SwiftfootBoots.java index 7ab481d0b60..02adb0445ea 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftfootBoots.java +++ b/Mage.Sets/src/mage/cards/s/SwiftfootBoots.java @@ -29,7 +29,7 @@ public final class SwiftfootBoots extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has hexproof and haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java b/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java index 8a827cdb393..52ceb304a95 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java @@ -51,7 +51,7 @@ public final class SwordOfDungeonsAndDragons extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2 and has protection from Rogues and from Clerics. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 2)); Effect effect = new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.EQUIPMENT); effect.setText("and has protection from Rogues and from Clerics"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java b/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java index b7ae9c47e02..321e3f662ab 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java @@ -27,7 +27,7 @@ public final class SwordOfKaldra extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +5/+5. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5, 5, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(5, 5, Duration.WhileOnBattlefield))); // Whenever equipped creature deals damage to a creature, exile that creature. this.addAbility(new SwordOfKaldraTriggeredAbility()); // Equip {4} diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java b/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java index 7f5ad3bb9e6..933de19a0d8 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java @@ -33,7 +33,7 @@ public final class SwordOfTheAnimist extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Whenever equipped creature attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); this.addAbility(new AttacksAttachedTriggeredAbility(new SearchLibraryPutInPlayEffect(target, true), true)); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheMeek.java b/Mage.Sets/src/mage/cards/s/SwordOfTheMeek.java index db23a117010..92f8ad6f43c 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheMeek.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheMeek.java @@ -37,7 +37,7 @@ public final class SwordOfTheMeek extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 2, Duration.WhileOnBattlefield))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); // Whenever a 1/1 creature you control enters, you may return Sword of the Meek from your graveyard to the battlefield, then attach it to that creature. diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java index 205bd58a0dd..84b69f93865 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java @@ -40,14 +40,14 @@ public final class SwordOfTheParuns extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // As long as equipped creature is tapped, tapped creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(2,0, Duration.WhileOnBattlefield, filterTapped), new CompoundCondition(EquipmentAttachedCondition.instance, AttachedToTappedCondition.TAPPED), "As long as equipped creature is tapped, tapped creatures you control get +2/+0" ))); // As long as equipped creature is untapped, untapped creatures you control get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(0,2, Duration.WhileOnBattlefield, filterUntapped), new CompoundCondition(EquipmentAttachedCondition.instance, AttachedToTappedCondition.UNTAPPED), "As long as equipped creature is untapped, untapped creatures you control get +0/+2" diff --git a/Mage.Sets/src/mage/cards/s/SwordOfVengeance.java b/Mage.Sets/src/mage/cards/s/SwordOfVengeance.java index 38dcfd7c417..728b252b82c 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfVengeance.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfVengeance.java @@ -35,7 +35,7 @@ public final class SwordOfVengeance extends CardImpl { // Equipped creature gets +2/+0 and has first strike, vigilance, trample, and haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 0)); Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SylvanAdvocate.java b/Mage.Sets/src/mage/cards/s/SylvanAdvocate.java index 4b9877fde15..71d731f2bd4 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/SylvanAdvocate.java @@ -49,7 +49,7 @@ public final class SylvanAdvocate extends CardImpl { new PermanentsOnTheBattlefieldCondition(new FilterControlledLandPermanent(), ComparisonType.MORE_THAN, 5), rule1); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true), new PermanentsOnTheBattlefieldCondition(new FilterControlledLandPermanent(), ComparisonType.MORE_THAN, 5), rule2); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(effect2); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SylviaBrightspear.java b/Mage.Sets/src/mage/cards/s/SylviaBrightspear.java index 27c59518cb6..7bea1c93184 100644 --- a/Mage.Sets/src/mage/cards/s/SylviaBrightspear.java +++ b/Mage.Sets/src/mage/cards/s/SylviaBrightspear.java @@ -40,7 +40,7 @@ public final class SylviaBrightspear extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // Dragons your team controls have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private SylviaBrightspear(final SylviaBrightspear card) { diff --git a/Mage.Sets/src/mage/cards/s/SylvokLifestaff.java b/Mage.Sets/src/mage/cards/s/SylvokLifestaff.java index 5b62c5d8f97..43e84a4fce6 100644 --- a/Mage.Sets/src/mage/cards/s/SylvokLifestaff.java +++ b/Mage.Sets/src/mage/cards/s/SylvokLifestaff.java @@ -26,7 +26,7 @@ public final class SylvokLifestaff extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature dies, you gain 3 life. this.addAbility(new DiesAttachedTriggeredAbility(new GainLifeEffect(3), "equipped creature")); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java index 1079be07358..c55c98ab5d6 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java @@ -33,7 +33,7 @@ public final class SymbioticDeployment extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // {1}, Tap two untapped creatures you control: Draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); diff --git a/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java b/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java index 5c555b7b6d1..cdb07835509 100644 --- a/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java +++ b/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java @@ -36,7 +36,7 @@ public final class SzadekLordOfSecrets extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If Szadek, Lord of Secrets would deal combat damage to a player, instead put that many +1/+1 counters on Szadek and that player puts that many cards from the top of their library into their graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SzadekLordOfSecretsEffect())); + this.addAbility(new SimpleStaticAbility(new SzadekLordOfSecretsEffect())); } -- 2.47.2 From 2bedb4a1eea5e16a22f08f965412df373b236f10 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:15:44 -0500 Subject: [PATCH 21/50] refactor: SimpleStaticAbility default zone (cards T) --- Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java | 2 +- Mage.Sets/src/mage/cards/t/TaintedRemedy.java | 2 +- Mage.Sets/src/mage/cards/t/TaintedWell.java | 2 +- Mage.Sets/src/mage/cards/t/TajuruPreserver.java | 2 +- Mage.Sets/src/mage/cards/t/TakePossession.java | 2 +- Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java | 2 +- Mage.Sets/src/mage/cards/t/TalonSliver.java | 2 +- Mage.Sets/src/mage/cards/t/TalruumPiper.java | 2 +- Mage.Sets/src/mage/cards/t/TandemLookout.java | 2 +- Mage.Sets/src/mage/cards/t/TangleKelp.java | 2 +- Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java | 2 +- Mage.Sets/src/mage/cards/t/Tanglewalker.java | 2 +- Mage.Sets/src/mage/cards/t/TasteForMayhem.java | 4 ++-- Mage.Sets/src/mage/cards/t/Tatterkite.java | 2 +- Mage.Sets/src/mage/cards/t/TauntingElf.java | 2 +- Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java | 4 ++-- Mage.Sets/src/mage/cards/t/TeferisCurse.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisMoat.java | 2 +- Mage.Sets/src/mage/cards/t/Tek.java | 2 +- Mage.Sets/src/mage/cards/t/Telepathy.java | 2 +- Mage.Sets/src/mage/cards/t/TemperedSteel.java | 2 +- Mage.Sets/src/mage/cards/t/TempestDjinn.java | 2 +- Mage.Sets/src/mage/cards/t/TempleAltisaur.java | 2 +- Mage.Sets/src/mage/cards/t/TemporalIsolation.java | 4 ++-- Mage.Sets/src/mage/cards/t/TemptingLicid.java | 2 +- Mage.Sets/src/mage/cards/t/TemurAscendancy.java | 2 +- Mage.Sets/src/mage/cards/t/TemurRunemark.java | 2 +- Mage.Sets/src/mage/cards/t/TerentatekCub.java | 2 +- Mage.Sets/src/mage/cards/t/TerritorialDispute.java | 2 +- Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java | 2 +- Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java | 2 +- Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java | 2 +- Mage.Sets/src/mage/cards/t/TezzeretsTouch.java | 2 +- Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThassasEmissary.java | 2 +- Mage.Sets/src/mage/cards/t/TheBrute.java | 2 +- Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java | 2 +- Mage.Sets/src/mage/cards/t/TheEternalWanderer.java | 2 +- Mage.Sets/src/mage/cards/t/TheFallenApart.java | 2 +- Mage.Sets/src/mage/cards/t/TheGitrogMonster.java | 2 +- Mage.Sets/src/mage/cards/t/TheImmortalSun.java | 6 +++--- Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java | 2 +- Mage.Sets/src/mage/cards/t/TheThirdDoctor.java | 2 +- Mage.Sets/src/mage/cards/t/TheUrDragon.java | 2 +- Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java | 2 +- Mage.Sets/src/mage/cards/t/TheloniteHermit.java | 2 +- Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java | 2 +- Mage.Sets/src/mage/cards/t/Thirst.java | 2 +- Mage.Sets/src/mage/cards/t/ThirstingAxe.java | 2 +- Mage.Sets/src/mage/cards/t/ThistledownLiege.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThopterEngineer.java | 2 +- Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java | 2 +- Mage.Sets/src/mage/cards/t/ThornbiteStaff.java | 2 +- Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThoughtReflection.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtVessel.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java | 2 +- Mage.Sets/src/mage/cards/t/ThousandYearElixir.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java | 2 +- Mage.Sets/src/mage/cards/t/ThranGolem.java | 2 +- Mage.Sets/src/mage/cards/t/ThranLens.java | 2 +- Mage.Sets/src/mage/cards/t/ThranPortal.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java | 2 +- Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java | 3 +-- Mage.Sets/src/mage/cards/t/ThrowingKnife.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullChampion.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullRetainer.java | 2 +- Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderblust.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderingSpineback.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderstaff.java | 2 +- Mage.Sets/src/mage/cards/t/TideDrifter.java | 2 +- Mage.Sets/src/mage/cards/t/TigerClaws.java | 2 +- Mage.Sets/src/mage/cards/t/TighteningCoils.java | 2 +- Mage.Sets/src/mage/cards/t/TilonallisCrown.java | 2 +- Mage.Sets/src/mage/cards/t/TimberlineRidge.java | 2 +- Mage.Sets/src/mage/cards/t/TimberpackWolf.java | 6 +----- Mage.Sets/src/mage/cards/t/TimeOfHeroes.java | 2 +- Mage.Sets/src/mage/cards/t/TimeVault.java | 4 ++-- Mage.Sets/src/mage/cards/t/TinStreetMarket.java | 2 +- Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java | 2 +- Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java | 2 +- Mage.Sets/src/mage/cards/t/TitanOfLittjara.java | 4 ++-- Mage.Sets/src/mage/cards/t/TitaniasSong.java | 2 +- Mage.Sets/src/mage/cards/t/TitheTaker.java | 4 ++-- Mage.Sets/src/mage/cards/t/Togglodyte.java | 2 +- Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java | 4 ++-- Mage.Sets/src/mage/cards/t/TorchGauntlet.java | 2 +- Mage.Sets/src/mage/cards/t/Torment.java | 2 +- Mage.Sets/src/mage/cards/t/TormentorsTrident.java | 2 +- Mage.Sets/src/mage/cards/t/TorporDust.java | 2 +- Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java | 2 +- Mage.Sets/src/mage/cards/t/TrainingDrone.java | 2 +- Mage.Sets/src/mage/cards/t/Transcendence.java | 2 +- Mage.Sets/src/mage/cards/t/TravelersCloak.java | 3 +-- Mage.Sets/src/mage/cards/t/TravelingPlague.java | 2 +- Mage.Sets/src/mage/cards/t/TreacherousLink.java | 2 +- Mage.Sets/src/mage/cards/t/Treachery.java | 2 +- Mage.Sets/src/mage/cards/t/Trinisphere.java | 2 +- Mage.Sets/src/mage/cards/t/Trollhide.java | 2 +- Mage.Sets/src/mage/cards/t/Tromokratis.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrooperArmor.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrooperCommando.java | 2 +- Mage.Sets/src/mage/cards/t/TroveOfTemptation.java | 2 +- Mage.Sets/src/mage/cards/t/TrueBeliever.java | 2 +- Mage.Sets/src/mage/cards/t/TrueConviction.java | 2 +- Mage.Sets/src/mage/cards/t/TrueFaithCenser.java | 2 +- Mage.Sets/src/mage/cards/t/TrueheartDuelist.java | 2 +- Mage.Sets/src/mage/cards/t/TrustedForcemage.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrustyMachete.java | 2 +- Mage.Sets/src/mage/cards/t/TsabosWeb.java | 2 +- Mage.Sets/src/mage/cards/t/TwentyToedToad.java | 2 +- Mage.Sets/src/mage/cards/t/TwilekSeductress.java | 2 +- Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java | 2 +- Mage.Sets/src/mage/cards/t/TwistedExperiment.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java | 2 +- 122 files changed, 138 insertions(+), 144 deletions(-) diff --git a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java index 70bf7024231..0dfd4b2c825 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java +++ b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java @@ -51,7 +51,7 @@ public final class TaigamOjutaiMaster extends CardImpl { this.toughness = new MageInt(4); // Instant, sorcery, and Dragon spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filter, null, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filter, null, Duration.WhileOnBattlefield))); // Whenever you cast an instant or sorcery spell from your hand, if Taigam, Ojutai Master attacked this turn, that spell gains rebound. Ability ability = new ConditionalInterveningIfTriggeredAbility(new TaigamOjutaiMasterTriggeredAbility(), diff --git a/Mage.Sets/src/mage/cards/t/TaintedRemedy.java b/Mage.Sets/src/mage/cards/t/TaintedRemedy.java index 685a511c987..e4f09f84b4d 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedRemedy.java +++ b/Mage.Sets/src/mage/cards/t/TaintedRemedy.java @@ -25,7 +25,7 @@ public final class TaintedRemedy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); // If an opponent would gain life, that player loses that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TaintedRemedyReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new TaintedRemedyReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TaintedWell.java b/Mage.Sets/src/mage/cards/t/TaintedWell.java index 61f785d356e..35faa261a22 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedWell.java +++ b/Mage.Sets/src/mage/cards/t/TaintedWell.java @@ -39,7 +39,7 @@ public final class TaintedWell extends CardImpl { // When Tainted Well enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted land is a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); } private TaintedWell(final TaintedWell card) { diff --git a/Mage.Sets/src/mage/cards/t/TajuruPreserver.java b/Mage.Sets/src/mage/cards/t/TajuruPreserver.java index b105bc547e8..02330bed9c0 100644 --- a/Mage.Sets/src/mage/cards/t/TajuruPreserver.java +++ b/Mage.Sets/src/mage/cards/t/TajuruPreserver.java @@ -28,7 +28,7 @@ public final class TajuruPreserver extends CardImpl { this.toughness = new MageInt(1); // Spells and abilities your opponents control can't cause you to sacrifice permanents. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TajuruPreserverEffect())); + this.addAbility(new SimpleStaticAbility(new TajuruPreserverEffect())); } private TajuruPreserver(final TajuruPreserver card) { diff --git a/Mage.Sets/src/mage/cards/t/TakePossession.java b/Mage.Sets/src/mage/cards/t/TakePossession.java index 62c8157e359..842ebdfd454 100644 --- a/Mage.Sets/src/mage/cards/t/TakePossession.java +++ b/Mage.Sets/src/mage/cards/t/TakePossession.java @@ -36,7 +36,7 @@ public final class TakePossession extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); } private TakePossession(final TakePossession card) { diff --git a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java index c18bc5c6394..59606ff5ad4 100644 --- a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java +++ b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java @@ -31,7 +31,7 @@ public final class TakenoSamuraiGeneral extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); // Each other Samurai creature you control gets +1/+1 for each point of bushido it has. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TakenoSamuraiGeneralEffect())); + this.addAbility(new SimpleStaticAbility(new TakenoSamuraiGeneralEffect())); } private TakenoSamuraiGeneral(final TakenoSamuraiGeneral card) { diff --git a/Mage.Sets/src/mage/cards/t/TalonSliver.java b/Mage.Sets/src/mage/cards/t/TalonSliver.java index e5d8b0ddca4..0f88f5db66d 100644 --- a/Mage.Sets/src/mage/cards/t/TalonSliver.java +++ b/Mage.Sets/src/mage/cards/t/TalonSliver.java @@ -31,7 +31,7 @@ public final class TalonSliver extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private TalonSliver(final TalonSliver card) { diff --git a/Mage.Sets/src/mage/cards/t/TalruumPiper.java b/Mage.Sets/src/mage/cards/t/TalruumPiper.java index 12d833523d4..99b855258ea 100644 --- a/Mage.Sets/src/mage/cards/t/TalruumPiper.java +++ b/Mage.Sets/src/mage/cards/t/TalruumPiper.java @@ -34,7 +34,7 @@ public final class TalruumPiper extends CardImpl { this.toughness = new MageInt(3); // All creatures with flying able to block Talruum Piper do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield, filter))); } private TalruumPiper(final TalruumPiper card) { diff --git a/Mage.Sets/src/mage/cards/t/TandemLookout.java b/Mage.Sets/src/mage/cards/t/TandemLookout.java index 3fb2a738459..e02b5aa1819 100644 --- a/Mage.Sets/src/mage/cards/t/TandemLookout.java +++ b/Mage.Sets/src/mage/cards/t/TandemLookout.java @@ -35,7 +35,7 @@ public final class TandemLookout extends CardImpl { // As long as Tandem Lookout is paired with another creature, each of those creatures has "Whenever this creature deals damage to an opponent, draw a card." Ability ability = new DealsDamageToOpponentTriggeredAbility(new DrawCardSourceControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private TandemLookout(final TandemLookout card) { diff --git a/Mage.Sets/src/mage/cards/t/TangleKelp.java b/Mage.Sets/src/mage/cards/t/TangleKelp.java index cd2d0597a18..978c146938d 100644 --- a/Mage.Sets/src/mage/cards/t/TangleKelp.java +++ b/Mage.Sets/src/mage/cards/t/TangleKelp.java @@ -48,7 +48,7 @@ public final class TangleKelp extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step if it attacked during its controller's last turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapIfAttackedLastTurnEnchantedEffect()), new AttackedLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new DontUntapIfAttackedLastTurnEnchantedEffect()), new AttackedLastTurnWatcher()); } private TangleKelp(final TangleKelp card) { diff --git a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java index 5ddfe0c12bc..7ac373df9d8 100644 --- a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java +++ b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java @@ -32,7 +32,7 @@ public final class TangleclawWerewolf extends CardImpl { this.secondSideCardClazz = mage.cards.f.FibrousEntangler.class; // Tangleclaw Werewolf can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); // {6}{G}: Transform Tangleclaw Werewolf. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/t/Tanglewalker.java b/Mage.Sets/src/mage/cards/t/Tanglewalker.java index 0a2cf0622f5..7bf18e717e5 100644 --- a/Mage.Sets/src/mage/cards/t/Tanglewalker.java +++ b/Mage.Sets/src/mage/cards/t/Tanglewalker.java @@ -42,7 +42,7 @@ public final class Tanglewalker extends CardImpl { new CantBeBlockedAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURES, Duration.WhileOnBattlefield), new DefendingPlayerControlsSourceAttackingCondition(filter)); effect.setText("Each creature you control can't be blocked as long as defending player controls an artifact land"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Tanglewalker(final Tanglewalker card) { diff --git a/Mage.Sets/src/mage/cards/t/TasteForMayhem.java b/Mage.Sets/src/mage/cards/t/TasteForMayhem.java index 3a9e6486aad..f69e6ead765 100644 --- a/Mage.Sets/src/mage/cards/t/TasteForMayhem.java +++ b/Mage.Sets/src/mage/cards/t/TasteForMayhem.java @@ -36,10 +36,10 @@ public final class TasteForMayhem extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // Hellbent - Enchanted creature gets an additional +2/+0 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 0), HellbentCondition.instance, "Hellbent — Enchanted creature gets an additional +2/+0 as long as you have no cards in hand"))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 0), HellbentCondition.instance, "Hellbent — Enchanted creature gets an additional +2/+0 as long as you have no cards in hand"))); } private TasteForMayhem(final TasteForMayhem card) { diff --git a/Mage.Sets/src/mage/cards/t/Tatterkite.java b/Mage.Sets/src/mage/cards/t/Tatterkite.java index 0d8406dd797..88845ec0d43 100644 --- a/Mage.Sets/src/mage/cards/t/Tatterkite.java +++ b/Mage.Sets/src/mage/cards/t/Tatterkite.java @@ -28,7 +28,7 @@ public final class Tatterkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Tatterkite can't have counters put on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantHaveCountersSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantHaveCountersSourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TauntingElf.java b/Mage.Sets/src/mage/cards/t/TauntingElf.java index 1932f585174..aeeab24db79 100644 --- a/Mage.Sets/src/mage/cards/t/TauntingElf.java +++ b/Mage.Sets/src/mage/cards/t/TauntingElf.java @@ -25,7 +25,7 @@ public final class TauntingElf extends CardImpl { this.toughness = new MageInt(1); // All creatures able to block Taunting Elf do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); } private TauntingElf(final TauntingElf card) { diff --git a/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java b/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java index cc1034d57d2..283a6df888f 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java +++ b/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java @@ -35,10 +35,10 @@ public final class TeferiMageOfZhalfir extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Creature cards you own that aren't on the battlefield have flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TeferiMageOfZhalfirAddFlashEffect())); + this.addAbility(new SimpleStaticAbility(new TeferiMageOfZhalfirAddFlashEffect())); // Each opponent can cast spells only any time they could cast a sorcery. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TeferiMageOfZhalfirReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new TeferiMageOfZhalfirReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TeferisCurse.java b/Mage.Sets/src/mage/cards/t/TeferisCurse.java index 6d98831b557..d887dc5aeef 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisCurse.java +++ b/Mage.Sets/src/mage/cards/t/TeferisCurse.java @@ -32,7 +32,7 @@ public final class TeferisCurse extends CardImpl { this.addAbility(ability); // Enchanted permanent has phasing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(PhasingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, null, "permanent"))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(PhasingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, null, "permanent"))); } private TeferisCurse(final TeferisCurse card) { diff --git a/Mage.Sets/src/mage/cards/t/TeferisMoat.java b/Mage.Sets/src/mage/cards/t/TeferisMoat.java index d1b1d19b238..e672d2ab4ec 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisMoat.java +++ b/Mage.Sets/src/mage/cards/t/TeferisMoat.java @@ -30,7 +30,7 @@ public final class TeferisMoat extends CardImpl { // As Teferi's Moat enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); // Creatures of the chosen color without flying can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TeferisMoatRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new TeferisMoatRestrictionEffect())); } private TeferisMoat(final TeferisMoat card) { diff --git a/Mage.Sets/src/mage/cards/t/Tek.java b/Mage.Sets/src/mage/cards/t/Tek.java index 4df8f731c51..41e8ecae5da 100644 --- a/Mage.Sets/src/mage/cards/t/Tek.java +++ b/Mage.Sets/src/mage/cards/t/Tek.java @@ -49,7 +49,7 @@ public final class Tek extends CardImpl { this.toughness = new MageInt(2); // Tek gets +0/+2 as long as you control a Plains, has flying as long as you control an Island, gets +2/+0 as long as you control a Swamp, has first strike as long as you control a Mountain, and has trample as long as you control a Forest. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(0, 2, Duration.WhileOnBattlefield), + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostSourceEffect(0, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filterPlains), "{this} gets +0/+2 as long as you control a Plains")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filterIsland), ", has flying as long as you control an Island")); diff --git a/Mage.Sets/src/mage/cards/t/Telepathy.java b/Mage.Sets/src/mage/cards/t/Telepathy.java index ccdc693c08d..784b8f50b95 100644 --- a/Mage.Sets/src/mage/cards/t/Telepathy.java +++ b/Mage.Sets/src/mage/cards/t/Telepathy.java @@ -20,7 +20,7 @@ public final class Telepathy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); // Your opponents play with their hands revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithHandRevealedEffect(TargetController.OPPONENT))); + this.addAbility(new SimpleStaticAbility(new PlayWithHandRevealedEffect(TargetController.OPPONENT))); } private Telepathy(final Telepathy card) { diff --git a/Mage.Sets/src/mage/cards/t/TemperedSteel.java b/Mage.Sets/src/mage/cards/t/TemperedSteel.java index e3be048a1fc..f93d66e68cd 100644 --- a/Mage.Sets/src/mage/cards/t/TemperedSteel.java +++ b/Mage.Sets/src/mage/cards/t/TemperedSteel.java @@ -26,7 +26,7 @@ public final class TemperedSteel extends CardImpl { public TemperedSteel (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } private TemperedSteel(final TemperedSteel card) { diff --git a/Mage.Sets/src/mage/cards/t/TempestDjinn.java b/Mage.Sets/src/mage/cards/t/TempestDjinn.java index 6d7b6800bdb..3671435ca72 100644 --- a/Mage.Sets/src/mage/cards/t/TempestDjinn.java +++ b/Mage.Sets/src/mage/cards/t/TempestDjinn.java @@ -42,7 +42,7 @@ public final class TempestDjinn extends CardImpl { // Tempest Djinn gets +1/+0 for each basic Island you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); } private TempestDjinn(final TempestDjinn card) { diff --git a/Mage.Sets/src/mage/cards/t/TempleAltisaur.java b/Mage.Sets/src/mage/cards/t/TempleAltisaur.java index a4519b6b46a..bf43fdce9d6 100644 --- a/Mage.Sets/src/mage/cards/t/TempleAltisaur.java +++ b/Mage.Sets/src/mage/cards/t/TempleAltisaur.java @@ -30,7 +30,7 @@ public final class TempleAltisaur extends CardImpl { this.toughness = new MageInt(4); // If a source would deal damage to another Dinosaur you control, prevent all but 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TempleAltisaurPreventEffect())); + this.addAbility(new SimpleStaticAbility(new TempleAltisaurPreventEffect())); } private TempleAltisaur(final TempleAltisaur card) { diff --git a/Mage.Sets/src/mage/cards/t/TemporalIsolation.java b/Mage.Sets/src/mage/cards/t/TemporalIsolation.java index 612c5431479..038f53f86ee 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalIsolation.java +++ b/Mage.Sets/src/mage/cards/t/TemporalIsolation.java @@ -40,9 +40,9 @@ public final class TemporalIsolation extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shadow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShadowAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShadowAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // Prevent all damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); } private TemporalIsolation(final TemporalIsolation card) { diff --git a/Mage.Sets/src/mage/cards/t/TemptingLicid.java b/Mage.Sets/src/mage/cards/t/TemptingLicid.java index 70dd120d0e8..ca6607b2fa5 100644 --- a/Mage.Sets/src/mage/cards/t/TemptingLicid.java +++ b/Mage.Sets/src/mage/cards/t/TemptingLicid.java @@ -31,7 +31,7 @@ public final class TemptingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.G), new ColoredManaCost(ColoredManaSymbol.G))); // All creatures able to block enchanted creature do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); } private TemptingLicid(final TemptingLicid card) { diff --git a/Mage.Sets/src/mage/cards/t/TemurAscendancy.java b/Mage.Sets/src/mage/cards/t/TemurAscendancy.java index 12057bcd39c..266e0613e78 100644 --- a/Mage.Sets/src/mage/cards/t/TemurAscendancy.java +++ b/Mage.Sets/src/mage/cards/t/TemurAscendancy.java @@ -33,7 +33,7 @@ public final class TemurAscendancy extends CardImpl { // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); // Whenever a creature with power 4 or greater you control enters, you may draw a card. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), filter, true)); diff --git a/Mage.Sets/src/mage/cards/t/TemurRunemark.java b/Mage.Sets/src/mage/cards/t/TemurRunemark.java index e9ae4697ff7..8a357973e2c 100644 --- a/Mage.Sets/src/mage/cards/t/TemurRunemark.java +++ b/Mage.Sets/src/mage/cards/t/TemurRunemark.java @@ -49,7 +49,7 @@ public final class TemurRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has trample as long as you control a blue or red permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/t/TerentatekCub.java b/Mage.Sets/src/mage/cards/t/TerentatekCub.java index 7b71719c3ca..945532f6d07 100644 --- a/Mage.Sets/src/mage/cards/t/TerentatekCub.java +++ b/Mage.Sets/src/mage/cards/t/TerentatekCub.java @@ -38,7 +38,7 @@ public final class TerentatekCub extends CardImpl { this.toughness = new MageInt(2); // As long as an opponent controls a Jedi or Sith, {this} gets +1/+1 and attacks each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "As long as an opponent controls a Jedi or Sith, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/t/TerritorialDispute.java b/Mage.Sets/src/mage/cards/t/TerritorialDispute.java index 86b472d109d..eff906fcff1 100644 --- a/Mage.Sets/src/mage/cards/t/TerritorialDispute.java +++ b/Mage.Sets/src/mage/cards/t/TerritorialDispute.java @@ -33,7 +33,7 @@ public final class TerritorialDispute extends CardImpl { )); // Players can't play lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TerritorialDisputeEffect())); + this.addAbility(new SimpleStaticAbility(new TerritorialDisputeEffect())); } private TerritorialDispute(final TerritorialDispute card) { diff --git a/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java b/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java index 6ad18b41d9c..cc818c9ecf9 100644 --- a/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java +++ b/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java @@ -46,7 +46,7 @@ public final class TetsukoUmezawaFugitive extends CardImpl { // Creatures you control with power or toughness 1 or less can't be blocked. Effect effect = new CantBeBlockedAllEffect(filter, Duration.Custom); effect.setText("Creatures you control with power or toughness 1 or less can't be blocked"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private TetsukoUmezawaFugitive(final TetsukoUmezawaFugitive card) { diff --git a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java index 2c89477b8cb..b829a581764 100644 --- a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java @@ -47,7 +47,7 @@ public final class TetsuoUmezawa extends CardImpl { this.toughness = new MageInt(3); // Tetsuo Umezawa can't be the target of Aura spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TetsuoUmezawaEffect())); + this.addAbility(new SimpleStaticAbility(new TetsuoUmezawaEffect())); // {U}{B}{B}{R}, {tap}: Destroy target tapped or blocking creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}{B}{R}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java index 4dc3e1202ce..9f85674d95b 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java @@ -43,7 +43,7 @@ public final class TezzeretMasterOfTheBridge extends CardImpl { this.setStartingLoyalty(5); // Creature and planeswalker spells you cast have affinity for artifacts. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect( new AffinityForArtifactsAbility(), filter ))); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java index a9f5e70c08a..ae2d414bb39 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java @@ -39,7 +39,7 @@ public final class TezzeretsTouch extends CardImpl { this.addAbility(ability); // Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new CreatureToken(5, 5, "5/5 creature"),"Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types", Duration.WhileOnBattlefield))); // When enchanted artifact is put into a graveyard, return that card to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java b/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java index 073487ab1f9..d3d773eeb3e 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java +++ b/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java @@ -35,7 +35,7 @@ public final class ThaliaGuardianOfThraben extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } @@ -47,4 +47,4 @@ public final class ThaliaGuardianOfThraben extends CardImpl { public ThaliaGuardianOfThraben copy() { return new ThaliaGuardianOfThraben(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/ThassasEmissary.java b/Mage.Sets/src/mage/cards/t/ThassasEmissary.java index 6c706a54354..412b82c35e6 100644 --- a/Mage.Sets/src/mage/cards/t/ThassasEmissary.java +++ b/Mage.Sets/src/mage/cards/t/ThassasEmissary.java @@ -38,7 +38,7 @@ public final class ThassasEmissary extends CardImpl { // Whenever Thassa's Emissary or enchanted creature deals combat damage to a player, draw a card. this.addAbility(new ThassasEmissaryTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3,3))); } private ThassasEmissary(final ThassasEmissary card) { diff --git a/Mage.Sets/src/mage/cards/t/TheBrute.java b/Mage.Sets/src/mage/cards/t/TheBrute.java index 8aef9e9115f..58e57434fb7 100644 --- a/Mage.Sets/src/mage/cards/t/TheBrute.java +++ b/Mage.Sets/src/mage/cards/t/TheBrute.java @@ -36,7 +36,7 @@ public final class TheBrute extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0))); // {R}{R}{R}: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{R}{R}{R}"))); diff --git a/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java b/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java index f19c245855d..151e4f4dcc8 100644 --- a/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java +++ b/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java @@ -27,7 +27,7 @@ public final class TheCheeseStandsAlone extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}{W}"); // When you control no permanents other than The Cheese Stands Alone and have no cards in hand, you win the game. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CheeseStandsAloneContinuousEffect()); + Ability ability = new SimpleStaticAbility(new CheeseStandsAloneContinuousEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java b/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java index 62796fd3fef..ef6212bfd3f 100644 --- a/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java +++ b/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java @@ -57,7 +57,7 @@ public final class TheEternalWanderer extends CardImpl { this.setStartingLoyalty(5); // No more than one creature can attack The Eternal Wanderer each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheEternalWandererAttackRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new TheEternalWandererAttackRestrictionEffect())); // +1: Exile up to one target artifact or creature. Return that card to the battlefield under its owner's control at the beginning of that player's next end step. Ability ability = new LoyaltyAbility(new TheEternalWandererExileEffect(), 1); diff --git a/Mage.Sets/src/mage/cards/t/TheFallenApart.java b/Mage.Sets/src/mage/cards/t/TheFallenApart.java index b78314dcd6a..71609346d17 100644 --- a/Mage.Sets/src/mage/cards/t/TheFallenApart.java +++ b/Mage.Sets/src/mage/cards/t/TheFallenApart.java @@ -37,7 +37,7 @@ public final class TheFallenApart extends CardImpl { this.addAbility(new DealtDamageToSourceTriggeredAbility(new TheFallenApartToggleEffect(), false)); // The Fallen Apart can’t attack if it has no legs and can’t block if it has no arms. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheFallenApartRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new TheFallenApartRestrictionEffect())); } private TheFallenApart(final TheFallenApart card) { diff --git a/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java b/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java index fbb1b849059..61850d8d3ac 100644 --- a/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java +++ b/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java @@ -40,7 +40,7 @@ public final class TheGitrogMonster extends CardImpl { new SacrificeTargetCost(StaticFilters.FILTER_LAND)))); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // Whenever one or more land cards are put into your graveyard from anywhere, draw a card. this.addAbility(new TheGitrogMonsterTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TheImmortalSun.java b/Mage.Sets/src/mage/cards/t/TheImmortalSun.java index f1cce7298c2..9cf3916339d 100644 --- a/Mage.Sets/src/mage/cards/t/TheImmortalSun.java +++ b/Mage.Sets/src/mage/cards/t/TheImmortalSun.java @@ -31,17 +31,17 @@ public final class TheImmortalSun extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Players can't activate planeswalkers' loyalty abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheImmortalSunCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new TheImmortalSunCantActivateEffect())); // At the beginning of your draw step, draw an additional card. this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardSourceControllerEffect(1) .setText("draw an additional card"), false)); // Spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterCard("Spells"), 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterCard("Spells"), 1))); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); } private TheImmortalSun(final TheImmortalSun card) { diff --git a/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java b/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java index b6095869891..1e694da122a 100644 --- a/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java +++ b/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java @@ -46,7 +46,7 @@ public final class TheMasterMultiplied extends CardImpl { this.addAbility(new SimpleStaticAbility(new LegendRuleDoesntApplyEffect(filter))); // Triggered abilities you control can't cause you to sacrifice or exile creature tokens you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheMasterMultipliedEffect())); + this.addAbility(new SimpleStaticAbility(new TheMasterMultipliedEffect())); } private TheMasterMultiplied(final TheMasterMultiplied card) { diff --git a/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java b/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java index 28494275eb5..982d733500c 100644 --- a/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java +++ b/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java @@ -52,7 +52,7 @@ public final class TheThirdDoctor extends CardImpl { // The Third Doctor gets +1/+1 for each noncreature token you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // When The Third Doctor enters the battlefield, create your choice of a Clue token, a Food token, or a Treasure token. this.addAbility(new EntersBattlefieldTriggeredAbility(new TheThirdDoctorEffect())); diff --git a/Mage.Sets/src/mage/cards/t/TheUrDragon.java b/Mage.Sets/src/mage/cards/t/TheUrDragon.java index beb8c081d1e..38286a68a34 100644 --- a/Mage.Sets/src/mage/cards/t/TheUrDragon.java +++ b/Mage.Sets/src/mage/cards/t/TheUrDragon.java @@ -43,7 +43,7 @@ public final class TheUrDragon extends CardImpl { // Eminence — As long as The Ur-Dragon is in the command zone or on the battlefield, other Dragon spells you cast cost {1} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filter, 1); effect.setText("As long as {this} is in the command zone or on the battlefield, other Dragon spells you cast cost {1} less to cast"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.setAbilityWord(AbilityWord.EMINENCE); this.addAbility(ability); effect = new SpellsCostReductionControllerEffect(filter, 1); diff --git a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java index 7eeffdeffa5..a920c320c8c 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java +++ b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java @@ -43,7 +43,7 @@ public final class ThelonOfHavenwood extends CardImpl { this.toughness = new MageInt(2); // Each Fungus creature gets +1/+1 for each spore counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThelonOfHavenwoodBoostEffect())); + this.addAbility(new SimpleStaticAbility(new ThelonOfHavenwoodBoostEffect())); // {B}{G}, Exile a Fungus card from a graveyard: Put a spore counter on each Fungus on the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.SPORE.createInstance(), filterPermanent), new ManaCostsImpl<>("{B}{G}")); diff --git a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java index e80cf2ccb2d..02cd5065f6b 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java @@ -39,7 +39,7 @@ public final class TheloniteHermit extends CardImpl { this.toughness = new MageInt(1); // Saproling creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // Morph {3}{G}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}{G}"))); diff --git a/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java b/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java index 3f4bb2dec90..e74de4d2ee3 100644 --- a/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java +++ b/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java @@ -31,7 +31,7 @@ public final class ThickSkinnedGoblin extends CardImpl { this.toughness = new MageInt(1); // You may pay {0} rather than pay the echo cost for permanents you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThickSkinnedGoblinCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new ThickSkinnedGoblinCostModificationEffect())); // {R}: Thick-Skinned Goblin gains protection from red until end of turn. this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/t/Thirst.java b/Mage.Sets/src/mage/cards/t/Thirst.java index 8341b8597a3..972f1213bc3 100644 --- a/Mage.Sets/src/mage/cards/t/Thirst.java +++ b/Mage.Sets/src/mage/cards/t/Thirst.java @@ -38,7 +38,7 @@ public final class Thirst extends CardImpl { // When Thirst enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // At the beginning of your upkeep, sacrifice Thirst unless you pay {U}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{U}")) )); diff --git a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java index 1ea9d5706a8..bd7e6e56dad 100644 --- a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java +++ b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java @@ -40,7 +40,7 @@ public final class ThirstingAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 0))); // At the beginning of your end step, if equipped creature didn't deal combat damage to a creature this turn, sacrifice it. TriggeredAbility ability = new BeginningOfEndStepTriggeredAbility(new SacrificeEquippedEffect()); diff --git a/Mage.Sets/src/mage/cards/t/ThistledownLiege.java b/Mage.Sets/src/mage/cards/t/ThistledownLiege.java index 05ef4e64b74..52c0cfdbe83 100644 --- a/Mage.Sets/src/mage/cards/t/ThistledownLiege.java +++ b/Mage.Sets/src/mage/cards/t/ThistledownLiege.java @@ -40,9 +40,9 @@ public final class ThistledownLiege extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); } private ThistledownLiege(final ThistledownLiege card) { diff --git a/Mage.Sets/src/mage/cards/t/ThopterEngineer.java b/Mage.Sets/src/mage/cards/t/ThopterEngineer.java index 198bd9d1571..4a1b5963a71 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterEngineer.java +++ b/Mage.Sets/src/mage/cards/t/ThopterEngineer.java @@ -40,7 +40,7 @@ public final class ThopterEngineer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken(), 1))); // Artifact creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private ThopterEngineer(final ThopterEngineer card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java b/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java index dd8d587def7..f0f8080d47b 100644 --- a/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java +++ b/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java @@ -27,7 +27,7 @@ public final class ThornOfAmethyst extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private ThornOfAmethyst(final ThornOfAmethyst card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java index 1b59f2acd78..2c93014a1d3 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java @@ -41,7 +41,7 @@ public final class ThornbiteStaff extends CardImpl { gainedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{2}, {T}: This creature deals 1 damage to any target\""); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(new DiesCreatureTriggeredAbility(new UntapSourceEffect(),false), AttachmentType.EQUIPMENT); effect.setText("and \"Whenever a creature dies, untap this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java b/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java index e66724ad3a7..da8ae76e503 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java @@ -37,7 +37,7 @@ public final class ThornscapeFamiliar extends CardImpl { this.toughness = new MageInt(1); // Red spells and white spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private ThornscapeFamiliar(final ThornscapeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java b/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java index 22c349b87f3..dc108596460 100644 --- a/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java +++ b/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java @@ -45,11 +45,11 @@ public final class ThornwatchScarecrow extends CardImpl { // Thornwatch Scarecrow has wither as long as you control a green creature. ContinuousEffect effect = new GainAbilitySourceEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Thornwatch Scarecrow has vigilance as long as you control a white creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtReflection.java b/Mage.Sets/src/mage/cards/t/ThoughtReflection.java index 673d320e4c0..4b2f58ff4d7 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtReflection.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtReflection.java @@ -27,7 +27,7 @@ public final class ThoughtReflection extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}{U}"); // If you would draw a card, draw two cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThoughtReflectionReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ThoughtReflectionReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtVessel.java b/Mage.Sets/src/mage/cards/t/ThoughtVessel.java index 3f80895d33f..896bdcf76f9 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtVessel.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtVessel.java @@ -23,7 +23,7 @@ public final class ThoughtVessel extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java b/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java index 4ba212246e3..1bc4a09249c 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java @@ -37,7 +37,7 @@ public final class ThoughtweftTrio extends CardImpl { this.addAbility(new ChampionAbility(this, SubType.KITHKIN)); // Thoughtweft Trio can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private ThoughtweftTrio(final ThoughtweftTrio card) { diff --git a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java index b45d8594e66..7e6e3081339 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java +++ b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java @@ -30,7 +30,7 @@ public final class ThousandYearElixir extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // You may activate abilities of creatures you control as though those creatures had haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThousandYearElixirEffect())); + this.addAbility(new SimpleStaticAbility(new ThousandYearElixirEffect())); // {1}, {tap}: Untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java index a8b44b89cd9..4c2ed207216 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java @@ -34,7 +34,7 @@ public final class ThrabenDoomsayer extends CardImpl { // {tap}: Create a 1/1 white Human creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); // Fateful hour - As long as you have 5 or less life, other creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control get +2/+2"))); } diff --git a/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java b/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java index 891b4887550..2b011cce9a5 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java @@ -32,7 +32,7 @@ public final class ThrabenFoulbloods extends CardImpl { // Delirium — Thraben Foulbloods gets +1/+1 and has menace as long as there are four or more card types among cards in your graveyard. (A creature with menace can't be blocked except by two or more creatures.) ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility()), DeliriumCondition.instance, "and has menace as long as there are four or more card types among cards in your graveyard. (A creature with menace can't be blocked except by two or more creatures.)")); ability.addHint(CardTypesInGraveyardHint.YOU); diff --git a/Mage.Sets/src/mage/cards/t/ThranGolem.java b/Mage.Sets/src/mage/cards/t/ThranGolem.java index e6009178c30..e355dc210db 100644 --- a/Mage.Sets/src/mage/cards/t/ThranGolem.java +++ b/Mage.Sets/src/mage/cards/t/ThranGolem.java @@ -34,7 +34,7 @@ public final class ThranGolem extends CardImpl { // As long as Thran Golem is enchanted, it gets +2/+2 and has flying, first strike, and trample. EnchantedSourceCondition enchanted = new EnchantedSourceCondition(); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, "As long as {this} is enchanted, it gets +2/+2")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), diff --git a/Mage.Sets/src/mage/cards/t/ThranLens.java b/Mage.Sets/src/mage/cards/t/ThranLens.java index 772d250a621..1e62c401a5e 100644 --- a/Mage.Sets/src/mage/cards/t/ThranLens.java +++ b/Mage.Sets/src/mage/cards/t/ThranLens.java @@ -21,7 +21,7 @@ public final class ThranLens extends CardImpl { public ThranLens(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // All permanents are colorless. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThranLensEffect())); + this.addAbility(new SimpleStaticAbility(new ThranLensEffect())); } private ThranLens(final ThranLens card) { diff --git a/Mage.Sets/src/mage/cards/t/ThranPortal.java b/Mage.Sets/src/mage/cards/t/ThranPortal.java index 8366d5963bd..01dd82ddf01 100644 --- a/Mage.Sets/src/mage/cards/t/ThranPortal.java +++ b/Mage.Sets/src/mage/cards/t/ThranPortal.java @@ -51,7 +51,7 @@ public class ThranPortal extends CardImpl { AsEntersBattlefieldAbility chooseLandTypeAbility = new AsEntersBattlefieldAbility(new ChooseBasicLandTypeEffect(Outcome.AddAbility)); chooseLandTypeAbility.addEffect(new EnterAttributeAddChosenSubtypeEffect()); // While it enters this.addAbility(chooseLandTypeAbility); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); // While on the battlefield + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // While on the battlefield // Mana abilities of Thran Portal cost an additional 1 life to activate. // This also adds the mana ability @@ -172,4 +172,4 @@ class ThranPortalAdditionalCostEffect extends CostModificationEffectImpl { return abilityToModify instanceof ManaAbility; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java index 7f17f17e714..c6cbcfa1b02 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java +++ b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java @@ -40,7 +40,7 @@ public final class ThrashOfRaptors extends CardImpl { this.toughness = new MageInt(3); // As long as you control another Dinosaur, Thrash of Raptors gets +2/+0 and has trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another Dinosaur, {this} gets +2/+0")); diff --git a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java index dfdeca389f3..ce924743d93 100644 --- a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java @@ -45,7 +45,7 @@ public final class ThreadsOfDisloyalty extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } @@ -58,4 +58,3 @@ public final class ThreadsOfDisloyalty extends CardImpl { return new ThreadsOfDisloyalty(this); } } - diff --git a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java index fdeaaf760ed..bf958508b51 100644 --- a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java +++ b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java @@ -31,7 +31,7 @@ public final class ThrowingKnife extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Whenever equipped creature attacks, you may sacrifice Throwing Knife. If you do, Throwing Knife deals 2 damage to any target. Effect effect = new SacrificeSourceEffect(); effect.setText("you may sacrifice {this}. If you do, "); diff --git a/Mage.Sets/src/mage/cards/t/ThrullChampion.java b/Mage.Sets/src/mage/cards/t/ThrullChampion.java index f715edf9914..b190e6141ce 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullChampion.java +++ b/Mage.Sets/src/mage/cards/t/ThrullChampion.java @@ -32,7 +32,7 @@ public final class ThrullChampion extends CardImpl { this.toughness = new MageInt(2); // Thrull creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {tap}: Gain control of target Thrull for as long as you control Thrull Champion. Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.WhileControlled) diff --git a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java index 15389b938d3..871bad88ec6 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java +++ b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java @@ -38,7 +38,7 @@ public final class ThrullRetainer extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice Thrull Retainer: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java index 2cc0e24b5a9..42da65135d9 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java +++ b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java @@ -42,7 +42,7 @@ public final class ThrunBreakerOfSilence extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Thrun, Breaker of Silence can't be the target of nongreen spells your opponents control or abilities from nongreen sources your opponents control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThrunBreakerOfSilenceEffect())); + this.addAbility(new SimpleStaticAbility(new ThrunBreakerOfSilenceEffect())); // As long as it's your turn, Thrun has indestructible. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/cards/t/Thunderblust.java b/Mage.Sets/src/mage/cards/t/Thunderblust.java index fec3973f392..c75c7b22444 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderblust.java +++ b/Mage.Sets/src/mage/cards/t/Thunderblust.java @@ -38,7 +38,7 @@ public final class Thunderblust extends CardImpl { // Thunderblust has trample as long as it has a -1/-1 counter on it. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.M1M1), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Persist this.addAbility(new PersistAbility()); diff --git a/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java b/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java index 2160f51f186..2f38a98d809 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java +++ b/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java @@ -44,7 +44,7 @@ public final class ThunderclapWyvern extends CardImpl { // Other creatures you control with flying get +1/+1. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true); effect.setText("Other creatures you control with flying get +1/+1"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java index 16a65420fea..caaf6938cb5 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java +++ b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java @@ -37,7 +37,7 @@ public final class ThunderingSpineback extends CardImpl { this.toughness = new MageInt(5); // Other Dinosaurs you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {5}{G}: Create a 3/3 green Dinosaur creature token with trample. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DinosaurToken()), new ManaCostsImpl<>("{5}{G}"))); diff --git a/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java b/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java index 4f629ab1068..b700d4cc591 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java @@ -40,7 +40,7 @@ public final class ThunderscapeFamiliar extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Black spells and green spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private ThunderscapeFamiliar(final ThunderscapeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/t/Thunderstaff.java b/Mage.Sets/src/mage/cards/t/Thunderstaff.java index 4f1b16aaf1d..cf9535a1f13 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderstaff.java +++ b/Mage.Sets/src/mage/cards/t/Thunderstaff.java @@ -29,7 +29,7 @@ public final class Thunderstaff extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // As long as Thunderstaff is untapped, if a creature would deal combat damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThunderstaffPreventionEffect())); + this.addAbility(new SimpleStaticAbility(new ThunderstaffPreventionEffect())); // {2}, {tap}: Attacking creatures get +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,0,Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TideDrifter.java b/Mage.Sets/src/mage/cards/t/TideDrifter.java index 5d27cb3933c..1c62b25e23f 100644 --- a/Mage.Sets/src/mage/cards/t/TideDrifter.java +++ b/Mage.Sets/src/mage/cards/t/TideDrifter.java @@ -37,7 +37,7 @@ public final class TideDrifter extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // Other colorless creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/t/TigerClaws.java b/Mage.Sets/src/mage/cards/t/TigerClaws.java index 825607751f6..c8b76033f21 100644 --- a/Mage.Sets/src/mage/cards/t/TigerClaws.java +++ b/Mage.Sets/src/mage/cards/t/TigerClaws.java @@ -44,7 +44,7 @@ public final class TigerClaws extends CardImpl { // Enchanted creature gets +1/+1 and has trample. Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TighteningCoils.java b/Mage.Sets/src/mage/cards/t/TighteningCoils.java index 9f79b3bbe52..2b193782975 100644 --- a/Mage.Sets/src/mage/cards/t/TighteningCoils.java +++ b/Mage.Sets/src/mage/cards/t/TighteningCoils.java @@ -39,7 +39,7 @@ public final class TighteningCoils extends CardImpl { this.addAbility(ability); // Enchanted creature gets -6/-0 and loses flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-6, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(-6, 0, Duration.WhileOnBattlefield)); Effect effect = new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and loses flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TilonallisCrown.java b/Mage.Sets/src/mage/cards/t/TilonallisCrown.java index a8cde4c15c1..a1d7bc3c9c6 100644 --- a/Mage.Sets/src/mage/cards/t/TilonallisCrown.java +++ b/Mage.Sets/src/mage/cards/t/TilonallisCrown.java @@ -44,7 +44,7 @@ public final class TilonallisCrown extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DamageAttachedEffect(1, "it"))); // Enchanted creature gets +3/+0 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 0)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TimberlineRidge.java b/Mage.Sets/src/mage/cards/t/TimberlineRidge.java index 7a0ba66a211..ebad3e35930 100644 --- a/Mage.Sets/src/mage/cards/t/TimberlineRidge.java +++ b/Mage.Sets/src/mage/cards/t/TimberlineRidge.java @@ -33,7 +33,7 @@ public final class TimberlineRidge extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from Timberline Ridge. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java index b2b5242bf48..b13644f46e6 100644 --- a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java +++ b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java @@ -35,7 +35,7 @@ public final class TimberpackWolf extends CardImpl { this.toughness = new MageInt(2); // Timberpack Wolf gets +1/+1 for each other creature you control named Timberpack Wolf. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TimberpackWolfEffect())); + this.addAbility(new SimpleStaticAbility(new TimberpackWolfEffect())); } private TimberpackWolf(final TimberpackWolf card) { @@ -79,7 +79,3 @@ public final class TimberpackWolf extends CardImpl { } } } - - - - diff --git a/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java b/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java index c6e9cf89415..61aadc6d97d 100644 --- a/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java +++ b/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java @@ -30,7 +30,7 @@ public final class TimeOfHeroes extends CardImpl { // Each creature you control with a level counter on it gets +2/+2. ContinuousEffect boost = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, boost)); + this.addAbility(new SimpleStaticAbility(boost)); } private TimeOfHeroes(final TimeOfHeroes card) { diff --git a/Mage.Sets/src/mage/cards/t/TimeVault.java b/Mage.Sets/src/mage/cards/t/TimeVault.java index 381712a94f5..5592240ed3b 100644 --- a/Mage.Sets/src/mage/cards/t/TimeVault.java +++ b/Mage.Sets/src/mage/cards/t/TimeVault.java @@ -35,10 +35,10 @@ public final class TimeVault extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Time Vault doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // If you would begin your turn while Time Vault is tapped, you may skip that turn instead. If you do, untap Time Vault. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TimeVaultReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new TimeVaultReplacementEffect())); // {tap}: Take an extra turn after this one. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java index ca164fdca72..5e529458a10 100644 --- a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java +++ b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java @@ -40,7 +40,7 @@ public final class TinStreetMarket extends CardImpl { // Enchanted land has "{T}, Discard a card: Draw a card." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); gainAbility.addCost(new DiscardCardCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, null, "land"))); } diff --git a/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java b/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java index abcfdea2c54..2fbb6ac1215 100644 --- a/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java +++ b/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java @@ -37,7 +37,7 @@ public final class TishanaVoiceOfThunder extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // When Tishana enters the battlefield, draw a card for each creature you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE)))); diff --git a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java index 9c5c5816ca0..397a30c2dba 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java @@ -39,7 +39,7 @@ public final class TitanOfEternalFire extends CardImpl { ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.HUMAN, "Each Human creature")); effect.setText("Each Human creature you control has \"{R}, {T}: This creature deals 1 damage to any target.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private TitanOfEternalFire(final TitanOfEternalFire card) { diff --git a/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java b/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java index 76ed7c1bee2..22dad8ad94b 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java @@ -43,7 +43,7 @@ public final class TitanOfLittjara extends CardImpl { // Titan of Littjara is the chosen type in addition to its other types. ability.addEffect(new EnterAttributeAddChosenSubtypeEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // Whenever Titan of Littjara enters the battlefield or attacks, you may draw a card for each other creature you control that shares a creature type with it. If you do, discard a card. this.addAbility(new EntersBattlefieldOrAttacksSourceTriggeredAbility( @@ -98,4 +98,4 @@ class TitanOfLittjaraEffect extends OneShotEffect { return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TitaniasSong.java b/Mage.Sets/src/mage/cards/t/TitaniasSong.java index ab1f6455c30..a9306e863f8 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniasSong.java +++ b/Mage.Sets/src/mage/cards/t/TitaniasSong.java @@ -31,7 +31,7 @@ public final class TitaniasSong extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // Each noncreature artifact loses all abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. If Titania's Song leaves the battlefield, this effect continues until end of turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TitaniasSongEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new TitaniasSongEffect(Duration.WhileOnBattlefield))); this.addAbility(new LeavesBattlefieldTriggeredAbility(new TitaniasSongEffect(Duration.EndOfTurn), false)); } diff --git a/Mage.Sets/src/mage/cards/t/TitheTaker.java b/Mage.Sets/src/mage/cards/t/TitheTaker.java index f13dd9bb8b9..295a2b253bf 100644 --- a/Mage.Sets/src/mage/cards/t/TitheTaker.java +++ b/Mage.Sets/src/mage/cards/t/TitheTaker.java @@ -30,7 +30,7 @@ public final class TitheTaker extends CardImpl { this.toughness = new MageInt(1); // During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TitheTakerCostReductionEffect()) + this.addAbility(new SimpleStaticAbility(new TitheTakerCostReductionEffect()) .addHint(MyTurnHint.instance)); // Afterlife 1 @@ -83,4 +83,4 @@ class TitheTakerCostReductionEffect extends CostModificationEffectImpl { return new TitheTakerCostReductionEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/Togglodyte.java b/Mage.Sets/src/mage/cards/t/Togglodyte.java index 4108e4a76c0..9626e8afb82 100644 --- a/Mage.Sets/src/mage/cards/t/Togglodyte.java +++ b/Mage.Sets/src/mage/cards/t/Togglodyte.java @@ -41,7 +41,7 @@ public final class Togglodyte extends CardImpl { this.addAbility(new SpellCastAllTriggeredAbility(new TogglodyteToggleEffect(), false)); // As long as Togglodyte is turned off, it can’t attack or block, and prevent all damage it would deal. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalRestrictionEffect(new TogglodyteRestrictionEffect(), new TogglodyteCondition())); + Ability ability = new SimpleStaticAbility(new ConditionalRestrictionEffect(new TogglodyteRestrictionEffect(), new TogglodyteCondition())); ability.addEffect(new ConditionalReplacementEffect(new TogglodytePreventionEffect(), new TogglodyteCondition())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java index a521ec38595..b62c81e52f7 100644 --- a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java @@ -42,9 +42,9 @@ public final class TolsimirWolfblood extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); // {tap}: Create a legendary 2/2 green and white Wolf creature token named Voja. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VojaToken()), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/t/TorchGauntlet.java b/Mage.Sets/src/mage/cards/t/TorchGauntlet.java index ca1bd7eebf0..593e374c38d 100644 --- a/Mage.Sets/src/mage/cards/t/TorchGauntlet.java +++ b/Mage.Sets/src/mage/cards/t/TorchGauntlet.java @@ -24,7 +24,7 @@ public final class TorchGauntlet extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/t/Torment.java b/Mage.Sets/src/mage/cards/t/Torment.java index 0959bb55c02..05f3e1d2ab2 100644 --- a/Mage.Sets/src/mage/cards/t/Torment.java +++ b/Mage.Sets/src/mage/cards/t/Torment.java @@ -34,7 +34,7 @@ public final class Torment extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); } private Torment(final Torment card) { diff --git a/Mage.Sets/src/mage/cards/t/TormentorsTrident.java b/Mage.Sets/src/mage/cards/t/TormentorsTrident.java index 26333cb4495..7437a150258 100644 --- a/Mage.Sets/src/mage/cards/t/TormentorsTrident.java +++ b/Mage.Sets/src/mage/cards/t/TormentorsTrident.java @@ -30,7 +30,7 @@ public final class TormentorsTrident extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+0 and attacks each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 0)); Effect effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TorporDust.java b/Mage.Sets/src/mage/cards/t/TorporDust.java index 91d2e012773..7e5f11c96d5 100644 --- a/Mage.Sets/src/mage/cards/t/TorporDust.java +++ b/Mage.Sets/src/mage/cards/t/TorporDust.java @@ -41,7 +41,7 @@ public final class TorporDust extends CardImpl { // Enchanted creature gets -3/-0. Effect effect = new BoostEnchantedEffect(-3, -0, Duration.WhileOnBattlefield); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability2 = new SimpleStaticAbility(effect); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java index 37ca7c7ab33..f9e5bf0f843 100644 --- a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java +++ b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java @@ -40,7 +40,7 @@ public final class TradeFederationBattleship extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // Droid creatures you control get +1/+1 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {T}: Create two 1/1 colorless Droid artifact token cretures. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DroidToken(), 2), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/t/TrainingDrone.java b/Mage.Sets/src/mage/cards/t/TrainingDrone.java index 82564ad57c4..0cbb8c164b3 100644 --- a/Mage.Sets/src/mage/cards/t/TrainingDrone.java +++ b/Mage.Sets/src/mage/cards/t/TrainingDrone.java @@ -28,7 +28,7 @@ public final class TrainingDrone extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TrainingDroneEffect())); + this.addAbility(new SimpleStaticAbility(new TrainingDroneEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/Transcendence.java b/Mage.Sets/src/mage/cards/t/Transcendence.java index cdc2849b9f4..5bd4fba4146 100644 --- a/Mage.Sets/src/mage/cards/t/Transcendence.java +++ b/Mage.Sets/src/mage/cards/t/Transcendence.java @@ -31,7 +31,7 @@ public final class Transcendence extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}{W}{W}"); // You don't lose the game for having 0 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); // When you have 20 or more life, you lose the game. this.addAbility(new TranscendenceStateTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TravelersCloak.java b/Mage.Sets/src/mage/cards/t/TravelersCloak.java index 077f0abf02f..7fa1ebab1e0 100644 --- a/Mage.Sets/src/mage/cards/t/TravelersCloak.java +++ b/Mage.Sets/src/mage/cards/t/TravelersCloak.java @@ -57,7 +57,7 @@ public final class TravelersCloak extends CardImpl { // Enchanted creature has landwalk of the chosen type. Effect effect = new TravelersCloakGainAbilityAttachedEffect(filter); effect.setText("Enchanted creature has landwalk of the chosen type"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private TravelersCloak(final TravelersCloak card) { @@ -109,4 +109,3 @@ enum TravelersCloakChosenSubtypePredicate implements ObjectSourcePlayerPredicate return "Chosen subtype"; } } - diff --git a/Mage.Sets/src/mage/cards/t/TravelingPlague.java b/Mage.Sets/src/mage/cards/t/TravelingPlague.java index a252c053b11..35ff32237c5 100644 --- a/Mage.Sets/src/mage/cards/t/TravelingPlague.java +++ b/Mage.Sets/src/mage/cards/t/TravelingPlague.java @@ -53,7 +53,7 @@ public final class TravelingPlague extends CardImpl { DynamicValue boostValue = new MultipliedValue(new CountersSourceCount(CounterType.PLAGUE), -1); Effect effect = new BoostEnchantedEffect(boostValue, boostValue, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets -1/-1 for each plague counter on {this}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // When enchanted creature leaves the battlefield, that creature's controller returns Traveling Plague from its owner's graveyard to the battlefield. this.addAbility(new TravelingPlagueTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousLink.java b/Mage.Sets/src/mage/cards/t/TreacherousLink.java index c595d31c800..ac9b0c30087 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousLink.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousLink.java @@ -39,7 +39,7 @@ public final class TreacherousLink extends CardImpl { this.addAbility(ability); // All damage that would be dealt to enchanted creature is dealt to its controller instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TreacherousLinkEffect())); + this.addAbility(new SimpleStaticAbility(new TreacherousLinkEffect())); } private TreacherousLink(final TreacherousLink card) { diff --git a/Mage.Sets/src/mage/cards/t/Treachery.java b/Mage.Sets/src/mage/cards/t/Treachery.java index a20da3fe547..a6429f0e116 100644 --- a/Mage.Sets/src/mage/cards/t/Treachery.java +++ b/Mage.Sets/src/mage/cards/t/Treachery.java @@ -38,7 +38,7 @@ public final class Treachery extends CardImpl { // When Treachery enters the battlefield, untap up to five lands. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapLandsEffect(5))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/Trinisphere.java b/Mage.Sets/src/mage/cards/t/Trinisphere.java index 1da0a078f97..466591f520f 100644 --- a/Mage.Sets/src/mage/cards/t/Trinisphere.java +++ b/Mage.Sets/src/mage/cards/t/Trinisphere.java @@ -27,7 +27,7 @@ public final class Trinisphere extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // As long as Trinisphere is untapped, each spell that would cost less than three mana to cast costs three mana to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TrinisphereEffect())); + this.addAbility(new SimpleStaticAbility(new TrinisphereEffect())); } private Trinisphere(final Trinisphere card) { diff --git a/Mage.Sets/src/mage/cards/t/Trollhide.java b/Mage.Sets/src/mage/cards/t/Trollhide.java index 34a6bb9e67a..b3a6dfa440d 100644 --- a/Mage.Sets/src/mage/cards/t/Trollhide.java +++ b/Mage.Sets/src/mage/cards/t/Trollhide.java @@ -42,7 +42,7 @@ public final class Trollhide extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{1}{G}: Regenerate this creature." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}")), AttachmentType.AURA); effect.setText("and has \"{1}{G}: Regenerate this creature.\""); diff --git a/Mage.Sets/src/mage/cards/t/Tromokratis.java b/Mage.Sets/src/mage/cards/t/Tromokratis.java index 16be7aac13c..59229b3895f 100644 --- a/Mage.Sets/src/mage/cards/t/Tromokratis.java +++ b/Mage.Sets/src/mage/cards/t/Tromokratis.java @@ -42,10 +42,10 @@ public final class Tromokratis extends CardImpl { new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new SourceMatchesFilterCondition(new FilterAttackingOrBlockingCreature())), "{this} has hexproof unless it's attacking or blocking"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Tromokratis can't be blocked unless all creatures defending player controls block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedUnlessAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedUnlessAllEffect())); } private Tromokratis(final Tromokratis card) { diff --git a/Mage.Sets/src/mage/cards/t/TrooperArmor.java b/Mage.Sets/src/mage/cards/t/TrooperArmor.java index a4fccd8a0b4..cc094d2f01d 100644 --- a/Mage.Sets/src/mage/cards/t/TrooperArmor.java +++ b/Mage.Sets/src/mage/cards/t/TrooperArmor.java @@ -25,8 +25,8 @@ public final class TrooperArmor extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equiped creature gets +1/+1 and is a Trooper in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect(SubType.TROOPER, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new AddCardSubtypeAttachedEffect(SubType.TROOPER, AttachmentType.EQUIPMENT))); // Whenever a Trooper you control enters, you may attach {this} to it. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/t/TrooperCommando.java b/Mage.Sets/src/mage/cards/t/TrooperCommando.java index f263c14abc6..00ef11ba019 100644 --- a/Mage.Sets/src/mage/cards/t/TrooperCommando.java +++ b/Mage.Sets/src/mage/cards/t/TrooperCommando.java @@ -34,7 +34,7 @@ public final class TrooperCommando extends CardImpl { this.toughness = new MageInt(3); // Trooper creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java b/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java index 8da2949c1a3..983a4a03f97 100644 --- a/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java +++ b/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java @@ -27,7 +27,7 @@ public final class TroveOfTemptation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // Each opponent must attack you or a planeswalker you control with at least one creature each combat if able. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TroveOfTemptationForceAttackEffect(Duration.WhileOnBattlefield))); + addAbility(new SimpleStaticAbility(new TroveOfTemptationForceAttackEffect(Duration.WhileOnBattlefield))); // At the beginning of your end step, create a colorless Treasure artifact token with "{t}, Sacrifice this artifact: Add one mana of any color.” addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new TreasureToken()))); diff --git a/Mage.Sets/src/mage/cards/t/TrueBeliever.java b/Mage.Sets/src/mage/cards/t/TrueBeliever.java index 88fc918ebe5..39d287baa7a 100644 --- a/Mage.Sets/src/mage/cards/t/TrueBeliever.java +++ b/Mage.Sets/src/mage/cards/t/TrueBeliever.java @@ -28,7 +28,7 @@ public final class TrueBeliever extends CardImpl { this.toughness = new MageInt(2); // You have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield))); } private TrueBeliever(final TrueBeliever card) { diff --git a/Mage.Sets/src/mage/cards/t/TrueConviction.java b/Mage.Sets/src/mage/cards/t/TrueConviction.java index dfeda4a8dbe..7962cebb460 100644 --- a/Mage.Sets/src/mage/cards/t/TrueConviction.java +++ b/Mage.Sets/src/mage/cards/t/TrueConviction.java @@ -26,7 +26,7 @@ public final class TrueConviction extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}{W}"); // Creatures you control have double strike and lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES)); + Ability ability = new SimpleStaticAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES)); Effect effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText(" and lifelink"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java index 602d8675833..fa6d474b188 100644 --- a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java +++ b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java @@ -30,7 +30,7 @@ public final class TrueFaithCenser extends CardImpl { // Equipped creature gets +1/+1 and has vigilance. Effect effect = new BoostEquippedEffect(1, 1); effect.setText("Equipped creature gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java b/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java index 4a263ec13a8..83e05c4b47f 100644 --- a/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java +++ b/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java @@ -29,7 +29,7 @@ public final class TrueheartDuelist extends CardImpl { this.toughness = new MageInt(2); // Trueheart Duelist can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); // Embalm {2}{W} this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{2}{W}"), this)); diff --git a/Mage.Sets/src/mage/cards/t/TrustedForcemage.java b/Mage.Sets/src/mage/cards/t/TrustedForcemage.java index 364d0405f09..ed84132e1c9 100644 --- a/Mage.Sets/src/mage/cards/t/TrustedForcemage.java +++ b/Mage.Sets/src/mage/cards/t/TrustedForcemage.java @@ -31,7 +31,7 @@ public final class TrustedForcemage extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Trusted Forcemage is paired with another creature, each of those creatures gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(1, 1, ruleText))); + this.addAbility(new SimpleStaticAbility(new BoostPairedEffect(1, 1, ruleText))); } private TrustedForcemage(final TrustedForcemage card) { @@ -42,4 +42,4 @@ public final class TrustedForcemage extends CardImpl { public TrustedForcemage copy() { return new TrustedForcemage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TrustyMachete.java b/Mage.Sets/src/mage/cards/t/TrustyMachete.java index 7bad10bb7c6..beb41e301e3 100644 --- a/Mage.Sets/src/mage/cards/t/TrustyMachete.java +++ b/Mage.Sets/src/mage/cards/t/TrustyMachete.java @@ -23,7 +23,7 @@ public final class TrustyMachete extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 1))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); } diff --git a/Mage.Sets/src/mage/cards/t/TsabosWeb.java b/Mage.Sets/src/mage/cards/t/TsabosWeb.java index 186b5d5956c..2e1bcf23bc8 100644 --- a/Mage.Sets/src/mage/cards/t/TsabosWeb.java +++ b/Mage.Sets/src/mage/cards/t/TsabosWeb.java @@ -26,7 +26,7 @@ public final class TsabosWeb extends CardImpl { // When Tsabo's Web enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Each land with an activated ability that isn't a mana ability doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TsabosWebPreventUntapEffect())); + this.addAbility(new SimpleStaticAbility(new TsabosWebPreventUntapEffect())); } private TsabosWeb(final TsabosWeb card) { diff --git a/Mage.Sets/src/mage/cards/t/TwentyToedToad.java b/Mage.Sets/src/mage/cards/t/TwentyToedToad.java index 08cfc2f57c3..9a2ab1d652e 100644 --- a/Mage.Sets/src/mage/cards/t/TwentyToedToad.java +++ b/Mage.Sets/src/mage/cards/t/TwentyToedToad.java @@ -36,7 +36,7 @@ public final class TwentyToedToad extends CardImpl { this.toughness = new MageInt(3); // Your maximum hand size is twenty. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaximumHandSizeControllerEffect(20, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET))); + this.addAbility(new SimpleStaticAbility(new MaximumHandSizeControllerEffect(20, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET))); // Whenever you attack with two or more creatures, put a +1/+1 counter on Twenty-Toed Toad and draw a card. Ability ability = new AttacksWithCreaturesTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), 2); diff --git a/Mage.Sets/src/mage/cards/t/TwilekSeductress.java b/Mage.Sets/src/mage/cards/t/TwilekSeductress.java index 635449f527d..fa50e1a6bc6 100644 --- a/Mage.Sets/src/mage/cards/t/TwilekSeductress.java +++ b/Mage.Sets/src/mage/cards/t/TwilekSeductress.java @@ -29,7 +29,7 @@ public final class TwilekSeductress extends CardImpl { this.toughness = new MageInt(1); // {this} must be blocked it if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); // Whenever {this} becomes blocked by a creature, put a bounty counter on that creature this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), false)); diff --git a/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java b/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java index c4272da8685..3ee182e07c0 100644 --- a/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java +++ b/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java @@ -43,7 +43,7 @@ public final class TwinsOfDiscord extends CardImpl { this.addAbility(new AttacksWithCreaturesTriggeredAbility(new TwinsOfDiscordEffect(), 1)); // Each other colorless creature you control has bloodthirst 2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new BloodthirstAbility(2), Duration.WhileOnBattlefield, colorlessCreatureFilter, true).setText("Each other colorless creature you control has bloodthirst 2"))); diff --git a/Mage.Sets/src/mage/cards/t/TwistedExperiment.java b/Mage.Sets/src/mage/cards/t/TwistedExperiment.java index 12e4c4a9765..a5b7e87c41b 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedExperiment.java +++ b/Mage.Sets/src/mage/cards/t/TwistedExperiment.java @@ -34,7 +34,7 @@ public final class TwistedExperiment extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield))); } private TwistedExperiment(final TwistedExperiment card) { diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java index d1bcd5b5961..856ae820831 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java @@ -40,7 +40,7 @@ public final class TwoHeadedDragon extends CardImpl { this.addAbility(new MenaceAbility()); // Two-Headed Dragon can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java b/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java index 66b6472afb9..b918a5b478f 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java @@ -27,7 +27,7 @@ public final class TwoHeadedGiantOfForiys extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Two-Headed Giant of Foriys can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private TwoHeadedGiantOfForiys(final TwoHeadedGiantOfForiys card) { diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java b/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java index 09529fa6510..1798f5c5ed7 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java @@ -29,7 +29,7 @@ public final class TwoHeadedSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have menace. (They can't be blocked except by two or more creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new MenaceAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Sliver creatures have menace. (They can't be blocked except by two or more creatures.)"))); -- 2.47.2 From 952f7d0c901cc0a2d22f0e4be31bb22dab7a39c8 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:16:11 -0500 Subject: [PATCH 22/50] refactor: SimpleStaticAbility default zone (cards U V) --- Mage.Sets/src/mage/cards/u/UWing.java | 4 ++-- Mage.Sets/src/mage/cards/u/UbaMask.java | 4 ++-- Mage.Sets/src/mage/cards/u/UginTheIneffable.java | 2 +- Mage.Sets/src/mage/cards/u/UginsNexus.java | 2 +- Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java | 2 +- Mage.Sets/src/mage/cards/u/UmbraMystic.java | 2 +- Mage.Sets/src/mage/cards/u/UnbridledGrowth.java | 2 +- Mage.Sets/src/mage/cards/u/UncontrollableAnger.java | 2 +- Mage.Sets/src/mage/cards/u/UndeadAlchemist.java | 2 +- Mage.Sets/src/mage/cards/u/UndeadWarchief.java | 4 ++-- Mage.Sets/src/mage/cards/u/Undertow.java | 2 +- Mage.Sets/src/mage/cards/u/UnderworldCerberus.java | 4 ++-- Mage.Sets/src/mage/cards/u/UnderworldConnections.java | 2 +- Mage.Sets/src/mage/cards/u/UndyingRage.java | 2 +- Mage.Sets/src/mage/cards/u/UnflinchingCourage.java | 2 +- Mage.Sets/src/mage/cards/u/UnholyCitadel.java | 2 +- Mage.Sets/src/mage/cards/u/UnholyStrength.java | 2 +- Mage.Sets/src/mage/cards/u/UnstableMutation.java | 2 +- Mage.Sets/src/mage/cards/u/UntamedHunger.java | 2 +- Mage.Sets/src/mage/cards/u/UnwindingClock.java | 2 +- Mage.Sets/src/mage/cards/u/UphillBattle.java | 2 +- Mage.Sets/src/mage/cards/u/Upwelling.java | 2 +- Mage.Sets/src/mage/cards/u/UrDrago.java | 2 +- Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java | 4 ++-- Mage.Sets/src/mage/cards/u/UrborgShambler.java | 2 +- Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasArmor.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasFilter.java | 2 +- Mage.Sets/src/mage/cards/u/UtopiaVow.java | 4 ++-- Mage.Sets/src/mage/cards/v/ValorMadeReal.java | 2 +- Mage.Sets/src/mage/cards/v/VampireNocturnus.java | 2 +- Mage.Sets/src/mage/cards/v/VampiricEmbrace.java | 2 +- Mage.Sets/src/mage/cards/v/VampiricSliver.java | 2 +- Mage.Sets/src/mage/cards/v/Vampirism.java | 4 ++-- Mage.Sets/src/mage/cards/v/VanguardsShield.java | 4 ++-- Mage.Sets/src/mage/cards/v/VanquishersBanner.java | 2 +- Mage.Sets/src/mage/cards/v/VaporSnare.java | 2 +- Mage.Sets/src/mage/cards/v/VastwoodZendikon.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenOrrery.java | 2 +- Mage.Sets/src/mage/cards/v/Veldt.java | 2 +- Mage.Sets/src/mage/cards/v/VenarianGold.java | 2 +- Mage.Sets/src/mage/cards/v/VengefulFirebrand.java | 4 ++-- Mage.Sets/src/mage/cards/v/VensersJournal.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantEmbrace.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantField.java | 2 +- Mage.Sets/src/mage/cards/v/VernalEquinox.java | 2 +- Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java | 2 +- Mage.Sets/src/mage/cards/v/VeteranArmorer.java | 2 +- Mage.Sets/src/mage/cards/v/VeteranArmorsmith.java | 2 +- Mage.Sets/src/mage/cards/v/VeteranBodyguard.java | 2 +- Mage.Sets/src/mage/cards/v/VeteranBrawlers.java | 4 ++-- Mage.Sets/src/mage/cards/v/VeteransArmaments.java | 2 +- Mage.Sets/src/mage/cards/v/VeteransSidearm.java | 2 +- Mage.Sets/src/mage/cards/v/VibratingSphere.java | 4 ++-- Mage.Sets/src/mage/cards/v/VictoryChimes.java | 2 +- Mage.Sets/src/mage/cards/v/VigeanHydropon.java | 2 +- Mage.Sets/src/mage/cards/v/Vigilance.java | 2 +- Mage.Sets/src/mage/cards/v/Vigor.java | 4 ++-- Mage.Sets/src/mage/cards/v/VileManifestation.java | 2 +- Mage.Sets/src/mage/cards/v/VillageSurvivors.java | 2 +- Mage.Sets/src/mage/cards/v/Vineweft.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianBetrayers.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianLongbow.java | 2 +- Mage.Sets/src/mage/cards/v/VirulentPlague.java | 2 +- Mage.Sets/src/mage/cards/v/VisceridArmor.java | 2 +- Mage.Sets/src/mage/cards/v/VishgrazTheDoomhive.java | 2 +- Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java | 2 +- Mage.Sets/src/mage/cards/v/VizierOfRemedies.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianKnights.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianSerpent.java | 2 +- Mage.Sets/src/mage/cards/v/VoiceOfAll.java | 2 +- Mage.Sets/src/mage/cards/v/VoidMaw.java | 2 +- Mage.Sets/src/mage/cards/v/VoidWinnower.java | 4 ++-- Mage.Sets/src/mage/cards/v/VoidstoneGargoyle.java | 4 ++-- Mage.Sets/src/mage/cards/v/VolcanicStrength.java | 2 +- Mage.Sets/src/mage/cards/v/VolitionReins.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsCurse.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java | 2 +- Mage.Sets/src/mage/cards/v/VoraciousReader.java | 2 +- Mage.Sets/src/mage/cards/v/VorracBattlehorns.java | 2 +- Mage.Sets/src/mage/cards/v/VowOfDuty.java | 2 +- Mage.Sets/src/mage/cards/v/VowOfFlight.java | 2 +- Mage.Sets/src/mage/cards/v/VowOfLightning.java | 2 +- Mage.Sets/src/mage/cards/v/VowOfMalice.java | 2 +- Mage.Sets/src/mage/cards/v/VowOfWildness.java | 2 +- Mage.Sets/src/mage/cards/v/VrynWingmare.java | 2 +- Mage.Sets/src/mage/cards/v/VulshokBattlegear.java | 2 +- Mage.Sets/src/mage/cards/v/VulshokGauntlets.java | 2 +- Mage.Sets/src/mage/cards/v/VulshokMorningstar.java | 2 +- 89 files changed, 103 insertions(+), 103 deletions(-) diff --git a/Mage.Sets/src/mage/cards/u/UWing.java b/Mage.Sets/src/mage/cards/u/UWing.java index fca29bd22e7..cbfa33ac460 100644 --- a/Mage.Sets/src/mage/cards/u/UWing.java +++ b/Mage.Sets/src/mage/cards/u/UWing.java @@ -33,13 +33,13 @@ public final class UWing extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // As long as U-Wing is tapped, it gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), SourceTappedCondition.TAPPED, "As long as {this} is tapped, it gets +1/+0"))); // As long as U-Wing is untapped, it gets +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(0, 1, Duration.WhileOnBattlefield), SourceTappedCondition.UNTAPPED, "As long as {this} is untapped, it gets +0/+1"))); diff --git a/Mage.Sets/src/mage/cards/u/UbaMask.java b/Mage.Sets/src/mage/cards/u/UbaMask.java index c8ae766fe91..7996e2f4fd7 100644 --- a/Mage.Sets/src/mage/cards/u/UbaMask.java +++ b/Mage.Sets/src/mage/cards/u/UbaMask.java @@ -28,10 +28,10 @@ public final class UbaMask extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // If a player would draw a card, that player exiles that card face up instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UbaMaskReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new UbaMaskReplacementEffect())); // Each player may play cards they exiled with Uba Mask this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UbaMaskPlayEffect()), new UbaMaskExiledCardsWatcher()); + this.addAbility(new SimpleStaticAbility(new UbaMaskPlayEffect()), new UbaMaskExiledCardsWatcher()); } private UbaMask(final UbaMask card) { diff --git a/Mage.Sets/src/mage/cards/u/UginTheIneffable.java b/Mage.Sets/src/mage/cards/u/UginTheIneffable.java index e9f702d82d0..848ee849bca 100644 --- a/Mage.Sets/src/mage/cards/u/UginTheIneffable.java +++ b/Mage.Sets/src/mage/cards/u/UginTheIneffable.java @@ -124,7 +124,7 @@ class UginTheIneffableEffect extends OneShotEffect { // with return ability for (UUID addedTokenId : effect.getLastAddedTokenIds()) { // display referenced exiled face-down card on token - SimpleStaticAbility sa = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("Referenced object: " + SimpleStaticAbility sa = new SimpleStaticAbility(new InfoEffect("Referenced object: " + card.getId().toString().substring(0, 3))); GainAbilityTargetEffect gainAbilityEffect = new GainAbilityTargetEffect(sa, Duration.WhileOnBattlefield); gainAbilityEffect.setTargetPointer(new FixedTarget(addedTokenId)); diff --git a/Mage.Sets/src/mage/cards/u/UginsNexus.java b/Mage.Sets/src/mage/cards/u/UginsNexus.java index 6069ea6d735..9e832ecfb2c 100644 --- a/Mage.Sets/src/mage/cards/u/UginsNexus.java +++ b/Mage.Sets/src/mage/cards/u/UginsNexus.java @@ -28,7 +28,7 @@ public final class UginsNexus extends CardImpl { this.addAbility(new SkipExtraTurnsAbility()); // If Ugin's Nexus would be put into a graveyard from the battlefield, instead exile it and take an extra turn after this one. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UginsNexusExileEffect())); + this.addAbility(new SimpleStaticAbility(new UginsNexusExileEffect())); } private UginsNexus(final UginsNexus card) { diff --git a/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java b/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java index 25d1cb4a2f5..400e6dda7fd 100644 --- a/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java +++ b/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java @@ -32,7 +32,7 @@ public final class UgnaughtScrapWorker extends CardImpl { this.toughness = new MageInt(2); // Droid spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private UgnaughtScrapWorker(final UgnaughtScrapWorker card) { diff --git a/Mage.Sets/src/mage/cards/u/UmbraMystic.java b/Mage.Sets/src/mage/cards/u/UmbraMystic.java index 97d2fcf412d..a1359bd3d42 100644 --- a/Mage.Sets/src/mage/cards/u/UmbraMystic.java +++ b/Mage.Sets/src/mage/cards/u/UmbraMystic.java @@ -37,7 +37,7 @@ public final class UmbraMystic extends CardImpl { this.toughness = new MageInt(2); // Auras attached to permanents you control have umbra armor. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new UmbraArmorAbility(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new UmbraArmorAbility(), Duration.WhileOnBattlefield, filter, false))); } private UmbraMystic(final UmbraMystic card) { diff --git a/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java b/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java index 917887196b9..aa8ef975688 100644 --- a/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java +++ b/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java @@ -45,7 +45,7 @@ public final class UnbridledGrowth extends CardImpl { Ability gainedAbility = new AnyColorManaAbility(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add one mana of any color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Sacrifice Unbridled Growth: Draw a card. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); diff --git a/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java b/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java index 5c3e6d07ad6..edaffdd6d3f 100644 --- a/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java +++ b/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java @@ -42,7 +42,7 @@ public final class UncontrollableAnger extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and attacks each turn if able. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java b/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java index 8d6317e7256..5edf5acb0f5 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java +++ b/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java @@ -36,7 +36,7 @@ public final class UndeadAlchemist extends CardImpl { this.toughness = new MageInt(2); // If a Zombie you control would deal combat damage to a player, instead that player puts that many cards from the top of their library into their graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UndeadAlchemistEffect())); + this.addAbility(new SimpleStaticAbility(new UndeadAlchemistEffect())); // Whenever a creature card is put into an opponent's graveyard from their library, exile that card and create a 2/2 black Zombie creature token. this.addAbility(new UndeadAlchemistTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/u/UndeadWarchief.java b/Mage.Sets/src/mage/cards/u/UndeadWarchief.java index fb3a410b44e..eeb034de299 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadWarchief.java +++ b/Mage.Sets/src/mage/cards/u/UndeadWarchief.java @@ -36,10 +36,10 @@ public final class UndeadWarchief extends CardImpl { this.toughness = new MageInt(1); // Zombie spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Zombie creatures you control get +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filterCreatures, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filterCreatures, false))); } private UndeadWarchief(final UndeadWarchief card) { diff --git a/Mage.Sets/src/mage/cards/u/Undertow.java b/Mage.Sets/src/mage/cards/u/Undertow.java index e4514509bfa..1c950903900 100644 --- a/Mage.Sets/src/mage/cards/u/Undertow.java +++ b/Mage.Sets/src/mage/cards/u/Undertow.java @@ -24,7 +24,7 @@ public final class Undertow extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // Creatures with islandwalk can be blocked as though they didn't have islandwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UndertowEffect())); + this.addAbility(new SimpleStaticAbility(new UndertowEffect())); } private Undertow(final Undertow card) { diff --git a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java index 35f55b8c14c..ab7e17a10ff 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java @@ -31,10 +31,10 @@ public final class UnderworldCerberus extends CardImpl { this.toughness = new MageInt(6); // Underworld Cerberus can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); // Cards in graveyards can't be the targets of spells or abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedCardsGraveyardsEffect())); // When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand. Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/u/UnderworldConnections.java b/Mage.Sets/src/mage/cards/u/UnderworldConnections.java index ce3b1a2e722..c1f4ae4434e 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldConnections.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldConnections.java @@ -46,7 +46,7 @@ public final class UnderworldConnections extends CardImpl { // Enchanted land has "{T}, Pay 1 life: Draw a card." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); gainedAbility.addCost(new PayLifeCost(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } private UnderworldConnections(final UnderworldConnections card) { diff --git a/Mage.Sets/src/mage/cards/u/UndyingRage.java b/Mage.Sets/src/mage/cards/u/UndyingRage.java index 4c199ef5a50..6d8324abaff 100644 --- a/Mage.Sets/src/mage/cards/u/UndyingRage.java +++ b/Mage.Sets/src/mage/cards/u/UndyingRage.java @@ -41,7 +41,7 @@ public final class UndyingRage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and can't block. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield)); Effect effect = new CantBlockAttachedEffect(AttachmentType.AURA); effect.setText("and can't block"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java b/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java index 45bcfd5af7a..cddc8a17a9a 100644 --- a/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java +++ b/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java @@ -39,7 +39,7 @@ public final class UnflinchingCourage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has trample and lifelink. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA).setText("and has trample")); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA).setText("and lifelink")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UnholyCitadel.java b/Mage.Sets/src/mage/cards/u/UnholyCitadel.java index baef413e2f8..a4160d016ea 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyCitadel.java +++ b/Mage.Sets/src/mage/cards/u/UnholyCitadel.java @@ -31,7 +31,7 @@ public final class UnholyCitadel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Black legendary creatures you control have "bands with other legendary creatures." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter) .withForceQuotes() )); diff --git a/Mage.Sets/src/mage/cards/u/UnholyStrength.java b/Mage.Sets/src/mage/cards/u/UnholyStrength.java index cdf98d16380..25df7b830d1 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyStrength.java +++ b/Mage.Sets/src/mage/cards/u/UnholyStrength.java @@ -33,7 +33,7 @@ public final class UnholyStrength extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/u/UnstableMutation.java b/Mage.Sets/src/mage/cards/u/UnstableMutation.java index f9a90ca7301..3bb618a1600 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableMutation.java +++ b/Mage.Sets/src/mage/cards/u/UnstableMutation.java @@ -38,7 +38,7 @@ public final class UnstableMutation extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3))); // At the beginning of the upkeep of enchanted creature's controller, put a -1/-1 counter on that creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new AddCountersAttachedEffect(CounterType.M1M1.createInstance(), "that creature"), false)); diff --git a/Mage.Sets/src/mage/cards/u/UntamedHunger.java b/Mage.Sets/src/mage/cards/u/UntamedHunger.java index afa8b15c3c1..fe5a8ce2b8f 100644 --- a/Mage.Sets/src/mage/cards/u/UntamedHunger.java +++ b/Mage.Sets/src/mage/cards/u/UntamedHunger.java @@ -38,7 +38,7 @@ public final class UntamedHunger extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.AURA); effect.setText("and has menace. " + "(It can't be blocked except by two or more creatures.)"); diff --git a/Mage.Sets/src/mage/cards/u/UnwindingClock.java b/Mage.Sets/src/mage/cards/u/UnwindingClock.java index 9d694b6663b..a01f5311018 100644 --- a/Mage.Sets/src/mage/cards/u/UnwindingClock.java +++ b/Mage.Sets/src/mage/cards/u/UnwindingClock.java @@ -22,7 +22,7 @@ public final class UnwindingClock extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Untap all artifacts you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UnwindingClockEffect())); + this.addAbility(new SimpleStaticAbility(new UnwindingClockEffect())); } private UnwindingClock(final UnwindingClock card) { diff --git a/Mage.Sets/src/mage/cards/u/UphillBattle.java b/Mage.Sets/src/mage/cards/u/UphillBattle.java index 2b0c15add39..b50e14fd2f6 100644 --- a/Mage.Sets/src/mage/cards/u/UphillBattle.java +++ b/Mage.Sets/src/mage/cards/u/UphillBattle.java @@ -28,7 +28,7 @@ public final class UphillBattle extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // Creatures played by your opponents enter the battlefield tapped. - Ability tapAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new UphillBattleTapEffect()); + Ability tapAbility = new SimpleStaticAbility(new UphillBattleTapEffect()); tapAbility.addWatcher(new PermanentWasCastWatcher()); tapAbility.addWatcher(new PlayCreatureLandWatcher()); addAbility(tapAbility); diff --git a/Mage.Sets/src/mage/cards/u/Upwelling.java b/Mage.Sets/src/mage/cards/u/Upwelling.java index f3cab721987..1ffe4527a90 100644 --- a/Mage.Sets/src/mage/cards/u/Upwelling.java +++ b/Mage.Sets/src/mage/cards/u/Upwelling.java @@ -28,7 +28,7 @@ public final class Upwelling extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // Mana pools don't empty as steps and phases end. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UpwellingRuleEffect())); + this.addAbility(new SimpleStaticAbility(new UpwellingRuleEffect())); } diff --git a/Mage.Sets/src/mage/cards/u/UrDrago.java b/Mage.Sets/src/mage/cards/u/UrDrago.java index ab5c3c8f2fc..83f59ef705a 100644 --- a/Mage.Sets/src/mage/cards/u/UrDrago.java +++ b/Mage.Sets/src/mage/cards/u/UrDrago.java @@ -29,7 +29,7 @@ public final class UrDrago extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Creatures with swampwalk can be blocked as though they didn't have swampwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UrDragoEffect())); + this.addAbility(new SimpleStaticAbility(new UrDragoEffect())); } private UrDrago(final UrDrago card) { diff --git a/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java b/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java index 253696103ca..4010c35d81e 100644 --- a/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java +++ b/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java @@ -36,8 +36,8 @@ public final class UrbanBurgeoning extends CardImpl { this.addAbility(ability); // Enchanted land has "Untap this land during each other player's untap step." - Ability gainedAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new UrbanBurgeoningUntapEffect()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); + Ability gainedAbility = new SimpleStaticAbility(new UrbanBurgeoningUntapEffect()); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } private UrbanBurgeoning(final UrbanBurgeoning card) { diff --git a/Mage.Sets/src/mage/cards/u/UrborgShambler.java b/Mage.Sets/src/mage/cards/u/UrborgShambler.java index 007875398a2..9a279ffe3c5 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgShambler.java +++ b/Mage.Sets/src/mage/cards/u/UrborgShambler.java @@ -35,7 +35,7 @@ public final class UrborgShambler extends CardImpl { this.toughness = new MageInt(3); // Other black creatures get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java b/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java index 240a6814c9a..ec9c0280b69 100644 --- a/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java +++ b/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java @@ -34,7 +34,7 @@ public final class UrilTheMiststalker extends CardImpl { // Uril, the Miststalker gets +2/+2 for each Aura attached to it. AuraAttachedCount count = new AuraAttachedCount(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasArmor.java b/Mage.Sets/src/mage/cards/u/UrzasArmor.java index 49d0334d8e4..c7e4fcfb46b 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasArmor.java +++ b/Mage.Sets/src/mage/cards/u/UrzasArmor.java @@ -23,7 +23,7 @@ public final class UrzasArmor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // If a source would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UrzasArmorEffect())); + this.addAbility(new SimpleStaticAbility(new UrzasArmorEffect())); } private UrzasArmor(final UrzasArmor card) { diff --git a/Mage.Sets/src/mage/cards/u/UrzasFilter.java b/Mage.Sets/src/mage/cards/u/UrzasFilter.java index 2c56e1c84c2..369a04e2be5 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasFilter.java +++ b/Mage.Sets/src/mage/cards/u/UrzasFilter.java @@ -27,7 +27,7 @@ public final class UrzasFilter extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Multicolored spells cost up to {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionAllEffect(filter, 2, true))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionAllEffect(filter, 2, true))); } private UrzasFilter(final UrzasFilter card) { diff --git a/Mage.Sets/src/mage/cards/u/UtopiaVow.java b/Mage.Sets/src/mage/cards/u/UtopiaVow.java index c1fcf371065..8358a8e1f4e 100644 --- a/Mage.Sets/src/mage/cards/u/UtopiaVow.java +++ b/Mage.Sets/src/mage/cards/u/UtopiaVow.java @@ -39,12 +39,12 @@ public final class UtopiaVow extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // Enchanted creature has "{tap}: Add one mana of any color." Effect effect = new GainAbilityAttachedEffect(new AnyColorManaAbility(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"{T}: Add one mana of any color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private UtopiaVow(final UtopiaVow card) { diff --git a/Mage.Sets/src/mage/cards/v/ValorMadeReal.java b/Mage.Sets/src/mage/cards/v/ValorMadeReal.java index 79afbafc871..e6a9bf5c92d 100644 --- a/Mage.Sets/src/mage/cards/v/ValorMadeReal.java +++ b/Mage.Sets/src/mage/cards/v/ValorMadeReal.java @@ -23,7 +23,7 @@ public final class ValorMadeReal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); // Target creature can block any number of creatures this turn. - Ability gainedAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0)); + Ability gainedAbility = new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn).setText("target creature can block any number of creatures this turn")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/v/VampireNocturnus.java b/Mage.Sets/src/mage/cards/v/VampireNocturnus.java index fffa6f48b4a..bd4f7dfc3d2 100644 --- a/Mage.Sets/src/mage/cards/v/VampireNocturnus.java +++ b/Mage.Sets/src/mage/cards/v/VampireNocturnus.java @@ -39,7 +39,7 @@ public final class VampireNocturnus extends CardImpl { this.toughness = new MageInt(3); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is black, Vampire Nocturnus and other Vampire creatures you control get +2/+1 and have flying. this.addAbility(new VampireNocturnusAbility()); } diff --git a/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java b/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java index 3a53922d7bc..24a649fb9eb 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java +++ b/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java @@ -38,7 +38,7 @@ public final class VampiricEmbrace extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VampiricSliver.java b/Mage.Sets/src/mage/cards/v/VampiricSliver.java index 5ce51700c6a..a591dcccf33 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricSliver.java +++ b/Mage.Sets/src/mage/cards/v/VampiricSliver.java @@ -36,7 +36,7 @@ public final class VampiricSliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have "Whenever a creature dealt damage by this creature this turn dies, put a +1/+1 counter on this creature." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new DealtDamageAndDiedTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())), Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"Whenever a creature dealt damage by this creature this turn dies, put a +1/+1 counter on this creature.\""))); diff --git a/Mage.Sets/src/mage/cards/v/Vampirism.java b/Mage.Sets/src/mage/cards/v/Vampirism.java index 389c61837ed..f15cd158921 100644 --- a/Mage.Sets/src/mage/cards/v/Vampirism.java +++ b/Mage.Sets/src/mage/cards/v/Vampirism.java @@ -45,10 +45,10 @@ public final class Vampirism extends CardImpl { .setText("draw a card at the beginning of the next turn's upkeep"), false)); // Enchanted creature gets +1/+1 for each other creature you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VampirismBoostEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new VampirismBoostEnchantedEffect())); // Other creatures you control get -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(-1, -1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(-1, -1, Duration.WhileOnBattlefield, true))); } diff --git a/Mage.Sets/src/mage/cards/v/VanguardsShield.java b/Mage.Sets/src/mage/cards/v/VanguardsShield.java index 82d2cff90db..102d602aa77 100644 --- a/Mage.Sets/src/mage/cards/v/VanguardsShield.java +++ b/Mage.Sets/src/mage/cards/v/VanguardsShield.java @@ -31,10 +31,10 @@ public final class VanguardsShield extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +0/+3 and can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(0, 3))); // Equipped creature can block an additional creature each combat. (static abilit of equipment, no ability that will be gained to equiped creature!) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VanguardsShieldEffect())); + this.addAbility(new SimpleStaticAbility(new VanguardsShieldEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java index be008e6500f..905ed2c1237 100644 --- a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java +++ b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java @@ -40,7 +40,7 @@ public final class VanquishersBanner extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Benefit))); // Creatures you control of the chosen type get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // Whenever you cast a creature spell of the chosen type, draw a card. this.addAbility(new DrawCardIfCreatureTypeAbility()); diff --git a/Mage.Sets/src/mage/cards/v/VaporSnare.java b/Mage.Sets/src/mage/cards/v/VaporSnare.java index f1f15de5933..55c57c37551 100644 --- a/Mage.Sets/src/mage/cards/v/VaporSnare.java +++ b/Mage.Sets/src/mage/cards/v/VaporSnare.java @@ -37,7 +37,7 @@ public final class VaporSnare extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of your upkeep, sacrifice Vapor Snare unless you return a land you control to its owner's hand. Effect effect = new SacrificeSourceUnlessPaysEffect(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(1, 1, StaticFilters.FILTER_CONTROLLED_PERMANENT_A_LAND, true))); diff --git a/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java b/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java index eefc87f5ced..f7d2b56d74e 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java @@ -38,7 +38,7 @@ public final class VastwoodZendikon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new CreatureToken(6, 4, "6/4 green Elemental creature", SubType.ELEMENTAL).withColor("G"), "Enchanted land is a 6/4 green Elemental creature. It's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java b/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java index 7291d2ebcd9..cd13c064fe9 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java @@ -28,7 +28,7 @@ public final class VedalkenOrrery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // You may cast spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } private VedalkenOrrery(final VedalkenOrrery card) { diff --git a/Mage.Sets/src/mage/cards/v/Veldt.java b/Mage.Sets/src/mage/cards/v/Veldt.java index 6842342fc83..14b9ec804e3 100644 --- a/Mage.Sets/src/mage/cards/v/Veldt.java +++ b/Mage.Sets/src/mage/cards/v/Veldt.java @@ -33,7 +33,7 @@ public final class Veldt extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from Veldt. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/v/VenarianGold.java b/Mage.Sets/src/mage/cards/v/VenarianGold.java index 403df607343..aaaed1521aa 100644 --- a/Mage.Sets/src/mage/cards/v/VenarianGold.java +++ b/Mage.Sets/src/mage/cards/v/VenarianGold.java @@ -48,7 +48,7 @@ public final class VenarianGold extends CardImpl { this.addAbility(ability); // Enchanted creature doesn’t untap during its controller’s untap step if it has a sleep counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), new AttachedToCounterCondition(CounterType.SLEEP, 1)).setText("Enchanted creature doesn't untap during its controller's untap step if it has a sleep counter on it"))); // At the beginning of the upkeep of enchanted creature’s controller, remove a sleep counter from that creature. diff --git a/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java b/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java index 6d9f6685813..f74f2655681 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java +++ b/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java @@ -36,7 +36,7 @@ public final class VengefulFirebrand extends CardImpl { this.toughness = new MageInt(2); // Vengeful Firebrand has haste as long as a Warrior card is in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), VengefulFirebrandCondition.instance, "{this} has haste as long as a Warrior card is in your graveyard"))); @@ -69,4 +69,4 @@ enum VengefulFirebrandCondition implements Condition { Player player = game.getPlayer(source.getControllerId()); return player != null && player.getGraveyard().count(filter, game) > 0; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/v/VensersJournal.java b/Mage.Sets/src/mage/cards/v/VensersJournal.java index fe75601a40d..717b3365950 100644 --- a/Mage.Sets/src/mage/cards/v/VensersJournal.java +++ b/Mage.Sets/src/mage/cards/v/VensersJournal.java @@ -26,7 +26,7 @@ public final class VensersJournal extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // At the beginning of your upkeep, you gain 1 life for each card in your hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(CardsInControllerHandCount.instance) diff --git a/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java b/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java index 7aad913974d..b93646ff203 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java +++ b/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java @@ -41,7 +41,7 @@ public final class VerdantEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, create a 1/1 green Saproling creature token." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); Ability grantedAbility = new BeginningOfUpkeepTriggeredAbility(TargetController.ANY, new CreateTokenEffect(new SaprolingToken()), false); Effect effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA); effect.setText("and has \"At the beginning of each upkeep, create a 1/1 green Saproling creature token.\""); diff --git a/Mage.Sets/src/mage/cards/v/VerdantField.java b/Mage.Sets/src/mage/cards/v/VerdantField.java index 289cb616a29..44c77f795c9 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantField.java +++ b/Mage.Sets/src/mage/cards/v/VerdantField.java @@ -38,7 +38,7 @@ public final class VerdantField extends CardImpl { // 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()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +1/+1 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/v/VernalEquinox.java b/Mage.Sets/src/mage/cards/v/VernalEquinox.java index 5202c7052d3..2a062df934a 100644 --- a/Mage.Sets/src/mage/cards/v/VernalEquinox.java +++ b/Mage.Sets/src/mage/cards/v/VernalEquinox.java @@ -28,7 +28,7 @@ public final class VernalEquinox extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // Any player may cast creature and enchantment spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java b/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java index 984b139ec40..f2868043818 100644 --- a/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java +++ b/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java @@ -34,7 +34,7 @@ public final class VesuvanDoppelganger extends CardImpl { this.toughness = new MageInt(0); // You may have Vesuvan Doppelganger enter the battlefield as a copy of any creature on the battlefield except it doesn't copy that creature's color and it has "At the beginning of your upkeep, you may have this creature become a copy of target creature except it doesn't copy that creature's color and it has this ability." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new VesuvanDoppelgangerCopyEffect(), rule, true)); + Ability ability = new SimpleStaticAbility(new EntersBattlefieldEffect(new VesuvanDoppelgangerCopyEffect(), rule, true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VeteranArmorer.java b/Mage.Sets/src/mage/cards/v/VeteranArmorer.java index 0c774ca96c4..1eca4954784 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranArmorer.java +++ b/Mage.Sets/src/mage/cards/v/VeteranArmorer.java @@ -27,7 +27,7 @@ public final class VeteranArmorer extends CardImpl { this.toughness = new MageInt(2); // Other creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, true))); } private VeteranArmorer(final VeteranArmorer card) { diff --git a/Mage.Sets/src/mage/cards/v/VeteranArmorsmith.java b/Mage.Sets/src/mage/cards/v/VeteranArmorsmith.java index 32d186688e1..1c811a1669f 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranArmorsmith.java +++ b/Mage.Sets/src/mage/cards/v/VeteranArmorsmith.java @@ -32,7 +32,7 @@ public final class VeteranArmorsmith extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } private VeteranArmorsmith(final VeteranArmorsmith card) { diff --git a/Mage.Sets/src/mage/cards/v/VeteranBodyguard.java b/Mage.Sets/src/mage/cards/v/VeteranBodyguard.java index ee391e70a57..9acde8cdb6b 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranBodyguard.java +++ b/Mage.Sets/src/mage/cards/v/VeteranBodyguard.java @@ -35,7 +35,7 @@ public final class VeteranBodyguard extends CardImpl { this.toughness = new MageInt(5); // As long as Veteran Bodyguard is untapped, all damage that would be dealt to you by unblocked creatures is dealt to Veteran Bodyguard instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalPreventionEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalPreventionEffect( new VeteranBodyguardEffect(), SourceTappedCondition.UNTAPPED, "As long as {this} is untapped, all damage that would be dealt to you by unblocked creatures is dealt to {this} instead." diff --git a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java index 6c5cfc20727..3318e8b497a 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java +++ b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java @@ -39,10 +39,10 @@ public final class VeteranBrawlers extends CardImpl { this.toughness = new MageInt(4); // Veteran Brawlers can't attack if defending player controls an untapped land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackIfDefenderControlsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackIfDefenderControlsPermanent(filter))); // Veteran Brawlers can't block if you control an untapped land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VeteranBrawlersCantBlockEffect(filter))); + this.addAbility(new SimpleStaticAbility(new VeteranBrawlersCantBlockEffect(filter))); } private VeteranBrawlers(final VeteranBrawlers card) { diff --git a/Mage.Sets/src/mage/cards/v/VeteransArmaments.java b/Mage.Sets/src/mage/cards/v/VeteransArmaments.java index 8a187767d04..9af7fe5ff88 100644 --- a/Mage.Sets/src/mage/cards/v/VeteransArmaments.java +++ b/Mage.Sets/src/mage/cards/v/VeteransArmaments.java @@ -38,7 +38,7 @@ public final class VeteransArmaments extends CardImpl { Ability gainedAbility = new AttacksOrBlocksTriggeredAbility(new BoostSourceEffect(xValue, xValue, Duration.EndOfTurn), false); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"Whenever this creature attacks or blocks, it gets +1/+1 until end of turn for each attacking creature.\""); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Whenever a Soldier creature enters the battlefield, you may attach Veteran's Armaments to it. diff --git a/Mage.Sets/src/mage/cards/v/VeteransSidearm.java b/Mage.Sets/src/mage/cards/v/VeteransSidearm.java index 0497b9f5af5..fdf478f4441 100644 --- a/Mage.Sets/src/mage/cards/v/VeteransSidearm.java +++ b/Mage.Sets/src/mage/cards/v/VeteransSidearm.java @@ -24,7 +24,7 @@ public final class VeteransSidearm extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/cards/v/VibratingSphere.java b/Mage.Sets/src/mage/cards/v/VibratingSphere.java index d03a6877c97..eebee450d3b 100644 --- a/Mage.Sets/src/mage/cards/v/VibratingSphere.java +++ b/Mage.Sets/src/mage/cards/v/VibratingSphere.java @@ -23,14 +23,14 @@ public final class VibratingSphere extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // As long as it's your turn, creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, creatures you control get +2/+0")) .addHint(MyTurnHint.instance)); // As long as it's not your turn, creatures you control get -0/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(0, -2, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, "During turns other than yours, creatures you control get -0/-2"))); diff --git a/Mage.Sets/src/mage/cards/v/VictoryChimes.java b/Mage.Sets/src/mage/cards/v/VictoryChimes.java index 22123e963a4..4cf0e7d3df8 100644 --- a/Mage.Sets/src/mage/cards/v/VictoryChimes.java +++ b/Mage.Sets/src/mage/cards/v/VictoryChimes.java @@ -27,7 +27,7 @@ public final class VictoryChimes extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Untap Victory Chimes during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapSourceDuringEachOtherPlayersUntapStepEffect())); + this.addAbility(new SimpleStaticAbility(new UntapSourceDuringEachOtherPlayersUntapStepEffect())); // {T}: A player of your choice adds {C}. ManaEffect effect = new VictoryChimesManaEffect("chosen player"); diff --git a/Mage.Sets/src/mage/cards/v/VigeanHydropon.java b/Mage.Sets/src/mage/cards/v/VigeanHydropon.java index 3bc69f4c54b..96a2afa1aca 100644 --- a/Mage.Sets/src/mage/cards/v/VigeanHydropon.java +++ b/Mage.Sets/src/mage/cards/v/VigeanHydropon.java @@ -32,7 +32,7 @@ public final class VigeanHydropon extends CardImpl { this.addAbility(new GraftAbility(this, 5)); // Vigean Hydropon can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VigeanHydroponEffect())); + this.addAbility(new SimpleStaticAbility(new VigeanHydroponEffect())); } private VigeanHydropon(final VigeanHydropon card) { diff --git a/Mage.Sets/src/mage/cards/v/Vigilance.java b/Mage.Sets/src/mage/cards/v/Vigilance.java index a4cae6bbb00..682973cde4f 100644 --- a/Mage.Sets/src/mage/cards/v/Vigilance.java +++ b/Mage.Sets/src/mage/cards/v/Vigilance.java @@ -26,7 +26,7 @@ public final class Vigilance extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); } private Vigilance(final Vigilance card) { diff --git a/Mage.Sets/src/mage/cards/v/Vigor.java b/Mage.Sets/src/mage/cards/v/Vigor.java index 17dfb6e3123..8a654c5c59b 100644 --- a/Mage.Sets/src/mage/cards/v/Vigor.java +++ b/Mage.Sets/src/mage/cards/v/Vigor.java @@ -37,7 +37,7 @@ public final class Vigor extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // If damage would be dealt to a creature you control other than Vigor, prevent that damage. Put a +1/+1 counter on that creature for each 1 damage prevented this way. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VigorReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new VigorReplacementEffect())); // When Vigor is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); @@ -98,4 +98,4 @@ class VigorReplacementEffect extends ReplacementEffectImpl { public VigorReplacementEffect copy() { return new VigorReplacementEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/v/VileManifestation.java b/Mage.Sets/src/mage/cards/v/VileManifestation.java index 754ba504731..e00a5399975 100644 --- a/Mage.Sets/src/mage/cards/v/VileManifestation.java +++ b/Mage.Sets/src/mage/cards/v/VileManifestation.java @@ -47,7 +47,7 @@ public final class VileManifestation extends CardImpl { DynamicValue amount = new CardsInControllerGraveyardCount(filter); Effect effect = new BoostSourceEffect(amount, StaticValue.get(0), Duration.WhileOnBattlefield); effect.setText("Vile Manifestation gets +1/+0 for each card with cycling in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Cycling {2} diff --git a/Mage.Sets/src/mage/cards/v/VillageSurvivors.java b/Mage.Sets/src/mage/cards/v/VillageSurvivors.java index 79ecac71d79..d8e7758470d 100644 --- a/Mage.Sets/src/mage/cards/v/VillageSurvivors.java +++ b/Mage.Sets/src/mage/cards/v/VillageSurvivors.java @@ -30,7 +30,7 @@ public final class VillageSurvivors extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Fateful hour - As long as you have 5 or less life, other creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, true), FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control have vigilance"))); diff --git a/Mage.Sets/src/mage/cards/v/Vineweft.java b/Mage.Sets/src/mage/cards/v/Vineweft.java index b6102395e00..6c325d42d0f 100644 --- a/Mage.Sets/src/mage/cards/v/Vineweft.java +++ b/Mage.Sets/src/mage/cards/v/Vineweft.java @@ -39,7 +39,7 @@ public final class Vineweft extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1,Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,1,Duration.WhileOnBattlefield))); // {4}{G}: Return Vineweft from your graveyard to your hand. this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{4}{G}"))); diff --git a/Mage.Sets/src/mage/cards/v/ViridianBetrayers.java b/Mage.Sets/src/mage/cards/v/ViridianBetrayers.java index 2494d967ae3..4ec441454a2 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianBetrayers.java +++ b/Mage.Sets/src/mage/cards/v/ViridianBetrayers.java @@ -38,7 +38,7 @@ public final class ViridianBetrayers extends CardImpl { // Viridian Betrayers has infect as long as an opponent is poisoned. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(InfectAbility.getInstance()), PoisonedCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private ViridianBetrayers(final ViridianBetrayers card) { diff --git a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java index 7a2ee2c6356..db89c47508d 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java +++ b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java @@ -34,7 +34,7 @@ public final class ViridianLongbow extends CardImpl { effect.setText("This creature deals 1 damage to any target"); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // Equip {3} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/cards/v/VirulentPlague.java b/Mage.Sets/src/mage/cards/v/VirulentPlague.java index f7f0e862dcc..0433fb479a6 100644 --- a/Mage.Sets/src/mage/cards/v/VirulentPlague.java +++ b/Mage.Sets/src/mage/cards/v/VirulentPlague.java @@ -27,7 +27,7 @@ public final class VirulentPlague extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); // Creature tokens get -2/-2 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-2,-2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-2,-2, Duration.WhileOnBattlefield, filter, false))); } private VirulentPlague(final VirulentPlague card) { diff --git a/Mage.Sets/src/mage/cards/v/VisceridArmor.java b/Mage.Sets/src/mage/cards/v/VisceridArmor.java index ae1e7db6ad2..32529307ee0 100644 --- a/Mage.Sets/src/mage/cards/v/VisceridArmor.java +++ b/Mage.Sets/src/mage/cards/v/VisceridArmor.java @@ -37,7 +37,7 @@ public final class VisceridArmor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {1}{U}: Return Viscerid Armor to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VishgrazTheDoomhive.java b/Mage.Sets/src/mage/cards/v/VishgrazTheDoomhive.java index 16283393c69..2457142115a 100644 --- a/Mage.Sets/src/mage/cards/v/VishgrazTheDoomhive.java +++ b/Mage.Sets/src/mage/cards/v/VishgrazTheDoomhive.java @@ -40,7 +40,7 @@ public final class VishgrazTheDoomhive extends CardImpl { // Vishgraz gets +1/+1 for each poison counter your opponents have. DynamicValue value = OpponentsPoisonCountersCount.instance; - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); } private VishgrazTheDoomhive(final VishgrazTheDoomhive card) { diff --git a/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java b/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java index 7dc0f3bfdf8..9c2ba2517e0 100644 --- a/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java +++ b/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java @@ -42,7 +42,7 @@ public final class VisionsOfBrutality extends CardImpl { this.addAbility(ability); // Enchanted creature can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantBlockAttachedEffect(AttachmentType.AURA))); // Whenever enchanted creature deals damage, its controller loses that much life. this.addAbility(new DealsDamageAttachedTriggeredAbility(Zone.BATTLEFIELD, new VisionsOfBrutalityEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/v/VizierOfRemedies.java b/Mage.Sets/src/mage/cards/v/VizierOfRemedies.java index f8a6edc8095..dae903d5ce5 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfRemedies.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfRemedies.java @@ -28,7 +28,7 @@ public final class VizierOfRemedies extends CardImpl { this.toughness = new MageInt(1); // If one or more -1/-1 counters would be put on a creature you control, that many -1/-1 counters minus one are put on it instead. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VizierOfRemediesReplacementEffect())); + addAbility(new SimpleStaticAbility(new VizierOfRemediesReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/v/VodalianKnights.java b/Mage.Sets/src/mage/cards/v/VodalianKnights.java index 8c275d5c35e..30d5f8b7f89 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianKnights.java +++ b/Mage.Sets/src/mage/cards/v/VodalianKnights.java @@ -34,7 +34,7 @@ public final class VodalianKnights extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Vodalian Knights can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // When you control no Islands, sacrifice Vodalian Knights. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/v/VodalianSerpent.java b/Mage.Sets/src/mage/cards/v/VodalianSerpent.java index 07c3037d8e5..c9e2177d7a9 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianSerpent.java +++ b/Mage.Sets/src/mage/cards/v/VodalianSerpent.java @@ -33,7 +33,7 @@ public final class VodalianSerpent extends CardImpl { // Kicker {2} this.addAbility(new KickerAbility("{2}")); // Vodalian Serpent can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // If Vodalian Serpent was kicked, it enters with four +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)), KickedCondition.ONCE, "If {this} was kicked, it enters with four +1/+1 counters on it.", "")); diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfAll.java b/Mage.Sets/src/mage/cards/v/VoiceOfAll.java index 3bd9226fd89..3563d5fe52d 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfAll.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfAll.java @@ -34,7 +34,7 @@ public final class VoiceOfAll extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Voice of All has protection from the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorSourceEffect())); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorSourceEffect())); } private VoiceOfAll(final VoiceOfAll card) { diff --git a/Mage.Sets/src/mage/cards/v/VoidMaw.java b/Mage.Sets/src/mage/cards/v/VoidMaw.java index cb8dd55041c..ef14d5065a5 100644 --- a/Mage.Sets/src/mage/cards/v/VoidMaw.java +++ b/Mage.Sets/src/mage/cards/v/VoidMaw.java @@ -41,7 +41,7 @@ public final class VoidMaw extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // If another creature would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VoidMawEffect())); + 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())); diff --git a/Mage.Sets/src/mage/cards/v/VoidWinnower.java b/Mage.Sets/src/mage/cards/v/VoidWinnower.java index 7d258680be5..e824bb46f49 100644 --- a/Mage.Sets/src/mage/cards/v/VoidWinnower.java +++ b/Mage.Sets/src/mage/cards/v/VoidWinnower.java @@ -29,10 +29,10 @@ public final class VoidWinnower extends CardImpl { this.toughness = new MageInt(9); // Your opponent can't cast spells with even converted mana costs. (Zero is even.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VoidWinnowerCantCastEffect())); + this.addAbility(new SimpleStaticAbility(new VoidWinnowerCantCastEffect())); // Your opponents can't block with creatures with even converted mana costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VoidWinnowerCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new VoidWinnowerCantBlockEffect())); } private VoidWinnower(final VoidWinnower card) { diff --git a/Mage.Sets/src/mage/cards/v/VoidstoneGargoyle.java b/Mage.Sets/src/mage/cards/v/VoidstoneGargoyle.java index 6d82e5a5049..a93017d6638 100644 --- a/Mage.Sets/src/mage/cards/v/VoidstoneGargoyle.java +++ b/Mage.Sets/src/mage/cards/v/VoidstoneGargoyle.java @@ -34,9 +34,9 @@ public final class VoidstoneGargoyle extends CardImpl { // As Voidstone Gargoyle enters the battlefield, name a nonland card. this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME))); // The named card can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VoidstoneGargoyleReplacementEffect1())); + this.addAbility(new SimpleStaticAbility(new VoidstoneGargoyleReplacementEffect1())); // Activated abilities of sources with the chosen name can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VoidstoneGargoyleRuleModifyingEffect2())); + this.addAbility(new SimpleStaticAbility(new VoidstoneGargoyleRuleModifyingEffect2())); } private VoidstoneGargoyle(final VoidstoneGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/v/VolcanicStrength.java b/Mage.Sets/src/mage/cards/v/VolcanicStrength.java index 6d9dcbdd39b..5ffd3906eec 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicStrength.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicStrength.java @@ -40,7 +40,7 @@ public final class VolcanicStrength extends CardImpl { // Enchanted creature gets +2/+2 and has mountainwalk. Effect effect = new GainAbilityAttachedEffect(new MountainwalkAbility(), AttachmentType.AURA); effect.setText("and has mountainwalk"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VolitionReins.java b/Mage.Sets/src/mage/cards/v/VolitionReins.java index 95462115853..cb212abf9c4 100644 --- a/Mage.Sets/src/mage/cards/v/VolitionReins.java +++ b/Mage.Sets/src/mage/cards/v/VolitionReins.java @@ -38,7 +38,7 @@ public final class VolitionReins extends CardImpl { // When Volition Reins enters the battlefield, if enchanted permanent is tapped, untap it. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapVolitionReinsEffect())); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); } private VolitionReins(final VolitionReins card) { diff --git a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java index a551b74797c..0bbd5b15072 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java @@ -44,7 +44,7 @@ public final class VolrathsCurse extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. That creature's controller may sacrifice a permanent for that player to ignore this effect until end of turn. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new VolrathsCurseRestrictionEffect()); + ability = new SimpleStaticAbility(new VolrathsCurseRestrictionEffect()); ability.addEffect(new VolrathsCurseCantActivateAbilitiesEffect()); this.addAbility(ability); this.addAbility(new VolrathsCurseSpecialAction()); diff --git a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java index 3585ed7743e..3e901bc8f1e 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java @@ -29,7 +29,7 @@ public final class VolrathsShapeshifter extends CardImpl { this.toughness = new MageInt(1); // As long as the top card of your graveyard is a creature card, Volrath's Shapeshifter has the full text of that card and has the text "{2}: Discard a card." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VolrathsShapeshifterEffect())); + this.addAbility(new SimpleStaticAbility(new VolrathsShapeshifterEffect())); // {2}: Discard a card. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/v/VoraciousReader.java b/Mage.Sets/src/mage/cards/v/VoraciousReader.java index c748b81c3b2..55306887a45 100644 --- a/Mage.Sets/src/mage/cards/v/VoraciousReader.java +++ b/Mage.Sets/src/mage/cards/v/VoraciousReader.java @@ -42,7 +42,7 @@ public final class VoraciousReader extends CardImpl { this.addAbility(new ProwessAbility()); // Instant and sorcery spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private VoraciousReader(final VoraciousReader card) { diff --git a/Mage.Sets/src/mage/cards/v/VorracBattlehorns.java b/Mage.Sets/src/mage/cards/v/VorracBattlehorns.java index 48ea60709af..172e49317a2 100644 --- a/Mage.Sets/src/mage/cards/v/VorracBattlehorns.java +++ b/Mage.Sets/src/mage/cards/v/VorracBattlehorns.java @@ -29,7 +29,7 @@ public final class VorracBattlehorns extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has trample and can't be blocked by more than one creature. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.EQUIPMENT); effect.setText("and can't be blocked by more than one creature"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VowOfDuty.java b/Mage.Sets/src/mage/cards/v/VowOfDuty.java index c718aae920c..48f77c026a8 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfDuty.java +++ b/Mage.Sets/src/mage/cards/v/VowOfDuty.java @@ -40,7 +40,7 @@ public final class VowOfDuty extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has vigilance, and can't attack you or a planeswalker you control. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText(", has vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VowOfFlight.java b/Mage.Sets/src/mage/cards/v/VowOfFlight.java index 61f510a6ec3..453ba4e55b7 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfFlight.java +++ b/Mage.Sets/src/mage/cards/v/VowOfFlight.java @@ -40,7 +40,7 @@ public final class VowOfFlight extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has flying, and can't attack you or a planeswalker you control. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText(", has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VowOfLightning.java b/Mage.Sets/src/mage/cards/v/VowOfLightning.java index 9c1314fa7c4..336baccea5e 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfLightning.java +++ b/Mage.Sets/src/mage/cards/v/VowOfLightning.java @@ -40,7 +40,7 @@ public final class VowOfLightning extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has first strike, and can't attack you or a planeswalker you control. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText(", has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VowOfMalice.java b/Mage.Sets/src/mage/cards/v/VowOfMalice.java index d834b0d6a11..06133a4f8fb 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfMalice.java +++ b/Mage.Sets/src/mage/cards/v/VowOfMalice.java @@ -40,7 +40,7 @@ public final class VowOfMalice extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has intimidate, and can't attack you or a planeswalker you control. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText(", has intimidate"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VowOfWildness.java b/Mage.Sets/src/mage/cards/v/VowOfWildness.java index f0104a88852..54931bf21ee 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfWildness.java +++ b/Mage.Sets/src/mage/cards/v/VowOfWildness.java @@ -41,7 +41,7 @@ public final class VowOfWildness extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3, has trample, and can't attack you or a planeswalker you control. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3,Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3,3,Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText(", has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VrynWingmare.java b/Mage.Sets/src/mage/cards/v/VrynWingmare.java index 8b7d1e18260..406d304878e 100644 --- a/Mage.Sets/src/mage/cards/v/VrynWingmare.java +++ b/Mage.Sets/src/mage/cards/v/VrynWingmare.java @@ -36,7 +36,7 @@ public final class VrynWingmare extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private VrynWingmare(final VrynWingmare card) { diff --git a/Mage.Sets/src/mage/cards/v/VulshokBattlegear.java b/Mage.Sets/src/mage/cards/v/VulshokBattlegear.java index 3eec213315f..d312ec0cbb3 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokBattlegear.java +++ b/Mage.Sets/src/mage/cards/v/VulshokBattlegear.java @@ -24,7 +24,7 @@ public final class VulshokBattlegear extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); this.subtype.add(SubType.EQUIPMENT); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 3))); } private VulshokBattlegear(final VulshokBattlegear card) { diff --git a/Mage.Sets/src/mage/cards/v/VulshokGauntlets.java b/Mage.Sets/src/mage/cards/v/VulshokGauntlets.java index 43c2632b27b..89226e8ac9f 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokGauntlets.java +++ b/Mage.Sets/src/mage/cards/v/VulshokGauntlets.java @@ -34,7 +34,7 @@ public final class VulshokGauntlets extends CardImpl { // Equipped creature gets +4/+2 and doesn't untap during its controller's untap step. Effect effect = new BoostEquippedEffect(4, 2); effect.setText("Equipped creature gets +4/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new VulshokGauntletsEffect(); effect.setText("and has doesn't untap during its controller's untap step"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VulshokMorningstar.java b/Mage.Sets/src/mage/cards/v/VulshokMorningstar.java index 241c22fad12..cebcf93a6e6 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokMorningstar.java +++ b/Mage.Sets/src/mage/cards/v/VulshokMorningstar.java @@ -22,7 +22,7 @@ public final class VulshokMorningstar extends CardImpl { public VulshokMorningstar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } -- 2.47.2 From 65a9f19a2c9efd749b310e74b732d76679b35498 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:16:38 -0500 Subject: [PATCH 23/50] refactor: SimpleStaticAbility default zone (cards W X Y Z) --- Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfDiffusion.java | 4 ++-- Mage.Sets/src/mage/cards/w/WallOfGlare.java | 2 +- Mage.Sets/src/mage/cards/w/WanderingEye.java | 2 +- Mage.Sets/src/mage/cards/w/WanderingWolf.java | 2 +- Mage.Sets/src/mage/cards/w/WarFalcon.java | 3 +-- Mage.Sets/src/mage/cards/w/WardOfBones.java | 2 +- Mage.Sets/src/mage/cards/w/WardOfLights.java | 2 +- Mage.Sets/src/mage/cards/w/WardSliver.java | 2 +- Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java | 2 +- Mage.Sets/src/mage/cards/w/WardenOfTheWall.java | 2 +- Mage.Sets/src/mage/cards/w/WardscaleDragon.java | 2 +- Mage.Sets/src/mage/cards/w/WarlordsAxe.java | 3 +-- Mage.Sets/src/mage/cards/w/WarmongersChariot.java | 4 ++-- Mage.Sets/src/mage/cards/w/Watchdog.java | 4 ++-- Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java | 2 +- Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java | 2 +- Mage.Sets/src/mage/cards/w/WatcherSliver.java | 2 +- Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java | 4 ++-- Mage.Sets/src/mage/cards/w/WaterWurm.java | 2 +- Mage.Sets/src/mage/cards/w/Waterknot.java | 2 +- Mage.Sets/src/mage/cards/w/WayOfTheThief.java | 4 ++-- Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java | 2 +- Mage.Sets/src/mage/cards/w/Weakness.java | 2 +- Mage.Sets/src/mage/cards/w/WeaponsTrainer.java | 2 +- Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java | 2 +- Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java | 2 +- Mage.Sets/src/mage/cards/w/WeightOfConscience.java | 2 +- Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java | 2 +- Mage.Sets/src/mage/cards/w/WeirdingWood.java | 2 +- Mage.Sets/src/mage/cards/w/WellLaidPlans.java | 2 +- Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java | 2 +- Mage.Sets/src/mage/cards/w/Whimwader.java | 2 +- Mage.Sets/src/mage/cards/w/WhipSilk.java | 2 +- Mage.Sets/src/mage/cards/w/WhiteScarab.java | 4 ++-- Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java | 2 +- Mage.Sets/src/mage/cards/w/WildNacatl.java | 4 ++-- Mage.Sets/src/mage/cards/w/WildwoodGeist.java | 2 +- Mage.Sets/src/mage/cards/w/WiltLeafLiege.java | 4 ++-- Mage.Sets/src/mage/cards/w/WindZendikon.java | 2 +- Mage.Sets/src/mage/cards/w/WindbriskRaptor.java | 2 +- Mage.Sets/src/mage/cards/w/WindwrightMage.java | 2 +- Mage.Sets/src/mage/cards/w/WingSplicer.java | 2 +- Mage.Sets/src/mage/cards/w/Wingcrafter.java | 2 +- Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java | 4 ++-- Mage.Sets/src/mage/cards/w/WingsOfAesthir.java | 2 +- Mage.Sets/src/mage/cards/w/WingsOfHope.java | 2 +- Mage.Sets/src/mage/cards/w/WingsOfHubris.java | 2 +- Mage.Sets/src/mage/cards/w/WinterOrb.java | 2 +- Mage.Sets/src/mage/cards/w/Wirecat.java | 2 +- Mage.Sets/src/mage/cards/w/WitchHunt.java | 2 +- Mage.Sets/src/mage/cards/w/WitchbaneOrb.java | 2 +- Mage.Sets/src/mage/cards/w/WitchesEye.java | 2 +- Mage.Sets/src/mage/cards/w/WizenedCenn.java | 2 +- Mage.Sets/src/mage/cards/w/WizenedSnitches.java | 2 +- Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java | 2 +- Mage.Sets/src/mage/cards/w/WolfirSilverheart.java | 2 +- Mage.Sets/src/mage/cards/w/WolfkinBond.java | 2 +- Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java | 2 +- Mage.Sets/src/mage/cards/w/WoodenStake.java | 2 +- Mage.Sets/src/mage/cards/w/WoollyRazorback.java | 2 +- Mage.Sets/src/mage/cards/w/Wordmail.java | 2 +- Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java | 4 ++-- Mage.Sets/src/mage/cards/w/Worship.java | 2 +- Mage.Sets/src/mage/cards/w/WreathOfGeists.java | 2 +- Mage.Sets/src/mage/cards/w/WuAdmiral.java | 2 +- Mage.Sets/src/mage/cards/w/WuWarship.java | 2 +- Mage.Sets/src/mage/cards/w/WurmweaverCoil.java | 2 +- Mage.Sets/src/mage/cards/x/Xenograft.java | 2 +- Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java | 2 +- Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java | 4 ++-- Mage.Sets/src/mage/cards/y/YawgmothsBargain.java | 2 +- Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java | 2 +- Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java | 2 +- Mage.Sets/src/mage/cards/y/YixlidJailer.java | 4 ++-- Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java | 2 +- Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java | 2 +- Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java | 2 +- Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java | 2 +- Mage.Sets/src/mage/cards/z/ZombieMaster.java | 4 ++-- Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java | 2 +- Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java | 2 +- Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java | 2 +- 83 files changed, 96 insertions(+), 98 deletions(-) diff --git a/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java b/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java index 53b6d772d7c..a1941600818 100644 --- a/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java +++ b/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java @@ -40,7 +40,7 @@ public final class WalkerOfTheWastes extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Walker of the Wastes gets +1/+1 for each land you control named Wastes. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect( + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect( new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java b/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java index 334ae6c8f4c..dc38500fb4a 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java +++ b/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java @@ -29,7 +29,7 @@ public final class WallOfDiffusion extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Wall of Diffusion can block creatures with shadow as though Wall of Diffusion had shadow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield))); } private WallOfDiffusion(final WallOfDiffusion card) { @@ -40,4 +40,4 @@ public final class WallOfDiffusion extends CardImpl { public WallOfDiffusion copy() { return new WallOfDiffusion(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WallOfGlare.java b/Mage.Sets/src/mage/cards/w/WallOfGlare.java index 41cbbbf3d82..dd924d959c7 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfGlare.java +++ b/Mage.Sets/src/mage/cards/w/WallOfGlare.java @@ -28,7 +28,7 @@ public final class WallOfGlare extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Wall of Glare can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private WallOfGlare(final WallOfGlare card) { diff --git a/Mage.Sets/src/mage/cards/w/WanderingEye.java b/Mage.Sets/src/mage/cards/w/WanderingEye.java index f720cfe64eb..c1dbf1b4237 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingEye.java +++ b/Mage.Sets/src/mage/cards/w/WanderingEye.java @@ -28,7 +28,7 @@ public final class WanderingEye extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Players play with their hands revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithHandRevealedEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new PlayWithHandRevealedEffect(TargetController.ANY))); } private WanderingEye(final WanderingEye card) { diff --git a/Mage.Sets/src/mage/cards/w/WanderingWolf.java b/Mage.Sets/src/mage/cards/w/WanderingWolf.java index fb1e49adc18..666f74d2e65 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingWolf.java +++ b/Mage.Sets/src/mage/cards/w/WanderingWolf.java @@ -25,7 +25,7 @@ public final class WanderingWolf extends CardImpl { this.toughness = new MageInt(1); // Creatures with power less than Wandering Wolf's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private WanderingWolf(final WanderingWolf card) { diff --git a/Mage.Sets/src/mage/cards/w/WarFalcon.java b/Mage.Sets/src/mage/cards/w/WarFalcon.java index 75b28494de4..ec066f5553a 100644 --- a/Mage.Sets/src/mage/cards/w/WarFalcon.java +++ b/Mage.Sets/src/mage/cards/w/WarFalcon.java @@ -34,7 +34,7 @@ public final class WarFalcon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // War Falcon can't attack unless you control a Knight or a Soldier. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WarFalconEffect())); + this.addAbility(new SimpleStaticAbility(new WarFalconEffect())); } private WarFalcon(final WarFalcon card) { @@ -84,4 +84,3 @@ class WarFalconEffect extends RestrictionEffect { return false; } } - diff --git a/Mage.Sets/src/mage/cards/w/WardOfBones.java b/Mage.Sets/src/mage/cards/w/WardOfBones.java index 0e7339a83d8..eb7279e5c98 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfBones.java +++ b/Mage.Sets/src/mage/cards/w/WardOfBones.java @@ -32,7 +32,7 @@ public final class WardOfBones extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // Each opponent who controls more creatures than you can't play creature cards. The same is true for artifacts, enchantments, and lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WardOfBonesEffect())); + this.addAbility(new SimpleStaticAbility(new WardOfBonesEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WardOfLights.java b/Mage.Sets/src/mage/cards/w/WardOfLights.java index e149a6a65eb..5114a37c0f3 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfLights.java +++ b/Mage.Sets/src/mage/cards/w/WardOfLights.java @@ -43,7 +43,7 @@ public final class WardOfLights extends CardImpl { // As Ward of Lights enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Enchanted creature has protection from the chosen color. This effect doesn't remove Ward of Lights. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); } private WardOfLights(final WardOfLights card) { diff --git a/Mage.Sets/src/mage/cards/w/WardSliver.java b/Mage.Sets/src/mage/cards/w/WardSliver.java index 59ce823dbc4..6d5e984883d 100644 --- a/Mage.Sets/src/mage/cards/w/WardSliver.java +++ b/Mage.Sets/src/mage/cards/w/WardSliver.java @@ -42,7 +42,7 @@ public final class WardSliver extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Protect))); // All Slivers have protection from the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WardSliverGainAbilityControlledEffect())); + this.addAbility(new SimpleStaticAbility(new WardSliverGainAbilityControlledEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java b/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java index 09f0040c610..1b5df25033b 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java @@ -38,7 +38,7 @@ public final class WardenOfEvosIsle extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creature spells with flying you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java index 0fa60be344c..80682bee3e0 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java @@ -34,7 +34,7 @@ public final class WardenOfTheWall extends CardImpl { this.addAbility(new ColorlessManaAbility()); // As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new GargoyleToken(), CardType.ARTIFACT, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, "During turns other than yours, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying")) diff --git a/Mage.Sets/src/mage/cards/w/WardscaleDragon.java b/Mage.Sets/src/mage/cards/w/WardscaleDragon.java index 872f63c9eb4..1b0af0849f4 100644 --- a/Mage.Sets/src/mage/cards/w/WardscaleDragon.java +++ b/Mage.Sets/src/mage/cards/w/WardscaleDragon.java @@ -34,7 +34,7 @@ public final class WardscaleDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As long as Wardscale Dragon is attacking, defending player can't cast spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WardscaleDragonRuleEffect())); + this.addAbility(new SimpleStaticAbility(new WardscaleDragonRuleEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WarlordsAxe.java b/Mage.Sets/src/mage/cards/w/WarlordsAxe.java index 49abf4a0158..dc359819798 100644 --- a/Mage.Sets/src/mage/cards/w/WarlordsAxe.java +++ b/Mage.Sets/src/mage/cards/w/WarlordsAxe.java @@ -26,7 +26,7 @@ public final class WarlordsAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1))); // Equip {4} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); @@ -42,4 +42,3 @@ public final class WarlordsAxe extends CardImpl { } } - diff --git a/Mage.Sets/src/mage/cards/w/WarmongersChariot.java b/Mage.Sets/src/mage/cards/w/WarmongersChariot.java index ceefa82cfb4..2ab3887fb70 100644 --- a/Mage.Sets/src/mage/cards/w/WarmongersChariot.java +++ b/Mage.Sets/src/mage/cards/w/WarmongersChariot.java @@ -25,10 +25,10 @@ public final class WarmongersChariot extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // As long as equipped creature has defender, it can attack as though it didn't have defender. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WarmongersChariotEffect())); + this.addAbility(new SimpleStaticAbility(new WarmongersChariotEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/cards/w/Watchdog.java b/Mage.Sets/src/mage/cards/w/Watchdog.java index 311d1f2c90c..3555a605fbb 100644 --- a/Mage.Sets/src/mage/cards/w/Watchdog.java +++ b/Mage.Sets/src/mage/cards/w/Watchdog.java @@ -33,9 +33,9 @@ public final class Watchdog extends CardImpl { this.toughness = new MageInt(2); // Watchdog blocks each turn if able. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); + addAbility(new SimpleStaticAbility(new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); // As long as Watchdog is untapped, all creatures attacking you get -1/-0. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(-1, 0, Duration.WhileOnBattlefield, new WatchdogFilter(), false), SourceTappedCondition.UNTAPPED, "As long as {this} is untapped, all creatures attacking you get -1/-0"))); } diff --git a/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java b/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java index 1cef365b4a8..42fb22d20dd 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java +++ b/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java @@ -31,7 +31,7 @@ public final class WatcherInTheWeb extends CardImpl { // Watcher in the Web can block an additional seven creatures each combat. Effect effect = new CanBlockAdditionalCreatureEffect(7); effect.setText("{this} can block an additional seven creatures each combat"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WatcherInTheWeb(final WatcherInTheWeb card) { diff --git a/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java b/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java index 9291749b4ef..636e7aa952d 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java +++ b/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java @@ -47,7 +47,7 @@ public final class WatcherOfTheSpheres extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creature spells with flying you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever another creature with flying you control enters, Watcher of the Spheres gets +1/+1 until end of turn. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter1, false)); diff --git a/Mage.Sets/src/mage/cards/w/WatcherSliver.java b/Mage.Sets/src/mage/cards/w/WatcherSliver.java index 4c427081b9b..deaf59c319f 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherSliver.java +++ b/Mage.Sets/src/mage/cards/w/WatcherSliver.java @@ -28,7 +28,7 @@ public final class WatcherSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, filter, false))); } private WatcherSliver(final WatcherSliver card) { diff --git a/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java b/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java index e381285d5c6..ac08669272c 100644 --- a/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java +++ b/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java @@ -45,11 +45,11 @@ public final class WatchwingScarecrow extends CardImpl { // Watchwing Scarecrow has vigilance as long as you control a white creature. ContinuousEffect effect = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Watchwing Scarecrow has flying as long as you control a blue creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/w/WaterWurm.java b/Mage.Sets/src/mage/cards/w/WaterWurm.java index 53f0100d746..7640c05809d 100644 --- a/Mage.Sets/src/mage/cards/w/WaterWurm.java +++ b/Mage.Sets/src/mage/cards/w/WaterWurm.java @@ -30,7 +30,7 @@ public final class WaterWurm extends CardImpl { this.toughness = new MageInt(1); // Water Wurm gets +0/+1 as long as an opponent controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(0, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "{this} gets +0/+1 as long as an opponent controls an Island"))); diff --git a/Mage.Sets/src/mage/cards/w/Waterknot.java b/Mage.Sets/src/mage/cards/w/Waterknot.java index 55c421ea57c..b803a938161 100644 --- a/Mage.Sets/src/mage/cards/w/Waterknot.java +++ b/Mage.Sets/src/mage/cards/w/Waterknot.java @@ -36,7 +36,7 @@ public final class Waterknot extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private Waterknot(final Waterknot card) { diff --git a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java index 7eafe85cae1..a67cb258e2a 100644 --- a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java +++ b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java @@ -44,12 +44,12 @@ public final class WayOfTheThief extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature can't be blocked as long as you control a Gate. Effect effect = new ConditionalRestrictionEffect(new CantBeBlockedAttachedEffect(AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter)); effect.setText(rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WayOfTheThief(final WayOfTheThief card) { diff --git a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java index 1287659b8e0..1fd41897c59 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java +++ b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java @@ -36,7 +36,7 @@ public final class WaywardSwordtooth extends CardImpl { new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // Wayward Sawtooth can't attack or block unless you have the city's blessing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessConditionSourceEffect(CitysBlessingCondition.instance)) + this.addAbility(new SimpleStaticAbility(new CantAttackBlockUnlessConditionSourceEffect(CitysBlessingCondition.instance)) .addHint(CitysBlessingHint.instance) ); } diff --git a/Mage.Sets/src/mage/cards/w/Weakness.java b/Mage.Sets/src/mage/cards/w/Weakness.java index 2d503f434b6..677fc2dbe72 100644 --- a/Mage.Sets/src/mage/cards/w/Weakness.java +++ b/Mage.Sets/src/mage/cards/w/Weakness.java @@ -35,7 +35,7 @@ public final class Weakness extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); } private Weakness(final Weakness card) { diff --git a/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java b/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java index c8a81625464..a4425d78e96 100644 --- a/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java +++ b/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java @@ -39,7 +39,7 @@ public final class WeaponsTrainer extends CardImpl { // Other creatures you control get +1/+0 as long as you control an Equipment. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, true), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WeaponsTrainer(final WeaponsTrainer card) { diff --git a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java index 06e1f51e339..8d0ab093541 100644 --- a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java +++ b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java @@ -35,7 +35,7 @@ public final class WeatheredBodyguards extends CardImpl { this.toughness = new MageInt(5); // As long as Weathered Bodyguards is untapped, all combat damage that would be dealt to you by unblocked creatures is dealt to Weathered Bodyguards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WeatheredBodyguardsEffect())); + this.addAbility(new SimpleStaticAbility(new WeatheredBodyguardsEffect())); // Morph {3}{W} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); diff --git a/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java b/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java index 656702b257c..281505e46ae 100644 --- a/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java +++ b/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java @@ -29,7 +29,7 @@ public final class WeequayBeastmaster extends CardImpl { this.toughness = new MageInt(1); // Monstrosity abilities you activate cost {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); // Whenever a creature you control becomes monstrous, put an additional +1/+1 counter on that creature. this.addAbility(new BecomesMonstrousTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java index 0a62d39f97b..3b850094825 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java @@ -43,7 +43,7 @@ public final class WeightOfConscience extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // Tap two untapped creatures you control that share a creature type: Exile enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAttachedEffect(), new TapTargetCost(new WeightOfConscienceTarget()))); diff --git a/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java b/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java index f225ffe82ad..304ed11080d 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java @@ -35,7 +35,7 @@ public final class WeightOfTheUnderworld extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3,-2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-3,-2, Duration.WhileOnBattlefield))); } private WeightOfTheUnderworld(final WeightOfTheUnderworld card) { diff --git a/Mage.Sets/src/mage/cards/w/WeirdingWood.java b/Mage.Sets/src/mage/cards/w/WeirdingWood.java index a665f9ad367..fc0bf8fbded 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdingWood.java +++ b/Mage.Sets/src/mage/cards/w/WeirdingWood.java @@ -46,7 +46,7 @@ public final class WeirdingWood extends CardImpl { Ability gainedAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WeirdingWood(final WeirdingWood card) { diff --git a/Mage.Sets/src/mage/cards/w/WellLaidPlans.java b/Mage.Sets/src/mage/cards/w/WellLaidPlans.java index 5000e804399..c2a5674e6d2 100644 --- a/Mage.Sets/src/mage/cards/w/WellLaidPlans.java +++ b/Mage.Sets/src/mage/cards/w/WellLaidPlans.java @@ -24,7 +24,7 @@ public final class WellLaidPlans extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // Prevent all damage that would be dealt to a creature by another creature if they share a color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WellLaidPlansPreventionEffect())); + this.addAbility(new SimpleStaticAbility(new WellLaidPlansPreventionEffect())); } private WellLaidPlans(final WellLaidPlans card) { diff --git a/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java b/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java index 891d02a85da..664d4afa559 100644 --- a/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java +++ b/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java @@ -43,7 +43,7 @@ public final class WheelOfSunAndMoon extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // If a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WheelOfSunAndMoonEffect())); + this.addAbility(new SimpleStaticAbility(new WheelOfSunAndMoonEffect())); } private WheelOfSunAndMoon(final WheelOfSunAndMoon card) { diff --git a/Mage.Sets/src/mage/cards/w/Whimwader.java b/Mage.Sets/src/mage/cards/w/Whimwader.java index c626d552ffe..4f9c0b975c2 100644 --- a/Mage.Sets/src/mage/cards/w/Whimwader.java +++ b/Mage.Sets/src/mage/cards/w/Whimwader.java @@ -35,7 +35,7 @@ public final class Whimwader extends CardImpl { this.toughness = new MageInt(4); // Whimwader can't attack unless defending player controls a blue permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); } diff --git a/Mage.Sets/src/mage/cards/w/WhipSilk.java b/Mage.Sets/src/mage/cards/w/WhipSilk.java index 1a0f3c698d1..1319d9c7ef2 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSilk.java +++ b/Mage.Sets/src/mage/cards/w/WhipSilk.java @@ -39,7 +39,7 @@ public final class WhipSilk extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); // {G}: Return Whip Silk to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.G))); } diff --git a/Mage.Sets/src/mage/cards/w/WhiteScarab.java b/Mage.Sets/src/mage/cards/w/WhiteScarab.java index 6307194c1aa..85ae7386660 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteScarab.java +++ b/Mage.Sets/src/mage/cards/w/WhiteScarab.java @@ -54,11 +54,11 @@ public final class WhiteScarab extends CardImpl { // Enchanted creature can't be blocked by white creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a white permanent"))); diff --git a/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java b/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java index 1db1781e8f3..33a342998c7 100644 --- a/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java +++ b/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java @@ -37,7 +37,7 @@ public final class WightOfPrecinctSix extends CardImpl { // Wight of Precinct Six gets +1/+1 for each creature card in your opponents' graveyards. DynamicValue boost = new CardsInOpponentGraveyardsCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(boost, boost, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(boost, boost, Duration.WhileOnBattlefield))); } private WightOfPrecinctSix(final WightOfPrecinctSix card) { diff --git a/Mage.Sets/src/mage/cards/w/WildNacatl.java b/Mage.Sets/src/mage/cards/w/WildNacatl.java index 7df81a662a5..64fc262874f 100644 --- a/Mage.Sets/src/mage/cards/w/WildNacatl.java +++ b/Mage.Sets/src/mage/cards/w/WildNacatl.java @@ -36,10 +36,10 @@ public final class WildNacatl extends CardImpl { this.toughness = new MageInt(1); // Wild Nacatl gets +1/+1 as long as you control a Mountain. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter1, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter1, 1, 1))); // Wild Nacatl gets +1/+1 as long as you control a Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter2, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter2, 1, 1))); } private WildNacatl(final WildNacatl card) { diff --git a/Mage.Sets/src/mage/cards/w/WildwoodGeist.java b/Mage.Sets/src/mage/cards/w/WildwoodGeist.java index 094742355c4..2b8aece07af 100644 --- a/Mage.Sets/src/mage/cards/w/WildwoodGeist.java +++ b/Mage.Sets/src/mage/cards/w/WildwoodGeist.java @@ -28,7 +28,7 @@ public final class WildwoodGeist extends CardImpl { this.toughness = new MageInt(3); // Wildwood Geist gets +2/+2 as long as it's your turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), MyTurnCondition.instance, "{this} gets +2/+2 as long as it's your turn")) diff --git a/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java b/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java index 4556b435c3d..d6ff06088c3 100644 --- a/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java +++ b/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java @@ -41,9 +41,9 @@ public final class WiltLeafLiege extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); // If a spell or ability an opponent controls causes you to discard Wilt-Leaf Liege, put it onto the battlefield instead of putting it into your graveyard. this.addAbility(new SimpleStaticAbility(Zone.HAND, new DiscardOntoBattlefieldEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WindZendikon.java b/Mage.Sets/src/mage/cards/w/WindZendikon.java index 8325b480e7f..210206e70e6 100644 --- a/Mage.Sets/src/mage/cards/w/WindZendikon.java +++ b/Mage.Sets/src/mage/cards/w/WindZendikon.java @@ -38,7 +38,7 @@ public final class WindZendikon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new WindZendikonElementalToken(), "Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java b/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java index 228d077589f..a939a230746 100644 --- a/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java +++ b/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java @@ -43,7 +43,7 @@ public final class WindbriskRaptor extends CardImpl { // Attacking creatures you control have lifelink. Effect effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("Attacking creatures you control have lifelink"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/w/WindwrightMage.java b/Mage.Sets/src/mage/cards/w/WindwrightMage.java index 64c534008f5..e7f71736f06 100644 --- a/Mage.Sets/src/mage/cards/w/WindwrightMage.java +++ b/Mage.Sets/src/mage/cards/w/WindwrightMage.java @@ -37,7 +37,7 @@ public final class WindwrightMage extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); // Windwright Mage has flying as long as an artifact card is in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), WindwrightMageCondition.instance, "{this} has flying as long as an artifact card is in your graveyard"))); diff --git a/Mage.Sets/src/mage/cards/w/WingSplicer.java b/Mage.Sets/src/mage/cards/w/WingSplicer.java index 9fb84b1a88c..c2536a5b208 100644 --- a/Mage.Sets/src/mage/cards/w/WingSplicer.java +++ b/Mage.Sets/src/mage/cards/w/WingSplicer.java @@ -42,7 +42,7 @@ public final class WingSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); // Golem creatures you control have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private WingSplicer(final WingSplicer card) { diff --git a/Mage.Sets/src/mage/cards/w/Wingcrafter.java b/Mage.Sets/src/mage/cards/w/Wingcrafter.java index 942789033af..05f23eba739 100644 --- a/Mage.Sets/src/mage/cards/w/Wingcrafter.java +++ b/Mage.Sets/src/mage/cards/w/Wingcrafter.java @@ -34,7 +34,7 @@ public final class Wingcrafter extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Wingcrafter is paired with another creature, both creatures have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(FlyingAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(FlyingAbility.getInstance(), ruleText))); } private Wingcrafter(final Wingcrafter card) { diff --git a/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java b/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java index 3e95a7650cf..8dbca7aebad 100644 --- a/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java +++ b/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java @@ -44,11 +44,11 @@ public final class WingrattleScarecrow extends CardImpl { // Wingrattle Scarecrow has flying as long as you control a blue creature. ContinuousEffect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Wingrattle Scarecrow has persist as long as you control a black creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(new PersistAbility(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java b/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java index 88f438932ea..325e5ba5a39 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java @@ -42,7 +42,7 @@ public final class WingsOfAesthir extends CardImpl { // Enchanted creature gets +1/+0 and has flying and first strike. Effect effect = new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield); effect.setText("enchanted creature gets +1/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/w/WingsOfHope.java b/Mage.Sets/src/mage/cards/w/WingsOfHope.java index e699d2d5cd6..8252b78d546 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfHope.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfHope.java @@ -38,7 +38,7 @@ public final class WingsOfHope extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+3 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/w/WingsOfHubris.java b/Mage.Sets/src/mage/cards/w/WingsOfHubris.java index f23a37ca4bb..96bf754eed5 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfHubris.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfHubris.java @@ -40,7 +40,7 @@ public final class WingsOfHubris extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); // Sacrifice Wings of Hubris: Equipped creature can't be blocked this turn. Sacrifice it at the beginning of the next end step. this.addAbility(new SimpleActivatedAbility(new WingsOfHubrisEffect(), new SacrificeSourceCost())); diff --git a/Mage.Sets/src/mage/cards/w/WinterOrb.java b/Mage.Sets/src/mage/cards/w/WinterOrb.java index 7a9b3167bd8..f052a445c08 100644 --- a/Mage.Sets/src/mage/cards/w/WinterOrb.java +++ b/Mage.Sets/src/mage/cards/w/WinterOrb.java @@ -27,7 +27,7 @@ public final class WinterOrb extends CardImpl { // As long as Winter Orb is untapped, players can't untap more than one land during their untap steps. // Players can't untap more than one land during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WinterOrbEffect())); + this.addAbility(new SimpleStaticAbility(new WinterOrbEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/Wirecat.java b/Mage.Sets/src/mage/cards/w/Wirecat.java index de63dd23ed0..3b8e48ae566 100644 --- a/Mage.Sets/src/mage/cards/w/Wirecat.java +++ b/Mage.Sets/src/mage/cards/w/Wirecat.java @@ -28,7 +28,7 @@ public final class Wirecat extends CardImpl { this.toughness = new MageInt(3); // Wirecat can't attack or block if an enchantment is on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WirecatEffect())); + this.addAbility(new SimpleStaticAbility(new WirecatEffect())); } private Wirecat(final Wirecat card) { diff --git a/Mage.Sets/src/mage/cards/w/WitchHunt.java b/Mage.Sets/src/mage/cards/w/WitchHunt.java index 24bf9cead9b..470b5570108 100644 --- a/Mage.Sets/src/mage/cards/w/WitchHunt.java +++ b/Mage.Sets/src/mage/cards/w/WitchHunt.java @@ -33,7 +33,7 @@ public final class WitchHunt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}"); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantGainLifeAllEffect())); // At the beginning of your upkeep, Witch Hunt deals 4 damage to you. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(4))); // At the beginning of your end step, target opponent chosen at random gains control of Witch Hunt. diff --git a/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java b/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java index 463171af825..1664f8a91f0 100644 --- a/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java +++ b/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java @@ -34,7 +34,7 @@ public final class WitchbaneOrb extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new WitchbaneOrbEffect())); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance()))); } diff --git a/Mage.Sets/src/mage/cards/w/WitchesEye.java b/Mage.Sets/src/mage/cards/w/WitchesEye.java index 4186aae9731..5f26cb3b863 100644 --- a/Mage.Sets/src/mage/cards/w/WitchesEye.java +++ b/Mage.Sets/src/mage/cards/w/WitchesEye.java @@ -32,7 +32,7 @@ public final class WitchesEye extends CardImpl { // Equipped creature has "{1}, {T}: Scry 1." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new GenericManaCost(1)); gainedAbility.addCost(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); // Equip {1} this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/w/WizenedCenn.java b/Mage.Sets/src/mage/cards/w/WizenedCenn.java index ceb8ce23ccb..f7d7f9780fa 100644 --- a/Mage.Sets/src/mage/cards/w/WizenedCenn.java +++ b/Mage.Sets/src/mage/cards/w/WizenedCenn.java @@ -33,7 +33,7 @@ public final class WizenedCenn extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // Other Kithkin creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private WizenedCenn(final WizenedCenn card) { diff --git a/Mage.Sets/src/mage/cards/w/WizenedSnitches.java b/Mage.Sets/src/mage/cards/w/WizenedSnitches.java index 27d2567f872..687c70df1bf 100644 --- a/Mage.Sets/src/mage/cards/w/WizenedSnitches.java +++ b/Mage.Sets/src/mage/cards/w/WizenedSnitches.java @@ -28,7 +28,7 @@ public final class WizenedSnitches extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Players play with the top card of their libraries revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect(true))); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect(true))); } private WizenedSnitches(final WizenedSnitches card) { diff --git a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java index 1a4f6d7c8d8..1f41fadcea3 100644 --- a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java @@ -38,7 +38,7 @@ public final class WolfhuntersQuiver extends CardImpl { abilityToGain.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{T}: This creature deals 1 damage to any target\""); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability = new SimpleStaticAbility(effect); // and "{T}: This creature deals 3 damage to target Werewolf creature." abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java b/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java index 4ed8da9a201..a3a1e01d95f 100644 --- a/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java +++ b/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java @@ -31,7 +31,7 @@ public final class WolfirSilverheart extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Wolfir Silverheart is paired with another creature, each of those creatures gets +4/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(4, 4, ruleText))); + this.addAbility(new SimpleStaticAbility(new BoostPairedEffect(4, 4, ruleText))); } private WolfirSilverheart(final WolfirSilverheart card) { diff --git a/Mage.Sets/src/mage/cards/w/WolfkinBond.java b/Mage.Sets/src/mage/cards/w/WolfkinBond.java index 088be9393e5..380b27b9a9c 100644 --- a/Mage.Sets/src/mage/cards/w/WolfkinBond.java +++ b/Mage.Sets/src/mage/cards/w/WolfkinBond.java @@ -41,7 +41,7 @@ public final class WolfkinBond extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()))); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } private WolfkinBond(final WolfkinBond card) { diff --git a/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java b/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java index 0eeace4ea22..d7db1bfdef1 100644 --- a/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java +++ b/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java @@ -40,7 +40,7 @@ public final class WoodbornBehemoth extends CardImpl { ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), eightOrMoreLandCondition, " and has trample"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(effect2); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WoodenStake.java b/Mage.Sets/src/mage/cards/w/WoodenStake.java index c31e522aad4..78e49449cfc 100644 --- a/Mage.Sets/src/mage/cards/w/WoodenStake.java +++ b/Mage.Sets/src/mage/cards/w/WoodenStake.java @@ -29,7 +29,7 @@ public final class WoodenStake extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature blocks or becomes blocked by a Vampire, destroy that creature. It can't be regenerated. this.addAbility(new WoodenStakeBlocksOrBecomesBlockedTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/w/WoollyRazorback.java b/Mage.Sets/src/mage/cards/w/WoollyRazorback.java index 244f891422c..3230c86089d 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyRazorback.java +++ b/Mage.Sets/src/mage/cards/w/WoollyRazorback.java @@ -43,7 +43,7 @@ public final class WoollyRazorback extends CardImpl { ConditionalReplacementEffect effect = new ConditionalReplacementEffect(new PreventCombatDamageBySourceEffect(Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.ICE)); effect.setText("as long as {this} has an ice counter on it, prevent all combat damage it would deal"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(DefenderAbility.getInstance()), new SourceHasCounterCondition(CounterType.ICE), "and it has defender")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Wordmail.java b/Mage.Sets/src/mage/cards/w/Wordmail.java index c9dd600220e..8cbc74618eb 100644 --- a/Mage.Sets/src/mage/cards/w/Wordmail.java +++ b/Mage.Sets/src/mage/cards/w/Wordmail.java @@ -40,7 +40,7 @@ public final class Wordmail extends CardImpl { // Enchanted creature gets +1/+1 for each word in its name. WordmailCount count = new WordmailCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(count, count, Duration.WhileOnBattlefield))); } private Wordmail(final Wordmail card) { diff --git a/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java b/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java index e11aa9a9f1a..c6f689b1904 100644 --- a/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java +++ b/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java @@ -29,10 +29,10 @@ public final class WormsOfTheEarth extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}{B}"); // Players can't play lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WormsOfTheEarthPlayEffect())); + this.addAbility(new SimpleStaticAbility(new WormsOfTheEarthPlayEffect())); // Lands can't enter the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WormsOfTheEarthEnterEffect())); + this.addAbility(new SimpleStaticAbility(new WormsOfTheEarthEnterEffect())); // At the beginning of each upkeep, any player may sacrifice two lands or have Worms of the Earth deal 5 damage to that player. If a player does either, destroy Worms of the Earth. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.ANY, new WormsOfTheEarthDestroyEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/w/Worship.java b/Mage.Sets/src/mage/cards/w/Worship.java index c1275da1eb3..0298428d656 100644 --- a/Mage.Sets/src/mage/cards/w/Worship.java +++ b/Mage.Sets/src/mage/cards/w/Worship.java @@ -22,7 +22,7 @@ public final class Worship extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WorshipReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new WorshipReplacementEffect())); } private Worship(final Worship card) { diff --git a/Mage.Sets/src/mage/cards/w/WreathOfGeists.java b/Mage.Sets/src/mage/cards/w/WreathOfGeists.java index 2c50cf1dd8f..9fd796936df 100644 --- a/Mage.Sets/src/mage/cards/w/WreathOfGeists.java +++ b/Mage.Sets/src/mage/cards/w/WreathOfGeists.java @@ -38,7 +38,7 @@ public final class WreathOfGeists extends CardImpl { // Enchanted creature gets +X/+X, where X is the number of creature cards in your graveyard. DynamicValue value = new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(value, value))); } private WreathOfGeists(final WreathOfGeists card) { diff --git a/Mage.Sets/src/mage/cards/w/WuAdmiral.java b/Mage.Sets/src/mage/cards/w/WuAdmiral.java index 6efe6aec752..371c20c4280 100644 --- a/Mage.Sets/src/mage/cards/w/WuAdmiral.java +++ b/Mage.Sets/src/mage/cards/w/WuAdmiral.java @@ -31,7 +31,7 @@ public final class WuAdmiral extends CardImpl { this.toughness = new MageInt(3); // Wu Admiral gets +1/+1 as long as an opponent controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "{this} gets +1/+1 as long as an opponent controls an Island"))); diff --git a/Mage.Sets/src/mage/cards/w/WuWarship.java b/Mage.Sets/src/mage/cards/w/WuWarship.java index 06b07e639c8..bc753d89040 100644 --- a/Mage.Sets/src/mage/cards/w/WuWarship.java +++ b/Mage.Sets/src/mage/cards/w/WuWarship.java @@ -26,7 +26,7 @@ public final class WuWarship extends CardImpl { this.toughness = new MageInt(3); // Wu Warship can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private WuWarship(final WuWarship card) { diff --git a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java index b3234732ed5..712301dff85 100644 --- a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java @@ -46,7 +46,7 @@ public final class WurmweaverCoil extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WurmToken(), 1), new ManaCostsImpl<>("{G}{G}{G}")); activatedAbility.addCost(new SacrificeSourceCost()); this.addAbility(activatedAbility); diff --git a/Mage.Sets/src/mage/cards/x/Xenograft.java b/Mage.Sets/src/mage/cards/x/Xenograft.java index 42c1f185645..372c4cf5a4a 100644 --- a/Mage.Sets/src/mage/cards/x/Xenograft.java +++ b/Mage.Sets/src/mage/cards/x/Xenograft.java @@ -27,7 +27,7 @@ public final class Xenograft extends CardImpl { // As Xenograft enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Detriment))); // Each creature you control is the chosen type in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new XenograftAddSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new XenograftAddSubtypeEffect())); } private Xenograft(final Xenograft card) { diff --git a/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java b/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java index d31ccad1b57..b6b2f813543 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java @@ -33,7 +33,7 @@ public final class YavimayaEnchantress extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } private YavimayaEnchantress(final YavimayaEnchantress card) { diff --git a/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java b/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java index 09a0a36ff7c..7927061a80f 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java +++ b/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java @@ -40,9 +40,9 @@ public final class YavimayasEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Enchanted creature gets +2/+2 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java b/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java index 5f58a6d1723..c88b6042cb6 100644 --- a/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java +++ b/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java @@ -23,7 +23,7 @@ public final class YawgmothsBargain extends CardImpl { // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Pay 1 life: Draw a card. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new PayLifeCost(1))); diff --git a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java index fcf44e9d4ab..7d32f2e2aa4 100644 --- a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java +++ b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java @@ -41,7 +41,7 @@ public final class YevaNaturesHerald extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // You may cast green creature spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } private YevaNaturesHerald(final YevaNaturesHerald card) { diff --git a/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java b/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java index f58324a77f9..13ab7ae12d1 100644 --- a/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java +++ b/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java @@ -38,7 +38,7 @@ public final class YgraEaterOfAll extends CardImpl { this.addAbility(new WardAbility(new SacrificeTargetCost(filter), false)); // Other creatures are Food artifacts in addition to their other types and have "{2}, {T}, Sacrifice this permanent: You gain 3 life." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new YgraEaterOfAllEffect())); + this.addAbility(new SimpleStaticAbility(new YgraEaterOfAllEffect())); // Whenever a Food is put into a graveyard from the battlefield, put two +1/+1 counters on Ygra, Eater of All. this.addAbility(new ZoneChangeAllTriggeredAbility(Zone.BATTLEFIELD, Zone.BATTLEFIELD, Zone.GRAVEYARD, diff --git a/Mage.Sets/src/mage/cards/y/YixlidJailer.java b/Mage.Sets/src/mage/cards/y/YixlidJailer.java index 3050e903b68..48cd9d5f3b1 100644 --- a/Mage.Sets/src/mage/cards/y/YixlidJailer.java +++ b/Mage.Sets/src/mage/cards/y/YixlidJailer.java @@ -30,8 +30,8 @@ public final class YixlidJailer extends CardImpl { this.toughness = new MageInt(1); // Cards in graveyards lose all abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new YixlidJailerEffect())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new YixlidJailerRulesEffect())); + this.addAbility(new SimpleStaticAbility(new YixlidJailerEffect())); + this.addAbility(new SimpleStaticAbility(new YixlidJailerRulesEffect())); } private YixlidJailer(final YixlidJailer card) { diff --git a/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java b/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java index 1a4dd9a037b..1f9e3e180c9 100644 --- a/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java +++ b/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java @@ -32,7 +32,7 @@ public final class YuanShaoTheIndecisive extends CardImpl { this.addAbility(HorsemanshipAbility.getInstance()); // Each creature you control can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneAllEffect(new FilterControlledCreaturePermanent()))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneAllEffect(new FilterControlledCreaturePermanent()))); } private YuanShaoTheIndecisive(final YuanShaoTheIndecisive card) { diff --git a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java index 17db1231ddf..91f83a13114 100644 --- a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java +++ b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java @@ -35,7 +35,7 @@ public final class ZephidsEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying and shroud. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java index f427c226b74..7b6e0a2d106 100644 --- a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java +++ b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java @@ -27,7 +27,7 @@ public final class ZhouYuChiefCommander extends CardImpl { this.toughness = new MageInt(8); // Zhou Yu, Chief Commander can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private ZhouYuChiefCommander(final ZhouYuChiefCommander card) { diff --git a/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java b/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java index d942cfaf157..5ce8990bead 100644 --- a/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java +++ b/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java @@ -30,7 +30,7 @@ public final class ZilorthaStrengthIncarnate extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ZilorthaStrengthIncarnateEffect())); + this.addAbility(new SimpleStaticAbility(new ZilorthaStrengthIncarnateEffect())); } private ZilorthaStrengthIncarnate(ZilorthaStrengthIncarnate card) { diff --git a/Mage.Sets/src/mage/cards/z/ZombieMaster.java b/Mage.Sets/src/mage/cards/z/ZombieMaster.java index aa45d24eb63..9e8bc0deaf3 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieMaster.java +++ b/Mage.Sets/src/mage/cards/z/ZombieMaster.java @@ -41,11 +41,11 @@ public final class ZombieMaster extends CardImpl { // Other Zombie creatures have swampwalk. Effect effect = new GainAbilityAllEffect(new SwampwalkAbility(), Duration.WhileOnBattlefield, filter, true); effect.setText("Other Zombie creatures have swampwalk. (They can't be blocked as long as defending player controls a Swamp.)"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Other Zombies have "{B}: Regenerate this permanent." effect = new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")), Duration.WhileOnBattlefield, filter, true); effect.setText("Other Zombies have \"{B}: Regenerate this permanent.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java index b3a2897e619..ed83ae25ec3 100644 --- a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java +++ b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java @@ -29,7 +29,7 @@ public final class ZuberiGoldenFeather extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Griffin creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private ZuberiGoldenFeather(final ZuberiGoldenFeather card) { diff --git a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java index 17cfc97c872..19a532e09e0 100644 --- a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java +++ b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java @@ -55,7 +55,7 @@ public final class ZurEternalSchemer extends CardImpl { // Enchantment creatures you control have deathtouch, lifelink, and hexproof. CompoundAbility compoundAbilities = new CompoundAbility(DeathtouchAbility.getInstance(), LifelinkAbility.getInstance(), HexproofAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, filter))); // {1}{W}: Target non-Aura enchantment you control becomes a creature in addition to its other types and has base power and toughness each equal to its mana value. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZurEternalSchemerEffect(), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java index da80d55a43e..c52da4dc799 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java @@ -32,7 +32,7 @@ public final class ZurgoBellstriker extends CardImpl { this.toughness = new MageInt(2); // Zurgo Bellstriker can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // Dash {1}{R} this.addAbility(new DashAbility("{1}{R}")); } -- 2.47.2 From 994c97e86ac005b9f6780714e65d63986d193838 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:17:19 -0500 Subject: [PATCH 24/50] refactor: SimpleStaticAbility default zone (tokens, emblems, etc.) --- .../main/java/mage/abilities/effects/common/InfoEffect.java | 6 +++--- .../src/main/java/mage/abilities/keyword/BestowAbility.java | 2 +- .../java/mage/abilities/keyword/LevelerCardBuilder.java | 4 ++-- .../java/mage/game/command/emblems/LukeSkywalkerEmblem.java | 2 +- .../java/mage/game/permanent/token/DaxosSpiritToken.java | 2 +- .../mage/game/permanent/token/DokaiWeaverofLifeToken.java | 2 +- .../java/mage/game/permanent/token/GutterGrimeToken.java | 2 +- .../token/KalonianTwingroveTreefolkWarriorToken.java | 2 +- .../permanent/token/NahiriTheLithomancerEquipmentToken.java | 2 +- .../java/mage/game/permanent/token/SaprolingBurstToken.java | 2 +- .../main/java/mage/game/permanent/token/TetraviteToken.java | 2 +- .../mage/game/permanent/token/VoiceOfResurgenceToken.java | 2 +- .../game/permanent/token/WastelandSurvivalGuideToken.java | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java b/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java index c1b5ab78f8f..9e6af5d650a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java @@ -53,7 +53,7 @@ public class InfoEffect extends OneShotEffect { */ public static void addInfoToPermanent(Game game, Ability source, Permanent permanent, String info, Duration duration) { // add simple static info to permanent's rules - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect(info)); + SimpleStaticAbility ability = new SimpleStaticAbility(new InfoEffect(info)); GainAbilityTargetEffect gainEffect = new GainAbilityTargetEffect(ability, duration); gainEffect.setTargetPointer(new FixedTarget(permanent, game)); @@ -70,7 +70,7 @@ public class InfoEffect extends OneShotEffect { * @param duration */ public static void addCardHintToPermanent(Game game, Ability source, Permanent permanent, Hint cardHint, Duration duration) { - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("hint")); + SimpleStaticAbility ability = new SimpleStaticAbility(new InfoEffect("hint")); ability.setRuleVisible(false); ability.addHint(cardHint); @@ -91,7 +91,7 @@ public class InfoEffect extends OneShotEffect { * @param condition */ public static void addCardHintToPermanentConditional(Game game, Ability source, Permanent permanent, Hint cardHint, Duration duration, Condition condition) { - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("hint")); + SimpleStaticAbility ability = new SimpleStaticAbility(new InfoEffect("hint")); ability.setRuleVisible(false); ability.addHint(cardHint); diff --git a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java index d4e25afec89..611d3bb2703 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java @@ -90,7 +90,7 @@ public class BestowAbility extends SpellAbility { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.addTarget(auraTarget); this.addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BestowEntersBattlefieldEffect()); + Ability ability = new SimpleStaticAbility(new BestowEntersBattlefieldEffect()); ability.setRuleVisible(false); addSubAbility(ability); } diff --git a/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java index 933f6783a64..7c28881cfdf 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java +++ b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java @@ -50,13 +50,13 @@ public class LevelerCardBuilder { for (Ability ability : abilities) { ContinuousEffect effect = new GainAbilitySourceEffect(ability); ConditionalContinuousEffect abEffect = new ConditionalContinuousEffect(effect, condition, ""); - Ability staticAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, abEffect); + Ability staticAbility = new SimpleStaticAbility(abEffect); staticAbility.setRuleVisible(false); constructed.add(staticAbility); } ContinuousEffect effect = new SetBasePowerToughnessSourceEffect(power, toughness, Duration.WhileOnBattlefield); ConditionalContinuousEffect ptEffect = new ConditionalContinuousEffect(effect, condition, rule); - constructed.add(new SimpleStaticAbility(Zone.BATTLEFIELD, ptEffect)); + constructed.add(new SimpleStaticAbility(ptEffect)); return constructed; } diff --git a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java index ad43f97d5b1..9b5b5787f37 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java @@ -19,7 +19,7 @@ public final class LukeSkywalkerEmblem extends Emblem { // -6: You get an emblem with "Prevent all damage that would be dealt to you during combat." Exile Luke Skywalker, the Last Jedi. public LukeSkywalkerEmblem() { super("Emblem Luke Skywalker"); - this.getAbilities().add(new SimpleStaticAbility(Zone.BATTLEFIELD, new LukeSkywalkerEmblemEffect())); + this.getAbilities().add(new SimpleStaticAbility(new LukeSkywalkerEmblemEffect())); } private LukeSkywalkerEmblem(final LukeSkywalkerEmblem card) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java index 1b17d54bcbf..ffe198aff1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java @@ -25,7 +25,7 @@ public final class DaxosSpiritToken extends TokenImpl { subtype.add(SubType.SPIRIT); power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DaxosSpiritSetPTEffect())); + this.addAbility(new SimpleStaticAbility(new DaxosSpiritSetPTEffect())); } private DaxosSpiritToken(final DaxosSpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java index 9216beb749a..7758f33f322 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java @@ -27,7 +27,7 @@ public final class DokaiWeaverofLifeToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filterLands); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(controlledLands, controlledLands, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(controlledLands, controlledLands, Duration.WhileOnBattlefield))); } private DokaiWeaverofLifeToken(final DokaiWeaverofLifeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java index f286e8dd9d8..eee240ce1df 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java @@ -33,7 +33,7 @@ public final class GutterGrimeToken extends TokenImpl { color.setGreen(true); power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new GutterGrimeCountersCount(sourceId)))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(new GutterGrimeCountersCount(sourceId)))); } private GutterGrimeToken(final GutterGrimeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index 6ac16b95374..b84f475ec3b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -29,7 +29,7 @@ public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterLands)))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterLands)))); } private KalonianTwingroveTreefolkWarriorToken(final KalonianTwingroveTreefolkWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java index 2e91bb1c52b..34a5562a778 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java @@ -29,7 +29,7 @@ public final class NahiriTheLithomancerEquipmentToken extends TokenImpl { this.addAbility(IndestructibleAbility.getInstance()); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5, 5)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(5, 5)); ability.addEffect(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield, "and has double strike")); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java index 6ca82ffc6a7..98a4cb519cc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java @@ -31,7 +31,7 @@ public final class SaprolingBurstToken extends TokenImpl { this.color.setGreen(true); this.subtype.add(SubType.SAPROLING); this.cardType.add(CardType.CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new SaprolingBurstTokenDynamicValue(saprolingBurstMOR)))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(new SaprolingBurstTokenDynamicValue(saprolingBurstMOR)))); } private SaprolingBurstToken(final SaprolingBurstToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java index ee48e287d45..99c42765d00 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java @@ -23,7 +23,7 @@ public final class TetraviteToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TetraviteTokenEffect())); + this.addAbility(new SimpleStaticAbility(new TetraviteTokenEffect())); } private TetraviteToken(final TetraviteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java index b11708a7fbd..875a723aa46 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java @@ -24,7 +24,7 @@ public final class VoiceOfResurgenceToken extends TokenImpl { toughness = new MageInt(0); // This creature's power and toughness are each equal to the number of creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect( + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect( CreaturesYouControlCount.instance))); } diff --git a/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java b/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java index 8894a1c2bcf..7858aa8a1d9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java @@ -27,7 +27,7 @@ public final class WastelandSurvivalGuideToken extends TokenImpl { this.cardType.add(CardType.ARTIFACT); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(xValue, xValue)).addHint(hint)); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(xValue, xValue)).addHint(hint)); this.addAbility(new EquipAbility(1, false)); } -- 2.47.2 From 39512d75ac1350fb427fcd16deadcaf1cc0626e0 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:18:19 -0500 Subject: [PATCH 25/50] refactor: SimpleStaticAbility default zone (before newline) --- Mage.Sets/src/mage/cards/a/AbzanKinGuard.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanRunemark.java | 2 +- Mage.Sets/src/mage/cards/a/AccursedWitch.java | 2 +- Mage.Sets/src/mage/cards/a/AcidicSliver.java | 2 +- Mage.Sets/src/mage/cards/a/AeronautAdmiral.java | 2 +- Mage.Sets/src/mage/cards/a/AinokArtillerist.java | 2 +- Mage.Sets/src/mage/cards/a/AlabasterLeech.java | 2 +- Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java | 2 +- Mage.Sets/src/mage/cards/a/AndraditeLeech.java | 2 +- Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java | 2 +- Mage.Sets/src/mage/cards/a/ArcaneMelee.java | 2 +- Mage.Sets/src/mage/cards/a/ArtifactWard.java | 2 +- Mage.Sets/src/mage/cards/a/Asceticism.java | 2 +- Mage.Sets/src/mage/cards/b/BatteringSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BattleBrawler.java | 2 +- Mage.Sets/src/mage/cards/b/BehindTheScenes.java | 2 +- Mage.Sets/src/mage/cards/b/BladeSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BlindSpotGiant.java | 2 +- Mage.Sets/src/mage/cards/b/BloodCursedKnight.java | 2 +- Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java | 4 ++-- Mage.Sets/src/mage/cards/b/BloodshedFever.java | 2 +- Mage.Sets/src/mage/cards/b/BonescytheSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BonesplitterSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BorealElemental.java | 2 +- Mage.Sets/src/mage/cards/b/Burrowing.java | 2 +- Mage.Sets/src/mage/cards/b/ButchersCleaver.java | 2 +- Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java | 2 +- Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java | 2 +- Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java | 2 +- Mage.Sets/src/mage/cards/c/CloudKey.java | 2 +- Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java | 2 +- Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java | 2 +- Mage.Sets/src/mage/cards/c/ConstrictingSliver.java | 2 +- Mage.Sets/src/mage/cards/c/CorruptedZendikon.java | 2 +- Mage.Sets/src/mage/cards/c/CourtHomunculus.java | 4 ++-- Mage.Sets/src/mage/cards/c/CuratorsWard.java | 2 +- Mage.Sets/src/mage/cards/d/DarkheartSliver.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelMutation.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelPlate.java | 2 +- Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java | 2 +- Mage.Sets/src/mage/cards/d/DeathcapCultivator.java | 2 +- Mage.Sets/src/mage/cards/d/DeepFreeze.java | 2 +- Mage.Sets/src/mage/cards/d/DementiaSliver.java | 2 +- Mage.Sets/src/mage/cards/d/DireWolves.java | 2 +- Mage.Sets/src/mage/cards/d/DivinityOfPride.java | 2 +- Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java | 2 +- Mage.Sets/src/mage/cards/d/DormantSliver.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java | 2 +- Mage.Sets/src/mage/cards/d/DrillSkimmer.java | 2 +- Mage.Sets/src/mage/cards/d/DryadsFavor.java | 2 +- Mage.Sets/src/mage/cards/e/ElderwoodScion.java | 4 ++-- Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java | 2 +- Mage.Sets/src/mage/cards/e/Entangler.java | 2 +- Mage.Sets/src/mage/cards/e/EtchedChampion.java | 2 +- Mage.Sets/src/mage/cards/e/Exploration.java | 2 +- Mage.Sets/src/mage/cards/f/FavorableDestiny.java | 4 ++-- Mage.Sets/src/mage/cards/f/FenStalker.java | 2 +- Mage.Sets/src/mage/cards/f/FowlPlay.java | 2 +- Mage.Sets/src/mage/cards/f/FreewindEquenaut.java | 2 +- Mage.Sets/src/mage/cards/f/FreneticSliver.java | 2 +- Mage.Sets/src/mage/cards/f/FurySliver.java | 2 +- Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java | 2 +- Mage.Sets/src/mage/cards/g/GateHound.java | 2 +- Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java | 2 +- Mage.Sets/src/mage/cards/g/GemhideSliver.java | 2 +- Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java | 2 +- Mage.Sets/src/mage/cards/g/GnatMiser.java | 2 +- Mage.Sets/src/mage/cards/g/GohamDjinn.java | 2 +- Mage.Sets/src/mage/cards/g/GraniteGrip.java | 2 +- Mage.Sets/src/mage/cards/g/GunnerConscript.java | 2 +- Mage.Sets/src/mage/cards/h/HalamDjinn.java | 2 +- Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java | 2 +- Mage.Sets/src/mage/cards/h/HazoretTheFervent.java | 2 +- Mage.Sets/src/mage/cards/h/HeadstrongBrute.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldsHorn.java | 2 +- Mage.Sets/src/mage/cards/h/HeroicDefiance.java | 2 +- Mage.Sets/src/mage/cards/h/HibernationSliver.java | 2 +- Mage.Sets/src/mage/cards/h/HiddenPath.java | 2 +- Mage.Sets/src/mage/cards/h/HoldTheGates.java | 2 +- Mage.Sets/src/mage/cards/h/Humility.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialLancer.java | 2 +- Mage.Sets/src/mage/cards/i/InBolassClutches.java | 2 +- Mage.Sets/src/mage/cards/i/IncendiaryOracle.java | 2 +- Mage.Sets/src/mage/cards/i/InnerSanctum.java | 2 +- Mage.Sets/src/mage/cards/i/InventorsApprentice.java | 2 +- Mage.Sets/src/mage/cards/i/Invisibility.java | 2 +- Mage.Sets/src/mage/cards/i/IriniSengir.java | 2 +- Mage.Sets/src/mage/cards/i/IvorytuskFortress.java | 2 +- Mage.Sets/src/mage/cards/j/JadeLeech.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaiRunemark.java | 2 +- Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java | 2 +- Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java | 2 +- Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java | 2 +- Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java | 2 +- Mage.Sets/src/mage/cards/j/JubilantSkybonder.java | 2 +- Mage.Sets/src/mage/cards/k/KavuRunner.java | 2 +- Mage.Sets/src/mage/cards/k/KessDissidentMage.java | 2 +- Mage.Sets/src/mage/cards/k/KessigDireSwine.java | 2 +- Mage.Sets/src/mage/cards/k/KirdApe.java | 2 +- Mage.Sets/src/mage/cards/k/KirdChieftain.java | 2 +- Mage.Sets/src/mage/cards/l/Lignify.java | 2 +- Mage.Sets/src/mage/cards/l/LoamLion.java | 2 +- Mage.Sets/src/mage/cards/l/LocustMiser.java | 2 +- Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java | 2 +- Mage.Sets/src/mage/cards/l/LustForWar.java | 2 +- Mage.Sets/src/mage/cards/m/MaelstromWanderer.java | 2 +- Mage.Sets/src/mage/cards/m/MagmaSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java | 2 +- Mage.Sets/src/mage/cards/m/MarduRunemark.java | 2 +- Mage.Sets/src/mage/cards/m/MesmericSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java | 2 +- Mage.Sets/src/mage/cards/m/MindwhipSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MineMineMine.java | 2 +- Mage.Sets/src/mage/cards/m/MudTrooper.java | 2 +- Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java | 2 +- Mage.Sets/src/mage/cards/m/MyrGalvanizer.java | 2 +- Mage.Sets/src/mage/cards/n/NecroticSliver.java | 2 +- Mage.Sets/src/mage/cards/n/NemesisMask.java | 2 +- Mage.Sets/src/mage/cards/n/NimDevourer.java | 2 +- Mage.Sets/src/mage/cards/n/NimGrotesque.java | 2 +- Mage.Sets/src/mage/cards/n/NullProfusion.java | 2 +- Mage.Sets/src/mage/cards/p/ParadiseMantle.java | 2 +- Mage.Sets/src/mage/cards/p/PollenbrightWings.java | 2 +- Mage.Sets/src/mage/cards/p/PoulticeSliver.java | 2 +- Mage.Sets/src/mage/cards/p/PredatorySliver.java | 2 +- Mage.Sets/src/mage/cards/p/PristineAngel.java | 2 +- Mage.Sets/src/mage/cards/p/PrizedElephant.java | 2 +- Mage.Sets/src/mage/cards/p/ProwlersHelm.java | 2 +- Mage.Sets/src/mage/cards/p/PterodonKnight.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverDagger.java | 2 +- Mage.Sets/src/mage/cards/q/QuilledSliver.java | 2 +- Mage.Sets/src/mage/cards/r/RadiantEssence.java | 2 +- Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java | 2 +- Mage.Sets/src/mage/cards/r/Rageform.java | 2 +- Mage.Sets/src/mage/cards/r/RampagingCyclops.java | 2 +- Mage.Sets/src/mage/cards/r/RangeTrooper.java | 2 +- Mage.Sets/src/mage/cards/r/RatColony.java | 2 +- Mage.Sets/src/mage/cards/r/RegisaurAlpha.java | 2 +- Mage.Sets/src/mage/cards/r/RelicRunner.java | 2 +- Mage.Sets/src/mage/cards/r/Retaliation.java | 2 +- Mage.Sets/src/mage/cards/r/RiotTrooper.java | 2 +- Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java | 2 +- Mage.Sets/src/mage/cards/r/RubyLeech.java | 2 +- Mage.Sets/src/mage/cards/r/RuhamDjinn.java | 2 +- Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java | 2 +- Mage.Sets/src/mage/cards/r/RustedRelic.java | 2 +- Mage.Sets/src/mage/cards/r/RuthlessCullblade.java | 2 +- Mage.Sets/src/mage/cards/s/SapphireLeech.java | 2 +- Mage.Sets/src/mage/cards/s/ScoriaCat.java | 2 +- Mage.Sets/src/mage/cards/s/ScreechingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SeaLegs.java | 2 +- Mage.Sets/src/mage/cards/s/SedgeSliver.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShaperApprentice.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldingPlax.java | 2 +- Mage.Sets/src/mage/cards/s/Shimmer.java | 2 +- Mage.Sets/src/mage/cards/s/SidewinderSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SkinInvasion.java | 2 +- Mage.Sets/src/mage/cards/s/SkittishKavu.java | 2 +- Mage.Sets/src/mage/cards/s/SkyriderTrainee.java | 2 +- Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java | 2 +- Mage.Sets/src/mage/cards/s/SnowTrooper.java | 2 +- Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java | 2 +- Mage.Sets/src/mage/cards/s/SpellwildOuphe.java | 4 ++-- Mage.Sets/src/mage/cards/s/SphereOfResistance.java | 2 +- Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java | 2 +- Mage.Sets/src/mage/cards/s/SpidersilkArmor.java | 2 +- Mage.Sets/src/mage/cards/s/SpittingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SpurGrappler.java | 2 +- Mage.Sets/src/mage/cards/s/Squeeze.java | 2 +- Mage.Sets/src/mage/cards/s/SteelformSliver.java | 2 +- Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java | 2 +- Mage.Sets/src/mage/cards/s/StrikingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SublimeArchangel.java | 2 +- Mage.Sets/src/mage/cards/s/SulamDjinn.java | 2 +- Mage.Sets/src/mage/cards/s/SultaiRunemark.java | 2 +- Mage.Sets/src/mage/cards/s/SummitApes.java | 2 +- Mage.Sets/src/mage/cards/s/Sunforger.java | 2 +- Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java | 2 +- Mage.Sets/src/mage/cards/s/SynchronousSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java | 2 +- Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisSentinel.java | 2 +- Mage.Sets/src/mage/cards/t/TelekineticSliver.java | 2 +- Mage.Sets/src/mage/cards/t/TemurRunemark.java | 2 +- Mage.Sets/src/mage/cards/t/TenaciousHunter.java | 2 +- Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java | 2 +- Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java | 2 +- Mage.Sets/src/mage/cards/t/ThorncasterSliver.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtDevourer.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtEater.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtNibbler.java | 2 +- Mage.Sets/src/mage/cards/t/ThresherLizard.java | 2 +- Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java | 2 +- Mage.Sets/src/mage/cards/t/ToxicIguanar.java | 2 +- Mage.Sets/src/mage/cards/t/TrueFaithCenser.java | 2 +- Mage.Sets/src/mage/cards/t/TrustedAdvisor.java | 2 +- Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasIncubator.java | 2 +- Mage.Sets/src/mage/cards/v/VeiledSerpent.java | 2 +- Mage.Sets/src/mage/cards/v/VenomSliver.java | 2 +- Mage.Sets/src/mage/cards/v/VictualSliver.java | 2 +- Mage.Sets/src/mage/cards/v/VintaraSnapper.java | 2 +- Mage.Sets/src/mage/cards/v/VirulentSliver.java | 2 +- Mage.Sets/src/mage/cards/w/WalkingDream.java | 2 +- Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java | 2 +- Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java | 2 +- Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java | 2 +- Mage.Sets/src/mage/cards/z/ZanamDjinn.java | 2 +- Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java | 2 +- Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java | 2 +- .../java/mage/game/permanent/token/KarnConstructToken.java | 2 +- .../src/main/java/mage/game/permanent/token/VrenRatToken.java | 2 +- 215 files changed, 223 insertions(+), 223 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java index d7053db0f29..ab061e35028 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java +++ b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java @@ -39,7 +39,7 @@ public final class AbzanKinGuard extends CardImpl { this.toughness = new MageInt(3); // Abzan Kin-Guard has lifelink as long as you control a white or black permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has lifelink as long as you control a white or black permanent"))); } diff --git a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java index 8f487ce98cf..2d823765b78 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java +++ b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java @@ -46,7 +46,7 @@ public final class AbzanRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has vigilance as long as you control a black or green permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has vigilance as long as you control a black or green permanent"))); } diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index beb098a87d5..242b3f8c0df 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -33,7 +33,7 @@ public final class AccursedWitch extends CardImpl { this.secondSideCardClazz = mage.cards.i.InfectiousCurse.class; // Spells your opponents cast that target Accursed Witch cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(-1, new FilterCard("Spells"), TargetController.OPPONENT)) ); diff --git a/Mage.Sets/src/mage/cards/a/AcidicSliver.java b/Mage.Sets/src/mage/cards/a/AcidicSliver.java index b808edb913f..1b99359297d 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSliver.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSliver.java @@ -36,7 +36,7 @@ public final class AcidicSliver extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{2}, Sacrifice this permanent: This permanent deals 2 damage to any target.\""))); diff --git a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java index 8171e02e55b..82abecda782 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java +++ b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java @@ -38,7 +38,7 @@ public final class AeronautAdmiral extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Vehicles you control have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java index b7239737467..07214253ef1 100644 --- a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java +++ b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java @@ -29,7 +29,7 @@ public final class AinokArtillerist extends CardImpl { this.toughness = new MageInt(1); // Ainok Artillerist has reach as long as it has a +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(ReachAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1),"{this} has reach as long as it has a +1/+1 counter on it"))); } diff --git a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java index 72083ffa179..135a6b9126a 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java @@ -34,7 +34,7 @@ public final class AlabasterLeech extends CardImpl { this.toughness = new MageInt(3); // White spells you cast cost {W} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{W}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java index 5e368fdcde3..3a4151d07c5 100644 --- a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java +++ b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java @@ -42,7 +42,7 @@ public class AllosaurusShepherd extends CardImpl { this.addAbility(new CantBeCounteredSourceAbility()); //Green spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeCounteredControlledEffect(greenSpellsFilter, null, Duration.WhileOnBattlefield))); //4GG: Until end of turn, each Elf creature you control has base power and toughness 5/5 diff --git a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java index a37f25cfbe1..97129468d68 100644 --- a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java +++ b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java @@ -33,7 +33,7 @@ public final class AndraditeLeech extends CardImpl { this.toughness = new MageInt(2); // Black spells you cast cost {B} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); // {B}: Andradite Leech gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java b/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java index 4b2ca1e2ad4..3f4c4153853 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java +++ b/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java @@ -37,7 +37,7 @@ public final class AngrathsAmbusher extends CardImpl { this.toughness = new MageInt(3); // Angrath's Ambusher gets +2/+0 as long as you control an Angrath planeswalker. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} gets +2/+0 as long as you control an Angrath planeswalker"))); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneMelee.java b/Mage.Sets/src/mage/cards/a/ArcaneMelee.java index d0e0fd124a7..76368169416 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneMelee.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneMelee.java @@ -19,7 +19,7 @@ public final class ArcaneMelee extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}"); // Instant and sorcery spells cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllEffect(new FilterInstantOrSorceryCard("Instant and sorcery spells"), 2)) ); } diff --git a/Mage.Sets/src/mage/cards/a/ArtifactWard.java b/Mage.Sets/src/mage/cards/a/ArtifactWard.java index f072a17c41b..919dbc77724 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactWard.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactWard.java @@ -33,7 +33,7 @@ public final class ArtifactWard extends CardImpl { // Enchanted creature can't be blocked by artifact creatures. // Prevent all damage that would be dealt to enchanted creature by artifact sources. // Enchanted creature can't be the target of abilities from artifact sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new ProtectionAbility(new FilterArtifactCard("artifacts")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/a/Asceticism.java b/Mage.Sets/src/mage/cards/a/Asceticism.java index bfaeb5c5c1d..2a8cadce8d1 100644 --- a/Mage.Sets/src/mage/cards/a/Asceticism.java +++ b/Mage.Sets/src/mage/cards/a/Asceticism.java @@ -26,7 +26,7 @@ public final class Asceticism extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // Creatures you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {1}{G}: Regenerate target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); diff --git a/Mage.Sets/src/mage/cards/b/BatteringSliver.java b/Mage.Sets/src/mage/cards/b/BatteringSliver.java index ac39923965a..0f2a4d0fd5e 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringSliver.java +++ b/Mage.Sets/src/mage/cards/b/BatteringSliver.java @@ -29,7 +29,7 @@ public final class BatteringSliver extends CardImpl { this.toughness = new MageInt(4); // All Sliver creatures have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/b/BattleBrawler.java b/Mage.Sets/src/mage/cards/b/BattleBrawler.java index 34c6e2bfd0b..c2cf6ab673d 100644 --- a/Mage.Sets/src/mage/cards/b/BattleBrawler.java +++ b/Mage.Sets/src/mage/cards/b/BattleBrawler.java @@ -41,7 +41,7 @@ public final class BattleBrawler extends CardImpl { this.toughness = new MageInt(2); // As long as you control a red or white permanent, Battle Brawler gets +1/+0 and has first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a red or white permanent, {this} gets +1/+0")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java index fcb2ccf536e..4a679512fc1 100644 --- a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java +++ b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java @@ -25,7 +25,7 @@ public final class BehindTheScenes extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // Creatures you control have skulk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {4}{W}: Creatures you control get +1/+1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/b/BladeSliver.java b/Mage.Sets/src/mage/cards/b/BladeSliver.java index 644d8fe77e9..aa2f92bdd92 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSliver.java +++ b/Mage.Sets/src/mage/cards/b/BladeSliver.java @@ -27,7 +27,7 @@ public final class BladeSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java index e040ce79069..d134c15a91b 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java +++ b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java @@ -35,7 +35,7 @@ public final class BlindSpotGiant extends CardImpl { this.toughness = new MageInt(3); // Blind-Spot Giant can't attack or block unless you control another Giant. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantAttackBlockUnlessConditionSourceEffect(new PermanentsOnTheBattlefieldCondition(filter)))); } diff --git a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java index 3b49b69e033..dd231a8dc25 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java +++ b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java @@ -34,7 +34,7 @@ public final class BloodCursedKnight extends CardImpl { this.toughness = new MageInt(2); // As long as you control an enchantment, Blood-Cursed Knight gets +1/+1 and has lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledEnchantmentPermanent()), rule1)); diff --git a/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java b/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java index 6cd71a597dd..cad369344c9 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java @@ -34,7 +34,7 @@ public final class BloodfireEnforcers extends CardImpl { this.toughness = new MageInt(2); // Bloodfire Enforcers has first strike and trample as long as an instant card and a sorcery card are in your graveyard. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new BloodfireEnforcersCondition(), "{this} has first strike")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), @@ -80,4 +80,4 @@ class BloodfireEnforcersCondition implements Condition { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/BloodshedFever.java b/Mage.Sets/src/mage/cards/b/BloodshedFever.java index 356671b375b..9d2e654e30d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshedFever.java +++ b/Mage.Sets/src/mage/cards/b/BloodshedFever.java @@ -31,7 +31,7 @@ public final class BloodshedFever extends CardImpl { this.addAbility(ability); // Enchanted creature attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/b/BonescytheSliver.java b/Mage.Sets/src/mage/cards/b/BonescytheSliver.java index fc222e32f03..52a7a00f659 100644 --- a/Mage.Sets/src/mage/cards/b/BonescytheSliver.java +++ b/Mage.Sets/src/mage/cards/b/BonescytheSliver.java @@ -28,7 +28,7 @@ public final class BonescytheSliver extends CardImpl { this.toughness = new MageInt(2); // Sliver creatures you control have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java b/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java index 70c8ec855c0..acbbfdef7a8 100644 --- a/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java +++ b/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java @@ -26,7 +26,7 @@ public final class BonesplitterSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BorealElemental.java b/Mage.Sets/src/mage/cards/b/BorealElemental.java index df54bda0db4..a7880c186b6 100644 --- a/Mage.Sets/src/mage/cards/b/BorealElemental.java +++ b/Mage.Sets/src/mage/cards/b/BorealElemental.java @@ -30,7 +30,7 @@ public final class BorealElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Spells your opponents cast that target Boreal Elemental cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/b/Burrowing.java b/Mage.Sets/src/mage/cards/b/Burrowing.java index fcaa926c749..3a04f120252 100644 --- a/Mage.Sets/src/mage/cards/b/Burrowing.java +++ b/Mage.Sets/src/mage/cards/b/Burrowing.java @@ -34,7 +34,7 @@ public final class Burrowing extends CardImpl { this.addAbility(ability); // Enchanted creature has mountainwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new MountainwalkAbility(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java index edfd66a7031..b1810ec51e0 100644 --- a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java +++ b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java @@ -30,7 +30,7 @@ public final class ButchersCleaver extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); // As long as equipped creature is a Human, it has lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); diff --git a/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java b/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java index 949f6307a60..2ed92de5796 100644 --- a/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java +++ b/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java @@ -46,7 +46,7 @@ public final class CallapheBelovedOfTheSea extends CardImpl { ).addHint(DevotionCount.U.getHint())); // Creatures and enchantments you control have "Spells your opponents cast that target this permanent cost {1} more to cast". - Ability gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability gainAbility = new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(1, new FilterCard("Spells"), TargetController.OPPONENT) .withTargetName("this permanent") ); diff --git a/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java b/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java index 2be4743f90c..8bb75dd5273 100644 --- a/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java +++ b/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java @@ -56,7 +56,7 @@ public final class CamelliaTheSeedmiser extends CardImpl { this.addAbility(new MenaceAbility(false)); // Other Squirrels you control have menace. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new MenaceAbility(false), Duration.WhileOnBattlefield, filterSquirrelCreatures, diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java b/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java index 4e7562014c4..e92cc673d99 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java @@ -38,7 +38,7 @@ public final class ChampionOfTheFlame extends CardImpl { DynamicValue auraAmount = new AuraAttachedCount(2); DynamicValue equipAmount = new EquipmentAttachedCount(2); DynamicValue totalAmount = new AdditiveDynamicValue(auraAmount, equipAmount); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(totalAmount, totalAmount, Duration.WhileOnBattlefield) .setText("{this} gets +2/+2 for each Aura and Equipment attached to it"))); } diff --git a/Mage.Sets/src/mage/cards/c/CloudKey.java b/Mage.Sets/src/mage/cards/c/CloudKey.java index 4e39cc8e0a9..7b12bd88f53 100644 --- a/Mage.Sets/src/mage/cards/c/CloudKey.java +++ b/Mage.Sets/src/mage/cards/c/CloudKey.java @@ -29,7 +29,7 @@ public final class CloudKey extends CardImpl { )); // Spells you cast of the chosen type cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenCardTypeEffect(new FilterCard("Spells you cast of the chosen type"), 1, true) )); } diff --git a/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java b/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java index a7f00563f31..d28b51b6e32 100644 --- a/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java +++ b/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java @@ -37,7 +37,7 @@ public final class ClutchOfUndeath extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 as long as it's a Zombie. Otherwise, it gets -3/-3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostEnchantedEffect(3, 3), new BoostEnchantedEffect(-3, -3), diff --git a/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java b/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java index 4904612301f..0f7aeb81e13 100644 --- a/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java +++ b/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java @@ -23,7 +23,7 @@ public final class ConcordantCrossroads extends CardImpl { this.supertype.add(SuperType.WORLD); // All creatures have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java index 69549944557..3632beaa28d 100644 --- a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java +++ b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java @@ -30,7 +30,7 @@ public final class ConstrictingSliver extends CardImpl { // until this creature leaves the battlefield." Ability ability = new EntersBattlefieldTriggeredAbility(new ExileUntilSourceLeavesEffect(), true); ability.addTarget(new TargetOpponentsCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS) .setText("Sliver creatures you control have \"When this creature enters, " diff --git a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java index b4c480648e0..268aaadfb2a 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java @@ -39,7 +39,7 @@ public final class CorruptedZendikon extends CardImpl { this.addAbility(ability); // Enchanted land is a 3/3 black Ooze creature. It's still a land. - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CorruptedZendikonOozeToken(), "Enchanted land is a 3/3 black Ooze creature. It's still a land.", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/c/CourtHomunculus.java b/Mage.Sets/src/mage/cards/c/CourtHomunculus.java index 6d02aa9b1e3..37297403ee3 100644 --- a/Mage.Sets/src/mage/cards/c/CourtHomunculus.java +++ b/Mage.Sets/src/mage/cards/c/CourtHomunculus.java @@ -33,7 +33,7 @@ public final class CourtHomunculus extends CardImpl { this.toughness = new MageInt(1); // Court Homunculus gets +1/+1 as long as you control another artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new ControlsAnotherArtifactCondition(), "{this} gets +1/+1 as long as you control another artifact"))); } @@ -60,4 +60,4 @@ class ControlsAnotherArtifactCondition implements Condition { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CuratorsWard.java b/Mage.Sets/src/mage/cards/c/CuratorsWard.java index e603e81ae99..f77e6a62905 100644 --- a/Mage.Sets/src/mage/cards/c/CuratorsWard.java +++ b/Mage.Sets/src/mage/cards/c/CuratorsWard.java @@ -42,7 +42,7 @@ public final class CuratorsWard extends CardImpl { this.addAbility(ability); // Enchanted permanent has hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA) .setText("Enchanted permanent has hexproof"))); diff --git a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java index bb7d549cb99..57edcdb31cc 100644 --- a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java +++ b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java @@ -32,7 +32,7 @@ public final class DarkheartSliver extends CardImpl { // All Slivers have "Sacrifice this permanent: You gain 3 life." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"Sacrifice this permanent: You gain 3 life.\""))); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java index e5caf70495f..cd96bcc936a 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java @@ -38,7 +38,7 @@ public final class DarksteelMutation extends CardImpl { this.addAbility(ability); // Enchanted creature is an Insect artifact creature with base power and toughness 0/1 and has indestructible, and it loses all other abilities, card types, and creature types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new DarksteelMutationInsectToken(), "Enchanted creature is an Insect artifact creature with base power and toughness 0/1 and has indestructible, and it loses all other abilities, card types, and creature types.", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ALL_BUT_COLOR))); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelPlate.java b/Mage.Sets/src/mage/cards/d/DarksteelPlate.java index b9b3037ef20..a0d8ad72d28 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelPlate.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelPlate.java @@ -25,7 +25,7 @@ public final class DarksteelPlate extends CardImpl { // Darksteel Plate is indestructible. this.addAbility(IndestructibleAbility.getInstance()); // Equipped creature is indestructible. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java index d8d088ed817..af9107d67c7 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java @@ -32,7 +32,7 @@ public final class DeadeyePlunderers extends CardImpl { this.toughness = new MageInt(3); // Deadeye Plunderers gets +1/+1 for each artifact you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, ArtifactYouControlCount.instance, Duration.WhileOnBattlefield) ).addHint(ArtifactYouControlHint.instance)); diff --git a/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java b/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java index 971decf4b27..490a2e1f369 100644 --- a/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java +++ b/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java @@ -35,7 +35,7 @@ public final class DeathcapCultivator extends CardImpl { this.addAbility(new GreenManaAbility()); // Delirium — Deathcap Cultivator has deathtouch as long as there are four or more card types among cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} has deathtouch as long as there are four or more card types among cards in your graveyard")) .addHint(CardTypesInGraveyardHint.YOU)); diff --git a/Mage.Sets/src/mage/cards/d/DeepFreeze.java b/Mage.Sets/src/mage/cards/d/DeepFreeze.java index 9ed5206e539..ac83433bf2a 100644 --- a/Mage.Sets/src/mage/cards/d/DeepFreeze.java +++ b/Mage.Sets/src/mage/cards/d/DeepFreeze.java @@ -40,7 +40,7 @@ public final class DeepFreeze extends CardImpl { this.addAbility(ability); // Enchanted creature has base power and toughness 0/4, has defender, loses all other abilities, and is a blue Wall in addition to its other colors and types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new DeepFreezeToken(), "Enchanted creature has base power and toughness 0/4, has defender, loses all other abilities, and is a blue Wall in addition to its other colors and types", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ABILITIES) diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java index ea88b06ec96..92b47218904 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java +++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java @@ -43,7 +43,7 @@ public final class DementiaSliver extends CardImpl { gainedAbility.addEffect(new DementiaSliverEffect()); gainedAbility.addTarget(new TargetOpponent()); gainedAbility.addHint(MyTurnHint.instance); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Choose a card name. " + "Target opponent reveals a card at random from their hand." diff --git a/Mage.Sets/src/mage/cards/d/DireWolves.java b/Mage.Sets/src/mage/cards/d/DireWolves.java index 487578976c3..71009710f21 100644 --- a/Mage.Sets/src/mage/cards/d/DireWolves.java +++ b/Mage.Sets/src/mage/cards/d/DireWolves.java @@ -36,7 +36,7 @@ public final class DireWolves extends CardImpl { this.toughness = new MageInt(2); // Dire Wolves has banding as long as you control a Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(BandingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/d/DivinityOfPride.java b/Mage.Sets/src/mage/cards/d/DivinityOfPride.java index 759ede95b74..0ae9c4f5dc4 100644 --- a/Mage.Sets/src/mage/cards/d/DivinityOfPride.java +++ b/Mage.Sets/src/mage/cards/d/DivinityOfPride.java @@ -33,7 +33,7 @@ public final class DivinityOfPride extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Divinity of Pride gets +4/+4 as long as you have 25 or more life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new LifeCompareCondition(TargetController.YOU, ComparisonType.OR_GREATER, 25), "{this} gets +4/+4 as long as you have 25 or more life"))); diff --git a/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java b/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java index e12b16301a5..3917a2f3232 100644 --- a/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java +++ b/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java @@ -61,7 +61,7 @@ public final class DonAndresTheRenegade extends CardImpl { this.toughness = new MageInt(3); // Each creature you control but don't own gets +2/+2, has menace and deathtouch, and is a Pirate in addition to its other types. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, creatureFilter, false) .setText("Each creature you control but don't own gets +2/+2")); ability.addEffect(new GainAbilityControlledEffect( diff --git a/Mage.Sets/src/mage/cards/d/DormantSliver.java b/Mage.Sets/src/mage/cards/d/DormantSliver.java index 90dc24d8d6e..8e8f06ff71b 100644 --- a/Mage.Sets/src/mage/cards/d/DormantSliver.java +++ b/Mage.Sets/src/mage/cards/d/DormantSliver.java @@ -35,11 +35,11 @@ public final class DormantSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have defender. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have defender."))); // All Slivers have "When this permanent enters the battlefield, draw a card." Ability ability2 = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability2, Duration.WhileOnBattlefield, filter, "All Slivers have \"When this permanent enters the battlefield, draw a card.\""))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java b/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java index 8afcf1aeaeb..0667c65d0e0 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java @@ -42,7 +42,7 @@ public final class DragonlordKolaghan extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Other creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); // Whenever an opponent casts a creature or planeswalker spell with the same name as a card in their graveyard, that player loses 10 life. diff --git a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java index 33e5ad1ea45..bbd5065b0d8 100644 --- a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java +++ b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java @@ -43,7 +43,7 @@ public final class DrillSkimmer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Drill-Skimmer has shroud as long as you control another artifact creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield), condition, "{this} has shroud as long as you control another artifact creature."))); } diff --git a/Mage.Sets/src/mage/cards/d/DryadsFavor.java b/Mage.Sets/src/mage/cards/d/DryadsFavor.java index fd69235b629..16ff37620d7 100644 --- a/Mage.Sets/src/mage/cards/d/DryadsFavor.java +++ b/Mage.Sets/src/mage/cards/d/DryadsFavor.java @@ -37,7 +37,7 @@ public final class DryadsFavor extends CardImpl { this.addAbility(ability); // Enchanted creature has forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new ForestwalkAbility(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/e/ElderwoodScion.java b/Mage.Sets/src/mage/cards/e/ElderwoodScion.java index 81f8c9f6725..cb639b9b6bc 100644 --- a/Mage.Sets/src/mage/cards/e/ElderwoodScion.java +++ b/Mage.Sets/src/mage/cards/e/ElderwoodScion.java @@ -34,12 +34,12 @@ public final class ElderwoodScion extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Spells you cast that target Elderwood Scion cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(-2, new FilterCard("Spells"), TargetController.YOU)) ); // Spells your opponents cast that target Elderwood Scion cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java index 31512115262..1b6788e2ae4 100644 --- a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java +++ b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java @@ -37,7 +37,7 @@ public final class EmblemOfTheWarmind extends CardImpl { this.addAbility(ability); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/e/Entangler.java b/Mage.Sets/src/mage/cards/e/Entangler.java index f17560fc8e9..304e8a9d7a4 100644 --- a/Mage.Sets/src/mage/cards/e/Entangler.java +++ b/Mage.Sets/src/mage/cards/e/Entangler.java @@ -39,7 +39,7 @@ public final class Entangler extends CardImpl { this.addAbility(ability); // Enchanted creature can block any number of creatures. - SimpleStaticAbility blockAbility = new SimpleStaticAbility(Zone.BATTLEFIELD,new CanBlockAdditionalCreatureEffect(0)); + SimpleStaticAbility blockAbility = new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0)); Effect effect = new GainAbilityAttachedEffect(blockAbility,AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature can block any number of creatures."); this.addAbility(new SimpleStaticAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/e/EtchedChampion.java b/Mage.Sets/src/mage/cards/e/EtchedChampion.java index 872ae670259..833324e81fb 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedChampion.java +++ b/Mage.Sets/src/mage/cards/e/EtchedChampion.java @@ -44,7 +44,7 @@ public final class EtchedChampion extends CardImpl { // Metalcraft — Etched Champion has protection from all colors as long as you control three or more artifacts. ContinuousEffect effect = new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, ruleText)) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance) diff --git a/Mage.Sets/src/mage/cards/e/Exploration.java b/Mage.Sets/src/mage/cards/e/Exploration.java index 8d391953c28..454e62b8b25 100644 --- a/Mage.Sets/src/mage/cards/e/Exploration.java +++ b/Mage.Sets/src/mage/cards/e/Exploration.java @@ -21,7 +21,7 @@ public final class Exploration extends CardImpl { // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/f/FavorableDestiny.java b/Mage.Sets/src/mage/cards/f/FavorableDestiny.java index 08f319ec99b..4d7ae2dc84b 100644 --- a/Mage.Sets/src/mage/cards/f/FavorableDestiny.java +++ b/Mage.Sets/src/mage/cards/f/FavorableDestiny.java @@ -45,7 +45,7 @@ public final class FavorableDestiny extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+2 as long as it's white. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), @@ -54,7 +54,7 @@ public final class FavorableDestiny extends CardImpl { )); // Enchanted creature has shroud as long as its controller controls another creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilityAttachedEffect( ShroudAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/f/FenStalker.java b/Mage.Sets/src/mage/cards/f/FenStalker.java index 5a14921e8d5..2d3ba45ae02 100644 --- a/Mage.Sets/src/mage/cards/f/FenStalker.java +++ b/Mage.Sets/src/mage/cards/f/FenStalker.java @@ -37,7 +37,7 @@ public final class FenStalker extends CardImpl { this.toughness = new MageInt(2); // Fen Stalker has fear as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} has fear as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/f/FowlPlay.java b/Mage.Sets/src/mage/cards/f/FowlPlay.java index f467e17b2e0..2e15ac854b7 100644 --- a/Mage.Sets/src/mage/cards/f/FowlPlay.java +++ b/Mage.Sets/src/mage/cards/f/FowlPlay.java @@ -32,7 +32,7 @@ public final class FowlPlay extends CardImpl { this.addAbility(ability); // Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CreatureToken(1, 1, "1/1 Bird creature", SubType.BIRD), "Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ABILITIES_SUBTYPE))); diff --git a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java index dfe3408d158..f07d673d300 100644 --- a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java +++ b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java @@ -39,7 +39,7 @@ public final class FreewindEquenaut extends CardImpl { new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(ability, Duration.WhileOnBattlefield), new EnchantedSourceCondition(), diff --git a/Mage.Sets/src/mage/cards/f/FreneticSliver.java b/Mage.Sets/src/mage/cards/f/FreneticSliver.java index 6c0145073db..2425e96d0b4 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticSliver.java +++ b/Mage.Sets/src/mage/cards/f/FreneticSliver.java @@ -35,7 +35,7 @@ public final class FreneticSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{0}: If this permanent is on the battlefield, flip a coin. If you win the flip, exile this permanent and return it to the battlefield under its owner's control at the beginning of the next end step. If you lose the flip, sacrifice it." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect( new SimpleActivatedAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/f/FurySliver.java b/Mage.Sets/src/mage/cards/f/FurySliver.java index e29441344e9..3bbf5a9faeb 100644 --- a/Mage.Sets/src/mage/cards/f/FurySliver.java +++ b/Mage.Sets/src/mage/cards/f/FurySliver.java @@ -27,7 +27,7 @@ public final class FurySliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS diff --git a/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java b/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java index 8abd58c7ec2..61d15644e49 100644 --- a/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java +++ b/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java @@ -51,7 +51,7 @@ public final class GarnaTheBloodflame extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GarnaTheBloodflameEffect(), false), new GarnaTheBloodflameWatcher()); // Other creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); } diff --git a/Mage.Sets/src/mage/cards/g/GateHound.java b/Mage.Sets/src/mage/cards/g/GateHound.java index eb109bfea6b..dcc8bd2a0cd 100644 --- a/Mage.Sets/src/mage/cards/g/GateHound.java +++ b/Mage.Sets/src/mage/cards/g/GateHound.java @@ -29,7 +29,7 @@ public final class GateHound extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES), new EnchantedSourceCondition(), diff --git a/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java b/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java index c42407096f7..f51d72cc82a 100644 --- a/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java +++ b/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java @@ -31,7 +31,7 @@ public final class GeistFueledScarecrow extends CardImpl { this.toughness = new MageInt(4); // Creature spells you cast cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(1, filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/g/GemhideSliver.java b/Mage.Sets/src/mage/cards/g/GemhideSliver.java index 53b1ca71552..f6fca871942 100644 --- a/Mage.Sets/src/mage/cards/g/GemhideSliver.java +++ b/Mage.Sets/src/mage/cards/g/GemhideSliver.java @@ -32,7 +32,7 @@ public final class GemhideSliver extends CardImpl { // All Slivers have "{tap}: Add one mana of any color." Ability ability = new AnyColorManaAbility(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Add one mana of any color.\""))); diff --git a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java index 046e21be57e..271c34aaa56 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java +++ b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java @@ -36,7 +36,7 @@ public final class GhastlordOfFugue extends CardImpl { this.toughness = new MageInt(4); // Ghastlord of Fugue can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeBlockedSourceEffect(Duration.WhileOnBattlefield))); // Whenever Ghastlord of Fugue deals combat damage to a player, diff --git a/Mage.Sets/src/mage/cards/g/GnatMiser.java b/Mage.Sets/src/mage/cards/g/GnatMiser.java index 8397fe023b2..c414d2bc172 100644 --- a/Mage.Sets/src/mage/cards/g/GnatMiser.java +++ b/Mage.Sets/src/mage/cards/g/GnatMiser.java @@ -36,7 +36,7 @@ public final class GnatMiser extends CardImpl { this.toughness = new MageInt(1); // Each opponent's maximum hand size is reduced by one. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(1, Duration.WhileOnBattlefield, HandSizeModification.REDUCE, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/g/GohamDjinn.java b/Mage.Sets/src/mage/cards/g/GohamDjinn.java index b17db40cdda..c07eb5efdf7 100644 --- a/Mage.Sets/src/mage/cards/g/GohamDjinn.java +++ b/Mage.Sets/src/mage/cards/g/GohamDjinn.java @@ -35,7 +35,7 @@ public final class GohamDjinn extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); // Goham Djinn gets -2/-2 as long as black is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.BLACK)), "{this} gets -2/-2 as long as black is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/g/GraniteGrip.java b/Mage.Sets/src/mage/cards/g/GraniteGrip.java index 2a8b91b6b4d..e0002ece174 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGrip.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGrip.java @@ -39,7 +39,7 @@ public final class GraniteGrip extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+0 for each Mountain you control. - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + SimpleStaticAbility ability = new SimpleStaticAbility( new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter, 1), new PermanentsOnBattlefieldCount(filter, 0), Duration.WhileOnBattlefield)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GunnerConscript.java b/Mage.Sets/src/mage/cards/g/GunnerConscript.java index 46245e98259..ecc84b5ad1a 100644 --- a/Mage.Sets/src/mage/cards/g/GunnerConscript.java +++ b/Mage.Sets/src/mage/cards/g/GunnerConscript.java @@ -44,7 +44,7 @@ public final class GunnerConscript extends CardImpl { // Gunner Conscript gets +1/+1 for each Aura and Equipment attached to it. DynamicValue totalAmount = new AdditiveDynamicValue(new AuraAttachedCount(), new EquipmentAttachedCount()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(totalAmount, totalAmount, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each Aura and Equipment attached to it"))); diff --git a/Mage.Sets/src/mage/cards/h/HalamDjinn.java b/Mage.Sets/src/mage/cards/h/HalamDjinn.java index 0c5de56456f..0357183ce58 100644 --- a/Mage.Sets/src/mage/cards/h/HalamDjinn.java +++ b/Mage.Sets/src/mage/cards/h/HalamDjinn.java @@ -33,7 +33,7 @@ public final class HalamDjinn extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Halam Djinn gets -2/-2 as long as red is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.RED)), "{this} gets -2/-2 as long as red is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java index b0f0604b24f..157c1599be8 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java @@ -33,7 +33,7 @@ public final class HammerOfPurphoros extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {2}{R}, {tap}, Sacrifice a land: Create a 3/3 colorless Golem enchantment artifact creature token. diff --git a/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java b/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java index 9529496e68b..e38ec8263b1 100644 --- a/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java +++ b/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java @@ -43,7 +43,7 @@ public final class HazoretTheFervent extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Hazoret the Fervent can't attack or block unless you have one or fewer cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantAttackBlockUnlessConditionSourceEffect(new CardsInHandCondition(ComparisonType.FEWER_THAN, 2)) .setText("{this} can't attack or block unless you have one or fewer cards in hand"))); diff --git a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java index 9dedfc41b47..8e6999ed00a 100644 --- a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java +++ b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java @@ -43,7 +43,7 @@ public final class HeadstrongBrute extends CardImpl { this.addAbility(new CantBlockAbility()); // Headstrong Brute has menace as long as you control another Pirate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has menace as long as you control another Pirate"))); } diff --git a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java index bb7e2bd994f..7b315343df5 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java +++ b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java @@ -32,7 +32,7 @@ public final class HeraldsHorn extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); // Creature spells you cast of the chosen type cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenSubtypeEffect(new FilterCreatureCard("Creature spells you cast of the chosen type"), 1, true))); // At the beginning of your upkeep, look at the top card of your library. If it's a creature card of the chosen type, you may reveal it and put it into your hand. diff --git a/Mage.Sets/src/mage/cards/h/HeroicDefiance.java b/Mage.Sets/src/mage/cards/h/HeroicDefiance.java index 7d4afa9be20..ad17dadc431 100644 --- a/Mage.Sets/src/mage/cards/h/HeroicDefiance.java +++ b/Mage.Sets/src/mage/cards/h/HeroicDefiance.java @@ -41,7 +41,7 @@ public final class HeroicDefiance extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 unless it shares a color with the most common color among all permanents or a color tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield), new HeroicDefianceCondition(), "Enchanted creature gets +3/+3 unless it shares a color with the most common color among all permanents or a color tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/h/HibernationSliver.java b/Mage.Sets/src/mage/cards/h/HibernationSliver.java index d0251e6f0ec..51dc7c47493 100644 --- a/Mage.Sets/src/mage/cards/h/HibernationSliver.java +++ b/Mage.Sets/src/mage/cards/h/HibernationSliver.java @@ -35,7 +35,7 @@ public final class HibernationSliver extends CardImpl { Effect effect = new ReturnToHandSourceEffect(true); effect.setText("Return this permanent to its owner's hand"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new PayLifeCost(2)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterPermanent(SubType.SLIVER, "All Slivers"), "All Slivers have \"Pay 2 life: Return this permanent to its owner's hand.\""))); } diff --git a/Mage.Sets/src/mage/cards/h/HiddenPath.java b/Mage.Sets/src/mage/cards/h/HiddenPath.java index a6ed2d465a4..734a973afd0 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenPath.java +++ b/Mage.Sets/src/mage/cards/h/HiddenPath.java @@ -30,7 +30,7 @@ public final class HiddenPath extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}{G}{G}{G}"); // Green creatures have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new ForestwalkAbility(false), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/h/HoldTheGates.java b/Mage.Sets/src/mage/cards/h/HoldTheGates.java index 7c0ec706f4e..b4ff9cf5c6e 100644 --- a/Mage.Sets/src/mage/cards/h/HoldTheGates.java +++ b/Mage.Sets/src/mage/cards/h/HoldTheGates.java @@ -26,7 +26,7 @@ public final class HoldTheGates extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Creatures you control get +0/+1 for each Gate you control and have vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new BoostControlledEffect(StaticValue.get(0), GateYouControlCount.instance, Duration.WhileOnBattlefield) ); ability.addEffect( diff --git a/Mage.Sets/src/mage/cards/h/Humility.java b/Mage.Sets/src/mage/cards/h/Humility.java index 9155997af9f..6973d894850 100644 --- a/Mage.Sets/src/mage/cards/h/Humility.java +++ b/Mage.Sets/src/mage/cards/h/Humility.java @@ -28,7 +28,7 @@ public final class Humility extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); // All creatures lose all abilities and have base power and toughness 1/1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new HumilityEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/i/ImperialLancer.java b/Mage.Sets/src/mage/cards/i/ImperialLancer.java index 76ba8858411..1ae2069dd78 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialLancer.java +++ b/Mage.Sets/src/mage/cards/i/ImperialLancer.java @@ -37,7 +37,7 @@ public final class ImperialLancer extends CardImpl { this.toughness = new MageInt(1); // Imperial Lancer has double strike as long as you control a Dinosaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has double strike as long as you control a Dinosaur"))); } diff --git a/Mage.Sets/src/mage/cards/i/InBolassClutches.java b/Mage.Sets/src/mage/cards/i/InBolassClutches.java index 38fb6b8ceb4..ac4db25d507 100644 --- a/Mage.Sets/src/mage/cards/i/InBolassClutches.java +++ b/Mage.Sets/src/mage/cards/i/InBolassClutches.java @@ -42,7 +42,7 @@ public final class InBolassClutches extends CardImpl { this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); // Enchanted permanent is legendary. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AddCardSuperTypeAttachedEffect(SuperType.LEGENDARY, Duration.WhileOnBattlefield, AttachmentType.AURA) )); } diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java index f70fc66c218..8279a536d1e 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java @@ -34,7 +34,7 @@ public final class IncendiaryOracle extends CardImpl { new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); // If a creature dealt damage by Incendiary Oracle this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } diff --git a/Mage.Sets/src/mage/cards/i/InnerSanctum.java b/Mage.Sets/src/mage/cards/i/InnerSanctum.java index 9738a5fdc74..96b48dd37c6 100644 --- a/Mage.Sets/src/mage/cards/i/InnerSanctum.java +++ b/Mage.Sets/src/mage/cards/i/InnerSanctum.java @@ -25,7 +25,7 @@ public final class InnerSanctum extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new PayLifeCost(2))); // Prevent all damage that would be dealt to creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED) )); } diff --git a/Mage.Sets/src/mage/cards/i/InventorsApprentice.java b/Mage.Sets/src/mage/cards/i/InventorsApprentice.java index 1fc0769780f..9af2d756391 100644 --- a/Mage.Sets/src/mage/cards/i/InventorsApprentice.java +++ b/Mage.Sets/src/mage/cards/i/InventorsApprentice.java @@ -31,7 +31,7 @@ public final class InventorsApprentice extends CardImpl { this.toughness = new MageInt(2); // Inventor's Apprentice gets +1/+1 as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); } diff --git a/Mage.Sets/src/mage/cards/i/Invisibility.java b/Mage.Sets/src/mage/cards/i/Invisibility.java index 065019fdd3b..5cd1e387516 100644 --- a/Mage.Sets/src/mage/cards/i/Invisibility.java +++ b/Mage.Sets/src/mage/cards/i/Invisibility.java @@ -38,7 +38,7 @@ public final class Invisibility extends CardImpl { this.addAbility(ability); // Enchanted creature can't be blocked except by Walls. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/i/IriniSengir.java b/Mage.Sets/src/mage/cards/i/IriniSengir.java index 02205e11dbc..e8a2d6854f6 100644 --- a/Mage.Sets/src/mage/cards/i/IriniSengir.java +++ b/Mage.Sets/src/mage/cards/i/IriniSengir.java @@ -34,7 +34,7 @@ public final class IriniSengir extends CardImpl { this.toughness = new MageInt(2); // Green enchantment spells and white enchantment spells cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY)) ); } diff --git a/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java b/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java index 070eaa78547..35eb2fb9d65 100644 --- a/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java +++ b/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java @@ -26,7 +26,7 @@ public final class IvorytuskFortress extends CardImpl { this.toughness = new MageInt(7); // Untap each creature you control with a +1/+1 counter on it during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new UntapAllDuringEachOtherPlayersUntapStepEffect(StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1))); } diff --git a/Mage.Sets/src/mage/cards/j/JadeLeech.java b/Mage.Sets/src/mage/cards/j/JadeLeech.java index a9f638b1184..c0224708f18 100644 --- a/Mage.Sets/src/mage/cards/j/JadeLeech.java +++ b/Mage.Sets/src/mage/cards/j/JadeLeech.java @@ -34,7 +34,7 @@ public final class JadeLeech extends CardImpl { this.toughness = new MageInt(5); // Green spells you cast cost {G} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{G}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java index 71e0f2475ef..8680fd898d1 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java @@ -51,7 +51,7 @@ public final class JeskaiRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has flying as long as you control a red or white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has flying as long as you control a red or white permanent"))); } diff --git a/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java b/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java index 262b18c722f..9d1c4a37870 100644 --- a/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java +++ b/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java @@ -30,7 +30,7 @@ public final class JhoirasFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Historic spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionControllerEffect(new FilterHistoricCard(), 1) .setText("Historic spells you cast cost {1} less to cast. (Artifacts, legendaries, and Sagas are historic.)"))); } diff --git a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java index fa9c181f7ed..e1a52558e3b 100644 --- a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java +++ b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java @@ -35,7 +35,7 @@ public final class JinGitaxiasCoreAugur extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DrawCardSourceControllerEffect(7))); // Each opponent's maximum hand size is reduced by seven. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(7, Duration.WhileOnBattlefield, HandSizeModification.REDUCE, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java index 47e92d67f2d..77fc965e7f0 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java @@ -56,7 +56,7 @@ public final class JoragaTreespeaker extends LevelerCard { // 1/4 // Elves you control have "{T}: Add {G}{G}." Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, + abilities2.add(new SimpleStaticAbility( new GainAbilityControlledEffect(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new TapSourceCost()), Duration.WhileOnBattlefield, filter))); diff --git a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java index 539d0cc7f4a..4c1422b6558 100644 --- a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java +++ b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java @@ -43,7 +43,7 @@ public final class JorubaiMurkLurker extends CardImpl { this.toughness = new MageInt(3); // Jorubai Murk Lurker gets +1/+1 as long as you control a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); diff --git a/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java b/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java index ee0d7622b27..185eb565b2d 100644 --- a/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java +++ b/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java @@ -41,7 +41,7 @@ public final class JubilantSkybonder extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creatures you control with flying have "Spells your opponents cast that target this creature cost {2} more to cast." - Ability gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability gainAbility = new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT) .withTargetName("this creature") ); diff --git a/Mage.Sets/src/mage/cards/k/KavuRunner.java b/Mage.Sets/src/mage/cards/k/KavuRunner.java index 45c08991051..d1336ed8f34 100644 --- a/Mage.Sets/src/mage/cards/k/KavuRunner.java +++ b/Mage.Sets/src/mage/cards/k/KavuRunner.java @@ -42,7 +42,7 @@ public final class KavuRunner extends CardImpl { this.toughness = new MageInt(3); // Kavu Runner has haste as long as no opponent controls a white or blue creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, false)), "{this} has haste as long as no opponent controls a white or blue creature"))); diff --git a/Mage.Sets/src/mage/cards/k/KessDissidentMage.java b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java index 985256280ea..64f349b7699 100644 --- a/Mage.Sets/src/mage/cards/k/KessDissidentMage.java +++ b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java @@ -40,7 +40,7 @@ public final class KessDissidentMage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // During each of your turns, you may cast an instant or sorcery card from your graveyard. If a card cast this way would be put into your graveyard this turn, exile it instead. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new KessDissidentMageCastFromGraveyardEffect()) .setIdentifier(MageIdentifier.KessDissidentMageWatcher); ability.addEffect(new KessDissidentMageReplacementEffect()); diff --git a/Mage.Sets/src/mage/cards/k/KessigDireSwine.java b/Mage.Sets/src/mage/cards/k/KessigDireSwine.java index f05a298d589..06cc7633207 100644 --- a/Mage.Sets/src/mage/cards/k/KessigDireSwine.java +++ b/Mage.Sets/src/mage/cards/k/KessigDireSwine.java @@ -29,7 +29,7 @@ public final class KessigDireSwine extends CardImpl { this.toughness = new MageInt(6); // Delirium — Kessig Dire Swine has trample as long as there are four or more card types among cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} has trample as long as there are four or more card types among cards in your graveyard")) .addHint(CardTypesInGraveyardHint.YOU)); diff --git a/Mage.Sets/src/mage/cards/k/KirdApe.java b/Mage.Sets/src/mage/cards/k/KirdApe.java index 9ffd0f3a738..e9e5695145e 100644 --- a/Mage.Sets/src/mage/cards/k/KirdApe.java +++ b/Mage.Sets/src/mage/cards/k/KirdApe.java @@ -37,7 +37,7 @@ public final class KirdApe extends CardImpl { this.toughness = new MageInt(1); // Kird Ape gets +1/+2 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/k/KirdChieftain.java b/Mage.Sets/src/mage/cards/k/KirdChieftain.java index 7886ed3990a..b6ea9a296dd 100644 --- a/Mage.Sets/src/mage/cards/k/KirdChieftain.java +++ b/Mage.Sets/src/mage/cards/k/KirdChieftain.java @@ -45,7 +45,7 @@ public final class KirdChieftain extends CardImpl { this.toughness = new MageInt(3); // Kird Chieftain gets +1/+1 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); diff --git a/Mage.Sets/src/mage/cards/l/Lignify.java b/Mage.Sets/src/mage/cards/l/Lignify.java index b30eedf74bc..1fba2f3fc4a 100644 --- a/Mage.Sets/src/mage/cards/l/Lignify.java +++ b/Mage.Sets/src/mage/cards/l/Lignify.java @@ -37,7 +37,7 @@ public final class Lignify extends CardImpl { this.addAbility(ability); // Enchanted creature is a Treefolk with base power and toughness 0/4 and loses all abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CreatureToken(0, 4, "0/4 Treefolk creature", SubType.TREEFOLK), "Enchanted creature is a Treefolk with base power and toughness 0/4 and loses all abilities", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ABILITIES_SUBTYPE))); diff --git a/Mage.Sets/src/mage/cards/l/LoamLion.java b/Mage.Sets/src/mage/cards/l/LoamLion.java index 781b92911db..7c6ac7cf387 100644 --- a/Mage.Sets/src/mage/cards/l/LoamLion.java +++ b/Mage.Sets/src/mage/cards/l/LoamLion.java @@ -37,7 +37,7 @@ public final class LoamLion extends CardImpl { this.toughness = new MageInt(1); // Loam Lion gets +1/+2 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/l/LocustMiser.java b/Mage.Sets/src/mage/cards/l/LocustMiser.java index ccbeedba8d7..cdf51fdfe4a 100644 --- a/Mage.Sets/src/mage/cards/l/LocustMiser.java +++ b/Mage.Sets/src/mage/cards/l/LocustMiser.java @@ -36,7 +36,7 @@ public final class LocustMiser extends CardImpl { this.toughness = new MageInt(2); // Each opponent's maximum hand size is reduced by two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.REDUCE, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java b/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java index c87f1c9db44..93803d030d3 100644 --- a/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java +++ b/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java @@ -41,7 +41,7 @@ public final class LootExuberantExplorer extends CardImpl { this.toughness = new MageInt(4); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // {4}{G}{G}, {T}: Look at the top six cards of your library. You may reveal a creature card with mana value less than or equal to the number of lands you control from among them and put it onto the battlefield. Put the rest on the bottom in a random order. diff --git a/Mage.Sets/src/mage/cards/l/LustForWar.java b/Mage.Sets/src/mage/cards/l/LustForWar.java index afc7a796615..57bf92941f4 100644 --- a/Mage.Sets/src/mage/cards/l/LustForWar.java +++ b/Mage.Sets/src/mage/cards/l/LustForWar.java @@ -41,7 +41,7 @@ public final class LustForWar extends CardImpl { this.addAbility(new BecomesTappedAttachedTriggeredAbility(new DamageAttachedControllerEffect(3), "enchanted creature")); // Enchanted creature attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java index a9d65b8d37a..4f6b718a133 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java @@ -26,7 +26,7 @@ public final class MaelstromWanderer extends CardImpl { this.toughness = new MageInt(5); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); // Cascade this.addAbility(new CascadeAbility(false)); diff --git a/Mage.Sets/src/mage/cards/m/MagmaSliver.java b/Mage.Sets/src/mage/cards/m/MagmaSliver.java index 33de3be8636..a66838798d0 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaSliver.java +++ b/Mage.Sets/src/mage/cards/m/MagmaSliver.java @@ -49,7 +49,7 @@ public final class MagmaSliver extends CardImpl { StaticFilters.FILTER_PERMANENT_ALL_SLIVERS); effect.setText("All Slivers have \"{T}: Target Sliver creature gets +X/+0 until end of turn, " + "where X is the number of Slivers on the battlefield.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java b/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java index f0891a7d7a5..e4358d79f2b 100644 --- a/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java +++ b/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java @@ -44,7 +44,7 @@ public final class MarchesaTheBlackRose extends CardImpl { this.addAbility(new DethroneAbility()); // Other creatures you control have dethrone. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(new DethroneAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); // Whenever a creature you control with a +1/+1 counter on it dies, return that card to the battlefield under your control at the beginning of the next end step. diff --git a/Mage.Sets/src/mage/cards/m/MarduRunemark.java b/Mage.Sets/src/mage/cards/m/MarduRunemark.java index f89367f59f3..0ef6bd27845 100644 --- a/Mage.Sets/src/mage/cards/m/MarduRunemark.java +++ b/Mage.Sets/src/mage/cards/m/MarduRunemark.java @@ -51,7 +51,7 @@ public final class MarduRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has first strike as long as you control a white or black permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has first strike as long as you control a white or black permanent"))); } diff --git a/Mage.Sets/src/mage/cards/m/MesmericSliver.java b/Mage.Sets/src/mage/cards/m/MesmericSliver.java index 8f3c781ca5d..c78b10f6ab4 100644 --- a/Mage.Sets/src/mage/cards/m/MesmericSliver.java +++ b/Mage.Sets/src/mage/cards/m/MesmericSliver.java @@ -37,7 +37,7 @@ public final class MesmericSliver extends CardImpl { // All Slivers have "When this permanent enters the battlefield, you may fateseal 1." Ability ability = new EntersBattlefieldTriggeredAbility(new FatesealEffect(1), true); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filterSliver, "All Slivers have \"When this permanent enters the battlefield, you may fateseal 1.\" (To fateseal 1, its controller looks at the top card of an opponent's library, then they may put that card on the bottom of that library.)"))); } diff --git a/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java b/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java index 28c722a0d2a..221272df9ab 100644 --- a/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java +++ b/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java @@ -32,7 +32,7 @@ public final class MinamoScrollkeeper extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Your maximum hand size is increased by one. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(1, Duration.WhileOnBattlefield, HandSizeModification.INCREASE))); } diff --git a/Mage.Sets/src/mage/cards/m/MindwhipSliver.java b/Mage.Sets/src/mage/cards/m/MindwhipSliver.java index 949d6c04942..fad7bd7ae03 100644 --- a/Mage.Sets/src/mage/cards/m/MindwhipSliver.java +++ b/Mage.Sets/src/mage/cards/m/MindwhipSliver.java @@ -39,7 +39,7 @@ public final class MindwhipSliver extends CardImpl { // All Slivers have "{2}, Sacrifice this permanent: Target player discards a card at random. Activate this ability only any time you could cast a sorcery." Ability gainedAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1, true), new GenericManaCost(2)); gainedAbility.addCost(new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, "All Slivers have \"{2}, Sacrifice this permanent: Target player discards a card at random. Activate only as a sorcery.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MineMineMine.java b/Mage.Sets/src/mage/cards/m/MineMineMine.java index 12da0746793..ae23cbd8684 100644 --- a/Mage.Sets/src/mage/cards/m/MineMineMine.java +++ b/Mage.Sets/src/mage/cards/m/MineMineMine.java @@ -37,7 +37,7 @@ public final class MineMineMine extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new MineMineMineDrawEffect())); // Players have no maximum hand size and don't lose the game for drawing from an empty library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET, TargetController.ANY) .setText("Players have no maximum hand size and don't lose the game for drawing from an empty library"))); this.addAbility(new SimpleStaticAbility(new MineMineMineDontLoseEffect())); diff --git a/Mage.Sets/src/mage/cards/m/MudTrooper.java b/Mage.Sets/src/mage/cards/m/MudTrooper.java index 4c4be3360d0..6ba5f9c4b6c 100644 --- a/Mage.Sets/src/mage/cards/m/MudTrooper.java +++ b/Mage.Sets/src/mage/cards/m/MudTrooper.java @@ -41,7 +41,7 @@ public final class MudTrooper extends CardImpl { new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("This creature gets +1/+1 until end of turn"), new GenericManaCost(2)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter, false) .withForceQuotes() )); diff --git a/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java b/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java index bf60fab27f7..dd824b2f204 100644 --- a/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java +++ b/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java @@ -47,7 +47,7 @@ public final class MultaniYavimayasAvatar extends CardImpl { PermanentsOnBattlefieldCount permanentsOnBattlefieldCount = new PermanentsOnBattlefieldCount(LANDS_YOU_CONTROL_FILTER); DynamicValue powerToughnessValue = new AdditiveDynamicValue(graveyardCount, permanentsOnBattlefieldCount); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(powerToughnessValue, powerToughnessValue, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each land you control and each land card in your graveyard") )); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java index fc082b63635..6d96b0a8ab1 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java @@ -45,7 +45,7 @@ public final class MyojinOfLifesWeb extends CardImpl { // Myojin of Life's Web enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Life's Web has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Life's Web: Put any number of creature cards from your hand onto the battlefield. diff --git a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java index 7fcc336f4fb..b2a2e929471 100644 --- a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java +++ b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java @@ -35,7 +35,7 @@ public final class MyrGalvanizer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // Other Myr creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {1}, {T}: Untap each other Myr you control. diff --git a/Mage.Sets/src/mage/cards/n/NecroticSliver.java b/Mage.Sets/src/mage/cards/n/NecroticSliver.java index d14976817d7..ad78e73389d 100644 --- a/Mage.Sets/src/mage/cards/n/NecroticSliver.java +++ b/Mage.Sets/src/mage/cards/n/NecroticSliver.java @@ -36,7 +36,7 @@ public final class NecroticSliver extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(3)); ability.addTarget(new TargetPermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{3}, Sacrifice this permanent: Destroy target permanent.\""))); diff --git a/Mage.Sets/src/mage/cards/n/NemesisMask.java b/Mage.Sets/src/mage/cards/n/NemesisMask.java index ae28d24825d..3158de02e86 100644 --- a/Mage.Sets/src/mage/cards/n/NemesisMask.java +++ b/Mage.Sets/src/mage/cards/n/NemesisMask.java @@ -26,7 +26,7 @@ public final class NemesisMask extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // All creatures able to block equipped creature do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MustBeBlockedByAllAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); // Equip {3} diff --git a/Mage.Sets/src/mage/cards/n/NimDevourer.java b/Mage.Sets/src/mage/cards/n/NimDevourer.java index 88256534f03..62146fa374c 100644 --- a/Mage.Sets/src/mage/cards/n/NimDevourer.java +++ b/Mage.Sets/src/mage/cards/n/NimDevourer.java @@ -31,7 +31,7 @@ public final class NimDevourer extends CardImpl { this.toughness = new MageInt(1); // Nim Devourer gets +1/+0 for each artifact you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield)) .addHint(ArtifactYouControlHint.instance) ); diff --git a/Mage.Sets/src/mage/cards/n/NimGrotesque.java b/Mage.Sets/src/mage/cards/n/NimGrotesque.java index e2ca99e5f4c..230cc4ef73c 100644 --- a/Mage.Sets/src/mage/cards/n/NimGrotesque.java +++ b/Mage.Sets/src/mage/cards/n/NimGrotesque.java @@ -28,7 +28,7 @@ public final class NimGrotesque extends CardImpl { this.toughness = new MageInt(6); // Nim Grotesque gets +1/+0 for each artifact you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield)) .addHint(ArtifactYouControlHint.instance) ); diff --git a/Mage.Sets/src/mage/cards/n/NullProfusion.java b/Mage.Sets/src/mage/cards/n/NullProfusion.java index 67dc0a9641e..355d1315c45 100644 --- a/Mage.Sets/src/mage/cards/n/NullProfusion.java +++ b/Mage.Sets/src/mage/cards/n/NullProfusion.java @@ -33,7 +33,7 @@ public final class NullProfusion extends CardImpl { new DrawCardSourceControllerEffect(1))); // Your maximum hand size is two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect( StaticValue.get(2), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/p/ParadiseMantle.java b/Mage.Sets/src/mage/cards/p/ParadiseMantle.java index 6e594a40e97..aeaa22683f3 100644 --- a/Mage.Sets/src/mage/cards/p/ParadiseMantle.java +++ b/Mage.Sets/src/mage/cards/p/ParadiseMantle.java @@ -28,7 +28,7 @@ public final class ParadiseMantle extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new AnyColorManaAbility(new TapSourceCost()), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java index 228c56e88cb..28e5da7f320 100644 --- a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java +++ b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java @@ -45,7 +45,7 @@ public final class PollenbrightWings extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals combat damage to a player, create that many 1/1 green Saproling creature tokens. this.addAbility(new PollenbrightWingsAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PoulticeSliver.java b/Mage.Sets/src/mage/cards/p/PoulticeSliver.java index b1a3629dffc..a723abbee14 100644 --- a/Mage.Sets/src/mage/cards/p/PoulticeSliver.java +++ b/Mage.Sets/src/mage/cards/p/PoulticeSliver.java @@ -37,7 +37,7 @@ public final class PoulticeSliver extends CardImpl { ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ALL_SLIVERS)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{2}, {T}: Regenerate target Sliver.\""))); diff --git a/Mage.Sets/src/mage/cards/p/PredatorySliver.java b/Mage.Sets/src/mage/cards/p/PredatorySliver.java index d642c6e97ff..94d7cee9e40 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorySliver.java +++ b/Mage.Sets/src/mage/cards/p/PredatorySliver.java @@ -27,7 +27,7 @@ public final class PredatorySliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostControlledEffect(1, 1, Duration.WhileInGraveyard, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/p/PristineAngel.java b/Mage.Sets/src/mage/cards/p/PristineAngel.java index 51ac8ae3a7f..5e997d5d86c 100644 --- a/Mage.Sets/src/mage/cards/p/PristineAngel.java +++ b/Mage.Sets/src/mage/cards/p/PristineAngel.java @@ -51,7 +51,7 @@ public final class PristineAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // As long as Pristine Angel is untapped, it has protection from artifacts and from all colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.WhileOnBattlefield), SourceTappedCondition.UNTAPPED, diff --git a/Mage.Sets/src/mage/cards/p/PrizedElephant.java b/Mage.Sets/src/mage/cards/p/PrizedElephant.java index 8c3ad3f8fcd..f1dbf3af72f 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedElephant.java +++ b/Mage.Sets/src/mage/cards/p/PrizedElephant.java @@ -42,7 +42,7 @@ public final class PrizedElephant extends CardImpl { this.toughness = new MageInt(3); // Prized Elephant gets +1/+1 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); diff --git a/Mage.Sets/src/mage/cards/p/ProwlersHelm.java b/Mage.Sets/src/mage/cards/p/ProwlersHelm.java index 4cf7e1c14e8..49bc7c97b14 100644 --- a/Mage.Sets/src/mage/cards/p/ProwlersHelm.java +++ b/Mage.Sets/src/mage/cards/p/ProwlersHelm.java @@ -28,7 +28,7 @@ public final class ProwlersHelm extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature can't be blocked except by Walls. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.EQUIPMENT))); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/p/PterodonKnight.java b/Mage.Sets/src/mage/cards/p/PterodonKnight.java index 7b185240136..228ddb04169 100644 --- a/Mage.Sets/src/mage/cards/p/PterodonKnight.java +++ b/Mage.Sets/src/mage/cards/p/PterodonKnight.java @@ -37,7 +37,7 @@ public final class PterodonKnight extends CardImpl { this.toughness = new MageInt(3); // Pterodon Knight has flying as long as you control a Dinosaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has flying as long as you control a Dinosaur"))); } diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java index 2a18f339195..69b83129fa1 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java @@ -44,7 +44,7 @@ public final class QuicksilverDagger extends CardImpl { Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainAbility.addTarget(new TargetPlayerOrPlaneswalker()); gainAbility.addEffect(new DrawCardSourceControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to target player or planeswalker. You draw a card.\"") )); diff --git a/Mage.Sets/src/mage/cards/q/QuilledSliver.java b/Mage.Sets/src/mage/cards/q/QuilledSliver.java index 61f23451f6c..82cc91da7a6 100644 --- a/Mage.Sets/src/mage/cards/q/QuilledSliver.java +++ b/Mage.Sets/src/mage/cards/q/QuilledSliver.java @@ -39,7 +39,7 @@ public final class QuilledSliver extends CardImpl { // All Slivers have "{tap}: This permanent deals 1 damage to target attacking or blocking creature." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: This permanent deals 1 damage to target attacking or blocking creature.\""))); diff --git a/Mage.Sets/src/mage/cards/r/RadiantEssence.java b/Mage.Sets/src/mage/cards/r/RadiantEssence.java index dc3b2f1846f..51bf2d3c13c 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantEssence.java +++ b/Mage.Sets/src/mage/cards/r/RadiantEssence.java @@ -36,7 +36,7 @@ public final class RadiantEssence extends CardImpl { this.toughness = new MageInt(3); // Radiant Essence gets +1/+2 as long as an opponent controls a black permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "{this} gets +1/+2 as long as an opponent controls a black permanent"))); diff --git a/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java b/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java index 846eb81f859..429b65d64e0 100644 --- a/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java +++ b/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java @@ -45,7 +45,7 @@ public final class RaffCapashenShipsMage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // You may cast historic spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, false) .setText("You may cast historic spells as though they had flash. (Artifacts, legendaries, and Sagas are historic.)"))); } diff --git a/Mage.Sets/src/mage/cards/r/Rageform.java b/Mage.Sets/src/mage/cards/r/Rageform.java index e5e8f5bd89a..b35dd7c8546 100644 --- a/Mage.Sets/src/mage/cards/r/Rageform.java +++ b/Mage.Sets/src/mage/cards/r/Rageform.java @@ -27,7 +27,7 @@ public final class Rageform extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesAuraAttachToManifestSourceEffect())); // Enchanted creature has double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/r/RampagingCyclops.java b/Mage.Sets/src/mage/cards/r/RampagingCyclops.java index e74e37ab86c..a715a3591aa 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingCyclops.java +++ b/Mage.Sets/src/mage/cards/r/RampagingCyclops.java @@ -32,7 +32,7 @@ public final class RampagingCyclops extends CardImpl { this.toughness = new MageInt(4); // Rampaging Cyclops gets -2/-0 as long as two or more creatures are blocking it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(-2, 0, Duration.WhileOnBattlefield), RampagingCyclopsCondition.instance, diff --git a/Mage.Sets/src/mage/cards/r/RangeTrooper.java b/Mage.Sets/src/mage/cards/r/RangeTrooper.java index fcf16b4dca6..2ab5d352f21 100644 --- a/Mage.Sets/src/mage/cards/r/RangeTrooper.java +++ b/Mage.Sets/src/mage/cards/r/RangeTrooper.java @@ -43,7 +43,7 @@ public final class RangeTrooper extends CardImpl { // Trooper creatures you control have "When this creature enters that battlefield, you may exile target creature. Return that creature to the battlefield at the beginning of the next end step." Ability ability = new EntersBattlefieldTriggeredAbility(new RangeTrooperEffect(), true); ability.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/r/RatColony.java b/Mage.Sets/src/mage/cards/r/RatColony.java index 619c6a21391..7a339ac92dc 100644 --- a/Mage.Sets/src/mage/cards/r/RatColony.java +++ b/Mage.Sets/src/mage/cards/r/RatColony.java @@ -38,7 +38,7 @@ public final class RatColony extends CardImpl { this.toughness = new MageInt(1); // Rat Colony gets +1/+0 for each other Rat you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java index b06cbab4260..8fe80bae341 100644 --- a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java +++ b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java @@ -39,7 +39,7 @@ public final class RegisaurAlpha extends CardImpl { this.toughness = new MageInt(4); // Other Dinosaurs you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); // When Regisaur Alpha enters the battlefield, create a 3/3 green Dinosaur creature token with trample. diff --git a/Mage.Sets/src/mage/cards/r/RelicRunner.java b/Mage.Sets/src/mage/cards/r/RelicRunner.java index ac63de39ef5..4f836100f0f 100644 --- a/Mage.Sets/src/mage/cards/r/RelicRunner.java +++ b/Mage.Sets/src/mage/cards/r/RelicRunner.java @@ -35,7 +35,7 @@ public final class RelicRunner extends CardImpl { this.toughness = new MageInt(1); // Relic Runner can't be blocked if you've cast an historic spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(new CantBeBlockedSourceAbility(), Duration.WhileOnBattlefield), new CastHistoricSpellThisTurnCondition(), diff --git a/Mage.Sets/src/mage/cards/r/Retaliation.java b/Mage.Sets/src/mage/cards/r/Retaliation.java index 16253cc2b83..a8febe2d5c5 100644 --- a/Mage.Sets/src/mage/cards/r/Retaliation.java +++ b/Mage.Sets/src/mage/cards/r/Retaliation.java @@ -32,7 +32,7 @@ public final class Retaliation extends CardImpl { Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("Creatures you control have \"Whenever this creature becomes blocked by a creature, " + "this creature gets +1/+1 until end of turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( effect)); } diff --git a/Mage.Sets/src/mage/cards/r/RiotTrooper.java b/Mage.Sets/src/mage/cards/r/RiotTrooper.java index fa6173f7666..0b7e7cfa73c 100644 --- a/Mage.Sets/src/mage/cards/r/RiotTrooper.java +++ b/Mage.Sets/src/mage/cards/r/RiotTrooper.java @@ -33,7 +33,7 @@ public final class RiotTrooper extends CardImpl { this.toughness = new MageInt(2); // Each trooper creature you control can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CanBlockAdditionalCreatureAllEffect(1, filter, Duration.WhileOnBattlefield) .setText("Each trooper creature you control can block an additional creature each combat"))); } diff --git a/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java b/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java index cd75a3282b6..fe2fc50bff4 100644 --- a/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java +++ b/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java @@ -51,7 +51,7 @@ public final class RoshanHiddenMagister extends CardImpl { ))); // Face-down creatures you control have menace. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new MenaceAbility(false), Duration.WhileOnBattlefield, filter diff --git a/Mage.Sets/src/mage/cards/r/RubyLeech.java b/Mage.Sets/src/mage/cards/r/RubyLeech.java index 868ba44d266..f9b92e03a38 100644 --- a/Mage.Sets/src/mage/cards/r/RubyLeech.java +++ b/Mage.Sets/src/mage/cards/r/RubyLeech.java @@ -37,7 +37,7 @@ public final class RubyLeech extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Red spells you cast cost {R} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{R}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/r/RuhamDjinn.java b/Mage.Sets/src/mage/cards/r/RuhamDjinn.java index d38709bddde..5cd2a9322ce 100644 --- a/Mage.Sets/src/mage/cards/r/RuhamDjinn.java +++ b/Mage.Sets/src/mage/cards/r/RuhamDjinn.java @@ -34,7 +34,7 @@ public final class RuhamDjinn extends CardImpl { // // Ruham Djinn gets -2/-2 as long as white is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.WHITE)), "{this} gets -2/-2 as long as white is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java index 658cb7288fd..d077b26c783 100644 --- a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java +++ b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java @@ -87,7 +87,7 @@ class RuneTailEssence extends TokenImpl { color.setWhite(true); // Prevent all damage that would be dealt to creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/r/RustedRelic.java b/Mage.Sets/src/mage/cards/r/RustedRelic.java index 17689395611..506c9ef6b90 100644 --- a/Mage.Sets/src/mage/cards/r/RustedRelic.java +++ b/Mage.Sets/src/mage/cards/r/RustedRelic.java @@ -22,7 +22,7 @@ public final class RustedRelic extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Metalcraft — Rusted Relic is a 5/5 Golem artifact creature as long as you control three or more artifacts. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new RustedRelicToken(), CardType.ARTIFACT, Duration.WhileOnBattlefield), MetalcraftCondition.instance, diff --git a/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java b/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java index f7d387b3961..236fa52925e 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java @@ -26,7 +26,7 @@ public final class RuthlessCullblade extends CardImpl { this.toughness = new MageInt(1); // Ruthless Cullblade gets +2/+1 as long as an opponent has 10 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), new LifeCompareCondition(TargetController.OPPONENT, ComparisonType.OR_LESS, 10), "{this} gets +2/+1 as long as an opponent has 10 or less life."))); diff --git a/Mage.Sets/src/mage/cards/s/SapphireLeech.java b/Mage.Sets/src/mage/cards/s/SapphireLeech.java index 68dc78d5fc1..1f0315835f9 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireLeech.java +++ b/Mage.Sets/src/mage/cards/s/SapphireLeech.java @@ -37,7 +37,7 @@ public final class SapphireLeech extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Blue spells you cast cost {U} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{U}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/s/ScoriaCat.java b/Mage.Sets/src/mage/cards/s/ScoriaCat.java index d590cc447cd..4e6701030e1 100644 --- a/Mage.Sets/src/mage/cards/s/ScoriaCat.java +++ b/Mage.Sets/src/mage/cards/s/ScoriaCat.java @@ -36,7 +36,7 @@ public final class ScoriaCat extends CardImpl { this.toughness = new MageInt(3); // Scoria Cat gets +3/+3 as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} gets +3/+3 as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java index 9839b851990..2c6f5f63abb 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java @@ -35,7 +35,7 @@ public final class ScreechingSliver extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, allSliversFilter, "All Slivers have \"{T}: Target player mills a card.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SeaLegs.java b/Mage.Sets/src/mage/cards/s/SeaLegs.java index 69ae710badb..35170cfaa76 100644 --- a/Mage.Sets/src/mage/cards/s/SeaLegs.java +++ b/Mage.Sets/src/mage/cards/s/SeaLegs.java @@ -41,7 +41,7 @@ public final class SeaLegs extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+2 as long as it's a Pirate. Otherwise, it gets -2/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostEnchantedEffect(0, 2), new BoostEnchantedEffect(-2, -0), diff --git a/Mage.Sets/src/mage/cards/s/SedgeSliver.java b/Mage.Sets/src/mage/cards/s/SedgeSliver.java index c70007555ba..81336897609 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeSliver.java +++ b/Mage.Sets/src/mage/cards/s/SedgeSliver.java @@ -39,12 +39,12 @@ public final class SedgeSliver extends CardImpl { // All Sliver creatures have "This creature gets +1/+1 as long as you control a Swamp." Ability boost = new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filterSwamp, 1, 1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(boost, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"This creature gets +1/+1 as long as you control a Swamp.\""))); // All Slivers have "{B}: Regenerate this permanent." Ability regenerate = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(regenerate, Duration.WhileOnBattlefield, filterSlivers, "All Slivers have \"{B}: Regenerate this permanent.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java b/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java index d978a28a417..5eeb03f8b0a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java +++ b/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java @@ -37,7 +37,7 @@ public final class ShadowfaxLordOfHorses extends CardImpl { this.toughness = new MageInt(4); // Horses you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); // Whenever Shadowfax, Lord of Horses attacks, you may put a creature card @@ -106,4 +106,4 @@ class ShadowfaxLordOfHorsesEffect extends OneShotEffect { return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java index ba0c0cde1cc..c8ff0ec5076 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java @@ -39,7 +39,7 @@ public final class ShaperApprentice extends CardImpl { this.toughness = new MageInt(1); // Shaper Apprentice has flying as long as you control another Merfolk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has flying as long as you control another Merfolk"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java index 1e9c8b9edf1..ca1ad61c5e0 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java @@ -27,7 +27,7 @@ public final class ShieldOfTheRealm extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // If a source would deal damage to equipped creature, prevent 2 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PreventDamageToAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT, 2, false))); // Equip {1} this.addAbility(new EquipAbility(Outcome.PreventDamage, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/s/ShieldingPlax.java b/Mage.Sets/src/mage/cards/s/ShieldingPlax.java index 1e7901cf1eb..4451f48e4ab 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldingPlax.java +++ b/Mage.Sets/src/mage/cards/s/ShieldingPlax.java @@ -46,7 +46,7 @@ public final class ShieldingPlax extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature can't be the target of spells or abilities your opponents control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeTargetedAttachedEffect(filter, Duration.WhileOnBattlefield, AttachmentType.AURA, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/s/Shimmer.java b/Mage.Sets/src/mage/cards/s/Shimmer.java index 9f2eb552b8b..d26f5439d57 100644 --- a/Mage.Sets/src/mage/cards/s/Shimmer.java +++ b/Mage.Sets/src/mage/cards/s/Shimmer.java @@ -28,7 +28,7 @@ public final class Shimmer extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseLandTypeEffect(Outcome.Detriment))); // Each land of the chosen type has phasing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllOfChosenSubtypeEffect(PhasingAbility.getInstance(), Duration.WhileOnBattlefield, new FilterLandPermanent("Each land of the chosen type")))); } diff --git a/Mage.Sets/src/mage/cards/s/SidewinderSliver.java b/Mage.Sets/src/mage/cards/s/SidewinderSliver.java index 2ffb7a4ff66..6d638725dbe 100644 --- a/Mage.Sets/src/mage/cards/s/SidewinderSliver.java +++ b/Mage.Sets/src/mage/cards/s/SidewinderSliver.java @@ -34,7 +34,7 @@ public final class SidewinderSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have flanking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, false) .setText("all Sliver creatures have flanking") )); diff --git a/Mage.Sets/src/mage/cards/s/SkinInvasion.java b/Mage.Sets/src/mage/cards/s/SkinInvasion.java index ea4a8eb81d7..418c9d540bc 100644 --- a/Mage.Sets/src/mage/cards/s/SkinInvasion.java +++ b/Mage.Sets/src/mage/cards/s/SkinInvasion.java @@ -44,7 +44,7 @@ public final class SkinInvasion extends CardImpl { this.addAbility(ability); // Enchanted creature attacks each combat if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA))); // When enchanted creature dies, return Skin Invasion to the battlefield transformed under your control. diff --git a/Mage.Sets/src/mage/cards/s/SkittishKavu.java b/Mage.Sets/src/mage/cards/s/SkittishKavu.java index 86d2e590e2e..de150f7b51d 100644 --- a/Mage.Sets/src/mage/cards/s/SkittishKavu.java +++ b/Mage.Sets/src/mage/cards/s/SkittishKavu.java @@ -41,7 +41,7 @@ public final class SkittishKavu extends CardImpl { this.toughness = new MageInt(1); // Skittish Kavu gets +1/+1 as long as no opponent controls a white or blue creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, false)), "{this} gets +1/+1 as long as no opponent controls a white or blue creature"))); diff --git a/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java b/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java index ccccd64d333..ba0e4c1ea16 100644 --- a/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java +++ b/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java @@ -29,7 +29,7 @@ public final class SkyriderTrainee extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new EnchantedSourceCondition(), diff --git a/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java b/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java index 1bceefd48b1..64a9f444c6e 100644 --- a/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java +++ b/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java @@ -36,7 +36,7 @@ public final class SnakeCultInitiation extends CardImpl { this.addAbility(ability); // Enchanted creature has poisonous 3. this.addAbility( - new SimpleStaticAbility(Zone.BATTLEFIELD, + new SimpleStaticAbility( new GainAbilityAttachedEffect(new PoisonousAbility(3), AttachmentType.AURA) .setText("Enchanted creature has poisonous 3. " + "(Whenever it deals combat damage to a player, that player gets three poison counters. " + diff --git a/Mage.Sets/src/mage/cards/s/SnowTrooper.java b/Mage.Sets/src/mage/cards/s/SnowTrooper.java index 540d5560d3f..d3698354e28 100644 --- a/Mage.Sets/src/mage/cards/s/SnowTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SnowTrooper.java @@ -28,7 +28,7 @@ public final class SnowTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have firststrike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.TROOPER, "Trooper creatures"), false))); } diff --git a/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java b/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java index 9c0d8a73004..ba4643d18f8 100644 --- a/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java +++ b/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java @@ -36,7 +36,7 @@ public final class SpellbaneCentaur extends CardImpl { this.toughness = new MageInt(2); // Creatures you control can't be the targets of blue spells or abilities from blue sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeTargetedAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURES, filter, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java b/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java index 7380d63032c..ad9e37e79f5 100644 --- a/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java +++ b/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java @@ -25,7 +25,7 @@ public final class SpellwildOuphe extends CardImpl { this.toughness = new MageInt(3); // Spells that target Spellwild Ouphe cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(-2, new FilterCard("Spells"), TargetController.ANY)) ); } @@ -38,4 +38,4 @@ public final class SpellwildOuphe extends CardImpl { public SpellwildOuphe copy() { return new SpellwildOuphe(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SphereOfResistance.java b/Mage.Sets/src/mage/cards/s/SphereOfResistance.java index 6f3f49be0c0..da01ea7f09d 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfResistance.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfResistance.java @@ -20,7 +20,7 @@ public final class SphereOfResistance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(1, new FilterCard("Spells"), TargetController.ANY)) ); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java b/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java index 102695ce817..45a81add37f 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java +++ b/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java @@ -34,7 +34,7 @@ public final class SphinxOfNewPrahv extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Spells your opponents cast that target Sphinx of New Prahv cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java b/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java index b5d5c3e23f5..6111c8b853d 100644 --- a/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java +++ b/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java @@ -25,7 +25,7 @@ public final class SpidersilkArmor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // Creatures you control get +0/+1 and have reach. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityControlledEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); diff --git a/Mage.Sets/src/mage/cards/s/SpittingSliver.java b/Mage.Sets/src/mage/cards/s/SpittingSliver.java index 30a6b9753d0..2136029ac9e 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingSliver.java +++ b/Mage.Sets/src/mage/cards/s/SpittingSliver.java @@ -34,7 +34,7 @@ public final class SpittingSliver extends CardImpl { // All Sliver creatures have first strike. Ability gainedAbility = FirstStrikeAbility.getInstance(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, "All Sliver creatures have first strike."))); } diff --git a/Mage.Sets/src/mage/cards/s/SpurGrappler.java b/Mage.Sets/src/mage/cards/s/SpurGrappler.java index 64b056d522b..26a2fcabc95 100644 --- a/Mage.Sets/src/mage/cards/s/SpurGrappler.java +++ b/Mage.Sets/src/mage/cards/s/SpurGrappler.java @@ -36,7 +36,7 @@ public final class SpurGrappler extends CardImpl { this.toughness = new MageInt(1); // Spur Grappler gets +2/+1 as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} gets +2/+1 as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/s/Squeeze.java b/Mage.Sets/src/mage/cards/s/Squeeze.java index 998c8da36f8..0e7a3b043da 100644 --- a/Mage.Sets/src/mage/cards/s/Squeeze.java +++ b/Mage.Sets/src/mage/cards/s/Squeeze.java @@ -26,7 +26,7 @@ public final class Squeeze extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Sorcery spells cost {3} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(3, filter, TargetController.ANY)) ); } diff --git a/Mage.Sets/src/mage/cards/s/SteelformSliver.java b/Mage.Sets/src/mage/cards/s/SteelformSliver.java index 8e639460ab5..25f99fa32b2 100644 --- a/Mage.Sets/src/mage/cards/s/SteelformSliver.java +++ b/Mage.Sets/src/mage/cards/s/SteelformSliver.java @@ -27,7 +27,7 @@ public final class SteelformSliver extends CardImpl { this.toughness = new MageInt(2); // Sliver creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java b/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java index 4d6494bc2af..247164ee62b 100644 --- a/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java +++ b/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java @@ -42,7 +42,7 @@ public class StennParanoidPartisan extends CardImpl { )); // Spells you cast of the chosen type cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenCardTypeEffect(new FilterCard("Spells you cast of the chosen type"), 1, true) )); diff --git a/Mage.Sets/src/mage/cards/s/StrikingSliver.java b/Mage.Sets/src/mage/cards/s/StrikingSliver.java index 083e5e51fa5..5b1027db0f9 100644 --- a/Mage.Sets/src/mage/cards/s/StrikingSliver.java +++ b/Mage.Sets/src/mage/cards/s/StrikingSliver.java @@ -28,7 +28,7 @@ public final class StrikingSliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/s/SublimeArchangel.java b/Mage.Sets/src/mage/cards/s/SublimeArchangel.java index c6ff6133e43..17baa75a078 100644 --- a/Mage.Sets/src/mage/cards/s/SublimeArchangel.java +++ b/Mage.Sets/src/mage/cards/s/SublimeArchangel.java @@ -33,7 +33,7 @@ public final class SublimeArchangel extends CardImpl { // Exalted this.addAbility(new ExaltedAbility()); // Other creatures you control have exalted. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(new ExaltedAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); } diff --git a/Mage.Sets/src/mage/cards/s/SulamDjinn.java b/Mage.Sets/src/mage/cards/s/SulamDjinn.java index 7d655cebc0f..bd102e2dc35 100644 --- a/Mage.Sets/src/mage/cards/s/SulamDjinn.java +++ b/Mage.Sets/src/mage/cards/s/SulamDjinn.java @@ -33,7 +33,7 @@ public final class SulamDjinn extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Sulam Djinn gets -2/-2 as long as green is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.GREEN)), "{this} gets -2/-2 as long as green is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java index 8c8fe881900..4a2415e96f6 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java +++ b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java @@ -51,7 +51,7 @@ public final class SultaiRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has deathtouch as long as you control a green or blue permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has deathtouch as long as you control a green or blue permanent"))); } diff --git a/Mage.Sets/src/mage/cards/s/SummitApes.java b/Mage.Sets/src/mage/cards/s/SummitApes.java index 63e0ddf5856..2e07e1e8ece 100644 --- a/Mage.Sets/src/mage/cards/s/SummitApes.java +++ b/Mage.Sets/src/mage/cards/s/SummitApes.java @@ -37,7 +37,7 @@ public final class SummitApes extends CardImpl { this.toughness = new MageInt(2); // As long as you control a Mountain, Summit Apes has menace. (It can't be blocked except by two or more creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility()), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/s/Sunforger.java b/Mage.Sets/src/mage/cards/s/Sunforger.java index cfc3ef41d61..02d07480951 100644 --- a/Mage.Sets/src/mage/cards/s/Sunforger.java +++ b/Mage.Sets/src/mage/cards/s/Sunforger.java @@ -44,7 +44,7 @@ public final class Sunforger extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostEquippedEffect(4, 0, Duration.WhileOnBattlefield))); // {R}{W}, Unattach Sunforger: Search your library for a red or white diff --git a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java index 450ba30e121..e800d7898d1 100644 --- a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java +++ b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java @@ -50,7 +50,7 @@ public final class SurrakDragonclaw extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); // Other creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); } diff --git a/Mage.Sets/src/mage/cards/s/SynchronousSliver.java b/Mage.Sets/src/mage/cards/s/SynchronousSliver.java index 22ca978d49f..fed42cf6770 100644 --- a/Mage.Sets/src/mage/cards/s/SynchronousSliver.java +++ b/Mage.Sets/src/mage/cards/s/SynchronousSliver.java @@ -29,7 +29,7 @@ public final class SynchronousSliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have vigilance."))); } diff --git a/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java b/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java index 087efb719c2..aa7cacedc07 100644 --- a/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java +++ b/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java @@ -37,7 +37,7 @@ public final class SyrElenoraTheDiscerning extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Spells your opponents cast that target Syr Elenora cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java index 62a8d948180..cfc3fe2ff6c 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java @@ -39,7 +39,7 @@ public final class TalonsOfFalkenrath extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{1}{R}: This creature gets +2/+0 until end of turn." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/t/TeferisSentinel.java b/Mage.Sets/src/mage/cards/t/TeferisSentinel.java index da3e3983fa5..0d10683d8ca 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisSentinel.java +++ b/Mage.Sets/src/mage/cards/t/TeferisSentinel.java @@ -32,7 +32,7 @@ public final class TeferisSentinel extends CardImpl { FilterControlledPermanent filter = new FilterControlledPermanent(); filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(SubType.TEFERI.getPredicate()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(4, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/t/TelekineticSliver.java b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java index f735e8eb122..ae8a0ed07d4 100644 --- a/Mage.Sets/src/mage/cards/t/TelekineticSliver.java +++ b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java @@ -35,7 +35,7 @@ public final class TelekineticSliver extends CardImpl { // All Slivers have "{T}: Tap target permanent." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Tap target permanent.\""))); } diff --git a/Mage.Sets/src/mage/cards/t/TemurRunemark.java b/Mage.Sets/src/mage/cards/t/TemurRunemark.java index 8a357973e2c..7b69dc269c1 100644 --- a/Mage.Sets/src/mage/cards/t/TemurRunemark.java +++ b/Mage.Sets/src/mage/cards/t/TemurRunemark.java @@ -51,7 +51,7 @@ public final class TemurRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has trample as long as you control a blue or red permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has trample as long as you control a blue or red permanent"))); } diff --git a/Mage.Sets/src/mage/cards/t/TenaciousHunter.java b/Mage.Sets/src/mage/cards/t/TenaciousHunter.java index bf1e7677678..625646074c0 100644 --- a/Mage.Sets/src/mage/cards/t/TenaciousHunter.java +++ b/Mage.Sets/src/mage/cards/t/TenaciousHunter.java @@ -39,7 +39,7 @@ public final class TenaciousHunter extends CardImpl { this.toughness = new MageInt(4); // As long as a creature has a -1/-1 counter on it, Tenacious Hunter has vigilance and deathtouch. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter, false), "As long as a creature has a -1/-1 counter on it, {this} has vigilance")); diff --git a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java index 483220680e4..ee74d061c54 100644 --- a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java @@ -51,7 +51,7 @@ public final class ThatWhichWasTaken extends CardImpl { // Each permanent with a divinity counter on it has indestructible. Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filterIndestructible, false); effect.setText("Each permanent with a divinity counter on it has indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( effect)); } diff --git a/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java b/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java index 36407025bc4..cea349b3b7e 100644 --- a/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java +++ b/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java @@ -38,7 +38,7 @@ public final class TheTwelfthDoctor extends CardImpl { this.toughness = new MageInt(4); // The first spell you cast from anywhere other than your hand each turn has demonstrate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new TheTwelfthDoctorGainDemonstrateEffect()), new TheTwelfthDoctorWatcher()); this.addAbility(new TheTwelfthDoctorCopyTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java index 569908848be..3473c35453d 100644 --- a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java +++ b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java @@ -33,7 +33,7 @@ public final class ThorncasterSliver extends CardImpl { // Sliver creatures you control have "Whenever this creature attacks, it deals 1 damage to any target." Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS) .setText("Sliver creatures you control have \"Whenever this creature attacks, it deals 1 damage to any target.\""))); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java b/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java index 4b162803320..c9e17e121c0 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java @@ -31,7 +31,7 @@ public final class ThoughtDevourer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Your maximum hand size is reduced by four. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(4, Duration.WhileOnBattlefield, HandSizeModification.REDUCE))); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtEater.java b/Mage.Sets/src/mage/cards/t/ThoughtEater.java index c1a187ea50d..dca9e9cf8e8 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtEater.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtEater.java @@ -31,7 +31,7 @@ public final class ThoughtEater extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Your maximum hand size is reduced by three. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(3, Duration.WhileOnBattlefield, HandSizeModification.REDUCE))); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java b/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java index dbaca7dd6b0..b1c6ad6eea3 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java @@ -31,7 +31,7 @@ public final class ThoughtNibbler extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Your maximum hand size is reduced by two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.REDUCE))); } diff --git a/Mage.Sets/src/mage/cards/t/ThresherLizard.java b/Mage.Sets/src/mage/cards/t/ThresherLizard.java index 598c6aef2d3..d992d173fff 100644 --- a/Mage.Sets/src/mage/cards/t/ThresherLizard.java +++ b/Mage.Sets/src/mage/cards/t/ThresherLizard.java @@ -28,7 +28,7 @@ public final class ThresherLizard extends CardImpl { this.toughness = new MageInt(2); // Thresher Lizard gets +1/+2 as long as you have one or fewer cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), HeckbentCondition.instance, diff --git a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java index 42da65135d9..9fce17a797b 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java +++ b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java @@ -44,7 +44,7 @@ public final class ThrunBreakerOfSilence extends CardImpl { // Thrun, Breaker of Silence can't be the target of nongreen spells your opponents control or abilities from nongreen sources your opponents control. this.addAbility(new SimpleStaticAbility(new ThrunBreakerOfSilenceEffect())); // As long as it's your turn, Thrun has indestructible. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, {this} has indestructible")) diff --git a/Mage.Sets/src/mage/cards/t/ToxicIguanar.java b/Mage.Sets/src/mage/cards/t/ToxicIguanar.java index 96c485f39b0..48cf77f1e1c 100644 --- a/Mage.Sets/src/mage/cards/t/ToxicIguanar.java +++ b/Mage.Sets/src/mage/cards/t/ToxicIguanar.java @@ -38,7 +38,7 @@ public final class ToxicIguanar extends CardImpl { this.toughness = new MageInt(1); // Toxic Iguanar has deathtouch as long as you control a green permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has deathtouch as long as you control a green permanent"))); } diff --git a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java index fa6d474b188..2f3d6e1406f 100644 --- a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java +++ b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java @@ -37,7 +37,7 @@ public final class TrueFaithCenser extends CardImpl { this.addAbility(ability); // As long as equipped creature is a Human, it gets an additional +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); diff --git a/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java b/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java index bf978936665..f16831ad6c6 100644 --- a/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java +++ b/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java @@ -39,7 +39,7 @@ public final class TrustedAdvisor extends CardImpl { this.toughness = new MageInt(2); // Your maximum hand size is increased by two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.INCREASE))); // At the beginning of your upkeep, return a blue creature you control to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java b/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java index 6ed6ff79295..25a8f5ba697 100644 --- a/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java +++ b/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java @@ -41,7 +41,7 @@ public final class UnquestionedAuthority extends CardImpl { // When Unquestioned Authority enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has protection from creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new ProtectionAbility(StaticFilters.FILTER_PERMANENT_CREATURES), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasIncubator.java b/Mage.Sets/src/mage/cards/u/UrzasIncubator.java index b0e85bbb522..6d7cd7b4c80 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasIncubator.java +++ b/Mage.Sets/src/mage/cards/u/UrzasIncubator.java @@ -25,7 +25,7 @@ public final class UrzasIncubator extends CardImpl { // As Urza's Incubator enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); // Creature spells of the chosen type cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenSubtypeEffect(new FilterCreatureCard("creature spells of the chosen type"), 2))); } diff --git a/Mage.Sets/src/mage/cards/v/VeiledSerpent.java b/Mage.Sets/src/mage/cards/v/VeiledSerpent.java index e30338bdc53..42bf1e8af41 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledSerpent.java +++ b/Mage.Sets/src/mage/cards/v/VeiledSerpent.java @@ -60,7 +60,7 @@ class VeiledSerpentToken extends TokenImpl { subtype.add(SubType.SERPENT); power = new MageInt(4); toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantAttackUnlessDefenderControllsPermanent( new FilterLandPermanent(SubType.ISLAND, "an Island")))); } diff --git a/Mage.Sets/src/mage/cards/v/VenomSliver.java b/Mage.Sets/src/mage/cards/v/VenomSliver.java index 4ae8cbbf267..bc47c4daeb0 100644 --- a/Mage.Sets/src/mage/cards/v/VenomSliver.java +++ b/Mage.Sets/src/mage/cards/v/VenomSliver.java @@ -28,7 +28,7 @@ public final class VenomSliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/v/VictualSliver.java b/Mage.Sets/src/mage/cards/v/VictualSliver.java index 84edf3f8f78..6c8c7860a8d 100644 --- a/Mage.Sets/src/mage/cards/v/VictualSliver.java +++ b/Mage.Sets/src/mage/cards/v/VictualSliver.java @@ -35,7 +35,7 @@ public final class VictualSliver extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{2}, Sacrifice this permanent: You gain 4 life.\""))); diff --git a/Mage.Sets/src/mage/cards/v/VintaraSnapper.java b/Mage.Sets/src/mage/cards/v/VintaraSnapper.java index 68ed24186a2..c2ecca33d88 100644 --- a/Mage.Sets/src/mage/cards/v/VintaraSnapper.java +++ b/Mage.Sets/src/mage/cards/v/VintaraSnapper.java @@ -37,7 +37,7 @@ public final class VintaraSnapper extends CardImpl { this.toughness = new MageInt(2); // Vintara Snapper has shroud as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} has shroud as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/v/VirulentSliver.java b/Mage.Sets/src/mage/cards/v/VirulentSliver.java index 5f9b4deaf06..9a967744abc 100644 --- a/Mage.Sets/src/mage/cards/v/VirulentSliver.java +++ b/Mage.Sets/src/mage/cards/v/VirulentSliver.java @@ -32,7 +32,7 @@ public final class VirulentSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have poisonous 1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new PoisonousAbility(1), Duration.WhileOnBattlefield, filter, "All Sliver creatures have poisonous 1. (Whenever a Sliver deals combat damage to a player, that player gets a poison counter.)"))); diff --git a/Mage.Sets/src/mage/cards/w/WalkingDream.java b/Mage.Sets/src/mage/cards/w/WalkingDream.java index 91053c7150b..334d35a5766 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingDream.java +++ b/Mage.Sets/src/mage/cards/w/WalkingDream.java @@ -38,7 +38,7 @@ public final class WalkingDream extends CardImpl { // Walking Dream doesn't untap during your untap step if an opponent controls two or more creatures. ContinuousRuleModifyingEffect dontUntap = new DontUntapInControllersUntapStepSourceEffect(false, true); dontUntap.setText(rule); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousRuleModifyingEffect( dontUntap, new OpponentControlsPermanentCondition( diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java b/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java index 213b608cfea..a630c707c76 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java @@ -36,7 +36,7 @@ public final class WardenOfTheBeyond extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Warden of the Beyond gets +2/+2 as long as an opponent owns a card in exile. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), OpponentOwnsCardInExileCondition.instance, "{this} gets +2/+2 as long as an opponent owns a card in exile"))); } diff --git a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java index 1fd41897c59..7cd51e46651 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java +++ b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java @@ -32,7 +32,7 @@ public final class WaywardSwordtooth extends CardImpl { this.addAbility(new AscendAbility()); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // Wayward Sawtooth can't attack or block unless you have the city's blessing. diff --git a/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java b/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java index 897b3af4b51..f91d13843b2 100644 --- a/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java +++ b/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java @@ -34,7 +34,7 @@ public final class WildMagicSorcerer extends CardImpl { this.toughness = new MageInt(3); // The first spell you cast from exile each turn has cascade. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new WildMagicSorcererGainCascadeFirstSpellCastFromExileEffect()), new WildMagicSorcererWatcher()); } diff --git a/Mage.Sets/src/mage/cards/z/ZanamDjinn.java b/Mage.Sets/src/mage/cards/z/ZanamDjinn.java index bf258e57db8..a245c0d06e5 100644 --- a/Mage.Sets/src/mage/cards/z/ZanamDjinn.java +++ b/Mage.Sets/src/mage/cards/z/ZanamDjinn.java @@ -33,7 +33,7 @@ public final class ZanamDjinn extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Zanam Djinn gets -2/-2 as long as blue is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.BLUE)), "{this} gets -2/-2 as long as blue is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java b/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java index b213e2dac86..856abc25f6e 100644 --- a/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java +++ b/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java @@ -45,7 +45,7 @@ public final class ZaskSkitteringSwarmlord extends CardImpl { this.toughness = new MageInt(5); // You may play lands and cast Insect spells from your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayFromGraveyardControllerEffect(filter) )); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java index 8a2a1012570..9ca7ced514d 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java @@ -38,7 +38,7 @@ public final class ZurgoHelmsmasher extends CardImpl { this.addAbility(new AttacksEachCombatStaticAbility()); // Zurgo Helmsmasher has indestructible as long as it's your turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.instance, "{this} has indestructible as long as it's your turn")) diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index 85105f34478..6b721307cf9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -22,7 +22,7 @@ public final class KarnConstructToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, ArtifactYouControlCount.instance, Duration.WhileOnBattlefield) .setText("This creature gets +1/+1 for each artifact you control") )); diff --git a/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java b/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java index 5876cdc1430..5925705fc98 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java @@ -31,7 +31,7 @@ public final class VrenRatToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield ) -- 2.47.2 From ca6d0302b7244e39611e42450827ff6472cf44c1 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:19:12 -0500 Subject: [PATCH 26/50] refactor: SimpleStaticAbility default zone (separate line) --- Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java | 1 - Mage.Sets/src/mage/cards/a/AerialEngineer.java | 1 - Mage.Sets/src/mage/cards/a/AggressiveMammoth.java | 1 - Mage.Sets/src/mage/cards/a/AhnCropInvader.java | 1 - Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java | 1 - Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java | 1 - Mage.Sets/src/mage/cards/a/ArisenGorgon.java | 1 - Mage.Sets/src/mage/cards/a/AsForetold.java | 1 - Mage.Sets/src/mage/cards/a/AuriokEdgewright.java | 1 - Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java | 1 - Mage.Sets/src/mage/cards/c/CallToArms.java | 1 - Mage.Sets/src/mage/cards/c/CennsTactician.java | 1 - Mage.Sets/src/mage/cards/c/ChaosLord.java | 1 - Mage.Sets/src/mage/cards/c/ChargingWarBoar.java | 1 - Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java | 2 -- Mage.Sets/src/mage/cards/c/ColossusOfAkros.java | 1 - Mage.Sets/src/mage/cards/c/CourtCleric.java | 1 - Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java | 1 - Mage.Sets/src/mage/cards/c/CrownedCeratok.java | 1 - Mage.Sets/src/mage/cards/d/DarkbladeAgent.java | 1 - Mage.Sets/src/mage/cards/d/DarksteelMonolith.java | 1 - Mage.Sets/src/mage/cards/d/DepartedDeckhand.java | 1 - Mage.Sets/src/mage/cards/d/DizzyingGaze.java | 1 - Mage.Sets/src/mage/cards/d/DomesticatedHydra.java | 1 - Mage.Sets/src/mage/cards/d/DovinsAutomaton.java | 1 - Mage.Sets/src/mage/cards/d/DrogskolCaptain.java | 1 - Mage.Sets/src/mage/cards/d/DropkickBomber.java | 1 - Mage.Sets/src/mage/cards/e/EarthenGoo.java | 1 - Mage.Sets/src/mage/cards/e/ElvishClancaller.java | 1 - Mage.Sets/src/mage/cards/g/GarrisonSergeant.java | 1 - Mage.Sets/src/mage/cards/g/GearsmithGuardian.java | 1 - Mage.Sets/src/mage/cards/g/GearsmithProdigy.java | 1 - Mage.Sets/src/mage/cards/g/Gigantiform.java | 1 - Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java | 1 - Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java | 1 - Mage.Sets/src/mage/cards/g/GraspingScoundrel.java | 1 - Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java | 1 - Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java | 1 - Mage.Sets/src/mage/cards/h/HighAlert.java | 1 - Mage.Sets/src/mage/cards/h/HungeringHydra.java | 1 - Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java | 1 - Mage.Sets/src/mage/cards/i/InfiniteHourglass.java | 1 - Mage.Sets/src/mage/cards/i/InspiringPaladin.java | 2 -- Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java | 1 - Mage.Sets/src/mage/cards/k/KarganDragonrider.java | 1 - Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java | 1 - Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java | 1 - Mage.Sets/src/mage/cards/l/LightningMare.java | 1 - Mage.Sets/src/mage/cards/l/LimitedResources.java | 1 - Mage.Sets/src/mage/cards/l/LongshotSquad.java | 1 - Mage.Sets/src/mage/cards/m/MarkOfAsylum.java | 1 - Mage.Sets/src/mage/cards/m/MerEkNightblade.java | 1 - Mage.Sets/src/mage/cards/m/MonstrousHound.java | 2 -- Mage.Sets/src/mage/cards/m/MoonEatingDog.java | 1 - Mage.Sets/src/mage/cards/m/MythUnbound.java | 1 - Mage.Sets/src/mage/cards/o/OctopusUmbra.java | 1 - Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java | 1 - Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java | 1 - Mage.Sets/src/mage/cards/p/PestilentSpirit.java | 1 - Mage.Sets/src/mage/cards/p/PhyrexianBoon.java | 1 - Mage.Sets/src/mage/cards/p/PistonFistCyclops.java | 1 - Mage.Sets/src/mage/cards/p/PlagueMare.java | 1 - Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java | 1 - Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java | 1 - Mage.Sets/src/mage/cards/r/RighteousWar.java | 2 -- Mage.Sets/src/mage/cards/r/RushbladeCommander.java | 1 - Mage.Sets/src/mage/cards/s/SapphireDrake.java | 1 - Mage.Sets/src/mage/cards/s/ScroungedScythe.java | 1 - Mage.Sets/src/mage/cards/s/Scuttlegator.java | 1 - Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java | 1 - Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java | 1 - Mage.Sets/src/mage/cards/s/SinstrikersWill.java | 1 - Mage.Sets/src/mage/cards/s/SinuousVermin.java | 1 - Mage.Sets/src/mage/cards/s/SkatewingSpy.java | 1 - Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java | 1 - Mage.Sets/src/mage/cards/s/SnowDevil.java | 1 - Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java | 2 -- Mage.Sets/src/mage/cards/s/StreetRiot.java | 1 - Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java | 1 - Mage.Sets/src/mage/cards/s/SupremePhantom.java | 1 - Mage.Sets/src/mage/cards/s/SurgeMare.java | 1 - Mage.Sets/src/mage/cards/s/SwarmbornGiant.java | 1 - Mage.Sets/src/mage/cards/t/TahngarthsRage.java | 1 - Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java | 1 - Mage.Sets/src/mage/cards/t/TendershootDryad.java | 1 - Mage.Sets/src/mage/cards/t/TeysaKarlov.java | 1 - Mage.Sets/src/mage/cards/t/TezzeretsStrider.java | 1 - Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java | 1 - Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java | 1 - Mage.Sets/src/mage/cards/t/TlincalliHunter.java | 1 - Mage.Sets/src/mage/cards/t/TrollbredGuardian.java | 1 - Mage.Sets/src/mage/cards/t/TuskguardCaptain.java | 1 - Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java | 1 - Mage.Sets/src/mage/cards/u/UrbanUtopia.java | 1 - Mage.Sets/src/mage/cards/v/ValiantKnight.java | 1 - Mage.Sets/src/mage/cards/v/VelaTheNightClad.java | 1 - Mage.Sets/src/mage/cards/v/VigorsporeWurm.java | 1 - Mage.Sets/src/mage/cards/v/VineMare.java | 1 - Mage.Sets/src/mage/cards/v/VividFlyingFish.java | 1 - Mage.Sets/src/mage/cards/w/WargRider.java | 1 - Mage.Sets/src/mage/cards/w/WitheringHex.java | 1 - Mage.Sets/src/mage/cards/w/WoollyMammoths.java | 1 - Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java | 1 - .../java/mage/game/permanent/token/ElephantResurgenceToken.java | 1 - .../main/java/mage/game/permanent/token/SoundTheCallToken.java | 1 - 105 files changed, 110 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java index a8825077a0f..9548556ad0c 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java @@ -32,7 +32,6 @@ public final class AbzanBattlePriest extends CardImpl { // Each creature you control with a +1/+1 counter on it has lifelink. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1, diff --git a/Mage.Sets/src/mage/cards/a/AerialEngineer.java b/Mage.Sets/src/mage/cards/a/AerialEngineer.java index 3d0ad400fce..450e1759fc8 100644 --- a/Mage.Sets/src/mage/cards/a/AerialEngineer.java +++ b/Mage.Sets/src/mage/cards/a/AerialEngineer.java @@ -33,7 +33,6 @@ public final class AerialEngineer extends CardImpl { // As long as you control an artifact, Aerial Engineer gets +2/+0 and has flying. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition( diff --git a/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java b/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java index 5db5480e8ea..96bae96f2bc 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java @@ -31,7 +31,6 @@ public final class AggressiveMammoth extends CardImpl { // Other creatures you control have trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java index 4dc68cf6781..c91347f923d 100644 --- a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java +++ b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java @@ -38,7 +38,6 @@ public final class AhnCropInvader extends CardImpl { // As long as it's your turn, Ahn-Crop Invader has first strike. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java b/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java index fc149d9c60e..d8aea5bad5f 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java @@ -30,7 +30,6 @@ public final class AmuletOfSafekeeping extends CardImpl { // Creature tokens get -1/-0. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostAllEffect( -1, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURE_TOKENS, false diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java index 835f80563ed..c1419d88fc5 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java @@ -39,7 +39,6 @@ public final class ArchfiendOfDespair extends CardImpl { // Your opponents can't gain life. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantGainLifeAllEffect( Duration.WhileOnBattlefield, TargetController.OPPONENT diff --git a/Mage.Sets/src/mage/cards/a/ArisenGorgon.java b/Mage.Sets/src/mage/cards/a/ArisenGorgon.java index 9a63ec14a4c..b3e86ab367b 100644 --- a/Mage.Sets/src/mage/cards/a/ArisenGorgon.java +++ b/Mage.Sets/src/mage/cards/a/ArisenGorgon.java @@ -37,7 +37,6 @@ public final class ArisenGorgon extends CardImpl { // Arisen Gorgon has deathtouch as long as you control a Liliana planeswalker. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( DeathtouchAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/a/AsForetold.java b/Mage.Sets/src/mage/cards/a/AsForetold.java index acc708f89cc..f5a67dc386c 100644 --- a/Mage.Sets/src/mage/cards/a/AsForetold.java +++ b/Mage.Sets/src/mage/cards/a/AsForetold.java @@ -40,7 +40,6 @@ public final class AsForetold extends CardImpl { // Once each turn, you may pay {0} rather than pay the mana cost for a spell you cast with converted mana cost X or less, where X is the number of time counters on As Foretold. addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new AsForetoldAddAltCostEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java index 55aa47616c4..f587e6408f6 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java @@ -31,7 +31,6 @@ public final class AuriokEdgewright extends CardImpl { ContinuousEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, effectText)) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance) diff --git a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java index 0a0bae295e3..6390b5d75e9 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java +++ b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java @@ -33,7 +33,6 @@ public final class BattlefrontKrushok extends CardImpl { // Each creature you control with a +1/+1 counter on it can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE_P1P1))); } diff --git a/Mage.Sets/src/mage/cards/c/CallToArms.java b/Mage.Sets/src/mage/cards/c/CallToArms.java index 104f789b443..a2c4ccb20e9 100644 --- a/Mage.Sets/src/mage/cards/c/CallToArms.java +++ b/Mage.Sets/src/mage/cards/c/CallToArms.java @@ -50,7 +50,6 @@ public final class CallToArms extends CardImpl { // White creatures get +1/+1 as long as the chosen color is the most common color among nontoken permanents the chosen player controls but isn't tied for most common. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CallToArmsEffect() )); diff --git a/Mage.Sets/src/mage/cards/c/CennsTactician.java b/Mage.Sets/src/mage/cards/c/CennsTactician.java index 9f5c1305160..711c5ef7d97 100644 --- a/Mage.Sets/src/mage/cards/c/CennsTactician.java +++ b/Mage.Sets/src/mage/cards/c/CennsTactician.java @@ -44,7 +44,6 @@ public final class CennsTactician extends CardImpl { // Each creature you control with a +1/+1 counter on it can block an additional creature each combat. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect( 1, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1, diff --git a/Mage.Sets/src/mage/cards/c/ChaosLord.java b/Mage.Sets/src/mage/cards/c/ChaosLord.java index bdffba28598..208bbffb97b 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosLord.java +++ b/Mage.Sets/src/mage/cards/c/ChaosLord.java @@ -43,7 +43,6 @@ public final class ChaosLord extends CardImpl { // Chaos Lord can attack as though it had haste unless it entered the battlefield this turn. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ChaosLordEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java b/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java index 58c8cdd9610..3cb206f6161 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java +++ b/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java @@ -42,7 +42,6 @@ public final class ChargingWarBoar extends CardImpl { // As long as you control a Domri planeswalker, Charging War Boar gets +1/+1 and has trample. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, "As long as you control a Domri planeswalker, {this} gets +1/+1" diff --git a/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java b/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java index c056044d859..c3338497b36 100644 --- a/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java +++ b/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java @@ -43,13 +43,11 @@ public final class CliffrunnerBehemoth extends CardImpl { // Cliffrunner Behemoth has haste as long as you control a red permanent. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(redPermanentFilter), "{this} has haste as long as you control a red permanent"))); // Cliffrunner Behemoth has lifelink as long as you control a white permanent. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(whitePermanentFilter), "{this} has lifelink as long as you control a white permanent"))); diff --git a/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java b/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java index 8b271aa8f0e..1e73592785c 100644 --- a/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java +++ b/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java @@ -43,7 +43,6 @@ public final class ColossusOfAkros extends CardImpl { this.addAbility(new MonstrosityAbility("{10}", 10)); // As long as Colossus of Akros is monstrous, it has trample and can attack as though it didn't have defender. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has trample")); diff --git a/Mage.Sets/src/mage/cards/c/CourtCleric.java b/Mage.Sets/src/mage/cards/c/CourtCleric.java index b9625bb2b87..d3eeb7babe7 100644 --- a/Mage.Sets/src/mage/cards/c/CourtCleric.java +++ b/Mage.Sets/src/mage/cards/c/CourtCleric.java @@ -40,7 +40,6 @@ public final class CourtCleric extends CardImpl { // Court Cleric gets +1/+1 as long as you control an Ajani planeswalker. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java b/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java index f0f33ad5fce..c4d07c0f8eb 100644 --- a/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java +++ b/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java @@ -34,7 +34,6 @@ public final class CrashOfRhinoBeetles extends CardImpl { // Crash of Rhino Beetles gets +10/+10 as long as you control ten or more lands. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect( 10, 10, Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java index 0191ad079ce..2ad266fcb12 100644 --- a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java +++ b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java @@ -32,7 +32,6 @@ public final class CrownedCeratok extends CardImpl { // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java b/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java index 5e902c1de29..40f777c4955 100644 --- a/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java +++ b/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java @@ -35,7 +35,6 @@ public final class DarkbladeAgent extends CardImpl { // As long as you've surveilled this turn, Darkblade Agent has deathtouch and "Whenever this creature deals combat damage to a player, draw a card." Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( DeathtouchAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java b/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java index 0cc187f582f..3ae3a10afc3 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java @@ -34,7 +34,6 @@ public final class DarksteelMonolith extends CardImpl { // Once each turn, you may pay {0} rather than pay the mana cost for a colorless spell that you cast from your hand. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new DarksteelMonolithAddAltCostEffect() )); } diff --git a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java index 2eccac06366..eb731ca38e6 100644 --- a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java +++ b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java @@ -50,7 +50,6 @@ public final class DepartedDeckhand extends CardImpl { // Departed Deckhand can only be blocked by Spirits. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ).setText("{this} can't be blocked except by Spirits") diff --git a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java index dc6a62204bc..104cbca60a1 100644 --- a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java +++ b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java @@ -52,7 +52,6 @@ public final class DizzyingGaze extends CardImpl { Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability2.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect( ability2, AttachmentType.AURA, diff --git a/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java b/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java index 663107943a1..3a4f34fc9f0 100644 --- a/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java +++ b/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java @@ -34,7 +34,6 @@ public final class DomesticatedHydra extends CardImpl { // As long as Domesticated Hydra is monstrous, it has trample. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has trample")); diff --git a/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java b/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java index e1e17cde995..a5424cab24a 100644 --- a/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java +++ b/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java @@ -36,7 +36,6 @@ public final class DovinsAutomaton extends CardImpl { // As long as you control a Dovin planeswalker, Dovin's Automaton gets +2/+2 and has vigilance. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), condition, "As long as you control a Dovin planeswalker, {this} gets +2/+2" diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java index 33ff8aefc19..e809798bc45 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java @@ -36,7 +36,6 @@ public final class DrogskolCaptain extends CardImpl { // Other Spirit creatures you control get +1/+1 and have hexproof. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/d/DropkickBomber.java b/Mage.Sets/src/mage/cards/d/DropkickBomber.java index 2a1075bcf26..c113bfa61f3 100644 --- a/Mage.Sets/src/mage/cards/d/DropkickBomber.java +++ b/Mage.Sets/src/mage/cards/d/DropkickBomber.java @@ -49,7 +49,6 @@ public final class DropkickBomber extends CardImpl { // Other Goblins you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/e/EarthenGoo.java b/Mage.Sets/src/mage/cards/e/EarthenGoo.java index 87405b0d6b4..dbf9ceeb0d3 100644 --- a/Mage.Sets/src/mage/cards/e/EarthenGoo.java +++ b/Mage.Sets/src/mage/cards/e/EarthenGoo.java @@ -44,7 +44,6 @@ public final class EarthenGoo extends CardImpl { // Earthen Goo gets +1/+1 for each age counter on it. DynamicValue value = new CountersSourceCount(CounterType.AGE); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each age counter on it") )); diff --git a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java index fb0b200c467..ca682779119 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java @@ -44,7 +44,6 @@ public final class ElvishClancaller extends CardImpl { // Other Elves you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java index 92d607bbc85..5e761f9c840 100644 --- a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java +++ b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java @@ -38,7 +38,6 @@ public final class GarrisonSergeant extends CardImpl { // Garrison Sergeant has double strike as long as you control a Gate. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( DoubleStrikeAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java b/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java index d78b54aad05..cd2a57e35fa 100644 --- a/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java @@ -38,7 +38,6 @@ public final class GearsmithGuardian extends CardImpl { // Gearsmith Guardian gets +2/+0 as long as you control a blue creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java b/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java index a3f696aeb60..f65e994a939 100644 --- a/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java +++ b/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java @@ -31,7 +31,6 @@ public final class GearsmithProdigy extends CardImpl { // Gearsmith Prodigy gets +1/+0 as long as you control an artifact. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), diff --git a/Mage.Sets/src/mage/cards/g/Gigantiform.java b/Mage.Sets/src/mage/cards/g/Gigantiform.java index 31ea58d53fb..feb60a03ab0 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantiform.java +++ b/Mage.Sets/src/mage/cards/g/Gigantiform.java @@ -70,7 +70,6 @@ class GigantiformAbility extends StaticAbility { public GigantiformAbility() { super(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA)); Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(8, 8, Duration.WhileOnBattlefield) ); this.addEffect(new GainAbilityAttachedEffect(ability, AttachmentType.AURA)); diff --git a/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java b/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java index 433e8abd4ae..f74be7d8f39 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java @@ -40,7 +40,6 @@ public final class GoblinTrashmaster extends CardImpl { // Other Goblins you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java b/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java index 586d0ab7683..6774ef5c4ca 100644 --- a/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java +++ b/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java @@ -46,7 +46,6 @@ public final class GoreclawTerrorOfQalSisma extends CardImpl { // Creature spells you cast with power 4 or greater cost {2} less to cast. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2) )); diff --git a/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java b/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java index 5b110dc08b4..6c9655f7380 100644 --- a/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java +++ b/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java @@ -30,7 +30,6 @@ public final class GraspingScoundrel extends CardImpl{ // Grasping Scoundrel gets +1/+0 as long as it's attacking. this.addAbility( new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), SourceAttackingCondition.instance, diff --git a/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java b/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java index dce0c0e1c83..38600966b9d 100644 --- a/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java +++ b/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java @@ -41,7 +41,6 @@ public final class GruulSpellbreaker extends CardImpl { // As long as it's your turn, you and Gruul Spellbreaker have hexproof. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControllerEffect( HexproofAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java index 7ddd346ebb2..3201bb0c792 100644 --- a/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java +++ b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java @@ -56,7 +56,6 @@ public final class HeavenlyBlademaster extends CardImpl { new AuraAttachedCount(1) ); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( totalAmount, totalAmount, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true diff --git a/Mage.Sets/src/mage/cards/h/HighAlert.java b/Mage.Sets/src/mage/cards/h/HighAlert.java index 764a3f00699..0fe967a5ab4 100644 --- a/Mage.Sets/src/mage/cards/h/HighAlert.java +++ b/Mage.Sets/src/mage/cards/h/HighAlert.java @@ -31,7 +31,6 @@ public final class HighAlert extends CardImpl { // Creatures you control can attack as though they didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderAllEffect( Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES diff --git a/Mage.Sets/src/mage/cards/h/HungeringHydra.java b/Mage.Sets/src/mage/cards/h/HungeringHydra.java index 778433589c5..49da8774253 100644 --- a/Mage.Sets/src/mage/cards/h/HungeringHydra.java +++ b/Mage.Sets/src/mage/cards/h/HungeringHydra.java @@ -39,7 +39,6 @@ public final class HungeringHydra extends CardImpl { // Hungering Hydra can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect() )); diff --git a/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java b/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java index 9cef9d28b06..35321728914 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java +++ b/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java @@ -38,7 +38,6 @@ public final class HuntingVelociraptor extends CardImpl { // Dinosaur spells you cast have prowl {2}{R}. // Based on Chief Engineer this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(new ProwlAbility("{2}{R}"), filter) )); } diff --git a/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java b/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java index 77e4d3c9009..b7219ba551a 100644 --- a/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java +++ b/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java @@ -36,7 +36,6 @@ public final class InfiniteHourglass extends CardImpl { // All creatures get +1/+0 for each time counter on Infinite Hourglass. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostAllEffect( new CountersSourceCount(CounterType.TIME), StaticValue.get(0), diff --git a/Mage.Sets/src/mage/cards/i/InspiringPaladin.java b/Mage.Sets/src/mage/cards/i/InspiringPaladin.java index c561923ca9e..c8b159db04c 100644 --- a/Mage.Sets/src/mage/cards/i/InspiringPaladin.java +++ b/Mage.Sets/src/mage/cards/i/InspiringPaladin.java @@ -42,7 +42,6 @@ public final class InspiringPaladin extends CardImpl { // During your turn, this creature has first strike. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), @@ -54,7 +53,6 @@ public final class InspiringPaladin extends CardImpl { // During your turn, creatures you control with +1/+1 counters on them have first strike. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControlledEffect( FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter diff --git a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java index c01ce816d58..bbb2e3a70e4 100644 --- a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java +++ b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java @@ -32,7 +32,6 @@ public final class JudithTheScourgeDiva extends CardImpl { // Other creatures you control get +1/+0. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, true) )); diff --git a/Mage.Sets/src/mage/cards/k/KarganDragonrider.java b/Mage.Sets/src/mage/cards/k/KarganDragonrider.java index 80849c15163..01918619f94 100644 --- a/Mage.Sets/src/mage/cards/k/KarganDragonrider.java +++ b/Mage.Sets/src/mage/cards/k/KarganDragonrider.java @@ -33,7 +33,6 @@ public final class KarganDragonrider extends CardImpl { // As long as you control a Dragon, Kargan Dragonrider has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FlyingAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java b/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java index 6d68a230cf2..4dec64fb6f0 100644 --- a/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java +++ b/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java @@ -50,7 +50,6 @@ public final class KestiaTheCultivator extends CardImpl { // Enchanted creature gets +4/+4. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield) )); diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java b/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java index 5e28150bb16..4e1a1a730fb 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java @@ -25,7 +25,6 @@ public final class LeylineOfTheMeek extends CardImpl { // Creature tokens get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostAllEffect( 1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURE_TOKENS, false diff --git a/Mage.Sets/src/mage/cards/l/LightningMare.java b/Mage.Sets/src/mage/cards/l/LightningMare.java index 32f6f387f40..4e10b68c637 100644 --- a/Mage.Sets/src/mage/cards/l/LightningMare.java +++ b/Mage.Sets/src/mage/cards/l/LightningMare.java @@ -43,7 +43,6 @@ public final class LightningMare extends CardImpl { // Lightning Mare can't be blocked by blue creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/l/LimitedResources.java b/Mage.Sets/src/mage/cards/l/LimitedResources.java index 3763e9d5324..473b27251a4 100644 --- a/Mage.Sets/src/mage/cards/l/LimitedResources.java +++ b/Mage.Sets/src/mage/cards/l/LimitedResources.java @@ -36,7 +36,6 @@ public final class LimitedResources extends CardImpl { // Players can't play lands as long as ten or more lands are on the battlefield. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect( new CantPlayLandEffect(), new PermanentsOnTheBattlefieldCondition( diff --git a/Mage.Sets/src/mage/cards/l/LongshotSquad.java b/Mage.Sets/src/mage/cards/l/LongshotSquad.java index 1b4c8a70e30..be3009bab1b 100644 --- a/Mage.Sets/src/mage/cards/l/LongshotSquad.java +++ b/Mage.Sets/src/mage/cards/l/LongshotSquad.java @@ -34,7 +34,6 @@ public final class LongshotSquad extends CardImpl { this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{1}{G}"))); // Each creature you control with a +1/+1 counter on it has reach. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( ReachAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java b/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java index 3729f0817fe..7b7e25b5aca 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java @@ -22,7 +22,6 @@ public final class MarkOfAsylum extends CardImpl { // Prevent all noncombat damage that would be dealt to creatures you control. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new PreventAllNonCombatDamageToAllEffect( Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES diff --git a/Mage.Sets/src/mage/cards/m/MerEkNightblade.java b/Mage.Sets/src/mage/cards/m/MerEkNightblade.java index 5062d23e0ab..5fd0e071474 100644 --- a/Mage.Sets/src/mage/cards/m/MerEkNightblade.java +++ b/Mage.Sets/src/mage/cards/m/MerEkNightblade.java @@ -35,7 +35,6 @@ public final class MerEkNightblade extends CardImpl { // Each creature you control with a +1/+1 counter on it has deathtouch. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/m/MonstrousHound.java b/Mage.Sets/src/mage/cards/m/MonstrousHound.java index cd157ea75a9..6173b065b42 100644 --- a/Mage.Sets/src/mage/cards/m/MonstrousHound.java +++ b/Mage.Sets/src/mage/cards/m/MonstrousHound.java @@ -33,13 +33,11 @@ public final class MonstrousHound extends CardImpl { // Monstrous Hound can't attack unless you control more lands than defending player. Effect effect = new CantAttackUnlessControllerControlsMoreLandsEffect(); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, effect.setText("{this} can't attack unless you control more lands than defending player"))); // Monstrous Hound can't block unless you control more lands than attacking player. Effect effect2 = new CantBlockUnlessControllerControlsMoreLandsEffect(); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, effect2.setText("{this} can't block unless you control more lands than attacking player"))); } diff --git a/Mage.Sets/src/mage/cards/m/MoonEatingDog.java b/Mage.Sets/src/mage/cards/m/MoonEatingDog.java index 9b8ac020620..ea2d688ca17 100644 --- a/Mage.Sets/src/mage/cards/m/MoonEatingDog.java +++ b/Mage.Sets/src/mage/cards/m/MoonEatingDog.java @@ -36,7 +36,6 @@ public final class MoonEatingDog extends CardImpl { // As long as you control a Yanling planeswalker, Moon-Eating Dog has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FlyingAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/m/MythUnbound.java b/Mage.Sets/src/mage/cards/m/MythUnbound.java index 2098dcd267a..150076ac28d 100644 --- a/Mage.Sets/src/mage/cards/m/MythUnbound.java +++ b/Mage.Sets/src/mage/cards/m/MythUnbound.java @@ -36,7 +36,6 @@ public final class MythUnbound extends CardImpl { // Your commander costs {1} less to cast for each time it's been cast from the command zone this game. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new MythUnboundCostReductionEffect() )); diff --git a/Mage.Sets/src/mage/cards/o/OctopusUmbra.java b/Mage.Sets/src/mage/cards/o/OctopusUmbra.java index 351ec798fe7..44c1874ff41 100644 --- a/Mage.Sets/src/mage/cards/o/OctopusUmbra.java +++ b/Mage.Sets/src/mage/cards/o/OctopusUmbra.java @@ -51,7 +51,6 @@ public final class OctopusUmbra extends CardImpl { Ability abilityToAdd = new AttacksTriggeredAbility(new TapTargetEffect(), true); abilityToAdd.addTarget(new TargetCreaturePermanent(filter)); ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new SetBasePowerToughnessEnchantedEffect(8, 8) ); ability.addEffect(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java b/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java index 8ce8d86155d..1f4b28f6dc0 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java +++ b/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java @@ -49,7 +49,6 @@ public final class OrcishSiegemaster extends CardImpl { // Other Orcs and Goblins you control have trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java index dd5502b9966..52a3f52255f 100644 --- a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java +++ b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java @@ -52,7 +52,6 @@ public final class PalladiaMorsTheRuiner extends CardImpl { // Palladia-Mors, the Ruiner has hexproof if it hasn't dealt damage yet. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(HexproofAbility.getInstance()), PalladiaMorsTheRuinerCondition.instance, diff --git a/Mage.Sets/src/mage/cards/p/PestilentSpirit.java b/Mage.Sets/src/mage/cards/p/PestilentSpirit.java index e3ac73f936c..d14dd02035d 100644 --- a/Mage.Sets/src/mage/cards/p/PestilentSpirit.java +++ b/Mage.Sets/src/mage/cards/p/PestilentSpirit.java @@ -44,7 +44,6 @@ public final class PestilentSpirit extends CardImpl { // Instant and sorcery spells you control have deathtouch. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(DeathtouchAbility.getInstance(), filter) )); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java b/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java index cb95a667758..2f5f40ed96a 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java @@ -39,7 +39,6 @@ public final class PhyrexianBoon extends CardImpl { // Enchanted creature gets +2/+1 as long as it's black. Otherwise, it gets -1/-2. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 1), new BoostEnchantedEffect(-1, -2), diff --git a/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java b/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java index 8e3fcc7424a..dcca9e7ba92 100644 --- a/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java +++ b/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java @@ -37,7 +37,6 @@ public final class PistonFistCyclops extends CardImpl { // As long as you've cast an instant or sorcery spell this turn, Piston-Fist Cyclops can attack as though it didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalAsThoughEffect( new CanAttackAsThoughItDidntHaveDefenderSourceEffect( Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/p/PlagueMare.java b/Mage.Sets/src/mage/cards/p/PlagueMare.java index eb1711cd07c..50bdc856c3e 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueMare.java +++ b/Mage.Sets/src/mage/cards/p/PlagueMare.java @@ -38,7 +38,6 @@ public final class PlagueMare extends CardImpl { // Plague Mare can't be blocked by white creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java b/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java index d545bc70ff4..be4c432f381 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java +++ b/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java @@ -39,7 +39,6 @@ public final class ProdigiousGrowth extends CardImpl { // Enchanted creature gets +7/+7 and has trample. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(7, 7, Duration.WhileOnBattlefield) ); ability.addEffect(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java b/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java index 568069c60b6..921e0e81a72 100644 --- a/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java +++ b/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java @@ -46,7 +46,6 @@ public final class PurrajOfUrborg extends CardImpl { // Purraj of Urborg has first strike as long as it's attacking. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, diff --git a/Mage.Sets/src/mage/cards/r/RighteousWar.java b/Mage.Sets/src/mage/cards/r/RighteousWar.java index 09f2165673c..d4bcb79cfc5 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousWar.java +++ b/Mage.Sets/src/mage/cards/r/RighteousWar.java @@ -33,7 +33,6 @@ public final class RighteousWar extends CardImpl { // White creatures you control have protection from black. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( ProtectionAbility.from(ObjectColor.BLACK), Duration.WhileOnBattlefield, @@ -43,7 +42,6 @@ public final class RighteousWar extends CardImpl { // Black creatures you control have protection from white. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( ProtectionAbility.from(ObjectColor.WHITE), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/r/RushbladeCommander.java b/Mage.Sets/src/mage/cards/r/RushbladeCommander.java index 52315300f32..c77151a73b5 100644 --- a/Mage.Sets/src/mage/cards/r/RushbladeCommander.java +++ b/Mage.Sets/src/mage/cards/r/RushbladeCommander.java @@ -32,7 +32,6 @@ public final class RushbladeCommander extends CardImpl { // Warrior creatures your team controls have haste. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/s/SapphireDrake.java b/Mage.Sets/src/mage/cards/s/SapphireDrake.java index 266aef59b1b..ef72bb53c78 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireDrake.java +++ b/Mage.Sets/src/mage/cards/s/SapphireDrake.java @@ -29,7 +29,6 @@ public final class SapphireDrake extends CardImpl { // Each creature you control with a +1/+1 counter on it has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1) diff --git a/Mage.Sets/src/mage/cards/s/ScroungedScythe.java b/Mage.Sets/src/mage/cards/s/ScroungedScythe.java index 6abb9df81ca..0c1473693d5 100644 --- a/Mage.Sets/src/mage/cards/s/ScroungedScythe.java +++ b/Mage.Sets/src/mage/cards/s/ScroungedScythe.java @@ -33,7 +33,6 @@ public final class ScroungedScythe extends CardImpl { // As long as equipped creature is a Human, it has menace. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition(SubType.HUMAN), diff --git a/Mage.Sets/src/mage/cards/s/Scuttlegator.java b/Mage.Sets/src/mage/cards/s/Scuttlegator.java index 9cde2f38b48..e9e53f0a082 100644 --- a/Mage.Sets/src/mage/cards/s/Scuttlegator.java +++ b/Mage.Sets/src/mage/cards/s/Scuttlegator.java @@ -39,7 +39,6 @@ public final class Scuttlegator extends CardImpl { // As long as Scuttlegator has a +1/+1 counter on it, it can attack as though it didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalAsThoughEffect( new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.P1P1) diff --git a/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java b/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java index cf552fc7b80..2c5089b0294 100644 --- a/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java +++ b/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java @@ -45,7 +45,6 @@ public final class ShannaSisaysLegacy extends CardImpl { // Shanna gets +1/+1 for each creature you control. DynamicValue value = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURES); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each creature you control") )); diff --git a/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java b/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java index f0c746feea8..7e5c262a622 100644 --- a/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java +++ b/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java @@ -34,7 +34,6 @@ public final class SigiledSwordOfValeron extends CardImpl { // Equipped creature gets +2/+0, has vigilance, and is a Knight in addition to its other types. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0) ); ability.addEffect(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java index 0095324e5de..36d87a617d8 100644 --- a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java +++ b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java @@ -40,7 +40,6 @@ public final class SinstrikersWill extends CardImpl { ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect( ability, AttachmentType.AURA, diff --git a/Mage.Sets/src/mage/cards/s/SinuousVermin.java b/Mage.Sets/src/mage/cards/s/SinuousVermin.java index 72b64382bd2..5dc235ac726 100644 --- a/Mage.Sets/src/mage/cards/s/SinuousVermin.java +++ b/Mage.Sets/src/mage/cards/s/SinuousVermin.java @@ -35,7 +35,6 @@ public final class SinuousVermin extends CardImpl { // As long as Sinuous Vermin is monstrous, it has menace. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has menace. " + diff --git a/Mage.Sets/src/mage/cards/s/SkatewingSpy.java b/Mage.Sets/src/mage/cards/s/SkatewingSpy.java index e4605b1908c..a2da2a8520a 100644 --- a/Mage.Sets/src/mage/cards/s/SkatewingSpy.java +++ b/Mage.Sets/src/mage/cards/s/SkatewingSpy.java @@ -34,7 +34,6 @@ public final class SkatewingSpy extends CardImpl { // Each creature you control with a +1/+1 counter on it has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( FlyingAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java b/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java index 5130bd827a4..f8374ac0a98 100644 --- a/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java +++ b/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java @@ -34,7 +34,6 @@ public final class SkitteringCrustacean extends CardImpl { // As long as Skittering Crustacean is monstrous, it has hexproof. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has hexproof")); diff --git a/Mage.Sets/src/mage/cards/s/SnowDevil.java b/Mage.Sets/src/mage/cards/s/SnowDevil.java index 12abdb83e88..f169d2fbcd8 100644 --- a/Mage.Sets/src/mage/cards/s/SnowDevil.java +++ b/Mage.Sets/src/mage/cards/s/SnowDevil.java @@ -50,7 +50,6 @@ public final class SnowDevil extends CardImpl { // Enchanted creature has first strike as long as it's blocking and you control a snow land. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect( FirstStrikeAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java b/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java index c4467fa9c81..d9c7bd20501 100644 --- a/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java +++ b/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java @@ -35,7 +35,6 @@ public final class SteamfloggerBoss extends CardImpl { // Other Rigger creatures you control get +1/+0 and have haste. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 0, Duration.WhileOnBattlefield, filter, true @@ -50,7 +49,6 @@ public final class SteamfloggerBoss extends CardImpl { // If a Rigger you control would assemble a Contraption, it assembles two Contraptions instead. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new InfoEffect( "If a Rigger you control would assemble a Contraption, " + "it assembles two Contraptions instead" diff --git a/Mage.Sets/src/mage/cards/s/StreetRiot.java b/Mage.Sets/src/mage/cards/s/StreetRiot.java index a87b1369aac..c3960dc93a6 100644 --- a/Mage.Sets/src/mage/cards/s/StreetRiot.java +++ b/Mage.Sets/src/mage/cards/s/StreetRiot.java @@ -27,7 +27,6 @@ public final class StreetRiot extends CardImpl { // As long as it's your turn, creatures you control get +1/+0 and have trample. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect( 1, 0, Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java index 1da9c7472ba..ce6bd240059 100644 --- a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java +++ b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java @@ -45,7 +45,6 @@ public final class SunCrestedPterodon extends CardImpl { ContinuousEffect effect = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); Condition condition = new PermanentsOnTheBattlefieldCondition(filterAnotherDino); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, condition, "{this} has vigilance as long as you control another Dinosaur.") )); diff --git a/Mage.Sets/src/mage/cards/s/SupremePhantom.java b/Mage.Sets/src/mage/cards/s/SupremePhantom.java index a75ced12162..2be942ed947 100644 --- a/Mage.Sets/src/mage/cards/s/SupremePhantom.java +++ b/Mage.Sets/src/mage/cards/s/SupremePhantom.java @@ -33,7 +33,6 @@ public final class SupremePhantom extends CardImpl { // Other Spirits you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/s/SurgeMare.java b/Mage.Sets/src/mage/cards/s/SurgeMare.java index cd11baa5f3d..3350d109e47 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeMare.java +++ b/Mage.Sets/src/mage/cards/s/SurgeMare.java @@ -41,7 +41,6 @@ public final class SurgeMare extends CardImpl { // Surge Mare can't be blocked by green creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java b/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java index 3cd0f13715c..d8de4d067cb 100644 --- a/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java +++ b/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java @@ -44,7 +44,6 @@ public final class SwarmbornGiant extends CardImpl { // As long as Swarmborn Giant is monstrous, it has reach. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has reach")); diff --git a/Mage.Sets/src/mage/cards/t/TahngarthsRage.java b/Mage.Sets/src/mage/cards/t/TahngarthsRage.java index 12ca298887b..42624c8a2d6 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthsRage.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthsRage.java @@ -40,7 +40,6 @@ public final class TahngarthsRage extends CardImpl { // Enchanted creature gets +3/+0 as long as it's attacking. Otherwise, it gets -2/-1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield), new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java index 34d58777766..eea26e59139 100644 --- a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java +++ b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java @@ -50,7 +50,6 @@ public final class TajicLegionsEdge extends CardImpl { // Prevent all noncombat damage that would be dealt to other creatures you control. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new PreventAllNonCombatDamageToAllEffect( Duration.WhileOnBattlefield, filter ) diff --git a/Mage.Sets/src/mage/cards/t/TendershootDryad.java b/Mage.Sets/src/mage/cards/t/TendershootDryad.java index 17da3ed05b7..a6a0471e0cb 100644 --- a/Mage.Sets/src/mage/cards/t/TendershootDryad.java +++ b/Mage.Sets/src/mage/cards/t/TendershootDryad.java @@ -44,7 +44,6 @@ public final class TendershootDryad extends CardImpl { // Saprolings you control get +2/+2 as long as you have the city's blessing. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter), CitysBlessingCondition.instance, diff --git a/Mage.Sets/src/mage/cards/t/TeysaKarlov.java b/Mage.Sets/src/mage/cards/t/TeysaKarlov.java index 8cf1752bc29..1ccd4409919 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaKarlov.java +++ b/Mage.Sets/src/mage/cards/t/TeysaKarlov.java @@ -37,7 +37,6 @@ public final class TeysaKarlov extends CardImpl { // Creature tokens you control have vigilance and lifelink. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java b/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java index 528ca79b88a..c8550bc53c8 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java @@ -36,7 +36,6 @@ public final class TezzeretsStrider extends CardImpl { // As long as you control a Tezzeret planeswalker, Tezzeret's Strider has menace. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( new MenaceAbility(true), diff --git a/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java b/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java index 9e252c6024d..28cf83312b8 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java @@ -38,7 +38,6 @@ public final class ThoughtboundPhantasm extends CardImpl { // As long as Thoughtbound Phantasm has three or more +1/+1 counters on it, it can attack as though it didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalAsThoughEffect( new CanAttackAsThoughItDidntHaveDefenderSourceEffect( Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java b/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java index bec81abee2f..20a8427df4d 100644 --- a/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java +++ b/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java @@ -25,7 +25,6 @@ public final class TibaltRakishInstigator extends CardImpl { // Your opponents can't gain life. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantGainLifeAllEffect( Duration.WhileOnBattlefield, TargetController.OPPONENT diff --git a/Mage.Sets/src/mage/cards/t/TlincalliHunter.java b/Mage.Sets/src/mage/cards/t/TlincalliHunter.java index fc03ac2d409..9cf8845dc43 100644 --- a/Mage.Sets/src/mage/cards/t/TlincalliHunter.java +++ b/Mage.Sets/src/mage/cards/t/TlincalliHunter.java @@ -40,7 +40,6 @@ public final class TlincalliHunter extends AdventureCard { // Once each turn, you may pay {0} rather than pay the mana cost for a creature spell you cast from exile. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new TlincalliHunterAddAltCostEffect())); // Retrieve Prey diff --git a/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java b/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java index 45790ecabf2..b4042b97f53 100644 --- a/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java +++ b/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java @@ -34,7 +34,6 @@ public final class TrollbredGuardian extends CardImpl { // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java index f1efa67572b..6714adca015 100644 --- a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java +++ b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java @@ -34,7 +34,6 @@ public final class TuskguardCaptain extends CardImpl { this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{G}"))); // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java index e13d4e1a56b..6ef6fb0264c 100644 --- a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java +++ b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java @@ -43,7 +43,6 @@ public final class TuvasaTheSunlit extends CardImpl { DynamicValue value = new PermanentsOnBattlefieldCount(filter); Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect( value, value, Duration.WhileOnBattlefield ).setText("{this} gets +1/+1 for each enchantment you control") diff --git a/Mage.Sets/src/mage/cards/u/UrbanUtopia.java b/Mage.Sets/src/mage/cards/u/UrbanUtopia.java index 1de58fe0dbf..4e352e7c97a 100644 --- a/Mage.Sets/src/mage/cards/u/UrbanUtopia.java +++ b/Mage.Sets/src/mage/cards/u/UrbanUtopia.java @@ -44,7 +44,6 @@ public final class UrbanUtopia extends CardImpl { // Enchanted land has "{T}: Add one mana of any color." this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect( new AnyColorManaAbility(), AttachmentType.AURA ).setText("Enchanted land has " diff --git a/Mage.Sets/src/mage/cards/v/ValiantKnight.java b/Mage.Sets/src/mage/cards/v/ValiantKnight.java index 23dcf0f1cf2..c1a1717e7f9 100644 --- a/Mage.Sets/src/mage/cards/v/ValiantKnight.java +++ b/Mage.Sets/src/mage/cards/v/ValiantKnight.java @@ -35,7 +35,6 @@ public final class ValiantKnight extends CardImpl { // Other Knights you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java index 68f63371231..9209518a31e 100644 --- a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java @@ -43,7 +43,6 @@ public final class VelaTheNightClad extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // Other creatures you control have intimidate. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); // Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life. diff --git a/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java b/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java index 4bd89193fb7..0fc430b9541 100644 --- a/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java +++ b/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java @@ -50,7 +50,6 @@ public final class VigorsporeWurm extends CardImpl { // Vigorspore Wurm can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect() )); } diff --git a/Mage.Sets/src/mage/cards/v/VineMare.java b/Mage.Sets/src/mage/cards/v/VineMare.java index 6b3a4ca4e7d..1dcc9cc46ff 100644 --- a/Mage.Sets/src/mage/cards/v/VineMare.java +++ b/Mage.Sets/src/mage/cards/v/VineMare.java @@ -40,7 +40,6 @@ public final class VineMare extends CardImpl { // Vine Mare can't be blocked by black creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/v/VividFlyingFish.java b/Mage.Sets/src/mage/cards/v/VividFlyingFish.java index 79167e2f6c1..5aaa50cecfe 100644 --- a/Mage.Sets/src/mage/cards/v/VividFlyingFish.java +++ b/Mage.Sets/src/mage/cards/v/VividFlyingFish.java @@ -30,7 +30,6 @@ public final class VividFlyingFish extends CardImpl { // Vivid Flying Fish has flying as long as it's attacking. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FlyingAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/w/WargRider.java b/Mage.Sets/src/mage/cards/w/WargRider.java index eb072cc2f9c..2839819f8f1 100644 --- a/Mage.Sets/src/mage/cards/w/WargRider.java +++ b/Mage.Sets/src/mage/cards/w/WargRider.java @@ -44,7 +44,6 @@ public final class WargRider extends CardImpl { // Other Orcs and Goblins you control have menace. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( new MenaceAbility(false), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/w/WitheringHex.java b/Mage.Sets/src/mage/cards/w/WitheringHex.java index b05e0558442..d307cecaf75 100644 --- a/Mage.Sets/src/mage/cards/w/WitheringHex.java +++ b/Mage.Sets/src/mage/cards/w/WitheringHex.java @@ -47,7 +47,6 @@ public final class WitheringHex extends CardImpl { // Enchanted creature gets -1/-1 for each plague counter on Withering Hex. DynamicValue value = new MultipliedValue(new CountersSourceCount(CounterType.PLAGUE), -1); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(value, value, Duration.WhileOnBattlefield) .setText("Enchanted creature gets -1/-1 for each plague counter on {this}.") )); diff --git a/Mage.Sets/src/mage/cards/w/WoollyMammoths.java b/Mage.Sets/src/mage/cards/w/WoollyMammoths.java index f0e2b8bd4ba..2d4b8d62d67 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyMammoths.java +++ b/Mage.Sets/src/mage/cards/w/WoollyMammoths.java @@ -41,7 +41,6 @@ public final class WoollyMammoths extends CardImpl { // Woolly Mammoths has trample as long as you control a snow land. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( TrampleAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java index d08011209a9..220c79c1331 100644 --- a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java +++ b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java @@ -46,7 +46,6 @@ public final class ZeganaUtopianSpeaker extends CardImpl { // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1) diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java index 94bbab7c4ad..2e69435c3b4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java @@ -25,7 +25,6 @@ public final class ElephantResurgenceToken extends TokenImpl { toughness = new MageInt(0); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new CardsInControllerGraveyardCount(new FilterCreatureCard())) .setText("This creature's power and toughness are each equal to the number of creature cards in its controller's graveyard.") )); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java index f4f5d344879..1f0d5e31bbd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java @@ -34,7 +34,6 @@ public final class SoundTheCallToken extends TokenImpl { DynamicValue value = new CardsInAllGraveyardsCount(filter); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield) .setText("This creature gets +1/+1 for each card named Sound the Call in each graveyard.") )); -- 2.47.2 From 139ca1ebe18ca68aca55936310cffc5b345e857c Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:20:27 -0500 Subject: [PATCH 27/50] refactor: SimpleStaticAbility default zone (second line) --- Mage.Sets/src/mage/cards/a/AetherTunnel.java | 2 +- Mage.Sets/src/mage/cards/c/CavalryMaster.java | 2 +- Mage.Sets/src/mage/cards/d/DivineVisitation.java | 2 +- Mage.Sets/src/mage/cards/e/EnergyFlux.java | 2 +- Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java | 2 +- Mage.Sets/src/mage/cards/m/MarshalsAnthem.java | 2 +- Mage.Sets/src/mage/cards/m/MessengersSpeed.java | 2 +- Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java | 4 ++-- Mage.Sets/src/mage/cards/n/NullhideFerox.java | 2 +- Mage.Sets/src/mage/cards/o/OchranAssassin.java | 2 +- Mage.Sets/src/mage/cards/s/StudentOfElements.java | 2 +- Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java | 2 +- Mage.Sets/src/mage/cards/t/TangleweaveArmor.java | 2 +- .../main/java/mage/abilities/keyword/PrototypeAbility.java | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AetherTunnel.java b/Mage.Sets/src/mage/cards/a/AetherTunnel.java index 6ba80c20616..33e3c7128c6 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTunnel.java +++ b/Mage.Sets/src/mage/cards/a/AetherTunnel.java @@ -38,7 +38,7 @@ public final class AetherTunnel extends CardImpl { // Enchanted creature gets +1/+0 and can't be blocked. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield) + new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield) ); ability.addEffect( new CantBeBlockedAttachedEffect(AttachmentType.AURA) diff --git a/Mage.Sets/src/mage/cards/c/CavalryMaster.java b/Mage.Sets/src/mage/cards/c/CavalryMaster.java index 08b3d2a7442..de9357c052b 100644 --- a/Mage.Sets/src/mage/cards/c/CavalryMaster.java +++ b/Mage.Sets/src/mage/cards/c/CavalryMaster.java @@ -39,7 +39,7 @@ public final class CavalryMaster extends CardImpl { this.addAbility(new FlankingAbility()); // Other creatures you control with flanking have flanking. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true) + new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true) .setText("Other creatures you control with flanking have flanking.") )); } diff --git a/Mage.Sets/src/mage/cards/d/DivineVisitation.java b/Mage.Sets/src/mage/cards/d/DivineVisitation.java index 66deef18de0..0d940501ecd 100644 --- a/Mage.Sets/src/mage/cards/d/DivineVisitation.java +++ b/Mage.Sets/src/mage/cards/d/DivineVisitation.java @@ -31,7 +31,7 @@ public final class DivineVisitation extends CardImpl { // that many 4/4 white Angel creature tokens with flying and // vigilance are created instead. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new DivineVisitationEffect() + new DivineVisitationEffect() )); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyFlux.java b/Mage.Sets/src/mage/cards/e/EnergyFlux.java index 0e58be21c43..1c2d704afae 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyFlux.java +++ b/Mage.Sets/src/mage/cards/e/EnergyFlux.java @@ -27,7 +27,7 @@ public final class EnergyFlux extends CardImpl { // All artifacts have "At the beginning of your upkeep, sacrifice this artifact unless you pay {2}." this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, + new GainAbilityAllEffect( new BeginningOfUpkeepTriggeredAbility( TargetController.YOU, new SacrificeSourceUnlessPaysEffect(new GenericManaCost(2)), diff --git a/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java b/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java index d303cc2ac85..1d396c143ad 100644 --- a/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java +++ b/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java @@ -28,7 +28,7 @@ public final class EnhancedSurveillance extends CardImpl { // You may look at an additional two cards each time you surveil. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new EnhancedSurveillanceReplacementEffect() + new EnhancedSurveillanceReplacementEffect() )); // Exile Enhanced Surveillance: Shuffle your graveyard into your library. diff --git a/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java b/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java index 5aae7525acd..14c935d55f4 100644 --- a/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java +++ b/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java @@ -35,7 +35,7 @@ public final class MarshalsAnthem extends CardImpl { // Creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield) + new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield) )); // When Marshal's Anthem enters the battlefield, return up to X target creature cards from your graveyard to the battlefield, where X is the number of times Marshal's Anthem was kicked. diff --git a/Mage.Sets/src/mage/cards/m/MessengersSpeed.java b/Mage.Sets/src/mage/cards/m/MessengersSpeed.java index 74f68e424b8..a4806e3defc 100644 --- a/Mage.Sets/src/mage/cards/m/MessengersSpeed.java +++ b/Mage.Sets/src/mage/cards/m/MessengersSpeed.java @@ -40,7 +40,7 @@ public final class MessengersSpeed extends CardImpl { this.addAbility(ability); // Enchanted creature has trample and haste. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); + new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java b/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java index 3079d86b7f4..5ad0d20bc74 100644 --- a/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java +++ b/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java @@ -32,7 +32,7 @@ public final class NikyaOfTheOldWays extends CardImpl { // You can't cast noncreature spells. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new NikyaOfTheOldWaysCantCastEffect() + new NikyaOfTheOldWaysCantCastEffect() )); // Whenever you tap a land for mana, add one mana of any type that land produced. @@ -85,4 +85,4 @@ class NikyaOfTheOldWaysCantCastEffect extends ContinuousRuleModifyingEffectImpl return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NullhideFerox.java b/Mage.Sets/src/mage/cards/n/NullhideFerox.java index 9437459f42f..2a2f0b8f806 100644 --- a/Mage.Sets/src/mage/cards/n/NullhideFerox.java +++ b/Mage.Sets/src/mage/cards/n/NullhideFerox.java @@ -44,7 +44,7 @@ public final class NullhideFerox extends CardImpl { // You can't cast noncreature spells. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new NullhideFeroxCantCastEffect() + new NullhideFeroxCantCastEffect() )); // {2}: Nullhide Ferox loses all abilities until end of turn. Any player may activate this ability. diff --git a/Mage.Sets/src/mage/cards/o/OchranAssassin.java b/Mage.Sets/src/mage/cards/o/OchranAssassin.java index 2a0ff9d4b20..111bbe1cde4 100644 --- a/Mage.Sets/src/mage/cards/o/OchranAssassin.java +++ b/Mage.Sets/src/mage/cards/o/OchranAssassin.java @@ -30,7 +30,7 @@ public final class OchranAssassin extends CardImpl { // All creatures able to block Ochran Assassin do so. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect() + new MustBeBlockedByAllSourceEffect() )); } diff --git a/Mage.Sets/src/mage/cards/s/StudentOfElements.java b/Mage.Sets/src/mage/cards/s/StudentOfElements.java index 65cc00bd0fc..b8caf19a91a 100644 --- a/Mage.Sets/src/mage/cards/s/StudentOfElements.java +++ b/Mage.Sets/src/mage/cards/s/StudentOfElements.java @@ -96,7 +96,7 @@ class TobitaMasterOfWinds extends TokenImpl { // Creatures you control have flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); + new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); } private TobitaMasterOfWinds(final TobitaMasterOfWinds token) { super(token); diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java b/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java index 97837054184..96a3ae411c3 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java @@ -42,7 +42,7 @@ public final class TalonsOfWildwood extends CardImpl { // Enchanted creature gets +1/+1 and has trample. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield) + new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield) ); ability.addEffect(new GainAbilityAttachedEffect( TrampleAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java b/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java index d3a494c7ebb..c1d5ffca94b 100644 --- a/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java +++ b/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java @@ -29,7 +29,7 @@ public final class TangleweaveArmor extends CardImpl { // Equipped creature gets +X/+X, where X is the greatest mana value among your commanders this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEquippedEffect(CommanderGreatestManaValue.instance, CommanderGreatestManaValue.instance) + new BoostEquippedEffect(CommanderGreatestManaValue.instance, CommanderGreatestManaValue.instance) )); // Equip {4} diff --git a/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java b/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java index 5b08d0e625e..643b93b0997 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java @@ -27,7 +27,7 @@ public class PrototypeAbility extends SpellAbility { this.setSpellAbilityCastMode(SpellAbilityCastMode.PROTOTYPE); this.setTiming(TimingRule.SORCERY); this.addSubAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new PrototypeEffect(power, toughness, manaString) + new PrototypeEffect(power, toughness, manaString) ).setRuleVisible(false)); this.rule = "Prototype " + manaString + " — " + power + "/" + toughness + " (You may cast this spell with different mana cost, color, and size. It keeps its abilities and types.)"; @@ -116,4 +116,4 @@ class PrototypeEffect extends ContinuousEffectImpl { permanent.getToughness().setModifiedBaseValue(toughness); return true; } -} \ No newline at end of file +} -- 2.47.2 From 9480101432a964e12dce7122014c044c271d2df0 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:25:34 -0500 Subject: [PATCH 28/50] refactor: SimpleActivatedAbility default zone (cards A) --- Mage.Sets/src/mage/cards/a/AWing.java | 2 +- Mage.Sets/src/mage/cards/a/AbbeyMatron.java | 2 +- Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java | 4 ++-- Mage.Sets/src/mage/cards/a/AbunaAcolyte.java | 6 +++--- Mage.Sets/src/mage/cards/a/AbyssalHunter.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanBanner.java | 2 +- Mage.Sets/src/mage/cards/a/AcademyElite.java | 2 +- Mage.Sets/src/mage/cards/a/AcademyRuins.java | 2 +- Mage.Sets/src/mage/cards/a/AccursedHorde.java | 2 +- Mage.Sets/src/mage/cards/a/AcidicSliver.java | 2 +- Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java | 2 +- Mage.Sets/src/mage/cards/a/AcornCatapult.java | 2 +- Mage.Sets/src/mage/cards/a/AdantoTheFirstFort.java | 2 +- Mage.Sets/src/mage/cards/a/AdarkarSentinel.java | 2 +- Mage.Sets/src/mage/cards/a/AdarkarWindform.java | 2 +- Mage.Sets/src/mage/cards/a/AdvanceScout.java | 2 +- Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java | 2 +- Mage.Sets/src/mage/cards/a/AegisAutomaton.java | 2 +- Mage.Sets/src/mage/cards/a/AegisOfHonor.java | 2 +- Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java | 2 +- Mage.Sets/src/mage/cards/a/Aeolipile.java | 2 +- Mage.Sets/src/mage/cards/a/AeonEngine.java | 2 +- Mage.Sets/src/mage/cards/a/AerieOuphes.java | 2 +- Mage.Sets/src/mage/cards/a/AetherSpellbomb.java | 6 +++--- Mage.Sets/src/mage/cards/a/AetherStorm.java | 2 +- Mage.Sets/src/mage/cards/a/AetherTheorist.java | 2 +- Mage.Sets/src/mage/cards/a/AetherVial.java | 2 +- Mage.Sets/src/mage/cards/a/Aetherling.java | 8 ++++---- Mage.Sets/src/mage/cards/a/AethersphereHarvester.java | 2 +- Mage.Sets/src/mage/cards/a/AethertideWhale.java | 2 +- Mage.Sets/src/mage/cards/a/AethertorchRenegade.java | 4 ++-- Mage.Sets/src/mage/cards/a/AetherwindBasker.java | 2 +- Mage.Sets/src/mage/cards/a/AgadeemOccultist.java | 2 +- Mage.Sets/src/mage/cards/a/AgentOfHorizons.java | 2 +- Mage.Sets/src/mage/cards/a/AgentOfShauku.java | 2 +- Mage.Sets/src/mage/cards/a/Agoraphobia.java | 2 +- Mage.Sets/src/mage/cards/a/AirServant.java | 2 +- Mage.Sets/src/mage/cards/a/AirdropCondor.java | 2 +- Mage.Sets/src/mage/cards/a/AjanisAid.java | 2 +- Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java | 2 +- Mage.Sets/src/mage/cards/a/AkroanJailer.java | 2 +- Mage.Sets/src/mage/cards/a/AkroanMastiff.java | 2 +- Mage.Sets/src/mage/cards/a/AkroanPhalanx.java | 2 +- Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java | 2 +- Mage.Sets/src/mage/cards/a/AlAbarasCarpet.java | 2 +- Mage.Sets/src/mage/cards/a/AlabasterMage.java | 2 +- Mage.Sets/src/mage/cards/a/AlabasterWall.java | 2 +- Mage.Sets/src/mage/cards/a/AladdinsLamp.java | 2 +- Mage.Sets/src/mage/cards/a/AladdinsRing.java | 2 +- Mage.Sets/src/mage/cards/a/AlbinoTroll.java | 4 ++-- Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java | 2 +- Mage.Sets/src/mage/cards/a/AlchemistsVial.java | 2 +- Mage.Sets/src/mage/cards/a/AlchorsTomb.java | 2 +- Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java | 2 +- Mage.Sets/src/mage/cards/a/AliBaba.java | 2 +- Mage.Sets/src/mage/cards/a/AlluringSiren.java | 4 ++-- Mage.Sets/src/mage/cards/a/AllyEncampment.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaKavu.java | 2 +- Mage.Sets/src/mage/cards/a/AltarGolem.java | 2 +- Mage.Sets/src/mage/cards/a/AltarOfDementia.java | 2 +- Mage.Sets/src/mage/cards/a/AltarOfShadows.java | 2 +- Mage.Sets/src/mage/cards/a/AmateurAuteur.java | 2 +- Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java | 2 +- Mage.Sets/src/mage/cards/a/AmberPrison.java | 2 +- Mage.Sets/src/mage/cards/a/AmbushCommander.java | 2 +- Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java | 2 +- Mage.Sets/src/mage/cards/a/Amok.java | 2 +- Mage.Sets/src/mage/cards/a/AmphinPathmage.java | 2 +- Mage.Sets/src/mage/cards/a/Amugaba.java | 2 +- Mage.Sets/src/mage/cards/a/AmuletOfKroog.java | 2 +- Mage.Sets/src/mage/cards/a/AnaDisciple.java | 4 ++-- Mage.Sets/src/mage/cards/a/AnabaAncestor.java | 2 +- Mage.Sets/src/mage/cards/a/AnabaShaman.java | 2 +- Mage.Sets/src/mage/cards/a/Anavolver.java | 2 +- Mage.Sets/src/mage/cards/a/AncientHydra.java | 2 +- Mage.Sets/src/mage/cards/a/AncientKavu.java | 2 +- Mage.Sets/src/mage/cards/a/AncientSilverback.java | 2 +- Mage.Sets/src/mage/cards/a/AngelfireCrusader.java | 2 +- Mage.Sets/src/mage/cards/a/AngelheartVial.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicPage.java | 4 ++-- Mage.Sets/src/mage/cards/a/AngelicShield.java | 2 +- Mage.Sets/src/mage/cards/a/AnimalBoneyard.java | 2 +- Mage.Sets/src/mage/cards/a/AnimationModule.java | 2 +- Mage.Sets/src/mage/cards/a/AnointerOfChampions.java | 2 +- Mage.Sets/src/mage/cards/a/AntQueen.java | 2 +- Mage.Sets/src/mage/cards/a/Anthroplasm.java | 2 +- Mage.Sets/src/mage/cards/a/AntlerSkulkin.java | 2 +- Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java | 2 +- Mage.Sets/src/mage/cards/a/AphettoAlchemist.java | 2 +- Mage.Sets/src/mage/cards/a/AphettoGrifter.java | 2 +- Mage.Sets/src/mage/cards/a/ApocalypseChime.java | 2 +- Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java | 2 +- Mage.Sets/src/mage/cards/a/Aquamoeba.java | 2 +- Mage.Sets/src/mage/cards/a/AquaticIncursion.java | 2 +- Mage.Sets/src/mage/cards/a/AquusSteed.java | 2 +- Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java | 2 +- Mage.Sets/src/mage/cards/a/ArbalestElite.java | 2 +- Mage.Sets/src/mage/cards/a/ArborElf.java | 2 +- Mage.Sets/src/mage/cards/a/ArcMage.java | 2 +- Mage.Sets/src/mage/cards/a/ArcSlogger.java | 2 +- Mage.Sets/src/mage/cards/a/ArcadesSabboth.java | 2 +- Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArcaneTeachings.java | 2 +- Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArcboundRavager.java | 2 +- Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java | 2 +- Mage.Sets/src/mage/cards/a/ArchersParapet.java | 2 +- Mage.Sets/src/mage/cards/a/Archivist.java | 2 +- Mage.Sets/src/mage/cards/a/Arena.java | 2 +- Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java | 2 +- Mage.Sets/src/mage/cards/a/ArgothianElder.java | 2 +- Mage.Sets/src/mage/cards/a/ArguelsBloodFast.java | 2 +- Mage.Sets/src/mage/cards/a/ArkOfBlight.java | 2 +- Mage.Sets/src/mage/cards/a/Armistice.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorOfFaith.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorSliver.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorThrull.java | 2 +- Mage.Sets/src/mage/cards/a/ArmoredGuardian.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java | 6 +++--- Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java | 2 +- Mage.Sets/src/mage/cards/a/ArtificersIntuition.java | 2 +- Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java | 4 ++-- Mage.Sets/src/mage/cards/a/Asceticism.java | 2 +- Mage.Sets/src/mage/cards/a/AshenFirebeast.java | 2 +- Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java | 2 +- Mage.Sets/src/mage/cards/a/AshnodsCylix.java | 2 +- Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java | 2 +- Mage.Sets/src/mage/cards/a/AsphodelWanderer.java | 2 +- Mage.Sets/src/mage/cards/a/AssaultFormation.java | 4 ++-- Mage.Sets/src/mage/cards/a/AssemblyWorker.java | 2 +- Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java | 2 +- Mage.Sets/src/mage/cards/a/AtarkaMonument.java | 2 +- Mage.Sets/src/mage/cards/a/Attunement.java | 2 +- Mage.Sets/src/mage/cards/a/AtzalCaveOfEternity.java | 2 +- Mage.Sets/src/mage/cards/a/AtzocanSeer.java | 2 +- Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java | 2 +- Mage.Sets/src/mage/cards/a/AugurOfSkulls.java | 2 +- Mage.Sets/src/mage/cards/a/AuraOfDominion.java | 2 +- Mage.Sets/src/mage/cards/a/AuraOfSilence.java | 2 +- Mage.Sets/src/mage/cards/a/Auratog.java | 2 +- Mage.Sets/src/mage/cards/a/AuriokSalvagers.java | 2 +- Mage.Sets/src/mage/cards/a/AuriokTransfixer.java | 2 +- Mage.Sets/src/mage/cards/a/AuriokWindwalker.java | 2 +- Mage.Sets/src/mage/cards/a/AuroraEidolon.java | 2 +- Mage.Sets/src/mage/cards/a/AuroraGriffin.java | 2 +- Mage.Sets/src/mage/cards/a/AutumnWillow.java | 2 +- Mage.Sets/src/mage/cards/a/AutumnalGloom.java | 2 +- Mage.Sets/src/mage/cards/a/AvacynianPriest.java | 2 +- Mage.Sets/src/mage/cards/a/AvariceTotem.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfFury.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfWoe.java | 2 +- Mage.Sets/src/mage/cards/a/AvenArcher.java | 2 +- Mage.Sets/src/mage/cards/a/AvenFateshaper.java | 2 +- Mage.Sets/src/mage/cards/a/AvenFlock.java | 2 +- Mage.Sets/src/mage/cards/a/AvenRedeemer.java | 2 +- Mage.Sets/src/mage/cards/a/AvenSoulgazer.java | 2 +- Mage.Sets/src/mage/cards/a/AvenTrooper.java | 2 +- Mage.Sets/src/mage/cards/a/AvengerEnDal.java | 2 +- Mage.Sets/src/mage/cards/a/AyeshaTanaka.java | 2 +- Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java | 2 +- Mage.Sets/src/mage/cards/a/AysenBureaucrats.java | 2 +- Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java | 2 +- Mage.Sets/src/mage/cards/a/AzoriusCluestone.java | 2 +- Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java | 2 +- Mage.Sets/src/mage/cards/a/AzoriusLocket.java | 2 +- Mage.Sets/src/mage/cards/a/AzorsGateway.java | 2 +- Mage.Sets/src/mage/cards/a/AzureMage.java | 2 +- 168 files changed, 189 insertions(+), 189 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AWing.java b/Mage.Sets/src/mage/cards/a/AWing.java index d40532abf61..d695a994101 100644 --- a/Mage.Sets/src/mage/cards/a/AWing.java +++ b/Mage.Sets/src/mage/cards/a/AWing.java @@ -39,7 +39,7 @@ public final class AWing extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // {1}:Remove A-wing from combat. It must attack on your next combat if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveFromCombatSourceEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new RemoveFromCombatSourceEffect(), new GenericManaCost(1)); ability.addEffect(new AWingAttacksNextCombatIfAbleSourceEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AbbeyMatron.java b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java index fec8b629e64..fae7eea67a7 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyMatron.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java @@ -29,7 +29,7 @@ public final class AbbeyMatron extends CardImpl { this.toughness = new MageInt(3); // {W}, {tap}: Abbey Matron gets +0/+3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0,3,Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(0,3,Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java index 77db4bb68d8..483912dcdec 100644 --- a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java @@ -45,12 +45,12 @@ public final class AboshanCephalidEmperor extends CardImpl { this.toughness = new MageInt(3); // Tap an untapped Octopus you control: Tap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(1, filter1))); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(1, filter1))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); // {U}{U}{U}: Tap all creatures without flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(filter2), new ManaCostsImpl<>("{U}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new TapAllEffect(filter2), new ManaCostsImpl<>("{U}{U}{U}"))); } private AboshanCephalidEmperor(final AboshanCephalidEmperor card) { diff --git a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java index fafd25e0096..2b4699f8d01 100644 --- a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java +++ b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java @@ -36,9 +36,9 @@ public final class AbunaAcolyte extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability1 = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability1.addTarget(new TargetAnyTarget()); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability1); this.addAbility(ability2); @@ -53,4 +53,4 @@ public final class AbunaAcolyte extends CardImpl { return new AbunaAcolyte(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AbyssalHunter.java b/Mage.Sets/src/mage/cards/a/AbyssalHunter.java index fb257523cc8..a399cfac944 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalHunter.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalHunter.java @@ -34,7 +34,7 @@ public final class AbyssalHunter extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{B}")); Effect effect = new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE); effect.setText("{this} deals damage equal to {this}'s power to that creature."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AbzanBanner.java b/Mage.Sets/src/mage/cards/a/AbzanBanner.java index 707e2ba5e0e..46b17695896 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBanner.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBanner.java @@ -31,7 +31,7 @@ public final class AbzanBanner extends CardImpl { this.addAbility(new GreenManaAbility()); // {W}{B}{G}, {T}, Sacrifice Abzan Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{B}{G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{B}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AcademyElite.java b/Mage.Sets/src/mage/cards/a/AcademyElite.java index be8e24d3575..027b9e44646 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyElite.java +++ b/Mage.Sets/src/mage/cards/a/AcademyElite.java @@ -40,7 +40,7 @@ public final class AcademyElite extends CardImpl { "with X +1/+1 counters on it, where X is the number of instant and sorcery cards in all graveyards")); // {2}{U}, Remove a +1/+1 counter from Academy Elite: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AcademyRuins.java b/Mage.Sets/src/mage/cards/a/AcademyRuins.java index 9b3080f5234..e0c2e635608 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyRuins.java +++ b/Mage.Sets/src/mage/cards/a/AcademyRuins.java @@ -28,7 +28,7 @@ public final class AcademyRuins extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}{U}, {T}: Put target artifact card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AccursedHorde.java b/Mage.Sets/src/mage/cards/a/AccursedHorde.java index 17ddc940dea..e759065daa5 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedHorde.java +++ b/Mage.Sets/src/mage/cards/a/AccursedHorde.java @@ -37,7 +37,7 @@ public final class AccursedHorde extends CardImpl { this.toughness = new MageInt(3); // {1}{B}: Target attacking Zombie gains indestructible until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AcidicSliver.java b/Mage.Sets/src/mage/cards/a/AcidicSliver.java index 1b99359297d..5e6366359f4 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSliver.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSliver.java @@ -33,7 +33,7 @@ public final class AcidicSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to any target." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java b/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java index a94cb35ea1e..ae8f909afb2 100644 --- a/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java @@ -29,7 +29,7 @@ public final class AcolyteOfXathrid extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AcornCatapult.java b/Mage.Sets/src/mage/cards/a/AcornCatapult.java index e2995ff033e..3a1780c0916 100644 --- a/Mage.Sets/src/mage/cards/a/AcornCatapult.java +++ b/Mage.Sets/src/mage/cards/a/AcornCatapult.java @@ -28,7 +28,7 @@ public final class AcornCatapult extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {1}, {T}: Acorn Catapult deals 1 damage to any target. That creature's controller or that player creates a 1/1 green Squirrel creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AcornCatapultEffect()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AdantoTheFirstFort.java b/Mage.Sets/src/mage/cards/a/AdantoTheFirstFort.java index e8112535e20..287da954970 100644 --- a/Mage.Sets/src/mage/cards/a/AdantoTheFirstFort.java +++ b/Mage.Sets/src/mage/cards/a/AdantoTheFirstFort.java @@ -32,7 +32,7 @@ public final class AdantoTheFirstFort extends CardImpl { this.addAbility(new WhiteManaAbility()); // 2W, T: Create a 1/1 white Vampire creature token with lifelink. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new IxalanVampireToken()), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new IxalanVampireToken()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java b/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java index 54b1b38f219..28605fc5720 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java @@ -27,7 +27,7 @@ public final class AdarkarSentinel extends CardImpl { this.toughness = new MageInt(3); // {1}: Adarkar Sentinel gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0,1,Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(0,1,Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AdarkarWindform.java b/Mage.Sets/src/mage/cards/a/AdarkarWindform.java index 76358d3d831..635b1f5157e 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarWindform.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarWindform.java @@ -29,7 +29,7 @@ public final class AdarkarWindform extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{S}: Target creature loses flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new LoseAbilityTargetEffect( FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{S}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AdvanceScout.java b/Mage.Sets/src/mage/cards/a/AdvanceScout.java index 2583f732021..be95a3279ff 100644 --- a/Mage.Sets/src/mage/cards/a/AdvanceScout.java +++ b/Mage.Sets/src/mage/cards/a/AdvanceScout.java @@ -28,7 +28,7 @@ public final class AdvanceScout extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java b/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java index c46cc195cca..d1ccc8b1513 100644 --- a/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java +++ b/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java @@ -31,7 +31,7 @@ public final class AdvancedHoverguard extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Advanced Hoverguard gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private AdvancedHoverguard(final AdvancedHoverguard card) { diff --git a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java index 561ca8a3508..db0ea3472ea 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java @@ -28,7 +28,7 @@ public final class AegisAutomaton extends CardImpl { this.toughness = new MageInt(3); // {4}{W}: Return another target creature you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{4}{W}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{4}{W}")); ability.addTarget(new TargetControlledCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AegisOfHonor.java b/Mage.Sets/src/mage/cards/a/AegisOfHonor.java index 274579e6e2b..3be38c89858 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfHonor.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfHonor.java @@ -31,7 +31,7 @@ public final class AegisOfHonor extends CardImpl { // {1}: The next time an instant or sorcery spell would deal damage to you this //turn, that spell deals that damage to its controller instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AegisOfHonorEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new AegisOfHonorEffect(), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java b/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java index 361603e8160..96bbbbfc9c8 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java @@ -35,7 +35,7 @@ public final class AegisOfTheMeek extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {1}, {T}: Target 1/1 creature gets +1/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/Aeolipile.java b/Mage.Sets/src/mage/cards/a/Aeolipile.java index d58131f88ba..e7a95017880 100644 --- a/Mage.Sets/src/mage/cards/a/Aeolipile.java +++ b/Mage.Sets/src/mage/cards/a/Aeolipile.java @@ -24,7 +24,7 @@ public final class Aeolipile extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Aeolipile: Aeolipile deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AeonEngine.java b/Mage.Sets/src/mage/cards/a/AeonEngine.java index 75cf735f88d..690f002c39d 100644 --- a/Mage.Sets/src/mage/cards/a/AeonEngine.java +++ b/Mage.Sets/src/mage/cards/a/AeonEngine.java @@ -26,7 +26,7 @@ public final class AeonEngine extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {T}, Exile Aeon Engine: Reverse the game’s turn order. (For example, if play had proceeded clockwise around the table, it now goes counterclockwise.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AeonEngineEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AeonEngineEffect(), new TapSourceCost()); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AerieOuphes.java b/Mage.Sets/src/mage/cards/a/AerieOuphes.java index ea31e737b22..cbe0fccb147 100644 --- a/Mage.Sets/src/mage/cards/a/AerieOuphes.java +++ b/Mage.Sets/src/mage/cards/a/AerieOuphes.java @@ -40,7 +40,7 @@ public final class AerieOuphes extends CardImpl { this.toughness = new MageInt(3); // Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("it deals damage equal to its power to target creature with flying"), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java b/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java index 6e09a9aa919..cabf20cd987 100644 --- a/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java +++ b/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java @@ -24,13 +24,13 @@ public final class AetherSpellbomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); //{U}, Sacrifice Aether Spellbomb: Return target creature to its owner's hand. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); //{1}, Sacrifice Aether Spellbomb: Draw a card. - SimpleActivatedAbility drawCardAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + SimpleActivatedAbility drawCardAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); drawCardAbility.addCost(new SacrificeSourceCost()); this.addAbility(drawCardAbility); @@ -44,4 +44,4 @@ public final class AetherSpellbomb extends CardImpl { public AetherSpellbomb copy() { return new AetherSpellbomb(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AetherStorm.java b/Mage.Sets/src/mage/cards/a/AetherStorm.java index 943d827cbac..a41faa2ba4f 100644 --- a/Mage.Sets/src/mage/cards/a/AetherStorm.java +++ b/Mage.Sets/src/mage/cards/a/AetherStorm.java @@ -30,7 +30,7 @@ public final class AetherStorm extends CardImpl { this.addAbility(new SimpleStaticAbility(new AetherStormReplacementEffect())); // Pay 4 life: Destroy Aether Storm. It can't be regenerated. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroySourceEffect(true), new PayLifeCost(4)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DestroySourceEffect(true), new PayLifeCost(4)); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AetherTheorist.java b/Mage.Sets/src/mage/cards/a/AetherTheorist.java index 3e1bf4ffb00..0329be03c9a 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTheorist.java +++ b/Mage.Sets/src/mage/cards/a/AetherTheorist.java @@ -33,7 +33,7 @@ public final class AetherTheorist extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(3))); // Tap, Pay {E}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1), new TapSourceCost()); ability.addCost(new PayEnergyCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AetherVial.java b/Mage.Sets/src/mage/cards/a/AetherVial.java index 7c6110bba59..fa7ec8ac144 100644 --- a/Mage.Sets/src/mage/cards/a/AetherVial.java +++ b/Mage.Sets/src/mage/cards/a/AetherVial.java @@ -35,7 +35,7 @@ public final class AetherVial extends CardImpl { // At the beginning of your upkeep, you may put a charge counter on Aether Vial. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), true)); // {tap}: You may put a creature card with converted mana cost equal to the number of charge counters on Aether Vial from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AetherVialEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AetherVialEffect(), new TapSourceCost())); } private AetherVial(final AetherVial card) { diff --git a/Mage.Sets/src/mage/cards/a/Aetherling.java b/Mage.Sets/src/mage/cards/a/Aetherling.java index 8dc959992ae..960d7c55234 100644 --- a/Mage.Sets/src/mage/cards/a/Aetherling.java +++ b/Mage.Sets/src/mage/cards/a/Aetherling.java @@ -29,13 +29,13 @@ public final class Aetherling extends CardImpl { this.toughness = new MageInt(5); // {U}: Exile Aetherling. Return it to the battlefield under its owner's control at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(), new ManaCostsImpl<>("{U}"))); // {U}: Aetherling can't be blocked this turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // {1}: Aetherling gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); // {1}: Aetherling gets -1/+1 until end of turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private Aetherling(final Aetherling card) { diff --git a/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java b/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java index f7751aa3c14..1307b557aa6 100644 --- a/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java +++ b/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java @@ -38,7 +38,7 @@ public final class AethersphereHarvester extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); // Pay {E}: Aethersphere Harvester gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1))); // Crew 1 (Tap any number of creature you control with power 1 or more: This Vehicle becomes an artifact creature until end of turn.) this.addAbility(new CrewAbility(1)); diff --git a/Mage.Sets/src/mage/cards/a/AethertideWhale.java b/Mage.Sets/src/mage/cards/a/AethertideWhale.java index 9b5bad701b4..5f116cb09d2 100644 --- a/Mage.Sets/src/mage/cards/a/AethertideWhale.java +++ b/Mage.Sets/src/mage/cards/a/AethertideWhale.java @@ -35,7 +35,7 @@ public final class AethertideWhale extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(6))); // Pay {E}{E}{E}{E}: Return Aethertide Whale to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayEnergyCost(4))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new PayEnergyCost(4))); } private AethertideWhale(final AethertideWhale card) { diff --git a/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java b/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java index 22eac58f189..e9e53c9323d 100644 --- a/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java +++ b/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java @@ -35,12 +35,12 @@ public final class AethertorchRenegade extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(4))); // {t}, Pay {E}{E} Aethertorch Renegade deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new PayEnergyCost(2)); this.addAbility(ability); // {t}, Pay {E}{E}{E}{E}{E}{E}{E}{E}: Aethertorch Renegade deals 6 damage to target player. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(6), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(6), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); ability.addCost(new PayEnergyCost(8)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AetherwindBasker.java b/Mage.Sets/src/mage/cards/a/AetherwindBasker.java index 1004f2de4cc..4e1e7c8a3ac 100644 --- a/Mage.Sets/src/mage/cards/a/AetherwindBasker.java +++ b/Mage.Sets/src/mage/cards/a/AetherwindBasker.java @@ -38,7 +38,7 @@ public final class AetherwindBasker extends CardImpl { this.addAbility(new EntersBattlefieldOrAttacksSourceTriggeredAbility(new GetEnergyCountersControllerEffect(new PermanentsOnBattlefieldCount(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED)))); // Pay {E}: Aetherwind Basker gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new PayEnergyCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new PayEnergyCost(1))); } private AetherwindBasker(final AetherwindBasker card) { diff --git a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java index c068f7a7011..b5bf7698444 100644 --- a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java +++ b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java @@ -37,7 +37,7 @@ public final class AgadeemOccultist extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put target creature card from an opponent's graveyard onto the battlefield under your control if its converted mana cost is less than or equal to the number of Allies you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AgadeemOccultistEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AgadeemOccultistEffect(), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java b/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java index 6a343b93622..800a01e4008 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java @@ -28,7 +28,7 @@ public final class AgentOfHorizons extends CardImpl { this.toughness = new MageInt(2); // {2}{U}: Agent of Horizons can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}"))); } private AgentOfHorizons(final AgentOfHorizons card) { diff --git a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java index d7ef7bd67c4..65e63c7bb0e 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java @@ -36,7 +36,7 @@ public final class AgentOfShauku extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, Sacrifice a land: Target creature gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/Agoraphobia.java b/Mage.Sets/src/mage/cards/a/Agoraphobia.java index 4753b6ab23f..9ede5cb29ea 100644 --- a/Mage.Sets/src/mage/cards/a/Agoraphobia.java +++ b/Mage.Sets/src/mage/cards/a/Agoraphobia.java @@ -41,7 +41,7 @@ public final class Agoraphobia extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-5, 0))); // {2}{U}: Return Agoraphobia to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); } private Agoraphobia(final Agoraphobia card) { diff --git a/Mage.Sets/src/mage/cards/a/AirServant.java b/Mage.Sets/src/mage/cards/a/AirServant.java index f6d76383a2b..59d071fe21f 100644 --- a/Mage.Sets/src/mage/cards/a/AirServant.java +++ b/Mage.Sets/src/mage/cards/a/AirServant.java @@ -37,7 +37,7 @@ public final class AirServant extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AirdropCondor.java b/Mage.Sets/src/mage/cards/a/AirdropCondor.java index 5f2b553949f..b78e06c7325 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropCondor.java +++ b/Mage.Sets/src/mage/cards/a/AirdropCondor.java @@ -41,7 +41,7 @@ public final class AirdropCondor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}, Sacrifice a Goblin creature: Airdrop Condor deals damage equal to the sacrificed creature's power to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SacrificeCostCreaturesPower.instance) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SacrificeCostCreaturesPower.instance) .setText("{this} deals damage equal to the sacrificed creature's power to any target"), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AjanisAid.java b/Mage.Sets/src/mage/cards/a/AjanisAid.java index 9728a402c34..51c07ba7b8e 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisAid.java +++ b/Mage.Sets/src/mage/cards/a/AjanisAid.java @@ -39,7 +39,7 @@ public final class AjanisAid extends CardImpl { // Sacrifice Ajani's Aid: Prevent all combat damage a creature of your choice would deal this turn. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, new FilterCreaturePermanent("creature of your choice"), true); effect.setText("Prevent all combat damage a creature of your choice would deal this turn"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(effect, new SacrificeSourceCost())); } private AjanisAid(final AjanisAid card) { diff --git a/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java b/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java index 8f5b6095223..e919a575ee2 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java +++ b/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java @@ -30,7 +30,7 @@ public final class AkkiDrillmaster extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // {tap}: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AkroanJailer.java b/Mage.Sets/src/mage/cards/a/AkroanJailer.java index 7499b037552..7b1a04de8ae 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanJailer.java +++ b/Mage.Sets/src/mage/cards/a/AkroanJailer.java @@ -29,7 +29,7 @@ public final class AkroanJailer extends CardImpl { this.toughness = new MageInt(1); // {2}{W}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java index 268fc500dee..2123b79b10d 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java +++ b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java @@ -29,7 +29,7 @@ public final class AkroanMastiff extends CardImpl { this.toughness = new MageInt(2); // {W},{T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java b/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java index 4ef7e6694a6..45b55a622e8 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java +++ b/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java @@ -31,7 +31,7 @@ public final class AkroanPhalanx extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {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}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); } private AkroanPhalanx(final AkroanPhalanx card) { diff --git a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java index c11d159b774..ebe6cb8326d 100644 --- a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java @@ -39,7 +39,7 @@ public final class AkromaAngelOfFury extends CardImpl { // protection from white and from blue this.addAbility(ProtectionAbility.from(ObjectColor.WHITE, ObjectColor.BLUE)); // {R}: Akroma, Angel of Fury 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}"))); // Morph {3}{R}{R}{R} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{R}{R}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AlAbarasCarpet.java b/Mage.Sets/src/mage/cards/a/AlAbarasCarpet.java index a0807c77a7f..b7007ff3509 100644 --- a/Mage.Sets/src/mage/cards/a/AlAbarasCarpet.java +++ b/Mage.Sets/src/mage/cards/a/AlAbarasCarpet.java @@ -31,7 +31,7 @@ public final class AlAbarasCarpet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {5}, {T}: Prevent all damage that would be dealt to you this turn by attacking creatures without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AlAbarasCarpetEffect(), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new AlAbarasCarpetEffect(), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterMage.java b/Mage.Sets/src/mage/cards/a/AlabasterMage.java index b9a529368df..644239547a5 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterMage.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterMage.java @@ -29,7 +29,7 @@ public final class AlabasterMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AlabasterWall.java b/Mage.Sets/src/mage/cards/a/AlabasterWall.java index 984c4e3b5eb..8b0ecf334c3 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterWall.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterWall.java @@ -31,7 +31,7 @@ public final class AlabasterWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AladdinsLamp.java b/Mage.Sets/src/mage/cards/a/AladdinsLamp.java index 8d46ca9c8e8..44614e7ec56 100644 --- a/Mage.Sets/src/mage/cards/a/AladdinsLamp.java +++ b/Mage.Sets/src/mage/cards/a/AladdinsLamp.java @@ -34,7 +34,7 @@ public final class AladdinsLamp extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{10}"); // {X}, {T}: The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card. X can't be 0. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AladdinsLampEffect(), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new AladdinsLampEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); for (Object cost : ability.getManaCosts()) { if (cost instanceof VariableManaCost) { diff --git a/Mage.Sets/src/mage/cards/a/AladdinsRing.java b/Mage.Sets/src/mage/cards/a/AladdinsRing.java index 2a96b9f0783..d16d3c379b1 100644 --- a/Mage.Sets/src/mage/cards/a/AladdinsRing.java +++ b/Mage.Sets/src/mage/cards/a/AladdinsRing.java @@ -23,7 +23,7 @@ public final class AladdinsRing extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{8}"); // {8}, {tap}: Aladdin's Ring deals 4 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl<>("{8}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new ManaCostsImpl<>("{8}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AlbinoTroll.java b/Mage.Sets/src/mage/cards/a/AlbinoTroll.java index e910f7d1103..64242249a7c 100644 --- a/Mage.Sets/src/mage/cards/a/AlbinoTroll.java +++ b/Mage.Sets/src/mage/cards/a/AlbinoTroll.java @@ -27,7 +27,7 @@ public final class AlbinoTroll extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new EchoAbility("{1}{G}")); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private AlbinoTroll(final AlbinoTroll card) { @@ -39,4 +39,4 @@ public final class AlbinoTroll extends CardImpl { return new AlbinoTroll(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java b/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java index 1865c7297d7..970afd7a20c 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java @@ -27,7 +27,7 @@ public final class AlchemistsApprentice extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Alchemist's Apprentice: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsVial.java b/Mage.Sets/src/mage/cards/a/AlchemistsVial.java index 3f7a9fab9fd..9d1eef49f4e 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsVial.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsVial.java @@ -30,7 +30,7 @@ public final class AlchemistsVial extends CardImpl { // When Alchemist's Vial enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // {1}, {T}, Sacrifice Alchemist's Vial: Target creature can't attack or block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/a/AlchorsTomb.java b/Mage.Sets/src/mage/cards/a/AlchorsTomb.java index cb74ab9f0b5..452da65579f 100644 --- a/Mage.Sets/src/mage/cards/a/AlchorsTomb.java +++ b/Mage.Sets/src/mage/cards/a/AlchorsTomb.java @@ -24,7 +24,7 @@ public final class AlchorsTomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}: Target permanent you control becomes the color of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(Duration.WhileOnBattlefield), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(Duration.WhileOnBattlefield), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java b/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java index af88f8f5a81..2ea68047f3a 100644 --- a/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java +++ b/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java @@ -38,7 +38,7 @@ public final class AlexiZephyrMage extends CardImpl { // {X}{U}, {tap}, Discard two cards: Return X target creatures to their owners' hands. Effect effect = new ReturnToHandTargetEffect(); effect.setText("Return X target creatures to their owner's hands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS))); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURES)); diff --git a/Mage.Sets/src/mage/cards/a/AliBaba.java b/Mage.Sets/src/mage/cards/a/AliBaba.java index 54cb865f43f..44cb9b6ddd0 100644 --- a/Mage.Sets/src/mage/cards/a/AliBaba.java +++ b/Mage.Sets/src/mage/cards/a/AliBaba.java @@ -35,7 +35,7 @@ public final class AliBaba extends CardImpl { this.toughness = new MageInt(1); // {R}: Tap target Wall. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AlluringSiren.java b/Mage.Sets/src/mage/cards/a/AlluringSiren.java index 3af2de7fe6e..14dc35dbfae 100644 --- a/Mage.Sets/src/mage/cards/a/AlluringSiren.java +++ b/Mage.Sets/src/mage/cards/a/AlluringSiren.java @@ -28,7 +28,7 @@ public final class AlluringSiren extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature an opponent controls attacks you this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn, TargetController.YOU), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AttacksIfAbleTargetEffect(Duration.EndOfTurn, TargetController.YOU), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE)); this.addAbility(ability); } @@ -42,4 +42,4 @@ public final class AlluringSiren extends CardImpl { return new AlluringSiren(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AllyEncampment.java b/Mage.Sets/src/mage/cards/a/AllyEncampment.java index 6912416ccae..73d4db7801c 100644 --- a/Mage.Sets/src/mage/cards/a/AllyEncampment.java +++ b/Mage.Sets/src/mage/cards/a/AllyEncampment.java @@ -42,7 +42,7 @@ public final class AllyEncampment extends CardImpl { this.addAbility(new ConditionalAnyColorManaAbility(new TapSourceCost(), 1, new ConditionalSpellManaBuilder(filterSpell), true)); // {1}, {T}, Sacrifice Ally Encampment: Return target Ally you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetControlledPermanent(filterPermanent)); diff --git a/Mage.Sets/src/mage/cards/a/AlphaKavu.java b/Mage.Sets/src/mage/cards/a/AlphaKavu.java index 0fc36af39bb..15dd7d09277 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaKavu.java +++ b/Mage.Sets/src/mage/cards/a/AlphaKavu.java @@ -35,7 +35,7 @@ public final class AlphaKavu extends CardImpl { this.toughness = new MageInt(2); // {1}{G}: Target Kavu creature gets -1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, 1, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AltarGolem.java b/Mage.Sets/src/mage/cards/a/AltarGolem.java index 28b8d99cf13..31b8571ab1a 100644 --- a/Mage.Sets/src/mage/cards/a/AltarGolem.java +++ b/Mage.Sets/src/mage/cards/a/AltarGolem.java @@ -53,7 +53,7 @@ public final class AltarGolem extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Tap five untapped creatures you control: Untap Altar Golem. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter, true)))); } diff --git a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java index cf45964668b..9ebbb8b4762 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java @@ -28,7 +28,7 @@ public final class AltarOfDementia extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Sacrifice a creature: Target player puts a number of cards equal to the sacrificed creature's power from the top of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AltarOfDementiaEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); + Ability ability = new SimpleActivatedAbility(new AltarOfDementiaEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AltarOfShadows.java b/Mage.Sets/src/mage/cards/a/AltarOfShadows.java index 0862944a6d5..efaa95dce93 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfShadows.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfShadows.java @@ -35,7 +35,7 @@ public final class AltarOfShadows extends CardImpl { this.addAbility(new BeginningOfFirstMainTriggeredAbility(new AltarOfShadowsEffect())); // {7}, {tap}: Destroy target creature. Then put a charge counter on Altar of Shadows. - Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(7)); + Ability destroyAbility = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(7)); destroyAbility.addCost(new TapSourceCost()); destroyAbility.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true) .concatBy("Then")); diff --git a/Mage.Sets/src/mage/cards/a/AmateurAuteur.java b/Mage.Sets/src/mage/cards/a/AmateurAuteur.java index 56e1bfa7868..98fe4cc2a54 100644 --- a/Mage.Sets/src/mage/cards/a/AmateurAuteur.java +++ b/Mage.Sets/src/mage/cards/a/AmateurAuteur.java @@ -28,7 +28,7 @@ public final class AmateurAuteur extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Amateur Auteur: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java index 213e8a4ae44..4e2cde321c3 100644 --- a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java +++ b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java @@ -31,7 +31,7 @@ public final class AmbassadorLaquatus extends CardImpl { this.toughness = new MageInt(3); // {3}: Target player puts the top three cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(3), new GenericManaCost(3)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AmberPrison.java b/Mage.Sets/src/mage/cards/a/AmberPrison.java index dc3297a1a2b..3bd1c05a4d3 100644 --- a/Mage.Sets/src/mage/cards/a/AmberPrison.java +++ b/Mage.Sets/src/mage/cards/a/AmberPrison.java @@ -39,7 +39,7 @@ public final class AmberPrison extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {4}, {tap}: Tap target artifact, creature, or land. That permanent doesn't untap during its controller's untap step for as long as Amber Prison remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index c3a94efbce0..036e316e46f 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -46,7 +46,7 @@ public final class AmbushCommander extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java b/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java index 53d18852e20..c7e1b997f0d 100644 --- a/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java +++ b/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java @@ -37,7 +37,7 @@ public final class AmoeboidChangeling extends CardImpl { this.addAbility(ability); // {tap}: Target creature loses all creature types until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAllCreatureTypesTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + ability = new SimpleActivatedAbility(new LoseAllCreatureTypesTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/Amok.java b/Mage.Sets/src/mage/cards/a/Amok.java index c19375fed65..814811c61fb 100644 --- a/Mage.Sets/src/mage/cards/a/Amok.java +++ b/Mage.Sets/src/mage/cards/a/Amok.java @@ -24,7 +24,7 @@ public final class Amok extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); // {1}, Discard a card at random: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}")); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AmphinPathmage.java b/Mage.Sets/src/mage/cards/a/AmphinPathmage.java index ae2b78baa8a..b3ca2fc60b2 100644 --- a/Mage.Sets/src/mage/cards/a/AmphinPathmage.java +++ b/Mage.Sets/src/mage/cards/a/AmphinPathmage.java @@ -30,7 +30,7 @@ public final class AmphinPathmage extends CardImpl { this.toughness = new MageInt(2); // {2}{U}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/Amugaba.java b/Mage.Sets/src/mage/cards/a/Amugaba.java index d5e09a282bf..c0439fe1e55 100644 --- a/Mage.Sets/src/mage/cards/a/Amugaba.java +++ b/Mage.Sets/src/mage/cards/a/Amugaba.java @@ -32,7 +32,7 @@ public final class Amugaba extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{U}, Discard a card: Return Amugaba to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java index 74f7aaec220..07b4658c3b3 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java @@ -24,7 +24,7 @@ public final class AmuletOfKroog extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AnaDisciple.java b/Mage.Sets/src/mage/cards/a/AnaDisciple.java index b747ec55885..48dc54b0380 100644 --- a/Mage.Sets/src/mage/cards/a/AnaDisciple.java +++ b/Mage.Sets/src/mage/cards/a/AnaDisciple.java @@ -28,11 +28,11 @@ public final class AnaDisciple extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); + Ability firstAbility = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability secondAbility = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java index 0612ecaced5..3510bc6d5c9 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java @@ -38,7 +38,7 @@ public final class AnabaAncestor extends CardImpl { this.toughness = new MageInt(1); // {T}: Another target Minotaur creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AnabaShaman.java b/Mage.Sets/src/mage/cards/a/AnabaShaman.java index dd02946d66f..8d4596ca05a 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaShaman.java +++ b/Mage.Sets/src/mage/cards/a/AnabaShaman.java @@ -30,7 +30,7 @@ public final class AnabaShaman extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}: Anaba Shaman deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/Anavolver.java b/Mage.Sets/src/mage/cards/a/Anavolver.java index fed67c10732..bfbae67c81e 100644 --- a/Mage.Sets/src/mage/cards/a/Anavolver.java +++ b/Mage.Sets/src/mage/cards/a/Anavolver.java @@ -52,7 +52,7 @@ public final class Anavolver extends CardImpl { new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition("{B}"), "If {this} was kicked with its {B} kicker, it enters with a +1/+1 counter on it and with \"Pay 3 life: Regenerate Anavolver.\"", "{this} enters with a +1/+1 counter on it and with \"Pay 3 life: Regenerate Anavolver.\""); - ((EntersBattlefieldEffect)ability2.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(3)), Duration.WhileOnBattlefield)); + ((EntersBattlefieldEffect)ability2.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new PayLifeCost(3)), Duration.WhileOnBattlefield)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/a/AncientHydra.java b/Mage.Sets/src/mage/cards/a/AncientHydra.java index 7a2a2d432b9..0a1ea294f10 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHydra.java +++ b/Mage.Sets/src/mage/cards/a/AncientHydra.java @@ -32,7 +32,7 @@ public final class AncientHydra extends CardImpl { // Fading 5 this.addAbility(new FadingAbility(5, this)); // {1}, Remove a fade counter from Ancient Hydra: Ancient Hydra deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.FADE.createInstance(1))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AncientKavu.java b/Mage.Sets/src/mage/cards/a/AncientKavu.java index 5cffc720f8d..a00ba99f705 100644 --- a/Mage.Sets/src/mage/cards/a/AncientKavu.java +++ b/Mage.Sets/src/mage/cards/a/AncientKavu.java @@ -27,7 +27,7 @@ public final class AncientKavu extends CardImpl { this.toughness = new MageInt(3); // {2}: Ancient Kavu becomes colorless until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private AncientKavu(final AncientKavu card) { diff --git a/Mage.Sets/src/mage/cards/a/AncientSilverback.java b/Mage.Sets/src/mage/cards/a/AncientSilverback.java index 10feefc0a9d..e86d9f24dda 100644 --- a/Mage.Sets/src/mage/cards/a/AncientSilverback.java +++ b/Mage.Sets/src/mage/cards/a/AncientSilverback.java @@ -25,7 +25,7 @@ public final class AncientSilverback extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(5); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private AncientSilverback(final AncientSilverback card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java b/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java index e79bfa56e2e..75450fca836 100644 --- a/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java @@ -24,7 +24,7 @@ public final class AngelfireCrusader extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - 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))); } private AngelfireCrusader(final AngelfireCrusader card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelheartVial.java b/Mage.Sets/src/mage/cards/a/AngelheartVial.java index 9c8968ee7ff..1d14580be2e 100644 --- a/Mage.Sets/src/mage/cards/a/AngelheartVial.java +++ b/Mage.Sets/src/mage/cards/a/AngelheartVial.java @@ -34,7 +34,7 @@ public final class AngelheartVial extends CardImpl { this.addAbility(new AngelheartVialTriggeredAbility()); // {2}, {tap}, Remove four charge counters from Angelheart Vial: You gain 2 life and draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(4))); ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and")); diff --git a/Mage.Sets/src/mage/cards/a/AngelicPage.java b/Mage.Sets/src/mage/cards/a/AngelicPage.java index ecab4a5f88a..c7a1124a229 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicPage.java +++ b/Mage.Sets/src/mage/cards/a/AngelicPage.java @@ -34,7 +34,7 @@ public final class AngelicPage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); //{T}: Target attacking or blocking creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); } @@ -47,4 +47,4 @@ public final class AngelicPage extends CardImpl { public AngelicPage copy() { return new AngelicPage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AngelicShield.java b/Mage.Sets/src/mage/cards/a/AngelicShield.java index 10cfe3fe663..5b5e3f1adb7 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicShield.java +++ b/Mage.Sets/src/mage/cards/a/AngelicShield.java @@ -29,7 +29,7 @@ public final class AngelicShield extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); // Sacrifice Angelic Shield: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index 7ec2f30c3d5..0c6c7a40d80 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -38,7 +38,7 @@ public final class AnimalBoneyard extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}, Sacrifice a creature: You gain life equal to that creature's toughness." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnimalBoneyardEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new AnimalBoneyardEffect(), new TapSourceCost()); gainedAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.\""); diff --git a/Mage.Sets/src/mage/cards/a/AnimationModule.java b/Mage.Sets/src/mage/cards/a/AnimationModule.java index b3326370682..8d14d4de075 100644 --- a/Mage.Sets/src/mage/cards/a/AnimationModule.java +++ b/Mage.Sets/src/mage/cards/a/AnimationModule.java @@ -42,7 +42,7 @@ public final class AnimationModule extends CardImpl { this.addAbility(new AnimationModuleTriggeredAbility()); // {3}, {T}: Choose a counter on target permanent or player. Give that permanent or player another counter of that kind. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnimationModuleEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new AnimationModuleEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanentOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java b/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java index 304298782eb..c6e99c46722 100644 --- a/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java +++ b/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java @@ -29,7 +29,7 @@ public final class AnointerOfChampions extends CardImpl { this.toughness = new MageInt(1); // {T}: Target attacking creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AntQueen.java b/Mage.Sets/src/mage/cards/a/AntQueen.java index 891d82ec328..0d169b10381 100644 --- a/Mage.Sets/src/mage/cards/a/AntQueen.java +++ b/Mage.Sets/src/mage/cards/a/AntQueen.java @@ -30,7 +30,7 @@ public final class AntQueen extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(insectToken), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(insectToken), new ManaCostsImpl<>("{1}{G}"))); } private AntQueen(final AntQueen card) { diff --git a/Mage.Sets/src/mage/cards/a/Anthroplasm.java b/Mage.Sets/src/mage/cards/a/Anthroplasm.java index b30d64a8d38..e1472ad7fc4 100644 --- a/Mage.Sets/src/mage/cards/a/Anthroplasm.java +++ b/Mage.Sets/src/mage/cards/a/Anthroplasm.java @@ -37,7 +37,7 @@ public final class Anthroplasm extends CardImpl { // Anthroplasm enters the battlefield with two +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {X}, {tap}: Remove all +1/+1 counters from Anthroplasm and put X +1/+1 counters on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnthroplasmEffect(), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new AnthroplasmEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java b/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java index 42a45e84fde..924656efdb4 100644 --- a/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java +++ b/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java @@ -40,7 +40,7 @@ public final class AntlerSkulkin extends CardImpl { this.toughness = new MageInt(3); // {2}: Target white creature gains persist until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java b/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java index c2831dcee55..01778901034 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java @@ -30,7 +30,7 @@ public final class AnuridSwarmsnapper extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {1}{G}: Anurid Swarmsnapper can block an additional creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{G}"))); } private AnuridSwarmsnapper(final AnuridSwarmsnapper card) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java index 6baf9e0aa73..bfa1f49169f 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java +++ b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java @@ -31,7 +31,7 @@ public final class AphettoAlchemist extends CardImpl { this.toughness = new MageInt(2); // {tap}: Untap target artifact or creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java index 13c84b30177..4081c5325c8 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java +++ b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java @@ -38,7 +38,7 @@ public final class AphettoGrifter extends CardImpl { this.toughness = new MageInt(1); // Tap two untapped Wizards you control: Tap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseChime.java b/Mage.Sets/src/mage/cards/a/ApocalypseChime.java index 10e9d8580e5..6aa76a96e7b 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseChime.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseChime.java @@ -42,7 +42,7 @@ public final class ApocalypseChime extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, {T}, Sacrifice Apocalypse Chime: Destroy all nontoken permanents with a name originally printed in the Homelands expansion. They can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, true), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DestroyAllEffect(filter, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java b/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java index b244839da0d..a34f82b88ec 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java @@ -41,7 +41,7 @@ public final class ApprenticeNecromancer extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}, Sacrifice Apprentice Necromancer: Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ApprenticeNecromancerEffect(), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new ApprenticeNecromancerEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/a/Aquamoeba.java b/Mage.Sets/src/mage/cards/a/Aquamoeba.java index d2ba873edec..3ed25828647 100644 --- a/Mage.Sets/src/mage/cards/a/Aquamoeba.java +++ b/Mage.Sets/src/mage/cards/a/Aquamoeba.java @@ -29,7 +29,7 @@ public final class Aquamoeba extends CardImpl { this.toughness = new MageInt(3); // Discard a card: Switch Aquamoeba's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new DiscardCardCost())); } private Aquamoeba(final Aquamoeba card) { diff --git a/Mage.Sets/src/mage/cards/a/AquaticIncursion.java b/Mage.Sets/src/mage/cards/a/AquaticIncursion.java index bd75200661e..5a71d373982 100644 --- a/Mage.Sets/src/mage/cards/a/AquaticIncursion.java +++ b/Mage.Sets/src/mage/cards/a/AquaticIncursion.java @@ -37,7 +37,7 @@ public final class AquaticIncursion extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkHexproofToken(), 2), false)); // {3}{U}: Target Merfolk can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AquusSteed.java b/Mage.Sets/src/mage/cards/a/AquusSteed.java index 8c5f1bd0f73..c774deddba3 100644 --- a/Mage.Sets/src/mage/cards/a/AquusSteed.java +++ b/Mage.Sets/src/mage/cards/a/AquusSteed.java @@ -30,7 +30,7 @@ public final class AquusSteed extends CardImpl { this.toughness = new MageInt(3); // {2}{U}, {T}: Target creature gets -2/-0 until end of turn. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}")); + Ability secondAbility = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}")); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java b/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java index ffd442f5838..2099b9ab64e 100644 --- a/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java +++ b/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java @@ -43,7 +43,7 @@ public final class ArashiTheSkyAsunder extends CardImpl { this.toughness = new MageInt(5); // {X}{G}, {tap}: Arashi, the Sky Asunder deals X damage to target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArbalestElite.java b/Mage.Sets/src/mage/cards/a/ArbalestElite.java index cbfc402f640..4d1b1a099c6 100644 --- a/Mage.Sets/src/mage/cards/a/ArbalestElite.java +++ b/Mage.Sets/src/mage/cards/a/ArbalestElite.java @@ -31,7 +31,7 @@ public final class ArbalestElite extends CardImpl { this.toughness = new MageInt(3); // {2}{W}, {tap}: Arbalest Elite deals 3 damage to target attacking or blocking creature. Arbalest Elite doesn't untap during your next untap step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); ability.addEffect(new DontUntapInControllersNextUntapStepSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/a/ArborElf.java b/Mage.Sets/src/mage/cards/a/ArborElf.java index a7b929a211b..622a0479758 100644 --- a/Mage.Sets/src/mage/cards/a/ArborElf.java +++ b/Mage.Sets/src/mage/cards/a/ArborElf.java @@ -33,7 +33,7 @@ public final class ArborElf extends CardImpl { this.toughness = new MageInt(1); // (T): Untap target Forest. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); TargetLandPermanent target = new TargetLandPermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArcMage.java b/Mage.Sets/src/mage/cards/a/ArcMage.java index 238a6d65921..e4f001a97f5 100644 --- a/Mage.Sets/src/mage/cards/a/ArcMage.java +++ b/Mage.Sets/src/mage/cards/a/ArcMage.java @@ -29,7 +29,7 @@ public final class ArcMage extends CardImpl { this.toughness = new MageInt(2); // {2}{R}, {tap}, Discard a card: Arc Mage deals 2 damage divided as you choose among one or two targets. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageMultiEffect(2), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageMultiEffect(2), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetAnyTargetAmount(2)); diff --git a/Mage.Sets/src/mage/cards/a/ArcSlogger.java b/Mage.Sets/src/mage/cards/a/ArcSlogger.java index 7e88e10ad1e..913231fef26 100644 --- a/Mage.Sets/src/mage/cards/a/ArcSlogger.java +++ b/Mage.Sets/src/mage/cards/a/ArcSlogger.java @@ -29,7 +29,7 @@ public final class ArcSlogger extends CardImpl { this.toughness = new MageInt(5); // {R}, Exile the top ten cards of your library: Arc-Slogger deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new ExileFromTopOfLibraryCost(10)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index 3247fb35aec..096b66e2214 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -51,7 +51,7 @@ public final class ArcadesSabboth extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, filter, false))); // {W}: Arcades Sabboth gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private ArcadesSabboth(final ArcadesSabboth card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java b/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java index 6f102bd4d04..837fae6f4e2 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java @@ -32,14 +32,14 @@ public final class ArcaneSpyglass extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {T} , Sacrifice a land: Draw a card and put a charge counter on Arcane Spyglass. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()).concatBy("and")); this.addAbility(ability); // Remove three charge counters from Arcane Spyglass: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)))); } private ArcaneSpyglass(final ArcaneSpyglass card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java index 2baf093c3e7..ce2f31b936e 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java @@ -33,7 +33,7 @@ public final class ArcaneTeachings extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); Ability staticAbility = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); staticAbility.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA) .setText("and has \"" + gainedAbility.getRule("This creature") + '\"')); diff --git a/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java index a7b01c3e8ee..1754aacab16 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java +++ b/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java @@ -30,10 +30,10 @@ public final class ArcanisTheOmnipotent extends CardImpl { this.toughness = new MageInt(4); // Tap: Draw three cards. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(3), new TapSourceCost())); // {2}{U}{U}: Return Arcanis the Omnipotent to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}{U}"))); } private ArcanisTheOmnipotent(final ArcanisTheOmnipotent card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcboundRavager.java b/Mage.Sets/src/mage/cards/a/ArcboundRavager.java index 829e7f9a714..5f4c6ae493e 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundRavager.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundRavager.java @@ -35,7 +35,7 @@ public final class ArcboundRavager extends CardImpl { this.toughness = new MageInt(0); // Sacrifice an artifact: Put a +1/+1 counter on Arcbound Ravager. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(filter))); // Modular 1 this.addAbility(new ModularAbility(this, 1)); } diff --git a/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java b/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java index d1908d6da0f..1d1e07208a0 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java @@ -29,7 +29,7 @@ public final class ArcboundReclaimer extends CardImpl { this.toughness = new MageInt(0); // Remove a +1/+1 counter from Arcbound Reclaimer: Put target artifact card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArchersParapet.java b/Mage.Sets/src/mage/cards/a/ArchersParapet.java index 93aef7bf780..38c804160d1 100644 --- a/Mage.Sets/src/mage/cards/a/ArchersParapet.java +++ b/Mage.Sets/src/mage/cards/a/ArchersParapet.java @@ -31,7 +31,7 @@ public final class ArchersParapet extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // 1B, T: Each opponent loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeOpponentsEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/Archivist.java b/Mage.Sets/src/mage/cards/a/Archivist.java index 7034310161e..b0cde1b880f 100644 --- a/Mage.Sets/src/mage/cards/a/Archivist.java +++ b/Mage.Sets/src/mage/cards/a/Archivist.java @@ -27,7 +27,7 @@ public final class Archivist extends CardImpl { this.toughness = new MageInt(1); //{T}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost())); } private Archivist(final Archivist card) { diff --git a/Mage.Sets/src/mage/cards/a/Arena.java b/Mage.Sets/src/mage/cards/a/Arena.java index ad799899172..2dffd133511 100644 --- a/Mage.Sets/src/mage/cards/a/Arena.java +++ b/Mage.Sets/src/mage/cards/a/Arena.java @@ -28,7 +28,7 @@ public final class Arena extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // {3}, {tap}: Tap target creature you control and target creature of an opponent's choice they control. Those creatures fight each other. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ArenaEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new ArenaEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addTarget(new TargetOpponentsChoicePermanent(1, 1, new FilterControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java b/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java index e11084b50ad..13a3ab31595 100644 --- a/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java +++ b/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java @@ -37,7 +37,7 @@ public final class ArgivianBlacksmith extends CardImpl { this.toughness = new MageInt(2); // {tap}: Prevent the next 2 damage that would be dealt to target artifact creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArgothianElder.java b/Mage.Sets/src/mage/cards/a/ArgothianElder.java index 2769f0b3e01..838ca102ef7 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianElder.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianElder.java @@ -29,7 +29,7 @@ public final class ArgothianElder extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetLandPermanent(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArguelsBloodFast.java b/Mage.Sets/src/mage/cards/a/ArguelsBloodFast.java index e8d0fa44286..d6966008224 100644 --- a/Mage.Sets/src/mage/cards/a/ArguelsBloodFast.java +++ b/Mage.Sets/src/mage/cards/a/ArguelsBloodFast.java @@ -29,7 +29,7 @@ public final class ArguelsBloodFast extends CardImpl { this.secondSideCardClazz = mage.cards.t.TempleOfAclazotz.class; // {1}{B}, Pay 2 life: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArkOfBlight.java b/Mage.Sets/src/mage/cards/a/ArkOfBlight.java index 2345cd8e47a..643b4888395 100644 --- a/Mage.Sets/src/mage/cards/a/ArkOfBlight.java +++ b/Mage.Sets/src/mage/cards/a/ArkOfBlight.java @@ -24,7 +24,7 @@ public final class ArkOfBlight extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}, Sacrifice Ark of Blight: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/a/Armistice.java b/Mage.Sets/src/mage/cards/a/Armistice.java index 077f854ced8..1d3a19b1d93 100644 --- a/Mage.Sets/src/mage/cards/a/Armistice.java +++ b/Mage.Sets/src/mage/cards/a/Armistice.java @@ -27,7 +27,7 @@ public final class Armistice extends CardImpl { // {3}{W}{W}: You draw a card and target opponent gains 3 life. Effect effect = new DrawCardSourceControllerEffect(1); effect.setText("You draw a card"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{W}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{W}{W}")); effect = new GainLifeTargetEffect(3); effect.setText("and target opponent gains 3 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java index f9ee8e5f6d7..4c023d71b98 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java @@ -34,7 +34,7 @@ public final class ArmorOfFaith extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {W}: Enchanted creature gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private ArmorOfFaith(final ArmorOfFaith card) { diff --git a/Mage.Sets/src/mage/cards/a/ArmorSliver.java b/Mage.Sets/src/mage/cards/a/ArmorSliver.java index 716d1c76dde..69351dafa43 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorSliver.java +++ b/Mage.Sets/src/mage/cards/a/ArmorSliver.java @@ -29,7 +29,7 @@ public final class ArmorSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( - new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn).setText("this creature gets +0/+1 until end of turn"), + new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn).setText("this creature gets +0/+1 until end of turn"), new GenericManaCost(2)), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmorThrull.java b/Mage.Sets/src/mage/cards/a/ArmorThrull.java index 4edc31651d7..7c5b0133e27 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorThrull.java +++ b/Mage.Sets/src/mage/cards/a/ArmorThrull.java @@ -29,7 +29,7 @@ public final class ArmorThrull extends CardImpl { this.toughness = new MageInt(3); // {T}, Sacrifice Armor Thrull: Put a +1/+2 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P2.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P2.createInstance()), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java b/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java index a58072b5160..a76f4828b05 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java @@ -32,12 +32,12 @@ public final class ArmoredGuardian extends CardImpl { this.toughness = new MageInt(5); // {1}{W}{W}: Target creature you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{W}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // {1}{U}{U}: Armored Guardian gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java b/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java index a8bc8c09f24..a3c04cca609 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java +++ b/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java @@ -30,13 +30,13 @@ public final class ArmorerGuildmage extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {G}, {tap}: Target creature gets +0/+1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -50,4 +50,4 @@ public final class ArmorerGuildmage extends CardImpl { public ArmorerGuildmage copy() { return new ArmorerGuildmage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java b/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java index 225b6ca7cd6..c68c2fd90d7 100644 --- a/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java +++ b/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java @@ -27,7 +27,7 @@ public final class ArnjlotsAscent extends CardImpl { // Cumulative upkeep {U} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{U}"))); // {1}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java b/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java index a1528c48cef..0d98a37d7dc 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java @@ -32,7 +32,7 @@ public final class ArtificersIntuition extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // {U}, Discard an artifact card: Search your library for an artifact card with converted mana cost 1 or less, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{U}")); ability.addCost(new DiscardCardCost(StaticFilters.FILTER_CARD_ARTIFACT_AN)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java b/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java index 52383708bdc..f9204066c0d 100644 --- a/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java +++ b/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java @@ -44,13 +44,13 @@ public final class AryelKnightOfWindgrace extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {2}{W}, {T}: Create a 2/2 white Knight creature token with vigilance. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KnightToken()), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new KnightToken()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {B}, {T}, Tap X untapped Knights you control: Destroy target creature with power X or less. //Simple costs - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect() + ability = new SimpleActivatedAbility(new DestroyTargetEffect() .setText("Destroy target creature with power X or less"), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapVariableTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/a/Asceticism.java b/Mage.Sets/src/mage/cards/a/Asceticism.java index 2a8cadce8d1..12634aa6cfb 100644 --- a/Mage.Sets/src/mage/cards/a/Asceticism.java +++ b/Mage.Sets/src/mage/cards/a/Asceticism.java @@ -29,7 +29,7 @@ public final class Asceticism extends CardImpl { this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {1}{G}: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AshenFirebeast.java b/Mage.Sets/src/mage/cards/a/AshenFirebeast.java index fdf7d0bfc5a..feed1e56ef5 100644 --- a/Mage.Sets/src/mage/cards/a/AshenFirebeast.java +++ b/Mage.Sets/src/mage/cards/a/AshenFirebeast.java @@ -36,7 +36,7 @@ public final class AshenFirebeast extends CardImpl { this.toughness = new MageInt(6); // {1}{R}: Ashen Firebeast deals 1 damage to each creature without flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new ManaCostsImpl<>("{1}{R}"))); } private AshenFirebeast(final AshenFirebeast card) { diff --git a/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java b/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java index 74730f8bfb0..c1752ef7c31 100644 --- a/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java +++ b/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java @@ -28,7 +28,7 @@ public final class AshnodsBattleGear extends CardImpl { // You may choose not to untap Ashnod's Battle Gear during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: Target creature you control gets +2/-2 for as long as Ashnod's Battle Gear remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, -2, Duration.Custom), SourceTappedCondition.TAPPED, "target creature you control gets +2/-2 for as long as {this} remains tapped"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AshnodsCylix.java b/Mage.Sets/src/mage/cards/a/AshnodsCylix.java index 4a2119641ef..aa6086e9723 100644 --- a/Mage.Sets/src/mage/cards/a/AshnodsCylix.java +++ b/Mage.Sets/src/mage/cards/a/AshnodsCylix.java @@ -31,7 +31,7 @@ public final class AshnodsCylix extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {T}: Target player looks at the top three cards of their library, puts one of them back on top of their library, then exiles the rest. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AshnodsCylixEffect(), new GenericManaCost(3)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new AshnodsCylixEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java b/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java index d03fb9e7299..d0a58762aa3 100644 --- a/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java +++ b/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java @@ -36,7 +36,7 @@ public final class AshnodsTransmogrant extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {T}, Sacrifice Ashnod's Transmogrant: Put a +1/+1 counter on target nonartifact creature. That creature becomes an artifact in addition to its other types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); Effect effect = new AddCardTypeTargetEffect(Duration.WhileOnBattlefield, CardType.ARTIFACT); effect.setText("That creature becomes an artifact in addition to its other types"); diff --git a/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java b/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java index 401b90b2878..f242e72c52a 100644 --- a/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java +++ b/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java @@ -27,7 +27,7 @@ public final class AsphodelWanderer extends CardImpl { this.toughness = new MageInt(1); // {2}{B}: Regenerate Asphodel Wanderer. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private AsphodelWanderer(final AsphodelWanderer card) { diff --git a/Mage.Sets/src/mage/cards/a/AssaultFormation.java b/Mage.Sets/src/mage/cards/a/AssaultFormation.java index e2ba98baffc..5b4e7179c4c 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultFormation.java +++ b/Mage.Sets/src/mage/cards/a/AssaultFormation.java @@ -37,12 +37,12 @@ public final class AssaultFormation extends CardImpl { this.addAbility(new SimpleStaticAbility(new CombatDamageByToughnessControlledEffect())); // {G}: Target creature with defender can attack this turn as though it didn't have defender. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new CanAttackAsThoughItDidntHaveDefenderTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {2}{G}: Creatures you control get +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java index a579a801088..b44256cde3c 100644 --- a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java +++ b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java @@ -36,7 +36,7 @@ public final class AssemblyWorker extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target Assembly-Worker creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java index 455024ec04f..9b9a981b9e9 100644 --- a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java +++ b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java @@ -43,7 +43,7 @@ public final class AtalyaSamiteMaster extends CardImpl { // {X}, {tap}: Choose one - Prevent the next X damage that would be dealt to target creature this turn; or you gain X life. Spend only white mana on X. PreventDamageToTargetEffect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, false, true, GetXValue.instance); effect.setText("Prevent the next X damage that would be dealt to target creature this turn. Spend only white mana on X."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java index 7740062c8a6..65dd23c23c9 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java @@ -30,7 +30,7 @@ public final class AtarkaMonument extends CardImpl { this.addAbility(new GreenManaAbility()); // {4}{R}{G}: Atarka Monument becomes a 4/4 red and green Dragon artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(4, 4, "4/4 red and green Dragon artifact creature with flying") .withColor("RG") .withSubType(SubType.DRAGON) diff --git a/Mage.Sets/src/mage/cards/a/Attunement.java b/Mage.Sets/src/mage/cards/a/Attunement.java index 131a9d56ccf..ca12c972a34 100644 --- a/Mage.Sets/src/mage/cards/a/Attunement.java +++ b/Mage.Sets/src/mage/cards/a/Attunement.java @@ -20,7 +20,7 @@ public final class Attunement extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // Return Attunement to its owner's hand: Draw three cards, then discard four cards. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new ReturnToHandFromBattlefieldSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(3), new ReturnToHandFromBattlefieldSourceCost()); ability.addEffect(new DiscardControllerEffect(4).concatBy(", then")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AtzalCaveOfEternity.java b/Mage.Sets/src/mage/cards/a/AtzalCaveOfEternity.java index 736b79fb0ca..73362456eba 100644 --- a/Mage.Sets/src/mage/cards/a/AtzalCaveOfEternity.java +++ b/Mage.Sets/src/mage/cards/a/AtzalCaveOfEternity.java @@ -34,7 +34,7 @@ public final class AtzalCaveOfEternity extends CardImpl { this.addAbility(new AnyColorManaAbility()); // {3}{B}{G}, {T}: Return target creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{3}{B}{G}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{3}{B}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AtzocanSeer.java b/Mage.Sets/src/mage/cards/a/AtzocanSeer.java index 2eef48c0d90..348db1eed3f 100644 --- a/Mage.Sets/src/mage/cards/a/AtzocanSeer.java +++ b/Mage.Sets/src/mage/cards/a/AtzocanSeer.java @@ -39,7 +39,7 @@ public final class AtzocanSeer extends CardImpl { this.addAbility(new AnyColorManaAbility()); // Sacrifice Atzocan Seer: Return target Dinosaur from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java b/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java index 6e133f73db0..3459457ddbf 100644 --- a/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java @@ -27,7 +27,7 @@ public final class AugmentingAutomaton extends CardImpl { this.toughness = new MageInt(1); // {1}{B}: Augmenting Automaton gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private AugmentingAutomaton(final AugmentingAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java b/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java index 90461ff162f..249ab1a1faa 100644 --- a/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java +++ b/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java @@ -33,7 +33,7 @@ public final class AugurOfSkulls extends CardImpl { this.toughness = new MageInt(1); // {1}{B}: Regenerate Augur of Skulls. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); // Sacrifice Augur of Skulls: Target player discards two cards. Activate this ability only during your upkeep. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), diff --git a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java index 8ce2069ff37..9b68395a9f7 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java @@ -42,7 +42,7 @@ public final class AuraOfDominion extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new UntapAttachedEffect(), new GenericManaCost(1)); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java index 7431846b325..42948cc426c 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java @@ -38,7 +38,7 @@ public final class AuraOfSilence extends CardImpl { this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(2, filter, TargetController.OPPONENT))); // Sacrifice Aura of Silence: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/Auratog.java b/Mage.Sets/src/mage/cards/a/Auratog.java index 0425f2cff93..990ebe99f83 100644 --- a/Mage.Sets/src/mage/cards/a/Auratog.java +++ b/Mage.Sets/src/mage/cards/a/Auratog.java @@ -33,7 +33,7 @@ public final class Auratog extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); } private Auratog(final Auratog card) { diff --git a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java index 6da02d3abae..ec6a51dbb9f 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java @@ -38,7 +38,7 @@ public final class AuriokSalvagers extends CardImpl { this.toughness = new MageInt(4); // {1}{W}: Return target artifact card with converted mana cost 1 or less from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(),new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(),new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java b/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java index 63f5b4c3e53..84a6d232c94 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java +++ b/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java @@ -35,7 +35,7 @@ public final class AuriokTransfixer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java index d46c0e41d9c..1af05214e72 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java +++ b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java @@ -42,7 +42,7 @@ public final class AuriokWindwalker extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {T}: Attach target Equipment you control to target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachTargetEquipmentEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AttachTargetEquipmentEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java index b1a3d8d7fc2..da5f5abe6bf 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java +++ b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java @@ -29,7 +29,7 @@ public final class AuroraEidolon extends CardImpl { this.toughness = new MageInt(2); // {W}, Sacrifice Aurora Eidolon: Prevent the next 3 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AuroraGriffin.java b/Mage.Sets/src/mage/cards/a/AuroraGriffin.java index 63051e05310..bf61529d3f1 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraGriffin.java +++ b/Mage.Sets/src/mage/cards/a/AuroraGriffin.java @@ -32,7 +32,7 @@ public final class AuroraGriffin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {W}: Target permanent becomes white until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.WHITE, + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AutumnWillow.java b/Mage.Sets/src/mage/cards/a/AutumnWillow.java index 1553fb566db..a85dc1b5875 100644 --- a/Mage.Sets/src/mage/cards/a/AutumnWillow.java +++ b/Mage.Sets/src/mage/cards/a/AutumnWillow.java @@ -32,7 +32,7 @@ public final class AutumnWillow extends CardImpl { this.addAbility(ShroudAbility.getInstance()); // {G}: Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AutumnWillowEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new AutumnWillowEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AutumnalGloom.java b/Mage.Sets/src/mage/cards/a/AutumnalGloom.java index 97d6596861d..68f7ec457de 100644 --- a/Mage.Sets/src/mage/cards/a/AutumnalGloom.java +++ b/Mage.Sets/src/mage/cards/a/AutumnalGloom.java @@ -28,7 +28,7 @@ public final class AutumnalGloom extends CardImpl { this.secondSideCardClazz = mage.cards.a.AncientOfTheEquinox.class; // {B}: Put the top card of your library into your graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsControllerEffect(1), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new MillCardsControllerEffect(1), new ManaCostsImpl<>("{B}"))); // Delirium — At the beginning of your end step, if there are four or more card types among cards in your graveyard, transform Autumnal Gloom. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java index 1fa1422bbfd..889728f9d37 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java +++ b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java @@ -37,7 +37,7 @@ public final class AvacynianPriest extends CardImpl { this.toughness = new MageInt(2); // {1}, {T}: Tap target non-Human creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AvariceTotem.java b/Mage.Sets/src/mage/cards/a/AvariceTotem.java index 5fb073015a0..2e84e82525c 100644 --- a/Mage.Sets/src/mage/cards/a/AvariceTotem.java +++ b/Mage.Sets/src/mage/cards/a/AvariceTotem.java @@ -24,7 +24,7 @@ public final class AvariceTotem extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {5}: Exchange control of Avarice Totem and target nonland permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExchangeControlTargetEffect(Duration.EndOfGame, rule, true), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new ExchangeControlTargetEffect(Duration.EndOfGame, rule, true), new ManaCostsImpl<>("{5}")); ability.addTarget(new TargetNonlandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfFury.java b/Mage.Sets/src/mage/cards/a/AvatarOfFury.java index bcdd9b609c0..48dcfac5e6d 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfFury.java @@ -53,7 +53,7 @@ public final class AvatarOfFury extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Avatar of Fury 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 AvatarOfFury(final AvatarOfFury card) { diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java b/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java index 31a47150ab3..d8ba2995048 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java @@ -47,7 +47,7 @@ public final class AvatarOfWoe extends CardImpl { this.addAbility(FearAbility.getInstance()); // {T}: 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/a/AvenArcher.java b/Mage.Sets/src/mage/cards/a/AvenArcher.java index f40913eb9aa..13b019c6f47 100644 --- a/Mage.Sets/src/mage/cards/a/AvenArcher.java +++ b/Mage.Sets/src/mage/cards/a/AvenArcher.java @@ -36,7 +36,7 @@ public final class AvenArcher extends CardImpl { // {2}{W}, {tap}: Aven Archer deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AvenFateshaper.java b/Mage.Sets/src/mage/cards/a/AvenFateshaper.java index 821ca1d8a55..8e83c282b0e 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFateshaper.java +++ b/Mage.Sets/src/mage/cards/a/AvenFateshaper.java @@ -32,7 +32,7 @@ public final class AvenFateshaper extends CardImpl { // When Aven Fateshaper enters the battlefield, look at the top four cards of your library, then put them back in any order. this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryControllerEffect(4))); // {4}{U}: Look at the top four cards of your library, then put them back in any order. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(4), new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(4), new ManaCostsImpl<>("{4}{U}"))); } private AvenFateshaper(final AvenFateshaper card) { diff --git a/Mage.Sets/src/mage/cards/a/AvenFlock.java b/Mage.Sets/src/mage/cards/a/AvenFlock.java index 2d3393f5477..4e9827f470a 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFlock.java +++ b/Mage.Sets/src/mage/cards/a/AvenFlock.java @@ -31,7 +31,7 @@ public final class AvenFlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {W}: Aven Flock gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private AvenFlock(final AvenFlock card) { diff --git a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java index c21e4352426..46c78cced25 100644 --- a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java +++ b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java @@ -33,7 +33,7 @@ public final class AvenRedeemer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {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 TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java index 2a30d6f84ec..b2838c20677 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java +++ b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java @@ -46,7 +46,7 @@ public final class AvenSoulgazer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}{W}: Look at target face-down creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AvenSoulgazerLookFaceDownEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new AvenSoulgazerLookFaceDownEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AvenTrooper.java b/Mage.Sets/src/mage/cards/a/AvenTrooper.java index c1dd396887e..e6854ed330e 100644 --- a/Mage.Sets/src/mage/cards/a/AvenTrooper.java +++ b/Mage.Sets/src/mage/cards/a/AvenTrooper.java @@ -32,7 +32,7 @@ public final class AvenTrooper extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{W}, Discard a card: Aven Trooper gets +1/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AvengerEnDal.java b/Mage.Sets/src/mage/cards/a/AvengerEnDal.java index f53dbeed8e6..817b4184dbc 100644 --- a/Mage.Sets/src/mage/cards/a/AvengerEnDal.java +++ b/Mage.Sets/src/mage/cards/a/AvengerEnDal.java @@ -34,7 +34,7 @@ public final class AvengerEnDal extends CardImpl { this.toughness = new MageInt(1); // {2}{W}, {T}, Discard a card: Exile target attacking creature. Its controller gains life equal to its toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetAttackingCreature()); diff --git a/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java b/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java index e9facffe344..40acfd9d34f 100644 --- a/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java +++ b/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java @@ -43,7 +43,7 @@ public final class AyeshaTanaka extends CardImpl { this.addAbility(BandingAbility.getInstance()); // {T}: Counter target activated ability from an artifact source unless that ability's controller pays {W}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{W}")), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{W}")), new TapSourceCost()); ability.addTarget(new TargetActivatedAbility(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java b/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java index 1a169a6b658..69dbeb75a4d 100644 --- a/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java @@ -42,7 +42,7 @@ public final class AyliEternalPilgrim extends CardImpl { // {1}, Sacrifice another creature: You gain life equal to the sacrificed creature's toughness. Effect effect = new GainLifeEffect(SacrificeCostCreaturesToughness.instance); effect.setText("You gain life equal to the sacrificed creature's toughness"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java b/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java index 81a81d256f5..4c6b5280596 100644 --- a/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java +++ b/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java @@ -37,7 +37,7 @@ public final class AysenBureaucrats extends CardImpl { this.toughness = new MageInt(1); // {tap}: Tap target creature with power 2 or less. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java index cd8799b2184..f2f65e90e82 100644 --- a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java @@ -39,7 +39,7 @@ public final class AzamiLadyOfScrolls extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped Wizard you control: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); } private AzamiLadyOfScrolls(final AzamiLadyOfScrolls card) { diff --git a/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java b/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java index d46de766757..74e2f21f24b 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java @@ -32,7 +32,7 @@ public final class AzoriusCluestone extends CardImpl { this.addAbility(new BlueManaAbility()); // {W}{U}, {T}, Sacrifice Azorius Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java b/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java index ef88cf6f7f2..6c22527c7fb 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java @@ -30,12 +30,12 @@ public final class AzoriusGuildmage extends CardImpl { this.toughness = new MageInt(2); // {2}{W}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}{U}: Counter target activated ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetActivatedAbility()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java index e54e8ac354c..2986c5d8025 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java @@ -30,7 +30,7 @@ public final class AzoriusKeyrune extends CardImpl { this.addAbility(new BlueManaAbility()); // {W}{U}: Azorius Keyrune becomes a 2/2 white and blue Bird artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(2, 2, "2/2 white and blue Bird artifact creature with flying") .withColor("WU") .withSubType(SubType.BIRD) diff --git a/Mage.Sets/src/mage/cards/a/AzoriusLocket.java b/Mage.Sets/src/mage/cards/a/AzoriusLocket.java index 2b1b832fff4..fbd1aff7efa 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusLocket.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusLocket.java @@ -28,7 +28,7 @@ public final class AzoriusLocket extends CardImpl { this.addAbility(new BlueManaAbility()); // {W/U}{W/U}{W/U}{W/U}, {T}, Sacrifice Azorius Locket: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{W/U}{W/U}{W/U}{W/U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{W/U}{W/U}{W/U}{W/U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AzorsGateway.java b/Mage.Sets/src/mage/cards/a/AzorsGateway.java index 8c92beb50f6..a5c4062569b 100644 --- a/Mage.Sets/src/mage/cards/a/AzorsGateway.java +++ b/Mage.Sets/src/mage/cards/a/AzorsGateway.java @@ -42,7 +42,7 @@ public final class AzorsGateway extends CardImpl { // If cards with five or more different converted mana costs are exiled with Azor's Gateway, // you gain 5 life, untap Azor's Gateway, and transform it. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AzorsGatewayEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AzorsGatewayEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AzureMage.java b/Mage.Sets/src/mage/cards/a/AzureMage.java index ea2922c252c..1444c647fb1 100644 --- a/Mage.Sets/src/mage/cards/a/AzureMage.java +++ b/Mage.Sets/src/mage/cards/a/AzureMage.java @@ -25,7 +25,7 @@ public final class AzureMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}"))); } private AzureMage(final AzureMage card) { -- 2.47.2 From ecdbacc107eb9557f4775e14884f6dc9114c1cf7 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:25:54 -0500 Subject: [PATCH 29/50] refactor: SimpleActivatedAbility default zone (cards B) --- Mage.Sets/src/mage/cards/b/BakuAltar.java | 2 +- Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java | 2 +- Mage.Sets/src/mage/cards/b/BalduvianConjurer.java | 2 +- Mage.Sets/src/mage/cards/b/BalduvianDead.java | 2 +- Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java | 2 +- Mage.Sets/src/mage/cards/b/BalduvianHydra.java | 2 +- Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java | 2 +- Mage.Sets/src/mage/cards/b/BallistaSquad.java | 2 +- Mage.Sets/src/mage/cards/b/BalloonPeddler.java | 2 +- Mage.Sets/src/mage/cards/b/BallynockTrapper.java | 2 +- Mage.Sets/src/mage/cards/b/BalmOfRestoration.java | 2 +- Mage.Sets/src/mage/cards/b/BalshanCollaborator.java | 2 +- Mage.Sets/src/mage/cards/b/BalshanGriffin.java | 2 +- Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java | 2 +- Mage.Sets/src/mage/cards/b/BanewhipPunisher.java | 2 +- Mage.Sets/src/mage/cards/b/BanishingKnack.java | 2 +- Mage.Sets/src/mage/cards/b/Banshee.java | 2 +- Mage.Sets/src/mage/cards/b/BantBattlemage.java | 4 ++-- Mage.Sets/src/mage/cards/b/BantPanorama.java | 2 +- Mage.Sets/src/mage/cards/b/BarbarianLunatic.java | 2 +- Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java | 2 +- Mage.Sets/src/mage/cards/b/BarbedField.java | 2 +- Mage.Sets/src/mage/cards/b/BarbedSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BarlsCage.java | 2 +- Mage.Sets/src/mage/cards/b/BaronSengir.java | 2 +- Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java | 2 +- Mage.Sets/src/mage/cards/b/BarrageOgre.java | 2 +- Mage.Sets/src/mage/cards/b/BarrageTyrant.java | 2 +- Mage.Sets/src/mage/cards/b/BarrentonMedic.java | 4 ++-- Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java | 2 +- Mage.Sets/src/mage/cards/b/BarrinsCodex.java | 2 +- Mage.Sets/src/mage/cards/b/BasaltGargoyle.java | 2 +- Mage.Sets/src/mage/cards/b/BasaltMonolith.java | 2 +- Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java | 2 +- Mage.Sets/src/mage/cards/b/BastionMastodon.java | 2 +- Mage.Sets/src/mage/cards/b/BatonOfCourage.java | 2 +- Mage.Sets/src/mage/cards/b/BatonOfMorale.java | 2 +- Mage.Sets/src/mage/cards/b/Batterskull.java | 2 +- Mage.Sets/src/mage/cards/b/BattlefieldPercher.java | 2 +- Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java | 2 +- Mage.Sets/src/mage/cards/b/BazaarTrader.java | 2 +- Mage.Sets/src/mage/cards/b/BeaconBehemoth.java | 2 +- Mage.Sets/src/mage/cards/b/BeaconHawk.java | 2 +- Mage.Sets/src/mage/cards/b/BeaconOfDestiny.java | 2 +- Mage.Sets/src/mage/cards/b/Bearscape.java | 2 +- Mage.Sets/src/mage/cards/b/BeastWalkers.java | 2 +- Mage.Sets/src/mage/cards/b/BelisariusCawl.java | 4 ++-- Mage.Sets/src/mage/cards/b/BellowsLizard.java | 2 +- Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java | 2 +- Mage.Sets/src/mage/cards/b/BenalishHeralds.java | 2 +- Mage.Sets/src/mage/cards/b/BenalishMissionary.java | 2 +- Mage.Sets/src/mage/cards/b/BenalishTrapper.java | 2 +- Mage.Sets/src/mage/cards/b/BenevolentAncestor.java | 2 +- Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java | 2 +- Mage.Sets/src/mage/cards/b/Benthicore.java | 4 ++-- Mage.Sets/src/mage/cards/b/BidentOfThassa.java | 2 +- Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java | 2 +- Mage.Sets/src/mage/cards/b/BileUrchin.java | 2 +- Mage.Sets/src/mage/cards/b/BirthingHulk.java | 2 +- Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java | 2 +- Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java | 2 +- Mage.Sets/src/mage/cards/b/BladedSentinel.java | 2 +- Mage.Sets/src/mage/cards/b/BladewingTheRisen.java | 2 +- Mage.Sets/src/mage/cards/b/BlasterMage.java | 2 +- Mage.Sets/src/mage/cards/b/BlastingStation.java | 2 +- Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java | 2 +- Mage.Sets/src/mage/cards/b/BlazingHellhound.java | 2 +- Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java | 2 +- Mage.Sets/src/mage/cards/b/BlightKeeper.java | 2 +- Mage.Sets/src/mage/cards/b/BlightMamba.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedBat.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedCataract.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedShaman.java | 4 ++-- Mage.Sets/src/mage/cards/b/Blightspeaker.java | 2 +- Mage.Sets/src/mage/cards/b/BlindSeer.java | 2 +- Mage.Sets/src/mage/cards/b/BlindingDrone.java | 2 +- Mage.Sets/src/mage/cards/b/BlindingMage.java | 2 +- Mage.Sets/src/mage/cards/b/BlinkingSpirit.java | 2 +- Mage.Sets/src/mage/cards/b/BlinkmothNexus.java | 4 ++-- Mage.Sets/src/mage/cards/b/BlinkmothWell.java | 2 +- Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java | 2 +- Mage.Sets/src/mage/cards/b/BlizzardElemental.java | 2 +- Mage.Sets/src/mage/cards/b/Blockbuster.java | 2 +- Mage.Sets/src/mage/cards/b/BloodChinFanatic.java | 2 +- Mage.Sets/src/mage/cards/b/BloodCultist.java | 2 +- Mage.Sets/src/mage/cards/b/BloodHost.java | 2 +- Mage.Sets/src/mage/cards/b/BloodRites.java | 2 +- Mage.Sets/src/mage/cards/b/BloodfireColossus.java | 2 +- Mage.Sets/src/mage/cards/b/BloodfireDwarf.java | 2 +- Mage.Sets/src/mage/cards/b/BloodfireInfusion.java | 2 +- Mage.Sets/src/mage/cards/b/BloodfireKavu.java | 2 +- Mage.Sets/src/mage/cards/b/BloodfireMentor.java | 2 +- Mage.Sets/src/mage/cards/b/BloodletterQuill.java | 2 +- Mage.Sets/src/mage/cards/b/BloodlineKeeper.java | 2 +- Mage.Sets/src/mage/cards/b/BloodlineShaman.java | 2 +- Mage.Sets/src/mage/cards/b/BloodlustInciter.java | 2 +- Mage.Sets/src/mage/cards/b/BloodriteInvoker.java | 2 +- Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java | 2 +- Mage.Sets/src/mage/cards/b/BloodthroneVampire.java | 2 +- Mage.Sets/src/mage/cards/b/BlossomDryad.java | 2 +- Mage.Sets/src/mage/cards/b/BoaConstrictor.java | 2 +- Mage.Sets/src/mage/cards/b/BogGlider.java | 2 +- Mage.Sets/src/mage/cards/b/BoggartArsonists.java | 2 +- Mage.Sets/src/mage/cards/b/BoggartForager.java | 2 +- Mage.Sets/src/mage/cards/b/BoggartLoggers.java | 2 +- Mage.Sets/src/mage/cards/b/BolaWarrior.java | 2 +- Mage.Sets/src/mage/cards/b/BoldImpaler.java | 2 +- Mage.Sets/src/mage/cards/b/BombSquad.java | 2 +- Mage.Sets/src/mage/cards/b/BondedFetch.java | 2 +- Mage.Sets/src/mage/cards/b/BoneFlute.java | 2 +- Mage.Sets/src/mage/cards/b/Boneknitter.java | 2 +- Mage.Sets/src/mage/cards/b/BoneyardDesecrator.java | 2 +- Mage.Sets/src/mage/cards/b/BookOfRass.java | 2 +- Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java | 2 +- Mage.Sets/src/mage/cards/b/BorealGriffin.java | 2 +- Mage.Sets/src/mage/cards/b/BorisDevilboon.java | 2 +- Mage.Sets/src/mage/cards/b/BorosCluestone.java | 2 +- Mage.Sets/src/mage/cards/b/BorosGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/b/BorosKeyrune.java | 2 +- Mage.Sets/src/mage/cards/b/BoshIronGolem.java | 2 +- Mage.Sets/src/mage/cards/b/BosiumStrip.java | 2 +- Mage.Sets/src/mage/cards/b/BottleGnomes.java | 2 +- Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java | 2 +- Mage.Sets/src/mage/cards/b/BountyCollector.java | 2 +- Mage.Sets/src/mage/cards/b/BountyHunter.java | 4 ++-- Mage.Sets/src/mage/cards/b/BountySniper.java | 2 +- Mage.Sets/src/mage/cards/b/BountySpotter.java | 2 +- Mage.Sets/src/mage/cards/b/BraidwoodCup.java | 2 +- Mage.Sets/src/mage/cards/b/BraidwoodSextant.java | 2 +- Mage.Sets/src/mage/cards/b/BrassSecretary.java | 2 +- Mage.Sets/src/mage/cards/b/BrassSquire.java | 2 +- Mage.Sets/src/mage/cards/b/BrassTalonChimera.java | 2 +- Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java | 2 +- Mage.Sets/src/mage/cards/b/Breathstealer.java | 2 +- Mage.Sets/src/mage/cards/b/BriarShield.java | 2 +- Mage.Sets/src/mage/cards/b/BribersPurse.java | 2 +- Mage.Sets/src/mage/cards/b/BrimstoneMage.java | 4 ++-- Mage.Sets/src/mage/cards/b/BrindleBoar.java | 2 +- Mage.Sets/src/mage/cards/b/BristlingHydra.java | 2 +- Mage.Sets/src/mage/cards/b/BrittleEffigy.java | 2 +- Mage.Sets/src/mage/cards/b/BrokenFall.java | 2 +- Mage.Sets/src/mage/cards/b/BroodButcher.java | 2 +- Mage.Sets/src/mage/cards/b/BrothersOfFire.java | 2 +- Mage.Sets/src/mage/cards/b/BrownOuphe.java | 2 +- Mage.Sets/src/mage/cards/b/Browse.java | 2 +- Mage.Sets/src/mage/cards/b/BrutalDeceiver.java | 2 +- Mage.Sets/src/mage/cards/b/BubblingCauldron.java | 4 ++-- Mage.Sets/src/mage/cards/b/BudokaGardener.java | 4 ++-- Mage.Sets/src/mage/cards/b/Bullwhip.java | 2 +- Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java | 2 +- Mage.Sets/src/mage/cards/b/BurningAnger.java | 2 +- Mage.Sets/src/mage/cards/b/BurningFistMinotaur.java | 2 +- Mage.Sets/src/mage/cards/b/BurningShieldAskari.java | 2 +- Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java | 4 ++-- Mage.Sets/src/mage/cards/b/BurrGrafter.java | 2 +- Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java | 2 +- 156 files changed, 168 insertions(+), 168 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BakuAltar.java b/Mage.Sets/src/mage/cards/b/BakuAltar.java index d0bb684ee49..5ef5bead80f 100644 --- a/Mage.Sets/src/mage/cards/b/BakuAltar.java +++ b/Mage.Sets/src/mage/cards/b/BakuAltar.java @@ -29,7 +29,7 @@ public final class BakuAltar extends CardImpl { // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Baku Altar. this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance(1)), StaticFilters.FILTER_SPIRIT_OR_ARCANE_CARD, true)); // {2}, {tap}, Remove a ki counter from Baku Altar: Create a 1/1 colorless Spirit creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritToken(), 1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SpiritToken(), 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.KI.createInstance(1))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java index 34ad281c55f..ce4ee20318c 100644 --- a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java +++ b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java @@ -42,7 +42,7 @@ public final class BalanWanderingKnight extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {1}{W}: Attach all Equipment you control to Balan. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalanWanderingKnightEffect(), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BalanWanderingKnightEffect(), new ManaCostsImpl<>("{1}{W}"))); } private BalanWanderingKnight(final BalanWanderingKnight card) { diff --git a/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java b/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java index 2258b7a0985..6ea42c3b844 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java @@ -35,7 +35,7 @@ public final class BalduvianConjurer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target snow land becomes a 2/2 creature until end of turn. It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new CreatureToken(2, 2), false, true, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect(new CreatureToken(2, 2), false, true, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BalduvianDead.java b/Mage.Sets/src/mage/cards/b/BalduvianDead.java index 1b4a965b1ab..eba2099b493 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianDead.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianDead.java @@ -37,7 +37,7 @@ public final class BalduvianDead extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, Exile a creature card from your graveyard: Create a 3/1 black and red Graveborn creature token with haste. Sacrifice it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalduvianDeadEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new BalduvianDeadEffect(), new ManaCostsImpl<>("{2}{R}")); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE); ability.addCost(new ExileFromGraveCost(target)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java b/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java index 2886af2c475..a9db98edee9 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java @@ -36,7 +36,7 @@ public final class BalduvianFrostwaker extends CardImpl { this.toughness = new MageInt(1); // {U}, {T}: Target snow land becomes a 2/2 blue Elemental creature with flying. It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new BalduvianFrostwakerToken(), false, true, Duration.Custom), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect(new BalduvianFrostwakerToken(), false, true, Duration.Custom), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BalduvianHydra.java b/Mage.Sets/src/mage/cards/b/BalduvianHydra.java index dbd652053b9..a73a65fe5af 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianHydra.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianHydra.java @@ -35,7 +35,7 @@ public final class BalduvianHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P0.createInstance()))); // Remove a +1/+0 counter from Balduvian Hydra: Prevent the next 1 damage that would be dealt to Balduvian Hydra this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new RemoveCountersSourceCost(CounterType.P1P0.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new RemoveCountersSourceCost(CounterType.P1P0.createInstance()))); // {R}{R}{R}: Put a +1/+0 counter on Balduvian Hydra. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P0.createInstance(1)), new ManaCostsImpl<>("{R}{R}{R}"), new IsStepCondition(PhaseStep.UPKEEP), null)); diff --git a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java index 66d6621a12e..49b1666a4b7 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java @@ -45,7 +45,7 @@ public final class BalduvianTradingPost extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 0, 1, 0, 0, 0, 1), new TapSourceCost())); // {1}, {tap}: Balduvian Trading Post deals 1 damage to target attacking 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 TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BallistaSquad.java b/Mage.Sets/src/mage/cards/b/BallistaSquad.java index 6d492a1ae78..fd635baa314 100644 --- a/Mage.Sets/src/mage/cards/b/BallistaSquad.java +++ b/Mage.Sets/src/mage/cards/b/BallistaSquad.java @@ -30,7 +30,7 @@ public final class BallistaSquad extends CardImpl { this.toughness = new MageInt(2); // {X}{W}, {T}: Ballista Squad deals X damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BalloonPeddler.java b/Mage.Sets/src/mage/cards/b/BalloonPeddler.java index bcb3f30ee8f..d08ad2b2a72 100644 --- a/Mage.Sets/src/mage/cards/b/BalloonPeddler.java +++ b/Mage.Sets/src/mage/cards/b/BalloonPeddler.java @@ -31,7 +31,7 @@ public final class BalloonPeddler extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}, Discard a card: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/b/BallynockTrapper.java b/Mage.Sets/src/mage/cards/b/BallynockTrapper.java index cfc9fcc794a..5797c1692f3 100644 --- a/Mage.Sets/src/mage/cards/b/BallynockTrapper.java +++ b/Mage.Sets/src/mage/cards/b/BallynockTrapper.java @@ -36,7 +36,7 @@ public final class BallynockTrapper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filterWhiteSpell, true)); diff --git a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java index 12e9d88efad..5bf9ed46ffe 100644 --- a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java +++ b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java @@ -27,7 +27,7 @@ public final class BalmOfRestoration extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Balm of Restoration: Choose one - You gain 2 life; - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java b/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java index fca1b499f00..5711819a1dc 100644 --- a/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java +++ b/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java @@ -29,7 +29,7 @@ public final class BalshanCollaborator extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Balshan Collaborator gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private BalshanCollaborator(final BalshanCollaborator card) { diff --git a/Mage.Sets/src/mage/cards/b/BalshanGriffin.java b/Mage.Sets/src/mage/cards/b/BalshanGriffin.java index 4ba12b5334e..14fb2a8c827 100644 --- a/Mage.Sets/src/mage/cards/b/BalshanGriffin.java +++ b/Mage.Sets/src/mage/cards/b/BalshanGriffin.java @@ -32,7 +32,7 @@ public final class BalshanGriffin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{U}, Discard a card: Return Balshan Griffin to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java index 190272d1ef8..d56b9b3d8bc 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java @@ -41,7 +41,7 @@ public final class BalthorTheDefiled extends CardImpl { new FilterCreaturePermanent(SubType.MINION, "Minion creatures"), false))); // {B}{B}{B}, Exile Balthor the Defiled: Each player returns all black and all red creature cards from their graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalthorTheDefiledEffect(), new ManaCostsImpl<>("{B}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new BalthorTheDefiledEffect(), new ManaCostsImpl<>("{B}{B}{B}")); ability.addCost(new ExileSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BanewhipPunisher.java b/Mage.Sets/src/mage/cards/b/BanewhipPunisher.java index 50aaa7cb01b..486be4e0c86 100644 --- a/Mage.Sets/src/mage/cards/b/BanewhipPunisher.java +++ b/Mage.Sets/src/mage/cards/b/BanewhipPunisher.java @@ -39,7 +39,7 @@ public final class BanewhipPunisher extends CardImpl { this.addAbility(etbAbility); // {B}, sacrifice Banewhip Punisher: Destroy target creature that has a -1/-1 counter on it. - Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability destroyAbility = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{B}")); destroyAbility.addCost(new SacrificeSourceCost()); destroyAbility.addTarget(new TargetPermanent(filter)); this.addAbility(destroyAbility); diff --git a/Mage.Sets/src/mage/cards/b/BanishingKnack.java b/Mage.Sets/src/mage/cards/b/BanishingKnack.java index 1cb5e1e4b48..9107981009c 100644 --- a/Mage.Sets/src/mage/cards/b/BanishingKnack.java +++ b/Mage.Sets/src/mage/cards/b/BanishingKnack.java @@ -28,7 +28,7 @@ public final class BanishingKnack extends CardImpl { public BanishingKnack(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}"); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn) .setText("Until end of turn, target creature gains \"{T}: Return target nonland permanent to its owner's hand.\"") diff --git a/Mage.Sets/src/mage/cards/b/Banshee.java b/Mage.Sets/src/mage/cards/b/Banshee.java index 8cb1bb21ada..0f3c320bf73 100644 --- a/Mage.Sets/src/mage/cards/b/Banshee.java +++ b/Mage.Sets/src/mage/cards/b/Banshee.java @@ -31,7 +31,7 @@ public final class Banshee extends CardImpl { this.toughness = new MageInt(1); // {X}, {T}: Banshee deals half X damage, rounded down, to any target, and half X damage, rounded up, to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new HalfValue(GetXValue.instance, false)).setText("Banshee deals half X damage, rounded down, to any target,"), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new HalfValue(GetXValue.instance, false)).setText("Banshee deals half X damage, rounded down, to any target,"), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(new HalfValue(GetXValue.instance, true)).setText(" and half X damage, rounded up, to you")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BantBattlemage.java b/Mage.Sets/src/mage/cards/b/BantBattlemage.java index 709568afa66..be6f7a7f704 100644 --- a/Mage.Sets/src/mage/cards/b/BantBattlemage.java +++ b/Mage.Sets/src/mage/cards/b/BantBattlemage.java @@ -31,11 +31,11 @@ public final class BantBattlemage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); + ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BantPanorama.java b/Mage.Sets/src/mage/cards/b/BantPanorama.java index c82921ad4e0..dbc71082e43 100644 --- a/Mage.Sets/src/mage/cards/b/BantPanorama.java +++ b/Mage.Sets/src/mage/cards/b/BantPanorama.java @@ -40,7 +40,7 @@ public final class BantPanorama extends CardImpl { // {1}, {T}, Sacrifice Bant Panorama: Search your library for a basic Forest, Plains, or Island card and put it onto the battlefield tapped. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java b/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java index ad37bd7b978..f3174997c50 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java @@ -29,7 +29,7 @@ public final class BarbarianLunatic extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, Sacrifice Barbarian Lunatic: Barbarian Lunatic deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java b/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java index dd120afdbd7..b80520846b5 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java @@ -29,7 +29,7 @@ public final class BarbarianRiftcutter extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); // {R}, Sacrifice Barbarian Riftcutter: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BarbedField.java b/Mage.Sets/src/mage/cards/b/BarbedField.java index fd18ef3b1ed..39de666b0e8 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedField.java +++ b/Mage.Sets/src/mage/cards/b/BarbedField.java @@ -35,7 +35,7 @@ public final class BarbedField extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: This land deals 1 damage to any target." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: This land deals 1 damage to any target.\""); diff --git a/Mage.Sets/src/mage/cards/b/BarbedSliver.java b/Mage.Sets/src/mage/cards/b/BarbedSliver.java index c9c75a84cc3..29a24855820 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedSliver.java +++ b/Mage.Sets/src/mage/cards/b/BarbedSliver.java @@ -28,7 +28,7 @@ public final class BarbedSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText("this creature gets +1/+0 until end of turn"), + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText("this creature gets +1/+0 until end of turn"), new GenericManaCost(2)), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BarlsCage.java b/Mage.Sets/src/mage/cards/b/BarlsCage.java index aeb96efe687..18ec6e76d22 100644 --- a/Mage.Sets/src/mage/cards/b/BarlsCage.java +++ b/Mage.Sets/src/mage/cards/b/BarlsCage.java @@ -21,7 +21,7 @@ public final class BarlsCage extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {3}: Target creature doesn't untap during its controller's next untap step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DontUntapInControllersNextUntapStepTargetEffect("Target creature"), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DontUntapInControllersNextUntapStepTargetEffect("Target creature"), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BaronSengir.java b/Mage.Sets/src/mage/cards/b/BaronSengir.java index 7ca3516ede7..3ee91c88308 100644 --- a/Mage.Sets/src/mage/cards/b/BaronSengir.java +++ b/Mage.Sets/src/mage/cards/b/BaronSengir.java @@ -47,7 +47,7 @@ public final class BaronSengir extends CardImpl { this.addAbility(new DealtDamageAndDiedTriggeredAbility(new AddCountersSourceEffect(CounterType.P2P2.createInstance()), false)); // {tap}: Regenerate another target Vampire. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java index cd0999eabd0..7c0ffdfd9f5 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java @@ -25,7 +25,7 @@ public final class BarrageOfExpendables extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{R}"); // {R}, Sacrifice a creature: Barrage of Expendables deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BarrageOgre.java b/Mage.Sets/src/mage/cards/b/BarrageOgre.java index a29fdbeb0bd..bf8ed418dce 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOgre.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOgre.java @@ -36,7 +36,7 @@ public final class BarrageOgre extends CardImpl { this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java index 8be91c7ffea..6069a0fdef9 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java @@ -47,7 +47,7 @@ public final class BarrageTyrant extends CardImpl { // {2}{R}, Sacrifice another colorless creature: Barrage Tyrant deals damage equal to the sacrificed creature's power to any target. Effect effect = new DamageTargetEffect(SacrificeCostCreaturesPower.instance); effect.setText("{this} deals damage equal to the sacrificed creature's power to any target"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java index 35d03bc21d3..4efadd102f0 100644 --- a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java +++ b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java @@ -33,12 +33,12 @@ public final class BarrentonMedic extends CardImpl { this.toughness = new MageInt(4); // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Put a -1/-1 counter on Barrenton Medic: Untap Barrenton Medic. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance(1)))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance(1)))); } private BarrentonMedic(final BarrentonMedic card) { diff --git a/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java b/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java index bb90f50349e..6678fe4092d 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java +++ b/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java @@ -31,7 +31,7 @@ public final class BarrinMasterWizard extends CardImpl { this.toughness = new MageInt(1); //{2}, Sacrifice a permanent: Return target creature to its owner's hand. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BarrinsCodex.java b/Mage.Sets/src/mage/cards/b/BarrinsCodex.java index b75e9169f09..6409523eaf2 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinsCodex.java +++ b/Mage.Sets/src/mage/cards/b/BarrinsCodex.java @@ -30,7 +30,7 @@ public final class BarrinsCodex extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.PAGE.createInstance()), true)); //{4}, {T}, Sacrifice Barrin's Codex: Draw X cards, where X is the number of page counters on Barrin's Codex. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.PAGE)), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.PAGE)), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java b/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java index eb9d4ca0e78..d8c3085452c 100644 --- a/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java +++ b/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java @@ -32,7 +32,7 @@ public final class BasaltGargoyle extends CardImpl { // Echo {2}{R} this.addAbility(new EchoAbility("{2}{R}")); // {R}: Basalt Gargoyle gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private BasaltGargoyle(final BasaltGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java index b5561ae21b8..7f16f501295 100644 --- a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java +++ b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java @@ -29,7 +29,7 @@ public final class BasaltMonolith extends CardImpl { // {tap}: Add {C}{C}{C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); // {3}: Untap Basalt Monolith. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new GenericManaCost(3))); } private BasaltMonolith(final BasaltMonolith card) { diff --git a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java index d493a3bbc66..52c57546e19 100644 --- a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java +++ b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java @@ -40,7 +40,7 @@ public final class BasandraBattleSeraph extends CardImpl { // {R}: Target creature attacks this turn if able. Effect effect = new AttacksIfAbleTargetEffect(Duration.EndOfTurn); effect.setOutcome(Outcome.Detriment); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BastionMastodon.java b/Mage.Sets/src/mage/cards/b/BastionMastodon.java index 0e9d38ae74a..b5c03fae626 100644 --- a/Mage.Sets/src/mage/cards/b/BastionMastodon.java +++ b/Mage.Sets/src/mage/cards/b/BastionMastodon.java @@ -28,7 +28,7 @@ public final class BastionMastodon extends CardImpl { this.toughness = new MageInt(5); // {W}: Bastion Mastodon gets vigilance until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BatonOfCourage.java b/Mage.Sets/src/mage/cards/b/BatonOfCourage.java index b1d99bbdaf7..e0e56936575 100644 --- a/Mage.Sets/src/mage/cards/b/BatonOfCourage.java +++ b/Mage.Sets/src/mage/cards/b/BatonOfCourage.java @@ -30,7 +30,7 @@ public final class BatonOfCourage extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Remove a charge counter from Baton of Courage: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BatonOfMorale.java b/Mage.Sets/src/mage/cards/b/BatonOfMorale.java index 3bd2e2ce654..bf14e57f86d 100644 --- a/Mage.Sets/src/mage/cards/b/BatonOfMorale.java +++ b/Mage.Sets/src/mage/cards/b/BatonOfMorale.java @@ -24,7 +24,7 @@ public final class BatonOfMorale extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}: Target creature gains banding until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/Batterskull.java b/Mage.Sets/src/mage/cards/b/Batterskull.java index 11ef76bfe46..c7576d0ae5b 100644 --- a/Mage.Sets/src/mage/cards/b/Batterskull.java +++ b/Mage.Sets/src/mage/cards/b/Batterskull.java @@ -36,7 +36,7 @@ public final class Batterskull extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); // {3}: Return Batterskull to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new GenericManaCost(3))); // Equip {5} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(5), false)); diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java b/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java index 224f4062784..df5dce37c8e 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java @@ -32,7 +32,7 @@ public final class BattlefieldPercher extends CardImpl { // Battlefield Percher can block only creatures with flying. this.addAbility(new CanBlockOnlyFlyingAbility()); // {1}{B}: Battlefield Percher gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java b/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java index d3cdfa1dc53..c7a7079a597 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java +++ b/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java @@ -20,7 +20,7 @@ public final class BazaarOfBaghdad extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); // {tap}: Draw two cards, then discard three cards. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(2, 3), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(2, 3), new TapSourceCost())); } private BazaarOfBaghdad(final BazaarOfBaghdad card) { diff --git a/Mage.Sets/src/mage/cards/b/BazaarTrader.java b/Mage.Sets/src/mage/cards/b/BazaarTrader.java index e74f8049d9a..dbc24b3adda 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarTrader.java +++ b/Mage.Sets/src/mage/cards/b/BazaarTrader.java @@ -40,7 +40,7 @@ public final class BazaarTrader extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target player gains control of target artifact, creature, or land you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TargetPlayerGainControlTargetPermanentEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TargetPlayerGainControlTargetPermanentEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java b/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java index 939cf6614a0..800b4d308b5 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java @@ -35,7 +35,7 @@ public final class BeaconBehemoth extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BeaconHawk.java b/Mage.Sets/src/mage/cards/b/BeaconHawk.java index 29d85d4e7f8..5c5e6f949b0 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconHawk.java +++ b/Mage.Sets/src/mage/cards/b/BeaconHawk.java @@ -31,7 +31,7 @@ public final class BeaconHawk extends CardImpl { Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new UntapTargetEffect(), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } private BeaconHawk(final BeaconHawk card) { diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfDestiny.java b/Mage.Sets/src/mage/cards/b/BeaconOfDestiny.java index 36c5a8cf87e..f38730ec408 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfDestiny.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfDestiny.java @@ -36,7 +36,7 @@ public final class BeaconOfDestiny extends CardImpl { this.toughness = new MageInt(3); // {T}: The next time a source of your choice would deal damage to you this turn, that damage is dealt to Beacon of Destiny instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BeaconOfDestinyEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new BeaconOfDestinyEffect(), new TapSourceCost())); } private BeaconOfDestiny(final BeaconOfDestiny card) { diff --git a/Mage.Sets/src/mage/cards/b/Bearscape.java b/Mage.Sets/src/mage/cards/b/Bearscape.java index 92b7a65b63b..cde528bd6a0 100644 --- a/Mage.Sets/src/mage/cards/b/Bearscape.java +++ b/Mage.Sets/src/mage/cards/b/Bearscape.java @@ -26,7 +26,7 @@ public final class Bearscape extends CardImpl { // {1}{G}, Exile two cards from your graveyard: Create a 2/2 green Bear creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BearToken()), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new BearToken()), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, StaticFilters.FILTER_CARDS_FROM_YOUR_GRAVEYARD))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BeastWalkers.java b/Mage.Sets/src/mage/cards/b/BeastWalkers.java index 561042a0296..ad6cffcfab6 100644 --- a/Mage.Sets/src/mage/cards/b/BeastWalkers.java +++ b/Mage.Sets/src/mage/cards/b/BeastWalkers.java @@ -31,7 +31,7 @@ public final class BeastWalkers extends CardImpl { this.toughness = new MageInt(2); // {G}: Beast Walkers gains banding until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private BeastWalkers(final BeastWalkers card) { diff --git a/Mage.Sets/src/mage/cards/b/BelisariusCawl.java b/Mage.Sets/src/mage/cards/b/BelisariusCawl.java index bedfdea141a..7d9774a1faf 100644 --- a/Mage.Sets/src/mage/cards/b/BelisariusCawl.java +++ b/Mage.Sets/src/mage/cards/b/BelisariusCawl.java @@ -42,12 +42,12 @@ public final class BelisariusCawl extends CardImpl { // Ultima Founding -- {T}, Tap two untapped artifacts you control: Create a 2/2 white Astartes Warrior creature token with vigilance. Effect effect = new CreateTokenEffect(new WhiteAstartesWarriorToken()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); this.addAbility(ability.withFlavorWord("Ultima Founding")); // Master of Machines -- {T}, Tap X untapped creatures you control: Look at the top X cards of your library. You may reveal an artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryAndPickControllerEffect(GetXValue.instance, 1, StaticFilters.FILTER_CARD_ARTIFACT, PutCards.HAND, PutCards.BOTTOM_RANDOM, true), new TapSourceCost()); + ability = new SimpleActivatedAbility(new LookLibraryAndPickControllerEffect(GetXValue.instance, 1, StaticFilters.FILTER_CARD_ARTIFACT, PutCards.HAND, PutCards.BOTTOM_RANDOM, true), new TapSourceCost()); ability.addCost(new TapVariableTargetCost(StaticFilters.FILTER_CONTROLLED_UNTAPPED_CREATURES)); this.addAbility(ability.withFlavorWord("Master of Machines")); } diff --git a/Mage.Sets/src/mage/cards/b/BellowsLizard.java b/Mage.Sets/src/mage/cards/b/BellowsLizard.java index 2e6b9721b93..b1f612394f1 100644 --- a/Mage.Sets/src/mage/cards/b/BellowsLizard.java +++ b/Mage.Sets/src/mage/cards/b/BellowsLizard.java @@ -28,7 +28,7 @@ public final class BellowsLizard extends CardImpl { this.toughness = new MageInt(1); // {1}{R}: Bellows Lizard gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private BellowsLizard(final BellowsLizard card) { diff --git a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java index f865a5f6eb8..7fd9c9d7903 100644 --- a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java @@ -39,7 +39,7 @@ public final class BenBenAkkiHermit extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter), true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter), true), new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BenalishHeralds.java b/Mage.Sets/src/mage/cards/b/BenalishHeralds.java index 6e687709851..e3a1d416a05 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishHeralds.java +++ b/Mage.Sets/src/mage/cards/b/BenalishHeralds.java @@ -28,7 +28,7 @@ public final class BenalishHeralds extends CardImpl { this.toughness = new MageInt(4); // {3}{U}, {tap}: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BenalishMissionary.java b/Mage.Sets/src/mage/cards/b/BenalishMissionary.java index 9b07639da7d..e98cd1183e2 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishMissionary.java +++ b/Mage.Sets/src/mage/cards/b/BenalishMissionary.java @@ -37,7 +37,7 @@ public final class BenalishMissionary extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {tap}: Prevent all combat damage that would be dealt by target blocked creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageByTargetEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageByTargetEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BenalishTrapper.java b/Mage.Sets/src/mage/cards/b/BenalishTrapper.java index a146ae6f228..237687dc914 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishTrapper.java +++ b/Mage.Sets/src/mage/cards/b/BenalishTrapper.java @@ -30,7 +30,7 @@ public final class BenalishTrapper extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java index fd8a86ebba9..115ac6e7d7c 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java @@ -30,7 +30,7 @@ public final class BenevolentAncestor extends CardImpl { this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java b/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java index 347ef356e8b..f86af17eb74 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java @@ -28,7 +28,7 @@ public final class BenevolentBodyguard extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Benevolent Bodyguard: Target creature you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/Benthicore.java b/Mage.Sets/src/mage/cards/b/Benthicore.java index f4151c1554f..9522df48251 100644 --- a/Mage.Sets/src/mage/cards/b/Benthicore.java +++ b/Mage.Sets/src/mage/cards/b/Benthicore.java @@ -45,7 +45,7 @@ public final class Benthicore extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkWizardToken(), 2), false)); // Tap two untapped Merfolk you control: Untap Benthicore. It gains shroud until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(2, filter))); + Ability ability = new SimpleActivatedAbility(new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(2, filter))); ability.addEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn).setText("it gains shroud until end of turn")); this.addAbility(ability); } @@ -58,4 +58,4 @@ public final class Benthicore extends CardImpl { public Benthicore copy() { return new Benthicore(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/BidentOfThassa.java b/Mage.Sets/src/mage/cards/b/BidentOfThassa.java index b9fcb3a2c10..52b93f23d34 100644 --- a/Mage.Sets/src/mage/cards/b/BidentOfThassa.java +++ b/Mage.Sets/src/mage/cards/b/BidentOfThassa.java @@ -36,7 +36,7 @@ public final class BidentOfThassa extends CardImpl { true, SetTargetPointer.NONE, true )); // {1}{U}, {T}: Creatures your opponents control attack this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleAllEffect(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURES,Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new AttacksIfAbleAllEffect(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURES,Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java b/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java index 4e60439570c..16e2ca4225e 100644 --- a/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java +++ b/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java @@ -55,7 +55,7 @@ public final class BiggerOnTheInside extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent has "{T}: Target player adds two mana of any one color. The next spell they cast this turn has cascade." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BiggerOnTheInsideEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new BiggerOnTheInsideEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPlayer()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, null, "permanent"); this.addAbility(new SimpleStaticAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/b/BileUrchin.java b/Mage.Sets/src/mage/cards/b/BileUrchin.java index 0d89affda2f..f205031a957 100644 --- a/Mage.Sets/src/mage/cards/b/BileUrchin.java +++ b/Mage.Sets/src/mage/cards/b/BileUrchin.java @@ -27,7 +27,7 @@ public final class BileUrchin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Bile Urchin: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BirthingHulk.java b/Mage.Sets/src/mage/cards/b/BirthingHulk.java index 732e107fd8c..7f003e2c111 100644 --- a/Mage.Sets/src/mage/cards/b/BirthingHulk.java +++ b/Mage.Sets/src/mage/cards/b/BirthingHulk.java @@ -37,7 +37,7 @@ public final class BirthingHulk extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); // {1}{C}: Regenerate Birthing Hulk. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{C}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{C}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java index aa4c09aa9c8..ba97419e572 100644 --- a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java +++ b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java @@ -43,7 +43,7 @@ public final class BlackOakOfOdunos extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {B}, Tap another untapped creature you control: Black Oak of Odunos gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java b/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java index 6eab328922b..04b428fb126 100644 --- a/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java @@ -34,7 +34,7 @@ public final class BlackPoplarShaman extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BladedSentinel.java b/Mage.Sets/src/mage/cards/b/BladedSentinel.java index a56e3f2ef6d..6fc8e77bb8f 100644 --- a/Mage.Sets/src/mage/cards/b/BladedSentinel.java +++ b/Mage.Sets/src/mage/cards/b/BladedSentinel.java @@ -26,7 +26,7 @@ public final class BladedSentinel extends CardImpl { this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private BladedSentinel(final BladedSentinel card) { diff --git a/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java b/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java index 60a4e29c3e3..2a550e4e15a 100644 --- a/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java +++ b/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java @@ -47,7 +47,7 @@ public final class BladewingTheRisen extends CardImpl { ability.addTarget(target); this.addAbility(ability); // {B}{R}: Dragon creatures get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(1,1, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{B}{R}"))); } private BladewingTheRisen(final BladewingTheRisen card) { diff --git a/Mage.Sets/src/mage/cards/b/BlasterMage.java b/Mage.Sets/src/mage/cards/b/BlasterMage.java index fca8ecd99be..997c1f5bc3f 100644 --- a/Mage.Sets/src/mage/cards/b/BlasterMage.java +++ b/Mage.Sets/src/mage/cards/b/BlasterMage.java @@ -36,7 +36,7 @@ public final class BlasterMage extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}, Discard a card: Destroy target Wall. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/b/BlastingStation.java b/Mage.Sets/src/mage/cards/b/BlastingStation.java index f9d5123eeec..9d7d74d4df3 100644 --- a/Mage.Sets/src/mage/cards/b/BlastingStation.java +++ b/Mage.Sets/src/mage/cards/b/BlastingStation.java @@ -27,7 +27,7 @@ public final class BlastingStation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {tap}, Sacrifice a creature: Blasting Station 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.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java b/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java index 27c57c4f158..8fae7b02898 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java +++ b/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java @@ -31,7 +31,7 @@ public final class BlazingBladeAskari extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {2}: Blazing Blade Askari becomes colorless until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private BlazingBladeAskari(final BlazingBladeAskari card) { diff --git a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java index 39ca6600224..39a6edac586 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java +++ b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java @@ -30,7 +30,7 @@ public final class BlazingHellhound extends CardImpl { this.toughness = new MageInt(3); // {1}, Sacrifice another creature: Blazing Hellhound deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java b/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java index 832584dde2c..f40584031f8 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java @@ -41,7 +41,7 @@ public final class BlessingOfLeeches extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1))); // {0}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA),new GenericManaCost(0))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA),new GenericManaCost(0))); } private BlessingOfLeeches(final BlessingOfLeeches card) { diff --git a/Mage.Sets/src/mage/cards/b/BlightKeeper.java b/Mage.Sets/src/mage/cards/b/BlightKeeper.java index c80b4da0f30..3c062ef6ef8 100644 --- a/Mage.Sets/src/mage/cards/b/BlightKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BlightKeeper.java @@ -35,7 +35,7 @@ public final class BlightKeeper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {7}{B}, {T}, Sacrifice Blight Keeper: Target opponent loses 4 life and you gain 4 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(4), new ManaCostsImpl<>("{7}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(4), new ManaCostsImpl<>("{7}{B}")); ability.addEffect(new GainLifeEffect(4).concatBy("and")); ability.addTarget(new TargetOpponent()); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlightMamba.java b/Mage.Sets/src/mage/cards/b/BlightMamba.java index a1147f3c0c3..1f538de6df9 100644 --- a/Mage.Sets/src/mage/cards/b/BlightMamba.java +++ b/Mage.Sets/src/mage/cards/b/BlightMamba.java @@ -28,7 +28,7 @@ public final class BlightMamba extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private BlightMamba(final BlightMamba card) { diff --git a/Mage.Sets/src/mage/cards/b/BlightedBat.java b/Mage.Sets/src/mage/cards/b/BlightedBat.java index d0646ad65fa..78e6e68435f 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedBat.java +++ b/Mage.Sets/src/mage/cards/b/BlightedBat.java @@ -32,7 +32,7 @@ public final class BlightedBat extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}: Blighted Bat gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1))); } private BlightedBat(final BlightedBat card) { diff --git a/Mage.Sets/src/mage/cards/b/BlightedCataract.java b/Mage.Sets/src/mage/cards/b/BlightedCataract.java index 6097f7c8649..f8cf1146c0a 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedCataract.java +++ b/Mage.Sets/src/mage/cards/b/BlightedCataract.java @@ -27,7 +27,7 @@ public final class BlightedCataract extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {5}{U}, {T}, Sacrifice Blighted Cataract: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{5}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{5}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlightedShaman.java b/Mage.Sets/src/mage/cards/b/BlightedShaman.java index ba518f56e61..fb40159b40e 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlightedShaman.java @@ -40,13 +40,13 @@ public final class BlightedShaman extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a Swamp: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filterSwamp)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {tap}, Sacrifice a creature: Target creature gets +2/+2 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); + ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/Blightspeaker.java b/Mage.Sets/src/mage/cards/b/Blightspeaker.java index f2bf9a31a52..95582632e7e 100644 --- a/Mage.Sets/src/mage/cards/b/Blightspeaker.java +++ b/Mage.Sets/src/mage/cards/b/Blightspeaker.java @@ -41,7 +41,7 @@ public final class Blightspeaker extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlindSeer.java b/Mage.Sets/src/mage/cards/b/BlindSeer.java index 021c14b2a49..945072c85b9 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSeer.java +++ b/Mage.Sets/src/mage/cards/b/BlindSeer.java @@ -27,7 +27,7 @@ public final class BlindSeer extends CardImpl { this.toughness = new MageInt(3); // {1}{U}: Target spell or permanent becomes the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetSpellOrPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlindingDrone.java b/Mage.Sets/src/mage/cards/b/BlindingDrone.java index 06820a27339..5198bd31919 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingDrone.java +++ b/Mage.Sets/src/mage/cards/b/BlindingDrone.java @@ -33,7 +33,7 @@ public final class BlindingDrone extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {C}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{C}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{C}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlindingMage.java b/Mage.Sets/src/mage/cards/b/BlindingMage.java index dd0a721f1af..55b0b398d36 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingMage.java +++ b/Mage.Sets/src/mage/cards/b/BlindingMage.java @@ -28,7 +28,7 @@ public final class BlindingMage extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java b/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java index f3984ba5ec5..4199f48ffc2 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java +++ b/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java @@ -26,7 +26,7 @@ public final class BlinkingSpirit extends CardImpl { this.toughness = new MageInt(2); // {0}: Return Blinking Spirit to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(0))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new GenericManaCost(0))); } private BlinkingSpirit(final BlinkingSpirit card) { diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java index 91ccfed2b03..84d1b6b3f90 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java @@ -40,7 +40,7 @@ public final class BlinkmothNexus extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}: Blinkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(1, 1, "1/1 Blinkmoth artifact creature with flying") .withSubType(SubType.BLINKMOTH) .withType(CardType.ARTIFACT) @@ -48,7 +48,7 @@ public final class BlinkmothNexus extends CardImpl { CardType.LAND, Duration.EndOfTurn), new GenericManaCost(1))); // {1}, {T}: Target Blinkmoth creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothWell.java b/Mage.Sets/src/mage/cards/b/BlinkmothWell.java index 978bd6a9180..fb2ee2904e1 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothWell.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothWell.java @@ -34,7 +34,7 @@ public final class BlinkmothWell extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}: Tap target noncreature artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java b/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java index acdee6a8118..f63219bbd7f 100644 --- a/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java +++ b/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java @@ -28,7 +28,7 @@ public final class BlisteringDieflyn extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B/R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B/R}"))); } private BlisteringDieflyn(final BlisteringDieflyn card) { diff --git a/Mage.Sets/src/mage/cards/b/BlizzardElemental.java b/Mage.Sets/src/mage/cards/b/BlizzardElemental.java index 55b9697ed73..1df16847198 100644 --- a/Mage.Sets/src/mage/cards/b/BlizzardElemental.java +++ b/Mage.Sets/src/mage/cards/b/BlizzardElemental.java @@ -28,7 +28,7 @@ public final class BlizzardElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{U}: Untap Blizzard Elemental. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{3}{U}"))); } private BlizzardElemental(final BlizzardElemental card) { diff --git a/Mage.Sets/src/mage/cards/b/Blockbuster.java b/Mage.Sets/src/mage/cards/b/Blockbuster.java index fe0b7988bbc..65fe419d982 100644 --- a/Mage.Sets/src/mage/cards/b/Blockbuster.java +++ b/Mage.Sets/src/mage/cards/b/Blockbuster.java @@ -30,7 +30,7 @@ public final class Blockbuster extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}{R}"); // {1}{R}, Sacrifice Blockbuster: Blockbuster deals 3 damage to each tapped creature and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(3, filter), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageEverythingEffect(3, filter), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java index 37af0c253ca..b8d08a43718 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java @@ -45,7 +45,7 @@ public final class BloodChinFanatic extends CardImpl { effect.setText("Target player loses X life"); Effect effect2 = new GainLifeEffect(SacrificeCostCreaturesPower.instance); effect2.setText("and you gain X life, where X is the sacrificed creature's power"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addEffect(effect2); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/b/BloodCultist.java b/Mage.Sets/src/mage/cards/b/BloodCultist.java index 430e6d90ac0..b3fa17ff8f8 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCultist.java +++ b/Mage.Sets/src/mage/cards/b/BloodCultist.java @@ -31,7 +31,7 @@ public final class BloodCultist extends CardImpl { this.toughness = new MageInt(1); // {T}: Blood Cultist deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever a creature dealt damage by Blood Cultist this turn dies, put a +1/+1 counter on Blood Cultist. diff --git a/Mage.Sets/src/mage/cards/b/BloodHost.java b/Mage.Sets/src/mage/cards/b/BloodHost.java index dfa52cbe9e8..7cc9f93b619 100644 --- a/Mage.Sets/src/mage/cards/b/BloodHost.java +++ b/Mage.Sets/src/mage/cards/b/BloodHost.java @@ -35,7 +35,7 @@ public final class BloodHost extends CardImpl { // {1}{B}, Sacrifice another creature: Put a +1/+1 counter on Blood Host Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance()); effect.setText("Put a +1/+1 counter on {this}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); // and you gain 2 life. effect = new GainLifeEffect(2); diff --git a/Mage.Sets/src/mage/cards/b/BloodRites.java b/Mage.Sets/src/mage/cards/b/BloodRites.java index cf78d3b9a35..4b447649b82 100644 --- a/Mage.Sets/src/mage/cards/b/BloodRites.java +++ b/Mage.Sets/src/mage/cards/b/BloodRites.java @@ -23,7 +23,7 @@ public final class BloodRites extends CardImpl { public BloodRites(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BloodfireColossus.java b/Mage.Sets/src/mage/cards/b/BloodfireColossus.java index 86043de4d9d..4c3c72e8f12 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireColossus.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireColossus.java @@ -27,7 +27,7 @@ public final class BloodfireColossus extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(6, "it"), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DamageEverythingEffect(6, "it"), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java b/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java index 8c1312ea8ee..9605d3b5d4f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java @@ -37,7 +37,7 @@ public final class BloodfireDwarf extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(1, filter), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java b/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java index 9aa0548ec0a..c5ec9de91fd 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java @@ -41,7 +41,7 @@ public final class BloodfireInfusion extends CardImpl { // {R}, Sacrifice enchanted creature: Bloodfire Infusion deals damage equal to the sacrificed creature's power to each creature. Effect effect = new DamageAllEffect(AttachedPermanentPowerCount.instance, new FilterCreaturePermanent()); effect.setText("{this} deals damage equal to the sacrificed creature's power to each creature"); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); + Ability ability2 = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}")); ability2.addCost(new SacrificeAttachedCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/b/BloodfireKavu.java b/Mage.Sets/src/mage/cards/b/BloodfireKavu.java index 2597dc231bf..c50c04400e1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireKavu.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireKavu.java @@ -28,7 +28,7 @@ public final class BloodfireKavu extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, new FilterCreaturePermanent()), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(2, new FilterCreaturePermanent()), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodfireMentor.java b/Mage.Sets/src/mage/cards/b/BloodfireMentor.java index 0f455427121..fd9e5d43d33 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireMentor.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireMentor.java @@ -28,7 +28,7 @@ public final class BloodfireMentor extends CardImpl { this.toughness = new MageInt(5); // {2}{U}, T: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1,1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(1,1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BloodletterQuill.java b/Mage.Sets/src/mage/cards/b/BloodletterQuill.java index f9049fced8c..15fef9dcf32 100644 --- a/Mage.Sets/src/mage/cards/b/BloodletterQuill.java +++ b/Mage.Sets/src/mage/cards/b/BloodletterQuill.java @@ -28,7 +28,7 @@ public final class BloodletterQuill extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}, {T}, Put a blood counter on Bloodletter Quill: Draw a card, then lose 1 life for each blood counter on Bloodletter Quill. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addEffect(new LoseLifeSourceControllerEffect(new CountersSourceCount(CounterType.BLOOD)) .setText(", then you lose 1 life for each blood counter on {this}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java index d1c198d121f..32dd7d98314 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java @@ -43,7 +43,7 @@ public final class BloodlineKeeper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {T}: Create a 2/2 black Vampire creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new VampireToken()), new TapSourceCost())); // {B}: Transform Bloodline Keeper. Activate this ability only if you control five or more Vampires. this.addAbility(new TransformAbility()); Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/b/BloodlineShaman.java b/Mage.Sets/src/mage/cards/b/BloodlineShaman.java index 5b151a78c4b..81c61082952 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineShaman.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineShaman.java @@ -32,7 +32,7 @@ public final class BloodlineShaman extends CardImpl { // {tap}: Choose a creature type. Reveal the top card of your library. If that card is a creature card of the chosen type, put it into your hand. // Otherwise, put it into your graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BloodlineShamanEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new BloodlineShamanEffect(), new TapSourceCost())); } private BloodlineShaman(final BloodlineShaman card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodlustInciter.java b/Mage.Sets/src/mage/cards/b/BloodlustInciter.java index 142b02dcaa7..b6f6fd7a6a1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlustInciter.java +++ b/Mage.Sets/src/mage/cards/b/BloodlustInciter.java @@ -30,7 +30,7 @@ public final class BloodlustInciter extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java b/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java index 86308f134e8..b795c9aad88 100644 --- a/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java +++ b/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java @@ -28,7 +28,7 @@ public final class BloodriteInvoker extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(3), new GenericManaCost(8)); ability.addEffect(new GainLifeEffect(3).concatBy("and")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java b/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java index dd559e0612e..7edbf9546fa 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java +++ b/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java @@ -39,7 +39,7 @@ public final class BloodthirstyOgre extends CardImpl { this.toughness = new MageInt(1); // {T}: Put a devotion counter on Bloodthirsty Ogre - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.DEVOTION.createInstance()),new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.DEVOTION.createInstance()),new TapSourceCost())); // {T}: Target creature gets -X/-X until end of turn, where X is the number of devotion counters on Bloodthirsty Ogre. Activate this ability only if you control a Demon. diff --git a/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java b/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java index 336fb1b3f77..ae7a27f469f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java @@ -27,7 +27,7 @@ public final class BloodthroneVampire extends CardImpl { this.subtype.add(SubType.VAMPIRE); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/b/BlossomDryad.java b/Mage.Sets/src/mage/cards/b/BlossomDryad.java index fa3c660b780..08475736d0a 100644 --- a/Mage.Sets/src/mage/cards/b/BlossomDryad.java +++ b/Mage.Sets/src/mage/cards/b/BlossomDryad.java @@ -28,7 +28,7 @@ public final class BlossomDryad 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/b/BoaConstrictor.java b/Mage.Sets/src/mage/cards/b/BoaConstrictor.java index 65e74711111..ec12a12b04a 100644 --- a/Mage.Sets/src/mage/cards/b/BoaConstrictor.java +++ b/Mage.Sets/src/mage/cards/b/BoaConstrictor.java @@ -27,7 +27,7 @@ public final class BoaConstrictor extends CardImpl { this.toughness = new MageInt(3); // {tap}: Boa Constrictor gets +3/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(3, 3, Duration.EndOfTurn), new TapSourceCost())); } private BoaConstrictor(final BoaConstrictor card) { diff --git a/Mage.Sets/src/mage/cards/b/BogGlider.java b/Mage.Sets/src/mage/cards/b/BogGlider.java index 4a59b270524..6f5d76e1b30 100644 --- a/Mage.Sets/src/mage/cards/b/BogGlider.java +++ b/Mage.Sets/src/mage/cards/b/BogGlider.java @@ -47,7 +47,7 @@ public final class BogGlider extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {T}, Sacrifice a land: Search your library for a Mercenary permanent card with converted mana cost 2 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(landFilter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BoggartArsonists.java b/Mage.Sets/src/mage/cards/b/BoggartArsonists.java index 4638aa6029e..b7beb38d45d 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartArsonists.java +++ b/Mage.Sets/src/mage/cards/b/BoggartArsonists.java @@ -43,7 +43,7 @@ public final class BoggartArsonists extends CardImpl { this.addAbility(new PlainswalkAbility()); // {2}{R}, Sacrifice Boggart Arsonists: Destroy target Scarecrow or Plains. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BoggartForager.java b/Mage.Sets/src/mage/cards/b/BoggartForager.java index 253182487bc..c25cfda540b 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartForager.java +++ b/Mage.Sets/src/mage/cards/b/BoggartForager.java @@ -28,7 +28,7 @@ public final class BoggartForager extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Boggart Forager: Target player shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibraryTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new ShuffleLibraryTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BoggartLoggers.java b/Mage.Sets/src/mage/cards/b/BoggartLoggers.java index 87d83ff278d..f6279421a39 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartLoggers.java +++ b/Mage.Sets/src/mage/cards/b/BoggartLoggers.java @@ -42,7 +42,7 @@ public final class BoggartLoggers extends CardImpl { this.addAbility(new ForestwalkAbility()); // {2}{B}, Sacrifice Boggart Loggers: Destroy target Treefolk or Forest. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BolaWarrior.java b/Mage.Sets/src/mage/cards/b/BolaWarrior.java index 6e6c8de83e2..fc45600973e 100644 --- a/Mage.Sets/src/mage/cards/b/BolaWarrior.java +++ b/Mage.Sets/src/mage/cards/b/BolaWarrior.java @@ -32,7 +32,7 @@ public final class BolaWarrior extends CardImpl { this.toughness = new MageInt(1); // {R}, {tap}, Discard a card: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/b/BoldImpaler.java b/Mage.Sets/src/mage/cards/b/BoldImpaler.java index 8b563abbac6..d4dfe73918e 100644 --- a/Mage.Sets/src/mage/cards/b/BoldImpaler.java +++ b/Mage.Sets/src/mage/cards/b/BoldImpaler.java @@ -26,7 +26,7 @@ public final class BoldImpaler extends CardImpl { this.toughness = new MageInt(2); // {2}{R}: Bold Impaler gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); } private BoldImpaler(final BoldImpaler card) { diff --git a/Mage.Sets/src/mage/cards/b/BombSquad.java b/Mage.Sets/src/mage/cards/b/BombSquad.java index 95aa631241a..b478540d890 100644 --- a/Mage.Sets/src/mage/cards/b/BombSquad.java +++ b/Mage.Sets/src/mage/cards/b/BombSquad.java @@ -45,7 +45,7 @@ public final class BombSquad extends CardImpl { this.toughness = new MageInt(1); // {tap}: Put a fuse counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FUSE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.FUSE.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // At the beginning of your upkeep, put a fuse counter on each creature with a fuse counter on it. diff --git a/Mage.Sets/src/mage/cards/b/BondedFetch.java b/Mage.Sets/src/mage/cards/b/BondedFetch.java index d3857644d31..b419d7bee81 100644 --- a/Mage.Sets/src/mage/cards/b/BondedFetch.java +++ b/Mage.Sets/src/mage/cards/b/BondedFetch.java @@ -31,7 +31,7 @@ public final class BondedFetch extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {tap}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); } private BondedFetch(final BondedFetch card) { diff --git a/Mage.Sets/src/mage/cards/b/BoneFlute.java b/Mage.Sets/src/mage/cards/b/BoneFlute.java index b4375271d3a..0d640625e8c 100644 --- a/Mage.Sets/src/mage/cards/b/BoneFlute.java +++ b/Mage.Sets/src/mage/cards/b/BoneFlute.java @@ -23,7 +23,7 @@ public final class BoneFlute extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {2}, {tap}: All creatures get -1/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -0, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(-1, -0, Duration.EndOfTurn), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/Boneknitter.java b/Mage.Sets/src/mage/cards/b/Boneknitter.java index a3136c60f97..a17e24ee8b3 100644 --- a/Mage.Sets/src/mage/cards/b/Boneknitter.java +++ b/Mage.Sets/src/mage/cards/b/Boneknitter.java @@ -36,7 +36,7 @@ public final class Boneknitter extends CardImpl { this.toughness = new MageInt(1); // {1}{B}: Regenerate target Zombie. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Morph {2}{B} diff --git a/Mage.Sets/src/mage/cards/b/BoneyardDesecrator.java b/Mage.Sets/src/mage/cards/b/BoneyardDesecrator.java index e45df1bece6..0f0a63762de 100644 --- a/Mage.Sets/src/mage/cards/b/BoneyardDesecrator.java +++ b/Mage.Sets/src/mage/cards/b/BoneyardDesecrator.java @@ -46,7 +46,7 @@ public final class BoneyardDesecrator extends CardImpl { // {1}{B}, Sacrifice another creature: Put a +1/+1 counter on Boneyard Desecrator. If an outlaw was sacrificed this way, create a Treasure token. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); ability.addEffect(new BoneyardDesecratorEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BookOfRass.java b/Mage.Sets/src/mage/cards/b/BookOfRass.java index 38513554831..f47a567f623 100644 --- a/Mage.Sets/src/mage/cards/b/BookOfRass.java +++ b/Mage.Sets/src/mage/cards/b/BookOfRass.java @@ -22,7 +22,7 @@ public final class BookOfRass extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {2}, Pay 2 life: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java index 9579f3a1708..6d31ed73a37 100644 --- a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java +++ b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java @@ -42,7 +42,7 @@ public final class BorborygmosEnraged extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new RevealLibraryPutIntoHandEffect(3, StaticFilters.FILTER_CARD_LANDS, Zone.GRAVEYARD), false, false)); //Discard a land card: Borborygmos Enraged deals 3 damage to any target - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_LAND_A))); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_LAND_A))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BorealGriffin.java b/Mage.Sets/src/mage/cards/b/BorealGriffin.java index ab0a09e7585..62cc7cf4547 100644 --- a/Mage.Sets/src/mage/cards/b/BorealGriffin.java +++ b/Mage.Sets/src/mage/cards/b/BorealGriffin.java @@ -28,7 +28,7 @@ public final class BorealGriffin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {S}: Boreal Griffin gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BorisDevilboon.java b/Mage.Sets/src/mage/cards/b/BorisDevilboon.java index 9a3680a195f..6d133f92109 100644 --- a/Mage.Sets/src/mage/cards/b/BorisDevilboon.java +++ b/Mage.Sets/src/mage/cards/b/BorisDevilboon.java @@ -30,7 +30,7 @@ public final class BorisDevilboon extends CardImpl { this.toughness = new MageInt(2); // {2}{B}{R}, {tap}: Create a 1/1 black and red Demon creature token named Minor Demon. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MinorDemonToken()), new ManaCostsImpl<>("{2}{B}{R}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new MinorDemonToken()), new ManaCostsImpl<>("{2}{B}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BorosCluestone.java b/Mage.Sets/src/mage/cards/b/BorosCluestone.java index bae4bcb8efb..2d8a32440d5 100644 --- a/Mage.Sets/src/mage/cards/b/BorosCluestone.java +++ b/Mage.Sets/src/mage/cards/b/BorosCluestone.java @@ -32,7 +32,7 @@ public final class BorosCluestone extends CardImpl { this.addAbility(new WhiteManaAbility()); // {R}{W}, {T}, Sacrifice Boros Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}{W}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BorosGuildmage.java b/Mage.Sets/src/mage/cards/b/BorosGuildmage.java index ac701b76340..3d42dd1c26d 100644 --- a/Mage.Sets/src/mage/cards/b/BorosGuildmage.java +++ b/Mage.Sets/src/mage/cards/b/BorosGuildmage.java @@ -31,10 +31,10 @@ public final class BorosGuildmage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BorosKeyrune.java b/Mage.Sets/src/mage/cards/b/BorosKeyrune.java index 27f55dcb406..89d492353b2 100644 --- a/Mage.Sets/src/mage/cards/b/BorosKeyrune.java +++ b/Mage.Sets/src/mage/cards/b/BorosKeyrune.java @@ -30,7 +30,7 @@ public final class BorosKeyrune extends CardImpl { this.addAbility(new WhiteManaAbility()); // {R}{W}: Boros Keyrune becomes a 1/1 red and white Soldier artifact creature with double strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(1, 1, "1/1 red and white Soldier artifact creature with double strike") .withColor("RW") .withSubType(SubType.SOLDIER) diff --git a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java index 86995273df6..4ea8de82ae3 100644 --- a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java +++ b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java @@ -42,7 +42,7 @@ public final class BoshIronGolem extends CardImpl { // {3}{R}, Sacrifice an artifact: Bosh, Iron Golem deals damage equal to the sacrificed artifact's converted mana cost to any target. Effect effect = new DamageTargetEffect(SacrificeCostManaValue.ARTIFACT); effect.setText("{this} deals damage equal to the sacrificed artifact's mana value to any target"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BosiumStrip.java b/Mage.Sets/src/mage/cards/b/BosiumStrip.java index 5acadf19846..4389bc6f3a2 100644 --- a/Mage.Sets/src/mage/cards/b/BosiumStrip.java +++ b/Mage.Sets/src/mage/cards/b/BosiumStrip.java @@ -30,7 +30,7 @@ public final class BosiumStrip extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {3}, {T}: Until end of turn, if the top card of your graveyard is an instant or sorcery card, you may cast that card. If a card cast this way would be put into a graveyard this turn, exile it instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BosiumStripCastFromGraveyardEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new BosiumStripCastFromGraveyardEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addEffect(new BosiumStripReplacementEffect()); this.addAbility(ability, new CastFromGraveyardWatcher()); diff --git a/Mage.Sets/src/mage/cards/b/BottleGnomes.java b/Mage.Sets/src/mage/cards/b/BottleGnomes.java index b2561f662e4..93cc756010d 100644 --- a/Mage.Sets/src/mage/cards/b/BottleGnomes.java +++ b/Mage.Sets/src/mage/cards/b/BottleGnomes.java @@ -23,7 +23,7 @@ public final class BottleGnomes extends CardImpl { this.subtype.add(SubType.GNOME); this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(3), new SacrificeSourceCost())); } private BottleGnomes(final BottleGnomes card) { diff --git a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java index 505a927094c..72b999e157a 100644 --- a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java +++ b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java @@ -24,7 +24,7 @@ public final class BottleOfSuleiman extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {1}, Sacrifice Bottle of Suleiman: Flip a coin. If you lose the flip, Bottle of Suleiman deals 5 damage to you. If you win the flip, create a 5/5 colorless Djinn artifact creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlipCoinEffect( + Ability ability = new SimpleActivatedAbility(new FlipCoinEffect( new CreateTokenEffect(new DjinnToken()), new DamageControllerEffect(5) ), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/b/BountyCollector.java b/Mage.Sets/src/mage/cards/b/BountyCollector.java index 57d0e37cc2f..762fdaef730 100644 --- a/Mage.Sets/src/mage/cards/b/BountyCollector.java +++ b/Mage.Sets/src/mage/cards/b/BountyCollector.java @@ -29,7 +29,7 @@ public final class BountyCollector extends CardImpl { this.toughness = new MageInt(1); // {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/b/BountyHunter.java b/Mage.Sets/src/mage/cards/b/BountyHunter.java index 75bb15f9c3f..365dc646545 100644 --- a/Mage.Sets/src/mage/cards/b/BountyHunter.java +++ b/Mage.Sets/src/mage/cards/b/BountyHunter.java @@ -37,11 +37,11 @@ public final class BountyHunter extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put a bounty counter on target nonblack creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); this.addAbility(ability); // {tap}: Destroy target creature with a bounty counter on it. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BountySniper.java b/Mage.Sets/src/mage/cards/b/BountySniper.java index 8df49731958..2ec5ae6ea57 100644 --- a/Mage.Sets/src/mage/cards/b/BountySniper.java +++ b/Mage.Sets/src/mage/cards/b/BountySniper.java @@ -30,7 +30,7 @@ public final class BountySniper extends CardImpl { this.toughness = new MageInt(3); // {T}: Bounty sniper deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BountySpotter.java b/Mage.Sets/src/mage/cards/b/BountySpotter.java index 3345880dc9a..034552fdfe7 100644 --- a/Mage.Sets/src/mage/cards/b/BountySpotter.java +++ b/Mage.Sets/src/mage/cards/b/BountySpotter.java @@ -36,7 +36,7 @@ public final class BountySpotter extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {T}: Put a bounty counter on target creature an opponent controls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); ability.addTarget(new TargetOpponentsCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BraidwoodCup.java b/Mage.Sets/src/mage/cards/b/BraidwoodCup.java index 2bb216cd07f..fe84a5cafcd 100644 --- a/Mage.Sets/src/mage/cards/b/BraidwoodCup.java +++ b/Mage.Sets/src/mage/cards/b/BraidwoodCup.java @@ -21,7 +21,7 @@ public final class BraidwoodCup extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {T}: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java b/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java index 86ef5e1b780..b7fa1657f11 100644 --- a/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java +++ b/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java @@ -26,7 +26,7 @@ public final class BraidwoodSextant extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {2}, {tap}, Sacrifice Braidwood Sextant: Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BrassSecretary.java b/Mage.Sets/src/mage/cards/b/BrassSecretary.java index a9dcd5987e4..27e90f31829 100644 --- a/Mage.Sets/src/mage/cards/b/BrassSecretary.java +++ b/Mage.Sets/src/mage/cards/b/BrassSecretary.java @@ -27,7 +27,7 @@ public final class BrassSecretary extends CardImpl { this.toughness = new MageInt(1); // {2}, Sacrifice Brass Secretary: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BrassSquire.java b/Mage.Sets/src/mage/cards/b/BrassSquire.java index 6eba71ed3ff..4418896aed4 100644 --- a/Mage.Sets/src/mage/cards/b/BrassSquire.java +++ b/Mage.Sets/src/mage/cards/b/BrassSquire.java @@ -39,7 +39,7 @@ public final class BrassSquire extends CardImpl { this.toughness = new MageInt(3); // {tap}: Attach target Equipment you control to target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EquipEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new EquipEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java b/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java index cfe4aa43c1b..232469aaf02 100644 --- a/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java +++ b/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java @@ -41,7 +41,7 @@ public final class BrassTalonChimera extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Sacrifice Brass-Talon Chimera: Put a +2/+2 counter on target Chimera creature. It gains first strike. (This effect lasts indefinitely.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); ability.addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield) .setText("It gains first strike. (This effect lasts indefinitely.)")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java b/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java index 9a71d01a764..197a4e6b965 100644 --- a/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java +++ b/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java @@ -35,7 +35,7 @@ public final class BreakThroughTheLine extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); // {R}: Target creature with power 2 or less gains haste until end of turn and can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); Effect effect = new CantBeBlockedTargetEffect(Duration.EndOfTurn); effect.setText("and can't be blocked this turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/b/Breathstealer.java b/Mage.Sets/src/mage/cards/b/Breathstealer.java index 3d8950f15bc..82e5f9e70b9 100644 --- a/Mage.Sets/src/mage/cards/b/Breathstealer.java +++ b/Mage.Sets/src/mage/cards/b/Breathstealer.java @@ -27,7 +27,7 @@ public final class Breathstealer extends CardImpl { this.toughness = new MageInt(2); // {B}: Breathstealer gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private Breathstealer(final Breathstealer card) { diff --git a/Mage.Sets/src/mage/cards/b/BriarShield.java b/Mage.Sets/src/mage/cards/b/BriarShield.java index d8b4743be75..ebac6b423ae 100644 --- a/Mage.Sets/src/mage/cards/b/BriarShield.java +++ b/Mage.Sets/src/mage/cards/b/BriarShield.java @@ -34,7 +34,7 @@ public final class BriarShield extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice Briar Shield: Enchanted creature gets +3/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost())); } private BriarShield(final BriarShield card) { diff --git a/Mage.Sets/src/mage/cards/b/BribersPurse.java b/Mage.Sets/src/mage/cards/b/BribersPurse.java index d3a76514687..81f594cb23d 100644 --- a/Mage.Sets/src/mage/cards/b/BribersPurse.java +++ b/Mage.Sets/src/mage/cards/b/BribersPurse.java @@ -31,7 +31,7 @@ public final class BribersPurse extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.GEM.createInstance()))); // {1}, {T}, Remove a gem counter from Briber's Purse: Target creature can't attack or block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CantAttackBlockTargetEffect(Duration.EndOfTurn), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.GEM.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneMage.java b/Mage.Sets/src/mage/cards/b/BrimstoneMage.java index 9100242bdd1..1684eff16f4 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneMage.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneMage.java @@ -35,12 +35,12 @@ public final class BrimstoneMage extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{3}{R}"))); Abilities abilities1 = new AbilitiesImpl<>(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); abilities1.add(ability); Abilities abilities2 = new AbilitiesImpl<>(); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); abilities2.add(ability); diff --git a/Mage.Sets/src/mage/cards/b/BrindleBoar.java b/Mage.Sets/src/mage/cards/b/BrindleBoar.java index 90e6158903a..6b8eb70c592 100644 --- a/Mage.Sets/src/mage/cards/b/BrindleBoar.java +++ b/Mage.Sets/src/mage/cards/b/BrindleBoar.java @@ -26,7 +26,7 @@ public final class BrindleBoar extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(4), new SacrificeSourceCost())); } private BrindleBoar(final BrindleBoar card) { diff --git a/Mage.Sets/src/mage/cards/b/BristlingHydra.java b/Mage.Sets/src/mage/cards/b/BristlingHydra.java index 3dc629a5976..761311ba228 100644 --- a/Mage.Sets/src/mage/cards/b/BristlingHydra.java +++ b/Mage.Sets/src/mage/cards/b/BristlingHydra.java @@ -36,7 +36,7 @@ public final class BristlingHydra extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(3))); // Pay {E}{E}{E}: Put a +1/+1 count on Bristling Hydra. It gains hexproof until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new PayEnergyCost(3)); Effect effect = new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn); effect.setText("It gains hexproof until end of turn"); diff --git a/Mage.Sets/src/mage/cards/b/BrittleEffigy.java b/Mage.Sets/src/mage/cards/b/BrittleEffigy.java index 551873583e1..3edceba90b6 100644 --- a/Mage.Sets/src/mage/cards/b/BrittleEffigy.java +++ b/Mage.Sets/src/mage/cards/b/BrittleEffigy.java @@ -25,7 +25,7 @@ public final class BrittleEffigy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {4}, {T}, Exile Brittle Effigy: Exile target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/b/BrokenFall.java b/Mage.Sets/src/mage/cards/b/BrokenFall.java index c07985937ad..1c3de475901 100644 --- a/Mage.Sets/src/mage/cards/b/BrokenFall.java +++ b/Mage.Sets/src/mage/cards/b/BrokenFall.java @@ -21,7 +21,7 @@ public final class BrokenFall extends CardImpl { public BrokenFall(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandFromBattlefieldSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ReturnToHandFromBattlefieldSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BroodButcher.java b/Mage.Sets/src/mage/cards/b/BroodButcher.java index 824f242a64a..c7e886d2870 100644 --- a/Mage.Sets/src/mage/cards/b/BroodButcher.java +++ b/Mage.Sets/src/mage/cards/b/BroodButcher.java @@ -39,7 +39,7 @@ public final class BroodButcher extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new EldraziScionToken()).withTextOptions(true), false)); // {B}{G}, Sacrifice a creature: Target creature gets -2/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java index e6a135e1abd..ba5e830dd35 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java +++ b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java @@ -29,7 +29,7 @@ public final class BrothersOfFire extends CardImpl { this.toughness = new MageInt(2); // {1}{R}{R}: Brothers of Fire deals 1 damage to any target and 1 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}{R}")); Effect effect = new DamageControllerEffect(1); effect.setText("and 1 damage to you"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/b/BrownOuphe.java b/Mage.Sets/src/mage/cards/b/BrownOuphe.java index b3f9d7ff462..cf43781bf9a 100644 --- a/Mage.Sets/src/mage/cards/b/BrownOuphe.java +++ b/Mage.Sets/src/mage/cards/b/BrownOuphe.java @@ -37,7 +37,7 @@ public final class BrownOuphe extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {tap}: Counter target activated ability from an artifact source. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetActivatedAbility(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/Browse.java b/Mage.Sets/src/mage/cards/b/Browse.java index d91f1bde0b9..6b46370f253 100644 --- a/Mage.Sets/src/mage/cards/b/Browse.java +++ b/Mage.Sets/src/mage/cards/b/Browse.java @@ -25,7 +25,7 @@ public final class Browse extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); // {2}{U}{U}: Look at the top five cards of your library, put one of them into your hand, and exile the rest. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BrowseEffect(), new ManaCostsImpl<>("{2}{U}{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BrowseEffect(), new ManaCostsImpl<>("{2}{U}{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java b/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java index ebbb9e8798e..ee1810e65b2 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java +++ b/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java @@ -37,7 +37,7 @@ public final class BrutalDeceiver extends CardImpl { this.toughness = new MageInt(2); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, {this} gets +1/+0 and gains first strike until end of turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BrutalDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/b/BubblingCauldron.java b/Mage.Sets/src/mage/cards/b/BubblingCauldron.java index 7662636762f..0f56311c84d 100644 --- a/Mage.Sets/src/mage/cards/b/BubblingCauldron.java +++ b/Mage.Sets/src/mage/cards/b/BubblingCauldron.java @@ -33,12 +33,12 @@ public final class BubblingCauldron extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {1}, {T}, Sacrifice a creature: You gain 4 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new ManaCostsImpl<>("{1}")); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(4), new ManaCostsImpl<>("{1}")); ability1.addCost(new TapSourceCost()); ability1.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability1); // {1}, {T}, Sacrifice a creature named Festering Newt: Each opponent loses 4 life. You gain life equal to the life lost this way. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsYouGainLifeLostEffect(4), new ManaCostsImpl<>("{1}")); + Ability ability2 = new SimpleActivatedAbility(new LoseLifeOpponentsYouGainLifeLostEffect(4), new ManaCostsImpl<>("{1}")); ability2.addCost(new TapSourceCost()); ability2.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/b/BudokaGardener.java b/Mage.Sets/src/mage/cards/b/BudokaGardener.java index f16b53069e7..c993fde2793 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaGardener.java +++ b/Mage.Sets/src/mage/cards/b/BudokaGardener.java @@ -40,7 +40,7 @@ public final class BudokaGardener extends CardImpl { this.flipCardName = "Dokai, Weaver of Life"; // {T}: You may put a land card from your hand onto the battlefield. If you control ten or more lands, flip Budoka Gardener. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new TapSourceCost()); ability.addEffect(new BudokaGardenerEffect()); this.addAbility(ability.addHint(new ValueHint("Lands you control", new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND)))); } @@ -101,7 +101,7 @@ class DokaiWeaverofLife extends TokenImpl { toughness = new MageInt(3); // {4}{G}{G}, {T}: Create an X/X green Elemental creature token, where X is the number of lands you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DokaiWeaverofLifeToken()), new ManaCostsImpl<>("{4}{G}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new DokaiWeaverofLifeToken()), new ManaCostsImpl<>("{4}{G}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/Bullwhip.java b/Mage.Sets/src/mage/cards/b/Bullwhip.java index 02d55d707e8..50309a5d368 100644 --- a/Mage.Sets/src/mage/cards/b/Bullwhip.java +++ b/Mage.Sets/src/mage/cards/b/Bullwhip.java @@ -26,7 +26,7 @@ public final class Bullwhip extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}: Bullwhip deals 1 damage to target creature. That creature attacks this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{2}")); Effect effect = new AttacksIfAbleTargetEffect(Duration.EndOfTurn); effect.setText("that creature attacks this turn if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java b/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java index a9ef35c61db..900974bc71e 100644 --- a/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java +++ b/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java @@ -35,7 +35,7 @@ public final class BurdenOfGuilt extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}: Tap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new TapEnchantedEffect(), new GenericManaCost(1))); } private BurdenOfGuilt(final BurdenOfGuilt card) { diff --git a/Mage.Sets/src/mage/cards/b/BurningAnger.java b/Mage.Sets/src/mage/cards/b/BurningAnger.java index bb80db5080c..a7056b93de9 100644 --- a/Mage.Sets/src/mage/cards/b/BurningAnger.java +++ b/Mage.Sets/src/mage/cards/b/BurningAnger.java @@ -41,7 +41,7 @@ public final class BurningAnger extends CardImpl { // Enchanted creature has "{T}: This creature deals damage equal to its power to any target." Effect effect = new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE); effect.setText("{this} deals damage equal to its power to any target"); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(effect, new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals damage equal to its power to any target.\""))); diff --git a/Mage.Sets/src/mage/cards/b/BurningFistMinotaur.java b/Mage.Sets/src/mage/cards/b/BurningFistMinotaur.java index a672ca2429d..f403cc8ca7a 100644 --- a/Mage.Sets/src/mage/cards/b/BurningFistMinotaur.java +++ b/Mage.Sets/src/mage/cards/b/BurningFistMinotaur.java @@ -33,7 +33,7 @@ public final class BurningFistMinotaur extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {1}{R}, Discard a card: Burning-Fist Minotaur gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java b/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java index 07e0523af1c..345971f848c 100644 --- a/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java +++ b/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java @@ -31,7 +31,7 @@ public final class BurningShieldAskari extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {R}{R}: Burning Shield Askari gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}"))); } private BurningShieldAskari(final BurningShieldAskari card) { diff --git a/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java b/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java index 4fff8e299e9..726fd540351 100644 --- a/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java +++ b/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java @@ -33,13 +33,13 @@ public final class BurningTreeBloodscale extends CardImpl { this.addAbility(new BloodthirstAbility(1)); // {2}{R}: Target creature can't block Burning-Tree Bloodscale this turn. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), + Ability ability1 = new SimpleActivatedAbility(new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); ability1.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); // {2}{G}: Target creature blocks Burning-Tree Bloodscale this turn if able. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(Duration.EndOfTurn), + Ability ability2 = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/b/BurrGrafter.java b/Mage.Sets/src/mage/cards/b/BurrGrafter.java index a7103c49b24..fa15b298a78 100644 --- a/Mage.Sets/src/mage/cards/b/BurrGrafter.java +++ b/Mage.Sets/src/mage/cards/b/BurrGrafter.java @@ -30,7 +30,7 @@ public final class BurrGrafter extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Burr Grafter: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(3)); diff --git a/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java b/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java index 4ddd254b170..3723515c746 100644 --- a/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java +++ b/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java @@ -39,7 +39,7 @@ public final class BurrentonForgeTender extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // Sacrifice Burrenton Forge-Tender: Prevent all damage a red source of your choice would deal this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageBySourceEffect(filterObject), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility( new PreventDamageBySourceEffect(filterObject), new SacrificeSourceCost())); } -- 2.47.2 From 8628de0c1fb5746b3a0232bfa71abb083fdbdbe6 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:26:19 -0500 Subject: [PATCH 30/50] refactor: SimpleActivatedAbility default zone (cards C) --- Mage.Sets/src/mage/cards/c/CabalArchon.java | 2 +- Mage.Sets/src/mage/cards/c/CabalTrainee.java | 2 +- Mage.Sets/src/mage/cards/c/CacklingImp.java | 2 +- Mage.Sets/src/mage/cards/c/CadaverousKnight.java | 2 +- Mage.Sets/src/mage/cards/c/CalciformPools.java | 2 +- Mage.Sets/src/mage/cards/c/CalderaKavu.java | 4 ++-- Mage.Sets/src/mage/cards/c/CallOfTheWild.java | 2 +- Mage.Sets/src/mage/cards/c/CallerOfGales.java | 2 +- Mage.Sets/src/mage/cards/c/CallousDeceiver.java | 2 +- Mage.Sets/src/mage/cards/c/CallousOppressor.java | 2 +- Mage.Sets/src/mage/cards/c/CanalDredger.java | 2 +- Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java | 2 +- Mage.Sets/src/mage/cards/c/CandlesOfLeng.java | 2 +- Mage.Sets/src/mage/cards/c/CanopyDragon.java | 2 +- Mage.Sets/src/mage/cards/c/CantinaBand.java | 2 +- Mage.Sets/src/mage/cards/c/CanyonDrake.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenKnight.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenStandard.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenTemplar.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenUnicorn.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainSisay.java | 2 +- Mage.Sets/src/mage/cards/c/CaptivatingVampire.java | 2 +- Mage.Sets/src/mage/cards/c/CaptiveFlame.java | 2 +- Mage.Sets/src/mage/cards/c/Carapace.java | 2 +- Mage.Sets/src/mage/cards/c/Caregiver.java | 2 +- Mage.Sets/src/mage/cards/c/CaribouRange.java | 4 ++-- Mage.Sets/src/mage/cards/c/CarnageAltar.java | 2 +- Mage.Sets/src/mage/cards/c/CarnageGladiator.java | 2 +- Mage.Sets/src/mage/cards/c/Carnassid.java | 2 +- Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionAnts.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionBeetles.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionHowler.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionWall.java | 2 +- Mage.Sets/src/mage/cards/c/CatapultMaster.java | 2 +- Mage.Sets/src/mage/cards/c/CatapultSquad.java | 2 +- Mage.Sets/src/mage/cards/c/CateranBrute.java | 2 +- Mage.Sets/src/mage/cards/c/CateranEnforcer.java | 2 +- Mage.Sets/src/mage/cards/c/CateranKidnappers.java | 2 +- Mage.Sets/src/mage/cards/c/CateranOverlord.java | 4 ++-- Mage.Sets/src/mage/cards/c/CateranPersuader.java | 2 +- Mage.Sets/src/mage/cards/c/CateranSlaver.java | 2 +- Mage.Sets/src/mage/cards/c/CatharCommando.java | 2 +- Mage.Sets/src/mage/cards/c/CauldronOfSouls.java | 2 +- Mage.Sets/src/mage/cards/c/CausticCaterpillar.java | 2 +- Mage.Sets/src/mage/cards/c/CausticTar.java | 2 +- Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java | 2 +- Mage.Sets/src/mage/cards/c/CavePeople.java | 2 +- Mage.Sets/src/mage/cards/c/CavernCrawler.java | 2 +- Mage.Sets/src/mage/cards/c/CavernHarpy.java | 2 +- Mage.Sets/src/mage/cards/c/CavernThoctar.java | 2 +- Mage.Sets/src/mage/cards/c/CelestialColonnade.java | 2 +- Mage.Sets/src/mage/cards/c/CellarDoor.java | 2 +- Mage.Sets/src/mage/cards/c/CemeteryReaper.java | 2 +- Mage.Sets/src/mage/cards/c/CennsTactician.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurArcher.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurGlade.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurVeteran.java | 2 +- Mage.Sets/src/mage/cards/c/CentaursHerald.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidBroker.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidIllusionist.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidRetainer.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidScout.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidSnitch.java | 2 +- Mage.Sets/src/mage/cards/c/CeruleanSphinx.java | 2 +- Mage.Sets/src/mage/cards/c/CetaDisciple.java | 2 +- Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java | 2 +- Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java | 2 +- Mage.Sets/src/mage/cards/c/ChaliceOfLife.java | 2 +- Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java | 2 +- Mage.Sets/src/mage/cards/c/ChamberSentry.java | 2 +- Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java | 2 +- Mage.Sets/src/mage/cards/c/Chandler.java | 2 +- Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java | 2 +- Mage.Sets/src/mage/cards/c/CharRumbler.java | 2 +- Mage.Sets/src/mage/cards/c/ChargingTroll.java | 2 +- Mage.Sets/src/mage/cards/c/CharmPeddler.java | 2 +- Mage.Sets/src/mage/cards/c/ChartoothCougar.java | 2 +- Mage.Sets/src/mage/cards/c/ChickenALaKing.java | 2 +- Mage.Sets/src/mage/cards/c/ChildOfGaea.java | 2 +- Mage.Sets/src/mage/cards/c/ChildOfThorns.java | 2 +- Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java | 2 +- Mage.Sets/src/mage/cards/c/ChillingApparition.java | 2 +- Mage.Sets/src/mage/cards/c/ChillingShade.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericEgg.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericIdol.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericMass.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericSphere.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChirrutImwe.java | 2 +- Mage.Sets/src/mage/cards/c/ChitteringWitch.java | 2 +- Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java | 2 +- Mage.Sets/src/mage/cards/c/ChokingRestraints.java | 2 +- Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java | 2 +- Mage.Sets/src/mage/cards/c/Chronomaton.java | 2 +- Mage.Sets/src/mage/cards/c/CinderElemental.java | 2 +- Mage.Sets/src/mage/cards/c/CinderPyromancer.java | 2 +- Mage.Sets/src/mage/cards/c/CinderShade.java | 4 ++-- Mage.Sets/src/mage/cards/c/Cinderbones.java | 2 +- Mage.Sets/src/mage/cards/c/CinderhazeWretch.java | 4 ++-- Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java | 2 +- Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java | 2 +- Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java | 2 +- Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java | 2 +- Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java | 2 +- Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java | 2 +- Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java | 2 +- Mage.Sets/src/mage/cards/c/CircleOfSolace.java | 2 +- Mage.Sets/src/mage/cards/c/CityOfShadows.java | 2 +- Mage.Sets/src/mage/cards/c/CivicGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/c/CivilizedScholar.java | 2 +- Mage.Sets/src/mage/cards/c/ClaimOfErebos.java | 2 +- Mage.Sets/src/mage/cards/c/ClawsOfGix.java | 2 +- Mage.Sets/src/mage/cards/c/ClayStatue.java | 4 ++-- Mage.Sets/src/mage/cards/c/ClergyEnVec.java | 2 +- Mage.Sets/src/mage/cards/c/Clickslither.java | 2 +- Mage.Sets/src/mage/cards/c/CliffsideLookout.java | 2 +- Mage.Sets/src/mage/cards/c/ClockworkDragon.java | 2 +- Mage.Sets/src/mage/cards/c/ClockworkGnomes.java | 2 +- Mage.Sets/src/mage/cards/c/ClockworkVorrac.java | 2 +- Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java | 2 +- Mage.Sets/src/mage/cards/c/CloudgoatRanger.java | 2 +- Mage.Sets/src/mage/cards/c/CloudheathDrake.java | 2 +- Mage.Sets/src/mage/cards/c/Cloudseeder.java | 2 +- Mage.Sets/src/mage/cards/c/CoalitionRelic.java | 2 +- Mage.Sets/src/mage/cards/c/CoastalDrake.java | 2 +- Mage.Sets/src/mage/cards/c/CoastalHornclaw.java | 2 +- Mage.Sets/src/mage/cards/c/CoastlineChimera.java | 2 +- Mage.Sets/src/mage/cards/c/CobaltGolem.java | 2 +- Mage.Sets/src/mage/cards/c/CoffinQueen.java | 2 +- Mage.Sets/src/mage/cards/c/CogworkAssembler.java | 2 +- Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java | 2 +- Mage.Sets/src/mage/cards/c/ColosYearling.java | 2 +- Mage.Sets/src/mage/cards/c/CombatMedic.java | 2 +- Mage.Sets/src/mage/cards/c/CommandBeacon.java | 2 +- Mage.Sets/src/mage/cards/c/CommandersSphere.java | 2 +- Mage.Sets/src/mage/cards/c/Compulsion.java | 4 ++-- Mage.Sets/src/mage/cards/c/CompulsoryRest.java | 2 +- Mage.Sets/src/mage/cards/c/ConchHorn.java | 2 +- Mage.Sets/src/mage/cards/c/ConduitOfStorms.java | 2 +- Mage.Sets/src/mage/cards/c/ConjurersBauble.java | 2 +- Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java | 2 +- Mage.Sets/src/mage/cards/c/Conservator.java | 2 +- Mage.Sets/src/mage/cards/c/ConsulateTurret.java | 4 ++-- Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java | 2 +- Mage.Sets/src/mage/cards/c/ContagionClasp.java | 2 +- Mage.Sets/src/mage/cards/c/ContagionEngine.java | 2 +- Mage.Sets/src/mage/cards/c/ContestedCliffs.java | 2 +- Mage.Sets/src/mage/cards/c/ConversionChamber.java | 4 ++-- Mage.Sets/src/mage/cards/c/Conviction.java | 2 +- Mage.Sets/src/mage/cards/c/CopperLeafAngel.java | 2 +- Mage.Sets/src/mage/cards/c/CoralHelm.java | 2 +- Mage.Sets/src/mage/cards/c/CoralReef.java | 4 ++-- Mage.Sets/src/mage/cards/c/CoralhelmGuide.java | 2 +- Mage.Sets/src/mage/cards/c/Coretapper.java | 4 ++-- Mage.Sets/src/mage/cards/c/CorpseHauler.java | 2 +- Mage.Sets/src/mage/cards/c/Corpseweft.java | 2 +- Mage.Sets/src/mage/cards/c/CorruptOfficial.java | 2 +- Mage.Sets/src/mage/cards/c/CorruptedHarvester.java | 2 +- Mage.Sets/src/mage/cards/c/CouriersCapsule.java | 2 +- Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrabUmbra.java | 2 +- Mage.Sets/src/mage/cards/c/Crackleburr.java | 4 ++-- Mage.Sets/src/mage/cards/c/CracklingClub.java | 2 +- Mage.Sets/src/mage/cards/c/CracklingPerimeter.java | 2 +- Mage.Sets/src/mage/cards/c/CracklingTriton.java | 2 +- Mage.Sets/src/mage/cards/c/CraftyPathmage.java | 2 +- Mage.Sets/src/mage/cards/c/CragPuca.java | 2 +- Mage.Sets/src/mage/cards/c/CranialArchive.java | 2 +- Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java | 2 +- Mage.Sets/src/mage/cards/c/CreditVoucher.java | 2 +- Mage.Sets/src/mage/cards/c/CreepingInn.java | 2 +- Mage.Sets/src/mage/cards/c/CreepingTarPit.java | 2 +- Mage.Sets/src/mage/cards/c/CrenellatedWall.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonHellkite.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonMage.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonManticore.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java | 2 +- Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrookedScales.java | 2 +- Mage.Sets/src/mage/cards/c/CrossbowInfantry.java | 2 +- Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java | 2 +- Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java | 2 +- Mage.Sets/src/mage/cards/c/CrowdFavorites.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrownOfConvergence.java | 2 +- Mage.Sets/src/mage/cards/c/CrownOfEmpires.java | 2 +- Mage.Sets/src/mage/cards/c/CrownOfFlames.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrownOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java | 2 +- Mage.Sets/src/mage/cards/c/CruelDeceiver.java | 2 +- Mage.Sets/src/mage/cards/c/CryptCreeper.java | 2 +- Mage.Sets/src/mage/cards/c/CryptRats.java | 2 +- Mage.Sets/src/mage/cards/c/CryptRipper.java | 2 +- Mage.Sets/src/mage/cards/c/Cryptbreaker.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrypticCruiser.java | 2 +- Mage.Sets/src/mage/cards/c/CrystalBall.java | 2 +- Mage.Sets/src/mage/cards/c/CrystalChimes.java | 2 +- Mage.Sets/src/mage/cards/c/CrystalSeer.java | 3 +-- Mage.Sets/src/mage/cards/c/CrystallineCrawler.java | 2 +- Mage.Sets/src/mage/cards/c/CudgelTroll.java | 2 +- Mage.Sets/src/mage/cards/c/CullingDais.java | 4 ++-- Mage.Sets/src/mage/cards/c/CultGuildmage.java | 2 +- Mage.Sets/src/mage/cards/c/CunningSparkmage.java | 2 +- Mage.Sets/src/mage/cards/c/CuombajjWitches.java | 4 ++-- Mage.Sets/src/mage/cards/c/CursedRonin.java | 2 +- Mage.Sets/src/mage/cards/c/CursedScroll.java | 2 +- Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java | 2 +- Mage.Sets/src/mage/cards/c/CyclopeanSnare.java | 2 +- Mage.Sets/src/mage/cards/c/CytoplastManipulator.java | 2 +- Mage.Sets/src/mage/cards/c/CytoplastRootKin.java | 2 +- Mage.Sets/src/mage/cards/c/CytospawnShambler.java | 2 +- 212 files changed, 233 insertions(+), 234 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CabalArchon.java b/Mage.Sets/src/mage/cards/c/CabalArchon.java index a700fa702ad..22719665572 100644 --- a/Mage.Sets/src/mage/cards/c/CabalArchon.java +++ b/Mage.Sets/src/mage/cards/c/CabalArchon.java @@ -39,7 +39,7 @@ public final class CabalArchon extends CardImpl { this.toughness = new MageInt(2); // {B}, Sacrifice a Cleric: Target player loses 2 life and you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}")); Effect effect = new GainLifeEffect(2); effect.setText("and you gain 2 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CabalTrainee.java b/Mage.Sets/src/mage/cards/c/CabalTrainee.java index fd6fac23686..824764e09da 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTrainee.java +++ b/Mage.Sets/src/mage/cards/c/CabalTrainee.java @@ -29,7 +29,7 @@ public final class CabalTrainee extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Cabal Trainee: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CacklingImp.java b/Mage.Sets/src/mage/cards/c/CacklingImp.java index f7959e55059..e5c9f7f28fd 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingImp.java +++ b/Mage.Sets/src/mage/cards/c/CacklingImp.java @@ -31,7 +31,7 @@ public final class CacklingImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java index 0b892ed6521..49cf0a3147e 100644 --- a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java +++ b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java @@ -30,7 +30,7 @@ public final class CadaverousKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {1}{B}{B}: Regenerate Cadaverous Knight. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{B}"))); } private CadaverousKnight(final CadaverousKnight card) { diff --git a/Mage.Sets/src/mage/cards/c/CalciformPools.java b/Mage.Sets/src/mage/cards/c/CalciformPools.java index 53346c4624e..e9eab23afed 100644 --- a/Mage.Sets/src/mage/cards/c/CalciformPools.java +++ b/Mage.Sets/src/mage/cards/c/CalciformPools.java @@ -31,7 +31,7 @@ public final class CalciformPools extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Put a storage counter on Calciform Pools. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Calciform Pools: Add X mana in any combination of {W} and/or {U}. diff --git a/Mage.Sets/src/mage/cards/c/CalderaKavu.java b/Mage.Sets/src/mage/cards/c/CalderaKavu.java index d7cb8e0150e..587e2a8adf6 100644 --- a/Mage.Sets/src/mage/cards/c/CalderaKavu.java +++ b/Mage.Sets/src/mage/cards/c/CalderaKavu.java @@ -28,9 +28,9 @@ public final class CalderaKavu extends CardImpl { this.toughness = new MageInt(2); // {1}{B}: Caldera Kavu gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); // {G}: Caldera Kavu becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private CalderaKavu(final CalderaKavu card) { diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java index 32477b03dbf..90170c4962e 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java @@ -24,7 +24,7 @@ public final class CallOfTheWild extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}{G}"); // {2}{G}{G}: Reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, put it into your graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CallOfTheWildEffect(), new ManaCostsImpl<>("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CallOfTheWildEffect(), new ManaCostsImpl<>("{2}{G}{G}"))); } private CallOfTheWild(final CallOfTheWild card) { diff --git a/Mage.Sets/src/mage/cards/c/CallerOfGales.java b/Mage.Sets/src/mage/cards/c/CallerOfGales.java index fbddfbe6e2e..96b5f1b66ad 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfGales.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfGales.java @@ -33,7 +33,7 @@ public final class CallerOfGales extends CardImpl { this.toughness = new MageInt(1); // {1}{U}, {T}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java index 61ddb8e5de8..8f7ee193662 100644 --- a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java @@ -36,7 +36,7 @@ public final class CallousDeceiver extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, {this} gets +1/+0 and gains flying until end of turn. Activate this ability only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CallousDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/c/CallousOppressor.java b/Mage.Sets/src/mage/cards/c/CallousOppressor.java index 690964fda6e..08905a71b70 100644 --- a/Mage.Sets/src/mage/cards/c/CallousOppressor.java +++ b/Mage.Sets/src/mage/cards/c/CallousOppressor.java @@ -49,7 +49,7 @@ public final class CallousOppressor extends CardImpl { new GainControlTargetEffect(Duration.OneUse), SourceTappedCondition.TAPPED, "Gain control of target creature for as long as {this} remains tapped"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new CallousOppressorFilter())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CanalDredger.java b/Mage.Sets/src/mage/cards/c/CanalDredger.java index 745fec83196..a17cda24833 100644 --- a/Mage.Sets/src/mage/cards/c/CanalDredger.java +++ b/Mage.Sets/src/mage/cards/c/CanalDredger.java @@ -37,7 +37,7 @@ public final class CanalDredger extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Each player passes the last card from each booster pack to a player who drafted a card named Canal Dredger - not implemented."))); // {T}: Put target card from your graveyard on the bottom of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java index b8b1a80ff8e..bfee94f79fb 100644 --- a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java +++ b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java @@ -28,7 +28,7 @@ public final class CandelabraOfTawnos extends CardImpl { // {X}, {T}: Untap X target lands. Effect effect = new UntapTargetEffect(); effect.setText("untap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); ability.setTargetAdjuster(new XTargetsCountAdjuster()); diff --git a/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java b/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java index f23c3917809..8b3ce2a7cf3 100644 --- a/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java +++ b/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java @@ -28,7 +28,7 @@ public final class CandlesOfLeng extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {4}, {tap}: Reveal the top card of your library. If it has the same name as a card in your graveyard, put it into your graveyard. Otherwise, draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CandlesOfLengEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CandlesOfLengEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CanopyDragon.java b/Mage.Sets/src/mage/cards/c/CanopyDragon.java index 2a14fcfc206..300603b262f 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyDragon.java +++ b/Mage.Sets/src/mage/cards/c/CanopyDragon.java @@ -35,7 +35,7 @@ public final class CanopyDragon extends CardImpl { // {1}{G}: Canopy Dragon gains flying and loses trample until end of turn. Effect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("{this} gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{G}")); effect = new LoseAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and loses trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CantinaBand.java b/Mage.Sets/src/mage/cards/c/CantinaBand.java index 933238f154b..36d2de81d0a 100644 --- a/Mage.Sets/src/mage/cards/c/CantinaBand.java +++ b/Mage.Sets/src/mage/cards/c/CantinaBand.java @@ -36,7 +36,7 @@ public final class CantinaBand extends CardImpl { this.toughness = new MageInt(1); // {T}, {1}: Tap target nonartifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CanyonDrake.java b/Mage.Sets/src/mage/cards/c/CanyonDrake.java index 9c103e72d9a..bd25368c9b3 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonDrake.java +++ b/Mage.Sets/src/mage/cards/c/CanyonDrake.java @@ -31,7 +31,7 @@ public final class CanyonDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}, Discard a card at random: Canyon Drake gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CapashenKnight.java b/Mage.Sets/src/mage/cards/c/CapashenKnight.java index b91fa037bca..0f9e596abbb 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenKnight.java +++ b/Mage.Sets/src/mage/cards/c/CapashenKnight.java @@ -30,7 +30,7 @@ public final class CapashenKnight extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {1}{W}: Capashen Knight gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private CapashenKnight(final CapashenKnight card) { diff --git a/Mage.Sets/src/mage/cards/c/CapashenStandard.java b/Mage.Sets/src/mage/cards/c/CapashenStandard.java index b6e6db81af7..b8c4f134d12 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenStandard.java +++ b/Mage.Sets/src/mage/cards/c/CapashenStandard.java @@ -40,7 +40,7 @@ public final class CapashenStandard extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {2}, Sacrifice Capashen Standard: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java index 55a4e92b63c..8a1824db865 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java +++ b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java @@ -28,7 +28,7 @@ public final class CapashenTemplar extends CardImpl { this.toughness = new MageInt(2); // {W}: Capashen Templar gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private CapashenTemplar(final CapashenTemplar card) { diff --git a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java index a080d12ba83..39dc30d3f77 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java +++ b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java @@ -31,7 +31,7 @@ public final class CapashenUnicorn extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {tap}, Sacrifice Capashen Unicorn: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java index ebfb997e9bf..056ca56bcbb 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java @@ -46,7 +46,7 @@ public final class CaptainOfTheMists extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new UntapSourceEffect(), filter)); // {1}{U}, {tap}: You may tap or untap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CaptainSisay.java b/Mage.Sets/src/mage/cards/c/CaptainSisay.java index 1fe7331e7da..7d57746a42e 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainSisay.java +++ b/Mage.Sets/src/mage/cards/c/CaptainSisay.java @@ -37,7 +37,7 @@ public final class CaptainSisay extends CardImpl { this.toughness = new MageInt(2); // {tap}: Search your library for a legendary card, reveal that card, and put it into your hand. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new TapSourceCost())); } private CaptainSisay(final CaptainSisay card) { diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java index 2a2e358476f..c2c1f3224e8 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java @@ -45,7 +45,7 @@ public final class CaptivatingVampire extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Tap five untapped Vampires you control: Gain control of target creature. It becomes a Vampire in addition to its other types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CaptivatingVampireEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter2, true))); + Ability ability = new SimpleActivatedAbility(new CaptivatingVampireEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter2, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CaptiveFlame.java b/Mage.Sets/src/mage/cards/c/CaptiveFlame.java index a78b7db6be2..1f703e98907 100644 --- a/Mage.Sets/src/mage/cards/c/CaptiveFlame.java +++ b/Mage.Sets/src/mage/cards/c/CaptiveFlame.java @@ -24,7 +24,7 @@ public final class CaptiveFlame extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // {R}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Carapace.java b/Mage.Sets/src/mage/cards/c/Carapace.java index a16077b3126..a450b9e3774 100644 --- a/Mage.Sets/src/mage/cards/c/Carapace.java +++ b/Mage.Sets/src/mage/cards/c/Carapace.java @@ -35,7 +35,7 @@ public final class Carapace extends CardImpl { // Enchanted creature gets +0/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); // Sacrifice Carapace: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } private Carapace(final Carapace card) { diff --git a/Mage.Sets/src/mage/cards/c/Caregiver.java b/Mage.Sets/src/mage/cards/c/Caregiver.java index 0277337394f..075f32f4ab3 100644 --- a/Mage.Sets/src/mage/cards/c/Caregiver.java +++ b/Mage.Sets/src/mage/cards/c/Caregiver.java @@ -34,7 +34,7 @@ public final class Caregiver extends CardImpl { this.toughness = new MageInt(1); // {W}, Sacrifice a creature: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index 20d11dd93ed..90b983d8042 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -47,13 +47,13 @@ public final class CaribouRange extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{W}{W}, {T}: Create a 0/1 white Caribou creature token." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl<>("{W}{W}")); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{W}{W}, {T}: Create a 0/1 white Caribou creature token.\""); this.addAbility(new SimpleStaticAbility(effect)); // Sacrifice a Caribou token: You gain 1 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(1), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/c/CarnageAltar.java b/Mage.Sets/src/mage/cards/c/CarnageAltar.java index a4310799c3b..d22b1ed4824 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageAltar.java +++ b/Mage.Sets/src/mage/cards/c/CarnageAltar.java @@ -22,7 +22,7 @@ public final class CarnageAltar extends CardImpl { public CarnageAltar(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java index 357f9323479..a610925edcb 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java +++ b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java @@ -33,7 +33,7 @@ public final class CarnageGladiator extends CardImpl { this.addAbility(new CarnageGladiatorTriggeredAbility()); // {1}{B}{R}: Renegerate Carnage Gladiator. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(),new ManaCostsImpl<>("{1}{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(),new ManaCostsImpl<>("{1}{B}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/c/Carnassid.java b/Mage.Sets/src/mage/cards/c/Carnassid.java index 9826e6092bf..3ff076f2d85 100644 --- a/Mage.Sets/src/mage/cards/c/Carnassid.java +++ b/Mage.Sets/src/mage/cards/c/Carnassid.java @@ -29,7 +29,7 @@ public final class Carnassid extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {1}{G}: Regenerate Carnassid. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private Carnassid(final Carnassid card) { diff --git a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java index 670356a0ab7..8c81dae9adb 100644 --- a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java +++ b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java @@ -29,7 +29,7 @@ public final class CarnivorousMossBeast extends CardImpl { this.toughness = new MageInt(5); // {5}{G}{G}: Put a +1/+1 counter on Carnivorous Moss-Beast. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{5}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{5}{G}{G}"))); } private CarnivorousMossBeast(final CarnivorousMossBeast card) { diff --git a/Mage.Sets/src/mage/cards/c/CarrionAnts.java b/Mage.Sets/src/mage/cards/c/CarrionAnts.java index ac7d277b66f..d0e805c957d 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionAnts.java +++ b/Mage.Sets/src/mage/cards/c/CarrionAnts.java @@ -26,7 +26,7 @@ public final class CarrionAnts extends CardImpl { this.toughness = new MageInt(1); // {1}: Carrion Ants gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java index b4beb79ff3c..f0fa956f9b9 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java +++ b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java @@ -28,7 +28,7 @@ public final class CarrionBeetles extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, {T}: Exile up to three target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 3, StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CarrionHowler.java b/Mage.Sets/src/mage/cards/c/CarrionHowler.java index 856defc68ff..4d884bd98e0 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionHowler.java +++ b/Mage.Sets/src/mage/cards/c/CarrionHowler.java @@ -28,7 +28,7 @@ public final class CarrionHowler extends CardImpl { this.toughness = new MageInt(2); // Pay 1 life: Carrion Howler gets +2/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -1, Duration.EndOfTurn), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -1, Duration.EndOfTurn), new PayLifeCost(1))); } private CarrionHowler(final CarrionHowler card) { diff --git a/Mage.Sets/src/mage/cards/c/CarrionWall.java b/Mage.Sets/src/mage/cards/c/CarrionWall.java index a85aa5682ec..759b86a031e 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionWall.java +++ b/Mage.Sets/src/mage/cards/c/CarrionWall.java @@ -29,7 +29,7 @@ public final class CarrionWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {1}{B}: Regenerate Carrion Wall. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private CarrionWall(final CarrionWall card) { diff --git a/Mage.Sets/src/mage/cards/c/CatapultMaster.java b/Mage.Sets/src/mage/cards/c/CatapultMaster.java index a6cef771cb2..c4829cbf0a0 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultMaster.java +++ b/Mage.Sets/src/mage/cards/c/CatapultMaster.java @@ -38,7 +38,7 @@ public final class CatapultMaster extends CardImpl { this.toughness = new MageInt(3); // Tap five untapped Soldiers you control: Exile target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapTargetCost(new TargetControlledPermanent(5,5,filter,false))); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapTargetCost(new TargetControlledPermanent(5,5,filter,false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CatapultSquad.java b/Mage.Sets/src/mage/cards/c/CatapultSquad.java index e9c75b770f7..ab28ba6efdd 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultSquad.java +++ b/Mage.Sets/src/mage/cards/c/CatapultSquad.java @@ -39,7 +39,7 @@ public final class CatapultSquad extends CardImpl { this.toughness = new MageInt(1); // Tap two untapped Soldiers you control: Catapult Squad deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranBrute.java b/Mage.Sets/src/mage/cards/c/CateranBrute.java index 35ac5ea0ccc..04821485eca 100644 --- a/Mage.Sets/src/mage/cards/c/CateranBrute.java +++ b/Mage.Sets/src/mage/cards/c/CateranBrute.java @@ -41,7 +41,7 @@ public final class CateranBrute extends CardImpl { this.toughness = new MageInt(2); // {2}, {T}: Search your library for a Mercenary permanent card with converted mana cost 2 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java index bed35f07988..cd45d11e256 100644 --- a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java +++ b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java @@ -45,7 +45,7 @@ public final class CateranEnforcer extends CardImpl { this.addAbility(FearAbility.getInstance()); // {4}, {T}: Search your library for a Mercenary permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(4)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java index ada5b879e10..20ea4aeae55 100644 --- a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java +++ b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java @@ -40,7 +40,7 @@ public final class CateranKidnappers extends CardImpl { this.toughness = new MageInt(2); // {3}, {T}: Search your library for a Mercenary permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranOverlord.java b/Mage.Sets/src/mage/cards/c/CateranOverlord.java index 0b5e00bec15..5040e4733e1 100644 --- a/Mage.Sets/src/mage/cards/c/CateranOverlord.java +++ b/Mage.Sets/src/mage/cards/c/CateranOverlord.java @@ -44,11 +44,11 @@ public final class CateranOverlord extends CardImpl { this.toughness = new MageInt(5); // Sacrifice a creature: Regenerate Cateran Overlord. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); // {6}, {T}: Search your library for a Mercenary permanent card with converted mana cost 6 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(6)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranPersuader.java b/Mage.Sets/src/mage/cards/c/CateranPersuader.java index 71a3564b25f..98669eb8a16 100644 --- a/Mage.Sets/src/mage/cards/c/CateranPersuader.java +++ b/Mage.Sets/src/mage/cards/c/CateranPersuader.java @@ -41,7 +41,7 @@ public final class CateranPersuader extends CardImpl { this.toughness = new MageInt(1); // {1}, {T}: Search your library for a Mercenary permanent card with converted mana cost 1 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranSlaver.java b/Mage.Sets/src/mage/cards/c/CateranSlaver.java index 418e9ff8cc3..eeff750768e 100644 --- a/Mage.Sets/src/mage/cards/c/CateranSlaver.java +++ b/Mage.Sets/src/mage/cards/c/CateranSlaver.java @@ -43,7 +43,7 @@ public final class CateranSlaver extends CardImpl { this.addAbility(new SwampwalkAbility()); // {5}, {T}: Search your library for a Mercenary permanent card with converted mana cost 5 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CatharCommando.java b/Mage.Sets/src/mage/cards/c/CatharCommando.java index 395e4626132..ac951d101f4 100644 --- a/Mage.Sets/src/mage/cards/c/CatharCommando.java +++ b/Mage.Sets/src/mage/cards/c/CatharCommando.java @@ -30,7 +30,7 @@ public final class CatharCommando extends CardImpl { this.addAbility(FlashAbility.getInstance()); // {1}, Sacrifice Cathar Commando: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); 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/c/CauldronOfSouls.java b/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java index be0507b42b0..49d6eac6183 100644 --- a/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java +++ b/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java @@ -28,7 +28,7 @@ public final class CauldronOfSouls extends CardImpl { // {tap}: Choose any number of target creatures. Each of those creatures gains persist until end of turn. Effect effect = new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn); effect.setText("choose any number of target creatures. Each of those creatures gains persist until end of turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE, StaticFilters.FILTER_PERMANENT_CREATURE, false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java index ea55883c59e..2837178a2f7 100644 --- a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java +++ b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java @@ -30,7 +30,7 @@ public final class CausticCaterpillar extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Caustic Caterpillar: 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/c/CausticTar.java b/Mage.Sets/src/mage/cards/c/CausticTar.java index 072df12adab..7c05e83a56d 100644 --- a/Mage.Sets/src/mage/cards/c/CausticTar.java +++ b/Mage.Sets/src/mage/cards/c/CausticTar.java @@ -36,7 +36,7 @@ public final class CausticTar extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Target player loses 3 life." - Ability tarAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new TapSourceCost()); + Ability tarAbility = new SimpleActivatedAbility(new LoseLifeTargetEffect(3), new TapSourceCost()); tarAbility.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(tarAbility, AttachmentType.AURA, Duration.WhileOnBattlefield,"Enchanted land has \"{T}: Target player loses 3 life.\""))); diff --git a/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java b/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java index f41ed1b6973..7798bd24491 100644 --- a/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java +++ b/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java @@ -44,7 +44,7 @@ public final class CaveOfTheFrostDragon extends CardImpl { this.addAbility(new WhiteManaAbility()); // {4}{W}: Cave of the Frost Dragon becomes a 3/4 white Dragon creature with flying until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 4, "3/4 white Dragon creature with flying") .withColor("W") .withSubType(SubType.DRAGON) diff --git a/Mage.Sets/src/mage/cards/c/CavePeople.java b/Mage.Sets/src/mage/cards/c/CavePeople.java index cf326643e0f..b5346ab3ece 100644 --- a/Mage.Sets/src/mage/cards/c/CavePeople.java +++ b/Mage.Sets/src/mage/cards/c/CavePeople.java @@ -35,7 +35,7 @@ public final class CavePeople extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(1, -2, Duration.EndOfTurn), false)); // {1}{R}{R}, {tap}: Target creature gains mountainwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new MountainwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new MountainwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CavernCrawler.java b/Mage.Sets/src/mage/cards/c/CavernCrawler.java index 860671b51fe..ba8dddad025 100644 --- a/Mage.Sets/src/mage/cards/c/CavernCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CavernCrawler.java @@ -30,7 +30,7 @@ public final class CavernCrawler extends CardImpl { this.addAbility(new MountainwalkAbility()); // {R}: Cavern Crawler 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}"))); } private CavernCrawler(final CavernCrawler card) { diff --git a/Mage.Sets/src/mage/cards/c/CavernHarpy.java b/Mage.Sets/src/mage/cards/c/CavernHarpy.java index 834ce621f07..d6b8f8d0d4d 100644 --- a/Mage.Sets/src/mage/cards/c/CavernHarpy.java +++ b/Mage.Sets/src/mage/cards/c/CavernHarpy.java @@ -44,7 +44,7 @@ public final class CavernHarpy extends CardImpl { // When Cavern Harpy enters the battlefield, return a blue or black creature you control to its owner's hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter), false)); // Pay 1 life: Return Cavern Harpy to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new PayLifeCost(1))); } private CavernHarpy(final CavernHarpy card) { diff --git a/Mage.Sets/src/mage/cards/c/CavernThoctar.java b/Mage.Sets/src/mage/cards/c/CavernThoctar.java index f60399a6226..d89e4d7c995 100644 --- a/Mage.Sets/src/mage/cards/c/CavernThoctar.java +++ b/Mage.Sets/src/mage/cards/c/CavernThoctar.java @@ -26,7 +26,7 @@ public final class CavernThoctar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private CavernThoctar(final CavernThoctar card) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java index 1183bf95990..17054982509 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java +++ b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java @@ -35,7 +35,7 @@ public final class CelestialColonnade extends CardImpl { this.addAbility(new WhiteManaAbility()); // {3}{W}{U}: Until end of turn, Celestial Colonnade becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(4, 4, "4/4 white and blue Elemental creature with flying and vigilance") .withColor("WU") .withSubType(SubType.ELEMENTAL) diff --git a/Mage.Sets/src/mage/cards/c/CellarDoor.java b/Mage.Sets/src/mage/cards/c/CellarDoor.java index 26f7c3683e3..8f0ba428501 100644 --- a/Mage.Sets/src/mage/cards/c/CellarDoor.java +++ b/Mage.Sets/src/mage/cards/c/CellarDoor.java @@ -28,7 +28,7 @@ public final class CellarDoor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Target player puts the bottom card of their library into their graveyard. If it's a creature card, you create a 2/2 black Zombie creature token. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CellarDoorEffect(), new GenericManaCost(3)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CellarDoorEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java index acd3bf384e1..8b5f5fd7655 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java @@ -44,7 +44,7 @@ public final class CemeteryReaper extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {2}{B}, {T} : Exile target creature card from a graveyard. Create a 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new CreateTokenEffect(new ZombieToken())); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/c/CennsTactician.java b/Mage.Sets/src/mage/cards/c/CennsTactician.java index 711c5ef7d97..2bc13f43866 100644 --- a/Mage.Sets/src/mage/cards/c/CennsTactician.java +++ b/Mage.Sets/src/mage/cards/c/CennsTactician.java @@ -37,7 +37,7 @@ public final class CennsTactician extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Put a +1/+1 counter on target Soldier creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filterSoldier)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CentaurArcher.java b/Mage.Sets/src/mage/cards/c/CentaurArcher.java index 8dc75effa43..b848646cc85 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurArcher.java +++ b/Mage.Sets/src/mage/cards/c/CentaurArcher.java @@ -38,7 +38,7 @@ public final class CentaurArcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: Centaur Archer deals 1 damage to target creature with flying. - Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability activatedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); activatedAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/cards/c/CentaurGlade.java b/Mage.Sets/src/mage/cards/c/CentaurGlade.java index 2036da19bf0..4ea34d0fd41 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGlade.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGlade.java @@ -21,7 +21,7 @@ public final class CentaurGlade extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}{G}"); // {2}{G}{G}: Create a 3/3 green Centaur creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken(), 1), new ManaCostsImpl<>("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new CentaurToken(), 1), new ManaCostsImpl<>("{2}{G}{G}"))); } private CentaurGlade(final CentaurGlade card) { diff --git a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java index 1a653f4c9e0..662fea5b9f3 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java +++ b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java @@ -30,7 +30,7 @@ public final class CentaurVeteran extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {G}, Discard a card: Regenerate Centaur Veteran. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CentaursHerald.java b/Mage.Sets/src/mage/cards/c/CentaursHerald.java index b0df14fc535..f0bf852949c 100644 --- a/Mage.Sets/src/mage/cards/c/CentaursHerald.java +++ b/Mage.Sets/src/mage/cards/c/CentaursHerald.java @@ -30,7 +30,7 @@ public final class CentaursHerald extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, Sacrifice Centaur's Herald: Create a 3/3 green Centaur creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken()), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CentaurToken()), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CephalidBroker.java b/Mage.Sets/src/mage/cards/c/CephalidBroker.java index 45579c298b7..670c1bfdee6 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidBroker.java +++ b/Mage.Sets/src/mage/cards/c/CephalidBroker.java @@ -29,7 +29,7 @@ public final class CephalidBroker extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target player draws two cards, then discards two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardTargetEffect(2), new TapSourceCost()); ability.addEffect(new DiscardTargetEffect(2).setText(", then discards two cards")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java index 3bbeca35460..fa7fa79dc81 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java +++ b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java @@ -41,7 +41,7 @@ public final class CephalidIllusionist extends CardImpl { Effect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); // and dealt by target creature you control this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{U}")); effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("and dealt by target creature you control this turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java index ff87b6306c3..03935c83147 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java +++ b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java @@ -38,7 +38,7 @@ public final class CephalidRetainer extends CardImpl { this.toughness = new MageInt(3); // {U}{U}: Tap target creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CephalidScout.java b/Mage.Sets/src/mage/cards/c/CephalidScout.java index 2cb46ac9243..0e6271b4424 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidScout.java +++ b/Mage.Sets/src/mage/cards/c/CephalidScout.java @@ -34,7 +34,7 @@ public final class CephalidScout extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{U}, Sacrifice a land: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java index 29750705037..c8d7f7ccde8 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java +++ b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java @@ -34,7 +34,7 @@ public final class CephalidSnitch extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Cephalid Snitch: Target creature loses protection from black until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CephalidSnitchEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CephalidSnitchEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java index 40c6d7b76b5..989a8ccebac 100644 --- a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java +++ b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java @@ -32,7 +32,7 @@ public final class CeruleanSphinx extends CardImpl { // {U}: Cerulean Sphinx's owner shuffles it into their library. Effect effect = new ShuffleIntoLibrarySourceEffect(); effect.setText("{this}'s owner shuffles it into their library."); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}"))); } private CeruleanSphinx(final CeruleanSphinx card) { diff --git a/Mage.Sets/src/mage/cards/c/CetaDisciple.java b/Mage.Sets/src/mage/cards/c/CetaDisciple.java index 4f3479dbd58..8e481f33a3e 100644 --- a/Mage.Sets/src/mage/cards/c/CetaDisciple.java +++ b/Mage.Sets/src/mage/cards/c/CetaDisciple.java @@ -30,7 +30,7 @@ public final class CetaDisciple extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability firstAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); diff --git a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java index b404b090605..3d40820b2cd 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java +++ b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java @@ -55,7 +55,7 @@ public final class ChainerDementiaMaster extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterCreature, false))); // {B}{B}{B}, Pay 3 life: Put target creature card from a graveyard onto the battlefield under your control. That creature is black and is a Nightmare in addition to its other creature types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChainerDementiaMasterEffect(), new ManaCostsImpl<>("{B}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new ChainerDementiaMasterEffect(), new ManaCostsImpl<>("{B}{B}{B}")); ability.addCost(new PayLifeCost(3)); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java b/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java index 2ee61966597..7a3263e9c24 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java @@ -25,7 +25,7 @@ public final class ChaliceOfDeath extends CardImpl { this.nightCard = true; // {tap}: Target player loses 5 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(5), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(5), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java b/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java index 3540c3edc55..8f436e29e57 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java @@ -30,7 +30,7 @@ public final class ChaliceOfLife extends CardImpl { // {tap}: You gain 1 life. Then if you have at least 10 life more than your starting life total, transform Chalice of Life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChaliceOfLifeEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new ChaliceOfLifeEffect(), new TapSourceCost())); } private ChaliceOfLife(final ChaliceOfLife card) { diff --git a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java index eda43ffe3f9..94d0ae379a7 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java +++ b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java @@ -38,7 +38,7 @@ public final class ChamberOfManipulation extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}, Discard a card: Gain control of target creature until end of turn." - Ability controlAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability controlAbility = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.EndOfTurn), new TapSourceCost()); controlAbility.addTarget(new TargetCreaturePermanent()); controlAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(controlAbility, AttachmentType.AURA, diff --git a/Mage.Sets/src/mage/cards/c/ChamberSentry.java b/Mage.Sets/src/mage/cards/c/ChamberSentry.java index f3e9ec0aba0..6f5d4ab3b1a 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberSentry.java +++ b/Mage.Sets/src/mage/cards/c/ChamberSentry.java @@ -46,7 +46,7 @@ public final class ChamberSentry extends CardImpl { "with a +1/+1 counter on it for each color of mana spent to cast it")); // {X}, {T}, Remove X +1/+1 counters from Chamber Sentry: It deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance) .setText("It deals X damage to any target"), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java index b808ed365c4..7962732fe8b 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java @@ -49,7 +49,7 @@ public final class ChampionOfStraySouls extends CardImpl { // {3}{B}{B}, {T}, Sacrifice X other creatures: Return X target creatures from your graveyard to the battlefield. Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); effect.setText("Return X target creature cards from your graveyard to the battlefield"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{B}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeXTargetCost(filter)); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/c/Chandler.java b/Mage.Sets/src/mage/cards/c/Chandler.java index d6ea428151e..9a87640b874 100644 --- a/Mage.Sets/src/mage/cards/c/Chandler.java +++ b/Mage.Sets/src/mage/cards/c/Chandler.java @@ -38,7 +38,7 @@ public final class Chandler extends CardImpl { this.toughness = new MageInt(3); // {R}{R}{R}, {tap}: Destroy target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java b/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java index 07e7a9122ee..10885efa17e 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java +++ b/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java @@ -50,7 +50,7 @@ public final class ChandraFireOfKaladesh extends CardImpl { // {T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new ExileAndReturnSourceEffect(PutCards.BATTLEFIELD_TRANSFORMED,Pronoun.SHE), new SourceDealtDamageCondition(3))); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability, new DamageDoneWatcher()); diff --git a/Mage.Sets/src/mage/cards/c/CharRumbler.java b/Mage.Sets/src/mage/cards/c/CharRumbler.java index 3c4c44a02f8..ad982ad0640 100644 --- a/Mage.Sets/src/mage/cards/c/CharRumbler.java +++ b/Mage.Sets/src/mage/cards/c/CharRumbler.java @@ -29,7 +29,7 @@ public final class CharRumbler extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // {R}: Char-Rumbler 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 CharRumbler(final CharRumbler card) { diff --git a/Mage.Sets/src/mage/cards/c/ChargingTroll.java b/Mage.Sets/src/mage/cards/c/ChargingTroll.java index 9e12cea803c..335cd3ffb47 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingTroll.java +++ b/Mage.Sets/src/mage/cards/c/ChargingTroll.java @@ -30,7 +30,7 @@ public final class ChargingTroll extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {G}: Regenerate Charging Troll. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CharmPeddler.java b/Mage.Sets/src/mage/cards/c/CharmPeddler.java index c0a8df8f1bc..c157be5a505 100644 --- a/Mage.Sets/src/mage/cards/c/CharmPeddler.java +++ b/Mage.Sets/src/mage/cards/c/CharmPeddler.java @@ -31,7 +31,7 @@ public final class CharmPeddler extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}, Discard a card: The next time a source of your choice would deal damage to target creature this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java index ea894945ab8..f2830d3b257 100644 --- a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java +++ b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java @@ -29,7 +29,7 @@ public final class ChartoothCougar extends CardImpl { this.toughness = new MageInt(4); // {R}: Chartooth Cougar 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}"))); // Mountaincycling {2} this.addAbility(new MountaincyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java index 24773df3209..cc6e611327f 100644 --- a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java +++ b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java @@ -46,7 +46,7 @@ public final class ChickenALaKing extends CardImpl { this.addAbility(new ChickenALaKingTriggeredAbility()); // Tap an untapped Bird you control: Roll a six-sided die. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(new RollDiceEffect(6), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); } private ChickenALaKing(final ChickenALaKing card) { diff --git a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java index d7c6cf87c13..abfff99e1c6 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java @@ -31,7 +31,7 @@ public final class ChildOfGaea extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{G}{G}")))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private ChildOfGaea(final ChildOfGaea card) { diff --git a/Mage.Sets/src/mage/cards/c/ChildOfThorns.java b/Mage.Sets/src/mage/cards/c/ChildOfThorns.java index 4e4623a6ea4..4631cc7d29f 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfThorns.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfThorns.java @@ -28,7 +28,7 @@ public final class ChildOfThorns extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Child of Thorns: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java b/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java index cb822bb779c..9d70a8b80f2 100644 --- a/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java +++ b/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java @@ -33,7 +33,7 @@ public final class ChildrenOfKorlis extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Children of Korlis: You gain life equal to the life you've lost this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainLifeEffect(new SourceControllerLostLifeCount(),"You gain life equal to the life you've lost this turn"), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/c/ChillingApparition.java b/Mage.Sets/src/mage/cards/c/ChillingApparition.java index 79285022287..ff116806d63 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingApparition.java +++ b/Mage.Sets/src/mage/cards/c/ChillingApparition.java @@ -27,7 +27,7 @@ public final class ChillingApparition extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Chilling Apparition. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // Whenever Chilling Apparition deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); } diff --git a/Mage.Sets/src/mage/cards/c/ChillingShade.java b/Mage.Sets/src/mage/cards/c/ChillingShade.java index db0477a243f..3a953bf2e0c 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingShade.java +++ b/Mage.Sets/src/mage/cards/c/ChillingShade.java @@ -31,7 +31,7 @@ public final class ChillingShade extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {S}: Chilling Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); } private ChillingShade(final ChillingShade card) { diff --git a/Mage.Sets/src/mage/cards/c/ChimericEgg.java b/Mage.Sets/src/mage/cards/c/ChimericEgg.java index 23dfe6018f8..c0217f7e4ab 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericEgg.java +++ b/Mage.Sets/src/mage/cards/c/ChimericEgg.java @@ -40,7 +40,7 @@ public final class ChimericEgg extends CardImpl { this.addAbility(new SpellCastOpponentTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), nonArtifactFilter, false)); // Remove three charge counters from Chimeric Egg: Chimeric Egg becomes a 6/6 Construct artifact creature with trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(6, 6, "6/6 Construct artifact creature with trample") .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT) diff --git a/Mage.Sets/src/mage/cards/c/ChimericIdol.java b/Mage.Sets/src/mage/cards/c/ChimericIdol.java index bbc8473deac..22123da1e99 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericIdol.java +++ b/Mage.Sets/src/mage/cards/c/ChimericIdol.java @@ -26,7 +26,7 @@ public final class ChimericIdol extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {0}: Tap all lands you control. Chimeric Idol becomes a 3/3 Turtle artifact creature until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(new FilterControlledLandPermanent("lands you control")), new ManaCostsImpl<>("{0}")); + Ability ability = new SimpleActivatedAbility(new TapAllEffect(new FilterControlledLandPermanent("lands you control")), new ManaCostsImpl<>("{0}")); ability.addEffect(new BecomesCreatureSourceEffect( new CreatureToken(3, 3, "3/3 Turtle artifact creature") .withSubType(SubType.TURTLE) diff --git a/Mage.Sets/src/mage/cards/c/ChimericMass.java b/Mage.Sets/src/mage/cards/c/ChimericMass.java index 757f09251ae..a86eca8020e 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericMass.java +++ b/Mage.Sets/src/mage/cards/c/ChimericMass.java @@ -30,7 +30,7 @@ public final class ChimericMass extends CardImpl { // {1}: Until end of turn, Chimeric Mass becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it." CountersSourceCount count = new CountersSourceCount(CounterType.CHARGE); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(0, 0, "Construct artifact creature with \"This creature's power and toughness are each equal to the number of charge counters on it.\"") .withType(CardType.ARTIFACT) .withSubType(SubType.CONSTRUCT) diff --git a/Mage.Sets/src/mage/cards/c/ChimericSphere.java b/Mage.Sets/src/mage/cards/c/ChimericSphere.java index 40bb8b4ec59..dd7c0146354 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericSphere.java +++ b/Mage.Sets/src/mage/cards/c/ChimericSphere.java @@ -26,7 +26,7 @@ public final class ChimericSphere extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}: Until end of turn, Chimeric Sphere becomes a 2/1 Construct artifact creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(2, 1, "2/1 Construct artifact creature with flying") .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT) @@ -34,7 +34,7 @@ public final class ChimericSphere extends CardImpl { CardType.ARTIFACT, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}"))); // {2}: Until end of turn, Chimeric Sphere becomes a 3/2 Construct artifact creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + Ability ability = new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 2, "3/2 Construct artifact creature") .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT), diff --git a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java index cebfe7fabdc..603907e8276 100644 --- a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java +++ b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java @@ -43,7 +43,7 @@ public final class ChirrutImwe extends CardImpl { // {1}{W}: Prevent all combat damage that would be dealt to Chirrut Imwe until end of turn. Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn); effect.setText("Prevent all combat damage that would be dealt to {this} until end of turn"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}"))); } private ChirrutImwe(final ChirrutImwe card) { diff --git a/Mage.Sets/src/mage/cards/c/ChitteringWitch.java b/Mage.Sets/src/mage/cards/c/ChitteringWitch.java index fa21160b9bb..3f1356ced0c 100644 --- a/Mage.Sets/src/mage/cards/c/ChitteringWitch.java +++ b/Mage.Sets/src/mage/cards/c/ChitteringWitch.java @@ -43,7 +43,7 @@ public final class ChitteringWitch extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // {1}{B}, Sacrifice a creature: Target creature gets -2/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java index 206174cb155..664608f5dba 100644 --- a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java +++ b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java @@ -36,7 +36,7 @@ public final class ChoArrimAlchemist extends CardImpl { this.toughness = new MageInt(1); // {1}{W}{W}, {tap}, Discard a card: The next time a source of your choice would deal damage to you this turn, prevent that damage. You gain life equal to the damage prevented this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChoArrimAlchemistEffect(), new ManaCostsImpl<>("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new ChoArrimAlchemistEffect(), new ManaCostsImpl<>("{1}{W}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java index 948760d7298..e4cf9913614 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java +++ b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java @@ -41,7 +41,7 @@ public final class ChokingRestraints extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // {3}{W}{W}, Sacrifice Choking Restraints: Exile enchanted creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAttachedEffect(), new ManaCostsImpl<>("{3}{W}{W}")); + ability = new SimpleActivatedAbility(new ExileAttachedEffect(), new ManaCostsImpl<>("{3}{W}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java index b52ded12bbe..d0d6472ed4e 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java +++ b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java @@ -41,7 +41,7 @@ public final class ChosenOfMarkov extends CardImpl { // {tap}, Tap an untapped Vampire you control: Transform Chosen of Markov. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TransformSourceEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Chronomaton.java b/Mage.Sets/src/mage/cards/c/Chronomaton.java index cfd8529fe46..b4f539f8a80 100644 --- a/Mage.Sets/src/mage/cards/c/Chronomaton.java +++ b/Mage.Sets/src/mage/cards/c/Chronomaton.java @@ -29,7 +29,7 @@ public final class Chronomaton extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}: Put a +1/+1 counter on Chronomaton. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CinderElemental.java b/Mage.Sets/src/mage/cards/c/CinderElemental.java index c965f0950fb..614a9c4f6a7 100644 --- a/Mage.Sets/src/mage/cards/c/CinderElemental.java +++ b/Mage.Sets/src/mage/cards/c/CinderElemental.java @@ -31,7 +31,7 @@ public final class CinderElemental extends CardImpl { this.toughness = new MageInt(2); // {X}{R}, {tap}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CinderPyromancer.java b/Mage.Sets/src/mage/cards/c/CinderPyromancer.java index 4594206425f..8724515bc19 100644 --- a/Mage.Sets/src/mage/cards/c/CinderPyromancer.java +++ b/Mage.Sets/src/mage/cards/c/CinderPyromancer.java @@ -38,7 +38,7 @@ public final class CinderPyromancer extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); diff --git a/Mage.Sets/src/mage/cards/c/CinderShade.java b/Mage.Sets/src/mage/cards/c/CinderShade.java index 5ba6e2076c1..cf38da3d4ff 100644 --- a/Mage.Sets/src/mage/cards/c/CinderShade.java +++ b/Mage.Sets/src/mage/cards/c/CinderShade.java @@ -31,10 +31,10 @@ public final class CinderShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Cinder Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {R}, Sacrifice Cinder Shade: Cinder Shade deals damage equal to its power to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("It deals damage equal to its power to target creature"), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/Cinderbones.java b/Mage.Sets/src/mage/cards/c/Cinderbones.java index fdc43b569ba..859bffb09a5 100644 --- a/Mage.Sets/src/mage/cards/c/Cinderbones.java +++ b/Mage.Sets/src/mage/cards/c/Cinderbones.java @@ -28,7 +28,7 @@ public final class Cinderbones extends CardImpl { this.toughness = new MageInt(1); this.addAbility(WitherAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private Cinderbones(final Cinderbones card) { diff --git a/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java b/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java index 47fd30cb2f2..a7cf0dbcf05 100644 --- a/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java +++ b/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java @@ -40,7 +40,7 @@ public final class CinderhazeWretch extends CardImpl { this.addAbility(ability); // Put a -1/-1 counter on Cinderhaze Wretch: Untap Cinderhaze Wretch. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance(1)))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance(1)))); } @@ -52,4 +52,4 @@ public final class CinderhazeWretch extends CardImpl { public CinderhazeWretch copy() { return new CinderhazeWretch(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java index 4439aa712fd..9a73859f84f 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java @@ -30,7 +30,7 @@ public final class CircleOfProtectionArtifacts extends CardImpl { // {2}: The next time an artifact source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}"))); } private CircleOfProtectionArtifacts(final CircleOfProtectionArtifacts card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java index 04ae99ce2c9..a42b75122cf 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionBlack extends CardImpl { // {1}: The next time a black source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionBlack(final CircleOfProtectionBlack card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java index f8427073049..7a52cc659bd 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionBlue extends CardImpl { // {1}: The next time a blue source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionBlue(final CircleOfProtectionBlue card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java index 642c7a50783..ab565226201 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionGreen extends CardImpl { // {1}: The next time a green source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionGreen(final CircleOfProtectionGreen card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java index 97f0bece75a..7ed4b49518e 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionRed extends CardImpl { // {1}: The next time a red source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionRed(final CircleOfProtectionRed card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java index a3a8f069dfa..7eaa168dc64 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionShadow extends CardImpl { // {1}: The next time a creature of your choice with shadow would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); effect.setText("The next time a creature of your choice with shadow would deal damage to you this turn, prevent that damage"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionShadow(final CircleOfProtectionShadow card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java index b94573a3df2..39c6d8ae8bb 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionWhite extends CardImpl { // {1}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionWhite(final CircleOfProtectionWhite card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfSolace.java b/Mage.Sets/src/mage/cards/c/CircleOfSolace.java index 53eee7dae07..02513f84e0c 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfSolace.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfSolace.java @@ -26,7 +26,7 @@ public final class CircleOfSolace extends CardImpl { // As Circle of Solace enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Neutral))); // {1}{W}: The next time a creature of the chosen type would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CircleOfSolaceEffect(), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CircleOfSolaceEffect(), new ManaCostsImpl<>("{1}{W}"))); } private CircleOfSolace(final CircleOfSolace card) { diff --git a/Mage.Sets/src/mage/cards/c/CityOfShadows.java b/Mage.Sets/src/mage/cards/c/CityOfShadows.java index 1a260c13fb7..f67dc011964 100644 --- a/Mage.Sets/src/mage/cards/c/CityOfShadows.java +++ b/Mage.Sets/src/mage/cards/c/CityOfShadows.java @@ -27,7 +27,7 @@ public final class CityOfShadows extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // {T}, Exile a creature you control: Put a storage counter on City of Shadows. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()); ability.addCost(new ExileTargetCost(new TargetControlledCreaturePermanent(StaticFilters.FILTER_CONTROLLED_A_CREATURE))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java index 51c905b5b96..2cbd31e078b 100644 --- a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java @@ -32,13 +32,13 @@ public final class CivicGuildmage extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: Target creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}, {tap}: Put target creature you control on top of its owner's library. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); + ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CivilizedScholar.java b/Mage.Sets/src/mage/cards/c/CivilizedScholar.java index 3f9dae4d5b5..8baaa504abc 100644 --- a/Mage.Sets/src/mage/cards/c/CivilizedScholar.java +++ b/Mage.Sets/src/mage/cards/c/CivilizedScholar.java @@ -35,7 +35,7 @@ public final class CivilizedScholar extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card, then discard a card. If a creature card is discarded this way, untap Civilized Scholar, then transform it. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CivilizedScholarEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CivilizedScholarEffect(), new TapSourceCost())); this.addAbility(new TransformAbility()); } diff --git a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java index 4c2aff1899d..1c90ffd7910 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java +++ b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java @@ -36,7 +36,7 @@ public final class ClaimOfErebos extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{1}{B}, {T}: Target player loses 2 life." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{1}{B}")); + Ability grantedAbility = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{1}{B}")); grantedAbility.addCost(new TapSourceCost()); grantedAbility.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfGix.java b/Mage.Sets/src/mage/cards/c/ClawsOfGix.java index 989826adc5b..cb0ea5ae474 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfGix.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfGix.java @@ -22,7 +22,7 @@ public final class ClawsOfGix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); //{1}, Sacrifice a permanent: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ClayStatue.java b/Mage.Sets/src/mage/cards/c/ClayStatue.java index f5dfd151f3f..66ae29256df 100644 --- a/Mage.Sets/src/mage/cards/c/ClayStatue.java +++ b/Mage.Sets/src/mage/cards/c/ClayStatue.java @@ -24,7 +24,7 @@ public final class ClayStatue extends CardImpl { this.toughness = new MageInt(1); // {2}: Regenerate Clay Statue. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}"))); } private ClayStatue(final ClayStatue card) { @@ -35,4 +35,4 @@ public final class ClayStatue extends CardImpl { public ClayStatue copy() { return new ClayStatue(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java index 454764db51d..b39b34e2f0f 100644 --- a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java +++ b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java @@ -28,7 +28,7 @@ public final class ClergyEnVec extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Clickslither.java b/Mage.Sets/src/mage/cards/c/Clickslither.java index b0dd80f30db..a7f94b4a6f3 100644 --- a/Mage.Sets/src/mage/cards/c/Clickslither.java +++ b/Mage.Sets/src/mage/cards/c/Clickslither.java @@ -38,7 +38,7 @@ public final class Clickslither extends CardImpl { // Sacrifice a Goblin: Clickslither gets +2/+2 and gains trample until end of turn. Effect effect = new BoostSourceEffect(2,2,Duration.EndOfTurn); effect.setText("{this} gets +2/+2"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, + Ability ability = new SimpleActivatedAbility(effect, new SacrificeTargetCost(filter)); effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); diff --git a/Mage.Sets/src/mage/cards/c/CliffsideLookout.java b/Mage.Sets/src/mage/cards/c/CliffsideLookout.java index 48e9e05bd78..cd35eebe348 100644 --- a/Mage.Sets/src/mage/cards/c/CliffsideLookout.java +++ b/Mage.Sets/src/mage/cards/c/CliffsideLookout.java @@ -28,7 +28,7 @@ public final class CliffsideLookout extends CardImpl { this.toughness = new MageInt(1); // {4}{W}: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}"))); } private CliffsideLookout(final CliffsideLookout card) { diff --git a/Mage.Sets/src/mage/cards/c/ClockworkDragon.java b/Mage.Sets/src/mage/cards/c/ClockworkDragon.java index 246dd5c029e..675c0fb8796 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkDragon.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkDragon.java @@ -37,7 +37,7 @@ public final class ClockworkDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6)), "with six +1/+1 counters on it")); this.addAbility(new AttacksOrBlocksTriggeredAbility(new ClockworkDragonEffect(), false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(3))); } private ClockworkDragon(final ClockworkDragon card) { diff --git a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java index c6cf072221b..810b2d41523 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java @@ -35,7 +35,7 @@ public final class ClockworkGnomes extends CardImpl { this.toughness = new MageInt(2); // {3}, {tap}: Regenerate target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java b/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java index 19e6240ea5c..b6d4de744a2 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java @@ -38,7 +38,7 @@ public final class ClockworkVorrac extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)), "with four +1/+1 counters on it")); this.addAbility(new AttacksOrBlocksTriggeredAbility(new ClockworkVorracEffect(), false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); } private ClockworkVorrac(final ClockworkVorrac card) { diff --git a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java index 8a603ccc80d..b6c73759e9f 100644 --- a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java +++ b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java @@ -39,7 +39,7 @@ public final class CloudchaserKestrel extends CardImpl { ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); // {W}: Target permanent becomes white until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java index 406c527474c..9c428b4acaf 100644 --- a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java @@ -50,7 +50,7 @@ public final class CloudgoatRanger extends CardImpl { // Tap three untapped Kithkin you control: Cloudgoat Ranger gets +2/+0 and gains flying until end of turn. Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn); effect.setText("{this} gets +2/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false))); + Ability ability = new SimpleActivatedAbility(effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false))); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java index bb7fb564481..ed5fafae89f 100644 --- a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java +++ b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java @@ -29,7 +29,7 @@ public final class CloudheathDrake extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private CloudheathDrake(final CloudheathDrake card) { diff --git a/Mage.Sets/src/mage/cards/c/Cloudseeder.java b/Mage.Sets/src/mage/cards/c/Cloudseeder.java index 2b5e8300809..7c14c46556c 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudseeder.java +++ b/Mage.Sets/src/mage/cards/c/Cloudseeder.java @@ -33,7 +33,7 @@ public final class Cloudseeder extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, {tap}, Discard a card: Create a 1/1 blue Faerie creature token named Cloud Sprite. It has flying and "Cloud Sprite can block only creatures with flying." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CloudSpriteToken()), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CloudSpriteToken()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoalitionRelic.java b/Mage.Sets/src/mage/cards/c/CoalitionRelic.java index ff162656756..4ae44f6e614 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionRelic.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionRelic.java @@ -33,7 +33,7 @@ public final class CoalitionRelic extends CardImpl { // {tap}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); // {tap}: Put a charge counter on Coalition Relic. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), new TapSourceCost())); // At the beginning of your precombat main phase, remove all charge counters from Coalition Relic. Add one mana of any color for each charge counter removed this way. this.addAbility(new BeginningOfFirstMainTriggeredAbility(new CoalitionRelicEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CoastalDrake.java b/Mage.Sets/src/mage/cards/c/CoastalDrake.java index b17155e5289..2e37b3766fc 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalDrake.java +++ b/Mage.Sets/src/mage/cards/c/CoastalDrake.java @@ -34,7 +34,7 @@ public final class CoastalDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{U}, {T} : Return target Kavu to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent(SubType.KAVU, "Kavu"))); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java b/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java index b9e44d1f4fe..34bec99c472 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java +++ b/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java @@ -34,7 +34,7 @@ public final class CoastalHornclaw extends CardImpl { this.toughness = new MageInt(3); // Sacrifice a land: Coastal Hornclaw gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); } private CoastalHornclaw(final CoastalHornclaw card) { diff --git a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java index d0723428644..3281a546f75 100644 --- a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java +++ b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java @@ -30,7 +30,7 @@ public final class CoastlineChimera extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Coastline Chimera can block an additional creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}"))); } private CoastlineChimera(final CoastlineChimera card) { diff --git a/Mage.Sets/src/mage/cards/c/CobaltGolem.java b/Mage.Sets/src/mage/cards/c/CobaltGolem.java index 66c77d396cf..d02b6800df9 100644 --- a/Mage.Sets/src/mage/cards/c/CobaltGolem.java +++ b/Mage.Sets/src/mage/cards/c/CobaltGolem.java @@ -25,7 +25,7 @@ public final class CobaltGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private CobaltGolem(final CobaltGolem card) { diff --git a/Mage.Sets/src/mage/cards/c/CoffinQueen.java b/Mage.Sets/src/mage/cards/c/CoffinQueen.java index 2a776d04eba..3934a6df253 100644 --- a/Mage.Sets/src/mage/cards/c/CoffinQueen.java +++ b/Mage.Sets/src/mage/cards/c/CoffinQueen.java @@ -44,7 +44,7 @@ public final class CoffinQueen extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {2}{B}, {tap}: Put target creature card from a graveyard onto the battlefield under your control. When Coffin Queen becomes untapped or you lose control of Coffin Queen, exile that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); ability.addEffect(new CoffinQueenCreateDelayedTriggerEffect()); diff --git a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java index 8db512dbdd2..67c4c3f3e79 100644 --- a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java +++ b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java @@ -36,7 +36,7 @@ public final class CogworkAssembler extends CardImpl { this.toughness = new MageInt(3); // {7}: Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CogworkAssemblerCreateTokenEffect(), new GenericManaCost(7)); + Ability ability = new SimpleActivatedAbility(new CogworkAssemblerCreateTokenEffect(), new GenericManaCost(7)); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java b/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java index 17e5d82be1b..cb188211c9c 100644 --- a/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java @@ -27,7 +27,7 @@ public final class CogworkersPuzzleknot extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ServoToken()))); // {1}{W}, Sacrifice Cogworker's Puzzleknot: Create a 1/1 colorless Servo artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ServoToken()), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ServoToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ColosYearling.java b/Mage.Sets/src/mage/cards/c/ColosYearling.java index 06a25f6b9b7..af7fe291da9 100644 --- a/Mage.Sets/src/mage/cards/c/ColosYearling.java +++ b/Mage.Sets/src/mage/cards/c/ColosYearling.java @@ -31,7 +31,7 @@ public final class ColosYearling extends CardImpl { this.addAbility(new MountainwalkAbility()); // {R}: Colos Yearling 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 ColosYearling(final ColosYearling card) { diff --git a/Mage.Sets/src/mage/cards/c/CombatMedic.java b/Mage.Sets/src/mage/cards/c/CombatMedic.java index 6f3b4cb1a84..e4af7bddcf2 100644 --- a/Mage.Sets/src/mage/cards/c/CombatMedic.java +++ b/Mage.Sets/src/mage/cards/c/CombatMedic.java @@ -30,7 +30,7 @@ public final class CombatMedic extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CommandBeacon.java b/Mage.Sets/src/mage/cards/c/CommandBeacon.java index 6a8f450826a..b5666e83eb6 100644 --- a/Mage.Sets/src/mage/cards/c/CommandBeacon.java +++ b/Mage.Sets/src/mage/cards/c/CommandBeacon.java @@ -31,7 +31,7 @@ public final class CommandBeacon extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {T}, Sacrifice Command Beacon: Put your commander into your hand from the command zone. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CommandBeaconEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CommandBeaconEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CommandersSphere.java b/Mage.Sets/src/mage/cards/c/CommandersSphere.java index 4dd425b34cb..4d63d29cbe5 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersSphere.java +++ b/Mage.Sets/src/mage/cards/c/CommandersSphere.java @@ -24,7 +24,7 @@ public final class CommandersSphere extends CardImpl { this.addAbility(new CommanderColorIdentityManaAbility()); // Sacrifice Commander's Sphere: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); } private CommandersSphere(final CommandersSphere card) { diff --git a/Mage.Sets/src/mage/cards/c/Compulsion.java b/Mage.Sets/src/mage/cards/c/Compulsion.java index e2432f91090..f3bf0fcae18 100644 --- a/Mage.Sets/src/mage/cards/c/Compulsion.java +++ b/Mage.Sets/src/mage/cards/c/Compulsion.java @@ -25,12 +25,12 @@ public final class Compulsion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); // {1}{U}, Discard a card: Draw a card. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); + Ability ability1 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); ability1.addCost(new DiscardTargetCost(new TargetCardInHand(1, new FilterCard("a card")))); this.addAbility(ability1); // {1}{U}, Sacrifice Compulsion: Draw a card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); + Ability ability2 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java index a6f13062d41..20ec0464d43 100644 --- a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java +++ b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java @@ -46,7 +46,7 @@ public final class CompulsoryRest extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // Enchanted creature has "{2}, Sacrifice this creature: You gain 2 life." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new GenericManaCost(2)); + Ability grantedAbility = new SimpleActivatedAbility(new GainLifeEffect(2), new GenericManaCost(2)); Cost cost = new SacrificeSourceCost(); cost.setText("Sacrifice this creature"); grantedAbility.addCost(cost); diff --git a/Mage.Sets/src/mage/cards/c/ConchHorn.java b/Mage.Sets/src/mage/cards/c/ConchHorn.java index 3249968250b..f01d2f05b13 100644 --- a/Mage.Sets/src/mage/cards/c/ConchHorn.java +++ b/Mage.Sets/src/mage/cards/c/ConchHorn.java @@ -28,7 +28,7 @@ public final class ConchHorn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Conch Horn: Draw two cards, then put a card from your hand on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConchHornEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ConchHornEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java index 576cb0d1c92..c0e8f602938 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java @@ -43,7 +43,7 @@ public final class ConduitOfStorms extends CardImpl { this.addAbility(new AttacksTriggeredAbility(effect, false)); // {3}{R}{R}: Transform Conduit of Storms. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{3}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{3}{R}{R}"))); } private ConduitOfStorms(final ConduitOfStorms card) { diff --git a/Mage.Sets/src/mage/cards/c/ConjurersBauble.java b/Mage.Sets/src/mage/cards/c/ConjurersBauble.java index 165b436f4ce..8f462c9faba 100644 --- a/Mage.Sets/src/mage/cards/c/ConjurersBauble.java +++ b/Mage.Sets/src/mage/cards/c/ConjurersBauble.java @@ -27,7 +27,7 @@ public final class ConjurersBauble extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {tap}, Sacrifice Conjurer's Bauble: Put up to one target card from your graveyard on the bottom of your library. Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false, rule), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false, rule), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(0, 1, StaticFilters.FILTER_CARD_FROM_YOUR_GRAVEYARD)); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java index a6d7e5b7d22..a13c8dc823b 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java @@ -50,7 +50,7 @@ public final class ConsecratedByBlood extends CardImpl { Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); - effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(2, filter)), AttachmentType.AURA); effect.setText("and \"Sacrifice two other creatures: Regenerate this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/Conservator.java b/Mage.Sets/src/mage/cards/c/Conservator.java index 70b29eb88ca..2aa7c616d54 100644 --- a/Mage.Sets/src/mage/cards/c/Conservator.java +++ b/Mage.Sets/src/mage/cards/c/Conservator.java @@ -25,7 +25,7 @@ public final class Conservator extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {T}: Prevent the next 2 damage that would be dealt to you this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 2), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 2), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ConsulateTurret.java b/Mage.Sets/src/mage/cards/c/ConsulateTurret.java index 7bc6328ef58..52529de6ac6 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateTurret.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateTurret.java @@ -24,10 +24,10 @@ public final class ConsulateTurret extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {T}: You get {E}. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GetEnergyCountersControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GetEnergyCountersControllerEffect(1), new TapSourceCost())); // {T}, Pay {E}{E}{E}: Consulate Turret deals 2 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new PayEnergyCost(3)); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java index 0d607e5babb..c366f780b6e 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java +++ b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java @@ -30,7 +30,7 @@ public final class ConsumptiveGoo extends CardImpl { this.toughness = new MageInt(1); // {2}{B}{B}: Target creature gets -1/-1 until end of turn. Put a +1/+1 counter on Consumptive Goo. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}{B}")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ContagionClasp.java b/Mage.Sets/src/mage/cards/c/ContagionClasp.java index 323d1668f3b..e860594488c 100644 --- a/Mage.Sets/src/mage/cards/c/ContagionClasp.java +++ b/Mage.Sets/src/mage/cards/c/ContagionClasp.java @@ -35,7 +35,7 @@ public final class ContagionClasp extends CardImpl { /* {4}, {T}: Proliferate. (You choose any number of permanents and/or players * with counters on them, then give each another counter of a kind already there.) */ - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new ProliferateEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ContagionEngine.java b/Mage.Sets/src/mage/cards/c/ContagionEngine.java index 29e677135d9..f317b6eb481 100644 --- a/Mage.Sets/src/mage/cards/c/ContagionEngine.java +++ b/Mage.Sets/src/mage/cards/c/ContagionEngine.java @@ -35,7 +35,7 @@ public final class ContagionEngine extends CardImpl { this.addAbility(ability); // {4}, {T}: Proliferate, then proliferate again. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there. Then do it again.) - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect("", false), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new ProliferateEffect("", false), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addEffect(new ProliferateEffect(" again", true).concatBy(", then")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java index dffd816cbf2..eece6e5d555 100644 --- a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java +++ b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java @@ -40,7 +40,7 @@ public final class ContestedCliffs extends CardImpl { // {R}{G}, {tap}: Choose target Beast creature you control and target creature an opponent controls. Those creatures fight each other. Effect effect = new FightTargetsEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); Target target1 = new TargetCreaturePermanent(filter1); ability.addTarget(target1); diff --git a/Mage.Sets/src/mage/cards/c/ConversionChamber.java b/Mage.Sets/src/mage/cards/c/ConversionChamber.java index 54805724d50..6fbe1595581 100644 --- a/Mage.Sets/src/mage/cards/c/ConversionChamber.java +++ b/Mage.Sets/src/mage/cards/c/ConversionChamber.java @@ -29,13 +29,13 @@ public final class ConversionChamber extends CardImpl { public ConversionChamber(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}, {T}: Exile target artifact card from a graveyard. Put a charge counter on Conversion Chamber. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(2)); ability.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetCardInGraveyard(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {2}, {T}, Remove a charge counter from Conversion Chamber: Create a 3/3 colorless Golem artifact creature token. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PhyrexianGolemToken()), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new PhyrexianGolemToken()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Conviction.java b/Mage.Sets/src/mage/cards/c/Conviction.java index e80ed6ea7ff..e8960a37cb8 100644 --- a/Mage.Sets/src/mage/cards/c/Conviction.java +++ b/Mage.Sets/src/mage/cards/c/Conviction.java @@ -41,7 +41,7 @@ public final class Conviction extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); // {W}: Return Conviction to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); } private Conviction(final Conviction card) { diff --git a/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java b/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java index adb06087075..f83fa0cf26c 100644 --- a/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java +++ b/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java @@ -34,7 +34,7 @@ public final class CopperLeafAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}, Sacrifice X lands: Put X +1/+1 counters on Copper-Leaf Angel. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(), GetXValue.instance, false), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(), GetXValue.instance, false), new TapSourceCost()); ability.addCost(new SacrificeXTargetCost(new FilterControlledLandPermanent("lands"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CoralHelm.java b/Mage.Sets/src/mage/cards/c/CoralHelm.java index c59acb5d14b..77a1d47819c 100644 --- a/Mage.Sets/src/mage/cards/c/CoralHelm.java +++ b/Mage.Sets/src/mage/cards/c/CoralHelm.java @@ -24,7 +24,7 @@ public final class CoralHelm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, Discard a card at random: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoralReef.java b/Mage.Sets/src/mage/cards/c/CoralReef.java index 02f39c91d02..46bd9d0d43e 100644 --- a/Mage.Sets/src/mage/cards/c/CoralReef.java +++ b/Mage.Sets/src/mage/cards/c/CoralReef.java @@ -53,11 +53,11 @@ public final class CoralReef extends CardImpl { // Sacrifice an Island: Put two polyp counters on Coral Reef. effect = new AddCountersSourceEffect(CounterType.POLYP.createInstance(2), true); effect.setText("Put two polyp counters on {this}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, + this.addAbility(new SimpleActivatedAbility(effect, new SacrificeTargetCost(islandFilter))); // {U}, Tap an untapped blue creature you control, Remove a polyp counter from Coral Reef: Put a +0/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P0P1.createInstance()), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P0P1.createInstance()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(untappedBlueCreatureFilter))); ability.addCost(new RemoveCountersSourceCost(CounterType.POLYP.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java b/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java index b950f0b2a69..ab01cd840c7 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java @@ -30,7 +30,7 @@ public final class CoralhelmGuide extends CardImpl { this.toughness = new MageInt(1); // {4}{U}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{4}{U}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{4}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Coretapper.java b/Mage.Sets/src/mage/cards/c/Coretapper.java index 9d07cb9b6a6..16d9793a271 100644 --- a/Mage.Sets/src/mage/cards/c/Coretapper.java +++ b/Mage.Sets/src/mage/cards/c/Coretapper.java @@ -34,10 +34,10 @@ public final class Coretapper extends CardImpl { this.subtype.add(SubType.MYR); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); firstAbility.addTarget(new TargetPermanent(filter)); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost()); secondAbility.addTarget(new TargetPermanent(filter)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/c/CorpseHauler.java b/Mage.Sets/src/mage/cards/c/CorpseHauler.java index a0940b85c58..4a311386e08 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHauler.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHauler.java @@ -38,7 +38,7 @@ public final class CorpseHauler extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, Sacrifice Corpse Hauler: Return another target creature card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Corpseweft.java b/Mage.Sets/src/mage/cards/c/Corpseweft.java index 28d491c1759..715bb9eae0c 100644 --- a/Mage.Sets/src/mage/cards/c/Corpseweft.java +++ b/Mage.Sets/src/mage/cards/c/Corpseweft.java @@ -29,7 +29,7 @@ public final class Corpseweft extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // {1}{B}, Exile one or more creature cards from your graveyard: Create a tapped X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CorpseweftEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new CorpseweftEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(1, Integer.MAX_VALUE, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java index ce60b5577bd..540cda3ba4e 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java +++ b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java @@ -27,7 +27,7 @@ public final class CorruptOfficial extends CardImpl { this.toughness = new MageInt(1); // {2}{B}: Regenerate Corrupt Official. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); // Whenever Corrupt Official becomes blocked, defending player discards a card at random. this.addAbility(new BecomesBlockedSourceTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java index b9ee3758386..d70708055e7 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java @@ -29,7 +29,7 @@ public final class CorruptedHarvester extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java index 1ed7745a89b..d06adb661dd 100644 --- a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java +++ b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java @@ -24,7 +24,7 @@ public final class CouriersCapsule extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{U}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java b/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java index c0972146140..39010bcf10f 100644 --- a/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java +++ b/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java @@ -29,12 +29,12 @@ public final class CourtlyProvocateur extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature attacks this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {tap}: Target creature blocks this turn if able. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/c/CrabUmbra.java b/Mage.Sets/src/mage/cards/c/CrabUmbra.java index bb0cdbb4414..ea749eaeb36 100644 --- a/Mage.Sets/src/mage/cards/c/CrabUmbra.java +++ b/Mage.Sets/src/mage/cards/c/CrabUmbra.java @@ -37,7 +37,7 @@ public final class CrabUmbra extends CardImpl { this.addAbility(ability); // {2}{U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapAttachedEffect(), new ManaCostsImpl<>("{2}{U}"))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/c/Crackleburr.java b/Mage.Sets/src/mage/cards/c/Crackleburr.java index bae011bb75d..861aecc1944 100644 --- a/Mage.Sets/src/mage/cards/c/Crackleburr.java +++ b/Mage.Sets/src/mage/cards/c/Crackleburr.java @@ -51,14 +51,14 @@ public final class Crackleburr extends CardImpl { this.toughness = new MageInt(2); // {UR}{UR}, {tap}, Tap two untapped red creatures you control: Crackleburr deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{U/R}{U/R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new ManaCostsImpl<>("{U/R}{U/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {UR}{UR}, {untap}, Untap two tapped blue creatures you control: Return target creature to its owner's hand. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U/R}{U/R}")); + Ability ability2 = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U/R}{U/R}")); ability2.addCost(new UntapSourceCost()); ability2.addCost(new UntapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter2, true))); ability2.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CracklingClub.java b/Mage.Sets/src/mage/cards/c/CracklingClub.java index 8e93c3c3e82..d7d53da9229 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingClub.java +++ b/Mage.Sets/src/mage/cards/c/CracklingClub.java @@ -39,7 +39,7 @@ public final class CracklingClub extends CardImpl { // Enchanted creature gets +1/+0. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); // Sacrifice Crackling Club: Crackling Club deals 1 damage to target creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java index 379e123bdcd..4ad9ed4790a 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java +++ b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java @@ -33,7 +33,7 @@ public final class CracklingPerimeter extends CardImpl { // Tap an untapped Gate you control: Crackling Perimeter deals 1 damage to each opponent. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new TapTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new TapTargetCost(new TargetControlledPermanent(filter)))); } private CracklingPerimeter(final CracklingPerimeter card) { diff --git a/Mage.Sets/src/mage/cards/c/CracklingTriton.java b/Mage.Sets/src/mage/cards/c/CracklingTriton.java index f329fa11fd4..35ecf010041 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingTriton.java +++ b/Mage.Sets/src/mage/cards/c/CracklingTriton.java @@ -30,7 +30,7 @@ public final class CracklingTriton extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, Sacrifice Crackling Triton: Crackling Triton deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CraftyPathmage.java b/Mage.Sets/src/mage/cards/c/CraftyPathmage.java index 652598ed405..0da1201b615 100644 --- a/Mage.Sets/src/mage/cards/c/CraftyPathmage.java +++ b/Mage.Sets/src/mage/cards/c/CraftyPathmage.java @@ -38,7 +38,7 @@ public final class CraftyPathmage extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CragPuca.java b/Mage.Sets/src/mage/cards/c/CragPuca.java index e1da4680ada..26f65c425fe 100644 --- a/Mage.Sets/src/mage/cards/c/CragPuca.java +++ b/Mage.Sets/src/mage/cards/c/CragPuca.java @@ -28,7 +28,7 @@ public final class CragPuca extends CardImpl { this.toughness = new MageInt(4); // {UR}: Switch Crag Puca's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CranialArchive.java b/Mage.Sets/src/mage/cards/c/CranialArchive.java index c052a1a7770..7f04779de04 100644 --- a/Mage.Sets/src/mage/cards/c/CranialArchive.java +++ b/Mage.Sets/src/mage/cards/c/CranialArchive.java @@ -27,7 +27,7 @@ public final class CranialArchive extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, Exile Cranial Archive: Target player shuffles their graveyard into their library. Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CranialArchiveEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CranialArchiveEffect(), new GenericManaCost(2)); ability.addCost(new ExileSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java index cfe0b0f4ad3..b2f0bf8d9df 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java @@ -29,7 +29,7 @@ public final class CreakwoodGhoul extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B/G}{B/G}")) ; + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{B/G}{B/G}")) ; ability.addTarget(new TargetCardInGraveyard()); ability.addEffect(new GainLifeEffect(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreditVoucher.java b/Mage.Sets/src/mage/cards/c/CreditVoucher.java index 1f03f0c96ab..8a241efd5ce 100644 --- a/Mage.Sets/src/mage/cards/c/CreditVoucher.java +++ b/Mage.Sets/src/mage/cards/c/CreditVoucher.java @@ -30,7 +30,7 @@ public final class CreditVoucher extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {tap}, Sacrifice Credit Voucher: Shuffle any number of cards from your hand into your library, then draw that many cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreditVoucherEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CreditVoucherEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreepingInn.java b/Mage.Sets/src/mage/cards/c/CreepingInn.java index b6ea4234afe..22cdd1d9244 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingInn.java +++ b/Mage.Sets/src/mage/cards/c/CreepingInn.java @@ -45,7 +45,7 @@ public final class CreepingInn extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new CreepingInnEffect())); // {4}: Creeping Inn phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutSourceEffect(), new ManaCostsImpl<>("{4}"))); + this.addAbility(new SimpleActivatedAbility(new PhaseOutSourceEffect(), new ManaCostsImpl<>("{4}"))); } private CreepingInn(final CreepingInn card) { diff --git a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java index 9eb3690be9a..4d9fbc50242 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java +++ b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java @@ -35,7 +35,7 @@ public final class CreepingTarPit extends CardImpl { this.addAbility(new BlackManaAbility()); // {1}{U}{B}: Until end of turn, Creeping Tar Pit becomes a 3/2 blue and black Elemental creature and can't be blocked. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 2, "3/2 blue and black Elemental creature") .withColor("BU") .withSubType(SubType.ELEMENTAL) diff --git a/Mage.Sets/src/mage/cards/c/CrenellatedWall.java b/Mage.Sets/src/mage/cards/c/CrenellatedWall.java index 6d7e51d159a..b9a7f4688c5 100644 --- a/Mage.Sets/src/mage/cards/c/CrenellatedWall.java +++ b/Mage.Sets/src/mage/cards/c/CrenellatedWall.java @@ -31,7 +31,7 @@ public final class CrenellatedWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {tap}: Target creature gets +0/+4 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 4, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 4, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java index d9eb2c30534..5f7fe4060f8 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java @@ -34,7 +34,7 @@ public final class CrimsonAcolyte extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {W}: Target creature gains protection from red until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java index 8b32f1e67d2..0c455f94a0c 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java @@ -45,7 +45,7 @@ public final class CrimsonHellkite extends CardImpl { // {X}, {tap}: Crimson Hellkite deals X damage to target creature. Spend only red mana on X. Effect effect = new DamageTargetEffect(GetXValue.instance); effect.setText("{this} deals X damage to target creature. Spend only red mana on X"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMage.java b/Mage.Sets/src/mage/cards/c/CrimsonMage.java index 6cefeef6707..b50e0d7128a 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMage.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMage.java @@ -30,7 +30,7 @@ public final class CrimsonMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java index 84a30b10914..fc3c1e0125b 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java @@ -32,7 +32,7 @@ public final class CrimsonManticore extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}, {tap}: Crimson Manticore deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java index f559bfef3c8..50cca3350b1 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java @@ -37,7 +37,7 @@ public final class CrimsonMuckwader extends CardImpl { // Crimson Muckwader gets +1/+1 as long as you control a Swamp. this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {2}{B}: Regenerate Crimson Muckwader. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private CrimsonMuckwader(final CrimsonMuckwader card) { diff --git a/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java b/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java index 07a101111b8..4e125c024c6 100644 --- a/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java +++ b/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java @@ -26,13 +26,13 @@ public final class CrookOfCondemnation extends CardImpl { // {1}, {t}: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); // {1}, Exile Crook of Condemnation: Exile all cards from all graveyards. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new ManaCostsImpl<>("{1}")); + Ability ability2 = new SimpleActivatedAbility(new ExileGraveyardAllPlayersEffect(), new ManaCostsImpl<>("{1}")); ability2.addCost(new ExileSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/c/CrookedScales.java b/Mage.Sets/src/mage/cards/c/CrookedScales.java index f14d5fe51f4..65937fa24ef 100644 --- a/Mage.Sets/src/mage/cards/c/CrookedScales.java +++ b/Mage.Sets/src/mage/cards/c/CrookedScales.java @@ -30,7 +30,7 @@ public final class CrookedScales extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {4}, {tap}: Flip a coin. If you win the flip, destroy target creature an opponent controls. If you lose the flip, destroy target creature you control unless you pay {3} and repeat this process. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrookedScalesEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CrookedScalesEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addTarget(new TargetOpponentsCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java b/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java index b4ef9d95a12..6f578bd8125 100644 --- a/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java +++ b/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java @@ -30,7 +30,7 @@ public final class CrossbowInfantry extends CardImpl { this.toughness = new MageInt(1); // {tap}: Crossbow Infantry deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java index 85b37bfd06e..08cadec78a3 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java @@ -47,7 +47,7 @@ public final class CrovaxAscendantHero extends CardImpl { // Nonwhite creatures get -1/-1. this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter2, false))); // Pay 2 life: Return Crovax, Ascendant Hero to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new PayLifeCost(2))); } private CrovaxAscendantHero(final CrovaxAscendantHero card) { diff --git a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java index 02d38c43b27..37b6d157f49 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java @@ -43,7 +43,7 @@ public final class CrovaxTheCursed extends CardImpl { this.addAbility(ability); // {B}: Crovax gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java index 580f6b1042e..519f181e425 100644 --- a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java +++ b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java @@ -30,11 +30,11 @@ public final class CrowdFavorites extends CardImpl { this.toughness = new MageInt(4); // {3}{W}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {3}{W}: Crowd Favorites gets +0/+5 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); } private CrowdFavorites(final CrowdFavorites card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java index 11d7699fbec..1360af11e59 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java @@ -43,7 +43,7 @@ public final class CrownOfConvergence extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {G}{W}: Put the top card of your library on the bottom of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfConvergenceEffect(), new ManaCostsImpl<>("{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CrownOfConvergenceEffect(), new ManaCostsImpl<>("{G}{W}"))); } private CrownOfConvergence(final CrownOfConvergence card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java index 08e928f2c3a..d7c4e88a5e0 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java @@ -28,7 +28,7 @@ public final class CrownOfEmpires extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfEmpiresEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CrownOfEmpiresEffect(), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java index a7641c91210..c271fb6add8 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java @@ -33,10 +33,10 @@ public final class CrownOfFlames extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); // {R}: Return Crown of Flames to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.R))); } private CrownOfFlames(final CrownOfFlames card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java index 0ea7698a3ad..cf6c9951c26 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java @@ -41,7 +41,7 @@ public final class CrownOfTheAges extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {4}, {tap}: Attach target Aura attached to a creature to another creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfTheAgesEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CrownOfTheAgesEffect(), new GenericManaCost(4)); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java b/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java index 457aed3658f..f30b9a61d2e 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java @@ -37,7 +37,7 @@ public final class CrucibleOfTheSpiritDragon extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Put a storage counter on Crucible of the Spirit Dragon. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java index a9a8bef807f..db1d48f65c4 100644 --- a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java @@ -37,7 +37,7 @@ public final class CruelDeceiver extends CardImpl { this.toughness = new MageInt(1); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, Cruel Deceiver gains "Whenever Cruel Deceiver deals damage to a creature, destroy that creature" until end of turn. Activate this ability only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CruelDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/c/CryptCreeper.java b/Mage.Sets/src/mage/cards/c/CryptCreeper.java index 2d489c7d80b..5a0522142e8 100644 --- a/Mage.Sets/src/mage/cards/c/CryptCreeper.java +++ b/Mage.Sets/src/mage/cards/c/CryptCreeper.java @@ -27,7 +27,7 @@ public final class CryptCreeper extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Crypt Creeper: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CryptRats.java b/Mage.Sets/src/mage/cards/c/CryptRats.java index fedf3955a9d..01d7f4dc7ef 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRats.java +++ b/Mage.Sets/src/mage/cards/c/CryptRats.java @@ -40,7 +40,7 @@ public final class CryptRats extends CardImpl { // {X}: Crypt Rats deals X damage to each creature and each player. Spend only black mana on X. Effect effect = new DamageEverythingEffect(GetXValue.instance); effect.setText("{this} deals X damage to each creature and each player. Spend only black mana on X"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect,new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect,new ManaCostsImpl<>("{X}")); VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { ((VariableManaCost) variableCost).setFilter(filterBlack); diff --git a/Mage.Sets/src/mage/cards/c/CryptRipper.java b/Mage.Sets/src/mage/cards/c/CryptRipper.java index 5ff537f90fa..858a270872e 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRipper.java +++ b/Mage.Sets/src/mage/cards/c/CryptRipper.java @@ -28,7 +28,7 @@ public final class CryptRipper extends CardImpl { this.toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private CryptRipper(final CryptRipper card) { diff --git a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java index 16d6652d2b1..6b29d91c78a 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java @@ -42,14 +42,14 @@ public final class Cryptbreaker extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, {T}, Discard a card: Create a 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // Tap three untapped Zombies you control: You draw a card and you lose 1 life. Effect effect = new DrawCardSourceControllerEffect(1, true); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, true))); + ability = new SimpleActivatedAbility(effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, true))); effect = new LoseLifeSourceControllerEffect(1); ability.addEffect(effect.concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrypticCruiser.java b/Mage.Sets/src/mage/cards/c/CrypticCruiser.java index 740ffbffb68..bbcdf0bf7fa 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticCruiser.java +++ b/Mage.Sets/src/mage/cards/c/CrypticCruiser.java @@ -32,7 +32,7 @@ public final class CrypticCruiser extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // {2}{U}, Put a card an opponent owns from exile into that player's graveyard: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new ExileOpponentsCardFromExileToGraveyardCost(true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrystalBall.java b/Mage.Sets/src/mage/cards/c/CrystalBall.java index f131ca6191e..de0dd15d798 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalBall.java +++ b/Mage.Sets/src/mage/cards/c/CrystalBall.java @@ -19,7 +19,7 @@ public final class CrystalBall extends CardImpl { public CrystalBall(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScryEffect(2), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrystalChimes.java b/Mage.Sets/src/mage/cards/c/CrystalChimes.java index b79d1273781..318b1a6f21b 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalChimes.java +++ b/Mage.Sets/src/mage/cards/c/CrystalChimes.java @@ -27,7 +27,7 @@ public final class CrystalChimes extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, {tap}, Sacrifice Crystal Chimes: Return all enchantment cards from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrystalChimesEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CrystalChimesEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrystalSeer.java b/Mage.Sets/src/mage/cards/c/CrystalSeer.java index 07d8d11f18f..a5551f9d47e 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalSeer.java +++ b/Mage.Sets/src/mage/cards/c/CrystalSeer.java @@ -34,7 +34,7 @@ public final class CrystalSeer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryControllerEffect(4))); // {4}{U}: Return Crystal Seer to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{4}{U}"))); } private CrystalSeer(final CrystalSeer card) { @@ -47,4 +47,3 @@ public final class CrystalSeer extends CardImpl { } } - diff --git a/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java b/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java index 22b6ad577b2..f8ada92671b 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java @@ -40,7 +40,7 @@ public final class CrystallineCrawler extends CardImpl { new CountersSourceCount(CounterType.P1P1), false)); // {T}: Put a +1/+1 counter on Crystalline Crawler. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); } private CrystallineCrawler(final CrystallineCrawler card) { diff --git a/Mage.Sets/src/mage/cards/c/CudgelTroll.java b/Mage.Sets/src/mage/cards/c/CudgelTroll.java index 8a103ab4e7b..6095a64d043 100644 --- a/Mage.Sets/src/mage/cards/c/CudgelTroll.java +++ b/Mage.Sets/src/mage/cards/c/CudgelTroll.java @@ -26,7 +26,7 @@ public final class CudgelTroll extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private CudgelTroll(final CudgelTroll card) { diff --git a/Mage.Sets/src/mage/cards/c/CullingDais.java b/Mage.Sets/src/mage/cards/c/CullingDais.java index 50af94bbda8..08c954cb44f 100644 --- a/Mage.Sets/src/mage/cards/c/CullingDais.java +++ b/Mage.Sets/src/mage/cards/c/CullingDais.java @@ -30,10 +30,10 @@ public final class CullingDais extends CardImpl { public CullingDais(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CullingDaisEffect(), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(new CullingDaisEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CultGuildmage.java b/Mage.Sets/src/mage/cards/c/CultGuildmage.java index 1b121527451..e69e83fcf07 100644 --- a/Mage.Sets/src/mage/cards/c/CultGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CultGuildmage.java @@ -37,7 +37,7 @@ public final class CultGuildmage extends CardImpl { this.addAbility(ability); // {R}, {T}: Cult Guildmage deals 1 damage to target opponent or planeswalker. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java index dc9662a95ef..908a210dbe1 100644 --- a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java +++ b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java @@ -30,7 +30,7 @@ public final class CunningSparkmage extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - 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/c/CuombajjWitches.java b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java index 43233ce7df9..2389a6b11b8 100644 --- a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java +++ b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java @@ -37,7 +37,7 @@ public final class CuombajjWitches extends CardImpl { // {T}: Cuombajj Witches deals 1 damage to any target and 1 damage to any target of an opponent's choice. Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to any target and 1 damage to any target of an opponent's choice"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addTarget(new TargetAnyTarget()); ability.setTargetAdjuster(CuombajjWitchesAdjuster.instance); @@ -75,4 +75,4 @@ enum CuombajjWitchesAdjuster implements TargetAdjuster { } } } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CursedRonin.java b/Mage.Sets/src/mage/cards/c/CursedRonin.java index 666dbcfadda..1f80e13e943 100644 --- a/Mage.Sets/src/mage/cards/c/CursedRonin.java +++ b/Mage.Sets/src/mage/cards/c/CursedRonin.java @@ -30,7 +30,7 @@ public final class CursedRonin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); - 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 CursedRonin(final CursedRonin card) { diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index 3d3f1fb38c5..035feba7dae 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -28,7 +28,7 @@ public final class CursedScroll extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {3}, {T}: Name a card. Reveal a card at random from your hand. If it's the named card, Cursed Scroll deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl<>("{3}")); ability.addEffect(new CursedScrollEffect()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java index 4e639378247..296798f508d 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java @@ -49,7 +49,7 @@ public final class CustodiSoulbinders extends CardImpl { // {2}{W}, Remove a +1/+1 counter from Custodi Soulbinders: Create a 1/1 white Spirit creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java b/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java index 7d67b93df91..fef2634d734 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java @@ -24,7 +24,7 @@ public final class CyclopeanSnare extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Tap target creature, then return Cyclopean Snare to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new ReturnToHandSourceEffect(true).concatBy(", then")); diff --git a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java index d5228930c80..2c91d858969 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java @@ -42,7 +42,7 @@ public final class CytoplastManipulator extends CardImpl { new GainControlTargetEffect(Duration.Custom, true), new SourceRemainsInZoneCondition(Zone.BATTLEFIELD), "gain control of target creature with a +1/+1 counter on it for as long as {this} remains on the battlefield"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java index 1454b52b5f4..273225097ce 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java @@ -39,7 +39,7 @@ public final class CytoplastRootKin extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_OTHER_CONTROLLED_CREATURE_P1P1))); // {2}: Move a +1/+1 counter from target creature you control onto Cytoplast Root-Kin. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCountersFromTargetToSourceEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new MoveCountersFromTargetToSourceEffect(), new GenericManaCost(2)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java index e1fd6c175d9..93a3487f1b2 100644 --- a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java +++ b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java @@ -35,7 +35,7 @@ public final class CytospawnShambler extends CardImpl { this.addAbility(new GraftAbility(this, 6)); // {G}: Target creature with a +1/+1 counter on it gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); } -- 2.47.2 From 07be392c35896478fadeccf7c0af3a7aca3d4bbc Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:26:34 -0500 Subject: [PATCH 31/50] refactor: SimpleActivatedAbility default zone (cards D) --- Mage.Sets/src/mage/cards/d/DAvenantArcher.java | 2 +- Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java | 2 +- Mage.Sets/src/mage/cards/d/DakraMystic.java | 2 +- Mage.Sets/src/mage/cards/d/DarajaGriffin.java | 2 +- Mage.Sets/src/mage/cards/d/DaringApprentice.java | 2 +- Mage.Sets/src/mage/cards/d/DaringSaboteur.java | 2 +- Mage.Sets/src/mage/cards/d/DarkDepths.java | 2 +- Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java | 2 +- Mage.Sets/src/mage/cards/d/DarkPrivilege.java | 2 +- Mage.Sets/src/mage/cards/d/DarkSphere.java | 2 +- Mage.Sets/src/mage/cards/d/DarkSupplicant.java | 2 +- Mage.Sets/src/mage/cards/d/DarkheartSliver.java | 2 +- Mage.Sets/src/mage/cards/d/DarklingStalker.java | 4 ++-- Mage.Sets/src/mage/cards/d/DarklitGargoyle.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelBrute.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelPendant.java | 2 +- Mage.Sets/src/mage/cards/d/DartingMerfolk.java | 2 +- Mage.Sets/src/mage/cards/d/DaruHealer.java | 2 +- Mage.Sets/src/mage/cards/d/DaruStinger.java | 2 +- Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java | 2 +- Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java | 2 +- Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java | 2 +- Mage.Sets/src/mage/cards/d/DauthiCutthroat.java | 2 +- Mage.Sets/src/mage/cards/d/DauthiEmbrace.java | 2 +- Mage.Sets/src/mage/cards/d/DauthiJackal.java | 2 +- Mage.Sets/src/mage/cards/d/DauthiMercenary.java | 4 ++-- Mage.Sets/src/mage/cards/d/DauthiTrapper.java | 2 +- Mage.Sets/src/mage/cards/d/DawnrayArcher.java | 2 +- Mage.Sets/src/mage/cards/d/Dawnstrider.java | 2 +- Mage.Sets/src/mage/cards/d/DaxosTheReturned.java | 2 +- Mage.Sets/src/mage/cards/d/DaybreakRanger.java | 4 ++-- Mage.Sets/src/mage/cards/d/DazzlingRamparts.java | 2 +- Mage.Sets/src/mage/cards/d/Deadapult.java | 2 +- Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java | 2 +- Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java | 2 +- Mage.Sets/src/mage/cards/d/DeadeyeTracker.java | 2 +- Mage.Sets/src/mage/cards/d/DeadlockTrap.java | 2 +- Mage.Sets/src/mage/cards/d/DeadlyDesigns.java | 2 +- Mage.Sets/src/mage/cards/d/DealBroker.java | 2 +- Mage.Sets/src/mage/cards/d/DeathHoodCobra.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeathbellowRaider.java | 2 +- Mage.Sets/src/mage/cards/d/Deathgrip.java | 2 +- Mage.Sets/src/mage/cards/d/DeathknellKami.java | 2 +- Mage.Sets/src/mage/cards/d/DeathriteShaman.java | 6 +++--- Mage.Sets/src/mage/cards/d/DeathsporeThallid.java | 2 +- Mage.Sets/src/mage/cards/d/DebtorsPulpit.java | 2 +- Mage.Sets/src/mage/cards/d/DecimatorWeb.java | 2 +- Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java | 2 +- Mage.Sets/src/mage/cards/d/DecoctionModule.java | 2 +- Mage.Sets/src/mage/cards/d/DecoratedGriffin.java | 2 +- Mage.Sets/src/mage/cards/d/DedicatedMartyr.java | 2 +- Mage.Sets/src/mage/cards/d/DeepSpawn.java | 2 +- Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java | 2 +- Mage.Sets/src/mage/cards/d/DeepfireElemental.java | 2 +- Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java | 2 +- Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java | 2 +- Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java | 2 +- Mage.Sets/src/mage/cards/d/DeepwoodLegate.java | 2 +- Mage.Sets/src/mage/cards/d/DefenderEnVec.java | 2 +- Mage.Sets/src/mage/cards/d/DefilingTears.java | 2 +- Mage.Sets/src/mage/cards/d/DeftbladeElite.java | 2 +- Mage.Sets/src/mage/cards/d/DegaDisciple.java | 4 ++-- Mage.Sets/src/mage/cards/d/Degavolver.java | 2 +- Mage.Sets/src/mage/cards/d/DeityOfScars.java | 2 +- Mage.Sets/src/mage/cards/d/DementiaBat.java | 2 +- Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicHordes.java | 2 +- Mage.Sets/src/mage/cards/d/DemonspineWhip.java | 2 +- Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java | 2 +- Mage.Sets/src/mage/cards/d/DesertedTemple.java | 2 +- Mage.Sets/src/mage/cards/d/DesertersQuarters.java | 2 +- Mage.Sets/src/mage/cards/d/DespoticScepter.java | 2 +- Mage.Sets/src/mage/cards/d/DeviantGlee.java | 2 +- Mage.Sets/src/mage/cards/d/DevotedCaretaker.java | 2 +- Mage.Sets/src/mage/cards/d/DevotedDruid.java | 2 +- Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java | 2 +- Mage.Sets/src/mage/cards/d/DevouringStrossus.java | 2 +- Mage.Sets/src/mage/cards/d/DevouringSwarm.java | 2 +- Mage.Sets/src/mage/cards/d/DevoutChaplain.java | 2 +- Mage.Sets/src/mage/cards/d/DevoutHarpist.java | 2 +- Mage.Sets/src/mage/cards/d/DevoutWitness.java | 2 +- Mage.Sets/src/mage/cards/d/DiabolicMachine.java | 2 +- Mage.Sets/src/mage/cards/d/DiamondFaerie.java | 2 +- Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java | 2 +- Mage.Sets/src/mage/cards/d/DiamondValley.java | 2 +- Mage.Sets/src/mage/cards/d/Didgeridoo.java | 2 +- Mage.Sets/src/mage/cards/d/DiligentFarmhand.java | 2 +- Mage.Sets/src/mage/cards/d/DimirCluestone.java | 2 +- Mage.Sets/src/mage/cards/d/DimirDoppelganger.java | 4 ++-- Mage.Sets/src/mage/cards/d/DimirHouseGuard.java | 2 +- Mage.Sets/src/mage/cards/d/DimirKeyrune.java | 2 +- Mage.Sets/src/mage/cards/d/DiplomaticEscort.java | 2 +- Mage.Sets/src/mage/cards/d/DirtwaterWraith.java | 2 +- Mage.Sets/src/mage/cards/d/Disappear.java | 2 +- Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java | 2 +- Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java | 2 +- Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java | 4 ++-- Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java | 2 +- Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java | 2 +- Mage.Sets/src/mage/cards/d/DispellersCapsule.java | 2 +- Mage.Sets/src/mage/cards/d/DisruptivePitmage.java | 4 ++-- Mage.Sets/src/mage/cards/d/DisruptiveStudent.java | 2 +- Mage.Sets/src/mage/cards/d/DistortingLens.java | 2 +- Mage.Sets/src/mage/cards/d/DiveBomber.java | 2 +- Mage.Sets/src/mage/cards/d/DivebomberGriffin.java | 2 +- Mage.Sets/src/mage/cards/d/DiversionaryTactics.java | 2 +- Mage.Sets/src/mage/cards/d/DivinersWand.java | 2 +- Mage.Sets/src/mage/cards/d/DiviningWitch.java | 2 +- Mage.Sets/src/mage/cards/d/DjinnOfWishes.java | 2 +- Mage.Sets/src/mage/cards/d/DoggedHunter.java | 2 +- Mage.Sets/src/mage/cards/d/DoomCannon.java | 2 +- Mage.Sets/src/mage/cards/d/DoomedNecromancer.java | 2 +- Mage.Sets/src/mage/cards/d/DoorToNothingness.java | 2 +- Mage.Sets/src/mage/cards/d/Doorkeeper.java | 2 +- Mage.Sets/src/mage/cards/d/Douse.java | 2 +- Mage.Sets/src/mage/cards/d/Downdraft.java | 4 ++-- Mage.Sets/src/mage/cards/d/DraconianCylix.java | 2 +- Mage.Sets/src/mage/cards/d/Dracoplasm.java | 2 +- Mage.Sets/src/mage/cards/d/DragonArch.java | 2 +- Mage.Sets/src/mage/cards/d/DragonBlood.java | 2 +- Mage.Sets/src/mage/cards/d/DragonBreath.java | 2 +- Mage.Sets/src/mage/cards/d/DragonEngine.java | 2 +- Mage.Sets/src/mage/cards/d/DragonMantle.java | 2 +- Mage.Sets/src/mage/cards/d/DragonMask.java | 2 +- Mage.Sets/src/mage/cards/d/DragonRoost.java | 2 +- Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java | 2 +- Mage.Sets/src/mage/cards/d/DragonTyrant.java | 2 +- Mage.Sets/src/mage/cards/d/DragonWhisperer.java | 2 +- Mage.Sets/src/mage/cards/d/Dragonrage.java | 2 +- Mage.Sets/src/mage/cards/d/DrakeHatcher.java | 2 +- Mage.Sets/src/mage/cards/d/DrakestownForgotten.java | 2 +- Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java | 2 +- Mage.Sets/src/mage/cards/d/DreadDefiler.java | 2 +- Mage.Sets/src/mage/cards/d/DreadShade.java | 2 +- Mage.Sets/src/mage/cards/d/DreadStatuary.java | 2 +- Mage.Sets/src/mage/cards/d/DreadshipReef.java | 2 +- Mage.Sets/src/mage/cards/d/Dreadwing.java | 2 +- Mage.Sets/src/mage/cards/d/DreamThrush.java | 2 +- Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java | 2 +- Mage.Sets/src/mage/cards/d/DriftingShade.java | 2 +- Mage.Sets/src/mage/cards/d/DrogskolCavalry.java | 2 +- Mage.Sets/src/mage/cards/d/Droideka.java | 2 +- Mage.Sets/src/mage/cards/d/DromokaDunecaster.java | 2 +- Mage.Sets/src/mage/cards/d/DromokaMonument.java | 2 +- Mage.Sets/src/mage/cards/d/DroneHolocron.java | 2 +- Mage.Sets/src/mage/cards/d/DronepackKindred.java | 2 +- Mage.Sets/src/mage/cards/d/DrossRipper.java | 2 +- Mage.Sets/src/mage/cards/d/Drowned.java | 2 +- Mage.Sets/src/mage/cards/d/DrownedRusalka.java | 2 +- Mage.Sets/src/mage/cards/d/DrownerOfHope.java | 2 +- Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java | 2 +- Mage.Sets/src/mage/cards/d/DrudgeReavers.java | 2 +- Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java | 2 +- Mage.Sets/src/mage/cards/d/DrudgeSpell.java | 2 +- Mage.Sets/src/mage/cards/d/DruidLyrist.java | 2 +- Mage.Sets/src/mage/cards/d/DruidicSatchel.java | 2 +- Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java | 2 +- Mage.Sets/src/mage/cards/d/DualCasting.java | 2 +- Mage.Sets/src/mage/cards/d/DuctCrawler.java | 2 +- Mage.Sets/src/mage/cards/d/DuergarAssailant.java | 2 +- Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java | 2 +- Mage.Sets/src/mage/cards/d/DukharaPeafowl.java | 2 +- Mage.Sets/src/mage/cards/d/DuneDiviner.java | 2 +- Mage.Sets/src/mage/cards/d/DungeonShade.java | 2 +- Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java | 2 +- Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java | 2 +- Mage.Sets/src/mage/cards/d/Duskworker.java | 2 +- Mage.Sets/src/mage/cards/d/DutifulThrull.java | 2 +- Mage.Sets/src/mage/cards/d/DutyBoundDead.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenArmorer.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenDriller.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenMiner.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenNomad.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenPony.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenWarriors.java | 2 +- 182 files changed, 194 insertions(+), 194 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DAvenantArcher.java b/Mage.Sets/src/mage/cards/d/DAvenantArcher.java index ebadbf86d7e..52fb92fc63e 100644 --- a/Mage.Sets/src/mage/cards/d/DAvenantArcher.java +++ b/Mage.Sets/src/mage/cards/d/DAvenantArcher.java @@ -30,7 +30,7 @@ public final class DAvenantArcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: D'Avenant Archer deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java b/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java index bc4f688a1aa..2d2d495ac2b 100644 --- a/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java +++ b/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java @@ -46,7 +46,7 @@ public final class DaghatarTheAdamant extends CardImpl { "with four +1/+1 counters on it")); // {1}{B/G}{B/G}: Move a +1/+1 counter from target creature onto a second target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCounterFromTargetToTargetEffect(),new ManaCostsImpl<>("{1}{B/G}{B/G}")); + Ability ability = new SimpleActivatedAbility(new MoveCounterFromTargetToTargetEffect(),new ManaCostsImpl<>("{1}{B/G}{B/G}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature the +1/+1 counter is moved from"))); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature the +1/+1 counter is moved to"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DakraMystic.java b/Mage.Sets/src/mage/cards/d/DakraMystic.java index e91d5f67d49..e46a368d079 100644 --- a/Mage.Sets/src/mage/cards/d/DakraMystic.java +++ b/Mage.Sets/src/mage/cards/d/DakraMystic.java @@ -34,7 +34,7 @@ public final class DakraMystic extends CardImpl { this.toughness = new MageInt(1); // {U},{T}:Each player reveals the top card of their library. You may put the revealed cards into their owners graveyard. If you don't, each player draws a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DakraMysticEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DakraMysticEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DarajaGriffin.java b/Mage.Sets/src/mage/cards/d/DarajaGriffin.java index 431d753dd93..06f046cd475 100644 --- a/Mage.Sets/src/mage/cards/d/DarajaGriffin.java +++ b/Mage.Sets/src/mage/cards/d/DarajaGriffin.java @@ -40,7 +40,7 @@ public final class DarajaGriffin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice Daraja Griffin: Destroy target black creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DaringApprentice.java b/Mage.Sets/src/mage/cards/d/DaringApprentice.java index 08d4928a961..d5a465bcbf5 100644 --- a/Mage.Sets/src/mage/cards/d/DaringApprentice.java +++ b/Mage.Sets/src/mage/cards/d/DaringApprentice.java @@ -30,7 +30,7 @@ public final class DaringApprentice extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Daring Apprentice: Counter target spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DaringSaboteur.java b/Mage.Sets/src/mage/cards/d/DaringSaboteur.java index 2d717cb4fdd..597486cf5c1 100644 --- a/Mage.Sets/src/mage/cards/d/DaringSaboteur.java +++ b/Mage.Sets/src/mage/cards/d/DaringSaboteur.java @@ -31,7 +31,7 @@ public final class DaringSaboteur extends CardImpl { this.toughness = new MageInt(1); // {2}{U}: Daring Saboteur can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}"))); // Whenever Daring Saboteur deals combat damage to a player, you may draw a card. If you do, discard a card. Effect effect = new DrawDiscardControllerEffect(1, 1); diff --git a/Mage.Sets/src/mage/cards/d/DarkDepths.java b/Mage.Sets/src/mage/cards/d/DarkDepths.java index f35d0d525fe..da109d3472e 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDepths.java +++ b/Mage.Sets/src/mage/cards/d/DarkDepths.java @@ -36,7 +36,7 @@ public final class DarkDepths extends CardImpl { // Dark Depths enters the battlefield with ten ice counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.ICE.createInstance(10)), "with ten ice counters on it")); // {3}: Remove an ice counter from Dark Depths. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new RemoveCounterSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl<>("{3}"))); // When Dark Depths has no ice counters on it, sacrifice it. If you do, create a legendary 20/20 black Avatar creature token with flying and "This creature is indestructible" named Marit Lage. this.addAbility(new DarkDepthsAbility()); } diff --git a/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java index 09442d42c6d..f5f8f7e84a4 100644 --- a/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java @@ -30,7 +30,7 @@ public final class DarkHeartOfTheWood extends CardImpl { // Sacrifice a Forest: You gain 3 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(3), new SacrificeTargetCost(filter))); } private DarkHeartOfTheWood(final DarkHeartOfTheWood card) { diff --git a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java index 21304bb3b65..5f06e2b5453 100644 --- a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java +++ b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java @@ -45,7 +45,7 @@ public final class DarkPrivilege extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice a creature: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/d/DarkSphere.java b/Mage.Sets/src/mage/cards/d/DarkSphere.java index c90d347b09f..64fb3666bb5 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSphere.java +++ b/Mage.Sets/src/mage/cards/d/DarkSphere.java @@ -32,7 +32,7 @@ public final class DarkSphere extends CardImpl { // {tap}, Sacrifice Dark Sphere: The next time a source of your choice would deal damage to you this turn, prevent half that damage, rounded down. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DarkSpherePreventionEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DarkSpherePreventionEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java index a965ab806a8..a482492e967 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java +++ b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java @@ -42,7 +42,7 @@ public final class DarkSupplicant extends CardImpl { this.toughness = new MageInt(1); // {T}, Sacrifice three Clerics: Search your graveyard, hand, and/or library for a card named Scion of Darkness and put it onto the battlefield. If you search your library this way, shuffle it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DarkSupplicantEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DarkSupplicantEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(3, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java index 57edcdb31cc..c93b4a80e3a 100644 --- a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java +++ b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java @@ -31,7 +31,7 @@ public final class DarkheartSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "Sacrifice this permanent: You gain 3 life." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(3), new SacrificeSourceCost()); this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, diff --git a/Mage.Sets/src/mage/cards/d/DarklingStalker.java b/Mage.Sets/src/mage/cards/d/DarklingStalker.java index 423e764b7fa..0429485307e 100644 --- a/Mage.Sets/src/mage/cards/d/DarklingStalker.java +++ b/Mage.Sets/src/mage/cards/d/DarklingStalker.java @@ -28,8 +28,8 @@ public final class DarklingStalker extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } private DarklingStalker(final DarklingStalker card) { diff --git a/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java b/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java index fabc0e95f2d..70bbc6f4319 100644 --- a/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java +++ b/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java @@ -28,7 +28,7 @@ public final class DarklitGargoyle extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -1, Duration.EndOfTurn), new ManaCostsImpl<>(("{B}")))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -1, Duration.EndOfTurn), new ManaCostsImpl<>(("{B}")))); } private DarklitGargoyle(final DarklitGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/d/DarksteelBrute.java b/Mage.Sets/src/mage/cards/d/DarksteelBrute.java index 5aafea93035..ce466eccccb 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelBrute.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelBrute.java @@ -28,7 +28,7 @@ public final class DarksteelBrute extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // {3}: Darksteel Brute becomes a 2/2 Beast artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(2, 2, "2/2 Beast artifact creature") .withSubType(SubType.BEAST) .withType(CardType.ARTIFACT), diff --git a/Mage.Sets/src/mage/cards/d/DarksteelPendant.java b/Mage.Sets/src/mage/cards/d/DarksteelPendant.java index 37be03cd247..131fd50a910 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelPendant.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelPendant.java @@ -25,7 +25,7 @@ public final class DarksteelPendant extends CardImpl { // Darksteel Pendant is indestructible. this.addAbility(IndestructibleAbility.getInstance()); // {1}, {tap}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DartingMerfolk.java b/Mage.Sets/src/mage/cards/d/DartingMerfolk.java index f50a284df1a..bcb30f09b07 100644 --- a/Mage.Sets/src/mage/cards/d/DartingMerfolk.java +++ b/Mage.Sets/src/mage/cards/d/DartingMerfolk.java @@ -26,7 +26,7 @@ public final class DartingMerfolk extends CardImpl { this.toughness = new MageInt(1); // {U}: Return Darting Merfolk to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}"))); } private DartingMerfolk(final DartingMerfolk card) { diff --git a/Mage.Sets/src/mage/cards/d/DaruHealer.java b/Mage.Sets/src/mage/cards/d/DaruHealer.java index 7bb3a53d17a..1d8a3635785 100644 --- a/Mage.Sets/src/mage/cards/d/DaruHealer.java +++ b/Mage.Sets/src/mage/cards/d/DaruHealer.java @@ -32,7 +32,7 @@ public final class DaruHealer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DaruStinger.java b/Mage.Sets/src/mage/cards/d/DaruStinger.java index 3ffd7bf7a72..21203feafb1 100644 --- a/Mage.Sets/src/mage/cards/d/DaruStinger.java +++ b/Mage.Sets/src/mage/cards/d/DaruStinger.java @@ -33,7 +33,7 @@ public final class DaruStinger extends CardImpl { // Amplify 1 this.addAbility(new AmplifyAbility(AmplifyEffect.AmplifyFactor.Amplify1)); // {tap}: Daru Stinger deals damage equal to the number of +1/+1 counters on it to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)) .setText("{this} deals damage equal to the number of +1/+1 counters on it to target attacking or blocking creature"), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java b/Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java index bd42ac50fcd..732032ad82f 100644 --- a/Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java +++ b/Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java @@ -44,7 +44,7 @@ public final class DaughterOfAutumn extends CardImpl { this.toughness = new MageInt(4); // {W}: The next 1 damage that would be dealt to target white creature this turn is dealt to Daughter of Autumn instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DaughterOfAutumnPreventDamageTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new DaughterOfAutumnPreventDamageTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java b/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java index af19fe1c6ae..351ccb5c832 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java @@ -41,7 +41,7 @@ public final class DauntlessBodyguard extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureEffect())); // Sacrifice Dauntless Bodyguard: The chosen creature gains indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DauntlessBodyguardGainAbilityEffect(), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DauntlessBodyguardGainAbilityEffect(), new SacrificeSourceCost())); } private DauntlessBodyguard(final DauntlessBodyguard card) { diff --git a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java index f898a711b32..2895cae0708 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java @@ -42,7 +42,7 @@ public final class DauntlessRiverMarshal extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {3}{U}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java b/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java index 0b74f4e61af..59f10702451 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java +++ b/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java @@ -40,7 +40,7 @@ public final class DauthiCutthroat extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {1}{B}, {tap}: Destroy target creature with shadow. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java b/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java index 342d3bdab09..468c16d806a 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java +++ b/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java @@ -25,7 +25,7 @@ public final class DauthiEmbrace extends CardImpl { // {B}{B}: Target creature gains shadow until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DauthiJackal.java b/Mage.Sets/src/mage/cards/d/DauthiJackal.java index aac279376c0..34039f12d65 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiJackal.java +++ b/Mage.Sets/src/mage/cards/d/DauthiJackal.java @@ -34,7 +34,7 @@ public final class DauthiJackal extends CardImpl { this.addAbility(ShadowAbility.getInstance()); // {B}{B}, Sacrifice Dauthi Jackal: Destroy target blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DauthiMercenary.java b/Mage.Sets/src/mage/cards/d/DauthiMercenary.java index dc1658928b2..c7acfe05964 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiMercenary.java +++ b/Mage.Sets/src/mage/cards/d/DauthiMercenary.java @@ -32,7 +32,7 @@ public final class DauthiMercenary extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {1}{B}: Dauthi Mercenary gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private DauthiMercenary(final DauthiMercenary card) { @@ -43,4 +43,4 @@ public final class DauthiMercenary extends CardImpl { public DauthiMercenary copy() { return new DauthiMercenary(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DauthiTrapper.java b/Mage.Sets/src/mage/cards/d/DauthiTrapper.java index c588fa24da4..929d7e83dd4 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiTrapper.java +++ b/Mage.Sets/src/mage/cards/d/DauthiTrapper.java @@ -31,7 +31,7 @@ public final class DauthiTrapper extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature gains shadow until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DawnrayArcher.java b/Mage.Sets/src/mage/cards/d/DawnrayArcher.java index 32cb1dfb6a3..19fe3b61340 100644 --- a/Mage.Sets/src/mage/cards/d/DawnrayArcher.java +++ b/Mage.Sets/src/mage/cards/d/DawnrayArcher.java @@ -33,7 +33,7 @@ public final class DawnrayArcher extends CardImpl { // Exalted this.addAbility(new ExaltedAbility()); // {W}, {tap}: Dawnray Archer deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetAttackingOrBlockingCreature()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Dawnstrider.java b/Mage.Sets/src/mage/cards/d/Dawnstrider.java index 532a6d6f61e..349cfaeacff 100644 --- a/Mage.Sets/src/mage/cards/d/Dawnstrider.java +++ b/Mage.Sets/src/mage/cards/d/Dawnstrider.java @@ -32,7 +32,7 @@ public final class Dawnstrider extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Discard a card: Prevent all combat damage that would be dealt this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java b/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java index b8a9c914a28..6b7adf2e7bb 100644 --- a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java +++ b/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java @@ -35,7 +35,7 @@ public final class DaxosTheReturned extends CardImpl { // {1}{W}{B}: Create a white and black Spirit enchantment creature token. It has // "This creature's power and toughness are each equal to the number of experience counters you have." - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DaxosSpiritToken(), 1), new ManaCostsImpl<>("{1}{W}{B}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new DaxosSpiritToken(), 1), new ManaCostsImpl<>("{1}{W}{B}"))); } private DaxosTheReturned(final DaxosTheReturned card) { diff --git a/Mage.Sets/src/mage/cards/d/DaybreakRanger.java b/Mage.Sets/src/mage/cards/d/DaybreakRanger.java index 6048aa33965..ef18fe46a36 100644 --- a/Mage.Sets/src/mage/cards/d/DaybreakRanger.java +++ b/Mage.Sets/src/mage/cards/d/DaybreakRanger.java @@ -43,7 +43,7 @@ public final class DaybreakRanger extends CardImpl { this.toughness = new MageInt(2); // {tap}: Daybreak Ranger deals 2 damage to target creature with flying. - Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability activatedAbility = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); activatedAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(activatedAbility); // At the beginning of each upkeep, if no spells were cast last turn, transform Daybreak Ranger. @@ -59,4 +59,4 @@ public final class DaybreakRanger extends CardImpl { public DaybreakRanger copy() { return new DaybreakRanger(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java b/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java index 0482e8ab980..ee004e49400 100644 --- a/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java +++ b/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java @@ -33,7 +33,7 @@ public final class DazzlingRamparts extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}{W}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Deadapult.java b/Mage.Sets/src/mage/cards/d/Deadapult.java index cdeeef86907..faf541f72a9 100644 --- a/Mage.Sets/src/mage/cards/d/Deadapult.java +++ b/Mage.Sets/src/mage/cards/d/Deadapult.java @@ -27,7 +27,7 @@ public final class Deadapult extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // {R}, Sacrifice a Zombie: Deadapult deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java index 67ca2b63b70..8e08d30f715 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java @@ -35,7 +35,7 @@ public final class DeadeyeNavigator extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Deadeye Navigator is paired with another creature, each of those creatures has "{1}{U}: Exile this creature, then return it to the battlefield under your control." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(true), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new ExileSourceEffect(true), new ManaCostsImpl<>("{1}{U}")); ability.addEffect(new ReturnToBattlefieldUnderYourControlSourceEffect()); this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java index af9107d67c7..ef071b79732 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java @@ -37,7 +37,7 @@ public final class DeadeyePlunderers extends CardImpl { ).addHint(ArtifactYouControlHint.instance)); // {2}{U}{B}: Create a colorless artifact token named Treasure with "{T}, Sacrifice this artifact: Add one mana of any color." - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl<>("{2}{U}{B}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl<>("{2}{U}{B}"))); } private DeadeyePlunderers(final DeadeyePlunderers card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeTracker.java b/Mage.Sets/src/mage/cards/d/DeadeyeTracker.java index 613413f41ae..e220875746e 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeTracker.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeTracker.java @@ -33,7 +33,7 @@ public final class DeadeyeTracker extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, {T}: Exile two target cards from an opponent's graveyard. Deadeye Tracker explores. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{1}{B}")); Effect effect = new ExploreSourceEffect(true, "{this}"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DeadlockTrap.java b/Mage.Sets/src/mage/cards/d/DeadlockTrap.java index 4e3997d040f..c0aa1a12173 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlockTrap.java +++ b/Mage.Sets/src/mage/cards/d/DeadlockTrap.java @@ -34,7 +34,7 @@ public final class DeadlockTrap extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); // {t}, Pay {E}: Tap target creature or planeswalker. Its activated abilities can't be activated this turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addCost(new PayEnergyCost(1)); ability.addTarget(new TargetCreatureOrPlaneswalker()); ability.addEffect(new DeadlockTrapCantActivateEffect()); diff --git a/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java b/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java index 5ead1184dcd..2786474f262 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java @@ -30,7 +30,7 @@ public final class DeadlyDesigns extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); // {2}: Put a plot counter on Deadly Designs. Any player may activate this ability. - SimpleActivatedAbility activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.PLOT.createInstance()), new GenericManaCost(2)); + SimpleActivatedAbility activatedAbility = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.PLOT.createInstance()), new GenericManaCost(2)); activatedAbility.setMayActivate(TargetController.ANY); activatedAbility.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(activatedAbility); diff --git a/Mage.Sets/src/mage/cards/d/DealBroker.java b/Mage.Sets/src/mage/cards/d/DealBroker.java index 3e1acd79ed1..9bc0502b888 100644 --- a/Mage.Sets/src/mage/cards/d/DealBroker.java +++ b/Mage.Sets/src/mage/cards/d/DealBroker.java @@ -35,7 +35,7 @@ public final class DealBroker extends CardImpl { + "Each other player may offer you one card in their card pool in exchange. You may accept any one offer - not implemented."))); // {T}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); } private DealBroker(final DealBroker card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java b/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java index 71f1aba1295..813ee20d93a 100644 --- a/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java +++ b/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java @@ -29,8 +29,8 @@ public final class DeathHoodCobra extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private DeathHoodCobra(final DeathHoodCobra card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java b/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java index 04f7e7b1029..0ddc6c2a30f 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java +++ b/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java @@ -31,7 +31,7 @@ public final class DeathbellowRaider extends CardImpl { this.addAbility(new AttacksEachCombatStaticAbility()); // {2}{B}: Regenerate Deathbellow Raider. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private DeathbellowRaider(final DeathbellowRaider card) { diff --git a/Mage.Sets/src/mage/cards/d/Deathgrip.java b/Mage.Sets/src/mage/cards/d/Deathgrip.java index c8bfcbe4417..1d51f3a71df 100644 --- a/Mage.Sets/src/mage/cards/d/Deathgrip.java +++ b/Mage.Sets/src/mage/cards/d/Deathgrip.java @@ -29,7 +29,7 @@ public final class Deathgrip extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}"); // {B}{B}: Counter target green spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{B}{B}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeathknellKami.java b/Mage.Sets/src/mage/cards/d/DeathknellKami.java index 5dd73d2502b..89bc8ec6185 100644 --- a/Mage.Sets/src/mage/cards/d/DeathknellKami.java +++ b/Mage.Sets/src/mage/cards/d/DeathknellKami.java @@ -37,7 +37,7 @@ public final class DeathknellKami extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}: Deathknell Kami gets +1/+1 until end of turn. Sacrifice it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,1,Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1,1,Duration.EndOfTurn), new GenericManaCost(2)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeathriteShaman.java b/Mage.Sets/src/mage/cards/d/DeathriteShaman.java index 496a15fb463..efa2186a081 100644 --- a/Mage.Sets/src/mage/cards/d/DeathriteShaman.java +++ b/Mage.Sets/src/mage/cards/d/DeathriteShaman.java @@ -47,7 +47,7 @@ public final class DeathriteShaman extends CardImpl { this.toughness = new MageInt(2); // {T}: Exile target land card from a graveyard. Add one mana of any color. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); // Because this is no mana ability, this mana will not be calculated during available mana calculation ability.addEffect(new AddManaOfAnyColorEffect(1, new LimitedDynamicValue(1, new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_LAND)), false)); @@ -55,14 +55,14 @@ public final class DeathriteShaman extends CardImpl { this.addAbility(ability); // {B}, {T}: Exile target instant or sorcery card from a graveyard. Each opponent loses 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new LoseLifeOpponentsEffect(2)); ability.addTarget(new TargetCardInGraveyard(filter)); this.addAbility(ability); // {G}, {T}: Exile target creature card from a graveyard. You gain 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{G}")); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new GainLifeEffect(2)); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java index b7b810ff21a..65bf6423d0b 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java @@ -40,7 +40,7 @@ public final class DeathsporeThallid extends CardImpl { new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(-1,-1, Duration.EndOfTurn), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java index 5344a120d3f..ca7b1b5831a 100644 --- a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java @@ -37,7 +37,7 @@ public final class DebtorsPulpit extends CardImpl { // Enchanted land has "{T}: Tap target creature." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Tap target creature.\""))); diff --git a/Mage.Sets/src/mage/cards/d/DecimatorWeb.java b/Mage.Sets/src/mage/cards/d/DecimatorWeb.java index 9747d8f0a69..6a273d8bc40 100644 --- a/Mage.Sets/src/mage/cards/d/DecimatorWeb.java +++ b/Mage.Sets/src/mage/cards/d/DecimatorWeb.java @@ -23,7 +23,7 @@ public final class DecimatorWeb extends CardImpl { public DecimatorWeb (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AddCountersTargetEffect(CounterType.POISON.createInstance()) .setText(", gets a poison counter")); diff --git a/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java b/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java index 96ef8e8db27..ccb74c2e316 100644 --- a/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java +++ b/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java @@ -32,7 +32,7 @@ public final class DeclarationOfNaught extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL))); // {U}: Counter target spell with the chosen name. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); ability.setTargetAdjuster(DeclarationOfNaughtAdjuster.instance); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DecoctionModule.java b/Mage.Sets/src/mage/cards/d/DecoctionModule.java index 65fc8cee925..078ea1b6238 100644 --- a/Mage.Sets/src/mage/cards/d/DecoctionModule.java +++ b/Mage.Sets/src/mage/cards/d/DecoctionModule.java @@ -34,7 +34,7 @@ public final class DecoctionModule extends CardImpl { ); // {4}, {T}: Return target creature you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java b/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java index f713527bbc4..1e4ea3667fe 100644 --- a/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java +++ b/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java @@ -30,7 +30,7 @@ public final class DecoratedGriffin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Prevent the next 1 combat damage that would be dealt to you this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, true, true, 1), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, true, true, 1), new ManaCostsImpl<>("{1}{W}"))); } private DecoratedGriffin(final DecoratedGriffin card) { diff --git a/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java b/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java index 59ec3f17e84..434ebdc29f1 100644 --- a/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java +++ b/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java @@ -30,7 +30,7 @@ public final class DedicatedMartyr extends CardImpl { this.toughness = new MageInt(1); // {W}, Sacrifice Dedicated Martyr: You gain 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(3), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeepSpawn.java b/Mage.Sets/src/mage/cards/d/DeepSpawn.java index 97146f30983..11a6b800d23 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSpawn.java +++ b/Mage.Sets/src/mage/cards/d/DeepSpawn.java @@ -41,7 +41,7 @@ public final class DeepSpawn extends CardImpl { effect.setText("sacrifice {this} unless you mill two cards"); this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect)); // {U}: Deep Spawn gains shroud until end of turn and doesn't untap during your next untap step. Tap Deep Spawn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect( ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); effect = new DontUntapInControllersNextUntapStepSourceEffect(); effect.setText("and doesn't untap during your next untap step"); diff --git a/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java b/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java index 0c997542437..c83a52751ad 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java +++ b/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java @@ -41,7 +41,7 @@ public final class DeepfathomSkulker extends CardImpl { this.addAbility(new DeepfathomSkulkerTriggeredAbility()); // {3}{C}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{3}{C}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{3}{C}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java b/Mage.Sets/src/mage/cards/d/DeepfireElemental.java index 72c553a4c1f..0736f30126c 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java +++ b/Mage.Sets/src/mage/cards/d/DeepfireElemental.java @@ -40,7 +40,7 @@ public final class DeepfireElemental extends CardImpl { this.toughness = new MageInt(4); // {X}{X}{1}: Destroy target artifact or creature with converted mana cost X. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{1}")); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(new XManaValueTargetAdjuster()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java b/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java index 0084882e5bc..9c306150a22 100644 --- a/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java +++ b/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java @@ -28,7 +28,7 @@ public final class DeeptreadMerrow extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( new IslandwalkAbility(), Duration.EndOfTurn) .setText("{this} gains islandwalk until end of turn"), new ColoredManaCost(ColoredManaSymbol.U))); diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java b/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java index a3c3a1bff5e..929c6d635d1 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java @@ -31,7 +31,7 @@ public final class DeepwoodDrummer extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Discard a card: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java b/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java index 73ec76045a9..da9638cbc3b 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java @@ -26,7 +26,7 @@ public final class DeepwoodGhoul extends CardImpl { this.toughness = new MageInt(1); // Pay 2 life: Regenerate Deepwood Ghoul. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new PayLifeCost(2))); } private DeepwoodGhoul(final DeepwoodGhoul card) { diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java b/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java index 8bed44af191..f040237f1be 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java @@ -46,7 +46,7 @@ public final class DeepwoodLegate extends CardImpl { this.addAbility(new AlternativeCostSourceAbility(null, condition)); // {B}: Deepwood Legate gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private DeepwoodLegate(final DeepwoodLegate card) { diff --git a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java index abe36af9ade..a5f36976101 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java +++ b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java @@ -34,7 +34,7 @@ public final class DefenderEnVec extends CardImpl { this.addAbility(new FadingAbility(4, this)); // Remove a fade counter from Defender en-Vec: Prevent the next 2 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DefilingTears.java b/Mage.Sets/src/mage/cards/d/DefilingTears.java index a36172f4bc5..22e01b0296a 100644 --- a/Mage.Sets/src/mage/cards/d/DefilingTears.java +++ b/Mage.Sets/src/mage/cards/d/DefilingTears.java @@ -37,7 +37,7 @@ public final class DefilingTears extends CardImpl { effect.setText(", gets +1/-1"); this.getSpellAbility().addEffect(effect); - effect = new GainAbilityTargetEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")), Duration.EndOfTurn); + effect = new GainAbilityTargetEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")), Duration.EndOfTurn); effect.setText(", and gains \"{B}: Regenerate this creature.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/d/DeftbladeElite.java b/Mage.Sets/src/mage/cards/d/DeftbladeElite.java index 94416a016c7..ab1e36dc022 100644 --- a/Mage.Sets/src/mage/cards/d/DeftbladeElite.java +++ b/Mage.Sets/src/mage/cards/d/DeftbladeElite.java @@ -36,7 +36,7 @@ public final class DeftbladeElite extends CardImpl { // {1}{W}: Prevent all combat damage that would be dealt to and dealt by Deftblade Elite 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<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}")); effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn); effect.setText("and dealt by {this} this turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DegaDisciple.java b/Mage.Sets/src/mage/cards/d/DegaDisciple.java index 2a0280c66aa..bc310b18c5b 100644 --- a/Mage.Sets/src/mage/cards/d/DegaDisciple.java +++ b/Mage.Sets/src/mage/cards/d/DegaDisciple.java @@ -30,11 +30,11 @@ public final class DegaDisciple extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability firstAbility = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability secondAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/d/Degavolver.java b/Mage.Sets/src/mage/cards/d/Degavolver.java index 15907c9c6df..ca554f5db41 100644 --- a/Mage.Sets/src/mage/cards/d/Degavolver.java +++ b/Mage.Sets/src/mage/cards/d/Degavolver.java @@ -44,7 +44,7 @@ public final class Degavolver extends CardImpl { new AddCountersSourceEffect(CounterType.P1P1.createInstance(2),false), new KickedCostCondition("{1}{B}"), "If Degavolver was kicked with its {1}{B} kicker, it enters with two +1/+1 counters on it and with \"Pay 3 life: Regenerate Degavolver.\"", "{this} enters with two +1/+1 counters on it and with \"Pay 3 life: Regenerate Degavolver.\""); - ((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(3)), Duration.WhileOnBattlefield)); + ((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new PayLifeCost(3)), Duration.WhileOnBattlefield)); this.addAbility(ability1); // If Degavolver was kicked with its {R} kicker, it enters with a +1/+1 counter on it and with first strike. diff --git a/Mage.Sets/src/mage/cards/d/DeityOfScars.java b/Mage.Sets/src/mage/cards/d/DeityOfScars.java index 7e474c8917f..00d67a36b52 100644 --- a/Mage.Sets/src/mage/cards/d/DeityOfScars.java +++ b/Mage.Sets/src/mage/cards/d/DeityOfScars.java @@ -38,7 +38,7 @@ public final class DeityOfScars extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)), "with two -1/-1 counters on it")); // {B/G}, Remove a -1/-1 counter from Deity of Scars: Regenerate Deity of Scars. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B/G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B/G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DementiaBat.java b/Mage.Sets/src/mage/cards/d/DementiaBat.java index 5d837c6f660..e9435f43bb1 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaBat.java +++ b/Mage.Sets/src/mage/cards/d/DementiaBat.java @@ -30,7 +30,7 @@ public final class DementiaBat extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new ManaCostsImpl<>("{4}{B}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DiscardTargetEffect(2), new ManaCostsImpl<>("{4}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java b/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java index 975a785f187..d55cbd85892 100644 --- a/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java +++ b/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java @@ -50,7 +50,7 @@ public final class DemonOfDarkSchemes extends CardImpl { // {2}{B}, Pay {E}{E}{E}{E}: Put target creature card from a graveyard onto the battlefield under your control tapped. effect = new ReturnFromGraveyardToBattlefieldTargetEffect(true); effect.setText("Put target creature card from a graveyard onto the battlefield under your control tapped"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{B}")); ability.addCost(new PayEnergyCost(4)); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DemonicHordes.java b/Mage.Sets/src/mage/cards/d/DemonicHordes.java index 4e42f462993..803e2d92d52 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicHordes.java +++ b/Mage.Sets/src/mage/cards/d/DemonicHordes.java @@ -41,7 +41,7 @@ public final class DemonicHordes extends CardImpl { this.toughness = new MageInt(5); // {tap}: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(new FilterLandPermanent())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DemonspineWhip.java b/Mage.Sets/src/mage/cards/d/DemonspineWhip.java index 258fe5c1ba3..d75ad5c5226 100644 --- a/Mage.Sets/src/mage/cards/d/DemonspineWhip.java +++ b/Mage.Sets/src/mage/cards/d/DemonspineWhip.java @@ -29,7 +29,7 @@ public final class DemonspineWhip extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // {X}: Equipped creature gets +X/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new XPaid(), StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl<>("{X}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEquippedEffect(new XPaid(), StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl<>("{X}"))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java b/Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java index f6fa8cd2a17..52077941612 100644 --- a/Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java +++ b/Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java @@ -52,7 +52,7 @@ public final class DenOfTheBugbear extends CardImpl { new CreateTokenEffect(new GoblinToken(), 1, true, true), false, "Whenever this creature attacks, create a 1/1 red Goblin creature token that's tapped and attacking." ); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 2, "3/2 red Goblin creature with \"Whenever this creature attacks, create a 1/1 red Goblin creature token that's tapped and attacking.\"") .withColor("R") .withSubType(SubType.GOBLIN) diff --git a/Mage.Sets/src/mage/cards/d/DesertedTemple.java b/Mage.Sets/src/mage/cards/d/DesertedTemple.java index 0c716417aff..592158d7f85 100644 --- a/Mage.Sets/src/mage/cards/d/DesertedTemple.java +++ b/Mage.Sets/src/mage/cards/d/DesertedTemple.java @@ -26,7 +26,7 @@ public final class DesertedTemple extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Untap target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DesertersQuarters.java b/Mage.Sets/src/mage/cards/d/DesertersQuarters.java index fa0ef466182..34b8709cd86 100644 --- a/Mage.Sets/src/mage/cards/d/DesertersQuarters.java +++ b/Mage.Sets/src/mage/cards/d/DesertersQuarters.java @@ -28,7 +28,7 @@ public final class DesertersQuarters extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {6}, T: Tap target creature. It doesn't untap during its controller's untap step for as long as Deserter's Quarters remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(6)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); diff --git a/Mage.Sets/src/mage/cards/d/DespoticScepter.java b/Mage.Sets/src/mage/cards/d/DespoticScepter.java index 13e7dedf319..d7dca438fff 100644 --- a/Mage.Sets/src/mage/cards/d/DespoticScepter.java +++ b/Mage.Sets/src/mage/cards/d/DespoticScepter.java @@ -30,7 +30,7 @@ public final class DespoticScepter extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {tap}: Destroy target permanent you own. 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 TargetPermanent(FILTER)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeviantGlee.java b/Mage.Sets/src/mage/cards/d/DeviantGlee.java index e9802ae78d0..92adb9aa852 100644 --- a/Mage.Sets/src/mage/cards/d/DeviantGlee.java +++ b/Mage.Sets/src/mage/cards/d/DeviantGlee.java @@ -41,7 +41,7 @@ public final class DeviantGlee extends CardImpl { // Enchanted creature gets +2/+1 and has "{R}: This creature gains trample until end of turn." SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn),new ManaCostsImpl<>("{R}")); + Ability gainedAbility = new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn),new ManaCostsImpl<>("{R}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java b/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java index 91fd0ca7f24..40dbee78f9d 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java +++ b/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java @@ -41,7 +41,7 @@ public final class DevotedCaretaker extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Target permanent you control gains protection from instant spells and from sorcery spells until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); Target target = new TargetControlledPermanent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/d/DevotedDruid.java b/Mage.Sets/src/mage/cards/d/DevotedDruid.java index 6e2307ff8b6..4b24d294ec8 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedDruid.java +++ b/Mage.Sets/src/mage/cards/d/DevotedDruid.java @@ -31,7 +31,7 @@ public final class DevotedDruid extends CardImpl { // {tap}: Add {G}. this.addAbility(new GreenManaAbility()); // Put a -1/-1 counter on Devoted Druid: Untap Devoted Druid. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance()))); } private DevotedDruid(final DevotedDruid card) { diff --git a/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java b/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java index b4d407d587f..b4759a49755 100644 --- a/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java +++ b/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java @@ -29,7 +29,7 @@ public final class DevoteeOfStrength extends CardImpl { this.toughness = new MageInt(2); // {4}{G}: Target creature gets +2/+2 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{4}{G}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{4}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DevouringStrossus.java b/Mage.Sets/src/mage/cards/d/DevouringStrossus.java index 63fe6ee84f6..ae31e216dd9 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringStrossus.java +++ b/Mage.Sets/src/mage/cards/d/DevouringStrossus.java @@ -41,7 +41,7 @@ public final class DevouringStrossus extends CardImpl { ); this.addAbility(ability); // Sacrifice a creature: Regenerate Devouring Strossus. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/d/DevouringSwarm.java b/Mage.Sets/src/mage/cards/d/DevouringSwarm.java index 7b4bfa7d784..1f15c3369aa 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringSwarm.java +++ b/Mage.Sets/src/mage/cards/d/DevouringSwarm.java @@ -28,7 +28,7 @@ public final class DevouringSwarm extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java index bfe805f223b..d1cdd760a7a 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java +++ b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java @@ -41,7 +41,7 @@ public final class DevoutChaplain extends CardImpl { this.toughness = new MageInt(2); // {T}, Tap two untapped Humans you control: Exile target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(2, 2, humanFilter, false))); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java index 0f6c9a2ca2d..e1b46ad8c63 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java +++ b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java @@ -39,7 +39,7 @@ public final class DevoutHarpist extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target Aura attached to a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DevoutWitness.java b/Mage.Sets/src/mage/cards/d/DevoutWitness.java index 61a46a02888..4c2d6e8156d 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutWitness.java +++ b/Mage.Sets/src/mage/cards/d/DevoutWitness.java @@ -33,7 +33,7 @@ public final class DevoutWitness extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {tap}, Discard a card: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/d/DiabolicMachine.java b/Mage.Sets/src/mage/cards/d/DiabolicMachine.java index 2cd8944a42e..839dc1ae6c4 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicMachine.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicMachine.java @@ -25,7 +25,7 @@ public final class DiabolicMachine extends CardImpl { this.toughness = new MageInt(4); // {3}: Regenerate Diabolic Machine. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(3))); } private DiabolicMachine(final DiabolicMachine card) { diff --git a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java index 494466d25f6..bf655b83b33 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java +++ b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java @@ -38,7 +38,7 @@ public final class DiamondFaerie extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{S}: Snow creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, filter), new ManaCostsImpl<>("{1}{S}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java index 68e5b88e799..0de9c8ca52d 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java +++ b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java @@ -36,7 +36,7 @@ public final class DiamondKaleidoscope extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {tap}: Create a 0/1 colorless Prism artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PrismToken(), 1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new PrismToken(), 1), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DiamondValley.java b/Mage.Sets/src/mage/cards/d/DiamondValley.java index 42136109730..2b4c0735733 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondValley.java +++ b/Mage.Sets/src/mage/cards/d/DiamondValley.java @@ -27,7 +27,7 @@ public final class DiamondValley extends CardImpl { Effect effect = new GainLifeEffect(SacrificeCostCreaturesToughness.instance); effect.setText("You gain life equal to the sacrificed creature's toughness"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/Didgeridoo.java b/Mage.Sets/src/mage/cards/d/Didgeridoo.java index e03be87bd86..cce8962bca6 100644 --- a/Mage.Sets/src/mage/cards/d/Didgeridoo.java +++ b/Mage.Sets/src/mage/cards/d/Didgeridoo.java @@ -28,7 +28,7 @@ public final class Didgeridoo extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {3}: You may put a Minotaur permanent card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{3}"))); } private Didgeridoo(final Didgeridoo card) { diff --git a/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java b/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java index 3d0d33aafe9..62581150d08 100644 --- a/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java +++ b/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java @@ -31,7 +31,7 @@ public final class DiligentFarmhand extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Diligent Farmhand: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // If Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst. diff --git a/Mage.Sets/src/mage/cards/d/DimirCluestone.java b/Mage.Sets/src/mage/cards/d/DimirCluestone.java index 22ae90229f5..52156e7e012 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCluestone.java +++ b/Mage.Sets/src/mage/cards/d/DimirCluestone.java @@ -32,7 +32,7 @@ public final class DimirCluestone extends CardImpl { this.addAbility(new BlackManaAbility()); // {U}{B}, {T}, Sacrifice Dimir Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java b/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java index 49694c07f27..b51da070de7 100644 --- a/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java +++ b/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java @@ -37,7 +37,7 @@ public final class DimirDoppelganger extends CardImpl { this.toughness = new MageInt(2); // {1}{U}{B}: Exile target creature card from a graveyard. Dimir Doppelganger becomes a copy of that card, except it has this ability. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl<>("{1}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new DimirDoppelgangerEffect(), new ManaCostsImpl<>("{1}{U}{B}")); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"))); this.addAbility(ability); @@ -101,7 +101,7 @@ class DimirDoppelgangerCopyApplier extends CopyApplier { @Override public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl<>("{1}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new DimirDoppelgangerEffect(), new ManaCostsImpl<>("{1}{U}{B}")); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"))); blueprint.getAbilities().add(ability); return true; diff --git a/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java b/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java index 22caefa6767..c28af077b2e 100644 --- a/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java +++ b/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java @@ -31,7 +31,7 @@ public final class DimirHouseGuard extends CardImpl { this.addAbility(FearAbility.getInstance()); // Sacrifice a creature: Regenerate Dimir House Guard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); // Transmute {1}{B}{B} this.addAbility(new TransmuteAbility("{1}{B}{B}")); diff --git a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java index 53fa6baf5e7..f7d863343db 100644 --- a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java +++ b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java @@ -30,7 +30,7 @@ public final class DimirKeyrune extends CardImpl { this.addAbility(new BlackManaAbility()); // {U}{B}: Dimir Keyrune becomes a 2/2 blue and black Horror and can't be blocked this turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(2, 2, "2/2 blue and black Horror creature that can't be blocked") .withColor("UB") .withSubType(SubType.HORROR) diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java index 5e8d1d11781..a508a3d9621 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java @@ -39,7 +39,7 @@ public final class DiplomaticEscort extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}, Discard a card: Counter target spell or ability that targets a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetStackObject(filter)); diff --git a/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java b/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java index f866461f074..7638aff5682 100644 --- a/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java +++ b/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java @@ -30,7 +30,7 @@ public final class DirtwaterWraith extends CardImpl { this.addAbility(new SwampwalkAbility()); // {B}: Dirtwater Wraith 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}"))); } private DirtwaterWraith(final DirtwaterWraith card) { diff --git a/Mage.Sets/src/mage/cards/d/Disappear.java b/Mage.Sets/src/mage/cards/d/Disappear.java index ab3b1893230..582e902982d 100644 --- a/Mage.Sets/src/mage/cards/d/Disappear.java +++ b/Mage.Sets/src/mage/cards/d/Disappear.java @@ -38,7 +38,7 @@ public final class Disappear extends CardImpl { this.addAbility(ability); // {U}: Return enchanted creature and Disappear to their owners' hands. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DisappearEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new DisappearEffect(), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java b/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java index e71c3b4e901..3df71170da6 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java @@ -35,7 +35,7 @@ public final class DiscipleOfGriselbrand extends CardImpl { this.toughness = new MageInt(1); // {1}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscipleOfGriselbrandEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DiscipleOfGriselbrandEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java b/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java index a6d157aadaf..2ca242bf389 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java @@ -36,7 +36,7 @@ public final class DiscipleOfKangee extends CardImpl { // {U}, {T}: Target creature gains flying and becomes blue until end of turn. Effect effect = new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target creature gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}")); effect = new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn); effect.setText("and becomes blue until end of turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java index c928697d6cf..a921141ad90 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java @@ -31,11 +31,11 @@ public final class DiscipleOfTeveshSzat extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {4}{B}{B}, {tap}, Sacrifice Disciple of Tevesh Szat: Target creature gets -6/-6 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-6, -6, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{B}{B}")); + ability = new SimpleActivatedAbility(new BoostTargetEffect(-6, -6, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java index fb2e1e61b86..f89e0e42ac9 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java @@ -29,7 +29,7 @@ public final class DiscipleOfTheOldWays extends CardImpl { this.toughness = new MageInt(2); // {R}: Disciple of the Old Ways gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private DiscipleOfTheOldWays(final DiscipleOfTheOldWays card) { diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java index 5fe2032a404..aac16a70b7c 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java @@ -39,7 +39,7 @@ public final class DiscipleOfTheRing extends CardImpl { // {1}, Exile an instant or sorcery card from your graveyard: // Choose one - Counter target noncreature spell unless its controller pay {2}; - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(2)), new GenericManaCost(1)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(1, new FilterInstantOrSorceryCard("an instant or sorcery card from your graveyard")))); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_NON_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/d/DispellersCapsule.java b/Mage.Sets/src/mage/cards/d/DispellersCapsule.java index 697417a2f90..6dc78a7a6fe 100644 --- a/Mage.Sets/src/mage/cards/d/DispellersCapsule.java +++ b/Mage.Sets/src/mage/cards/d/DispellersCapsule.java @@ -26,7 +26,7 @@ public final class DispellersCapsule extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{W}"); // {2}{W}, {T}, Sacrifice Dispeller's Capsule: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java index ef73896f1f6..a242e2f9e35 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java +++ b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java @@ -31,7 +31,7 @@ public final class DisruptivePitmage extends CardImpl { this.toughness = new MageInt(1); // {tap}: Counter target spell unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); @@ -47,4 +47,4 @@ public final class DisruptivePitmage extends CardImpl { public DisruptivePitmage copy() { return new DisruptivePitmage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java b/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java index 18ac60c9c94..e99d1b08c53 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java +++ b/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java @@ -30,7 +30,7 @@ public final class DisruptiveStudent extends CardImpl { this.toughness = new MageInt(1); // {tap}: Counter target spell unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DistortingLens.java b/Mage.Sets/src/mage/cards/d/DistortingLens.java index b77f97118ce..c15aad1418e 100644 --- a/Mage.Sets/src/mage/cards/d/DistortingLens.java +++ b/Mage.Sets/src/mage/cards/d/DistortingLens.java @@ -29,7 +29,7 @@ public final class DistortingLens extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {tap}: Target permanent becomes the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChangeColorEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ChangeColorEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DiveBomber.java b/Mage.Sets/src/mage/cards/d/DiveBomber.java index 626a5d8262f..a0e9813d5dd 100644 --- a/Mage.Sets/src/mage/cards/d/DiveBomber.java +++ b/Mage.Sets/src/mage/cards/d/DiveBomber.java @@ -33,7 +33,7 @@ public final class DiveBomber extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}, Sacrifice Dive Bomber: Dive Bomber deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java b/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java index a277f231690..843b097a2f6 100644 --- a/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java +++ b/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java @@ -32,7 +32,7 @@ public final class DivebomberGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}, Sacrifice Divebomber Griffin: Divebomber Griffin deals 3 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3, "it"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3, "it"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java b/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java index 7755f2097e0..3cf25dae0ff 100644 --- a/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java +++ b/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java @@ -29,7 +29,7 @@ public final class DiversionaryTactics extends CardImpl { public DiversionaryTactics(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DivinersWand.java b/Mage.Sets/src/mage/cards/d/DivinersWand.java index 789c266a3b7..d109d6a4866 100644 --- a/Mage.Sets/src/mage/cards/d/DivinersWand.java +++ b/Mage.Sets/src/mage/cards/d/DivinersWand.java @@ -38,7 +38,7 @@ public final class DivinersWand extends CardImpl { // new abilities Ability newBoost = new DrawCardControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false); newBoost.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn).concatBy("and")); - Ability newDraw = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(4)); + Ability newDraw = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(4)); // gain new abilities Effect effectBoost = new GainAbilityAttachedEffect(newBoost, AttachmentType.EQUIPMENT) .setText("Equipped creature has \"Whenever you draw a card, this creature gets +1/+1 and gains flying until end of turn\""); diff --git a/Mage.Sets/src/mage/cards/d/DiviningWitch.java b/Mage.Sets/src/mage/cards/d/DiviningWitch.java index e583fade385..8f2b3aaa22e 100644 --- a/Mage.Sets/src/mage/cards/d/DiviningWitch.java +++ b/Mage.Sets/src/mage/cards/d/DiviningWitch.java @@ -35,7 +35,7 @@ public final class DiviningWitch extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, {tap}, Discard a card: Name a card. Exile the top six cards of your library. Reveal cards from the top of your library until you reveal the named card, then put that card into your hand. Exile all other cards revealed this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiviningWitchEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new DiviningWitchEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java b/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java index c4e11548669..b43521b92f5 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java +++ b/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java @@ -41,7 +41,7 @@ public final class DjinnOfWishes extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.WISH.createInstance(3)), "with three wish counters on it")); // {2}{U}{U}, Remove a wish counter from Djinn of Wishes: Reveal the top card of your library. You may play that card without paying its mana cost. If you don't, exile it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DjinnOfWishesEffect(), new ManaCostsImpl<>("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new DjinnOfWishesEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new RemoveCountersSourceCost(CounterType.WISH.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DoggedHunter.java b/Mage.Sets/src/mage/cards/d/DoggedHunter.java index ad7703d0113..bed092c443d 100644 --- a/Mage.Sets/src/mage/cards/d/DoggedHunter.java +++ b/Mage.Sets/src/mage/cards/d/DoggedHunter.java @@ -36,7 +36,7 @@ public final class DoggedHunter extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DoomCannon.java b/Mage.Sets/src/mage/cards/d/DoomCannon.java index 396576bad3a..9bccfeda446 100644 --- a/Mage.Sets/src/mage/cards/d/DoomCannon.java +++ b/Mage.Sets/src/mage/cards/d/DoomCannon.java @@ -35,7 +35,7 @@ public final class DoomCannon extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Sacrifice))); // {3}, {T}, Sacrifice a creature of the chosen type: Doom Cannon deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new DoomCannonFilter())); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java b/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java index 449372a703f..7f9ff7a7c05 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java +++ b/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java @@ -34,7 +34,7 @@ public final class DoomedNecromancer extends CardImpl { this.toughness = new MageInt(2); // {B}, {tap}, Sacrifice Doomed Necromancer: Return target creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/d/DoorToNothingness.java b/Mage.Sets/src/mage/cards/d/DoorToNothingness.java index 8d0bc6d5a7d..e4691fa2d17 100644 --- a/Mage.Sets/src/mage/cards/d/DoorToNothingness.java +++ b/Mage.Sets/src/mage/cards/d/DoorToNothingness.java @@ -31,7 +31,7 @@ public final class DoorToNothingness extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}, {tap}, Sacrifice Door to Nothingness: Target player loses the game. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoorToNothingnessEffect(), new ManaCostsImpl<>("{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}")); + Ability ability = new SimpleActivatedAbility(new DoorToNothingnessEffect(), new ManaCostsImpl<>("{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/d/Doorkeeper.java b/Mage.Sets/src/mage/cards/d/Doorkeeper.java index f6f43bf86c2..9e2bd3124bb 100644 --- a/Mage.Sets/src/mage/cards/d/Doorkeeper.java +++ b/Mage.Sets/src/mage/cards/d/Doorkeeper.java @@ -42,7 +42,7 @@ public final class Doorkeeper extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {2}{U}, {T}: Target player puts the top X cards of their library into their graveyard, where X is the number of creatures with defender you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Douse.java b/Mage.Sets/src/mage/cards/d/Douse.java index a5cf85e45d3..77cd595e3c6 100644 --- a/Mage.Sets/src/mage/cards/d/Douse.java +++ b/Mage.Sets/src/mage/cards/d/Douse.java @@ -30,7 +30,7 @@ public final class Douse extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // {1}{U}: Counter target red spell. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/Downdraft.java b/Mage.Sets/src/mage/cards/d/Downdraft.java index f18dce91a0b..f4400e93aee 100644 --- a/Mage.Sets/src/mage/cards/d/Downdraft.java +++ b/Mage.Sets/src/mage/cards/d/Downdraft.java @@ -34,14 +34,14 @@ public final class Downdraft extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // {G}: Target creature loses flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Sacrifice Downdraft: Downdraft deals 2 damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, "it", filter), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(2, "it", filter), new SacrificeSourceCost())); } private Downdraft(final Downdraft card) { diff --git a/Mage.Sets/src/mage/cards/d/DraconianCylix.java b/Mage.Sets/src/mage/cards/d/DraconianCylix.java index 736c75c6dd6..b0327ee0b7a 100644 --- a/Mage.Sets/src/mage/cards/d/DraconianCylix.java +++ b/Mage.Sets/src/mage/cards/d/DraconianCylix.java @@ -24,7 +24,7 @@ public final class DraconianCylix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {2}, {tap}, Discard a card at random: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/Dracoplasm.java b/Mage.Sets/src/mage/cards/d/Dracoplasm.java index a7c9965823f..472827af344 100644 --- a/Mage.Sets/src/mage/cards/d/Dracoplasm.java +++ b/Mage.Sets/src/mage/cards/d/Dracoplasm.java @@ -44,7 +44,7 @@ public final class Dracoplasm extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new DracoplasmEffect())); // {R}: Dracoplasm 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))); } private Dracoplasm(final Dracoplasm card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonArch.java b/Mage.Sets/src/mage/cards/d/DragonArch.java index 72d0df30bdf..e21ef69ef0f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonArch.java +++ b/Mage.Sets/src/mage/cards/d/DragonArch.java @@ -31,7 +31,7 @@ public final class DragonArch extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {2}, {T}: You may put a multicolored creature card from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), + Ability ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DragonBlood.java b/Mage.Sets/src/mage/cards/d/DragonBlood.java index ef92574924d..f4c6c6413c9 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBlood.java +++ b/Mage.Sets/src/mage/cards/d/DragonBlood.java @@ -22,7 +22,7 @@ public final class DragonBlood extends CardImpl { public DragonBlood(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DragonBreath.java b/Mage.Sets/src/mage/cards/d/DragonBreath.java index 2fe3a6ca27c..3b5147c563c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBreath.java +++ b/Mage.Sets/src/mage/cards/d/DragonBreath.java @@ -51,7 +51,7 @@ public final class DragonBreath extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Breath from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonBreathEffect(), filter, true, SetTargetPointer.PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/d/DragonEngine.java b/Mage.Sets/src/mage/cards/d/DragonEngine.java index 9e0dba783d4..b1429affa48 100644 --- a/Mage.Sets/src/mage/cards/d/DragonEngine.java +++ b/Mage.Sets/src/mage/cards/d/DragonEngine.java @@ -27,7 +27,7 @@ public final class DragonEngine extends CardImpl { this.toughness = new MageInt(3); // {2}: Dragon Engine gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private DragonEngine(final DragonEngine card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonMantle.java b/Mage.Sets/src/mage/cards/d/DragonMantle.java index d92616e4e90..a7a03192846 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMantle.java +++ b/Mage.Sets/src/mage/cards/d/DragonMantle.java @@ -38,7 +38,7 @@ public final class DragonMantle extends CardImpl { // When Dragon Mantle enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has "{R}: This creature gets +1/+0 until end of turn." - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability2 = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{R}: This creature gets +1/+0 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonMask.java b/Mage.Sets/src/mage/cards/d/DragonMask.java index 1968183f7bf..814a837c81a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMask.java +++ b/Mage.Sets/src/mage/cards/d/DragonMask.java @@ -28,7 +28,7 @@ public final class DragonMask extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, {tap}: Target creature you control gets +2/+2 until end of turn. Return it to its owner's hand at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); Effect returnEffect = new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnToHandTargetEffect())); diff --git a/Mage.Sets/src/mage/cards/d/DragonRoost.java b/Mage.Sets/src/mage/cards/d/DragonRoost.java index f23f06b8bc7..f48c7100b93 100644 --- a/Mage.Sets/src/mage/cards/d/DragonRoost.java +++ b/Mage.Sets/src/mage/cards/d/DragonRoost.java @@ -20,7 +20,7 @@ public final class DragonRoost extends CardImpl { public DragonRoost(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}{R}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl<>("{5}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl<>("{5}{R}{R}"))); } private DragonRoost(final DragonRoost card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java index 4eb644b2ef6..1fd9cef7335 100644 --- a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java +++ b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java @@ -35,7 +35,7 @@ public final class DragonThroneOfTarkir extends CardImpl { Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, true); effect.setText("Other creatures you control gain trample"); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability gainedAbility = new SimpleActivatedAbility(effect, new GenericManaCost(2)); effect = new BoostControlledEffect(SourcePermanentPowerValue.NOT_NEGATIVE, SourcePermanentPowerValue.NOT_NEGATIVE, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, true); effect.setText("and get +X/+X until end of turn, where X is this creature's power"); gainedAbility.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DragonTyrant.java b/Mage.Sets/src/mage/cards/d/DragonTyrant.java index 2d88fe16918..6b671208053 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTyrant.java +++ b/Mage.Sets/src/mage/cards/d/DragonTyrant.java @@ -39,7 +39,7 @@ public final class DragonTyrant extends CardImpl { // At the beginning of your upkeep, sacrifice Dragon Tyrant unless you pay {R}{R}{R}{R}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{R}{R}{R}{R}")))); // {R}: Dragon Tyrant 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 DragonTyrant(final DragonTyrant card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java index 5d3f8ed5803..dd463346042 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java @@ -35,7 +35,7 @@ public final class DragonWhisperer extends CardImpl { this.toughness = new MageInt(2); // {R}: Dragon Whisperer gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/d/Dragonrage.java b/Mage.Sets/src/mage/cards/d/Dragonrage.java index 9d0018696ff..70e13518095 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonrage.java +++ b/Mage.Sets/src/mage/cards/d/Dragonrage.java @@ -40,7 +40,7 @@ public final class Dragonrage extends CardImpl { new PermanentsOnBattlefieldCount(filter))); // Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn." - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability abilityToGain = new SimpleActivatedAbility(new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); Effect effect = new GainAbilityAllEffect(abilityToGain, Duration.EndOfTurn, filter); effect.setText("Until end of turn, attacking creatures you control gain \"{R}: This creature gets +1/+0 until end of turn.\""); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DrakeHatcher.java b/Mage.Sets/src/mage/cards/d/DrakeHatcher.java index 627d246f096..bc09b9209b2 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeHatcher.java +++ b/Mage.Sets/src/mage/cards/d/DrakeHatcher.java @@ -50,7 +50,7 @@ public final class DrakeHatcher extends CardImpl { this.addAbility(ability); // Remove three incubation counters from this creature: Create a 2/2 blue Drake creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect( + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect( new DrakeToken()), new RemoveCountersSourceCost(CounterType.INCUBATION.createInstance(3))) ); diff --git a/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java b/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java index 7e9815a27e3..df6df5a1b58 100644 --- a/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java +++ b/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java @@ -41,7 +41,7 @@ public final class DrakestownForgotten extends CardImpl { "with X +1/+1 counters on it, where X is the number of creature cards in all graveyards")); // {2}{B}, Remove a +1/+1 counter from Drakestown Forgotten: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java b/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java index be1085ddc11..236694ce496 100644 --- a/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java +++ b/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java @@ -37,7 +37,7 @@ public final class DranaKalastriaBloodchief extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(StaticValue.get(0), new SignInversionDynamicValue(GetXValue.instance), Duration.EndOfTurn), new ManaCostsImpl<>("{X}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(StaticValue.get(0), new SignInversionDynamicValue(GetXValue.instance), Duration.EndOfTurn), new ManaCostsImpl<>("{X}{B}{B}")); ability.addEffect(new BoostSourceEffect(GetXValue.instance, StaticValue.get(0), Duration.EndOfTurn).concatBy("and")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DreadDefiler.java b/Mage.Sets/src/mage/cards/d/DreadDefiler.java index 26b2b4788c9..76970c6aa07 100644 --- a/Mage.Sets/src/mage/cards/d/DreadDefiler.java +++ b/Mage.Sets/src/mage/cards/d/DreadDefiler.java @@ -39,7 +39,7 @@ public final class DreadDefiler extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {3}{C}, Exile a creature card from your graveyard: Target opponent loses life equal to the exiled card's power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DreadDefilerEffect(), new ManaCostsImpl<>("{3}{C}")); + Ability ability = new SimpleActivatedAbility(new DreadDefilerEffect(), new ManaCostsImpl<>("{3}{C}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD))); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DreadShade.java b/Mage.Sets/src/mage/cards/d/DreadShade.java index 8e47a8fb484..d9c8a7cee5b 100644 --- a/Mage.Sets/src/mage/cards/d/DreadShade.java +++ b/Mage.Sets/src/mage/cards/d/DreadShade.java @@ -27,7 +27,7 @@ public final class DreadShade extends CardImpl { this.toughness = new MageInt(3); // {B}: Dread Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private DreadShade(final DreadShade card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadStatuary.java b/Mage.Sets/src/mage/cards/d/DreadStatuary.java index c440e81b789..cc0432edafc 100644 --- a/Mage.Sets/src/mage/cards/d/DreadStatuary.java +++ b/Mage.Sets/src/mage/cards/d/DreadStatuary.java @@ -25,7 +25,7 @@ public final class DreadStatuary extends CardImpl { public DreadStatuary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new DreadStatuaryToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{4}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new DreadStatuaryToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{4}"))); } private DreadStatuary(final DreadStatuary card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadshipReef.java b/Mage.Sets/src/mage/cards/d/DreadshipReef.java index 7a2b404fbb7..6c55b2c4d4c 100644 --- a/Mage.Sets/src/mage/cards/d/DreadshipReef.java +++ b/Mage.Sets/src/mage/cards/d/DreadshipReef.java @@ -31,7 +31,7 @@ public final class DreadshipReef extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Dreadship Reef. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Dreadship Reef: Add X mana in any combination of {U} and/or {B}. diff --git a/Mage.Sets/src/mage/cards/d/Dreadwing.java b/Mage.Sets/src/mage/cards/d/Dreadwing.java index 3014ab01f14..4e3a07d719d 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadwing.java +++ b/Mage.Sets/src/mage/cards/d/Dreadwing.java @@ -32,7 +32,7 @@ public final class Dreadwing extends CardImpl { // {1}{U}{R}: Dreadwing gets +3/+0 and gains flying until end of turn. Effect effect = new BoostSourceEffect(3, 0, Duration.EndOfTurn); effect.setText("{this} gets +3/+0"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>(("{1}{U}{R}"))); + SimpleActivatedAbility ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>(("{1}{U}{R}"))); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.getEffects().add(effect); diff --git a/Mage.Sets/src/mage/cards/d/DreamThrush.java b/Mage.Sets/src/mage/cards/d/DreamThrush.java index c9aa4992d7e..674e6509499 100644 --- a/Mage.Sets/src/mage/cards/d/DreamThrush.java +++ b/Mage.Sets/src/mage/cards/d/DreamThrush.java @@ -33,7 +33,7 @@ public final class DreamThrush extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Target land 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 TargetLandPermanent(); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java b/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java index ebec82144a6..59b35d7d9ca 100644 --- a/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java @@ -44,7 +44,7 @@ public final class DreamsOfTheDead extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // {1}{U}: Return target white or black creature card from your graveyard to the battlefield. That creature gains "Cumulative upkeep {2}." If the creature would leave the battlefield, exile it instead of putting it anywhere else. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DreamsOfTheDeadEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new DreamsOfTheDeadEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addEffect(new LeaveBattlefieldExileTargetReplacementEffect("the creature")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DriftingShade.java b/Mage.Sets/src/mage/cards/d/DriftingShade.java index 3d98557aae4..fe80d849981 100644 --- a/Mage.Sets/src/mage/cards/d/DriftingShade.java +++ b/Mage.Sets/src/mage/cards/d/DriftingShade.java @@ -28,7 +28,7 @@ public final class DriftingShade extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - 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 DriftingShade(final DriftingShade card) { diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java index 87d1290be43..f5cbe553138 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java @@ -45,7 +45,7 @@ public final class DrogskolCavalry extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new GainLifeEffect(2), filter)); // {3}{W}: Create a 1/1 white Spirit creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{3}{W}"))); } private DrogskolCavalry(final DrogskolCavalry card) { diff --git a/Mage.Sets/src/mage/cards/d/Droideka.java b/Mage.Sets/src/mage/cards/d/Droideka.java index bb3a40b3545..0d178393a2f 100644 --- a/Mage.Sets/src/mage/cards/d/Droideka.java +++ b/Mage.Sets/src/mage/cards/d/Droideka.java @@ -28,7 +28,7 @@ public final class Droideka extends CardImpl { this.toughness = new MageInt(6); // {2}{U}: Change a target of target spell or ability to Droideka. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChangeATargetOfTargetSpellAbilityToSourceEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new ChangeATargetOfTargetSpellAbilityToSourceEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetStackObject()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java b/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java index 0b5ec485bae..95038c35611 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java +++ b/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java @@ -38,7 +38,7 @@ public final class DromokaDunecaster extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {T}: Tap target creature without flying. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DromokaMonument.java b/Mage.Sets/src/mage/cards/d/DromokaMonument.java index 0175e1b5a82..720489630c4 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaMonument.java +++ b/Mage.Sets/src/mage/cards/d/DromokaMonument.java @@ -31,7 +31,7 @@ public final class DromokaMonument extends CardImpl { this.addAbility(new WhiteManaAbility()); // {4}{G}{W}: Dromoka Monument becomes a 4/4 green and white Dragon artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect (new DromokaMonumentToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{G}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DroneHolocron.java b/Mage.Sets/src/mage/cards/d/DroneHolocron.java index 7c7254666a6..4f5d31d6d35 100644 --- a/Mage.Sets/src/mage/cards/d/DroneHolocron.java +++ b/Mage.Sets/src/mage/cards/d/DroneHolocron.java @@ -29,7 +29,7 @@ public final class DroneHolocron extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {T}: Put a charge counter on Drone Holocron. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); // {T}, Remove a charge counter from Drone Holocron: Add {W}, {U} or {B}. Cost cost = new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)); diff --git a/Mage.Sets/src/mage/cards/d/DronepackKindred.java b/Mage.Sets/src/mage/cards/d/DronepackKindred.java index e58137e3ec9..3b3e4b5b1a1 100644 --- a/Mage.Sets/src/mage/cards/d/DronepackKindred.java +++ b/Mage.Sets/src/mage/cards/d/DronepackKindred.java @@ -34,7 +34,7 @@ public final class DronepackKindred extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {1}: Dronepack Kindred gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); } private DronepackKindred(final DronepackKindred card) { diff --git a/Mage.Sets/src/mage/cards/d/DrossRipper.java b/Mage.Sets/src/mage/cards/d/DrossRipper.java index 0055b0ad4f3..df643bcfee8 100644 --- a/Mage.Sets/src/mage/cards/d/DrossRipper.java +++ b/Mage.Sets/src/mage/cards/d/DrossRipper.java @@ -26,7 +26,7 @@ public final class DrossRipper extends CardImpl { this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); } private DrossRipper(final DrossRipper card) { diff --git a/Mage.Sets/src/mage/cards/d/Drowned.java b/Mage.Sets/src/mage/cards/d/Drowned.java index e9ed570851f..8d701025cf9 100644 --- a/Mage.Sets/src/mage/cards/d/Drowned.java +++ b/Mage.Sets/src/mage/cards/d/Drowned.java @@ -25,7 +25,7 @@ public final class Drowned extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Drowned. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private Drowned(final Drowned card) { diff --git a/Mage.Sets/src/mage/cards/d/DrownedRusalka.java b/Mage.Sets/src/mage/cards/d/DrownedRusalka.java index 7b93a8deb1e..52506a8c3be 100644 --- a/Mage.Sets/src/mage/cards/d/DrownedRusalka.java +++ b/Mage.Sets/src/mage/cards/d/DrownedRusalka.java @@ -31,7 +31,7 @@ public final class DrownedRusalka extends CardImpl { this.toughness = new MageInt(1); // {U}, Sacrifice a creature: Discard a card, then draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DiscardControllerEffect(1), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy(", then")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java index 9b13f55d9b3..15a13c2fea2 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java @@ -49,7 +49,7 @@ public final class DrownerOfHope extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); // Sacrifice an Eldrazi Scion: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new SacrificeTargetCost(filter)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java index faadb053900..f2f87a5fac0 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java @@ -39,7 +39,7 @@ public final class DrownerOfSecrets extends CardImpl { this.toughness = new MageInt(3); // Tap an untapped Merfolk you control: Target player puts the top card of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DrudgeReavers.java b/Mage.Sets/src/mage/cards/d/DrudgeReavers.java index a0e9fbaf926..6fd3f7cc087 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeReavers.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeReavers.java @@ -28,7 +28,7 @@ public final class DrudgeReavers extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // {B}: Regenerate Drudge Reavers. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private DrudgeReavers(final DrudgeReavers card) { diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java b/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java index 03b0ec2cc2d..97e6eba453e 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java @@ -25,7 +25,7 @@ public final class DrudgeSkeletons 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 DrudgeSkeletons(final DrudgeSkeletons card) { diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java index c4632f2ca09..94cdfd3e946 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java @@ -40,7 +40,7 @@ public final class DrudgeSpell extends CardImpl { // {B}, Exile two creature cards from your graveyard: Create a 1/1 black Skeleton creature token. It has "{B}: Regenerate this creature." Effect effect = new CreateTokenEffect(new SkeletonRegenerateToken()); effect.setText("create a 1/1 black Skeleton creature token. It has \"{B}: Regenerate this creature.\""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(effect, new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DruidLyrist.java b/Mage.Sets/src/mage/cards/d/DruidLyrist.java index d6e296ec709..0ebf9abc93f 100644 --- a/Mage.Sets/src/mage/cards/d/DruidLyrist.java +++ b/Mage.Sets/src/mage/cards/d/DruidLyrist.java @@ -31,7 +31,7 @@ public final class DruidLyrist extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Druid Lyrist: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java index bd98e6edc27..0966f232fbb 100644 --- a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java +++ b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java @@ -27,7 +27,7 @@ public final class DruidicSatchel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}, {T}: Reveal the top card of your library. If it’s a creature card, create a 1/1 green Saproling creature token. If it’s a land card, put that card onto the battlefield under your control. If it’s a noncreature, nonland card, you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DruidicSatchelEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DruidicSatchelEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java b/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java index d5633d3542b..fa3b97a66e3 100644 --- a/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java +++ b/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java @@ -36,7 +36,7 @@ public final class DrunauCorpseTrawler extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken()))); // {2}{B}: Target Zombie gains deathtouch until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent(SubType.ZOMBIE, "Zombie"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DualCasting.java b/Mage.Sets/src/mage/cards/d/DualCasting.java index 7556af2b090..c4060718963 100644 --- a/Mage.Sets/src/mage/cards/d/DualCasting.java +++ b/Mage.Sets/src/mage/cards/d/DualCasting.java @@ -46,7 +46,7 @@ public final class DualCasting extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{R}, {tap}: Copy target instant or sorcery spell you control. You may choose new targets for the copy." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ColoredManaCost(ColoredManaSymbol.R)); + ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/d/DuctCrawler.java b/Mage.Sets/src/mage/cards/d/DuctCrawler.java index 4e00ba1176c..6547bf9d39e 100644 --- a/Mage.Sets/src/mage/cards/d/DuctCrawler.java +++ b/Mage.Sets/src/mage/cards/d/DuctCrawler.java @@ -28,7 +28,7 @@ public final class DuctCrawler extends CardImpl { this.toughness = new MageInt(1); // {1}{R}: Target creature can't block Duct Crawler this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuergarAssailant.java b/Mage.Sets/src/mage/cards/d/DuergarAssailant.java index bf5f25b5aeb..aa35f5e673b 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarAssailant.java +++ b/Mage.Sets/src/mage/cards/d/DuergarAssailant.java @@ -30,7 +30,7 @@ public final class DuergarAssailant extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Duergar Assailant: Duergar Assailant deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java b/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java index 970dec10f76..e019f45ff79 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java +++ b/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java @@ -28,7 +28,7 @@ public final class DuergarCaveGuard extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(WitherAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}"))); } private DuergarCaveGuard(final DuergarCaveGuard card) { diff --git a/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java b/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java index 3d5207f7be6..7de96f601a9 100644 --- a/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java +++ b/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java @@ -27,7 +27,7 @@ public final class DukharaPeafowl extends CardImpl { this.toughness = new MageInt(4); // {U}: Dukhara Peafowl 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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DuneDiviner.java b/Mage.Sets/src/mage/cards/d/DuneDiviner.java index 5619f358b36..4841ec1ea08 100644 --- a/Mage.Sets/src/mage/cards/d/DuneDiviner.java +++ b/Mage.Sets/src/mage/cards/d/DuneDiviner.java @@ -39,7 +39,7 @@ public final class DuneDiviner extends CardImpl { this.toughness = new MageInt(3); // {1}, Tap an untapped Desert you control: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new GenericManaCost(1)); ability.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DungeonShade.java b/Mage.Sets/src/mage/cards/d/DungeonShade.java index aa77d49b589..991a46f997c 100644 --- a/Mage.Sets/src/mage/cards/d/DungeonShade.java +++ b/Mage.Sets/src/mage/cards/d/DungeonShade.java @@ -31,7 +31,7 @@ public final class DungeonShade extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {B}: Dungeon Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private DungeonShade(final DungeonShade card) { diff --git a/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java b/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java index bebd481b8eb..b8a3861e1ee 100644 --- a/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java +++ b/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java @@ -43,7 +43,7 @@ public final class DuskborneSkymarcher extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}, {T}: Target attacking vampire gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java index 9ece5e9d50f..76d9e2505c5 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java @@ -39,10 +39,10 @@ public final class DuskmantleGuildmage extends CardImpl { this.toughness = new MageInt(2); // {1}{U}{B}: Whenever a card is put into an opponent's graveyard from anywhere this turn, that player loses 1 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new CardPutIntoOpponentGraveThisTurn()), new ManaCostsImpl<>("{1}{U}{B}"))); + this.addAbility(new SimpleActivatedAbility(new CreateDelayedTriggeredAbilityEffect(new CardPutIntoOpponentGraveThisTurn()), new ManaCostsImpl<>("{1}{U}{B}"))); // {2}{U}{B}: Target player puts the top two cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(2), new ManaCostsImpl<>("{2}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(2), new ManaCostsImpl<>("{2}{U}{B}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java index 676be5a1cd0..7e1be59a53b 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java @@ -26,7 +26,7 @@ public final class DuskmantleHouseOfShadow extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {U}{B}, {tap}: Target player puts the top card of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(1), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Duskworker.java b/Mage.Sets/src/mage/cards/d/Duskworker.java index ffad7381f92..ff90b568388 100644 --- a/Mage.Sets/src/mage/cards/d/Duskworker.java +++ b/Mage.Sets/src/mage/cards/d/Duskworker.java @@ -27,7 +27,7 @@ public final class Duskworker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new BecomesBlockedSourceTriggeredAbility(new RegenerateSourceEffect(), false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(3))); } private Duskworker(final Duskworker card) { diff --git a/Mage.Sets/src/mage/cards/d/DutifulThrull.java b/Mage.Sets/src/mage/cards/d/DutifulThrull.java index cd563ed2432..4407e78e4de 100644 --- a/Mage.Sets/src/mage/cards/d/DutifulThrull.java +++ b/Mage.Sets/src/mage/cards/d/DutifulThrull.java @@ -27,7 +27,7 @@ public final class DutifulThrull extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Dutiful Thrull. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } private DutifulThrull(final DutifulThrull card) { diff --git a/Mage.Sets/src/mage/cards/d/DutyBoundDead.java b/Mage.Sets/src/mage/cards/d/DutyBoundDead.java index d391222f6a5..eeef94f694e 100644 --- a/Mage.Sets/src/mage/cards/d/DutyBoundDead.java +++ b/Mage.Sets/src/mage/cards/d/DutyBoundDead.java @@ -29,7 +29,7 @@ public final class DutyBoundDead extends CardImpl { // Exalted this.addAbility(new ExaltedAbility()); // {3}{B}: Regenerate Duty-Bound Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{3}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{3}{B}"))); } private DutyBoundDead(final DutyBoundDead card) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java b/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java index 1f058319e8b..3e52b135109 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java @@ -42,7 +42,7 @@ public final class DwarvenArmorer extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}, Discard a card: Put a +0/+1 counter or a +1/+0 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DwarvenArmorerEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DwarvenArmorerEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java index b4ca46394d8..60f98290473 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java @@ -28,7 +28,7 @@ public final class DwarvenBlastminer extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, {tap}: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java index 25d0abcd280..373e9cce7f9 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java @@ -38,7 +38,7 @@ public final class DwarvenBloodboiler extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped Dwarf you control: Target creature gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java index 36fa33469c1..7149e308f38 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java @@ -35,7 +35,7 @@ public final class DwarvenDemolitionTeam extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target Wall. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenDriller.java b/Mage.Sets/src/mage/cards/d/DwarvenDriller.java index bacb413c032..01d9f1cfc5d 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenDriller.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenDriller.java @@ -31,7 +31,7 @@ public final class DwarvenDriller extends CardImpl { this.toughness = new MageInt(2); // {tap}: Destroy target land unless its controller has Dwarven Driller deal 2 damage to them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DwarvenDrillerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DwarvenDrillerEffect(), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java index daeb0df5cf9..a4e401f1476 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java @@ -36,7 +36,7 @@ public final class DwarvenLieutenant extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Target Dwarf creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenMiner.java b/Mage.Sets/src/mage/cards/d/DwarvenMiner.java index 50e30f2978f..51a983d26e0 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenMiner.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenMiner.java @@ -28,7 +28,7 @@ public final class DwarvenMiner extends CardImpl { this.toughness = new MageInt(2); // {2}{R}, {tap}: Destroy target nonbasic land - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenNomad.java b/Mage.Sets/src/mage/cards/d/DwarvenNomad.java index de79ff8cbda..0a007e756b5 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenNomad.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenNomad.java @@ -37,7 +37,7 @@ public final class DwarvenNomad extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenPony.java b/Mage.Sets/src/mage/cards/d/DwarvenPony.java index f282c52f2a2..0c8537dc7ae 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPony.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPony.java @@ -37,7 +37,7 @@ public final class DwarvenPony extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, {tap}: Target Dwarf creature gains mountainwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new MountainwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java b/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java index c1c2c6f94f5..ad77cc11630 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java @@ -34,7 +34,7 @@ public final class DwarvenStrikeForce extends CardImpl { // Discard a card at random: Dwarven Strike Force gains first strike and haste until end of turn. Effect effect = new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("{this} gains first strike"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new DiscardCardCost(true)); + Ability ability = new SimpleActivatedAbility(effect, new DiscardCardCost(true)); effect = new GainAbilitySourceEffect(HasteAbility.getInstance(),Duration.EndOfTurn); effect.setText("and haste until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java b/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java index 7de0c745f60..4fec6dcbc90 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java @@ -29,7 +29,7 @@ public final class DwarvenThaumaturgist extends CardImpl { this.toughness = new MageInt(2); // {tap}: Switch target creature's power and toughness until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java b/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java index 21d0c76bbd4..5bc2d1b8b6a 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java @@ -37,7 +37,7 @@ public final class DwarvenWarriors extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } -- 2.47.2 From 065803633a42d1466503279d3462d83d9b961149 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:26:52 -0500 Subject: [PATCH 32/50] refactor: SimpleActivatedAbility default zone (cards E) --- Mage.Sets/src/mage/cards/e/EarsplittingRats.java | 2 +- Mage.Sets/src/mage/cards/e/Earthblighter.java | 2 +- Mage.Sets/src/mage/cards/e/Earthcraft.java | 2 +- Mage.Sets/src/mage/cards/e/EasternPaladin.java | 2 +- Mage.Sets/src/mage/cards/e/EaterOfHope.java | 4 ++-- Mage.Sets/src/mage/cards/e/EbonyHorse.java | 2 +- Mage.Sets/src/mage/cards/e/EbonyTreefolk.java | 2 +- Mage.Sets/src/mage/cards/e/EchoMage.java | 4 ++-- Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java | 2 +- Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java | 2 +- Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java | 2 +- Mage.Sets/src/mage/cards/e/EiganjoCastle.java | 2 +- Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java | 4 ++-- Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java | 2 +- Mage.Sets/src/mage/cards/e/ElderDruid.java | 2 +- Mage.Sets/src/mage/cards/e/ElectricEel.java | 2 +- Mage.Sets/src/mage/cards/e/ElementalAugury.java | 2 +- Mage.Sets/src/mage/cards/e/ElementalMastery.java | 2 +- Mage.Sets/src/mage/cards/e/ElephantGraveyard.java | 2 +- Mage.Sets/src/mage/cards/e/ElfReplica.java | 2 +- Mage.Sets/src/mage/cards/e/EliteArcanist.java | 2 +- Mage.Sets/src/mage/cards/e/EliteArchers.java | 2 +- Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java | 2 +- Mage.Sets/src/mage/cards/e/ElixirOfVitality.java | 4 ++-- Mage.Sets/src/mage/cards/e/ElkinBottle.java | 2 +- Mage.Sets/src/mage/cards/e/ElusiveTormentor.java | 2 +- Mage.Sets/src/mage/cards/e/ElvenFortress.java | 2 +- Mage.Sets/src/mage/cards/e/ElvenLyre.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishBranchbender.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishEulogist.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishFarmer.java | 4 ++-- Mage.Sets/src/mage/cards/e/ElvishHerder.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishHexhunter.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishHunter.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishLyrist.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishPathcutter.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishScout.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishScrapper.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java | 2 +- Mage.Sets/src/mage/cards/e/EmbalmersTools.java | 2 +- Mage.Sets/src/mage/cards/e/EmberEyeWolf.java | 2 +- Mage.Sets/src/mage/cards/e/EmbermageGoblin.java | 2 +- Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java | 2 +- Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java | 2 +- Mage.Sets/src/mage/cards/e/EmmessiTome.java | 2 +- Mage.Sets/src/mage/cards/e/EmpressGalina.java | 2 +- Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java | 2 +- Mage.Sets/src/mage/cards/e/EncampmentKeeper.java | 2 +- Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java | 4 ++-- Mage.Sets/src/mage/cards/e/EncroachingWastes.java | 2 +- Mage.Sets/src/mage/cards/e/Endbringer.java | 6 +++--- Mage.Sets/src/mage/cards/e/Endoskeleton.java | 2 +- Mage.Sets/src/mage/cards/e/Energizer.java | 2 +- Mage.Sets/src/mage/cards/e/EngineeredExplosives.java | 2 +- Mage.Sets/src/mage/cards/e/EnigmaEidolon.java | 2 +- Mage.Sets/src/mage/cards/e/EnslavedDwarf.java | 2 +- Mage.Sets/src/mage/cards/e/EnsouledScimitar.java | 2 +- Mage.Sets/src/mage/cards/e/EntropicEidolon.java | 2 +- Mage.Sets/src/mage/cards/e/EpharasRadiance.java | 2 +- Mage.Sets/src/mage/cards/e/EpharasWarden.java | 2 +- Mage.Sets/src/mage/cards/e/Ephemeron.java | 2 +- Mage.Sets/src/mage/cards/e/EpiphanyStorm.java | 2 +- Mage.Sets/src/mage/cards/e/ErebossEmissary.java | 2 +- Mage.Sets/src/mage/cards/e/EronTheRelentless.java | 2 +- Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java | 2 +- Mage.Sets/src/mage/cards/e/ErraticPortal.java | 2 +- Mage.Sets/src/mage/cards/e/ErsatzGnomes.java | 4 ++-- Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java | 2 +- Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java | 2 +- Mage.Sets/src/mage/cards/e/EscapeArtist.java | 2 +- Mage.Sets/src/mage/cards/e/EscapeRoutes.java | 2 +- Mage.Sets/src/mage/cards/e/EsperPanorama.java | 2 +- Mage.Sets/src/mage/cards/e/EssenceDepleter.java | 2 +- Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java | 2 +- Mage.Sets/src/mage/cards/e/EtchedOracle.java | 2 +- Mage.Sets/src/mage/cards/e/EtherealChampion.java | 2 +- Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java | 2 +- Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java | 2 +- Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java | 4 ++-- Mage.Sets/src/mage/cards/e/EvanescentIntellect.java | 2 +- Mage.Sets/src/mage/cards/e/EverbarkShaman.java | 2 +- Mage.Sets/src/mage/cards/e/EverflameEidolon.java | 2 +- Mage.Sets/src/mage/cards/e/EvergloveCourier.java | 2 +- Mage.Sets/src/mage/cards/e/EvernightShade.java | 2 +- Mage.Sets/src/mage/cards/e/EverythingamajigB.java | 4 ++-- Mage.Sets/src/mage/cards/e/EverythingamajigC.java | 2 +- Mage.Sets/src/mage/cards/e/EverythingamajigE.java | 4 ++-- Mage.Sets/src/mage/cards/e/EvilTwin.java | 2 +- Mage.Sets/src/mage/cards/e/EvolutionVat.java | 4 ++-- Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java | 2 +- Mage.Sets/src/mage/cards/e/EwokFiredancers.java | 2 +- Mage.Sets/src/mage/cards/e/Excavation.java | 2 +- Mage.Sets/src/mage/cards/e/Excavator.java | 2 +- Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java | 2 +- Mage.Sets/src/mage/cards/e/Exorcist.java | 2 +- Mage.Sets/src/mage/cards/e/ExpendableTroops.java | 2 +- Mage.Sets/src/mage/cards/e/ExperimentKraj.java | 2 +- Mage.Sets/src/mage/cards/e/ExperimentOne.java | 2 +- Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java | 2 +- Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java | 2 +- Mage.Sets/src/mage/cards/e/Extruder.java | 2 +- Mage.Sets/src/mage/cards/e/EyeOfDoom.java | 2 +- Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java | 2 +- Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java | 2 +- 104 files changed, 117 insertions(+), 117 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/EarsplittingRats.java b/Mage.Sets/src/mage/cards/e/EarsplittingRats.java index f4f39c3649e..66322af7370 100644 --- a/Mage.Sets/src/mage/cards/e/EarsplittingRats.java +++ b/Mage.Sets/src/mage/cards/e/EarsplittingRats.java @@ -30,7 +30,7 @@ public final class EarsplittingRats extends CardImpl { // When Earsplitting Rats enters the battlefield, each player discards a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DiscardEachPlayerEffect())); // Discard a card: Regenerate Earsplitting Rats. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new DiscardCardCost())); } private EarsplittingRats(final EarsplittingRats card) { diff --git a/Mage.Sets/src/mage/cards/e/Earthblighter.java b/Mage.Sets/src/mage/cards/e/Earthblighter.java index 3eefed4ec21..222132565cf 100644 --- a/Mage.Sets/src/mage/cards/e/Earthblighter.java +++ b/Mage.Sets/src/mage/cards/e/Earthblighter.java @@ -37,7 +37,7 @@ public final class Earthblighter extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, {tap}, Sacrifice a Goblin: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/Earthcraft.java b/Mage.Sets/src/mage/cards/e/Earthcraft.java index 5085f457bea..730000169af 100644 --- a/Mage.Sets/src/mage/cards/e/Earthcraft.java +++ b/Mage.Sets/src/mage/cards/e/Earthcraft.java @@ -35,7 +35,7 @@ public final class Earthcraft extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); // Tap an untapped creature you control: Untap target basic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCreature, true))); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCreature, true))); ability.addTarget(new TargetPermanent(filterLand)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EasternPaladin.java b/Mage.Sets/src/mage/cards/e/EasternPaladin.java index 083b88df0e9..508336db108 100644 --- a/Mage.Sets/src/mage/cards/e/EasternPaladin.java +++ b/Mage.Sets/src/mage/cards/e/EasternPaladin.java @@ -40,7 +40,7 @@ public final class EasternPaladin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EaterOfHope.java b/Mage.Sets/src/mage/cards/e/EaterOfHope.java index 8ead8f16247..999e77e78b3 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfHope.java @@ -44,12 +44,12 @@ public final class EaterOfHope extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {B}, Sacrifice another creature: Regenerate Eater of Hope. - Ability regenAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability regenAbility = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); regenAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(regenAbility); // {2}{B}, Sacrifice two other creatures: Destroy target creature. - Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability destroyAbility = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); destroyAbility.addCost(new SacrificeTargetCost(2, destroyFilter)); destroyAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(destroyAbility); diff --git a/Mage.Sets/src/mage/cards/e/EbonyHorse.java b/Mage.Sets/src/mage/cards/e/EbonyHorse.java index f68ff2f2433..05bf3cea578 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyHorse.java +++ b/Mage.Sets/src/mage/cards/e/EbonyHorse.java @@ -36,7 +36,7 @@ public final class EbonyHorse extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {2}, {tap}: Untap target attacking creature you control. Prevent all combat damage that would be dealt to and dealt by that creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn); effect.setText("Prevent all combat damage that would be dealt to"); diff --git a/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java b/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java index 5a4ce7c68fd..bfd82f76717 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java +++ b/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java @@ -26,7 +26,7 @@ public final class EbonyTreefolk extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); } private EbonyTreefolk(final EbonyTreefolk card) { diff --git a/Mage.Sets/src/mage/cards/e/EchoMage.java b/Mage.Sets/src/mage/cards/e/EchoMage.java index 5c8751e48de..7f7b836fe36 100644 --- a/Mage.Sets/src/mage/cards/e/EchoMage.java +++ b/Mage.Sets/src/mage/cards/e/EchoMage.java @@ -45,7 +45,7 @@ public final class EchoMage extends LevelerCard { // 2/4 // {U}{U}, {tap}: Copy target instant or sorcery spell. You may choose new targets for the copy. Abilities abilities1 = new AbilitiesImpl<>(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); ability.addCost(new TapSourceCost()); abilities1.add(ability); @@ -53,7 +53,7 @@ public final class EchoMage extends LevelerCard { // 2/5 // {U}{U}, {tap}: Copy target instant or sorcery spell twice. You may choose new targets for the copies. Abilities abilities2 = new AbilitiesImpl<>(); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EchoMageEffect(), new ManaCostsImpl<>("{U}{U}")); + ability = new SimpleActivatedAbility(new EchoMageEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); ability.addCost(new TapSourceCost()); abilities2.add(ability); diff --git a/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java b/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java index 732d94f303d..ab0efbb3a47 100644 --- a/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java +++ b/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java @@ -20,7 +20,7 @@ public final class EchoesOfTheKinTree extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // {2}{W}: Bolster 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BolsterEffect(1),new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BolsterEffect(1),new ManaCostsImpl<>("{2}{W}"))); } private EchoesOfTheKinTree(final EchoesOfTheKinTree card) { diff --git a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java index 3e7eeabc30c..da3725d7179 100644 --- a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java +++ b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java @@ -33,7 +33,7 @@ public final class EdificeOfAuthority extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {1}, {T}: Target creature can't attack this turn. Put a brick counter on Edifice of Authority. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AddCountersSourceEffect(CounterType.BRICK.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java b/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java index 1dc283ed866..5d9881d7af7 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java @@ -29,7 +29,7 @@ public final class EidolonOfPhilosophy extends CardImpl { this.toughness = new MageInt(2); // {6}{U}, Sacrifice Eidolon of Philosophy: Draw three cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new ManaCostsImpl<>("{6}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(3), new ManaCostsImpl<>("{6}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EiganjoCastle.java b/Mage.Sets/src/mage/cards/e/EiganjoCastle.java index 00b5d597bdb..3d5a9233376 100644 --- a/Mage.Sets/src/mage/cards/e/EiganjoCastle.java +++ b/Mage.Sets/src/mage/cards/e/EiganjoCastle.java @@ -30,7 +30,7 @@ public final class EiganjoCastle extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.supertype.add(SuperType.LEGENDARY); this.addAbility(new WhiteManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java b/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java index cbcee74440f..0ff6eeae20f 100644 --- a/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java +++ b/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java @@ -35,11 +35,11 @@ public final class EightAndAHalfTails extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Target permanent you control gains protection from white until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); // {1}: Target spell or permanent becomes white until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn) + ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn) .setText("Target spell or permanent becomes white until end of turn"), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetSpellOrPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java index f96d87e576c..81df015efee 100644 --- a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java +++ b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java @@ -32,7 +32,7 @@ public final class ElaborateFirecannon extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {4}, {T}: Elaborate Firecannon deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElderDruid.java b/Mage.Sets/src/mage/cards/e/ElderDruid.java index 0fe7b39a9d2..d1c72f91e51 100644 --- a/Mage.Sets/src/mage/cards/e/ElderDruid.java +++ b/Mage.Sets/src/mage/cards/e/ElderDruid.java @@ -42,7 +42,7 @@ public final class ElderDruid extends CardImpl { this.toughness = new MageInt(2); // {3}{G}, {tap}: You may tap or untap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElectricEel.java b/Mage.Sets/src/mage/cards/e/ElectricEel.java index f36584ceb10..7ec3dc3efb9 100644 --- a/Mage.Sets/src/mage/cards/e/ElectricEel.java +++ b/Mage.Sets/src/mage/cards/e/ElectricEel.java @@ -35,7 +35,7 @@ public final class ElectricEel extends CardImpl { // {R}{R}: Electric Eel gets +2/+0 until end of turn and deals 1 damage to you. Effect effect = new DamageControllerEffect(1); effect.setText("and deals 1 damage to you"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElementalAugury.java b/Mage.Sets/src/mage/cards/e/ElementalAugury.java index ac8f31e7ebb..a05a621928e 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalAugury.java +++ b/Mage.Sets/src/mage/cards/e/ElementalAugury.java @@ -24,7 +24,7 @@ public final class ElementalAugury extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{B}{R}"); // {3}: Look at the top three cards of target player's library, then put them back in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElementalAuguryEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new ElementalAuguryEffect(), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElementalMastery.java b/Mage.Sets/src/mage/cards/e/ElementalMastery.java index 51a9ca43438..60275754fba 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElementalMastery.java @@ -42,7 +42,7 @@ public final class ElementalMastery extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step." - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElementalMasteryEffect(), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new ElementalMasteryEffect(), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java b/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java index 89134c13bce..7517e36abc8 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java @@ -29,7 +29,7 @@ public final class ElephantGraveyard extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {tap}: Regenerate target Elephant. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElfReplica.java b/Mage.Sets/src/mage/cards/e/ElfReplica.java index 797c49e994f..6dde0566758 100644 --- a/Mage.Sets/src/mage/cards/e/ElfReplica.java +++ b/Mage.Sets/src/mage/cards/e/ElfReplica.java @@ -26,7 +26,7 @@ public final class ElfReplica extends CardImpl { this.subtype.add(SubType.ELF); this.power = new MageInt(2); this.toughness = new MageInt(2); - 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 TargetEnchantmentPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EliteArcanist.java b/Mage.Sets/src/mage/cards/e/EliteArcanist.java index 9b009f85445..ff2ad860b1e 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArcanist.java +++ b/Mage.Sets/src/mage/cards/e/EliteArcanist.java @@ -42,7 +42,7 @@ public final class EliteArcanist extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new EliteArcanistImprintEffect(), true)); // {X}, {T}: Copy the exiled card. You may cast the copy without paying its mana cost. X is the converted mana cost of the exiled card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EliteArcanistCopyEffect(), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new EliteArcanistCopyEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.setCostAdjuster(EliteArcanistAdjuster.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EliteArchers.java b/Mage.Sets/src/mage/cards/e/EliteArchers.java index 691bacd72cd..be74d531d95 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArchers.java +++ b/Mage.Sets/src/mage/cards/e/EliteArchers.java @@ -30,7 +30,7 @@ public final class EliteArchers extends CardImpl { this.toughness = new MageInt(3); // {tap}: Elite Archers deals 3 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java b/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java index 9b9c396396f..8105b9ab4e4 100644 --- a/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java +++ b/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java @@ -24,7 +24,7 @@ public final class ElixirOfImmortality extends CardImpl { public ElixirOfImmortality(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElixerOfImmortalityEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ElixerOfImmortalityEffect(), new TapSourceCost()); ability.addCost(new GenericManaCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java b/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java index d28183a2530..a68764555a0 100644 --- a/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java +++ b/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java @@ -26,11 +26,11 @@ public final class ElixirOfVitality extends CardImpl { // Elixir of Vitality enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}, Sacrifice Elixir of Vitality: You gain 4 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new TapSourceCost()); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(4), new TapSourceCost()); ability1.addCost(new SacrificeSourceCost()); this.addAbility(ability1); // {8}, {tap}, Sacrifice Elixir of Vitality: You gain 8 life. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(8), new ManaCostsImpl<>("{8}")); + Ability ability2 = new SimpleActivatedAbility(new GainLifeEffect(8), new ManaCostsImpl<>("{8}")); ability2.addCost(new TapSourceCost()); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/e/ElkinBottle.java b/Mage.Sets/src/mage/cards/e/ElkinBottle.java index 7b996be501a..b06c672926f 100644 --- a/Mage.Sets/src/mage/cards/e/ElkinBottle.java +++ b/Mage.Sets/src/mage/cards/e/ElkinBottle.java @@ -27,7 +27,7 @@ public final class ElkinBottle extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {3}, {tap}, Exile the top card of your library. Until the beginning of your next upkeep, you may play that card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElkinBottleExileEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new ElkinBottleExileEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java b/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java index 8e60ab80195..7081587e355 100644 --- a/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java +++ b/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java @@ -32,7 +32,7 @@ public final class ElusiveTormentor extends CardImpl { // {1}, Discard a card: Transform Elusive Tormentor. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TransformSourceEffect(), new GenericManaCost(1)); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvenFortress.java b/Mage.Sets/src/mage/cards/e/ElvenFortress.java index a9bf200ccc9..7b6c2a404aa 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenFortress.java +++ b/Mage.Sets/src/mage/cards/e/ElvenFortress.java @@ -24,7 +24,7 @@ public final class ElvenFortress extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // {1}{G}: Target blocking creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvenLyre.java b/Mage.Sets/src/mage/cards/e/ElvenLyre.java index 49d98192c56..8dbe6a96d9b 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenLyre.java +++ b/Mage.Sets/src/mage/cards/e/ElvenLyre.java @@ -25,7 +25,7 @@ public final class ElvenLyre extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Elven Lyre: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java index f51ce5ac83b..93697a497f0 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java @@ -39,7 +39,7 @@ public final class ElvishBranchbender extends CardImpl { this.toughness = new MageInt(2); // {tap}: Until end of turn, target Forest becomes an X/X Treefolk creature in addition to its other types, where X is the number of Elves you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElvishBranchbenderEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ElvishBranchbenderEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java index b69e04afc71..a1e1904155a 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java @@ -34,7 +34,7 @@ public final class ElvishEulogist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CardsInControllerGraveyardCount(filter, 1)) + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(new CardsInControllerGraveyardCount(filter, 1)) .setText("you gain 1 life for each Elf card in your graveyard"), new SacrificeSourceCost()) .addHint(new ValueHint("Elf cards in your graveyard", new CardsInControllerGraveyardCount(filter, 1)))); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java index 3c778ae7c2d..eb8afab6329 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java +++ b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java @@ -40,9 +40,9 @@ public final class ElvishFarmer extends CardImpl { // At the beginning of your upkeep, put a spore counter on Elvish Farmer. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Elvish Farmer: 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: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishHerder.java b/Mage.Sets/src/mage/cards/e/ElvishHerder.java index ff98511b1c0..c79165c43dd 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHerder.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHerder.java @@ -29,7 +29,7 @@ public final class ElvishHerder extends CardImpl { this.toughness = new MageInt(1); // {G}: Target creature gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java index 80c8ad17a3a..964cc27ff40 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java @@ -31,7 +31,7 @@ public final class ElvishHexhunter extends CardImpl { this.toughness = new MageInt(1); // {GW}, {tap}, Sacrifice Elvish Hexhunter: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G/W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{G/W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishHunter.java b/Mage.Sets/src/mage/cards/e/ElvishHunter.java index a064432f466..3f009c4d0e9 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHunter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHunter.java @@ -30,7 +30,7 @@ public final class ElvishHunter extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {tap}: Target creature doesn't untap during its controller's next untap step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DontUntapInControllersNextUntapStepTargetEffect("Target creature"), + Ability ability = new SimpleActivatedAbility(new DontUntapInControllersNextUntapStepTargetEffect("Target creature"), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java index 65d003e479d..23899b60bf6 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java @@ -30,7 +30,7 @@ public final class ElvishLyrist extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Elvish Lyrist: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java index e9c92271692..e44dbfb0d4f 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java @@ -37,7 +37,7 @@ public final class ElvishPathcutter extends CardImpl { this.toughness = new MageInt(2); // {2}{G}: Target Elf creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishScout.java b/Mage.Sets/src/mage/cards/e/ElvishScout.java index 7cf37d30d05..9c5a2d865b4 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScout.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScout.java @@ -41,7 +41,7 @@ public final class ElvishScout extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: Untap target attacking creature you control. Prevent all combat damage that would be dealt to and dealt by it this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); diff --git a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java index 9d5023ed681..c57ac0c5713 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java @@ -30,7 +30,7 @@ public final class ElvishScrapper extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Elvish Scrapper: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java b/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java index e0b59e97a33..9aff07445f5 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java @@ -41,7 +41,7 @@ public final class ElvishSkysweeper extends CardImpl { this.toughness = new MageInt(1); // {4}{G}, Sacrifice a creature: Destroy target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{4}{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{4}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java index 2db95b909a5..dd1ca50b4af 100644 --- a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java +++ b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java @@ -40,7 +40,7 @@ public final class EmbalmersTools extends CardImpl { this.addAbility(new SimpleStaticAbility(new EmbalmersToolsEffect())); // Tap an untapped Zombie you control: Target player puts the top card of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java b/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java index 878077df8bb..d1649b960f5 100644 --- a/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java +++ b/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java @@ -30,7 +30,7 @@ public final class EmberEyeWolf extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {1}{R}: Ember-Eye Wolf gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private EmberEyeWolf(final EmberEyeWolf card) { diff --git a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java index 5c390bff330..f2b4ad4a064 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java +++ b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java @@ -44,7 +44,7 @@ public final class EmbermageGoblin extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); // {tap}: Embermage Goblin 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/e/EmbraalGearSmasher.java b/Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java index 0e42ef78225..1a77ca88dfb 100644 --- a/Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java +++ b/Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java @@ -33,7 +33,7 @@ public final class EmbraalGearSmasher extends CardImpl { this.toughness = new MageInt(3); // {T}, Sacrifice an artifact: Embraal Gear-Smasher deals 2 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(2, TargetController.OPPONENT), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(2, TargetController.OPPONENT), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java b/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java index 3ab1ef169ca..864ccdcbb63 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java @@ -32,7 +32,7 @@ public final class EmeraldDragonfly extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}{G}: Emerald Dragonfly gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}"))); } private EmeraldDragonfly(final EmeraldDragonfly card) { diff --git a/Mage.Sets/src/mage/cards/e/EmmessiTome.java b/Mage.Sets/src/mage/cards/e/EmmessiTome.java index 8f1547776fb..8f6a9d5ffda 100644 --- a/Mage.Sets/src/mage/cards/e/EmmessiTome.java +++ b/Mage.Sets/src/mage/cards/e/EmmessiTome.java @@ -22,7 +22,7 @@ public final class EmmessiTome extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {5}, {tap}: Draw two cards, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(2,1), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(2,1), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EmpressGalina.java b/Mage.Sets/src/mage/cards/e/EmpressGalina.java index 45232a93ff2..4e58a649f87 100644 --- a/Mage.Sets/src/mage/cards/e/EmpressGalina.java +++ b/Mage.Sets/src/mage/cards/e/EmpressGalina.java @@ -33,7 +33,7 @@ public final class EmpressGalina extends CardImpl { this.toughness = new MageInt(3); // {U}{U}, {tap}: Gain control of target legendary permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java index 9c783cb7a02..ace3122e070 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java @@ -41,7 +41,7 @@ public final class EmrakulsEvangel extends CardImpl { // {T}, Sacrifice Emrakul's Evangel and any number of other non-Eldrazi creatures: // Create a 3/2 colorless Eldrazi Horror creature token for each creature sacrificed this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EmrakulsEvangelEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new EmrakulsEvangelEffect(), new TapSourceCost()); ability.addCost(new EmrakulsEvangelCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java b/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java index 928d92dd982..80ad4e36f54 100644 --- a/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java +++ b/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java @@ -34,7 +34,7 @@ public final class EncampmentKeeper extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {7}{W}, Sacrifice Encampment Keeper: Creatures you control get +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{7}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{7}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java b/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java index fb57a37353e..bfe0d2063a5 100644 --- a/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java +++ b/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java @@ -36,10 +36,10 @@ public final class EnclaveCryptologist extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}{U}"))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost()); Abilities abilities1 = new AbilitiesImpl<>(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); Abilities abilities2 = new AbilitiesImpl<>(ability); this.addAbilities(LevelerCardBuilder.construct( diff --git a/Mage.Sets/src/mage/cards/e/EncroachingWastes.java b/Mage.Sets/src/mage/cards/e/EncroachingWastes.java index 7e645f974da..a79e3a92c2c 100644 --- a/Mage.Sets/src/mage/cards/e/EncroachingWastes.java +++ b/Mage.Sets/src/mage/cards/e/EncroachingWastes.java @@ -26,7 +26,7 @@ public final class EncroachingWastes extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {4}, {T}, Sacrifice Encroaching Wastes: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/Endbringer.java b/Mage.Sets/src/mage/cards/e/Endbringer.java index 1c1f5370270..07eb8bad855 100644 --- a/Mage.Sets/src/mage/cards/e/Endbringer.java +++ b/Mage.Sets/src/mage/cards/e/Endbringer.java @@ -37,18 +37,18 @@ public final class Endbringer extends CardImpl { this.addAbility(new SimpleStaticAbility(new UntapSourceDuringEachOtherPlayersUntapStepEffect())); // {T}: Endbringer deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {C}, {T}: Target creature can't attack or block this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{C}")); + ability = new SimpleActivatedAbility(new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{C}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {C}{C}, {T}: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{C}{C}")); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{C}{C}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/Endoskeleton.java b/Mage.Sets/src/mage/cards/e/Endoskeleton.java index 394645981c8..ed11e965609 100644 --- a/Mage.Sets/src/mage/cards/e/Endoskeleton.java +++ b/Mage.Sets/src/mage/cards/e/Endoskeleton.java @@ -29,7 +29,7 @@ public final class Endoskeleton extends CardImpl { // You may choose not to untap Endoskeleton during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: Target creature gets +0/+3 for as long as Endoskeleton remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(0, 3, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +0/+3 for as long as {this} remains tapped"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/Energizer.java b/Mage.Sets/src/mage/cards/e/Energizer.java index ca08e10cedf..f836aa144fa 100644 --- a/Mage.Sets/src/mage/cards/e/Energizer.java +++ b/Mage.Sets/src/mage/cards/e/Energizer.java @@ -26,7 +26,7 @@ public final class Energizer extends CardImpl { this.subtype.add(SubType.JUGGERNAUT); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java index 92eb598f7b2..e61e003a2ec 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java @@ -32,7 +32,7 @@ public final class EngineeredExplosives extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // {2}, Sacrifice Engineered Explosives: Destroy each nonland permanent with converted mana cost equal to the number of charge counters on Engineered Explosives. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EngineeredExplosivesEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new EngineeredExplosivesEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java index 888f429f2c6..e5e3a9ff25b 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java @@ -32,7 +32,7 @@ public final class EnigmaEidolon extends CardImpl { this.toughness = new MageInt(2); // {U}, Sacrifice Enigma Eidolon: Target player puts the top three cards of their library into their graveyard. - 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()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java b/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java index 589d2721c8a..b24361a8199 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java @@ -43,7 +43,7 @@ public final class EnslavedDwarf extends CardImpl { // {R}, Sacrifice Enslaved Dwarf: Target black creature gets +1/+0 and gains first strike until end of turn. Effect effect = new BoostTargetEffect(1,0,Duration.EndOfTurn); effect.setText("Target black creature gets +1/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains first strike until end of turn"); diff --git a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java index ea021fdc840..90fe9d4407d 100644 --- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java +++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java @@ -30,7 +30,7 @@ public final class EnsouledScimitar extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // {3}: Ensouled Scimitar becomes a 1/5 Spirit artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new EnsouledScimitarToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new EnsouledScimitarToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); // Equipped creature gets +1/+5. this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 5))); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/e/EntropicEidolon.java b/Mage.Sets/src/mage/cards/e/EntropicEidolon.java index a936989e046..adf47f16235 100644 --- a/Mage.Sets/src/mage/cards/e/EntropicEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EntropicEidolon.java @@ -34,7 +34,7 @@ public final class EntropicEidolon extends CardImpl { this.toughness = new MageInt(2); // {B}, Sacrifice Entropic Eidolon: Target player loses 1 life and you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); Effect effect = new GainLifeEffect(1); effect.setText("and you gain 1 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java index 4c2a8cfa41c..a5ac3441358 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java +++ b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java @@ -35,7 +35,7 @@ public final class EpharasRadiance extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{1}{W}, {T}: You gain 3 life." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{1}{W}")); + ability = new SimpleActivatedAbility(new GainLifeEffect(3), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/e/EpharasWarden.java b/Mage.Sets/src/mage/cards/e/EpharasWarden.java index 19e82bf6dab..8a6e7db8638 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasWarden.java +++ b/Mage.Sets/src/mage/cards/e/EpharasWarden.java @@ -38,7 +38,7 @@ public final class EpharasWarden extends CardImpl { this.toughness = new MageInt(2); // {T}: Tap target creature with power 3 or less. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/Ephemeron.java b/Mage.Sets/src/mage/cards/e/Ephemeron.java index 992071de183..03afcb2e5f2 100644 --- a/Mage.Sets/src/mage/cards/e/Ephemeron.java +++ b/Mage.Sets/src/mage/cards/e/Ephemeron.java @@ -31,7 +31,7 @@ public final class Ephemeron extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Discard a card: Return Ephemeron to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new DiscardTargetCost(new TargetCardInHand()))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new DiscardTargetCost(new TargetCardInHand()))); } private Ephemeron(final Ephemeron card) { diff --git a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java index 4625f9c41d6..c636944f7bd 100644 --- a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java @@ -41,7 +41,7 @@ public final class EpiphanyStorm extends CardImpl { this.addAbility(ability); // Enchanted creature has "{R}, {T}, Discard a card: Draw a card." - Ability drawAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}")); + Ability drawAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}")); drawAbility.addCost(new TapSourceCost()); drawAbility.addCost(new DiscardCardCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(drawAbility, AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/e/ErebossEmissary.java b/Mage.Sets/src/mage/cards/e/ErebossEmissary.java index 0d8289c5e83..a82cd83dfd6 100644 --- a/Mage.Sets/src/mage/cards/e/ErebossEmissary.java +++ b/Mage.Sets/src/mage/cards/e/ErebossEmissary.java @@ -35,7 +35,7 @@ public final class ErebossEmissary extends CardImpl { this.addAbility(new BestowAbility(this, "{5}{B}")); // Discard a creature card: Erebos's Emissary gets +2/+2 until end of turn. If Erebos's Emissary is an Aura, enchanted creature gets +2/+2 until end of turn instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SourceHasSubtypeCondition(SubType.AURA), diff --git a/Mage.Sets/src/mage/cards/e/EronTheRelentless.java b/Mage.Sets/src/mage/cards/e/EronTheRelentless.java index 25c7e2cd57f..a9e4fe50538 100644 --- a/Mage.Sets/src/mage/cards/e/EronTheRelentless.java +++ b/Mage.Sets/src/mage/cards/e/EronTheRelentless.java @@ -33,7 +33,7 @@ public final class EronTheRelentless extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {R}{R}{R}: Regenerate Eron the Relentless. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}{R}{R}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java b/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java index 4130ef86149..b4b98352cc1 100644 --- a/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java +++ b/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java @@ -37,7 +37,7 @@ public final class ErrantDoomsayers extends CardImpl { this.toughness = new MageInt(1); // {tap}: Tap target creature with toughness 2 or less. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ErraticPortal.java b/Mage.Sets/src/mage/cards/e/ErraticPortal.java index abf83eb552c..84170361b93 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticPortal.java +++ b/Mage.Sets/src/mage/cards/e/ErraticPortal.java @@ -29,7 +29,7 @@ public final class ErraticPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {1}, {tap}: Return target creature to its owner's hand unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ErraticPortalEffect(new GenericManaCost(1)), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new ErraticPortalEffect(new GenericManaCost(1)), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java b/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java index 7e6f4dd35f9..621ace14da0 100644 --- a/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java +++ b/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java @@ -30,12 +30,12 @@ public final class ErsatzGnomes extends CardImpl { this.toughness = new MageInt(1); // {T}: Target spell becomes colorless. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.COLORLESS, Duration.Custom), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.COLORLESS, Duration.Custom), new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); // {T}: Target permanent becomes colorless until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new TapSourceCost()); + ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java index ee217634f90..0289821fc08 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java +++ b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java @@ -34,7 +34,7 @@ public final class ErtaiTheCorrupted extends CardImpl { this.toughness = new MageInt(4); // {U}, {tap}, Sacrifice a creature or enchantment: Counter target spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE_OR_ENCHANTMENT)); ability.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java b/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java index 7d45d29886e..27ccf8a7bb2 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java +++ b/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java @@ -32,7 +32,7 @@ public final class ErtaiWizardAdept extends CardImpl { this.toughness = new MageInt(1); // {2}{U}{U}, {tap}: Counter target spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EscapeArtist.java b/Mage.Sets/src/mage/cards/e/EscapeArtist.java index a9c4db0f83c..4285b7b0e57 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeArtist.java +++ b/Mage.Sets/src/mage/cards/e/EscapeArtist.java @@ -33,7 +33,7 @@ public final class EscapeArtist extends CardImpl { // Escape Artist can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); // {U}, Discard a card: Return Escape Artist to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java index fb06079763b..3e4636beb1d 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java +++ b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java @@ -34,7 +34,7 @@ public final class EscapeRoutes extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // {2}{U}: Return target white or black creature you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EsperPanorama.java b/Mage.Sets/src/mage/cards/e/EsperPanorama.java index 239718a75b8..85cf8d0ffab 100644 --- a/Mage.Sets/src/mage/cards/e/EsperPanorama.java +++ b/Mage.Sets/src/mage/cards/e/EsperPanorama.java @@ -38,7 +38,7 @@ public final class EsperPanorama extends CardImpl { this.addAbility(new ColorlessManaAbility()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EssenceDepleter.java b/Mage.Sets/src/mage/cards/e/EssenceDepleter.java index b052c19fe64..e51f9a76d35 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceDepleter.java +++ b/Mage.Sets/src/mage/cards/e/EssenceDepleter.java @@ -32,7 +32,7 @@ public final class EssenceDepleter extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {1}{C}: Target opponent loses 1 life and you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{C}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{C}")); ability.addEffect(new GainLifeEffect(1).concatBy("and")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java b/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java index 3f4cd76efc0..41311ecb94f 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java +++ b/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java @@ -31,7 +31,7 @@ public final class EtchedMonstrosity extends CardImpl { this.power = new MageInt(10); this.toughness = new MageInt(10); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(5)), " with five -1/-1 counters on it")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardTargetEffect(3), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(5))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtchedOracle.java b/Mage.Sets/src/mage/cards/e/EtchedOracle.java index e9383989b54..89544bf38d9 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedOracle.java +++ b/Mage.Sets/src/mage/cards/e/EtchedOracle.java @@ -32,7 +32,7 @@ public final class EtchedOracle extends CardImpl { // Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.) this.addAbility(new SunburstAbility(this)); // {1}, Remove four +1/+1 counters from Etched Oracle: Target player draws three cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DrawCardTargetEffect(3), new ManaCostsImpl<>("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(4))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtherealChampion.java b/Mage.Sets/src/mage/cards/e/EtherealChampion.java index 752a801f8d1..eead26b5ff9 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealChampion.java +++ b/Mage.Sets/src/mage/cards/e/EtherealChampion.java @@ -30,7 +30,7 @@ public final class EtherealChampion extends CardImpl { // Pay 1 life: Prevent the next 1 damage that would be dealt to Ethereal Champion this turn. Effect effect = new PreventDamageToSourceEffect(Duration.EndOfTurn, 1); effect.setText("Prevent the next 1 damage that would be dealt to {this} this turn"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(effect, new PayLifeCost(1))); } private EtherealChampion(final EtherealChampion card) { diff --git a/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java b/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java index 4da1caf4e42..71166e590a6 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java @@ -34,7 +34,7 @@ public final class EtheriumAstrolabe extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // {B}, {tap}, Sacrifice an artifact: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java b/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java index 937a026afe1..c0158a3a529 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java @@ -29,7 +29,7 @@ public final class EtheriumHornSorcerer extends CardImpl { this.toughness = new MageInt(6); // {1}{U}{R}: Return Etherium-Horn Sorcerer to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}{R}"))); // Cascade this.addAbility(new CascadeAbility()); diff --git a/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java b/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java index 95f29ba6e90..8144b3595d4 100644 --- a/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java +++ b/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java @@ -35,13 +35,13 @@ public final class EtherswornAdjudicator extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}{B}, {T}: Destroy target creature or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}{B}")); ability.addCost(new TapSourceCost()); Target target = new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURE_OR_ENCHANTMENT); ability.addTarget(target); this.addAbility(ability); // {2}{U}: Untap Ethersworn Adjudicator. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}"))); } private EtherswornAdjudicator(final EtherswornAdjudicator card) { diff --git a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java index 351dfbcf06f..630ca409911 100644 --- a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java +++ b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java @@ -36,7 +36,7 @@ public final class EvanescentIntellect extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{1}{U}, {T}: Target player puts the top three cards of their library into their graveyard." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}")); + ability = new SimpleActivatedAbility(new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/e/EverbarkShaman.java b/Mage.Sets/src/mage/cards/e/EverbarkShaman.java index 91f8105827d..b8a8eaac1f0 100644 --- a/Mage.Sets/src/mage/cards/e/EverbarkShaman.java +++ b/Mage.Sets/src/mage/cards/e/EverbarkShaman.java @@ -40,7 +40,7 @@ public final class EverbarkShaman extends CardImpl { this.toughness = new MageInt(5); // {T}, Exile a Treefolk card from your graveyard: Search your library for up to two Forest cards and put them onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filterForest), true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filterForest), true), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filterTreefolk))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java index 7f7527c0eca..523cfb944d1 100644 --- a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java @@ -34,7 +34,7 @@ public final class EverflameEidolon extends CardImpl { // Bestow {2}{R} this.addAbility(new BestowAbility(this, "{2}{R}")); // {R}: Everflame Eidolon gets +1/+0 until end of turn. If it's an Aura, enchanted creature gets +1/+0 until end of turn instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EverflameEidolonEffect(), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new EverflameEidolonEffect(), new ManaCostsImpl<>("{R}"))); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java index 4b8ea2fa0ae..38456e9dcef 100644 --- a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java +++ b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java @@ -43,7 +43,7 @@ public final class EvergloveCourier extends CardImpl { // You may choose not to untap Everglove Courier during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}{G}, {tap}: Target Elf creature gets +2/+2 and has trample for as long as Everglove Courier remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target Elf creature gets +2/+2"), new ManaCostsImpl<>("{2}{G}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/e/EvernightShade.java b/Mage.Sets/src/mage/cards/e/EvernightShade.java index f5398ddf95e..d360ccf5e33 100644 --- a/Mage.Sets/src/mage/cards/e/EvernightShade.java +++ b/Mage.Sets/src/mage/cards/e/EvernightShade.java @@ -27,7 +27,7 @@ public final class EvernightShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Evernight Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); this.addAbility(new UndyingAbility()); } diff --git a/Mage.Sets/src/mage/cards/e/EverythingamajigB.java b/Mage.Sets/src/mage/cards/e/EverythingamajigB.java index ed21767e6a7..172c34ab2ad 100644 --- a/Mage.Sets/src/mage/cards/e/EverythingamajigB.java +++ b/Mage.Sets/src/mage/cards/e/EverythingamajigB.java @@ -50,13 +50,13 @@ public final class EverythingamajigB extends CardImpl { // Tower of Eons // 8, T: You gain 10 life. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(10), new GenericManaCost(8)); + Ability ability2 = new SimpleActivatedAbility(new GainLifeEffect(10), new GenericManaCost(8)); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); // Spatula of the Ages // 4, T, Sacrifice Everythingamajig: You may put a silver-bordered permanent card from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EverythingamajigC.java b/Mage.Sets/src/mage/cards/e/EverythingamajigC.java index 883f7c3784b..e38c629f950 100644 --- a/Mage.Sets/src/mage/cards/e/EverythingamajigC.java +++ b/Mage.Sets/src/mage/cards/e/EverythingamajigC.java @@ -49,7 +49,7 @@ public final class EverythingamajigC extends CardImpl { // Chimeric Staff // X: Everythingamajig becomes an X/X Construct artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChimericStaffEffect(), new VariableManaCost(VariableCostType.NORMAL))); + this.addAbility(new SimpleActivatedAbility(new ChimericStaffEffect(), new VariableManaCost(VariableCostType.NORMAL))); } private EverythingamajigC(final EverythingamajigC card) { diff --git a/Mage.Sets/src/mage/cards/e/EverythingamajigE.java b/Mage.Sets/src/mage/cards/e/EverythingamajigE.java index 628a6c237d2..b33912a7fa9 100644 --- a/Mage.Sets/src/mage/cards/e/EverythingamajigE.java +++ b/Mage.Sets/src/mage/cards/e/EverythingamajigE.java @@ -41,7 +41,7 @@ public final class EverythingamajigE extends CardImpl { // Zuran Orb // Sacrifice a land: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); // Ashnod's Altar // Sacrifice a creature: Add {C}{C} to your mana pool. @@ -52,7 +52,7 @@ public final class EverythingamajigE extends CardImpl { // Urza's Hot Tub // 2, Discard a card: Search your library for a card that shares a complete word in its name with the name of the discarded card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasHotTubEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new UrzasHotTubEffect(), new GenericManaCost(2)); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EvilTwin.java b/Mage.Sets/src/mage/cards/e/EvilTwin.java index 038f3c91587..0297e1150bc 100644 --- a/Mage.Sets/src/mage/cards/e/EvilTwin.java +++ b/Mage.Sets/src/mage/cards/e/EvilTwin.java @@ -66,7 +66,7 @@ class EvilTwinCopyApplier extends CopyApplier { @Override public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); blueprint.getAbilities().add(ability); diff --git a/Mage.Sets/src/mage/cards/e/EvolutionVat.java b/Mage.Sets/src/mage/cards/e/EvolutionVat.java index 2c427997af0..b1133c1f3c1 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionVat.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionVat.java @@ -30,14 +30,14 @@ public final class EvolutionVat extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, {tap}: Tap target creature and put a +1/+1 counter on it. Until end of turn, that creature gains "{2}{G}{U}: Double the number of +1/+1 counters on this creature." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); effect.setText("and put a +1/+1 counter on it"); ability.addEffect(effect); effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(), new CountersSourceCount(CounterType.P1P1), false); effect.setText("Double the number of +1/+1 counters on this creature"); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}{U}")); + Ability gainedAbility = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{G}{U}")); ability.addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn, "Until end of turn, that creature gains \"{2}{G}{U}: Double the number of +1/+1 counters on this creature.\"")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java b/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java index fae84adc391..09ef0580bc4 100644 --- a/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java +++ b/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java @@ -35,7 +35,7 @@ public final class EvraHalcyonWitness extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // {4}: Exchange your life total with Evra, Halcyon Witness's power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EvraHalcyonWitnessEffect(), new ManaCostsImpl<>("{4}"))); + this.addAbility(new SimpleActivatedAbility(new EvraHalcyonWitnessEffect(), new ManaCostsImpl<>("{4}"))); } private EvraHalcyonWitness(final EvraHalcyonWitness card) { diff --git a/Mage.Sets/src/mage/cards/e/EwokFiredancers.java b/Mage.Sets/src/mage/cards/e/EwokFiredancers.java index a2102e4ab4b..c2a80033a06 100644 --- a/Mage.Sets/src/mage/cards/e/EwokFiredancers.java +++ b/Mage.Sets/src/mage/cards/e/EwokFiredancers.java @@ -31,7 +31,7 @@ public final class EwokFiredancers extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {1}{R}: Ewok Firedancers gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private EwokFiredancers(final EwokFiredancers card) { diff --git a/Mage.Sets/src/mage/cards/e/Excavation.java b/Mage.Sets/src/mage/cards/e/Excavation.java index f451a92e115..9032a419272 100644 --- a/Mage.Sets/src/mage/cards/e/Excavation.java +++ b/Mage.Sets/src/mage/cards/e/Excavation.java @@ -23,7 +23,7 @@ public final class Excavation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // {1}, Sacrifice a land: Draw a card. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.setMayActivate(TargetController.ANY); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/Excavator.java b/Mage.Sets/src/mage/cards/e/Excavator.java index 056e770f9ab..132cf6f9f72 100644 --- a/Mage.Sets/src/mage/cards/e/Excavator.java +++ b/Mage.Sets/src/mage/cards/e/Excavator.java @@ -36,7 +36,7 @@ public final class Excavator extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}, Sacrifice a basic land: Target creature gains landwalk of each of the land types of the sacrificed land until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExcavatorEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExcavatorEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java b/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java index 044c796c9f3..be66a2ff068 100644 --- a/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java +++ b/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java @@ -22,7 +22,7 @@ public final class ExecutionersCapsule extends CardImpl { public ExecutionersCapsule(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{B}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); diff --git a/Mage.Sets/src/mage/cards/e/Exorcist.java b/Mage.Sets/src/mage/cards/e/Exorcist.java index 3ba9d2b61ce..be5ead24428 100644 --- a/Mage.Sets/src/mage/cards/e/Exorcist.java +++ b/Mage.Sets/src/mage/cards/e/Exorcist.java @@ -37,7 +37,7 @@ public final class Exorcist extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {tap}: Destroy target black creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/ExpendableTroops.java b/Mage.Sets/src/mage/cards/e/ExpendableTroops.java index 7fb5898057e..4974710688c 100644 --- a/Mage.Sets/src/mage/cards/e/ExpendableTroops.java +++ b/Mage.Sets/src/mage/cards/e/ExpendableTroops.java @@ -31,7 +31,7 @@ public final class ExpendableTroops extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Expendable Troops: Expendable Troops deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java index c208a7ac2d3..9f12203b8e0 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java @@ -38,7 +38,7 @@ public final class ExperimentKraj extends CardImpl { this.addAbility(new SimpleStaticAbility(new ExperimentKrajEffect())); // {tap}: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ExperimentOne.java b/Mage.Sets/src/mage/cards/e/ExperimentOne.java index 930e5c9ab49..dd3989f1704 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentOne.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentOne.java @@ -32,7 +32,7 @@ public final class ExperimentOne extends CardImpl { this.addAbility(new EvolveAbility()); //Remove two +1/+1 counters from Experiment One: Regenerate Experiment One. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } private ExperimentOne(final ExperimentOne card) { diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java index 6d0d74c77c8..bce233d4f49 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java @@ -24,7 +24,7 @@ public final class ExplosiveApparatus extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {3}, {T}, Sacrifice Explosive Apparatus: Explosive Apparatus deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "It"), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "It"), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java index 5b176a45956..1d9019bd1c1 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java @@ -50,7 +50,7 @@ public final class ExtricatorOfFlesh extends CardImpl { VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filterEldrazi))); // {2}, {T}, Sacrifice a non-Eldrazi creature: Create a 3/2 colorless Eldrazi Horror creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziHorrorToken()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new EldraziHorrorToken()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filterNonEldrazi)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/Extruder.java b/Mage.Sets/src/mage/cards/e/Extruder.java index a4bef32a98c..924edf72509 100644 --- a/Mage.Sets/src/mage/cards/e/Extruder.java +++ b/Mage.Sets/src/mage/cards/e/Extruder.java @@ -38,7 +38,7 @@ public final class Extruder extends CardImpl { this.addAbility(new EchoAbility("{4}")); // Sacrifice an artifact: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(filter)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java index 63dafcc9036..a796e1c3db2 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java @@ -42,7 +42,7 @@ public final class EyeOfDoom extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new EyeOfDoomEffect(), false)); // {2}, {tap}, Sacrifice Eye of Doom: Destroy each permanent with a doom counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DestroyAllEffect(filter), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java b/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java index a73609acaec..470b4f85a85 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java @@ -34,7 +34,7 @@ public final class EyeOfYawgmoth extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {3}, {T}, Sacrifice a creature: Reveal a number of cards from the top of your library equal to the sacrificed creature's power. Put one into your hand and exile the rest. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EyeOfYawgmothEffect(), new GenericManaCost(3)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new EyeOfYawgmothEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java index 17e5c3c8b2f..402b2d287de 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java @@ -42,7 +42,7 @@ public final class EzuriRenegadeLeader extends CardImpl { this.toughness = new MageInt(2); // {G}: Regenerate another target Elf. - Ability ezuriRegen = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ezuriRegen = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); ezuriRegen.addTarget(new TargetPermanent(anotherFilter)); this.addAbility(ezuriRegen); -- 2.47.2 From 80fec3304f911508592eb258e918155f83d1fc47 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:27:07 -0500 Subject: [PATCH 33/50] refactor: SimpleActivatedAbility default zone (cards F) --- Mage.Sets/src/mage/cards/f/FaadiyahSeer.java | 2 +- Mage.Sets/src/mage/cards/f/FabricationModule.java | 2 +- Mage.Sets/src/mage/cards/f/FaceOfFear.java | 2 +- Mage.Sets/src/mage/cards/f/Facevaulter.java | 2 +- Mage.Sets/src/mage/cards/f/FaerieConclave.java | 2 +- Mage.Sets/src/mage/cards/f/FaerieNoble.java | 2 +- Mage.Sets/src/mage/cards/f/FaithHealer.java | 2 +- Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java | 2 +- Mage.Sets/src/mage/cards/f/FallenAngel.java | 2 +- Mage.Sets/src/mage/cards/f/FallenFerromancer.java | 2 +- Mage.Sets/src/mage/cards/f/FamishedGhoul.java | 2 +- Mage.Sets/src/mage/cards/f/FanBearer.java | 2 +- Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java | 4 ++-- Mage.Sets/src/mage/cards/f/FangSkulkin.java | 2 +- Mage.Sets/src/mage/cards/f/Fatestitcher.java | 2 +- Mage.Sets/src/mage/cards/f/FathomFeeder.java | 2 +- Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java | 2 +- Mage.Sets/src/mage/cards/f/FearsomeTemper.java | 2 +- Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java | 2 +- Mage.Sets/src/mage/cards/f/FeldonsCane.java | 2 +- Mage.Sets/src/mage/cards/f/FelidarCub.java | 2 +- Mage.Sets/src/mage/cards/f/FelidarUmbra.java | 2 +- Mage.Sets/src/mage/cards/f/FemerefArchers.java | 2 +- Mage.Sets/src/mage/cards/f/FemerefHealer.java | 2 +- Mage.Sets/src/mage/cards/f/FemerefKnight.java | 2 +- Mage.Sets/src/mage/cards/f/FencerClique.java | 2 +- Mage.Sets/src/mage/cards/f/FeralDeceiver.java | 2 +- Mage.Sets/src/mage/cards/f/FeralHydra.java | 2 +- Mage.Sets/src/mage/cards/f/FeralRidgewolf.java | 2 +- Mage.Sets/src/mage/cards/f/FeralThallid.java | 2 +- Mage.Sets/src/mage/cards/f/Ferrovore.java | 2 +- Mage.Sets/src/mage/cards/f/Fertilid.java | 2 +- Mage.Sets/src/mage/cards/f/FerventPaincaster.java | 4 ++-- Mage.Sets/src/mage/cards/f/FetidHorror.java | 2 +- Mage.Sets/src/mage/cards/f/FetidImp.java | 2 +- Mage.Sets/src/mage/cards/f/FeveredConvulsions.java | 2 +- Mage.Sets/src/mage/cards/f/FieldOfReality.java | 2 +- Mage.Sets/src/mage/cards/f/FieldOfRuin.java | 2 +- Mage.Sets/src/mage/cards/f/FieldSurgeon.java | 2 +- Mage.Sets/src/mage/cards/f/FieryBombardment.java | 2 +- Mage.Sets/src/mage/cards/f/FieryHellhound.java | 2 +- Mage.Sets/src/mage/cards/f/FieryMantle.java | 2 +- Mage.Sets/src/mage/cards/f/FiligreeSages.java | 2 +- Mage.Sets/src/mage/cards/f/FireAnts.java | 2 +- Mage.Sets/src/mage/cards/f/FireWhip.java | 4 ++-- Mage.Sets/src/mage/cards/f/FirebornKnight.java | 2 +- Mage.Sets/src/mage/cards/f/Firebreathing.java | 2 +- Mage.Sets/src/mage/cards/f/Firefly.java | 2 +- Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java | 2 +- Mage.Sets/src/mage/cards/f/FirefrightMage.java | 2 +- Mage.Sets/src/mage/cards/f/FirehoofCavalry.java | 2 +- Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java | 2 +- Mage.Sets/src/mage/cards/f/Firescreamer.java | 2 +- Mage.Sets/src/mage/cards/f/FirewakeSliver.java | 2 +- Mage.Sets/src/mage/cards/f/FiveAlarmFire.java | 2 +- Mage.Sets/src/mage/cards/f/FlailingManticore.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlailingOgre.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlailingSoldier.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlameFusillade.java | 2 +- Mage.Sets/src/mage/cards/f/FlameSpirit.java | 2 +- Mage.Sets/src/mage/cards/f/FlamecastWheel.java | 2 +- Mage.Sets/src/mage/cards/f/FlamekinBrawler.java | 2 +- Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java | 2 +- Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java | 2 +- Mage.Sets/src/mage/cards/f/FlamestickCourier.java | 2 +- Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java | 2 +- Mage.Sets/src/mage/cards/f/Flamewright.java | 4 ++-- Mage.Sets/src/mage/cards/f/FledglingImp.java | 2 +- Mage.Sets/src/mage/cards/f/FledglingMawcor.java | 2 +- Mage.Sets/src/mage/cards/f/FleetingImage.java | 2 +- Mage.Sets/src/mage/cards/f/FleshCarver.java | 2 +- Mage.Sets/src/mage/cards/f/FleshEaterImp.java | 2 +- Mage.Sets/src/mage/cards/f/Fleshgrafter.java | 2 +- Mage.Sets/src/mage/cards/f/Flickerform.java | 2 +- Mage.Sets/src/mage/cards/f/FlickeringWard.java | 2 +- Mage.Sets/src/mage/cards/f/FlightSpellbomb.java | 2 +- Mage.Sets/src/mage/cards/f/Flood.java | 2 +- Mage.Sets/src/mage/cards/f/Floodbringer.java | 2 +- Mage.Sets/src/mage/cards/f/Floodchaser.java | 2 +- Mage.Sets/src/mage/cards/f/FloodedShoreline.java | 2 +- Mage.Sets/src/mage/cards/f/FloodwaterDam.java | 2 +- Mage.Sets/src/mage/cards/f/FloweringField.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneArmor.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneBlade.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneGiant.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneHellion.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneThopter.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneWall.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java | 2 +- Mage.Sets/src/mage/cards/f/FlyingCarpet.java | 2 +- Mage.Sets/src/mage/cards/f/FodderCannon.java | 2 +- Mage.Sets/src/mage/cards/f/FogOfGnats.java | 2 +- Mage.Sets/src/mage/cards/f/FolkOfThePines.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfFertility.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfFortunes.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfIre.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfReturn.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfVigor.java | 2 +- Mage.Sets/src/mage/cards/f/Foratog.java | 2 +- Mage.Sets/src/mage/cards/f/ForbiddenLore.java | 2 +- Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java | 2 +- Mage.Sets/src/mage/cards/f/ForcedWorship.java | 2 +- Mage.Sets/src/mage/cards/f/Forcefield.java | 2 +- Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java | 2 +- Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java | 2 +- Mage.Sets/src/mage/cards/f/ForiysianTotem.java | 2 +- Mage.Sets/src/mage/cards/f/Fortitude.java | 2 +- Mage.Sets/src/mage/cards/f/FoulFamiliar.java | 2 +- Mage.Sets/src/mage/cards/f/FoundryChampion.java | 4 ++-- Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java | 2 +- Mage.Sets/src/mage/cards/f/FountainOfCho.java | 2 +- Mage.Sets/src/mage/cards/f/FountainOfRenewal.java | 2 +- Mage.Sets/src/mage/cards/f/FountainOfYouth.java | 2 +- Mage.Sets/src/mage/cards/f/FoxfireOak.java | 2 +- Mage.Sets/src/mage/cards/f/FreeRangeChicken.java | 2 +- Mage.Sets/src/mage/cards/f/FreedFromTheReal.java | 4 ++-- Mage.Sets/src/mage/cards/f/FreneticOgre.java | 2 +- Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java | 2 +- Mage.Sets/src/mage/cards/f/FrightshroudCourier.java | 2 +- Mage.Sets/src/mage/cards/f/FrontlineDevastator.java | 2 +- Mage.Sets/src/mage/cards/f/FrontlineMedic.java | 2 +- Mage.Sets/src/mage/cards/f/FrontlineSage.java | 2 +- Mage.Sets/src/mage/cards/f/FrostRaptor.java | 2 +- Mage.Sets/src/mage/cards/f/FrostburnWeird.java | 2 +- Mage.Sets/src/mage/cards/f/Frostling.java | 2 +- Mage.Sets/src/mage/cards/f/Frostwielder.java | 2 +- Mage.Sets/src/mage/cards/f/FrozenShade.java | 2 +- Mage.Sets/src/mage/cards/f/FruitcakeElemental.java | 2 +- Mage.Sets/src/mage/cards/f/FullMoonsRise.java | 2 +- Mage.Sets/src/mage/cards/f/FulminatorMage.java | 2 +- Mage.Sets/src/mage/cards/f/FumeSpitter.java | 2 +- Mage.Sets/src/mage/cards/f/FungalReaches.java | 2 +- Mage.Sets/src/mage/cards/f/FurnaceBrood.java | 2 +- Mage.Sets/src/mage/cards/f/FurnaceSpirit.java | 2 +- Mage.Sets/src/mage/cards/f/FurnaceWhelp.java | 2 +- Mage.Sets/src/mage/cards/f/FurystokeGiant.java | 2 +- Mage.Sets/src/mage/cards/f/Fylamarid.java | 2 +- Mage.Sets/src/mage/cards/f/Fylgja.java | 4 ++-- Mage.Sets/src/mage/cards/f/FyndhornBow.java | 2 +- Mage.Sets/src/mage/cards/f/FyndhornBrownie.java | 2 +- 143 files changed, 153 insertions(+), 153 deletions(-) diff --git a/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java b/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java index 71861445965..3ec7e279881 100644 --- a/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java +++ b/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java @@ -35,7 +35,7 @@ public final class FaadiyahSeer extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card and reveal it. If it isn't a land card, discard it. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FaadiyahSeerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new FaadiyahSeerEffect(), new TapSourceCost())); } private FaadiyahSeer(final FaadiyahSeer card) { diff --git a/Mage.Sets/src/mage/cards/f/FabricationModule.java b/Mage.Sets/src/mage/cards/f/FabricationModule.java index 36942aa5a66..9e7987a6d8e 100644 --- a/Mage.Sets/src/mage/cards/f/FabricationModule.java +++ b/Mage.Sets/src/mage/cards/f/FabricationModule.java @@ -34,7 +34,7 @@ public final class FabricationModule extends CardImpl { this.addAbility(ability); // {4}, {T}: You get {E}. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GetEnergyCountersControllerEffect(1), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new GetEnergyCountersControllerEffect(1), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FaceOfFear.java b/Mage.Sets/src/mage/cards/f/FaceOfFear.java index ba0e571bf8c..3f43cabf82a 100644 --- a/Mage.Sets/src/mage/cards/f/FaceOfFear.java +++ b/Mage.Sets/src/mage/cards/f/FaceOfFear.java @@ -30,7 +30,7 @@ public final class FaceOfFear extends CardImpl { this.toughness = new MageInt(4); // {2}{B}, Discard a card: Face of Fear gains fear until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new DiscardCardCost(false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Facevaulter.java b/Mage.Sets/src/mage/cards/f/Facevaulter.java index b1b3f19eeaa..6d8810122ab 100644 --- a/Mage.Sets/src/mage/cards/f/Facevaulter.java +++ b/Mage.Sets/src/mage/cards/f/Facevaulter.java @@ -33,7 +33,7 @@ public final class Facevaulter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FaerieConclave.java b/Mage.Sets/src/mage/cards/f/FaerieConclave.java index dd6a1ec0f7d..2497683e23f 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieConclave.java +++ b/Mage.Sets/src/mage/cards/f/FaerieConclave.java @@ -27,7 +27,7 @@ public final class FaerieConclave extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlueManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new FaerieConclaveToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new FaerieConclaveToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private FaerieConclave(final FaerieConclave card) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieNoble.java b/Mage.Sets/src/mage/cards/f/FaerieNoble.java index 8d5afad5300..e25db8a530c 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieNoble.java +++ b/Mage.Sets/src/mage/cards/f/FaerieNoble.java @@ -41,7 +41,7 @@ public final class FaerieNoble extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); // {tap}: Other Faerie creatures you control get +1/+0 until end of turn. Effect effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter, true); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FaithHealer.java b/Mage.Sets/src/mage/cards/f/FaithHealer.java index eb2c17821ee..2820c02bf85 100644 --- a/Mage.Sets/src/mage/cards/f/FaithHealer.java +++ b/Mage.Sets/src/mage/cards/f/FaithHealer.java @@ -30,7 +30,7 @@ public final class FaithHealer extends CardImpl { this.toughness = new MageInt(1); // Sacrifice an enchantment: You gain life equal to the sacrificed enchantment's converted mana cost. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(SacrificeCostManaValue.ENCHANTMENT), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(SacrificeCostManaValue.ENCHANTMENT), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ENCHANTMENT))); } diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java index ddfdbfe9eec..dbcdada721a 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java @@ -35,7 +35,7 @@ public final class FalkenrathExterminator extends CardImpl { // Whenever Falkenrath Exterminator deals combat damage to a player, put a +1/+1 counter on it. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // {2}{R}: Falkenrath Exterminator deals damage to target creature equal to the number of +1/+1 counters on Falkenrath Exterminator. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FallenAngel.java b/Mage.Sets/src/mage/cards/f/FallenAngel.java index 70d29b4032c..5231d6dfe89 100644 --- a/Mage.Sets/src/mage/cards/f/FallenAngel.java +++ b/Mage.Sets/src/mage/cards/f/FallenAngel.java @@ -32,7 +32,7 @@ public final class FallenAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice a creature: Fallen Angel gets +2/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java index 30cad617ff5..a85a811d676 100644 --- a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java +++ b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java @@ -34,7 +34,7 @@ public final class FallenFerromancer extends CardImpl { this.addAbility(InfectAbility.getInstance()); // {1}{R}, {T}: Fallen Ferromancer deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java index 34ff9563da7..8e76bf9453f 100644 --- a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java +++ b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java @@ -29,7 +29,7 @@ public final class FamishedGhoul extends CardImpl { this.toughness = new MageInt(2); // {1}{B}, Sacrifice Famished Ghoul: Exile up to two target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 2, StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FanBearer.java b/Mage.Sets/src/mage/cards/f/FanBearer.java index b4cb3220c0b..5ad15cc9496 100644 --- a/Mage.Sets/src/mage/cards/f/FanBearer.java +++ b/Mage.Sets/src/mage/cards/f/FanBearer.java @@ -29,7 +29,7 @@ public final class FanBearer extends CardImpl { this.toughness = new MageInt(2); // {2}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java index 339ae6246ea..3ae9499a1f8 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java @@ -37,7 +37,7 @@ public final class FanaticalFirebrand extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {T}, Sacrifice Fanatical Firebrand: It deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -51,4 +51,4 @@ public final class FanaticalFirebrand extends CardImpl { public FanaticalFirebrand copy() { return new FanaticalFirebrand(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/f/FangSkulkin.java b/Mage.Sets/src/mage/cards/f/FangSkulkin.java index f0a57ac7c2d..0ed4a8ead57 100644 --- a/Mage.Sets/src/mage/cards/f/FangSkulkin.java +++ b/Mage.Sets/src/mage/cards/f/FangSkulkin.java @@ -35,7 +35,7 @@ public final class FangSkulkin extends CardImpl { this.subtype.add(SubType.SCARECROW); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(WitherAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(WitherAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filterBlackCreature)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Fatestitcher.java b/Mage.Sets/src/mage/cards/f/Fatestitcher.java index 1b3bc383b6f..b22c1a012a5 100644 --- a/Mage.Sets/src/mage/cards/f/Fatestitcher.java +++ b/Mage.Sets/src/mage/cards/f/Fatestitcher.java @@ -38,7 +38,7 @@ public final class Fatestitcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: You may tap or untap another target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Unearth {U} diff --git a/Mage.Sets/src/mage/cards/f/FathomFeeder.java b/Mage.Sets/src/mage/cards/f/FathomFeeder.java index d2ff7d47821..9c0da4c8a9e 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFeeder.java +++ b/Mage.Sets/src/mage/cards/f/FathomFeeder.java @@ -46,7 +46,7 @@ public final class FathomFeeder extends CardImpl { // {3}{U}{B}: Draw a card. Each opponent exiles the top card of their library. Effect effect = new FathomFeederEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}{B}")); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java b/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java index c6431fdf1ba..c024ab7bcd7 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java @@ -28,7 +28,7 @@ public final class FathomFleetFirebrand extends CardImpl { this.toughness = new MageInt(2); // {1}{r}: Fathom Fleet Firebrand gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FathomFleetFirebrand(final FathomFleetFirebrand card) { diff --git a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java index 78da48253ae..376b486ad6e 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java @@ -40,7 +40,7 @@ public final class FearsomeTemper extends CardImpl { Effect effect = new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); ability = new SimpleStaticAbility(effect); - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); + Ability grantedAbility = new SimpleActivatedAbility(new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); grantedAbility.addTarget(new TargetCreaturePermanent()); effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"{2}{R}: Target creature can't block this creature this turn.\""); diff --git a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java index 4cfbddac838..1e891cebda1 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java +++ b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java @@ -42,7 +42,7 @@ public final class FeldonOfTheThirdPath extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, {T}: Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FeldonOfTheThirdPathEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new FeldonOfTheThirdPathEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(1, 1, new FilterCreatureCard("creature card in your graveyard"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FeldonsCane.java b/Mage.Sets/src/mage/cards/f/FeldonsCane.java index 702d3e1afba..0283dc88776 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonsCane.java +++ b/Mage.Sets/src/mage/cards/f/FeldonsCane.java @@ -22,7 +22,7 @@ public final class FeldonsCane extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {tap}, Exile Feldon's Cane: Shuffle your graveyard into your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleYourGraveyardIntoLibraryEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ShuffleYourGraveyardIntoLibraryEffect(), new TapSourceCost()); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FelidarCub.java b/Mage.Sets/src/mage/cards/f/FelidarCub.java index 465cb5d471b..f7de726026e 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarCub.java +++ b/Mage.Sets/src/mage/cards/f/FelidarCub.java @@ -28,7 +28,7 @@ public final class FelidarCub extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Felidar Cub: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java index 729f7299394..1caeb44ff93 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java +++ b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java @@ -44,7 +44,7 @@ public final class FelidarUmbra extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); // {1}{W}: Attach Felidar Umbra to target creature you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{1}{W}")); + ability = new SimpleActivatedAbility(new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FemerefArchers.java b/Mage.Sets/src/mage/cards/f/FemerefArchers.java index d9c5b4a84bc..1bbe77a4ca2 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefArchers.java +++ b/Mage.Sets/src/mage/cards/f/FemerefArchers.java @@ -36,7 +36,7 @@ public final class FemerefArchers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FemerefHealer.java b/Mage.Sets/src/mage/cards/f/FemerefHealer.java index afbeee66973..345baf036c1 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefHealer.java +++ b/Mage.Sets/src/mage/cards/f/FemerefHealer.java @@ -29,7 +29,7 @@ public final class FemerefHealer extends CardImpl { this.toughness = new MageInt(1); // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FemerefKnight.java b/Mage.Sets/src/mage/cards/f/FemerefKnight.java index ecba4613c4f..cf98b2aa27f 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefKnight.java +++ b/Mage.Sets/src/mage/cards/f/FemerefKnight.java @@ -32,7 +32,7 @@ public final class FemerefKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {W}: Femeref Knight gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private FemerefKnight(final FemerefKnight card) { diff --git a/Mage.Sets/src/mage/cards/f/FencerClique.java b/Mage.Sets/src/mage/cards/f/FencerClique.java index 3ba7c4e1936..e48b9586c27 100644 --- a/Mage.Sets/src/mage/cards/f/FencerClique.java +++ b/Mage.Sets/src/mage/cards/f/FencerClique.java @@ -29,7 +29,7 @@ public final class FencerClique extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Put Fencer Clique on top of its owner's library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); } private FencerClique(final FencerClique card) { diff --git a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java index 028106217c3..c88d6f00c26 100644 --- a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java +++ b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java @@ -41,7 +41,7 @@ public final class FeralDeceiver extends CardImpl { this.toughness = new MageInt(2); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, {this} gets +2/+2 and gains trample until end of turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new FeralDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/f/FeralHydra.java b/Mage.Sets/src/mage/cards/f/FeralHydra.java index 88d7dea25ac..078caa21fea 100644 --- a/Mage.Sets/src/mage/cards/f/FeralHydra.java +++ b/Mage.Sets/src/mage/cards/f/FeralHydra.java @@ -35,7 +35,7 @@ public final class FeralHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // {3}: Put a +1/+1 counter on Feral Hydra. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java index c5142576208..525941b3597 100644 --- a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java +++ b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java @@ -29,7 +29,7 @@ public final class FeralRidgewolf extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {1}{R}: Feral Ridgewolf gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FeralRidgewolf(final FeralRidgewolf card) { diff --git a/Mage.Sets/src/mage/cards/f/FeralThallid.java b/Mage.Sets/src/mage/cards/f/FeralThallid.java index be4728d540f..0e5e59f9bee 100644 --- a/Mage.Sets/src/mage/cards/f/FeralThallid.java +++ b/Mage.Sets/src/mage/cards/f/FeralThallid.java @@ -30,7 +30,7 @@ public final class FeralThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Feral Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Feral Thallid: Regenerate Feral Thallid. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } private FeralThallid(final FeralThallid card) { diff --git a/Mage.Sets/src/mage/cards/f/Ferrovore.java b/Mage.Sets/src/mage/cards/f/Ferrovore.java index 03cc4672c9f..ef2e10cab2b 100644 --- a/Mage.Sets/src/mage/cards/f/Ferrovore.java +++ b/Mage.Sets/src/mage/cards/f/Ferrovore.java @@ -35,7 +35,7 @@ public final class Ferrovore extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Fertilid.java b/Mage.Sets/src/mage/cards/f/Fertilid.java index 49db6eec8ab..52625174ec5 100644 --- a/Mage.Sets/src/mage/cards/f/Fertilid.java +++ b/Mage.Sets/src/mage/cards/f/Fertilid.java @@ -37,7 +37,7 @@ public final class Fertilid extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches their library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/f/FerventPaincaster.java b/Mage.Sets/src/mage/cards/f/FerventPaincaster.java index f16c2397496..3b45726bf2c 100644 --- a/Mage.Sets/src/mage/cards/f/FerventPaincaster.java +++ b/Mage.Sets/src/mage/cards/f/FerventPaincaster.java @@ -32,12 +32,12 @@ public final class FerventPaincaster extends CardImpl { this.toughness = new MageInt(1); // {T}: Fervent Paincaster deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); // {T}, Exert Fervent Paincaster: It deals 1 damage to target creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new TapSourceCost()); ability2.addCost(new ExertSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/f/FetidHorror.java b/Mage.Sets/src/mage/cards/f/FetidHorror.java index 69be40113a3..9ec2f607507 100644 --- a/Mage.Sets/src/mage/cards/f/FetidHorror.java +++ b/Mage.Sets/src/mage/cards/f/FetidHorror.java @@ -28,7 +28,7 @@ public final class FetidHorror extends CardImpl { this.toughness = new MageInt(2); // {B}: Fetid Horror 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 FetidHorror(final FetidHorror card) { diff --git a/Mage.Sets/src/mage/cards/f/FetidImp.java b/Mage.Sets/src/mage/cards/f/FetidImp.java index 0a84cd56619..ae8f65eda41 100644 --- a/Mage.Sets/src/mage/cards/f/FetidImp.java +++ b/Mage.Sets/src/mage/cards/f/FetidImp.java @@ -31,7 +31,7 @@ public final class FetidImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Fetid Imp gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private FetidImp(final FetidImp card) { diff --git a/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java index 65e8a82fe88..8806d714282 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java +++ b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java @@ -22,7 +22,7 @@ public final class FeveredConvulsions extends CardImpl { public FeveredConvulsions(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl<>("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl<>("{2}{B}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FieldOfReality.java b/Mage.Sets/src/mage/cards/f/FieldOfReality.java index 07dfd40204d..d566bd8dbb4 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfReality.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfReality.java @@ -35,7 +35,7 @@ public final class FieldOfReality extends CardImpl { this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesAttachedEffect( Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.SPIRIT, "Spirits"), AttachmentType.AURA))); // {1}{U}: Return Field of Reality 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 FieldOfReality(final FieldOfReality card) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java index a80c738434a..0eb5368b767 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java @@ -46,7 +46,7 @@ public final class FieldOfRuin extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new FieldOfRuinEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java index 6b3678c8c6e..32e91858a89 100644 --- a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java +++ b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java @@ -38,7 +38,7 @@ public final class FieldSurgeon extends CardImpl { this.toughness = new MageInt(1); // Tap an untapped creature you control: Prevent the next 1 damage that would be dealt to target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapTargetCost(new TargetControlledCreaturePermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FieryBombardment.java b/Mage.Sets/src/mage/cards/f/FieryBombardment.java index 62257b4c516..2691c9a9cd2 100644 --- a/Mage.Sets/src/mage/cards/f/FieryBombardment.java +++ b/Mage.Sets/src/mage/cards/f/FieryBombardment.java @@ -33,7 +33,7 @@ public final class FieryBombardment extends CardImpl { // Chroma - {2}, Sacrifice a creature: Fiery Bombardment deals damage to any target equal to the number of red mana symbols in the sacrificed creature's mana cost. Effect effect = new FieryBombardmentEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); ability.setAbilityWord(AbilityWord.CHROMA); diff --git a/Mage.Sets/src/mage/cards/f/FieryHellhound.java b/Mage.Sets/src/mage/cards/f/FieryHellhound.java index 67e1da2a70b..d053e151761 100644 --- a/Mage.Sets/src/mage/cards/f/FieryHellhound.java +++ b/Mage.Sets/src/mage/cards/f/FieryHellhound.java @@ -28,7 +28,7 @@ public final class FieryHellhound extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - 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 FieryHellhound(final FieryHellhound card) { diff --git a/Mage.Sets/src/mage/cards/f/FieryMantle.java b/Mage.Sets/src/mage/cards/f/FieryMantle.java index bae0acb82fd..435d04c016a 100644 --- a/Mage.Sets/src/mage/cards/f/FieryMantle.java +++ b/Mage.Sets/src/mage/cards/f/FieryMantle.java @@ -34,7 +34,7 @@ public final class FieryMantle extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); // When Fiery Mantle is put into a graveyard from the battlefield, return Fiery Mantle to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/f/FiligreeSages.java b/Mage.Sets/src/mage/cards/f/FiligreeSages.java index e70e20124c9..26208799cb3 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeSages.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeSages.java @@ -34,7 +34,7 @@ public final class FiligreeSages extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FireAnts.java b/Mage.Sets/src/mage/cards/f/FireAnts.java index 0cd7d8fdb1f..1e75e244a0c 100644 --- a/Mage.Sets/src/mage/cards/f/FireAnts.java +++ b/Mage.Sets/src/mage/cards/f/FireAnts.java @@ -37,7 +37,7 @@ public final class FireAnts extends CardImpl { this.toughness = new MageInt(1); // {tap}: Fire Ants deals 1 damage to each other creature without flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new TapSourceCost())); } private FireAnts(final FireAnts card) { diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index a5a419fb5ca..20f93f029d6 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -37,11 +37,11 @@ public final class FireWhip extends CardImpl { this.addAbility(ability); // Enchanted creature has "{t}: This creature deals 1 damage to any target." - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability1 = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability1.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); // Sacrifice Fire Whip: Fire Whip deals 1 damage to any target. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1), new SacrificeSourceCost()); ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/f/FirebornKnight.java b/Mage.Sets/src/mage/cards/f/FirebornKnight.java index 9dbef06dfb3..3963b625075 100644 --- a/Mage.Sets/src/mage/cards/f/FirebornKnight.java +++ b/Mage.Sets/src/mage/cards/f/FirebornKnight.java @@ -32,7 +32,7 @@ public final class FirebornKnight extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // {R/W}{R/W}{R/W}{R/W}: Fireborn Knight gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}{R/W}{R/W}{R/W}"))); } diff --git a/Mage.Sets/src/mage/cards/f/Firebreathing.java b/Mage.Sets/src/mage/cards/f/Firebreathing.java index e6c85d29621..81749e52bf6 100644 --- a/Mage.Sets/src/mage/cards/f/Firebreathing.java +++ b/Mage.Sets/src/mage/cards/f/Firebreathing.java @@ -32,7 +32,7 @@ public final class Firebreathing extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private Firebreathing(final Firebreathing card) { diff --git a/Mage.Sets/src/mage/cards/f/Firefly.java b/Mage.Sets/src/mage/cards/f/Firefly.java index f6e4da47329..31e8794337d 100644 --- a/Mage.Sets/src/mage/cards/f/Firefly.java +++ b/Mage.Sets/src/mage/cards/f/Firefly.java @@ -28,7 +28,7 @@ public final class Firefly extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - 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))); } private Firefly(final Firefly card) { diff --git a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java index 4987094a5ab..6c5cb8e381b 100644 --- a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java @@ -30,7 +30,7 @@ public final class FireforgersPuzzleknot extends CardImpl { this.addAbility(ability); // {2}{R}, Sacrifice Fireforger's Puzzleknot: It deals 1 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{2}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FirefrightMage.java b/Mage.Sets/src/mage/cards/f/FirefrightMage.java index 288fe8181c6..8f38964995d 100644 --- a/Mage.Sets/src/mage/cards/f/FirefrightMage.java +++ b/Mage.Sets/src/mage/cards/f/FirefrightMage.java @@ -46,7 +46,7 @@ public final class FirefrightMage extends CardImpl { this.toughness = new MageInt(1); //{1}{R}, {T}, Discard a card: Target creature can't be blocked this turn except by artifact creatures and/or red creatures. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java b/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java index 574387f09d5..ac32b2da452 100644 --- a/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java +++ b/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java @@ -34,7 +34,7 @@ public final class FirehoofCavalry extends CardImpl { // {3}{R}: Firehoof Cavalry gets +2/+0 and gains trample until end of turn. Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn); effect.setText("{this} gets +2/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{R}")); effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java index e8776bb3246..4a65914295b 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java @@ -28,7 +28,7 @@ public final class FiresOfYavimaya extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Firescreamer.java b/Mage.Sets/src/mage/cards/f/Firescreamer.java index 3f7915cf74a..9220634c626 100644 --- a/Mage.Sets/src/mage/cards/f/Firescreamer.java +++ b/Mage.Sets/src/mage/cards/f/Firescreamer.java @@ -26,7 +26,7 @@ public final class Firescreamer extends CardImpl { this.toughness = new MageInt(2); // {R}: Firescreamer 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 Firescreamer(final Firescreamer card) { diff --git a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java index 8457630204d..421eea7ad80 100644 --- a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java +++ b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java @@ -45,7 +45,7 @@ public final class FirewakeSliver extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1)); + Ability gainedAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1)); gainedAbility.addCost(new SacrificeSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(targetSliverFilter)); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( diff --git a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java index 4e2113188fe..5395ff067aa 100644 --- a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java +++ b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java @@ -37,7 +37,7 @@ public final class FiveAlarmFire extends CardImpl { //Whenever a creature you control deals combat damage, put a blaze counter on Five-Alarm Fire. this.addAbility(new FiveAlarmFireTriggeredAbility()); //Remove five blaze counters from Five-Alarm Fire: Five-Alarm Fire deals 5 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5, "it"), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5))); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(5, "it"), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlailingManticore.java b/Mage.Sets/src/mage/cards/f/FlailingManticore.java index 17270aed090..fe1f6966534 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingManticore.java +++ b/Mage.Sets/src/mage/cards/f/FlailingManticore.java @@ -34,12 +34,12 @@ public final class FlailingManticore extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {1}: Flailing Manticore gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Manticore gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlailingOgre.java b/Mage.Sets/src/mage/cards/f/FlailingOgre.java index 9ce47e645bb..9dd941197b7 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingOgre.java +++ b/Mage.Sets/src/mage/cards/f/FlailingOgre.java @@ -28,12 +28,12 @@ public final class FlailingOgre extends CardImpl { this.toughness = new MageInt(3); // {1}: Flailing Ogre gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Ogre gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java index 253b89d8016..14306138179 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java +++ b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java @@ -29,12 +29,12 @@ public final class FlailingSoldier extends CardImpl { this.toughness = new MageInt(2); // {1}: Flailing Soldier gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Soldier gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlameFusillade.java b/Mage.Sets/src/mage/cards/f/FlameFusillade.java index c5ceef06e4b..1581f9b7e16 100644 --- a/Mage.Sets/src/mage/cards/f/FlameFusillade.java +++ b/Mage.Sets/src/mage/cards/f/FlameFusillade.java @@ -23,7 +23,7 @@ public final class FlameFusillade extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); // Until end of turn, permanents you control gain "{tap}: This permanent deals 1 damage to any target." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "this permanent"), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1, "this permanent"), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainAbilityControlledEffect(gainedAbility, Duration.EndOfTurn).withDurationRuleAtStart(true)); } diff --git a/Mage.Sets/src/mage/cards/f/FlameSpirit.java b/Mage.Sets/src/mage/cards/f/FlameSpirit.java index 171e66e6bfd..a63b5f329c1 100644 --- a/Mage.Sets/src/mage/cards/f/FlameSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FlameSpirit.java @@ -28,7 +28,7 @@ public final class FlameSpirit extends CardImpl { this.toughness = new MageInt(3); // {R}: Flame Spirit 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 FlameSpirit(final FlameSpirit card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamecastWheel.java b/Mage.Sets/src/mage/cards/f/FlamecastWheel.java index 57077e8e98b..5a6cbb8470c 100644 --- a/Mage.Sets/src/mage/cards/f/FlamecastWheel.java +++ b/Mage.Sets/src/mage/cards/f/FlamecastWheel.java @@ -23,7 +23,7 @@ public final class FlamecastWheel extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {5}, {T}, Sacrifice Flamecast Wheel: Flamecast Wheel deals 3 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3, "it"), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3, "it"), new GenericManaCost(5)); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java b/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java index dddc07e745e..18ce75a875d 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java @@ -27,7 +27,7 @@ public final class FlamekinBrawler extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - 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))); } private FlamekinBrawler(final FlamekinBrawler card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java index d9abae55f51..7786068bdaa 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java @@ -27,7 +27,7 @@ public final class FlamekinSpitfire extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{3}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java index cf0aba6d4f5..47c9ed2393e 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java @@ -38,7 +38,7 @@ public final class FlamesOfRemembrance extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(new AddCountersSourceEffect(CounterType.LORE.createInstance()), new ExileFromGraveCost(new TargetCardInYourGraveyard()), null, true))); // Sacrifice Flames of Remembrance: Exile top X cards of your library, where X is the number of lore counters on Flames of Remembrance. Until end of turn you play cards exile this way. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlamesOfRemembranceExileEffect(new CountersSourceCount(CounterType.LORE)), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new FlamesOfRemembranceExileEffect(new CountersSourceCount(CounterType.LORE)), new SacrificeSourceCost())); } private FlamesOfRemembrance(final FlamesOfRemembrance card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java index a8bd1977db9..7ef97f22936 100644 --- a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java +++ b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java @@ -43,7 +43,7 @@ public final class FlamestickCourier extends CardImpl { // You may choose not to untap Flamestick Courier during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}{R}, {tap}: Target Goblin creature gets +2/+2 and has haste for as long as Flamestick Courier remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target Goblin creature gets +2/+2"), new ManaCostsImpl<>("{2}{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java index 233a20c5f0a..711fac81146 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java @@ -27,7 +27,7 @@ public final class FlamewaveInvoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl<>("{7}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(5), new ManaCostsImpl<>("{7}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Flamewright.java b/Mage.Sets/src/mage/cards/f/Flamewright.java index 122cf5d70f0..2abab014ca8 100644 --- a/Mage.Sets/src/mage/cards/f/Flamewright.java +++ b/Mage.Sets/src/mage/cards/f/Flamewright.java @@ -42,12 +42,12 @@ public final class Flamewright extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}: Create a 1/1 colorless Construct artifact creature token with defender. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DarettiConstructToken()), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new DarettiConstructToken()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {tap}, Sacrifice a creature with defender: Flamewright deals 1 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FledglingImp.java b/Mage.Sets/src/mage/cards/f/FledglingImp.java index 1ea7f7251b9..bfa3e441251 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingImp.java +++ b/Mage.Sets/src/mage/cards/f/FledglingImp.java @@ -30,7 +30,7 @@ public final class FledglingImp extends CardImpl { this.toughness = new MageInt(2); // {B}, Discard a card: Fledgling Imp gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index 40534c951c3..320f88cbf0f 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -33,7 +33,7 @@ public final class FledglingMawcor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Fledgling Mawcor 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/f/FleetingImage.java b/Mage.Sets/src/mage/cards/f/FleetingImage.java index 09bee488b83..1f538518a26 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingImage.java +++ b/Mage.Sets/src/mage/cards/f/FleetingImage.java @@ -29,7 +29,7 @@ public final class FleetingImage extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{U}: Return Fleeting Image 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 FleetingImage(final FleetingImage card) { diff --git a/Mage.Sets/src/mage/cards/f/FleshCarver.java b/Mage.Sets/src/mage/cards/f/FleshCarver.java index 132a5ed34b0..8247d4cbb23 100644 --- a/Mage.Sets/src/mage/cards/f/FleshCarver.java +++ b/Mage.Sets/src/mage/cards/f/FleshCarver.java @@ -45,7 +45,7 @@ public final class FleshCarver extends CardImpl { // Intimidate this.addAbility(IntimidateAbility.getInstance()); // {1}{B}, Sacrifice another creature: Put two +1/+1 counters on Flesh Carver. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FleshEaterImp.java b/Mage.Sets/src/mage/cards/f/FleshEaterImp.java index 04eeace45b3..de3bfa6a738 100644 --- a/Mage.Sets/src/mage/cards/f/FleshEaterImp.java +++ b/Mage.Sets/src/mage/cards/f/FleshEaterImp.java @@ -32,7 +32,7 @@ public final class FleshEaterImp extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/f/Fleshgrafter.java b/Mage.Sets/src/mage/cards/f/Fleshgrafter.java index a0ddf5b1241..2bc56e74452 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshgrafter.java +++ b/Mage.Sets/src/mage/cards/f/Fleshgrafter.java @@ -29,7 +29,7 @@ public final class Fleshgrafter extends CardImpl { this.toughness = new MageInt(2); // Discard an artifact card: Fleshgrafter gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new DiscardCardCost(new FilterArtifactCard("an artifact card")))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new DiscardCardCost(new FilterArtifactCard("an artifact card")))); } private Fleshgrafter(final Fleshgrafter card) { diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java index 3e4a7c722c2..4b1366dd476 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerform.java +++ b/Mage.Sets/src/mage/cards/f/Flickerform.java @@ -48,7 +48,7 @@ public final class Flickerform extends CardImpl { this.addAbility(ability); // {2}{W}{W}: Exile enchanted creature and all Auras attached to it. At the beginning of the next end step, return that card to the battlefield under its owner's control. If you do, return the other cards exiled this way to the battlefield under their owners' control attached to that creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlickerformEffect(), new ManaCostsImpl<>("{2}{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new FlickerformEffect(), new ManaCostsImpl<>("{2}{W}{W}"))); } private Flickerform(final Flickerform card) { diff --git a/Mage.Sets/src/mage/cards/f/FlickeringWard.java b/Mage.Sets/src/mage/cards/f/FlickeringWard.java index de6dd0e93ba..378047d6505 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringWard.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringWard.java @@ -43,7 +43,7 @@ public final class FlickeringWard extends CardImpl { this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); // {W}: Return Flickering Ward to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}"))); } private FlickeringWard(final FlickeringWard card) { diff --git a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java index 44e141f60b5..ec09ab7d006 100644 --- a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java @@ -28,7 +28,7 @@ public final class FlightSpellbomb extends CardImpl { public FlightSpellbomb (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Flood.java b/Mage.Sets/src/mage/cards/f/Flood.java index 5cc5e63b6fd..da0062f8b25 100644 --- a/Mage.Sets/src/mage/cards/f/Flood.java +++ b/Mage.Sets/src/mage/cards/f/Flood.java @@ -32,7 +32,7 @@ public final class Flood extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); // {U}{U}: Tap target creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Floodbringer.java b/Mage.Sets/src/mage/cards/f/Floodbringer.java index 7fe222d4184..32f30356a6b 100644 --- a/Mage.Sets/src/mage/cards/f/Floodbringer.java +++ b/Mage.Sets/src/mage/cards/f/Floodbringer.java @@ -37,7 +37,7 @@ public final class Floodbringer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Tap target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(2)); ReturnToHandChosenControlledPermanentCost cost = new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)); cost.setText("Return a land you control to its owner's hand"); ability.addCost(cost); diff --git a/Mage.Sets/src/mage/cards/f/Floodchaser.java b/Mage.Sets/src/mage/cards/f/Floodchaser.java index 4cf86bf8ed6..fab0314ba63 100644 --- a/Mage.Sets/src/mage/cards/f/Floodchaser.java +++ b/Mage.Sets/src/mage/cards/f/Floodchaser.java @@ -42,7 +42,7 @@ public final class Floodchaser extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); // {U}, Remove a +1/+1 counter from Floodchaser: Target land becomes an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java index 5fac46920c3..8858c92c278 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java +++ b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java @@ -32,7 +32,7 @@ public final class FloodedShoreline extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}{U}"); // {U}{U}, Return two Islands you control to their owner's hand: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2,2, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java index 5cccc6ace27..cd8e44e976d 100644 --- a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java +++ b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java @@ -27,7 +27,7 @@ public final class FloodwaterDam extends CardImpl { // {X}{X}{1}, {tap}: Tap X target lands. Effect effect = new TapTargetEffect(); effect.setText("tap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}{X}{1}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}{X}{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 655a538d915..f63ad8a492a 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -35,7 +35,7 @@ public final class FloweringField extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to any target this turn." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java index 7ab6d085439..74024a64fd8 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java @@ -29,7 +29,7 @@ public final class FlowstoneArmor extends CardImpl { // You may choose not to untap Flowstone Armor during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {3}, {tap}: Target creature gets +1/-1 for as long as Flowstone Armor remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(1, -1, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +1/-1 for as long as {this} remains tapped"), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java index f5cda71dbf7..8b765a831b6 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java @@ -36,7 +36,7 @@ public final class FlowstoneBlade extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlowstoneBlade(final FlowstoneBlade card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java index 8cdb6f48efd..a255abb86b4 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java @@ -35,7 +35,7 @@ public final class FlowstoneEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {tap}: Enchanted creature gets +2/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2, Duration.EndOfTurn), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(2, -2, Duration.EndOfTurn), new TapSourceCost())); } private FlowstoneEmbrace(final FlowstoneEmbrace card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java b/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java index 53b86d4ee1a..65ea7a65fa6 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java @@ -26,7 +26,7 @@ public final class FlowstoneGiant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private FlowstoneGiant(final FlowstoneGiant card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java b/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java index 15c2ac4aff3..72e6240f9d3 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java @@ -31,7 +31,7 @@ public final class FlowstoneHellion extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {0}: Flowstone Hellion gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1,-1,Duration.EndOfTurn), new GenericManaCost(0))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(+1,-1,Duration.EndOfTurn), new GenericManaCost(0))); } private FlowstoneHellion(final FlowstoneHellion card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java index 07bc833de06..257b612ad38 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java @@ -29,7 +29,7 @@ public final class FlowstoneOverseer extends CardImpl { this.toughness = new MageInt(4); // {R}{R}: Target creature gets +1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java index ab917f42e12..f6fdecd2ce7 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java @@ -42,7 +42,7 @@ public final class FlowstoneSculpture extends CardImpl { this.toughness = new MageInt(4); // {2}, Discard a card: Put a +1/+1 counter on Flowstone Sculpture or Flowstone Sculpture gains flying, first strike, or trample. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlowstoneSculptureEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new FlowstoneSculptureEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java index 08178fc821e..97b9a3ad273 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java @@ -33,7 +33,7 @@ public final class FlowstoneThopter extends CardImpl { // {1}: Flowstone Thopter gets +1/-1 and gains flying until end of turn. Effect effect = new BoostSourceEffect(1, -1, Duration.EndOfTurn); effect.setText("{this} gets +1/-1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}")); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java index ac9b1245f74..30d9314ba98 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java @@ -29,7 +29,7 @@ public final class FlowstoneWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {R}: Flowstone Wall 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}"))); } private FlowstoneWall(final FlowstoneWall card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java b/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java index 5b28a898d01..b137bcfd399 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java @@ -28,7 +28,7 @@ public final class FlowstoneWyvern extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private FlowstoneWyvern(final FlowstoneWyvern card) { diff --git a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java index 46090bde601..41f52833d2a 100644 --- a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java +++ b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java @@ -25,7 +25,7 @@ public final class FlyingCarpet extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FodderCannon.java b/Mage.Sets/src/mage/cards/f/FodderCannon.java index 5a8533a9549..2682808d214 100644 --- a/Mage.Sets/src/mage/cards/f/FodderCannon.java +++ b/Mage.Sets/src/mage/cards/f/FodderCannon.java @@ -26,7 +26,7 @@ public final class FodderCannon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {4}, {tap}, Sacrifice a creature: Fodder Cannon deals 4 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new ManaCostsImpl<>("{4}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/f/FogOfGnats.java b/Mage.Sets/src/mage/cards/f/FogOfGnats.java index 01486d56abc..4eef4564cb1 100644 --- a/Mage.Sets/src/mage/cards/f/FogOfGnats.java +++ b/Mage.Sets/src/mage/cards/f/FogOfGnats.java @@ -29,7 +29,7 @@ public final class FogOfGnats extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Regenerate Fog of Gnats. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private FogOfGnats(final FogOfGnats card) { diff --git a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java index 56647b41be2..1bc06a958d5 100644 --- a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java +++ b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java @@ -26,7 +26,7 @@ public final class FolkOfThePines extends CardImpl { this.toughness = new MageInt(5); // {1}{G}: Folk of the Pines gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private FolkOfThePines(final FolkOfThePines card) { diff --git a/Mage.Sets/src/mage/cards/f/FontOfFertility.java b/Mage.Sets/src/mage/cards/f/FontOfFertility.java index 1aaf756baa3..9d187f19bdc 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFertility.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFertility.java @@ -27,7 +27,7 @@ public final class FontOfFertility extends CardImpl { // {1}{G}, Sacrifice Font of Fertility: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java index d9f6daad87b..fcc36d55952 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java @@ -23,7 +23,7 @@ public final class FontOfFortunes extends CardImpl { // {1}{U}, Sacrifice Font of Fortunes: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FontOfIre.java b/Mage.Sets/src/mage/cards/f/FontOfIre.java index 861dbfc2df3..2f349b6cd77 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfIre.java +++ b/Mage.Sets/src/mage/cards/f/FontOfIre.java @@ -23,7 +23,7 @@ public final class FontOfIre extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // {3}{R}, Sacrifice Font of Ire: Font of Ire deals 5 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5, "it"), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(5, "it"), new ManaCostsImpl<>("{3}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FontOfReturn.java b/Mage.Sets/src/mage/cards/f/FontOfReturn.java index 525b2413464..22b7715c6fd 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfReturn.java +++ b/Mage.Sets/src/mage/cards/f/FontOfReturn.java @@ -23,7 +23,7 @@ public final class FontOfReturn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); // {3}{B}, Sacrifice Font of Return: Return up to three target creature cards from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(0, 3, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FontOfVigor.java b/Mage.Sets/src/mage/cards/f/FontOfVigor.java index 06c2f50d38b..628dcdce0cd 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfVigor.java +++ b/Mage.Sets/src/mage/cards/f/FontOfVigor.java @@ -23,7 +23,7 @@ public final class FontOfVigor extends CardImpl { // {2}{W}, Sacrifice Font of Vigor: You gain 7 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(7), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(7), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Foratog.java b/Mage.Sets/src/mage/cards/f/Foratog.java index 7fd724421ec..a2ece741ea3 100644 --- a/Mage.Sets/src/mage/cards/f/Foratog.java +++ b/Mage.Sets/src/mage/cards/f/Foratog.java @@ -35,7 +35,7 @@ public final class Foratog extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice a Forest: Foratog gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java index 06987afcf3c..f33bf69c945 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java @@ -34,7 +34,7 @@ public final class ForbiddenLore extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Target creature gets +2/+1 until end of turn." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 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 +2/+1 until end of turn.\""))); diff --git a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java index f84513c8db7..e2b1740526d 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java @@ -32,7 +32,7 @@ public final class ForbiddingWatchtower extends CardImpl { this.addAbility(new WhiteManaAbility()); // {1}{W}: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private ForbiddingWatchtower(final ForbiddingWatchtower card) { diff --git a/Mage.Sets/src/mage/cards/f/ForcedWorship.java b/Mage.Sets/src/mage/cards/f/ForcedWorship.java index 91dba6f9140..bc3619e5617 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedWorship.java +++ b/Mage.Sets/src/mage/cards/f/ForcedWorship.java @@ -41,7 +41,7 @@ public final class ForcedWorship extends CardImpl { // Enchanted creature can't attack. this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // {2}{W}: Return Forced Worship to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{W}"))); } private ForcedWorship(final ForcedWorship card) { diff --git a/Mage.Sets/src/mage/cards/f/Forcefield.java b/Mage.Sets/src/mage/cards/f/Forcefield.java index aeb110b60c2..598a204c83b 100644 --- a/Mage.Sets/src/mage/cards/f/Forcefield.java +++ b/Mage.Sets/src/mage/cards/f/Forcefield.java @@ -34,7 +34,7 @@ public final class Forcefield extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {1}: The next time an unblocked creature of your choice would deal combat damage to you this turn, prevent all but 1 of that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ForcefieldEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new ForcefieldEffect(), new GenericManaCost(1))); } private Forcefield(final Forcefield card) { diff --git a/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java b/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java index dfbe808e4eb..d4f15946325 100644 --- a/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java +++ b/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java @@ -36,7 +36,7 @@ public final class ForcemageAdvocate extends CardImpl { // {tap}: Return target card from an opponent's graveyard to their hand. Put a +1/+1 counter on target creature. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("Return target card from an opponent's graveyard to their hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); effect.setText("Put a +1/+1 counter on target creature"); diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java index 2111f8ca71c..4fa8e818dcb 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java @@ -42,7 +42,7 @@ public final class ForerunnerOfSlaughter extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {1}: Target colorless creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java index 17cd16d1ed6..977494bf9a4 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java @@ -36,7 +36,7 @@ public final class ForiysianTotem extends CardImpl { this.addAbility(new RedManaAbility()); // {4}{R}: Foriysian Totem becomes a 4/4 red Giant artifact creature with trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForiysianTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new ForiysianTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}"))); // As long as Foriysian Totem is a creature, it can block an additional creature each combat. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText))); diff --git a/Mage.Sets/src/mage/cards/f/Fortitude.java b/Mage.Sets/src/mage/cards/f/Fortitude.java index 92bfcf3400d..118811d2c50 100644 --- a/Mage.Sets/src/mage/cards/f/Fortitude.java +++ b/Mage.Sets/src/mage/cards/f/Fortitude.java @@ -42,7 +42,7 @@ public final class Fortitude extends CardImpl { this.addAbility(ability); // Sacrifice a Forest: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeTargetCost(filter))); // When Fortitude is put into a graveyard from the battlefield, return Fortitude to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java index 5e3ea05f981..b9450e56374 100644 --- a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java +++ b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java @@ -30,7 +30,7 @@ public final class FoulFamiliar extends CardImpl { // Foul Familiar can't block. this.addAbility(new CantBlockAbility()); // {B}, Pay 1 life: Return Foul Familiar to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FoundryChampion.java b/Mage.Sets/src/mage/cards/f/FoundryChampion.java index 656c824df3c..ac2e5a41684 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryChampion.java +++ b/Mage.Sets/src/mage/cards/f/FoundryChampion.java @@ -39,10 +39,10 @@ public final class FoundryChampion extends CardImpl { this.addAbility(ability); //{R}: Foundry Champion 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}"))); //{W}: Foundry Champion gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private FoundryChampion(final FoundryChampion card) { diff --git a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java index d4dfb6bcedb..51baf589e18 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java +++ b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java @@ -28,7 +28,7 @@ public final class FoundryOfTheConsuls extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {5}, {T}, Sacrifice Foundry of the Consuls: Create two 1/1 colorless Thopter artifact creature tokens with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken(), 2), + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ThopterColorlessToken(), 2), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FountainOfCho.java b/Mage.Sets/src/mage/cards/f/FountainOfCho.java index 2f1aefd4f7a..37eb0056d42 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfCho.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfCho.java @@ -30,7 +30,7 @@ public final class FountainOfCho extends CardImpl { // Fountain of Cho enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Put a storage counter on Fountain of Cho. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {T}, Remove any number of storage counters from Fountain of Cho: Add {W} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.WhiteMana(1), diff --git a/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java b/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java index b91b93422bb..7349c798b2b 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java @@ -26,7 +26,7 @@ public final class FountainOfRenewal extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(1))); // {3}, Sacrifice Fountain of Renewal: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FountainOfYouth.java b/Mage.Sets/src/mage/cards/f/FountainOfYouth.java index bf710d5871f..3f9d9e476de 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfYouth.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfYouth.java @@ -20,7 +20,7 @@ public final class FountainOfYouth extends CardImpl { public FountainOfYouth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FoxfireOak.java b/Mage.Sets/src/mage/cards/f/FoxfireOak.java index 4aff5ec9ec3..cf6b9928998 100644 --- a/Mage.Sets/src/mage/cards/f/FoxfireOak.java +++ b/Mage.Sets/src/mage/cards/f/FoxfireOak.java @@ -27,7 +27,7 @@ public final class FoxfireOak extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(6); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/G}{R/G}{R/G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/G}{R/G}{R/G}"))); } private FoxfireOak(final FoxfireOak card) { diff --git a/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java b/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java index 5b1ee4e0ac9..1895348acc8 100644 --- a/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java +++ b/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java @@ -32,7 +32,7 @@ public final class FreeRangeChicken extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Roll two six-sided dice. If both results are the same, Free-Range Chicken gets +X/+X until end of turn, where X is that result. If the total of those results is equal to any other total you have rolled this turn for Free-Range Chicken, sacrifice it. (For example, if you roll two 3s, Free-Range Chicken gets +3/+3. If you roll a total of 6 for Free-Range Chicken later that turn, sacrifice it.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FreeRangeChickenEffect(), new ManaCostsImpl<>("{1}{G}")), new FreeRangeChickenWatcher()); + this.addAbility(new SimpleActivatedAbility(new FreeRangeChickenEffect(), new ManaCostsImpl<>("{1}{G}")), new FreeRangeChickenWatcher()); } private FreeRangeChicken(final FreeRangeChicken card) { diff --git a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java index 4ce9ce503ec..52acbf8a8eb 100644 --- a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java @@ -33,9 +33,9 @@ public final class FreedFromTheReal extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget)); // {U}: Tap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new TapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); // {U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapAttachedEffect(), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FreneticOgre.java b/Mage.Sets/src/mage/cards/f/FreneticOgre.java index 7f068199586..ac1cae4d8bd 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticOgre.java +++ b/Mage.Sets/src/mage/cards/f/FreneticOgre.java @@ -29,7 +29,7 @@ public final class FreneticOgre extends CardImpl { this.toughness = new MageInt(3); // {R}, Discard a card at random: Frenetic Ogre gets +3/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java b/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java index 9dc1229a95b..b25ac0a2327 100644 --- a/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java +++ b/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java @@ -43,7 +43,7 @@ public final class FreyaliseSupplicant extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a red or white creature: Freyalise Supplicant deals damage to any target equal to half the sacrificed creature's power, rounded down. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new HalfValue(SacrificeCostCreaturesPower.instance, false)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new HalfValue(SacrificeCostCreaturesPower.instance, false)), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java index 39ba836d832..a19bf49df6a 100644 --- a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java +++ b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java @@ -43,7 +43,7 @@ public final class FrightshroudCourier extends CardImpl { // You may choose not to untap Frightshroud Courier during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}{B}, {tap}: Target Zombie creature gets +2/+2 and has fear for as long as Frightshroud Courier remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target Zombie creature gets +2/+2"), new ManaCostsImpl<>("{2}{B}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java b/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java index 8f405dc0b9a..b62df1a3919 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java @@ -32,7 +32,7 @@ public final class FrontlineDevastator extends CardImpl { // Afflict 2 addAbility(new AfflictAbility(2)); // {1}{R}: Frontline Devastator gets +1/+0 until end of turn. - addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FrontlineDevastator(final FrontlineDevastator card) { diff --git a/Mage.Sets/src/mage/cards/f/FrontlineMedic.java b/Mage.Sets/src/mage/cards/f/FrontlineMedic.java index 43b5ff38997..8162d94c8d6 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineMedic.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineMedic.java @@ -48,7 +48,7 @@ public final class FrontlineMedic extends CardImpl { this.addAbility(new BattalionAbility(effect)); // Sacrifice Frontline Medic: Counter target spell with {X} in its mana cost unless its controller pays {3}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrontlineSage.java b/Mage.Sets/src/mage/cards/f/FrontlineSage.java index 1b04ae11b3c..6d6857a4686 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineSage.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineSage.java @@ -30,7 +30,7 @@ public final class FrontlineSage extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FrostRaptor.java b/Mage.Sets/src/mage/cards/f/FrostRaptor.java index bbce7785f3a..879e7df94cb 100644 --- a/Mage.Sets/src/mage/cards/f/FrostRaptor.java +++ b/Mage.Sets/src/mage/cards/f/FrostRaptor.java @@ -32,7 +32,7 @@ public final class FrostRaptor extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {S}{S}: Frost Raptor gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{S}{S}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java index e2e07dc0827..b109645e003 100644 --- a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java +++ b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java @@ -27,7 +27,7 @@ public final class FrostburnWeird extends CardImpl { this.toughness = new MageInt(4); // {U/R}: Frostburn Weird gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } private FrostburnWeird(final FrostburnWeird card) { diff --git a/Mage.Sets/src/mage/cards/f/Frostling.java b/Mage.Sets/src/mage/cards/f/Frostling.java index 0127f7151ee..766f00620c4 100644 --- a/Mage.Sets/src/mage/cards/f/Frostling.java +++ b/Mage.Sets/src/mage/cards/f/Frostling.java @@ -27,7 +27,7 @@ public final class Frostling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Frostling: Frostling deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Frostwielder.java b/Mage.Sets/src/mage/cards/f/Frostwielder.java index 7f0597231cc..4200494b814 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwielder.java +++ b/Mage.Sets/src/mage/cards/f/Frostwielder.java @@ -33,7 +33,7 @@ public final class Frostwielder extends CardImpl { this.toughness = new MageInt(2); // {T}: Frostwielder 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); // If a creature dealt damage by Frostwielder this turn would die, exile it instead. diff --git a/Mage.Sets/src/mage/cards/f/FrozenShade.java b/Mage.Sets/src/mage/cards/f/FrozenShade.java index cec029d35ca..8c4795236ca 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenShade.java +++ b/Mage.Sets/src/mage/cards/f/FrozenShade.java @@ -28,7 +28,7 @@ public final class FrozenShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Frozen Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private FrozenShade(final FrozenShade card) { diff --git a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java index 6d98b95bd59..2a563f2904b 100644 --- a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java +++ b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java @@ -46,7 +46,7 @@ public final class FruitcakeElemental extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageControllerEffect(7))); // {3}: Target player gains control of Fruitcake Elemental. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FruitcakeElementalEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new FruitcakeElementalEffect(), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetPlayer(1, 1, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java index 61ee050ef08..2ed8e3e0a5f 100644 --- a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java +++ b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java @@ -45,7 +45,7 @@ public final class FullMoonsRise extends CardImpl { this.addAbility(ability); // Sacrifice Full Moon's Rise: Regenerate all Werewolf creatures you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FullMoonsRiseEffect(filter), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new FullMoonsRiseEffect(filter), new SacrificeSourceCost())); } private FullMoonsRise(final FullMoonsRise card) { diff --git a/Mage.Sets/src/mage/cards/f/FulminatorMage.java b/Mage.Sets/src/mage/cards/f/FulminatorMage.java index 9f1a121117d..aa9ffb87dec 100644 --- a/Mage.Sets/src/mage/cards/f/FulminatorMage.java +++ b/Mage.Sets/src/mage/cards/f/FulminatorMage.java @@ -29,7 +29,7 @@ public final class FulminatorMage extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Fulminator Mage: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FumeSpitter.java b/Mage.Sets/src/mage/cards/f/FumeSpitter.java index aaf8c76b2b8..6ad5e267f71 100644 --- a/Mage.Sets/src/mage/cards/f/FumeSpitter.java +++ b/Mage.Sets/src/mage/cards/f/FumeSpitter.java @@ -29,7 +29,7 @@ public final class FumeSpitter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FungalReaches.java b/Mage.Sets/src/mage/cards/f/FungalReaches.java index c042338edc6..709f0325b30 100644 --- a/Mage.Sets/src/mage/cards/f/FungalReaches.java +++ b/Mage.Sets/src/mage/cards/f/FungalReaches.java @@ -32,7 +32,7 @@ public final class FungalReaches extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Fungal Reaches. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java index 3737444ab03..0cd5d49e8b8 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java @@ -28,7 +28,7 @@ public final class FurnaceBrood extends CardImpl { this.toughness = new MageInt(3); // {R}: Target creature can't be regenerated this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java index de158251d56..3fd42dad397 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java @@ -29,7 +29,7 @@ public final class FurnaceSpirit extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {R}: Furnace Spirit 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 FurnaceSpirit(final FurnaceSpirit card) { diff --git a/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java b/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java index 64e4d23f57b..764186680b3 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java @@ -28,7 +28,7 @@ public final class FurnaceWhelp extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - 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))); } private FurnaceWhelp(final FurnaceWhelp card) { diff --git a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java index aa717d927b1..d4035eb2a5b 100644 --- a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java +++ b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java @@ -33,7 +33,7 @@ public final class FurystokeGiant extends CardImpl { this.toughness = new MageInt(3); // When Furystoke Giant enters the battlefield, other creatures you control gain "{tap}: This creature deals 2 damage to any target" until end of turn. - SimpleActivatedAbility FurystokeGiantAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + SimpleActivatedAbility FurystokeGiantAbility = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); FurystokeGiantAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAllEffect(FurystokeGiantAbility, Duration.EndOfTurn, new FilterControlledCreaturePermanent("other creatures"), true); effect.setText("other creatures you control gain \"{T}: This creature deals 2 damage to any target\" until end of turn."); diff --git a/Mage.Sets/src/mage/cards/f/Fylamarid.java b/Mage.Sets/src/mage/cards/f/Fylamarid.java index 7da338ff78f..4ccf52d8e97 100644 --- a/Mage.Sets/src/mage/cards/f/Fylamarid.java +++ b/Mage.Sets/src/mage/cards/f/Fylamarid.java @@ -45,7 +45,7 @@ public final class Fylamarid extends CardImpl { // Fylamarid can't be blocked by blue creatures. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); // {U}: Target creature becomes blue until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.BLUE, + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Fylgja.java b/Mage.Sets/src/mage/cards/f/Fylgja.java index 9ab5a548b0e..34c8c3a144d 100644 --- a/Mage.Sets/src/mage/cards/f/Fylgja.java +++ b/Mage.Sets/src/mage/cards/f/Fylgja.java @@ -46,12 +46,12 @@ public final class Fylgja extends CardImpl { .setText("with four healing counters on it."))); // Remove a healing counter from Fylgja: Prevent the next 1 damage that would be dealt to enchanted creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToAttachedEffect(Duration.EndOfTurn, AttachmentType.AURA, 1, false) + this.addAbility(new SimpleActivatedAbility(new PreventDamageToAttachedEffect(Duration.EndOfTurn, AttachmentType.AURA, 1, false) .setText("Prevent the next 1 damage that would be dealt to enchanted creature this turn"), new RemoveCountersSourceCost(CounterType.HEALING.createInstance(1)))); // {2}{W}: Put a healing counter on 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/f/FyndhornBow.java b/Mage.Sets/src/mage/cards/f/FyndhornBow.java index b5c82742cfc..9552d9d703a 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBow.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBow.java @@ -25,7 +25,7 @@ public final class FyndhornBow extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java index b5630dfe2ed..d4e972beb26 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java @@ -29,7 +29,7 @@ public final class FyndhornBrownie extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, {tap}: Untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); -- 2.47.2 From ac7e34168d0d7525a8a4661bdd28a4e0524ba890 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:27:25 -0500 Subject: [PATCH 34/50] refactor: SimpleActivatedAbility default zone (cards G) --- Mage.Sets/src/mage/cards/g/GaeasEmbrace.java | 2 +- Mage.Sets/src/mage/cards/g/GalecasterColossus.java | 2 +- Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java | 4 ++-- Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java | 2 +- Mage.Sets/src/mage/cards/g/GalvanicKey.java | 2 +- Mage.Sets/src/mage/cards/g/GangrenousZombies.java | 2 +- Mage.Sets/src/mage/cards/g/GargantuanGorilla.java | 2 +- Mage.Sets/src/mage/cards/g/GarzasAssassin.java | 2 +- Mage.Sets/src/mage/cards/g/GatewayShade.java | 4 ++-- Mage.Sets/src/mage/cards/g/GathererOfGraces.java | 2 +- Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java | 2 +- Mage.Sets/src/mage/cards/g/GavonyTownship.java | 2 +- Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java | 2 +- Mage.Sets/src/mage/cards/g/Gelectrode.java | 2 +- Mage.Sets/src/mage/cards/g/GelidShackles.java | 2 +- Mage.Sets/src/mage/cards/g/GemstoneArray.java | 2 +- Mage.Sets/src/mage/cards/g/GeneralGrievous.java | 2 +- Mage.Sets/src/mage/cards/g/GeneralsRegalia.java | 2 +- Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java | 2 +- Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java | 2 +- Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java | 4 ++-- Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java | 2 +- Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java | 2 +- Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java | 2 +- Mage.Sets/src/mage/cards/g/GerrardsHourglassPendant.java | 2 +- Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java | 2 +- Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java | 4 ++-- Mage.Sets/src/mage/cards/g/GhituFireEater.java | 2 +- Mage.Sets/src/mage/cards/g/GhituFirebreathing.java | 4 ++-- Mage.Sets/src/mage/cards/g/GhituWarCry.java | 2 +- Mage.Sets/src/mage/cards/g/GhostLitNourisher.java | 2 +- Mage.Sets/src/mage/cards/g/GhostLitRaider.java | 2 +- Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java | 2 +- Mage.Sets/src/mage/cards/g/GhostLitWarder.java | 2 +- Mage.Sets/src/mage/cards/g/GhostShip.java | 2 +- Mage.Sets/src/mage/cards/g/GhostWarden.java | 2 +- Mage.Sets/src/mage/cards/g/GhosthelmCourier.java | 2 +- Mage.Sets/src/mage/cards/g/GhostlyChangeling.java | 2 +- Mage.Sets/src/mage/cards/g/GhostlyWings.java | 2 +- Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java | 2 +- Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java | 2 +- Mage.Sets/src/mage/cards/g/GiantCaterpillar.java | 2 +- Mage.Sets/src/mage/cards/g/GiantCrab.java | 2 +- Mage.Sets/src/mage/cards/g/GiantOyster.java | 2 +- Mage.Sets/src/mage/cards/g/GiantTrapDoorSpider.java | 2 +- Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java | 2 +- Mage.Sets/src/mage/cards/g/Gigantomancer.java | 2 +- Mage.Sets/src/mage/cards/g/Gigantoplasm.java | 2 +- Mage.Sets/src/mage/cards/g/GildedGoose.java | 2 +- Mage.Sets/src/mage/cards/g/GilderBairn.java | 2 +- Mage.Sets/src/mage/cards/g/GiltLeafSeer.java | 4 ++-- Mage.Sets/src/mage/cards/g/GiltspireAvenger.java | 2 +- Mage.Sets/src/mage/cards/g/GlacialCrevasses.java | 2 +- Mage.Sets/src/mage/cards/g/GlareOfSubdual.java | 2 +- Mage.Sets/src/mage/cards/g/Glarecaster.java | 2 +- Mage.Sets/src/mage/cards/g/GlassblowersPuzzleknot.java | 2 +- Mage.Sets/src/mage/cards/g/GlassesOfUrza.java | 2 +- Mage.Sets/src/mage/cards/g/GleamOfAuthority.java | 2 +- Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java | 2 +- Mage.Sets/src/mage/cards/g/GlimmeringAngel.java | 2 +- Mage.Sets/src/mage/cards/g/GlintHawkIdol.java | 2 +- Mage.Sets/src/mage/cards/g/GlintwingInvoker.java | 2 +- Mage.Sets/src/mage/cards/g/GlissaSunseeker.java | 2 +- Mage.Sets/src/mage/cards/g/GlitteringLion.java | 2 +- Mage.Sets/src/mage/cards/g/GlitteringLynx.java | 2 +- Mage.Sets/src/mage/cards/g/GlorifierOfDusk.java | 4 ++-- Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java | 2 +- Mage.Sets/src/mage/cards/g/GnawingZombie.java | 2 +- Mage.Sets/src/mage/cards/g/GobblingOoze.java | 2 +- Mage.Sets/src/mage/cards/g/GobhobblerRats.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinBombardment.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinBurrows.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinCannon.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinDynamo.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinFestival.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinFireFiend.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinFireslinger.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinGoliath.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinLookout.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinLyre.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinRazerunners.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinReplica.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinSappers.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinSkycutter.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinSledder.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinTestPilot.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinTinkerer.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinTunneler.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinTurncoat.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWarrens.java | 2 +- Mage.Sets/src/mage/cards/g/Godsire.java | 2 +- Mage.Sets/src/mage/cards/g/GohamDjinn.java | 2 +- Mage.Sets/src/mage/cards/g/GoldenUrn.java | 2 +- Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java | 2 +- Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java | 2 +- Mage.Sets/src/mage/cards/g/GolemArtisan.java | 5 ++--- Mage.Sets/src/mage/cards/g/GolemFoundry.java | 2 +- Mage.Sets/src/mage/cards/g/GolgariCluestone.java | 2 +- Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java | 2 +- Mage.Sets/src/mage/cards/g/GolgariKeyrune.java | 2 +- Mage.Sets/src/mage/cards/g/GolgariRotwurm.java | 2 +- Mage.Sets/src/mage/cards/g/GolgothianSylex.java | 2 +- Mage.Sets/src/mage/cards/g/Gomazoa.java | 2 +- Mage.Sets/src/mage/cards/g/GorillaChieftain.java | 2 +- Mage.Sets/src/mage/cards/g/GorillaShaman.java | 2 +- Mage.Sets/src/mage/cards/g/GossamerChains.java | 2 +- Mage.Sets/src/mage/cards/g/GrafHarvest.java | 2 +- Mage.Sets/src/mage/cards/g/GrandArchitect.java | 2 +- Mage.Sets/src/mage/cards/g/GrandmotherSengir.java | 2 +- Mage.Sets/src/mage/cards/g/GrangerGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/g/GraniteGargoyle.java | 2 +- Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java | 2 +- Mage.Sets/src/mage/cards/g/GrasslandCrusader.java | 2 +- Mage.Sets/src/mage/cards/g/GraveDefiler.java | 2 +- Mage.Sets/src/mage/cards/g/GraveRobbers.java | 2 +- Mage.Sets/src/mage/cards/g/GraveShellScarab.java | 2 +- Mage.Sets/src/mage/cards/g/GravelSlinger.java | 2 +- Mage.Sets/src/mage/cards/g/GravespawnSovereign.java | 2 +- Mage.Sets/src/mage/cards/g/GrazingKelpie.java | 2 +- Mage.Sets/src/mage/cards/g/GreaterForgeling.java | 2 +- Mage.Sets/src/mage/cards/g/GreaterGood.java | 2 +- Mage.Sets/src/mage/cards/g/GreaterRealmOfPreservation.java | 2 +- Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java | 2 +- Mage.Sets/src/mage/cards/g/Greed.java | 2 +- Mage.Sets/src/mage/cards/g/GreensideWatcher.java | 2 +- Mage.Sets/src/mage/cards/g/GremlinMine.java | 4 ++-- Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java | 2 +- Mage.Sets/src/mage/cards/g/GriffinCanyon.java | 2 +- Mage.Sets/src/mage/cards/g/GrimBackwoods.java | 2 +- Mage.Sets/src/mage/cards/g/GrimLavamancer.java | 2 +- Mage.Sets/src/mage/cards/g/GrimMonolith.java | 2 +- Mage.Sets/src/mage/cards/g/GrimPoppet.java | 2 +- Mage.Sets/src/mage/cards/g/GrimRoustabout.java | 4 ++-- Mage.Sets/src/mage/cards/g/GrimclawBats.java | 2 +- Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java | 2 +- Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java | 2 +- Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java | 2 +- Mage.Sets/src/mage/cards/g/Grindclock.java | 4 ++-- Mage.Sets/src/mage/cards/g/GrindingStation.java | 2 +- Mage.Sets/src/mage/cards/g/Griselbrand.java | 2 +- Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java | 2 +- Mage.Sets/src/mage/cards/g/GrixisBattlemage.java | 4 ++-- Mage.Sets/src/mage/cards/g/GrixisPanorama.java | 2 +- Mage.Sets/src/mage/cards/g/GrizzledAngler.java | 2 +- Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java | 2 +- Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java | 2 +- Mage.Sets/src/mage/cards/g/GroundPounder.java | 2 +- Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java | 2 +- Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java | 2 +- Mage.Sets/src/mage/cards/g/GruulCluestone.java | 2 +- Mage.Sets/src/mage/cards/g/GruulGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/g/GruulKeyrune.java | 2 +- Mage.Sets/src/mage/cards/g/GruulLocket.java | 2 +- Mage.Sets/src/mage/cards/g/GruulNodorog.java | 4 ++-- Mage.Sets/src/mage/cards/g/GruulWarPlow.java | 2 +- Mage.Sets/src/mage/cards/g/GuardDogs.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianIdol.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java | 2 +- Mage.Sets/src/mage/cards/g/Gurzigost.java | 2 +- Mage.Sets/src/mage/cards/g/GustSkimmer.java | 2 +- Mage.Sets/src/mage/cards/g/GutlessGhoul.java | 2 +- Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java | 4 ++-- 172 files changed, 190 insertions(+), 191 deletions(-) diff --git a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java index 030ac72c1c7..8c27da723c9 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java @@ -41,7 +41,7 @@ public final class GaeasEmbrace extends CardImpl { ability.addEffect(effect); this.addAbility(ability); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ColoredManaCost(ColoredManaSymbol.G))); } private GaeasEmbrace(final GaeasEmbrace card) { diff --git a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java index 9d909401eb4..2d712bbad85 100644 --- a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java +++ b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java @@ -43,7 +43,7 @@ public final class GalecasterColossus extends CardImpl { this.toughness = new MageInt(6); // Tap an untapped Wizard you control: Return target nonland permanent you don't control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapTargetCost(new TargetControlledPermanent(1, 1, filter2, true))); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapTargetCost(new TargetControlledPermanent(1, 1, filter2, true))); ability.addTarget(new TargetNonlandPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java index 2b7f676589a..f7632b69f8f 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java @@ -37,7 +37,7 @@ public final class GallowsAtWillowHill extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {3}, {tap}, Tap three untapped Humans you control: Destroy target creature. Its controller creates a 1/1 white Spirit creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(3)); ability.addEffect(new CreateTokenControllerTargetEffect(new SpiritWhiteToken())); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(3, 3, humanFilter, false))); @@ -53,4 +53,4 @@ public final class GallowsAtWillowHill extends CardImpl { public GallowsAtWillowHill copy() { return new GallowsAtWillowHill(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java index 64685afe7ff..33273e6a5d1 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java @@ -35,7 +35,7 @@ public final class GalvanicAlchemist extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Galvanic Alchemist is paired with another creature, each of those creatures has "{2}{U}: Untap this creature." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}")); this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/cards/g/GalvanicKey.java b/Mage.Sets/src/mage/cards/g/GalvanicKey.java index d24abe458b9..2c9cf27732c 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicKey.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicKey.java @@ -30,7 +30,7 @@ public final class GalvanicKey extends CardImpl { public GalvanicKey(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); this.addAbility(FlashAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GangrenousZombies.java b/Mage.Sets/src/mage/cards/g/GangrenousZombies.java index bd9d5102ee4..a0d0bba5c9c 100644 --- a/Mage.Sets/src/mage/cards/g/GangrenousZombies.java +++ b/Mage.Sets/src/mage/cards/g/GangrenousZombies.java @@ -40,7 +40,7 @@ public final class GangrenousZombies extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice Gangrenous Zombies: Gangrenous Zombies deals 1 damage to each creature and each player. If you control a snow Swamp, Gangrenous Zombies deals 2 damage to each creature and each player instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalOneShotEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalOneShotEffect( new DamageEverythingEffect(2), new DamageEverythingEffect(1), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java index 90d40adfae4..b7f752ece69 100644 --- a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java +++ b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java @@ -39,7 +39,7 @@ public final class GargantuanGorilla extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GargantuanGorillaSacrificeEffect())); // {T}: Gargantuan Gorilla deals damage equal to its power to another target creature. That creature deals damage equal to its power to Gargantuan Gorilla. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GargantuanGorillaFightEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GargantuanGorillaFightEffect(), new TapSourceCost()); FilterCreaturePermanent filter = new FilterCreaturePermanent(); filter.add(AnotherPredicate.instance); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/g/GarzasAssassin.java b/Mage.Sets/src/mage/cards/g/GarzasAssassin.java index 79bca77865a..d2edccf206b 100644 --- a/Mage.Sets/src/mage/cards/g/GarzasAssassin.java +++ b/Mage.Sets/src/mage/cards/g/GarzasAssassin.java @@ -36,7 +36,7 @@ public final class GarzasAssassin extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Garza's Assassin: Destroy target nonblack creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GatewayShade.java b/Mage.Sets/src/mage/cards/g/GatewayShade.java index 73820cf6257..305f9b3b47a 100644 --- a/Mage.Sets/src/mage/cards/g/GatewayShade.java +++ b/Mage.Sets/src/mage/cards/g/GatewayShade.java @@ -37,10 +37,10 @@ public final class GatewayShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Gateway Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn),new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,1, Duration.EndOfTurn),new ManaCostsImpl<>("{B}"))); // Tap an untapped Gate you control: Gateway Shade gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2, Duration.EndOfTurn),new TapTargetCost(new TargetControlledPermanent(1,1,filter, true)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2,2, Duration.EndOfTurn),new TapTargetCost(new TargetControlledPermanent(1,1,filter, true)))); } diff --git a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java index 01557edbd57..375677d93ce 100644 --- a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java +++ b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java @@ -42,7 +42,7 @@ public final class GathererOfGraces extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Sacrifice an Aura: Regenerate Gatherer of Graces - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); } private GathererOfGraces(final GathererOfGraces gathererOfGraces) { diff --git a/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java b/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java index 44159bb8783..049d1ebeb74 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java +++ b/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java @@ -31,7 +31,7 @@ public final class GauntletsOfChaos extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {5}, Sacrifice Gauntlets of Chaos: Exchange control of target artifact, creature, or land you control and target permanent an opponent controls that shares one of those types with it. If those permanents are exchanged this way, destroy all Auras attached to them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExchangeControlTargetEffect(Duration.EndOfGame, + Ability ability = new SimpleActivatedAbility(new ExchangeControlTargetEffect(Duration.EndOfGame, "exchange control of target artifact, creature, or land you control and target permanent an opponent controls that shares one of those types with it." + " If those permanents are exchanged this way, destroy all Auras attached to them", false, true, true), new ManaCostsImpl<>("{5}") diff --git a/Mage.Sets/src/mage/cards/g/GavonyTownship.java b/Mage.Sets/src/mage/cards/g/GavonyTownship.java index 953899f3465..2d6e43eae3d 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyTownship.java +++ b/Mage.Sets/src/mage/cards/g/GavonyTownship.java @@ -23,7 +23,7 @@ public final class GavonyTownship extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}{G}{W}, {T}: Put a +1/+1 counter on each creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED), new ManaCostsImpl<>("{2}{G}{W}")); + Ability ability = new SimpleActivatedAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED), new ManaCostsImpl<>("{2}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java b/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java index bd816fe044a..2e1734db849 100644 --- a/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java +++ b/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java @@ -30,7 +30,7 @@ public final class GeierReachSanitarium extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}: Each player draws a card, then discards a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardAllEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardAllEffect(1), new GenericManaCost(2)); Effect effect = new DiscardEachPlayerEffect(); effect.setText(", then discards a card"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/Gelectrode.java b/Mage.Sets/src/mage/cards/g/Gelectrode.java index ae7f7176272..cf33208d2b4 100644 --- a/Mage.Sets/src/mage/cards/g/Gelectrode.java +++ b/Mage.Sets/src/mage/cards/g/Gelectrode.java @@ -29,7 +29,7 @@ public final class Gelectrode extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - 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); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), new FilterInstantOrSorcerySpell("an instant or sorcery spell"), true)); diff --git a/Mage.Sets/src/mage/cards/g/GelidShackles.java b/Mage.Sets/src/mage/cards/g/GelidShackles.java index aa62c4a9859..d91d667f175 100644 --- a/Mage.Sets/src/mage/cards/g/GelidShackles.java +++ b/Mage.Sets/src/mage/cards/g/GelidShackles.java @@ -39,7 +39,7 @@ public final class GelidShackles extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBlockActivateAttachedEffect())); // {snow}: Enchanted creature gains defender until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GemstoneArray.java b/Mage.Sets/src/mage/cards/g/GemstoneArray.java index c030b122f53..472ece6bef0 100644 --- a/Mage.Sets/src/mage/cards/g/GemstoneArray.java +++ b/Mage.Sets/src/mage/cards/g/GemstoneArray.java @@ -24,7 +24,7 @@ public final class GemstoneArray extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}: Put a charge counter on Gemstone Array. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new ManaCostsImpl<>("{2}"))); // Remove a charge counter from Gemstone Array: Add one mana of any color. this.addAbility(new AnyColorManaAbility(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)), new CountersSourceCount(CounterType.CHARGE), false)); diff --git a/Mage.Sets/src/mage/cards/g/GeneralGrievous.java b/Mage.Sets/src/mage/cards/g/GeneralGrievous.java index 1bac0f584d9..18b2a18e180 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralGrievous.java +++ b/Mage.Sets/src/mage/cards/g/GeneralGrievous.java @@ -37,7 +37,7 @@ public final class GeneralGrievous extends CardImpl { this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true, true)); // Remove two +1/+1 counters from General Grievous: Return General Grievous to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } private GeneralGrievous(final GeneralGrievous card) { diff --git a/Mage.Sets/src/mage/cards/g/GeneralsRegalia.java b/Mage.Sets/src/mage/cards/g/GeneralsRegalia.java index faceffa370e..72f6ae43132 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralsRegalia.java +++ b/Mage.Sets/src/mage/cards/g/GeneralsRegalia.java @@ -30,7 +30,7 @@ public final class GeneralsRegalia extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {3}: The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GeneralsRegaliaEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new GeneralsRegaliaEffect(), new GenericManaCost(3)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java index 82a6202740d..b461656469a 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java @@ -40,7 +40,7 @@ public final class GenjuOfTheCedars extends CardImpl { this.addAbility(ability); // {2}: Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Forest is put into a graveyard, you may return Genju of the Cedars from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java index a2f03443b44..6068e52e51e 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java @@ -41,7 +41,7 @@ public final class GenjuOfTheFalls extends CardImpl { this.addAbility(ability); // {2}: Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Island is put into a graveyard, you may return Genju of the Falls from your graveyard to your hand. TargetPermanent auraTarget = new TargetLandPermanent(filter); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java index be13eff56c8..c4df15c0a11 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java @@ -42,7 +42,7 @@ public final class GenjuOfTheFens extends CardImpl { this.addAbility(ability); // {2}: Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with "{B}: This creature gets +1/+1 until end of turn." It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with \"{B}: This creature gets +1/+1 until end of turn.\" It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with \"{B}: This creature gets +1/+1 until end of turn.\" It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Swamp is put into a graveyard, you may return Genju of the Fens from your graveyard to your hand. @@ -70,7 +70,7 @@ public final class GenjuOfTheFens extends CardImpl { subtype.add(SubType.SPIRIT); power = new MageInt(2); toughness = new MageInt(2); - addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private SpiritToken(final SpiritToken token) { diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java index 8255af56c40..18551f9b1f2 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java @@ -44,7 +44,7 @@ public final class GenjuOfTheFields extends CardImpl { // {2}: Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with "Whenever this creature deals damage, its controller gains that much life." It's still a land. Effect effect = new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature", Duration.EndOfTurn); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(effect, new GenericManaCost(2)); effect = new GainAbilityAttachedEffect(new DealsDamageGainLifeSourceTriggeredAbility(), AttachmentType.AURA, Duration.EndOfTurn); effect.setText("with \"Whenever this creature deals damage, its controller gains that much life.\" It's still a land"); ability2.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java index 9899904b6a5..907b580e0da 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java @@ -39,7 +39,7 @@ public final class GenjuOfTheRealm extends CardImpl { this.addAbility(ability); // {2}: Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); this.addAbility(ability2); // When enchanted land is put into a graveyard, you may return Genju of the Realm from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java index 90da2fa4708..5f37cf5ab32 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java @@ -40,7 +40,7 @@ public final class GenjuOfTheSpires extends CardImpl { this.addAbility(ability); // {2}: Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(new SpiritToken(), "Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land", Duration.EndOfTurn), new GenericManaCost(2)); this.addAbility(ability2); // When enchanted Mountain is put into a graveyard, you may return Genju of the Spires from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/cards/g/GerrardsHourglassPendant.java b/Mage.Sets/src/mage/cards/g/GerrardsHourglassPendant.java index e3692b6174f..4241d7d3f0b 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsHourglassPendant.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsHourglassPendant.java @@ -37,7 +37,7 @@ public final class GerrardsHourglassPendant extends CardImpl { // {4}, {T}, Exile Gerrard's Hourglass Pendant: Return to the battlefield tapped all artifact, creature, // enchantment, and land cards in your graveyard that were put there from the battlefield this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GerrardsHourglassPendantReanimateEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new GerrardsHourglassPendantReanimateEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileSourceCost()); ability.addWatcher(new CardsPutIntoGraveyardWatcher()); diff --git a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java index df613d1dec7..44db952a12f 100644 --- a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java +++ b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java @@ -46,7 +46,7 @@ public final class GethLordOfTheVault extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // {X}{B}: Put target artifact or creature card with converted mana cost X from an opponent's graveyard onto the battlefield under your control tapped. // Then that player puts the top X cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GethLordOfTheVaultEffect(), new ManaCostsImpl<>("{X}{B}")); + Ability ability = new SimpleActivatedAbility(new GethLordOfTheVaultEffect(), new ManaCostsImpl<>("{X}{B}")); ability.addTarget(new TargetCardInGraveyard(filter)); ability.setTargetAdjuster(new XManaValueTargetAdjuster()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java b/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java index 8b4e1836437..7a6e8a55784 100644 --- a/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java +++ b/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java @@ -43,12 +43,12 @@ public final class GhaveGuruOfSpores extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)), "with five +1/+1 counters on it")); // {1}, Remove a +1/+1 counter from a creature you control: Create a 1/1 green Saproling creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent().withNotTarget(true), CounterType.P1P1)); this.addAbility(ability); // {1}, Sacrifice a creature: Put a +1/+1 counter on target creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); ability2.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/g/GhituFireEater.java b/Mage.Sets/src/mage/cards/g/GhituFireEater.java index 834fcc1b62c..3d028a4bbfd 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFireEater.java +++ b/Mage.Sets/src/mage/cards/g/GhituFireEater.java @@ -31,7 +31,7 @@ public final class GhituFireEater extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice Ghitu Fire-Eater: Ghitu Fire-Eater deals damage equal to its power to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("it deals damage equal to its power to any target"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java b/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java index 675e36c4dee..f129b6226c1 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java +++ b/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java @@ -38,10 +38,10 @@ public final class GhituFirebreathing extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); // {R}: Return Ghitu Firebreathing to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{R}"))); } private GhituFirebreathing(final GhituFirebreathing card) { diff --git a/Mage.Sets/src/mage/cards/g/GhituWarCry.java b/Mage.Sets/src/mage/cards/g/GhituWarCry.java index ded5b6ca61a..eabb79238ba 100644 --- a/Mage.Sets/src/mage/cards/g/GhituWarCry.java +++ b/Mage.Sets/src/mage/cards/g/GhituWarCry.java @@ -24,7 +24,7 @@ public final class GhituWarCry extends CardImpl { // {R}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java b/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java index 0bf904bad17..d09a990655a 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java @@ -31,7 +31,7 @@ public final class GhostLitNourisher extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, {tap}: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GhostLitRaider.java b/Mage.Sets/src/mage/cards/g/GhostLitRaider.java index 1f4b8146b4e..b5e8c200400 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitRaider.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitRaider.java @@ -30,7 +30,7 @@ public final class GhostLitRaider extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, {tap}: Ghost-Lit Raider deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java b/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java index e9d898420f9..d89846fc146 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java @@ -29,7 +29,7 @@ public final class GhostLitRedeemer extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: You gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // Channel - {1}{W}, Discard Ghost-Lit Redeemer: You gain 4 life. diff --git a/Mage.Sets/src/mage/cards/g/GhostLitWarder.java b/Mage.Sets/src/mage/cards/g/GhostLitWarder.java index 3bbce4acea6..1071d2b52ff 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitWarder.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitWarder.java @@ -30,7 +30,7 @@ public final class GhostLitWarder extends CardImpl { this.toughness = new MageInt(1); // {3}{U}, {tap}: Counter target spell unless its controller pays {2}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{2}")), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{2}")), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GhostShip.java b/Mage.Sets/src/mage/cards/g/GhostShip.java index 030be317805..246d3ab2e01 100644 --- a/Mage.Sets/src/mage/cards/g/GhostShip.java +++ b/Mage.Sets/src/mage/cards/g/GhostShip.java @@ -30,7 +30,7 @@ public final class GhostShip extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}{U}{U}: Regenerate Ghost Ship. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{U}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{U}{U}{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GhostWarden.java b/Mage.Sets/src/mage/cards/g/GhostWarden.java index 0999cb74824..26f61ec05d6 100644 --- a/Mage.Sets/src/mage/cards/g/GhostWarden.java +++ b/Mage.Sets/src/mage/cards/g/GhostWarden.java @@ -27,7 +27,7 @@ public final class GhostWarden extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java b/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java index 93fd64fdeaf..444545774e2 100644 --- a/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java +++ b/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java @@ -44,7 +44,7 @@ public final class GhosthelmCourier extends CardImpl { // You may choose not to untap Ghosthelm Courier during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}{U}, {tap}: Target Wizard creature gets +2/+2 and has shroud for as long as Ghosthelm Courier remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target Wizard creature gets +2/+2"), new ManaCostsImpl<>("{2}{U}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(ShroudAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java b/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java index ca691cfed28..dcb92e9f9d2 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java @@ -27,7 +27,7 @@ public final class GhostlyChangeling extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new ChangelingAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private GhostlyChangeling(final GhostlyChangeling card) { diff --git a/Mage.Sets/src/mage/cards/g/GhostlyWings.java b/Mage.Sets/src/mage/cards/g/GhostlyWings.java index b82e436c75f..c1851fd6e7e 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyWings.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyWings.java @@ -48,7 +48,7 @@ public final class GhostlyWings extends CardImpl { ability.addEffect(effect); this.addAbility(ability); // Discard a card: Return enchanted creature to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GhostlyWingsReturnEffect(), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new GhostlyWingsReturnEffect(), new DiscardCardCost())); } diff --git a/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java b/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java index 7d53d0fd474..1ac74e4792c 100644 --- a/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java @@ -28,7 +28,7 @@ public final class GhostsOfTheDamned extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature gets -1/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java index e250042e145..454c5b08e57 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java @@ -39,7 +39,7 @@ public final class GhoulcallerGisa extends CardImpl { // {B}, {tap}, Sacrifice another creature: create X 2/2 black Zombie creature tokens, where X is the sacrificed creature's power. Effect effect = new CreateTokenEffect(new ZombieToken(), SacrificeCostCreaturesPower.instance); effect.setText("create X 2/2 black Zombie creature tokens, where X is the sacrificed creature's power"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java b/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java index 88963e49af9..5f48213d0a3 100644 --- a/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java +++ b/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java @@ -30,7 +30,7 @@ public final class GiantCaterpillar extends CardImpl { this.toughness = new MageInt(3); // {G}, Sacrifice Giant Caterpillar: Create a 1/1 green Insect creature token with flying named Butterfly at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect( + Ability ability = new SimpleActivatedAbility(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new ButterflyToken()))), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GiantCrab.java b/Mage.Sets/src/mage/cards/g/GiantCrab.java index 6b27435c3ea..7d821946b2d 100644 --- a/Mage.Sets/src/mage/cards/g/GiantCrab.java +++ b/Mage.Sets/src/mage/cards/g/GiantCrab.java @@ -26,7 +26,7 @@ public final class GiantCrab extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } private GiantCrab(final GiantCrab card) { diff --git a/Mage.Sets/src/mage/cards/g/GiantOyster.java b/Mage.Sets/src/mage/cards/g/GiantOyster.java index fd8b43557f6..df682ce3765 100644 --- a/Mage.Sets/src/mage/cards/g/GiantOyster.java +++ b/Mage.Sets/src/mage/cards/g/GiantOyster.java @@ -51,7 +51,7 @@ public final class GiantOyster extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {tap}: For as long as Giant Oyster remains tapped, target tapped creature doesn't untap during its controller's untap step, and at the beginning of each of your draw steps, put a -1/-1 counter on that creature. When Giant Oyster leaves the battlefield or becomes untapped, remove all -1/-1 counters from the creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DontUntapAsLongAsSourceTappedEffect() + Ability ability = new SimpleActivatedAbility(new DontUntapAsLongAsSourceTappedEffect() .setText("For as long as {this} remains tapped, target tapped creature doesn't untap during its controller's untap step"), new TapSourceCost()); ability.addEffect(new GiantOysterCreateDelayedTriggerEffects()); diff --git a/Mage.Sets/src/mage/cards/g/GiantTrapDoorSpider.java b/Mage.Sets/src/mage/cards/g/GiantTrapDoorSpider.java index 06195e2c476..5fb28ea8bea 100644 --- a/Mage.Sets/src/mage/cards/g/GiantTrapDoorSpider.java +++ b/Mage.Sets/src/mage/cards/g/GiantTrapDoorSpider.java @@ -40,7 +40,7 @@ public final class GiantTrapDoorSpider extends CardImpl { this.toughness = new MageInt(3); // {1}{R}{G}, {tap}: Exile Giant Trap Door Spider and target creature without flying that's attacking you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new ManaCostsImpl<>("{1}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new ExileSourceEffect(), new ManaCostsImpl<>("{1}{R}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ExileTargetEffect().setText("and target creature without flying that's attacking you")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java b/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java index e411e6bbdba..8394a6fee0e 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java +++ b/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java @@ -29,7 +29,7 @@ public final class GideonsLawkeeper extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/Gigantomancer.java b/Mage.Sets/src/mage/cards/g/Gigantomancer.java index 4e1057b5897..0a6ad1946a5 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantomancer.java +++ b/Mage.Sets/src/mage/cards/g/Gigantomancer.java @@ -31,7 +31,7 @@ public final class Gigantomancer extends CardImpl { this.toughness = new MageInt(1); //{1}: Target creature you control has base power and toughness 7/7 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessTargetEffect(7, 7, Duration.EndOfTurn), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SetBasePowerToughnessTargetEffect(7, 7, Duration.EndOfTurn), new GenericManaCost(1)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Gigantoplasm.java b/Mage.Sets/src/mage/cards/g/Gigantoplasm.java index d2198161414..6c5e1a2f6b6 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantoplasm.java +++ b/Mage.Sets/src/mage/cards/g/Gigantoplasm.java @@ -55,7 +55,7 @@ class GigantoplasmCopyApplier extends CopyApplier { public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { Effect effect = new SetBasePowerToughnessSourceEffect(GetXValue.instance, Duration.Custom); effect.setText("This creature has base power and toughness X/X"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); blueprint.getAbilities().add(ability); return true; } diff --git a/Mage.Sets/src/mage/cards/g/GildedGoose.java b/Mage.Sets/src/mage/cards/g/GildedGoose.java index f98d8c8c057..d7883917fe1 100644 --- a/Mage.Sets/src/mage/cards/g/GildedGoose.java +++ b/Mage.Sets/src/mage/cards/g/GildedGoose.java @@ -42,7 +42,7 @@ public final class GildedGoose extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new FoodToken()), false)); // {1}{G}, {T}: Create a Food token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new FoodToken()), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new FoodToken()), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GilderBairn.java b/Mage.Sets/src/mage/cards/g/GilderBairn.java index 4f2c0cb817c..774f1bcae1d 100644 --- a/Mage.Sets/src/mage/cards/g/GilderBairn.java +++ b/Mage.Sets/src/mage/cards/g/GilderBairn.java @@ -33,7 +33,7 @@ public final class GilderBairn extends CardImpl { this.toughness = new MageInt(3); // {2}{GU}, {untap}: For each counter on target permanent, put another of those counters on that permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GilderBairnEffect(), new ManaCostsImpl<>("{2}{G/U}")); + Ability ability = new SimpleActivatedAbility(new GilderBairnEffect(), new ManaCostsImpl<>("{2}{G/U}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java b/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java index e7f0e1ef369..13866b8ec16 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java @@ -29,7 +29,7 @@ public final class GiltLeafSeer extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}: Look at the top two cards of your library, then put them back in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(2), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new LookLibraryControllerEffect(2), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } @@ -42,4 +42,4 @@ public final class GiltLeafSeer extends CardImpl { public GiltLeafSeer copy() { return new GiltLeafSeer(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GiltspireAvenger.java b/Mage.Sets/src/mage/cards/g/GiltspireAvenger.java index 914b026bacf..fd51af64dd2 100644 --- a/Mage.Sets/src/mage/cards/g/GiltspireAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GiltspireAvenger.java @@ -40,7 +40,7 @@ public final class GiltspireAvenger extends CardImpl { this.addAbility(new ExaltedAbility()); // {T}: Destroy target creature that dealt damage to you this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new GiltspireAvengerTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java index 2a2839e1ef3..adfa86f759e 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java @@ -32,7 +32,7 @@ public final class GlacialCrevasses extends CardImpl { // Sacrifice a snow Mountain: Prevent all combat damage that would be dealt this turn. Effect effect = new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt this turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new SacrificeTargetCost(filter)); + Ability ability = new SimpleActivatedAbility(effect, new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java b/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java index 6ed422e15e6..ccecee5f520 100644 --- a/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java +++ b/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java @@ -33,7 +33,7 @@ public final class GlareOfSubdual extends CardImpl { // Tap an untapped creature you control: Tap target artifact or creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCost, true))); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCost, true))); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Glarecaster.java b/Mage.Sets/src/mage/cards/g/Glarecaster.java index ab5c0fe3feb..f504863f3cd 100644 --- a/Mage.Sets/src/mage/cards/g/Glarecaster.java +++ b/Mage.Sets/src/mage/cards/g/Glarecaster.java @@ -38,7 +38,7 @@ public final class Glarecaster extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {5}{W}: The next time damage would be dealt to Glarecaster and/or you this turn, that damage is dealt to any target instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GlarecasterEffect(), new ManaCostsImpl<>("{5}{W}")); + Ability ability = new SimpleActivatedAbility(new GlarecasterEffect(), new ManaCostsImpl<>("{5}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GlassblowersPuzzleknot.java b/Mage.Sets/src/mage/cards/g/GlassblowersPuzzleknot.java index 6bf11c80e42..39c2955eab9 100644 --- a/Mage.Sets/src/mage/cards/g/GlassblowersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/g/GlassblowersPuzzleknot.java @@ -34,7 +34,7 @@ public final class GlassblowersPuzzleknot extends CardImpl { this.addAbility(ability); // {2}{U}, Sacrifice Glassblower's Puzzleknot: Scry 2, then you get {E}{E}. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, scryEffect, new ManaCostsImpl<>("{2}{U}")); + ability = new SimpleActivatedAbility(scryEffect, new ManaCostsImpl<>("{2}{U}")); ability.addCost(new SacrificeSourceCost()); ability.addEffect(energyEffect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java b/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java index 3c2287a0a7d..0ea206ec97f 100644 --- a/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java +++ b/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java @@ -22,7 +22,7 @@ public final class GlassesOfUrza extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {tap}: Look at target player's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookAtTargetPlayerHandEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LookAtTargetPlayerHandEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java index 68ac91aeb9e..25790ea83bb 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java @@ -49,7 +49,7 @@ public final class GleamOfAuthority extends CardImpl { // Enchanted creature has vigilance and "{W}, {T}: Bloster 1." ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BolsterEffect(1), new ManaCostsImpl<>("{W}")); + Ability gainedAbility = new SimpleActivatedAbility(new BolsterEffect(1), new ManaCostsImpl<>("{W}")); gainedAbility.addCost(new TapSourceCost()); ability.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA).setText("and \"{W}, {T}: Bolster 1.\"")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java b/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java index 7f0c2d93c11..e44f43ff50d 100644 --- a/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java +++ b/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java @@ -35,7 +35,7 @@ public final class GlenElendraArchmage extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, Sacrifice Glen Elendra Archmage: Counter target noncreature spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_NON_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java b/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java index f81f3c0bf40..9f08e23dd3d 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java +++ b/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java @@ -31,7 +31,7 @@ public final class GlimmeringAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Glimmering Angel gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private GlimmeringAngel(final GlimmeringAngel card) { diff --git a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java index 8a01b51fb39..38a1dc6cc9f 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java @@ -37,7 +37,7 @@ public final class GlintHawkIdol extends CardImpl { Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GlintHawkIdolToken(), CardType.ARTIFACT, Duration.EndOfTurn), filter, true)); // {W}: Glint Hawk Idol becomes a 2/2 Bird artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GlintHawkIdolToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new GlintHawkIdolToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } private GlintHawkIdol(final GlintHawkIdol card) { diff --git a/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java b/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java index 6e066656517..ebc5df855d9 100644 --- a/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java +++ b/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java @@ -34,7 +34,7 @@ public final class GlintwingInvoker extends CardImpl { // {7}{U}: Glintwing Invoker gets +3/+3 and gains flying until end of turn. Effect effect = new BoostSourceEffect(3, 3, Duration.EndOfTurn); effect.setText("{this} gets +3/+3"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{7}{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{7}{U}")); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java index 3a1c710b2cc..3ca7b6919e7 100644 --- a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java +++ b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java @@ -38,7 +38,7 @@ public final class GlissaSunseeker extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {tap}: Destroy target artifact if its converted mana cost is equal to the amount of mana in your mana pool. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GlissaSunseekerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GlissaSunseekerEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GlitteringLion.java b/Mage.Sets/src/mage/cards/g/GlitteringLion.java index 65782958c88..aa5d3c82dac 100644 --- a/Mage.Sets/src/mage/cards/g/GlitteringLion.java +++ b/Mage.Sets/src/mage/cards/g/GlitteringLion.java @@ -32,7 +32,7 @@ public final class GlitteringLion extends CardImpl { // Prevent all damage that would be dealt to Glittering Lion. this.addAbility(GlitteringLionAbility.getInstance()); // {3}: Until end of turn, Glittering Lion loses "Prevent all damage that would be dealt to Glittering Lion." Any player may activate this ability. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect(GlitteringLionAbility.getInstance(), Duration.EndOfTurn).setText("Until end of turn, {this} loses \"Prevent all damage that would be dealt to {this}.\" Any player may activate this ability"), new ManaCostsImpl<>("{3}")); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(new LoseAbilitySourceEffect(GlitteringLionAbility.getInstance(), Duration.EndOfTurn).setText("Until end of turn, {this} loses \"Prevent all damage that would be dealt to {this}.\" Any player may activate this ability"), new ManaCostsImpl<>("{3}")); ability2.setMayActivate(TargetController.ANY); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/g/GlitteringLynx.java b/Mage.Sets/src/mage/cards/g/GlitteringLynx.java index 0d3c271d4a0..c9d56644abf 100644 --- a/Mage.Sets/src/mage/cards/g/GlitteringLynx.java +++ b/Mage.Sets/src/mage/cards/g/GlitteringLynx.java @@ -33,7 +33,7 @@ public final class GlitteringLynx extends CardImpl { // Prevent all damage that would be dealt to Glittering Lynx. this.addAbility(GlitteringLynxAbility.getInstance()); // {2}: Until end of turn, Glittering Lynx loses "Prevent all damage that would be dealt to Glittering Lynx." Any player may activate this ability. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect(GlitteringLynxAbility.getInstance(), Duration.EndOfTurn).setText("Until end of turn, {this} loses \"Prevent all damage that would be dealt to {this}.\""), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(new LoseAbilitySourceEffect(GlitteringLynxAbility.getInstance(), Duration.EndOfTurn).setText("Until end of turn, {this} loses \"Prevent all damage that would be dealt to {this}.\""), new ManaCostsImpl<>("{2}")); ability2.setMayActivate(TargetController.ANY); ability2.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/g/GlorifierOfDusk.java b/Mage.Sets/src/mage/cards/g/GlorifierOfDusk.java index d6a0bb36910..7631048c44b 100644 --- a/Mage.Sets/src/mage/cards/g/GlorifierOfDusk.java +++ b/Mage.Sets/src/mage/cards/g/GlorifierOfDusk.java @@ -30,10 +30,10 @@ public final class GlorifierOfDusk extends CardImpl { this.toughness = new MageInt(4); // Pay 2 life: Glorifier of Dusk gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new PayLifeCost(2))); // Pay 2 life: Glorifier of Dusk gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new PayLifeCost(2))); } private GlorifierOfDusk(final GlorifierOfDusk card) { diff --git a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java index a06cc5c3f86..96d6cd35023 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java +++ b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java @@ -54,7 +54,7 @@ public final class GnarlrootTrapper extends CardImpl { // {T}: Target attacking Elf you control gains deathtouch until end of turn. Effect effect = new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target attacking Elf you control 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 TapSourceCost()); + ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GnawingZombie.java b/Mage.Sets/src/mage/cards/g/GnawingZombie.java index aba1a7931b8..f0942e6328c 100644 --- a/Mage.Sets/src/mage/cards/g/GnawingZombie.java +++ b/Mage.Sets/src/mage/cards/g/GnawingZombie.java @@ -32,7 +32,7 @@ public final class GnawingZombie extends CardImpl { this.toughness = new MageInt(3); // {1}{B}, Sacrifice a creature: Target player loses 1 life and you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addEffect(new GainLifeEffect(1).concatBy("and")); ability.addTarget(new TargetPlayer()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/g/GobblingOoze.java b/Mage.Sets/src/mage/cards/g/GobblingOoze.java index 747766ebd15..096c38971bb 100644 --- a/Mage.Sets/src/mage/cards/g/GobblingOoze.java +++ b/Mage.Sets/src/mage/cards/g/GobblingOoze.java @@ -31,7 +31,7 @@ public final class GobblingOoze extends CardImpl { this.toughness = new MageInt(3); // {G}, Sacrifice another creature: Put a +1/+1 counter on Gobbling Ooze. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java index dec3d9ceae0..266c62e4a6e 100644 --- a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java +++ b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java @@ -35,7 +35,7 @@ public final class GobhobblerRats extends CardImpl { // Hellbent - As long as you have no cards in hand, Gobhobbler Rats gets +1/+0 and has "{B}: Regenerate Gobhobbler Rats." Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — As long as you have no cards in hand, {this} gets +1/+0")); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability gainedAbility = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), HellbentCondition.instance, "and has \"{B}: Regenerate {this}.\"")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java b/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java index 0c08fa250fa..44f94b45ff1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java @@ -34,7 +34,7 @@ public final class GoblinArchaeologist extends CardImpl { this.toughness = new MageInt(2); // {R}, {T]: Flip a coin. If you win the flip, destroy target artifact and untap Goblin Archaeologist. If you lose the flip, sacrifice Goblin Archaeologist. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinArchaeologistEffect(),new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new GoblinArchaeologistEffect(),new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java index fbe4ae0099b..04311443ca7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java @@ -30,7 +30,7 @@ public final class GoblinBalloonBrigade extends CardImpl { this.toughness = new MageInt(1); // {R}: Goblin Balloon Brigade gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java index 930c4c67f34..d91e7e6c8b9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java @@ -32,7 +32,7 @@ public final class GoblinBangchuckers extends CardImpl { this.toughness = new MageInt(2); // {T}: Flip a coin. If you win the flip, Goblin Bangchuckers deals 2 damage to any target. If you lose the flip, Goblin Bangchuckers deals 2 damage to itself. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinBangchuckersEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GoblinBangchuckersEffect(), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBombardment.java b/Mage.Sets/src/mage/cards/g/GoblinBombardment.java index 7dc6da877d4..00643b0bbf8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBombardment.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBombardment.java @@ -23,7 +23,7 @@ public final class GoblinBombardment extends CardImpl { public GoblinBombardment(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBurrows.java b/Mage.Sets/src/mage/cards/g/GoblinBurrows.java index 17c3d503a3c..2899d5e9ab4 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBurrows.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBurrows.java @@ -35,7 +35,7 @@ public final class GoblinBurrows extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}{R}, {tap}: Target Goblin creature gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2,0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinCannon.java b/Mage.Sets/src/mage/cards/g/GoblinCannon.java index 02ed36630b1..6023357ca4a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCannon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCannon.java @@ -23,7 +23,7 @@ public final class GoblinCannon extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}: Goblin Cannon deals 1 damage to any target. Sacrifice Goblin Cannon. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new SacrificeSourceEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java index 9a020f87837..0a2d05953ed 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java @@ -27,7 +27,7 @@ public final class GoblinCharbelcher extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {tap}: Reveal cards from the top of your library until you reveal a land card. Goblin Charbelcher deals damage equal to the number of nonland cards revealed this way to any target. If the revealed land card was a Mountain, Goblin Charbelcher deals double that damage instead. Put the revealed cards on the bottom of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinCharbelcherEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new GoblinCharbelcherEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java b/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java index 74e5da939b0..d217f930147 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java @@ -35,7 +35,7 @@ public final class GoblinDiggingTeam extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Goblin Digging Team: Destroy target Wall. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java index 64690122cbf..2d1eb884456 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java @@ -31,7 +31,7 @@ public final class GoblinDynamo extends CardImpl { this.toughness = new MageInt(4); // {T}: Goblin Dynamo 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/g/GoblinFestival.java b/Mage.Sets/src/mage/cards/g/GoblinFestival.java index c084aa9b76f..b691552119d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFestival.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFestival.java @@ -30,7 +30,7 @@ public final class GoblinFestival extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // {2}: Goblin Festival deals 1 damage to any target. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of Goblin Festival. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new GoblinFestivalChangeControlEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java index f10765f98ad..b5b405b452a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java @@ -37,7 +37,7 @@ public final class GoblinFireFiend extends CardImpl { this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); //{R}: Goblin Fire Fiend 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 GoblinFireFiend(final GoblinFireFiend card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java b/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java index edc1c15ee86..4a12d0b9dd9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java @@ -28,7 +28,7 @@ public final class GoblinFireslinger extends CardImpl { this.toughness = new MageInt(1); // {tap}: Goblin Fireslinger deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java b/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java index dbbcf9efc2c..83dc20105dd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java @@ -30,7 +30,7 @@ public final class GoblinFlectomancer extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Goblin Flectomancer: You may change the targets of target instant or sorcery spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChooseNewTargetsTargetEffect().setText("you may change the targets of target instant or sorcery spell"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ChooseNewTargetsTargetEffect().setText("you may change the targets of target instant or sorcery spell"), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(new FilterInstantOrSorcerySpell())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGoliath.java b/Mage.Sets/src/mage/cards/g/GoblinGoliath.java index 97e3f5796ee..7a7f5c2efd3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGoliath.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGoliath.java @@ -39,7 +39,7 @@ public final class GoblinGoliath extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // {3}{R}, {T}: If a source you control would deal damage to an opponent this turn, it deals double that damage to that player instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinGoliathDamageEffect(), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new GoblinGoliathDamageEffect(), new ManaCostsImpl<>("{3}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java b/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java index b753ad7aa23..a01cc7da1a8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java @@ -32,13 +32,13 @@ public final class GoblinLegionnaire extends CardImpl { this.toughness = new MageInt(2); // {R}, Sacrifice Goblin Legionnaire: It deals 2 damage to any target. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ColoredManaCost(ColoredManaSymbol.R)); + Ability firstAbility = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); // {W}, Sacrifice Goblin Legionnaire: Prevent the next 2 damage that would be dealt to any target this turn. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); + Ability secondAbility = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); secondAbility.addCost(new SacrificeSourceCost()); secondAbility.addTarget(new TargetAnyTarget()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/g/GoblinLookout.java b/Mage.Sets/src/mage/cards/g/GoblinLookout.java index 9a4869e4f84..e23786138e1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLookout.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLookout.java @@ -37,7 +37,7 @@ public final class GoblinLookout extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice a Goblin: Goblin creatures get +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 0, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(2, 0, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filterPermanent)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinLyre.java b/Mage.Sets/src/mage/cards/g/GoblinLyre.java index 08b98a1ebfe..ab861f85f8f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLyre.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLyre.java @@ -26,7 +26,7 @@ public final class GoblinLyre extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Sacrifice Goblin Lyre: Flip a coin. If you win the flip, Goblin Lyre deals damage to target opponent equal to the number of creatures you control. If you lose the flip, Goblin Lyre deals damage to you equal to the number of creatures that opponent controls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinLyreEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new GoblinLyreEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java b/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java index e7fcb812e37..a2c36ac6dee 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java @@ -38,7 +38,7 @@ public final class GoblinRazerunners extends CardImpl { this.toughness = new MageInt(4); // {1}{R}, Sacrifice a land: Put a +1/+1 counter on Goblin Razerunners. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinReplica.java b/Mage.Sets/src/mage/cards/g/GoblinReplica.java index 94c5de4862c..12b7725085d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinReplica.java +++ b/Mage.Sets/src/mage/cards/g/GoblinReplica.java @@ -33,7 +33,7 @@ public final class GoblinReplica extends CardImpl { this.subtype.add(SubType.GOBLIN); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSappers.java b/Mage.Sets/src/mage/cards/g/GoblinSappers.java index ec64f377482..b6d78f9b68d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSappers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSappers.java @@ -33,7 +33,7 @@ public final class GoblinSappers extends CardImpl { this.toughness = new MageInt(1); // {R}{R}, {T}: Target creature you control can’t be blocked this turn. Destroy it and Goblin Sappers at end of combat. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); DelayedTriggeredAbility triggeredAbility = new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect().setText("destroy that creature")); @@ -42,7 +42,7 @@ public final class GoblinSappers extends CardImpl { this.addAbility(ability); // {R}{R}{R}{R}, {T}: Target creature you control can’t be blocked this turn. Destroy it at end of combat. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}{R}")); + Ability secondAbility = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}{R}")); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetControlledCreaturePermanent()); DelayedTriggeredAbility secondTriggeredAbility = new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect().setText("destroy that creature")); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java index ff9f1bb48d4..930419024c9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java @@ -36,7 +36,7 @@ public final class GoblinSharpshooter extends CardImpl { // Whenever a creature dies, untap Goblin Sharpshooter. this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false)); // {T}: Goblin Sharpshooter 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/g/GoblinSkycutter.java b/Mage.Sets/src/mage/cards/g/GoblinSkycutter.java index b06a7ee85f1..fa99a35d84e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSkycutter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSkycutter.java @@ -40,7 +40,7 @@ public final class GoblinSkycutter extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Goblin Skycutter: Goblin Skycutter deals 2 damage to target creature with flying. That creature loses flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); ability.addEffect(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn).setText("that creature loses flying until end of turn")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSledder.java b/Mage.Sets/src/mage/cards/g/GoblinSledder.java index 1baad15521a..62e6eb1e229 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSledder.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSledder.java @@ -32,7 +32,7 @@ public final class GoblinSledder extends CardImpl { this.toughness = new MageInt(1); // Sacrifice a Goblin: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1,Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1,1,Duration.EndOfTurn), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java b/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java index a27e6595bd5..5daf2fa43d3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java @@ -42,7 +42,7 @@ public final class GoblinSoothsayer extends CardImpl { this.toughness = new MageInt(1); // {R}, {T}, Sacrifice a Goblin: Red creatures get +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1,Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1,1,Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java index 6e10b260be6..51af39c4703 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java @@ -36,7 +36,7 @@ public final class GoblinTaskmaster extends CardImpl { this.toughness = new MageInt(1); // {1}{R}: Target Goblin creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java index f95fc74e592..0d5019e5eef 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java @@ -34,7 +34,7 @@ public final class GoblinTestPilot extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Goblin Test Pilot deals 2 damage to any target chosen at random. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); Target target = new TargetAnyTarget(); target.setRandom(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java b/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java index 0c93f809cc9..8637f1a8363 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java @@ -34,7 +34,7 @@ public final class GoblinTinkerer extends CardImpl { this.toughness = new MageInt(2); // {R}, {T}: Destroy target artifact. That artifact deals damage equal to its converted mana cost to Goblin Tinkerer. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addEffect(new GoblinTinkererDamageEffect()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinTunneler.java b/Mage.Sets/src/mage/cards/g/GoblinTunneler.java index 525c6c8861f..794fcf94f45 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTunneler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTunneler.java @@ -39,7 +39,7 @@ public final class GoblinTunneler extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java b/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java index 9f4cd529d1d..4b1121fc8e1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java @@ -31,7 +31,7 @@ public final class GoblinTurncoat extends CardImpl { this.toughness = new MageInt(1); // Sacrifice a Goblin: Regenerate Goblin Turncoat. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarrens.java b/Mage.Sets/src/mage/cards/g/GoblinWarrens.java index 7152ad16eb5..3702346ec35 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarrens.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarrens.java @@ -26,7 +26,7 @@ public final class GoblinWarrens extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // {2}{R}, Sacrifice two Goblins: Create three 1/1 red Goblin creature tokens. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinToken(), 3), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GoblinToken(), 3), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(2, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Godsire.java b/Mage.Sets/src/mage/cards/g/Godsire.java index df3fe44b9e1..3e2585fa93e 100644 --- a/Mage.Sets/src/mage/cards/g/Godsire.java +++ b/Mage.Sets/src/mage/cards/g/Godsire.java @@ -27,7 +27,7 @@ public final class Godsire extends CardImpl { this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GodSireBeastToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new GodSireBeastToken()), new TapSourceCost())); } private Godsire(final Godsire card) { diff --git a/Mage.Sets/src/mage/cards/g/GohamDjinn.java b/Mage.Sets/src/mage/cards/g/GohamDjinn.java index c07eb5efdf7..60938aefdb6 100644 --- a/Mage.Sets/src/mage/cards/g/GohamDjinn.java +++ b/Mage.Sets/src/mage/cards/g/GohamDjinn.java @@ -32,7 +32,7 @@ public final class GohamDjinn extends CardImpl { this.toughness = new MageInt(5); // {1}{B}: Regenerate Goham Djinn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); // Goham Djinn gets -2/-2 as long as black is the most common color among all permanents or is tied for most common. this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/g/GoldenUrn.java b/Mage.Sets/src/mage/cards/g/GoldenUrn.java index e5c479e2dd0..187af29d5b8 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenUrn.java +++ b/Mage.Sets/src/mage/cards/g/GoldenUrn.java @@ -26,7 +26,7 @@ public final class GoldenUrn extends CardImpl { public GoldenUrn (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), true)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CountersSourceCount(CounterType.CHARGE)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(new CountersSourceCount(CounterType.CHARGE)), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java b/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java index 1b049fcc3ae..da13191167c 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java @@ -29,7 +29,7 @@ public final class GoldmeadowHarrier extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java b/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java index ebd61dd71b6..4eabe617f7a 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java @@ -30,7 +30,7 @@ public final class GoldmeadowLookout extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}, Discard a card: Create a 1/1 white Kithkin Soldier creature token named Goldmeadow Harrier. It has "{W}, {tap}: Tap target creature." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoldmeadowHarrierToken()), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GoldmeadowHarrierToken()), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GolemArtisan.java b/Mage.Sets/src/mage/cards/g/GolemArtisan.java index 45185b0f73c..893ec99853d 100644 --- a/Mage.Sets/src/mage/cards/g/GolemArtisan.java +++ b/Mage.Sets/src/mage/cards/g/GolemArtisan.java @@ -34,12 +34,12 @@ public final class GolemArtisan extends CardImpl { this.toughness = new MageInt(3); // {2}: Target artifact creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE)); this.addAbility(ability); // {2}: Target artifact creature gains your choice of flying, trample, or haste until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainsChoiceOfAbilitiesEffect( + ability = new SimpleActivatedAbility(new GainsChoiceOfAbilitiesEffect( FlyingAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance()), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE)); this.addAbility(ability); @@ -55,4 +55,3 @@ public final class GolemArtisan extends CardImpl { return new GolemArtisan(this); } } - diff --git a/Mage.Sets/src/mage/cards/g/GolemFoundry.java b/Mage.Sets/src/mage/cards/g/GolemFoundry.java index 151f7c049b1..b5f3e389fbf 100644 --- a/Mage.Sets/src/mage/cards/g/GolemFoundry.java +++ b/Mage.Sets/src/mage/cards/g/GolemFoundry.java @@ -25,7 +25,7 @@ public final class GolemFoundry extends CardImpl { // Whenever you cast an artifact spell, you may put a charge counter on Golem Foundry. this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), StaticFilters.FILTER_SPELL_AN_ARTIFACT, true)); // Remove three charge counters from Golem Foundry: Create a 3/3 colorless Golem artifact creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new GolemToken()), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)))); } private GolemFoundry(final GolemFoundry card) { diff --git a/Mage.Sets/src/mage/cards/g/GolgariCluestone.java b/Mage.Sets/src/mage/cards/g/GolgariCluestone.java index 8174dae6e2e..767340994ad 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariCluestone.java +++ b/Mage.Sets/src/mage/cards/g/GolgariCluestone.java @@ -32,7 +32,7 @@ public final class GolgariCluestone extends CardImpl { this.addAbility(new GreenManaAbility()); // {B}{G}, {T}, Sacrifice Golgari Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java b/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java index 0080714eeac..a0b1154ea8d 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java @@ -39,7 +39,7 @@ public final class GolgariGraveTroll extends CardImpl { // Golgari Grave-Troll enters the battlefield with a +1/+1 counter on it for each creature card in your graveyard. this.addAbility(new EntersBattlefieldAbility(new GolgariGraveTrollEffect(), "with a +1/+1 counter on it for each creature card in your graveyard")); // {1}, Remove a +1/+1 counter from Golgari Grave-Troll: Regenerate Golgari Grave-Troll. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); // Dredge 6 diff --git a/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java index ec28151fb43..d68d3085bc3 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java +++ b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java @@ -30,7 +30,7 @@ public final class GolgariKeyrune extends CardImpl { this.addAbility(new GreenManaAbility()); // {B}{G}: Golgari Keyrune becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GolgariKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new GolgariKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); } private GolgariKeyrune(final GolgariKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java b/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java index d717861359e..24dd500f0d0 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java +++ b/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java @@ -33,7 +33,7 @@ public final class GolgariRotwurm extends CardImpl { this.toughness = new MageInt(4); // {B}, Sacrifice a creature: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java index beae1453196..c8b1d287e55 100644 --- a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java +++ b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java @@ -31,7 +31,7 @@ public final class GolgothianSylex extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {1}, {tap}: Each nontoken permanent from the Antiquities expansion is sacrificed by its controller. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GolgothianSylexEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new GolgothianSylexEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Gomazoa.java b/Mage.Sets/src/mage/cards/g/Gomazoa.java index 5fc4ac8a933..7c5c86fb8c5 100644 --- a/Mage.Sets/src/mage/cards/g/Gomazoa.java +++ b/Mage.Sets/src/mage/cards/g/Gomazoa.java @@ -44,7 +44,7 @@ public final class Gomazoa extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Put Gomazoa and each creature it's blocking on top of their owners' libraries, then those players shuffle their libraries. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GomazoaEffect(), new TapSourceCost()), new BlockedByWatcher()); + this.addAbility(new SimpleActivatedAbility(new GomazoaEffect(), new TapSourceCost()), new BlockedByWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GorillaChieftain.java b/Mage.Sets/src/mage/cards/g/GorillaChieftain.java index 03d5065a9a4..69238c9eeaa 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaChieftain.java +++ b/Mage.Sets/src/mage/cards/g/GorillaChieftain.java @@ -26,7 +26,7 @@ public final class GorillaChieftain extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Regenerate Gorilla Chieftain. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private GorillaChieftain(final GorillaChieftain card) { diff --git a/Mage.Sets/src/mage/cards/g/GorillaShaman.java b/Mage.Sets/src/mage/cards/g/GorillaShaman.java index 842054be47e..7d9a3fae9a0 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaShaman.java +++ b/Mage.Sets/src/mage/cards/g/GorillaShaman.java @@ -38,7 +38,7 @@ public final class GorillaShaman extends CardImpl { this.toughness = new MageInt(1); // {X}{X}{1}: Destroy target noncreature artifact with converted mana cost X. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{1}")); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(new XManaValueTargetAdjuster()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GossamerChains.java b/Mage.Sets/src/mage/cards/g/GossamerChains.java index cb2be937394..56afe0a9dba 100644 --- a/Mage.Sets/src/mage/cards/g/GossamerChains.java +++ b/Mage.Sets/src/mage/cards/g/GossamerChains.java @@ -31,7 +31,7 @@ public final class GossamerChains extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}{W}"); // Return Gossamer Chains to its owner's hand: Prevent all combat damage that would be dealt by target unblocked creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageByTargetEffect(Duration.EndOfTurn, true), new ReturnToHandFromBattlefieldSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageByTargetEffect(Duration.EndOfTurn, true), new ReturnToHandFromBattlefieldSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrafHarvest.java b/Mage.Sets/src/mage/cards/g/GrafHarvest.java index 5b0d75b5ada..73847fbf52b 100644 --- a/Mage.Sets/src/mage/cards/g/GrafHarvest.java +++ b/Mage.Sets/src/mage/cards/g/GrafHarvest.java @@ -43,7 +43,7 @@ public final class GrafHarvest extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {3}{B}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrandArchitect.java b/Mage.Sets/src/mage/cards/g/GrandArchitect.java index a504b443aca..e21d3124bc3 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArchitect.java +++ b/Mage.Sets/src/mage/cards/g/GrandArchitect.java @@ -53,7 +53,7 @@ public final class GrandArchitect extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, true))); // {U}: Target artifact creature becomes blue until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrandArchitectEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new GrandArchitectEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java b/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java index 06b54714aef..160fc03c6b3 100644 --- a/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java +++ b/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java @@ -32,7 +32,7 @@ public final class GrandmotherSengir extends CardImpl { this.toughness = new MageInt(3); // {1}{B}, {tap}: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java index 2592c683377..aa45d3eb1c8 100644 --- a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java +++ b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java @@ -34,14 +34,14 @@ public final class GrangerGuildmage extends CardImpl { this.toughness = new MageInt(1); // {R}, {tap}: Granger Guildmage deals 1 damage to any target and 1 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1).setText("and 1 damage to you")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {W}, {tap}: Target creature gains first strike until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java b/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java index 6ac12f4003e..1f210b7d739 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java @@ -29,7 +29,7 @@ public final class GraniteGargoyle extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}: Granite Gargoyle gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private GraniteGargoyle(final GraniteGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java b/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java index 0d0c47e2280..12561052632 100644 --- a/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java +++ b/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java @@ -37,7 +37,7 @@ public final class GrapeshotCatapult extends CardImpl { this.toughness = new MageInt(3); // {tap}: Grapeshot Catapult deals 1 damage to target creature with flying. - Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability activatedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); activatedAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java b/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java index c76783f5b1f..0536fa34cb4 100644 --- a/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java +++ b/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java @@ -38,7 +38,7 @@ public final class GrasslandCrusader extends CardImpl { this.toughness = new MageInt(4); // {tap}: Target Elf or Soldier creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GraveDefiler.java b/Mage.Sets/src/mage/cards/g/GraveDefiler.java index eace4dbf038..8194fabdce9 100644 --- a/Mage.Sets/src/mage/cards/g/GraveDefiler.java +++ b/Mage.Sets/src/mage/cards/g/GraveDefiler.java @@ -37,7 +37,7 @@ public final class GraveDefiler extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new RevealLibraryPutIntoHandEffect(4, filter, Zone.LIBRARY))); // {1}{B}: Regenerate Grave Defiler. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private GraveDefiler(final GraveDefiler card) { diff --git a/Mage.Sets/src/mage/cards/g/GraveRobbers.java b/Mage.Sets/src/mage/cards/g/GraveRobbers.java index 51be10b3895..9a600fb76e2 100644 --- a/Mage.Sets/src/mage/cards/g/GraveRobbers.java +++ b/Mage.Sets/src/mage/cards/g/GraveRobbers.java @@ -32,7 +32,7 @@ public final class GraveRobbers extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Exile target artifact card from a graveyard. You gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(filter)); ability.addEffect(new GainLifeEffect(2)); diff --git a/Mage.Sets/src/mage/cards/g/GraveShellScarab.java b/Mage.Sets/src/mage/cards/g/GraveShellScarab.java index b56046424a8..36dfcf61286 100644 --- a/Mage.Sets/src/mage/cards/g/GraveShellScarab.java +++ b/Mage.Sets/src/mage/cards/g/GraveShellScarab.java @@ -29,7 +29,7 @@ public final class GraveShellScarab extends CardImpl { this.toughness = new MageInt(4); // {1}, Sacrifice Grave-Shell Scarab: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // Dredge 1 diff --git a/Mage.Sets/src/mage/cards/g/GravelSlinger.java b/Mage.Sets/src/mage/cards/g/GravelSlinger.java index fbb8f00d1bc..ab01098cca4 100644 --- a/Mage.Sets/src/mage/cards/g/GravelSlinger.java +++ b/Mage.Sets/src/mage/cards/g/GravelSlinger.java @@ -31,7 +31,7 @@ public final class GravelSlinger extends CardImpl { this.toughness = new MageInt(3); // {tap}: Gravel Slinger deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); // Morph {1}{W} diff --git a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java index 067be5624e6..126f0f857cf 100644 --- a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java +++ b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java @@ -39,7 +39,7 @@ public final class GravespawnSovereign extends CardImpl { this.toughness = new MageInt(3); // Tap five untapped Zombies you control: Put target creature card from a graveyard onto the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter, true))); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter, true))); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrazingKelpie.java b/Mage.Sets/src/mage/cards/g/GrazingKelpie.java index ff08e43f7ba..8d8a7ba2ed0 100644 --- a/Mage.Sets/src/mage/cards/g/GrazingKelpie.java +++ b/Mage.Sets/src/mage/cards/g/GrazingKelpie.java @@ -31,7 +31,7 @@ public final class GrazingKelpie extends CardImpl { this.toughness = new MageInt(3); // {GU}, Sacrifice Grazing Kelpie: Put target card from a graveyard on the bottom of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new ManaCostsImpl<>("{G/U}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new ManaCostsImpl<>("{G/U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GreaterForgeling.java b/Mage.Sets/src/mage/cards/g/GreaterForgeling.java index 4d11a6c1814..165f71dee0f 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterForgeling.java +++ b/Mage.Sets/src/mage/cards/g/GreaterForgeling.java @@ -27,7 +27,7 @@ public final class GreaterForgeling extends CardImpl { this.toughness = new MageInt(4); // {1}{R}: Greater Forgeling gets +3/-3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private GreaterForgeling(final GreaterForgeling card) { diff --git a/Mage.Sets/src/mage/cards/g/GreaterGood.java b/Mage.Sets/src/mage/cards/g/GreaterGood.java index b893966a657..f0ab98fc275 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterGood.java +++ b/Mage.Sets/src/mage/cards/g/GreaterGood.java @@ -28,7 +28,7 @@ public final class GreaterGood extends CardImpl { // Sacrifice a creature: Draw cards equal to the sacrificed creature's power, then discard three cards. Effect effect = new DrawCardSourceControllerEffect(SacrificeCostCreaturesPower.instance); effect.setText("Draw cards equal to the sacrificed creature's power"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, + Ability ability = new SimpleActivatedAbility(effect, new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); effect = new DiscardControllerEffect(3); effect.setText(", then discard three cards"); diff --git a/Mage.Sets/src/mage/cards/g/GreaterRealmOfPreservation.java b/Mage.Sets/src/mage/cards/g/GreaterRealmOfPreservation.java index a79c077d2d2..74a405ba4ad 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterRealmOfPreservation.java +++ b/Mage.Sets/src/mage/cards/g/GreaterRealmOfPreservation.java @@ -33,7 +33,7 @@ public final class GreaterRealmOfPreservation extends CardImpl { // {1}{W}: The next time a black or red source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}"))); } private GreaterRealmOfPreservation(final GreaterRealmOfPreservation card) { diff --git a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java index e17ffb23372..dc73967e12c 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java +++ b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java @@ -52,7 +52,7 @@ public final class GreaterStoneSpirit extends CardImpl { ); Effect effect = new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn); effect.setText("and gains \"{R}: This creature gets +1/+0 until end of turn.\""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 2, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 2, Duration.EndOfTurn) .setText("until end of turn, target creature gets +0/+2"), new ManaCostsImpl<>("{2}{R}")); ability.addEffect(effect); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/g/Greed.java b/Mage.Sets/src/mage/cards/g/Greed.java index ab0a29f6064..b7112da7110 100644 --- a/Mage.Sets/src/mage/cards/g/Greed.java +++ b/Mage.Sets/src/mage/cards/g/Greed.java @@ -23,7 +23,7 @@ public final class Greed extends CardImpl { // {B}, Pay 2 life: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}")); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GreensideWatcher.java b/Mage.Sets/src/mage/cards/g/GreensideWatcher.java index 60b34e514b4..bee2c721259 100644 --- a/Mage.Sets/src/mage/cards/g/GreensideWatcher.java +++ b/Mage.Sets/src/mage/cards/g/GreensideWatcher.java @@ -35,7 +35,7 @@ public final class GreensideWatcher extends CardImpl { this.toughness = new MageInt(1); // {tap}: Untap target Gate. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GremlinMine.java b/Mage.Sets/src/mage/cards/g/GremlinMine.java index 72583322508..6f6cb61a922 100644 --- a/Mage.Sets/src/mage/cards/g/GremlinMine.java +++ b/Mage.Sets/src/mage/cards/g/GremlinMine.java @@ -42,13 +42,13 @@ public final class GremlinMine extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {1}, {tap}, Sacrifice Gremlin Mine: Gremlin Mine deals 4 damage to target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4, "it"), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4, "it"), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent(filterCreature)); this.addAbility(ability); // {1}, {tap}, Sacrifice Gremlin Mine: Remove up to four charge counters from target noncreature artifact. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GremlinMineEffect(), new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new GremlinMineEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent(filterNonCreature)); diff --git a/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java b/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java index dddfd9969d0..02a0db1a354 100644 --- a/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java +++ b/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java @@ -41,7 +41,7 @@ public final class GrenzoDungeonWarden extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // {2}: Put the bottom card of your library into your graveyard. If it's a creature card with power less than or equal to Grenzo's power, put it onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrenzoDungeonWardenEffect(), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new GrenzoDungeonWardenEffect(), new GenericManaCost(2))); } private GrenzoDungeonWarden(final GrenzoDungeonWarden card) { diff --git a/Mage.Sets/src/mage/cards/g/GriffinCanyon.java b/Mage.Sets/src/mage/cards/g/GriffinCanyon.java index fae6c45e721..dff95eead3f 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinCanyon.java +++ b/Mage.Sets/src/mage/cards/g/GriffinCanyon.java @@ -31,7 +31,7 @@ public final class GriffinCanyon extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {tap}: Untap target Griffin. If it's a creature, it gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GriffinCanyonEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GriffinCanyonEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrimBackwoods.java b/Mage.Sets/src/mage/cards/g/GrimBackwoods.java index eaa0ef8c84a..71fd095766c 100644 --- a/Mage.Sets/src/mage/cards/g/GrimBackwoods.java +++ b/Mage.Sets/src/mage/cards/g/GrimBackwoods.java @@ -28,7 +28,7 @@ public final class GrimBackwoods extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}{B}{G}, {tap}, Sacrifice a creature: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{B}{G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{B}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrimLavamancer.java b/Mage.Sets/src/mage/cards/g/GrimLavamancer.java index c9fb81b1001..04265a1dc32 100644 --- a/Mage.Sets/src/mage/cards/g/GrimLavamancer.java +++ b/Mage.Sets/src/mage/cards/g/GrimLavamancer.java @@ -33,7 +33,7 @@ public final class GrimLavamancer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, StaticFilters.FILTER_CARDS_FROM_YOUR_GRAVEYARD))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GrimMonolith.java b/Mage.Sets/src/mage/cards/g/GrimMonolith.java index 6992bdc77e7..85f99feffb0 100644 --- a/Mage.Sets/src/mage/cards/g/GrimMonolith.java +++ b/Mage.Sets/src/mage/cards/g/GrimMonolith.java @@ -29,7 +29,7 @@ public final class GrimMonolith extends CardImpl { // {tap}: Add {C}{C}{C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); // {4}: Untap Grim Monolith. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{4}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{4}"))); } private GrimMonolith(final GrimMonolith card) { diff --git a/Mage.Sets/src/mage/cards/g/GrimPoppet.java b/Mage.Sets/src/mage/cards/g/GrimPoppet.java index 8d365e8ee15..c55993e5700 100644 --- a/Mage.Sets/src/mage/cards/g/GrimPoppet.java +++ b/Mage.Sets/src/mage/cards/g/GrimPoppet.java @@ -41,7 +41,7 @@ public final class GrimPoppet extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(3)), "with three -1/-1 counters on it")); // Remove a -1/-1 counter from Grim Poppet: Put a -1/-1 counter on another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new RemoveCountersSourceCost(CounterType.M1M1.createInstance())); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new RemoveCountersSourceCost(CounterType.M1M1.createInstance())); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrimRoustabout.java b/Mage.Sets/src/mage/cards/g/GrimRoustabout.java index 3b6ac0f2850..78ddf63a063 100644 --- a/Mage.Sets/src/mage/cards/g/GrimRoustabout.java +++ b/Mage.Sets/src/mage/cards/g/GrimRoustabout.java @@ -32,7 +32,7 @@ public final class GrimRoustabout extends CardImpl { this.addAbility(new UnleashAbility()); // {1}{B}: Regenerate Grim Roustabout. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private GrimRoustabout(final GrimRoustabout card) { @@ -43,4 +43,4 @@ public final class GrimRoustabout extends CardImpl { public GrimRoustabout copy() { return new GrimRoustabout(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GrimclawBats.java b/Mage.Sets/src/mage/cards/g/GrimclawBats.java index 5490a53d474..e6fe63934e9 100644 --- a/Mage.Sets/src/mage/cards/g/GrimclawBats.java +++ b/Mage.Sets/src/mage/cards/g/GrimclawBats.java @@ -30,7 +30,7 @@ public final class GrimclawBats extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java b/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java index 129c70c2dfa..b462f8fddc2 100644 --- a/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java +++ b/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java @@ -52,7 +52,7 @@ public final class GrimgrinCorpseBorn extends CardImpl { this.addAbility(ability); // Sacrifice another creature: Untap Grimgrin and put a +1/+1 counter on it. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), + ability = new SimpleActivatedAbility(new UntapSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).setText("and put a +1/+1 counter on it")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java index 16c49734305..bbc81909820 100644 --- a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java +++ b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java @@ -55,7 +55,7 @@ public final class GrimlockDinobotLeader extends CardImpl{ // {2}: Grimlock, Dinobot Leader becomes Grimlock, Ferocious King. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{2}"))); } private GrimlockDinobotLeader(final GrimlockDinobotLeader card) { diff --git a/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java b/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java index b707016de20..f24ff1b75e6 100644 --- a/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java +++ b/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java @@ -38,7 +38,7 @@ public final class GrimlockFerociousKing extends CardImpl{ // {2}: Grimlock, Ferocious King becomes Grimlock, Dinobot Leader. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{2}"))); } private GrimlockFerociousKing(final GrimlockFerociousKing card) { diff --git a/Mage.Sets/src/mage/cards/g/Grindclock.java b/Mage.Sets/src/mage/cards/g/Grindclock.java index 878da99757d..4246a66cbb9 100644 --- a/Mage.Sets/src/mage/cards/g/Grindclock.java +++ b/Mage.Sets/src/mage/cards/g/Grindclock.java @@ -27,8 +27,8 @@ public final class Grindclock extends CardImpl { public Grindclock(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrindclockEffect(), new TapSourceCost()); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + Ability ability = new SimpleActivatedAbility(new GrindclockEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrindingStation.java b/Mage.Sets/src/mage/cards/g/GrindingStation.java index 5348d28dba6..42831fefeab 100644 --- a/Mage.Sets/src/mage/cards/g/GrindingStation.java +++ b/Mage.Sets/src/mage/cards/g/GrindingStation.java @@ -33,7 +33,7 @@ public final class GrindingStation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {T}, Sacrifice an artifact: Target player puts the top three cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(3), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/Griselbrand.java b/Mage.Sets/src/mage/cards/g/Griselbrand.java index 597294e2895..2e8330b0e07 100644 --- a/Mage.Sets/src/mage/cards/g/Griselbrand.java +++ b/Mage.Sets/src/mage/cards/g/Griselbrand.java @@ -32,7 +32,7 @@ public final class Griselbrand extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); // Pay 7 life: Draw seven cards. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(7), new PayLifeCost(7))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(7), new PayLifeCost(7))); } private Griselbrand(final Griselbrand card) { diff --git a/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java b/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java index ba31bdb3d15..60a4e8a6058 100644 --- a/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java +++ b/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java @@ -33,7 +33,7 @@ public final class GrislyAnglerfish extends CardImpl { this.nightCard = true; // {6}: Creatures your opponents control attack this turn if able. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrislyAnglerfishMustAttackEffect(), new ManaCostsImpl<>("{6}"))); + this.addAbility(new SimpleActivatedAbility(new GrislyAnglerfishMustAttackEffect(), new ManaCostsImpl<>("{6}"))); } private GrislyAnglerfish(final GrislyAnglerfish card) { diff --git a/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java b/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java index 81bed8ed437..c83d3ea0116 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java +++ b/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java @@ -32,11 +32,11 @@ public final class GrixisBattlemage extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}: Draw a card, then discard a card. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); + Ability ability1 = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); ability1.addCost(new TapSourceCost()); this.addAbility(ability1); // {R}, {tap}: Target creature can't block this turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability2 = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java index b39da86e115..56eb1fbc431 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java +++ b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java @@ -38,7 +38,7 @@ public final class GrixisPanorama extends CardImpl { this.addAbility(new ColorlessManaAbility()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrizzledAngler.java b/Mage.Sets/src/mage/cards/g/GrizzledAngler.java index ff7100a2bce..9b31af0fff7 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzledAngler.java +++ b/Mage.Sets/src/mage/cards/g/GrizzledAngler.java @@ -36,7 +36,7 @@ public final class GrizzledAngler extends CardImpl { // {T}: Put the top two cards of your library into your graveyard. Then if there is a colorless creature card in your graveyard, transform Grizzled Angler. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrizzledAnglerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GrizzledAnglerEffect(), new TapSourceCost())); } private GrizzledAngler(final GrizzledAngler card) { diff --git a/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java b/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java index d4610c7a0d8..cde46db7dc5 100644 --- a/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java +++ b/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java @@ -41,7 +41,7 @@ public final class GrotagSiegeRunner extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Grotag Siege-Runner: Destroy target creature with defender. Grotag Siege-Runner deals 2 damage to that creature's controller. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new DamageTargetControllerEffect(2)); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java b/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java index 878c7afec33..08b542e4887 100644 --- a/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java +++ b/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java @@ -38,7 +38,7 @@ public final class GrotesqueHybrid extends CardImpl { // Discard a card: Grotesque Hybrid gains flying and protection from green and from white until end of turn. Effect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("{this} gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(effect, new DiscardCardCost()); effect = new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.WHITE), Duration.EndOfTurn); effect.setText("and protection from green and from white until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GroundPounder.java b/Mage.Sets/src/mage/cards/g/GroundPounder.java index 7a733d6d0af..43ad540b5a2 100644 --- a/Mage.Sets/src/mage/cards/g/GroundPounder.java +++ b/Mage.Sets/src/mage/cards/g/GroundPounder.java @@ -35,7 +35,7 @@ public final class GroundPounder extends CardImpl { this.toughness = new MageInt(2); // 3G: Roll a six-sided die. Ground Pounder gets +X/+X until end of turn, where X is the result. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GroundPounderEffect(), new ManaCostsImpl<>("{3}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GroundPounderEffect(), new ManaCostsImpl<>("{3}{G}"))); // Whenever you roll a 5 or higher on a die, Ground Pounder gains trample until end of turn. this.addAbility(new GroundPounderTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java index b8898282e6f..d2623292303 100644 --- a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java @@ -38,7 +38,7 @@ public final class GroveOfTheGuardian extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new TapSourceCost())); // {3}{G}{W}, {T}, Tap two untapped creatures you control, Sacrifice Grove of the Guardian: Create an 8/8 green and white Elemental creature token with vigilance. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GreenAndWhiteElementalToken(), 1), new ManaCostsImpl<>("{3}{G}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GreenAndWhiteElementalToken(), 1), new ManaCostsImpl<>("{3}{G}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java b/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java index 966d42a469a..5df1f913f76 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java @@ -36,7 +36,7 @@ public final class GruesomeSlaughter extends CardImpl { // Until end of turn, colorless creatures you control gain "{T}: This creature deals damage equal to its power to target creature." Effect effect = new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE); effect.setText("{this} deals damage equal to its power to target creature."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); effect = new GainAbilityControlledEffect(ability, Duration.EndOfTurn, filter); effect.setText("Until end of turn, colorless creatures you control gain \"{T}: This creature deals damage equal to its power to target creature.\""); diff --git a/Mage.Sets/src/mage/cards/g/GruulCluestone.java b/Mage.Sets/src/mage/cards/g/GruulCluestone.java index 2a8a4ce978f..7fb84d99a0f 100644 --- a/Mage.Sets/src/mage/cards/g/GruulCluestone.java +++ b/Mage.Sets/src/mage/cards/g/GruulCluestone.java @@ -32,7 +32,7 @@ public final class GruulCluestone extends CardImpl { this.addAbility(new GreenManaAbility()); // {R}{G}, {T}, Sacrifice Gruul Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GruulGuildmage.java b/Mage.Sets/src/mage/cards/g/GruulGuildmage.java index 3069b48b543..1cba9e9ff53 100644 --- a/Mage.Sets/src/mage/cards/g/GruulGuildmage.java +++ b/Mage.Sets/src/mage/cards/g/GruulGuildmage.java @@ -37,12 +37,12 @@ public final class GruulGuildmage extends CardImpl { this.toughness = new MageInt(2); // {3}{R}, Sacrifice a land: Gruul Guildmage deals 2 damage to target player. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{R}")); + Ability firstAbility = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{R}")); firstAbility.addCost(new SacrificeTargetCost(filter)); firstAbility.addTarget(new TargetPlayerOrPlaneswalker(1)); this.addAbility(firstAbility); // {3}{G}: Target creature gets +2/+2 until end of turn. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); + Ability secondAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/g/GruulKeyrune.java b/Mage.Sets/src/mage/cards/g/GruulKeyrune.java index 3e720c257d8..2e440518a8a 100644 --- a/Mage.Sets/src/mage/cards/g/GruulKeyrune.java +++ b/Mage.Sets/src/mage/cards/g/GruulKeyrune.java @@ -31,7 +31,7 @@ public final class GruulKeyrune extends CardImpl { this.addAbility(new GreenManaAbility()); // {R}{G}: Gruul Keyrune becomes a 3/2 red and green Beast artifact creature with trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GruulKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new GruulKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}"))); } private GruulKeyrune(final GruulKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/g/GruulLocket.java b/Mage.Sets/src/mage/cards/g/GruulLocket.java index 1f175809a23..bdeed9f61f5 100644 --- a/Mage.Sets/src/mage/cards/g/GruulLocket.java +++ b/Mage.Sets/src/mage/cards/g/GruulLocket.java @@ -28,7 +28,7 @@ public final class GruulLocket extends CardImpl { this.addAbility(new GreenManaAbility()); // {R/G}{R/G}{R/G}{R/G}, {T}, Sacrifice Gruul Locket: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{R/G}{R/G}{R/G}{R/G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{R/G}{R/G}{R/G}{R/G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GruulNodorog.java b/Mage.Sets/src/mage/cards/g/GruulNodorog.java index edd20d6dbc0..2ef23e909b2 100644 --- a/Mage.Sets/src/mage/cards/g/GruulNodorog.java +++ b/Mage.Sets/src/mage/cards/g/GruulNodorog.java @@ -28,7 +28,7 @@ public final class GruulNodorog extends CardImpl { this.toughness = new MageInt(4); //{R}: Gruul Nodorog gains menace until end of turn. (It can't be blocked except by two or more creatures.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private GruulNodorog(final GruulNodorog card) { @@ -39,4 +39,4 @@ public final class GruulNodorog extends CardImpl { public GruulNodorog copy() { return new GruulNodorog(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java index 9a3f83eae89..13193e46909 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java @@ -30,7 +30,7 @@ public final class GruulWarPlow extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {1}{R}{G}: Gruul War Plow becomes a 4/4 Juggernaut artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GruulWarPlowToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new GruulWarPlowToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{G}"))); } private GruulWarPlow(final GruulWarPlow card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardDogs.java b/Mage.Sets/src/mage/cards/g/GuardDogs.java index c8cc0430beb..8548c0ea209 100644 --- a/Mage.Sets/src/mage/cards/g/GuardDogs.java +++ b/Mage.Sets/src/mage/cards/g/GuardDogs.java @@ -35,7 +35,7 @@ public final class GuardDogs extends CardImpl { this.toughness = new MageInt(2); // {2}{W}, {T}: Choose a permanent you control. Prevent all combat damage target creature would deal this turn if it shares a color with that permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GuardDogsEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new GuardDogsEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GuardianIdol.java b/Mage.Sets/src/mage/cards/g/GuardianIdol.java index 84661db89bf..5bd1ef5e986 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianIdol.java +++ b/Mage.Sets/src/mage/cards/g/GuardianIdol.java @@ -30,7 +30,7 @@ public final class GuardianIdol extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}: Guardian Idol becomes a 2/2 Golem artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GuardianIdolGolemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new GuardianIdolGolemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private GuardianIdol(final GuardianIdol card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java index cca4f6ed1a8..c2526bd84d7 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java @@ -39,7 +39,7 @@ public final class GuardianOfCloverdell extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(5); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinSoldierToken(), 3), false)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Gurzigost.java b/Mage.Sets/src/mage/cards/g/Gurzigost.java index 0ae0e58918e..e4a3d39e8af 100644 --- a/Mage.Sets/src/mage/cards/g/Gurzigost.java +++ b/Mage.Sets/src/mage/cards/g/Gurzigost.java @@ -45,7 +45,7 @@ public final class Gurzigost extends CardImpl { // {G}{G}, Discard a card: You may have Gurzigost assign its combat damage this turn as though it weren't blocked. Effect effect = new GainAbilitySourceEffect(DamageAsThoughNotBlockedAbility.getInstance(), Duration.EndOfTurn); effect.setText("You may have Gurzigost assign its combat damage this turn as though it weren't blocked"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{G}{G}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GustSkimmer.java b/Mage.Sets/src/mage/cards/g/GustSkimmer.java index 4bf75779035..1962479ae9b 100644 --- a/Mage.Sets/src/mage/cards/g/GustSkimmer.java +++ b/Mage.Sets/src/mage/cards/g/GustSkimmer.java @@ -26,7 +26,7 @@ public final class GustSkimmer extends CardImpl { this.subtype.add(SubType.INSECT); this.power = new MageInt(2); this.toughness = new MageInt(1); - 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 GustSkimmer(final GustSkimmer card) { diff --git a/Mage.Sets/src/mage/cards/g/GutlessGhoul.java b/Mage.Sets/src/mage/cards/g/GutlessGhoul.java index fae262ae226..e8ac916234d 100644 --- a/Mage.Sets/src/mage/cards/g/GutlessGhoul.java +++ b/Mage.Sets/src/mage/cards/g/GutlessGhoul.java @@ -31,7 +31,7 @@ public final class GutlessGhoul extends CardImpl { this.toughness = new MageInt(2); // {1}, Sacrifice a creature: You gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java b/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java index b6f658257b6..841d90bfda3 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java @@ -38,13 +38,13 @@ public final class GuulDrazAssassin extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}{B}"))); Abilities abilities1 = new AbilitiesImpl<>(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); abilities1.add(ability); Abilities abilities2 = new AbilitiesImpl<>(); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + Ability ability2 = new SimpleActivatedAbility(new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability2.addTarget(new TargetCreaturePermanent()); ability2.addCost(new TapSourceCost()); abilities2.add(ability2); -- 2.47.2 From 1252ccf21acd50e923ed79163de5aec74710d5c2 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:27:49 -0500 Subject: [PATCH 35/50] refactor: SimpleActivatedAbility default zone (cards H) --- Mage.Sets/src/mage/cards/h/HaazdaExonerator.java | 2 +- Mage.Sets/src/mage/cards/h/HaazdaShieldMate.java | 2 +- Mage.Sets/src/mage/cards/h/HagraSharpshooter.java | 2 +- Mage.Sets/src/mage/cards/h/HallOfStormGiants.java | 2 +- Mage.Sets/src/mage/cards/h/HallowedGround.java | 2 +- Mage.Sets/src/mage/cards/h/HammerMage.java | 2 +- Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java | 2 +- Mage.Sets/src/mage/cards/h/HammerfistGiant.java | 2 +- Mage.Sets/src/mage/cards/h/Hammerheim.java | 2 +- Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java | 2 +- Mage.Sets/src/mage/cards/h/HandOfJustice.java | 2 +- Mage.Sets/src/mage/cards/h/HangarbackWalker.java | 2 +- Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java | 2 +- Mage.Sets/src/mage/cards/h/HaplessResearcher.java | 2 +- Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java | 4 ++-- Mage.Sets/src/mage/cards/h/HarmattanEfreet.java | 2 +- Mage.Sets/src/mage/cards/h/HarpoonSniper.java | 2 +- Mage.Sets/src/mage/cards/h/HarshDeceiver.java | 2 +- Mage.Sets/src/mage/cards/h/HatchetBully.java | 2 +- Mage.Sets/src/mage/cards/h/HateWeaver.java | 2 +- Mage.Sets/src/mage/cards/h/Hateflayer.java | 2 +- Mage.Sets/src/mage/cards/h/HauntedCrossroads.java | 2 +- Mage.Sets/src/mage/cards/h/HavenOfTheSpiritDragon.java | 2 +- Mage.Sets/src/mage/cards/h/HavengulLich.java | 2 +- Mage.Sets/src/mage/cards/h/HavocSower.java | 2 +- Mage.Sets/src/mage/cards/h/HazduhrTheAbbot.java | 2 +- Mage.Sets/src/mage/cards/h/HazoretTheFervent.java | 2 +- Mage.Sets/src/mage/cards/h/HealersHeaddress.java | 4 ++-- Mage.Sets/src/mage/cards/h/HeapDoll.java | 2 +- Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java | 2 +- Mage.Sets/src/mage/cards/h/HeartWarden.java | 2 +- Mage.Sets/src/mage/cards/h/HearthKami.java | 2 +- Mage.Sets/src/mage/cards/h/HearthcageGiant.java | 2 +- Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java | 2 +- Mage.Sets/src/mage/cards/h/HeartwoodGiant.java | 2 +- Mage.Sets/src/mage/cards/h/HeavyArbalest.java | 2 +- Mage.Sets/src/mage/cards/h/HeavyBallista.java | 2 +- Mage.Sets/src/mage/cards/h/Hecatomb.java | 2 +- Mage.Sets/src/mage/cards/h/HedgeTroll.java | 2 +- Mage.Sets/src/mage/cards/h/HedronAlignment.java | 2 +- Mage.Sets/src/mage/cards/h/HedronArchive.java | 2 +- Mage.Sets/src/mage/cards/h/Heliophial.java | 2 +- Mage.Sets/src/mage/cards/h/HeliumSquirter.java | 2 +- Mage.Sets/src/mage/cards/h/HellBentRaider.java | 4 ++-- Mage.Sets/src/mage/cards/h/HellholeFlailer.java | 2 +- Mage.Sets/src/mage/cards/h/HellionCrucible.java | 4 ++-- Mage.Sets/src/mage/cards/h/HellkiteOverlord.java | 4 ++-- Mage.Sets/src/mage/cards/h/HelmOfChatzuk.java | 2 +- Mage.Sets/src/mage/cards/h/Helvault.java | 4 ++-- Mage.Sets/src/mage/cards/h/HematiteGolem.java | 2 +- Mage.Sets/src/mage/cards/h/HenchfiendOfUkor.java | 2 +- Mage.Sets/src/mage/cards/h/HengeGuardian.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java | 2 +- Mage.Sets/src/mage/cards/h/HerbalPoultice.java | 2 +- Mage.Sets/src/mage/cards/h/HermeticStudy.java | 2 +- Mage.Sets/src/mage/cards/h/HeroesBane.java | 2 +- Mage.Sets/src/mage/cards/h/Heroism.java | 2 +- Mage.Sets/src/mage/cards/h/HexParasite.java | 2 +- Mage.Sets/src/mage/cards/h/HibernationSliver.java | 2 +- Mage.Sets/src/mage/cards/h/HiddenRetreat.java | 2 +- Mage.Sets/src/mage/cards/h/HighMarket.java | 2 +- Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java | 2 +- Mage.Sets/src/mage/cards/h/HightideHermit.java | 2 +- Mage.Sets/src/mage/cards/h/HigureTheStillWind.java | 2 +- Mage.Sets/src/mage/cards/h/HiredTorturer.java | 2 +- Mage.Sets/src/mage/cards/h/HissingQuagmire.java | 2 +- Mage.Sets/src/mage/cards/h/HithlainRope.java | 4 ++-- Mage.Sets/src/mage/cards/h/HoarShade.java | 2 +- Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java | 4 ++-- Mage.Sets/src/mage/cards/h/HolisticWisdom.java | 2 +- Mage.Sets/src/mage/cards/h/HolyArmor.java | 2 +- Mage.Sets/src/mage/cards/h/HomaridShaman.java | 2 +- Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java | 2 +- Mage.Sets/src/mage/cards/h/HomaridWarrior.java | 2 +- Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java | 2 +- Mage.Sets/src/mage/cards/h/HonorGuard.java | 2 +- Mage.Sets/src/mage/cards/h/HoodedKavu.java | 2 +- Mage.Sets/src/mage/cards/h/HoofSkulkin.java | 2 +- Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java | 2 +- Mage.Sets/src/mage/cards/h/HopeTender.java | 4 ++-- Mage.Sets/src/mage/cards/h/HordeOfNotions.java | 2 +- Mage.Sets/src/mage/cards/h/HorizonCanopy.java | 2 +- Mage.Sets/src/mage/cards/h/HornOfDeafening.java | 2 +- Mage.Sets/src/mage/cards/h/HornedHelm.java | 2 +- Mage.Sets/src/mage/cards/h/HornedTroll.java | 2 +- Mage.Sets/src/mage/cards/h/HornetCannon.java | 2 +- Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java | 2 +- Mage.Sets/src/mage/cards/h/HorseshoeCrab.java | 2 +- Mage.Sets/src/mage/cards/h/HostileDesert.java | 2 +- Mage.Sets/src/mage/cards/h/HostileRealm.java | 2 +- Mage.Sets/src/mage/cards/h/HotSprings.java | 2 +- Mage.Sets/src/mage/cards/h/HuntedTroll.java | 2 +- Mage.Sets/src/mage/cards/h/HuntingKavu.java | 2 +- Mage.Sets/src/mage/cards/h/HurrJackal.java | 2 +- Mage.Sets/src/mage/cards/h/HyalopterousLemure.java | 2 +- Mage.Sets/src/mage/cards/h/HydromorphGuardian.java | 2 +- Mage.Sets/src/mage/cards/h/HydromorphGull.java | 2 +- Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java | 2 +- Mage.Sets/src/mage/cards/h/HypervoltGrasp.java | 4 ++-- Mage.Sets/src/mage/cards/h/Hypochondria.java | 4 ++-- 100 files changed, 111 insertions(+), 111 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java b/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java index c8afe33639b..4d3fb00e01a 100644 --- a/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java +++ b/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java @@ -35,7 +35,7 @@ public final class HaazdaExonerator extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HaazdaShieldMate.java b/Mage.Sets/src/mage/cards/h/HaazdaShieldMate.java index ec8d00b3833..3fb2048ceac 100644 --- a/Mage.Sets/src/mage/cards/h/HaazdaShieldMate.java +++ b/Mage.Sets/src/mage/cards/h/HaazdaShieldMate.java @@ -32,7 +32,7 @@ public final class HaazdaShieldMate extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{W}")))); // {W}: The next time a source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private HaazdaShieldMate(final HaazdaShieldMate card) { diff --git a/Mage.Sets/src/mage/cards/h/HagraSharpshooter.java b/Mage.Sets/src/mage/cards/h/HagraSharpshooter.java index 22aa3dad5a0..ce7b4e2909a 100644 --- a/Mage.Sets/src/mage/cards/h/HagraSharpshooter.java +++ b/Mage.Sets/src/mage/cards/h/HagraSharpshooter.java @@ -30,7 +30,7 @@ public final class HagraSharpshooter extends CardImpl { this.toughness = new MageInt(2); // {4}{B}: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HallOfStormGiants.java b/Mage.Sets/src/mage/cards/h/HallOfStormGiants.java index aba2c2e2d30..40150e6404e 100644 --- a/Mage.Sets/src/mage/cards/h/HallOfStormGiants.java +++ b/Mage.Sets/src/mage/cards/h/HallOfStormGiants.java @@ -45,7 +45,7 @@ public final class HallOfStormGiants extends CardImpl { this.addAbility(new BlueManaAbility()); // {5}{U}: Until end of turn, Hall of Storm Giants becomes a 7/7 blue Giant creature with ward {3}. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(7, 7, "7/7 blue Giant creature with ward {3}") .withColor("U") .withSubType(SubType.GIANT) diff --git a/Mage.Sets/src/mage/cards/h/HallowedGround.java b/Mage.Sets/src/mage/cards/h/HallowedGround.java index e47899d59ac..614806f05ef 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedGround.java +++ b/Mage.Sets/src/mage/cards/h/HallowedGround.java @@ -32,7 +32,7 @@ public final class HallowedGround extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); // {W}{W}: Return target nonsnow land you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HammerMage.java b/Mage.Sets/src/mage/cards/h/HammerMage.java index 0ead20826ad..8bbbcb9e6a4 100644 --- a/Mage.Sets/src/mage/cards/h/HammerMage.java +++ b/Mage.Sets/src/mage/cards/h/HammerMage.java @@ -33,7 +33,7 @@ public final class HammerMage extends CardImpl { this.toughness = new MageInt(1); // {X}{R}, {tap}, Discard a card: Destroy all artifacts with converted mana cost X or less. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HammerMageEffect(), new ManaCostsImpl<>("{X}{R}")); + Ability ability = new SimpleActivatedAbility(new HammerMageEffect(), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java index 157c1599be8..5d436eeeba0 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java @@ -37,7 +37,7 @@ public final class HammerOfPurphoros extends CardImpl { new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {2}{R}, {tap}, Sacrifice a land: Create a 3/3 colorless Golem enchantment artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HammerOfPurphorosGolemToken()), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new HammerOfPurphorosGolemToken()), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HammerfistGiant.java b/Mage.Sets/src/mage/cards/h/HammerfistGiant.java index 98241c2cb8a..972f3861912 100644 --- a/Mage.Sets/src/mage/cards/h/HammerfistGiant.java +++ b/Mage.Sets/src/mage/cards/h/HammerfistGiant.java @@ -36,7 +36,7 @@ public final class HammerfistGiant extends CardImpl { this.toughness = new MageInt(4); // {tap}: Hammerfist Giant deals 4 damage to each creature without flying and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(4, filter), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageEverythingEffect(4, filter), new TapSourceCost())); } private HammerfistGiant(final HammerfistGiant card) { diff --git a/Mage.Sets/src/mage/cards/h/Hammerheim.java b/Mage.Sets/src/mage/cards/h/Hammerheim.java index 3199302528a..2be6edc368a 100644 --- a/Mage.Sets/src/mage/cards/h/Hammerheim.java +++ b/Mage.Sets/src/mage/cards/h/Hammerheim.java @@ -38,7 +38,7 @@ public final class Hammerheim extends CardImpl { this.addAbility(new RedManaAbility()); // {tap}: Target creature loses all landwalk abilities until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HammerheimEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new HammerheimEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java b/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java index f3419702820..b0b9a81407d 100644 --- a/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java +++ b/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java @@ -38,7 +38,7 @@ public final class HanSoloScrumrat extends CardImpl { this.addAbility(new PartnerWithAbility("Chewbacca, the Beast")); // R: Han Solo, Scrumrat gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // Whenever Han Solo, Scrumrat deals damage during your turn, put a +1/+1 counter on another target creature you control. Ability ability = new HanSoloScrumratTriggeredAbility(); diff --git a/Mage.Sets/src/mage/cards/h/HandOfJustice.java b/Mage.Sets/src/mage/cards/h/HandOfJustice.java index fe642b84c75..251edadb036 100644 --- a/Mage.Sets/src/mage/cards/h/HandOfJustice.java +++ b/Mage.Sets/src/mage/cards/h/HandOfJustice.java @@ -40,7 +40,7 @@ public final class HandOfJustice extends CardImpl { this.toughness = new MageInt(6); // {tap}, Tap three untapped white creatures you control: Destroy target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HangarbackWalker.java b/Mage.Sets/src/mage/cards/h/HangarbackWalker.java index 79f9056b4fe..0716ee526dc 100644 --- a/Mage.Sets/src/mage/cards/h/HangarbackWalker.java +++ b/Mage.Sets/src/mage/cards/h/HangarbackWalker.java @@ -40,7 +40,7 @@ public final class HangarbackWalker extends CardImpl { this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken(), new CountersSourceCount(CounterType.P1P1)), false)); // {1}, {t}: Put a +1/+1 counter on Hangarback Walker. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java b/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java index a18290fdf3f..db307fa57c3 100644 --- a/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java +++ b/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java @@ -42,7 +42,7 @@ public final class HannaShipsNavigator extends CardImpl { this.toughness = new MageInt(2); // {1}{W}{U}, {tap}: Return target artifact or enchantment card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{1}{W}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{1}{W}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HaplessResearcher.java b/Mage.Sets/src/mage/cards/h/HaplessResearcher.java index 134a75bae17..22ab481a5f7 100644 --- a/Mage.Sets/src/mage/cards/h/HaplessResearcher.java +++ b/Mage.Sets/src/mage/cards/h/HaplessResearcher.java @@ -27,7 +27,7 @@ public final class HaplessResearcher extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Hapless Researcher: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new SacrificeSourceCost())); } private HaplessResearcher(final HaplessResearcher card) { diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java b/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java index 768784f4a12..02113fb2424 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java @@ -42,10 +42,10 @@ public final class HarbingerOfTheHunt extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}{R}: Harbinger of the Hunt deals 1 damage to each creature without flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new ManaCostsImpl<>("{2}{R}"))); // {2}{G}: Harbinger of the Hunt deals 1 damage to each other creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter2), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter2), new ManaCostsImpl<>("{2}{G}"))); } private HarbingerOfTheHunt(final HarbingerOfTheHunt card) { diff --git a/Mage.Sets/src/mage/cards/h/HarmattanEfreet.java b/Mage.Sets/src/mage/cards/h/HarmattanEfreet.java index f882a343749..b382be9e48b 100644 --- a/Mage.Sets/src/mage/cards/h/HarmattanEfreet.java +++ b/Mage.Sets/src/mage/cards/h/HarmattanEfreet.java @@ -32,7 +32,7 @@ public final class HarmattanEfreet extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // // {1}{U}{U}: Target creature gains flying until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HarpoonSniper.java b/Mage.Sets/src/mage/cards/h/HarpoonSniper.java index 20724f5b73e..aa7fce28462 100644 --- a/Mage.Sets/src/mage/cards/h/HarpoonSniper.java +++ b/Mage.Sets/src/mage/cards/h/HarpoonSniper.java @@ -37,7 +37,7 @@ public final class HarpoonSniper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)) .setText("{this} deals X damage to target attacking or blocking creature, where X is the number of Merfolk you control"), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HarshDeceiver.java b/Mage.Sets/src/mage/cards/h/HarshDeceiver.java index 6bdee22add5..b8c880e776b 100644 --- a/Mage.Sets/src/mage/cards/h/HarshDeceiver.java +++ b/Mage.Sets/src/mage/cards/h/HarshDeceiver.java @@ -40,7 +40,7 @@ public final class HarshDeceiver extends CardImpl { this.toughness = new MageInt(4); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, untap {this} and it gets +1/+1 until end of turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new HarshDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/h/HatchetBully.java b/Mage.Sets/src/mage/cards/h/HatchetBully.java index 0c9f3d58fec..4c753e09863 100644 --- a/Mage.Sets/src/mage/cards/h/HatchetBully.java +++ b/Mage.Sets/src/mage/cards/h/HatchetBully.java @@ -38,7 +38,7 @@ public final class HatchetBully extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, {tap}, Put a -1/-1 counter on a creature you control: Hatchet Bully deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HatchetBullyEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new HatchetBullyEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new HatchetBullyCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/h/HateWeaver.java b/Mage.Sets/src/mage/cards/h/HateWeaver.java index d1d9fb8c662..feccdddab81 100644 --- a/Mage.Sets/src/mage/cards/h/HateWeaver.java +++ b/Mage.Sets/src/mage/cards/h/HateWeaver.java @@ -40,7 +40,7 @@ public final class HateWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/Hateflayer.java b/Mage.Sets/src/mage/cards/h/Hateflayer.java index e05765c529d..126db699469 100644 --- a/Mage.Sets/src/mage/cards/h/Hateflayer.java +++ b/Mage.Sets/src/mage/cards/h/Hateflayer.java @@ -34,7 +34,7 @@ public final class Hateflayer extends CardImpl { this.addAbility(WitherAbility.getInstance()); // {2}{R}, {untap}: Hateflayer deals damage equal to its power to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("{this} deals damage equal to its power to any target"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/h/HauntedCrossroads.java b/Mage.Sets/src/mage/cards/h/HauntedCrossroads.java index a2579735506..1765fe1167e 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedCrossroads.java +++ b/Mage.Sets/src/mage/cards/h/HauntedCrossroads.java @@ -23,7 +23,7 @@ public final class HauntedCrossroads extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // {B}: Put target creature 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.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HavenOfTheSpiritDragon.java b/Mage.Sets/src/mage/cards/h/HavenOfTheSpiritDragon.java index e7eb164b333..81469e0d14e 100644 --- a/Mage.Sets/src/mage/cards/h/HavenOfTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/h/HavenOfTheSpiritDragon.java @@ -50,7 +50,7 @@ public final class HavenOfTheSpiritDragon extends CardImpl { this.addAbility(new ConditionalAnyColorManaAbility(new TapSourceCost(), 1, new HavenOfTheSpiritManaBuilder(), true)); // {2}, {T}, Sacrifice Haven of the Spirit Dragon: Return target Dragon creature card or Ugin planeswalker card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/cards/h/HavengulLich.java b/Mage.Sets/src/mage/cards/h/HavengulLich.java index e71f6511da7..134cb4cc184 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulLich.java +++ b/Mage.Sets/src/mage/cards/h/HavengulLich.java @@ -38,7 +38,7 @@ public final class HavengulLich extends CardImpl { this.toughness = new MageInt(4); // {1}: You may cast target creature card in a graveyard this turn. When you cast that card this turn, Havengul Lich gains all activated abilities of that card until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HavengulLichPlayEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new HavengulLichPlayEffect(), new ManaCostsImpl<>("{1}")); ability.addEffect(new HavengulLichPlayedEffect()); ability.addTarget(new TargetCardInGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HavocSower.java b/Mage.Sets/src/mage/cards/h/HavocSower.java index 33bc8690ea2..ca8ec7e9bfb 100644 --- a/Mage.Sets/src/mage/cards/h/HavocSower.java +++ b/Mage.Sets/src/mage/cards/h/HavocSower.java @@ -30,7 +30,7 @@ public final class HavocSower extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // {1}{C}: Havoc Sower gets +2/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{C}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{C}"))); } private HavocSower(final HavocSower card) { diff --git a/Mage.Sets/src/mage/cards/h/HazduhrTheAbbot.java b/Mage.Sets/src/mage/cards/h/HazduhrTheAbbot.java index 784150b7027..cc5bae4eb23 100644 --- a/Mage.Sets/src/mage/cards/h/HazduhrTheAbbot.java +++ b/Mage.Sets/src/mage/cards/h/HazduhrTheAbbot.java @@ -43,7 +43,7 @@ public final class HazduhrTheAbbot extends CardImpl { this.toughness = new MageInt(5); // {X}, {T}: The next X damage that would be dealt this turn to target white creature you control is dealt to Hazduhr the Abbot instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HazduhrTheAbbotRedirectDamageEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new HazduhrTheAbbotRedirectDamageEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java b/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java index e38ec8263b1..b511029b58c 100644 --- a/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java +++ b/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java @@ -48,7 +48,7 @@ public final class HazoretTheFervent extends CardImpl { .setText("{this} can't attack or block unless you have one or fewer cards in hand"))); // {2}{R}, Discard a card: Hazoret deals 2 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(2, TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(2, TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java index e8648c7e4ae..cc46c81c0ac 100644 --- a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java +++ b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java @@ -36,7 +36,7 @@ public final class HealersHeaddress extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +0/+2 and has "{tap}: Prevent the next 1 damage that would be dealt to any target this turn." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); gainAbility.addTarget(new TargetAnyTarget()); Effect effect = new BoostEquippedEffect(0, 2); effect.setText("Equipped creature gets +0/+2"); @@ -46,7 +46,7 @@ public final class HealersHeaddress extends CardImpl { ability.addEffect(effect); this.addAbility(ability); // {W}{W}: Attach Healer's Headdress to target creature you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{W}{W}")); + ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{W}{W}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/h/HeapDoll.java b/Mage.Sets/src/mage/cards/h/HeapDoll.java index e09c80e3ddb..b47516075b7 100644 --- a/Mage.Sets/src/mage/cards/h/HeapDoll.java +++ b/Mage.Sets/src/mage/cards/h/HeapDoll.java @@ -27,7 +27,7 @@ public final class HeapDoll extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Heap Doll: Exile target card from a graveyard. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new SacrificeSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new ExileTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java b/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java index bc5ff9b0df6..8503fe3e190 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java @@ -42,7 +42,7 @@ public final class HeartOfYavimaya extends CardImpl { this.addAbility(new GreenManaAbility()); // {tap}: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1,Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1,1,Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HeartWarden.java b/Mage.Sets/src/mage/cards/h/HeartWarden.java index 97476f1aa49..551b0717911 100644 --- a/Mage.Sets/src/mage/cards/h/HeartWarden.java +++ b/Mage.Sets/src/mage/cards/h/HeartWarden.java @@ -32,7 +32,7 @@ public final class HeartWarden extends CardImpl { // {tap}: Add {G}. this.addAbility(new GreenManaAbility()); // {2}, Sacrifice Heart Warden: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HearthKami.java b/Mage.Sets/src/mage/cards/h/HearthKami.java index c09637d73a0..61df708d348 100644 --- a/Mage.Sets/src/mage/cards/h/HearthKami.java +++ b/Mage.Sets/src/mage/cards/h/HearthKami.java @@ -36,7 +36,7 @@ public final class HearthKami extends CardImpl { this.toughness = new MageInt(1); // {X}, Sacrifice Hearth Kami: Destroy target artifact with converted mana cost X. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(new XManaValueTargetAdjuster()); diff --git a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java index 251ed7f5505..dc2d93b9588 100644 --- a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java +++ b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java @@ -47,7 +47,7 @@ public final class HearthcageGiant extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken(), 2), false)); //Sacrifice an Elemental: Target Giant creature gets +3/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 1, Duration.EndOfTurn), new SacrificeTargetCost(filterElemental)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(3, 1, Duration.EndOfTurn), new SacrificeTargetCost(filterElemental)); ability.addTarget(new TargetCreaturePermanent(filterGiant)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java b/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java index 382ae94e745..2da4c7b8561 100644 --- a/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java +++ b/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java @@ -28,7 +28,7 @@ public final class HeartlessHidetsugu extends CardImpl { this.toughness = new MageInt(3); // {tap}: Heartless Hidetsugu deals damage to each player equal to half that player's life total, rounded down. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new HeartlessHidetsuguDamageEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new HeartlessHidetsuguDamageEffect(), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java b/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java index 4e7ff0ba23e..d24b7395c06 100644 --- a/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java +++ b/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java @@ -35,7 +35,7 @@ public final class HeartwoodGiant extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java index 16ff458c06c..401034859b5 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java +++ b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java @@ -40,7 +40,7 @@ public final class HeavyArbalest extends CardImpl { this.addAbility(new SimpleStaticAbility(new HeavyArbalestEffect())); // Equipped creature has "{T}: This creature deals 2 damage to any target." - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability2.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/h/HeavyBallista.java b/Mage.Sets/src/mage/cards/h/HeavyBallista.java index 6e41891d0b8..685a4415d5a 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyBallista.java +++ b/Mage.Sets/src/mage/cards/h/HeavyBallista.java @@ -29,7 +29,7 @@ public final class HeavyBallista extends CardImpl { this.toughness = new MageInt(3); // {tap}: Heavy Ballista deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/Hecatomb.java b/Mage.Sets/src/mage/cards/h/Hecatomb.java index ae7cdcbbcef..f4984617ff1 100644 --- a/Mage.Sets/src/mage/cards/h/Hecatomb.java +++ b/Mage.Sets/src/mage/cards/h/Hecatomb.java @@ -46,7 +46,7 @@ public final class Hecatomb extends CardImpl { .withRuleTextReplacement(false)); // Tap an untapped Swamp you control: Hecatomb deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true))); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HedgeTroll.java b/Mage.Sets/src/mage/cards/h/HedgeTroll.java index 21afffa2b29..2bfd1fcd729 100644 --- a/Mage.Sets/src/mage/cards/h/HedgeTroll.java +++ b/Mage.Sets/src/mage/cards/h/HedgeTroll.java @@ -38,7 +38,7 @@ public final class HedgeTroll extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {W}: Regenerate Hedge Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); } private HedgeTroll(final HedgeTroll card) { diff --git a/Mage.Sets/src/mage/cards/h/HedronAlignment.java b/Mage.Sets/src/mage/cards/h/HedronAlignment.java index 747045251bc..bb0339d9e31 100644 --- a/Mage.Sets/src/mage/cards/h/HedronAlignment.java +++ b/Mage.Sets/src/mage/cards/h/HedronAlignment.java @@ -37,7 +37,7 @@ public final class HedronAlignment extends CardImpl { // At the beginning of your upkeep, you may reveal your hand. If you do, you win the game if you own a card named Hedron Alignment in exile, in your hand, in your graveyard, and on the battlefield. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new HedronAlignmentEffect(), true)); // {1}{U}: Scry 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1, false), new ManaCostsImpl<>("{1}{U}"))); } private HedronAlignment(final HedronAlignment card) { diff --git a/Mage.Sets/src/mage/cards/h/HedronArchive.java b/Mage.Sets/src/mage/cards/h/HedronArchive.java index 3187f710db0..53977d23809 100644 --- a/Mage.Sets/src/mage/cards/h/HedronArchive.java +++ b/Mage.Sets/src/mage/cards/h/HedronArchive.java @@ -28,7 +28,7 @@ public final class HedronArchive extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(2), new TapSourceCost())); // {2}, {T}, Sacrifice Hedron Archive: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/Heliophial.java b/Mage.Sets/src/mage/cards/h/Heliophial.java index 70e5b96803f..0c52ee33da0 100644 --- a/Mage.Sets/src/mage/cards/h/Heliophial.java +++ b/Mage.Sets/src/mage/cards/h/Heliophial.java @@ -31,7 +31,7 @@ public final class Heliophial extends CardImpl { // {2}, Sacrifice Heliophial: Heliophial deals damage equal to the number of charge counters on it to any target. Effect effect = new DamageTargetEffect(new CountersSourceCount(CounterType.CHARGE)); effect.setText("it deals damage equal to the number of charge counters on it to any target"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HeliumSquirter.java b/Mage.Sets/src/mage/cards/h/HeliumSquirter.java index 8598b428a35..edb6b49f36e 100644 --- a/Mage.Sets/src/mage/cards/h/HeliumSquirter.java +++ b/Mage.Sets/src/mage/cards/h/HeliumSquirter.java @@ -35,7 +35,7 @@ public final class HeliumSquirter extends CardImpl { this.addAbility(new GraftAbility(this, 3)); // {1}: Target creature with a +1/+1 counter on it gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HellBentRaider.java b/Mage.Sets/src/mage/cards/h/HellBentRaider.java index 91fe9c8e636..7e60b0e8ad5 100644 --- a/Mage.Sets/src/mage/cards/h/HellBentRaider.java +++ b/Mage.Sets/src/mage/cards/h/HellBentRaider.java @@ -36,7 +36,7 @@ public final class HellBentRaider extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Discard a card at random: Hell-Bent Raider gains protection from white until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new DiscardCardCost(true)); this.addAbility(ability); @@ -50,4 +50,4 @@ public final class HellBentRaider extends CardImpl { public HellBentRaider copy() { return new HellBentRaider(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/h/HellholeFlailer.java b/Mage.Sets/src/mage/cards/h/HellholeFlailer.java index 9472e19cb54..3eb48afa8d3 100644 --- a/Mage.Sets/src/mage/cards/h/HellholeFlailer.java +++ b/Mage.Sets/src/mage/cards/h/HellholeFlailer.java @@ -36,7 +36,7 @@ public final class HellholeFlailer extends CardImpl { this.addAbility(new UnleashAbility()); // {2}{B}{R}, Sacrifice Hellhole Flailer: Hellhole Flailer deals damage equal to its power to target player or planeswalker. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("{this} deals damage equal to its power to target player or planeswalker"), new ManaCostsImpl<>("{2}{B}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HellionCrucible.java b/Mage.Sets/src/mage/cards/h/HellionCrucible.java index 39eeacdfa96..0ae37b61e69 100644 --- a/Mage.Sets/src/mage/cards/h/HellionCrucible.java +++ b/Mage.Sets/src/mage/cards/h/HellionCrucible.java @@ -31,12 +31,12 @@ public final class HellionCrucible extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{R}, {tap}: Put a pressure counter on Hellion Crucible. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.PRESSURE.createInstance()), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.PRESSURE.createInstance()), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}{R}, {tap}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionToken(true), 1), new ManaCostsImpl<>("{1}{R}")); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new HellionToken(true), 1), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.PRESSURE.createInstance(2))); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HellkiteOverlord.java b/Mage.Sets/src/mage/cards/h/HellkiteOverlord.java index 4d6858aecb2..c4e6291c9bc 100644 --- a/Mage.Sets/src/mage/cards/h/HellkiteOverlord.java +++ b/Mage.Sets/src/mage/cards/h/HellkiteOverlord.java @@ -34,8 +34,8 @@ public final class HellkiteOverlord extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{G}"))); } private HellkiteOverlord(final HellkiteOverlord card) { diff --git a/Mage.Sets/src/mage/cards/h/HelmOfChatzuk.java b/Mage.Sets/src/mage/cards/h/HelmOfChatzuk.java index 1ec0552d206..774c23b6ede 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfChatzuk.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfChatzuk.java @@ -25,7 +25,7 @@ public final class HelmOfChatzuk extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, {T}: Target creature gains banding until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/Helvault.java b/Mage.Sets/src/mage/cards/h/Helvault.java index 44063085919..2e5d365b095 100644 --- a/Mage.Sets/src/mage/cards/h/Helvault.java +++ b/Mage.Sets/src/mage/cards/h/Helvault.java @@ -27,13 +27,13 @@ public final class Helvault extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {1}, {T}: Exile target creature you control. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(1)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new ExileTargetForSourceEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // {7}, {T}: Exile target creature you don't control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(7)); + ability = new SimpleActivatedAbility(new ExileTargetForSourceEffect(), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HematiteGolem.java b/Mage.Sets/src/mage/cards/h/HematiteGolem.java index 0228fd11cf0..33d496be089 100644 --- a/Mage.Sets/src/mage/cards/h/HematiteGolem.java +++ b/Mage.Sets/src/mage/cards/h/HematiteGolem.java @@ -26,7 +26,7 @@ public final class HematiteGolem extends CardImpl { this.toughness = new MageInt(4); // {1}{R}: Hematite Golem gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private HematiteGolem(final HematiteGolem card) { diff --git a/Mage.Sets/src/mage/cards/h/HenchfiendOfUkor.java b/Mage.Sets/src/mage/cards/h/HenchfiendOfUkor.java index ff5c726faff..89f678138f5 100644 --- a/Mage.Sets/src/mage/cards/h/HenchfiendOfUkor.java +++ b/Mage.Sets/src/mage/cards/h/HenchfiendOfUkor.java @@ -34,7 +34,7 @@ public final class HenchfiendOfUkor extends CardImpl { this.addAbility(new EchoAbility("{1}{B}")); // {BR}: Henchfiend of Ukor gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B/R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B/R}"))); } private HenchfiendOfUkor(final HenchfiendOfUkor card) { diff --git a/Mage.Sets/src/mage/cards/h/HengeGuardian.java b/Mage.Sets/src/mage/cards/h/HengeGuardian.java index 4faaf7322ee..176acad0c3b 100644 --- a/Mage.Sets/src/mage/cards/h/HengeGuardian.java +++ b/Mage.Sets/src/mage/cards/h/HengeGuardian.java @@ -29,7 +29,7 @@ public final class HengeGuardian extends CardImpl { this.toughness = new MageInt(4); // {2}: Henge Guardian gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private HengeGuardian(final HengeGuardian card) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java b/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java index 48269309fce..700e9922060 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java @@ -40,7 +40,7 @@ public final class HeraldOfAnguish extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT))); // {1}{B}, Sacrifice an artifact: Target creature gets -2/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HerbalPoultice.java b/Mage.Sets/src/mage/cards/h/HerbalPoultice.java index 5eb4c26182c..7be75c24a38 100644 --- a/Mage.Sets/src/mage/cards/h/HerbalPoultice.java +++ b/Mage.Sets/src/mage/cards/h/HerbalPoultice.java @@ -21,7 +21,7 @@ public final class HerbalPoultice extends CardImpl { public HerbalPoultice(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new GenericManaCost(3)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HermeticStudy.java b/Mage.Sets/src/mage/cards/h/HermeticStudy.java index 70efb6bdb96..2096fb8b4da 100644 --- a/Mage.Sets/src/mage/cards/h/HermeticStudy.java +++ b/Mage.Sets/src/mage/cards/h/HermeticStudy.java @@ -38,7 +38,7 @@ public final class HermeticStudy extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to any target." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); diff --git a/Mage.Sets/src/mage/cards/h/HeroesBane.java b/Mage.Sets/src/mage/cards/h/HeroesBane.java index 44204c0e184..0443f1a4fa9 100644 --- a/Mage.Sets/src/mage/cards/h/HeroesBane.java +++ b/Mage.Sets/src/mage/cards/h/HeroesBane.java @@ -36,7 +36,7 @@ public final class HeroesBane extends CardImpl { // {2}{G}{G}: Put X +1/+1 counters on Heroe's Bane, where X is its power. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), SourcePermanentPowerValue.NOT_NEGATIVE, true); effect.setText("Put X +1/+1 counters on {this}, where X is its power"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{G}{G}"))); } private HeroesBane(final HeroesBane card) { diff --git a/Mage.Sets/src/mage/cards/h/Heroism.java b/Mage.Sets/src/mage/cards/h/Heroism.java index a37ac200096..12506d9e124 100644 --- a/Mage.Sets/src/mage/cards/h/Heroism.java +++ b/Mage.Sets/src/mage/cards/h/Heroism.java @@ -42,7 +42,7 @@ public final class Heroism extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Sacrifice a white creature: For each attacking red creature, prevent all combat damage that would be dealt by that creature this turn unless its controller pays {2}{R}. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new HeroismEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new HeroismEffect(), new SacrificeTargetCost(filter))); } private Heroism(final Heroism card) { diff --git a/Mage.Sets/src/mage/cards/h/HexParasite.java b/Mage.Sets/src/mage/cards/h/HexParasite.java index d4d4f2e3be2..3013430cfd8 100644 --- a/Mage.Sets/src/mage/cards/h/HexParasite.java +++ b/Mage.Sets/src/mage/cards/h/HexParasite.java @@ -31,7 +31,7 @@ public final class HexParasite extends CardImpl { this.toughness = new MageInt(1); // {X}{B/P}: Remove up to X counters from target permanent. For each counter removed this way, Hex Parasite gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HexParasiteEffect(), new ManaCostsImpl<>("{X}{B/P}")); + Ability ability = new SimpleActivatedAbility(new HexParasiteEffect(), new ManaCostsImpl<>("{X}{B/P}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HibernationSliver.java b/Mage.Sets/src/mage/cards/h/HibernationSliver.java index 51dc7c47493..7e6c46ef780 100644 --- a/Mage.Sets/src/mage/cards/h/HibernationSliver.java +++ b/Mage.Sets/src/mage/cards/h/HibernationSliver.java @@ -34,7 +34,7 @@ public final class HibernationSliver extends CardImpl { // All Slivers have "Pay 2 life: Return this permanent to its owner's hand." Effect effect = new ReturnToHandSourceEffect(true); effect.setText("Return this permanent to its owner's hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new PayLifeCost(2)); + Ability ability = new SimpleActivatedAbility(effect, new PayLifeCost(2)); this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterPermanent(SubType.SLIVER, "All Slivers"), "All Slivers have \"Pay 2 life: Return this permanent to its owner's hand.\""))); diff --git a/Mage.Sets/src/mage/cards/h/HiddenRetreat.java b/Mage.Sets/src/mage/cards/h/HiddenRetreat.java index ec209859432..c2e56e51fe5 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenRetreat.java +++ b/Mage.Sets/src/mage/cards/h/HiddenRetreat.java @@ -26,7 +26,7 @@ public class HiddenRetreat extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); //Put a card from your hand on top of your library: Prevent all damage that would be dealt by target instant or sorcery spell this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HiddenRetreatEffect(), new PutCardFromHandOnTopOfLibraryCost()); + Ability ability = new SimpleActivatedAbility(new HiddenRetreatEffect(), new PutCardFromHandOnTopOfLibraryCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HighMarket.java b/Mage.Sets/src/mage/cards/h/HighMarket.java index fcd53cc36f3..ba1bb961766 100644 --- a/Mage.Sets/src/mage/cards/h/HighMarket.java +++ b/Mage.Sets/src/mage/cards/h/HighMarket.java @@ -27,7 +27,7 @@ public final class HighMarket extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {tap}, Sacrifice a creature: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java index 3bb6ec9511c..e2c7fb3a631 100644 --- a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java +++ b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java @@ -44,7 +44,7 @@ public final class HighSentinelsOfArashin extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // {3}{W}: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HightideHermit.java b/Mage.Sets/src/mage/cards/h/HightideHermit.java index 6898f71e3c3..7fd720c91ab 100644 --- a/Mage.Sets/src/mage/cards/h/HightideHermit.java +++ b/Mage.Sets/src/mage/cards/h/HightideHermit.java @@ -34,7 +34,7 @@ public final class HightideHermit extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(4))); // Pay {E}{E}: Hightide Hermit can attack this turn as though it didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new PayEnergyCost(2))); + this.addAbility(new SimpleActivatedAbility(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new PayEnergyCost(2))); } private HightideHermit(final HightideHermit card) { diff --git a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java index eb5599d7e3a..d04baeffddf 100644 --- a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java +++ b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java @@ -51,7 +51,7 @@ public final class HigureTheStillWind extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); // {2}: Target Ninja creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HiredTorturer.java b/Mage.Sets/src/mage/cards/h/HiredTorturer.java index 5771667f67a..aed3ff45fdc 100644 --- a/Mage.Sets/src/mage/cards/h/HiredTorturer.java +++ b/Mage.Sets/src/mage/cards/h/HiredTorturer.java @@ -41,7 +41,7 @@ public final class HiredTorturer extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {3}{B}, {T}: Target opponent loses 2 life and reveals a card at random from their hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2),new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2),new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new HiredTorturerEffect()); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/h/HissingQuagmire.java b/Mage.Sets/src/mage/cards/h/HissingQuagmire.java index 1d2158bf402..c206cbf7ad7 100644 --- a/Mage.Sets/src/mage/cards/h/HissingQuagmire.java +++ b/Mage.Sets/src/mage/cards/h/HissingQuagmire.java @@ -38,7 +38,7 @@ public final class HissingQuagmire extends CardImpl { // {1}{B}{G}: Hissing Quagmire becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land. Effect effect = new BecomesCreatureSourceEffect(new HissingQuagmireToken(), CardType.LAND, Duration.EndOfTurn); effect.setText("{this} becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}{G}"))); } private HissingQuagmire(final HissingQuagmire card) { diff --git a/Mage.Sets/src/mage/cards/h/HithlainRope.java b/Mage.Sets/src/mage/cards/h/HithlainRope.java index 0adf39e6b3d..98be23c69b5 100644 --- a/Mage.Sets/src/mage/cards/h/HithlainRope.java +++ b/Mage.Sets/src/mage/cards/h/HithlainRope.java @@ -30,7 +30,7 @@ public final class HithlainRope extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeSacrificedSourceEffect())); // {1}, {T}: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. The player to your right gains control of Hithlain Rope. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect( + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect( new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND_A), true ), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); @@ -38,7 +38,7 @@ public final class HithlainRope extends CardImpl { this.addAbility(ability); // {2}, {T}: Draw a card. The player to your right gains control of Hithlain Rope. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addEffect(new PlayerToRightGainsControlOfSourceEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HoarShade.java b/Mage.Sets/src/mage/cards/h/HoarShade.java index f30125af473..dde1bbf5a3e 100644 --- a/Mage.Sets/src/mage/cards/h/HoarShade.java +++ b/Mage.Sets/src/mage/cards/h/HoarShade.java @@ -27,7 +27,7 @@ public final class HoarShade extends CardImpl { this.toughness = new MageInt(2); // {B}: Hoar 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 HoarShade(final HoarShade card) { diff --git a/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java b/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java index eb98f3e095a..028fe93f268 100644 --- a/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java +++ b/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java @@ -37,7 +37,7 @@ public final class HoardSmelterDragon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); ability.addTarget(new TargetPermanent(filter)); ability.addEffect(new HoardSmelterEffect()); this.addAbility(ability); @@ -90,4 +90,4 @@ class HoardSmelterEffect extends ContinuousEffectImpl { return new HoardSmelterEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/h/HolisticWisdom.java b/Mage.Sets/src/mage/cards/h/HolisticWisdom.java index dddbf4d0e80..6b94d89f4b4 100644 --- a/Mage.Sets/src/mage/cards/h/HolisticWisdom.java +++ b/Mage.Sets/src/mage/cards/h/HolisticWisdom.java @@ -34,7 +34,7 @@ public final class HolisticWisdom extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}{G}"); // {2}, Exile a card from your hand: Return target card from your graveyard to your hand if it shares a card type with the card exiled this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HolisticWisdomEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new HolisticWisdomEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new ExileFromHandCost(new TargetCardInHand(new FilterCard("a card from your hand")))); ability.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HolyArmor.java b/Mage.Sets/src/mage/cards/h/HolyArmor.java index d2839cc59a4..d85ff869fee 100644 --- a/Mage.Sets/src/mage/cards/h/HolyArmor.java +++ b/Mage.Sets/src/mage/cards/h/HolyArmor.java @@ -38,7 +38,7 @@ public final class HolyArmor extends CardImpl { // Enchanted creature gets +0/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); // {W}: Enchanted creature gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } private HolyArmor(final HolyArmor card) { diff --git a/Mage.Sets/src/mage/cards/h/HomaridShaman.java b/Mage.Sets/src/mage/cards/h/HomaridShaman.java index 3e0536d26af..e954f1ed0da 100644 --- a/Mage.Sets/src/mage/cards/h/HomaridShaman.java +++ b/Mage.Sets/src/mage/cards/h/HomaridShaman.java @@ -37,7 +37,7 @@ public final class HomaridShaman extends CardImpl { this.toughness = new MageInt(1); // {U}: Tap target green creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java b/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java index c0534622309..1c3760e1c55 100644 --- a/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java +++ b/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java @@ -34,7 +34,7 @@ public final class HomaridSpawningBed extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}"); // {1}{U}{U}, Sacrifice a blue creature: create X 1/1 blue Camarid creature tokens, where X is the sacrificed creature's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CamaridToken(), SacrificeCostManaValue.CREATURE), + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CamaridToken(), SacrificeCostManaValue.CREATURE), new ManaCostsImpl<>("{1}{U}{U}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HomaridWarrior.java b/Mage.Sets/src/mage/cards/h/HomaridWarrior.java index 24bf1fe35a2..cf9854988f1 100644 --- a/Mage.Sets/src/mage/cards/h/HomaridWarrior.java +++ b/Mage.Sets/src/mage/cards/h/HomaridWarrior.java @@ -32,7 +32,7 @@ public final class HomaridWarrior extends CardImpl { this.toughness = new MageInt(3); // {U}: Homarid Warrior gains shroud until end of turn and doesn't untap during your next untap step. Tap Homarid Warrior. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect( ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); Effect effect = new DontUntapInControllersNextUntapStepSourceEffect(); effect.setText("and doesn't untap during your next untap step"); diff --git a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java index c20a481be04..8bb6bba326a 100644 --- a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java +++ b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java @@ -115,7 +115,7 @@ class HomurasEssence2 extends TokenImpl { Effect effect = new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have flying"); ability.addEffect(effect); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability gainedAbility = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); effect = new GainAbilityControlledEffect(gainedAbility, Duration.WhileOnBattlefield, filter); effect.setText("and \"{R}: This creature gets +1/+0 until end of turn.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HonorGuard.java b/Mage.Sets/src/mage/cards/h/HonorGuard.java index 67cf1122ceb..e4f4435a27b 100644 --- a/Mage.Sets/src/mage/cards/h/HonorGuard.java +++ b/Mage.Sets/src/mage/cards/h/HonorGuard.java @@ -24,7 +24,7 @@ public final class HonorGuard extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } private HonorGuard(final HonorGuard card) { diff --git a/Mage.Sets/src/mage/cards/h/HoodedKavu.java b/Mage.Sets/src/mage/cards/h/HoodedKavu.java index 0b0cd6d03d6..a64887f35af 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedKavu.java +++ b/Mage.Sets/src/mage/cards/h/HoodedKavu.java @@ -28,7 +28,7 @@ public final class HoodedKavu extends CardImpl { this.toughness = new MageInt(2); // {B}: Hooded Kavu gains fear until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private HoodedKavu(final HoodedKavu card) { diff --git a/Mage.Sets/src/mage/cards/h/HoofSkulkin.java b/Mage.Sets/src/mage/cards/h/HoofSkulkin.java index a1c024311e3..8f333f5b79b 100644 --- a/Mage.Sets/src/mage/cards/h/HoofSkulkin.java +++ b/Mage.Sets/src/mage/cards/h/HoofSkulkin.java @@ -35,7 +35,7 @@ public final class HoofSkulkin extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent(filterGreenCreature)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java index 94c3e7c6ed2..34598fa9a96 100644 --- a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java +++ b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java @@ -51,7 +51,7 @@ public final class HopeOfGhirapur extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Hope of Ghirapur: Until your next turn, target player who was dealt combat damage by Hope of Ghirapur this turn can't cast noncreature spells. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HopeOfGhirapurCantCastEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new HopeOfGhirapurCantCastEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer(1, 1, false, filter)); this.addAbility(ability, new HopeOfGhirapurCombatDamageWatcher()); } diff --git a/Mage.Sets/src/mage/cards/h/HopeTender.java b/Mage.Sets/src/mage/cards/h/HopeTender.java index 1a9786a5ff6..58cdd3a334d 100644 --- a/Mage.Sets/src/mage/cards/h/HopeTender.java +++ b/Mage.Sets/src/mage/cards/h/HopeTender.java @@ -31,13 +31,13 @@ public final class HopeTender extends CardImpl { this.toughness = new MageInt(2); // {1}, {T}: Untap target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); // {1}, {T}, Exert Hope Tender: Untap two target lands. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new ExertSourceCost()); ability.addTarget(new TargetLandPermanent(2)); diff --git a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java index 641f5133c6b..bc75a01d8b1 100644 --- a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java +++ b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java @@ -47,7 +47,7 @@ public final class HordeOfNotions extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {W}{U}{B}{R}{G}: You may play target Elemental card from your graveyard without paying its mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HordeOfNotionsEffect(), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new HordeOfNotionsEffect(), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HorizonCanopy.java b/Mage.Sets/src/mage/cards/h/HorizonCanopy.java index 8480838be24..ec8d2c01036 100644 --- a/Mage.Sets/src/mage/cards/h/HorizonCanopy.java +++ b/Mage.Sets/src/mage/cards/h/HorizonCanopy.java @@ -33,7 +33,7 @@ public final class HorizonCanopy extends CardImpl { ability2.addCost(new PayLifeCost(1)); this.addAbility(ability2); // {1}, {tap}, Sacrifice Horizon Canopy: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HornOfDeafening.java b/Mage.Sets/src/mage/cards/h/HornOfDeafening.java index e7734474098..20982237b98 100644 --- a/Mage.Sets/src/mage/cards/h/HornOfDeafening.java +++ b/Mage.Sets/src/mage/cards/h/HornOfDeafening.java @@ -27,7 +27,7 @@ public final class HornOfDeafening extends CardImpl { // {2}, {tap}: Prevent all combat damage that would be dealt by target creature this turn. Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt by target creature this turn."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HornedHelm.java b/Mage.Sets/src/mage/cards/h/HornedHelm.java index c757acb4a00..17ff5902ea3 100644 --- a/Mage.Sets/src/mage/cards/h/HornedHelm.java +++ b/Mage.Sets/src/mage/cards/h/HornedHelm.java @@ -41,7 +41,7 @@ public final class HornedHelm extends CardImpl { ability.addEffect(effect); this.addAbility(ability); // {G}{G}: Attach Horned Helm to target creature you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{G}{G}")); + ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{G}{G}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/h/HornedTroll.java b/Mage.Sets/src/mage/cards/h/HornedTroll.java index 9c685b1390f..f49e4f2cfc0 100644 --- a/Mage.Sets/src/mage/cards/h/HornedTroll.java +++ b/Mage.Sets/src/mage/cards/h/HornedTroll.java @@ -26,7 +26,7 @@ public final class HornedTroll extends CardImpl { this.toughness = new MageInt(2); // {G}: Regenerate Horned Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private HornedTroll(final HornedTroll card) { diff --git a/Mage.Sets/src/mage/cards/h/HornetCannon.java b/Mage.Sets/src/mage/cards/h/HornetCannon.java index 7fa9ef5548c..d44eff72b22 100644 --- a/Mage.Sets/src/mage/cards/h/HornetCannon.java +++ b/Mage.Sets/src/mage/cards/h/HornetCannon.java @@ -30,7 +30,7 @@ public final class HornetCannon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {tap}: Create a 1/1 colorless Insect artifact creature token with flying and haste named Hornet. Destroy it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HornetCannonEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new HornetCannonEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java b/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java index fb2e0232913..989f256ab96 100644 --- a/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java +++ b/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java @@ -36,7 +36,7 @@ public final class HorrorOfHorrors extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}"); // Sacrifice a Swamp: Regenerate target black creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new SacrificeTargetCost(filter1)); ability.addTarget(new TargetCreaturePermanent(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HorseshoeCrab.java b/Mage.Sets/src/mage/cards/h/HorseshoeCrab.java index 707b02792fc..9922c8dc62a 100644 --- a/Mage.Sets/src/mage/cards/h/HorseshoeCrab.java +++ b/Mage.Sets/src/mage/cards/h/HorseshoeCrab.java @@ -25,7 +25,7 @@ public final class HorseshoeCrab extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); } private HorseshoeCrab(final HorseshoeCrab card) { diff --git a/Mage.Sets/src/mage/cards/h/HostileDesert.java b/Mage.Sets/src/mage/cards/h/HostileDesert.java index 92d648b887a..1922600cbfe 100644 --- a/Mage.Sets/src/mage/cards/h/HostileDesert.java +++ b/Mage.Sets/src/mage/cards/h/HostileDesert.java @@ -32,7 +32,7 @@ public final class HostileDesert extends CardImpl { // {T}: Add {C}. addAbility(new ColorlessManaAbility()); // {2}, Exile a land card from your graveyard: Hostile Desert becomes a 3/4 Elemental creature until end of turn. It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + Ability ability = new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 4, "3/4 Elemental creature", SubType.ELEMENTAL), CardType.LAND, Duration.EndOfTurn), new GenericManaCost(2)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterLandCard("land card from your graveyard")))); diff --git a/Mage.Sets/src/mage/cards/h/HostileRealm.java b/Mage.Sets/src/mage/cards/h/HostileRealm.java index bd5b062d1a6..0a89adee732 100644 --- a/Mage.Sets/src/mage/cards/h/HostileRealm.java +++ b/Mage.Sets/src/mage/cards/h/HostileRealm.java @@ -41,7 +41,7 @@ public final class HostileRealm extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Target creature can't block this turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Target creature can't block this turn.\""); diff --git a/Mage.Sets/src/mage/cards/h/HotSprings.java b/Mage.Sets/src/mage/cards/h/HotSprings.java index 0742f0595a6..05da3292532 100644 --- a/Mage.Sets/src/mage/cards/h/HotSprings.java +++ b/Mage.Sets/src/mage/cards/h/HotSprings.java @@ -40,7 +40,7 @@ public final class HotSprings extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Prevent the next 1 damage that would be dealt to any target this turn." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); diff --git a/Mage.Sets/src/mage/cards/h/HuntedTroll.java b/Mage.Sets/src/mage/cards/h/HuntedTroll.java index dab79bc3d07..71c23e8c9d2 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedTroll.java +++ b/Mage.Sets/src/mage/cards/h/HuntedTroll.java @@ -39,7 +39,7 @@ public final class HuntedTroll extends CardImpl { ability.addTarget(target); this.addAbility(ability); // {G}: Regenerate Hunted Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); } private HuntedTroll(final HuntedTroll card) { diff --git a/Mage.Sets/src/mage/cards/h/HuntingKavu.java b/Mage.Sets/src/mage/cards/h/HuntingKavu.java index 71a6f6626af..071d00b2bfc 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingKavu.java +++ b/Mage.Sets/src/mage/cards/h/HuntingKavu.java @@ -40,7 +40,7 @@ public final class HuntingKavu extends CardImpl { this.toughness = new MageInt(3); // {1}{R}{G}, {tap}: Exile Hunting Kavu and target creature without flying that's attacking you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new ManaCostsImpl<>("{1}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new ExileSourceEffect(), new ManaCostsImpl<>("{1}{R}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ExileTargetEffect().setText("and target creature without flying that's attacking you")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/h/HurrJackal.java b/Mage.Sets/src/mage/cards/h/HurrJackal.java index f01e4073134..65967ece6ab 100644 --- a/Mage.Sets/src/mage/cards/h/HurrJackal.java +++ b/Mage.Sets/src/mage/cards/h/HurrJackal.java @@ -28,7 +28,7 @@ public final class HurrJackal extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature can't be regenerated this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HyalopterousLemure.java b/Mage.Sets/src/mage/cards/h/HyalopterousLemure.java index 835d4caac5d..7170ceb5dd1 100644 --- a/Mage.Sets/src/mage/cards/h/HyalopterousLemure.java +++ b/Mage.Sets/src/mage/cards/h/HyalopterousLemure.java @@ -32,7 +32,7 @@ public final class HyalopterousLemure extends CardImpl { // {0}: Hyalopterous Lemure gets -1/-0 and gains flying 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 ManaCostsImpl<>("{0}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{0}")); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java b/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java index ec173af525f..4b9726a42ba 100644 --- a/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java +++ b/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java @@ -38,7 +38,7 @@ public final class HydromorphGuardian extends CardImpl { this.toughness = new MageInt(2); // {U}, Sacrifice Hydromorph Guardian: Counter target spell that targets one or more creatures you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HydromorphGull.java b/Mage.Sets/src/mage/cards/h/HydromorphGull.java index ce142b02b3b..8c34ed82348 100644 --- a/Mage.Sets/src/mage/cards/h/HydromorphGull.java +++ b/Mage.Sets/src/mage/cards/h/HydromorphGull.java @@ -42,7 +42,7 @@ public final class HydromorphGull extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, Sacrifice Hydromorph Gull: Counter target spell that targets one or more creatures you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java b/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java index 60e6dd7c30e..d0f32ace70d 100644 --- a/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java +++ b/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java @@ -36,7 +36,7 @@ public final class HyperionBlacksmith extends CardImpl { this.toughness = new MageInt(2); // {tap}: You may tap or untap target artifact an opponent controls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java index 2e20e7a8f2d..ffa41faf2fe 100644 --- a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java @@ -39,12 +39,12 @@ public final class HypervoltGrasp extends CardImpl { this.addAbility(ability); // Enchanted creature has "Tap: This creature deals 1 damage to any target." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); // {1}{U}: Return Hypervolt Grasp 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 HypervoltGrasp(final HypervoltGrasp card) { diff --git a/Mage.Sets/src/mage/cards/h/Hypochondria.java b/Mage.Sets/src/mage/cards/h/Hypochondria.java index ff9fb9afd66..a14d87955ff 100644 --- a/Mage.Sets/src/mage/cards/h/Hypochondria.java +++ b/Mage.Sets/src/mage/cards/h/Hypochondria.java @@ -25,12 +25,12 @@ public final class Hypochondria extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // {W}, Discard a card: Prevent the next 3 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl<>("{W}")); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {W}, Sacrifice Hypochondria: Prevent the next 3 damage that would be dealt to any target this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); -- 2.47.2 From 268234299076e554bf11c072924791751659da69 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:28:08 -0500 Subject: [PATCH 36/50] refactor: SimpleActivatedAbility default zone (cards I J) --- Mage.Sets/src/mage/cards/i/IcatianCrier.java | 4 ++-- Mage.Sets/src/mage/cards/i/IcatianInfantry.java | 4 ++-- Mage.Sets/src/mage/cards/i/IcatianJavelineers.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianLieutenant.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianPriest.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianScout.java | 2 +- Mage.Sets/src/mage/cards/i/IceFloe.java | 2 +- Mage.Sets/src/mage/cards/i/Iceberg.java | 2 +- Mage.Sets/src/mage/cards/i/IcyManipulator.java | 2 +- Mage.Sets/src/mage/cards/i/IdleThoughts.java | 2 +- Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java | 2 +- Mage.Sets/src/mage/cards/i/IgneousGolem.java | 2 +- Mage.Sets/src/mage/cards/i/IgnitionTeam.java | 4 ++-- Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java | 2 +- Mage.Sets/src/mage/cards/i/IlluminatedWings.java | 2 +- Mage.Sets/src/mage/cards/i/Imagecrafter.java | 2 +- Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java | 2 +- Mage.Sets/src/mage/cards/i/ImmobilizingInk.java | 2 +- Mage.Sets/src/mage/cards/i/ImpelledGiant.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialGunner.java | 2 +- Mage.Sets/src/mage/cards/i/ImperiousPerfect.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfExamination.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java | 2 +- Mage.Sets/src/mage/cards/i/ImpromptuRaid.java | 2 +- Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java | 2 +- Mage.Sets/src/mage/cards/i/IncitedRabble.java | 2 +- Mage.Sets/src/mage/cards/i/IndigoFaerie.java | 2 +- Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java | 2 +- Mage.Sets/src/mage/cards/i/InfantryVeteran.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalDenizen.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalTribute.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoFist.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoTitan.java | 2 +- Mage.Sets/src/mage/cards/i/InformationDealer.java | 2 +- Mage.Sets/src/mage/cards/i/IngeniousSkaab.java | 2 +- Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java | 2 +- Mage.Sets/src/mage/cards/i/InkfathomWitch.java | 2 +- Mage.Sets/src/mage/cards/i/InkmothNexus.java | 2 +- Mage.Sets/src/mage/cards/i/InnocenceKami.java | 2 +- Mage.Sets/src/mage/cards/i/InsolentNeonate.java | 2 +- Mage.Sets/src/mage/cards/i/InspiredSphinx.java | 2 +- Mage.Sets/src/mage/cards/i/InspiredSprite.java | 2 +- Mage.Sets/src/mage/cards/i/Instigator.java | 2 +- Mage.Sets/src/mage/cards/i/IntrepidHero.java | 2 +- Mage.Sets/src/mage/cards/i/IonCannon.java | 2 +- Mage.Sets/src/mage/cards/i/IonStorm.java | 2 +- Mage.Sets/src/mage/cards/i/IpnuRivulet.java | 2 +- Mage.Sets/src/mage/cards/i/IronHeartChimera.java | 2 +- Mage.Sets/src/mage/cards/i/IronLance.java | 2 +- Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java | 2 +- Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java | 2 +- Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java | 2 +- Mage.Sets/src/mage/cards/i/IslandOfWakWak.java | 2 +- Mage.Sets/src/mage/cards/i/IthHighArcanist.java | 2 +- Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java | 2 +- Mage.Sets/src/mage/cards/i/IzzetCluestone.java | 2 +- Mage.Sets/src/mage/cards/i/IzzetGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/i/IzzetStaticaster.java | 2 +- Mage.Sets/src/mage/cards/j/JabarisBanner.java | 2 +- Mage.Sets/src/mage/cards/j/JabbaTheHutt.java | 2 +- Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java | 2 +- Mage.Sets/src/mage/cards/j/JacesArchivist.java | 2 +- Mage.Sets/src/mage/cards/j/JadeMage.java | 2 +- Mage.Sets/src/mage/cards/j/JadeMonolith.java | 2 +- Mage.Sets/src/mage/cards/j/JaggedScarArchers.java | 2 +- Mage.Sets/src/mage/cards/j/JalumGrifter.java | 2 +- Mage.Sets/src/mage/cards/j/JalumTome.java | 2 +- Mage.Sets/src/mage/cards/j/JamuraanLion.java | 2 +- Mage.Sets/src/mage/cards/j/JandorsSaddlebags.java | 2 +- Mage.Sets/src/mage/cards/j/JanjeetSentry.java | 2 +- Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java | 2 +- Mage.Sets/src/mage/cards/j/JawboneSkulkin.java | 2 +- Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java | 6 +++--- Mage.Sets/src/mage/cards/j/JayemdaeTome.java | 2 +- Mage.Sets/src/mage/cards/j/JediHolocron.java | 2 +- Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaiBanner.java | 2 +- Mage.Sets/src/mage/cards/j/JestersMask.java | 2 +- Mage.Sets/src/mage/cards/j/JestersScepter.java | 2 +- Mage.Sets/src/mage/cards/j/JeweledSpirit.java | 2 +- Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java | 4 ++-- Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java | 2 +- Mage.Sets/src/mage/cards/j/JhoirasTimebug.java | 2 +- Mage.Sets/src/mage/cards/j/JhoirasToolbox.java | 2 +- Mage.Sets/src/mage/cards/j/JinxedChoker.java | 2 +- Mage.Sets/src/mage/cards/j/JinxedIdol.java | 2 +- Mage.Sets/src/mage/cards/j/JinxedRing.java | 2 +- Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java | 2 +- Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java | 2 +- Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java | 2 +- Mage.Sets/src/mage/cards/j/JolraelsFavor.java | 2 +- Mage.Sets/src/mage/cards/j/JoltingMerfolk.java | 2 +- Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java | 2 +- Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java | 2 +- Mage.Sets/src/mage/cards/j/Joven.java | 2 +- Mage.Sets/src/mage/cards/j/JovensTools.java | 2 +- Mage.Sets/src/mage/cards/j/JundBattlemage.java | 4 ++-- Mage.Sets/src/mage/cards/j/JundPanorama.java | 2 +- Mage.Sets/src/mage/cards/j/JunglePatrol.java | 2 +- Mage.Sets/src/mage/cards/j/JungleTroll.java | 4 ++-- Mage.Sets/src/mage/cards/j/JuniperOrderDruid.java | 2 +- Mage.Sets/src/mage/cards/j/Junktroller.java | 2 +- Mage.Sets/src/mage/cards/j/JushiApprentice.java | 4 ++-- 105 files changed, 115 insertions(+), 115 deletions(-) diff --git a/Mage.Sets/src/mage/cards/i/IcatianCrier.java b/Mage.Sets/src/mage/cards/i/IcatianCrier.java index 85274ab46d8..8fe3767b88d 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianCrier.java +++ b/Mage.Sets/src/mage/cards/i/IcatianCrier.java @@ -30,7 +30,7 @@ public final class IcatianCrier extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {tap}, Discard a card: Create two 1/1 white Citizen creature tokens. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CitizenToken(), 2), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CitizenToken(), 2), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); @@ -44,4 +44,4 @@ public final class IcatianCrier extends CardImpl { public IcatianCrier copy() { return new IcatianCrier(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/i/IcatianInfantry.java b/Mage.Sets/src/mage/cards/i/IcatianInfantry.java index 1ac3ce0a443..24640051ffb 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianInfantry.java +++ b/Mage.Sets/src/mage/cards/i/IcatianInfantry.java @@ -31,10 +31,10 @@ public final class IcatianInfantry extends CardImpl { this.toughness = new MageInt(1); // {1}: Icatian Infantry gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); // {1}: Icatian Infantry gains banding until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private IcatianInfantry(final IcatianInfantry card) { diff --git a/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java index 602052ccff7..10382bf1166 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java +++ b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java @@ -35,7 +35,7 @@ public final class IcatianJavelineers extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.JAVELIN.createInstance()), "with a javelin counter on it")); // {tap}, Remove a javelin counter from Icatian Javelineers: Icatian Javelineers deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.JAVELIN.createInstance())); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java b/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java index 637188a4513..c86b7a5b6e2 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java +++ b/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java @@ -36,7 +36,7 @@ public final class IcatianLieutenant extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Target Soldier creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IcatianPriest.java b/Mage.Sets/src/mage/cards/i/IcatianPriest.java index 96fd7d9237b..55beca9be76 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianPriest.java +++ b/Mage.Sets/src/mage/cards/i/IcatianPriest.java @@ -28,7 +28,7 @@ public final class IcatianPriest extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IcatianScout.java b/Mage.Sets/src/mage/cards/i/IcatianScout.java index 63c385b5dea..2af19a2a9bb 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianScout.java +++ b/Mage.Sets/src/mage/cards/i/IcatianScout.java @@ -32,7 +32,7 @@ public final class IcatianScout extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/i/IceFloe.java b/Mage.Sets/src/mage/cards/i/IceFloe.java index eaedf805fc3..2f3a53dcf35 100644 --- a/Mage.Sets/src/mage/cards/i/IceFloe.java +++ b/Mage.Sets/src/mage/cards/i/IceFloe.java @@ -38,7 +38,7 @@ public final class IceFloe extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {T}: Tap target creature without flying that's attacking you. It doesn't untap during its controller's untap step for as long as Ice Floe remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/Iceberg.java b/Mage.Sets/src/mage/cards/i/Iceberg.java index 49a724e761d..b1e40b07467 100644 --- a/Mage.Sets/src/mage/cards/i/Iceberg.java +++ b/Mage.Sets/src/mage/cards/i/Iceberg.java @@ -30,7 +30,7 @@ public final class Iceberg extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.ICE.createInstance()))); // {3}: Put an ice counter on Iceberg. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl<>("{3}"))); // Remove an ice counter from Iceberg: Add {C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), diff --git a/Mage.Sets/src/mage/cards/i/IcyManipulator.java b/Mage.Sets/src/mage/cards/i/IcyManipulator.java index 14cd96ab591..c52266e0d81 100644 --- a/Mage.Sets/src/mage/cards/i/IcyManipulator.java +++ b/Mage.Sets/src/mage/cards/i/IcyManipulator.java @@ -32,7 +32,7 @@ public final class IcyManipulator extends CardImpl { public IcyManipulator(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IdleThoughts.java b/Mage.Sets/src/mage/cards/i/IdleThoughts.java index 712014849f3..0c900a88072 100644 --- a/Mage.Sets/src/mage/cards/i/IdleThoughts.java +++ b/Mage.Sets/src/mage/cards/i/IdleThoughts.java @@ -24,7 +24,7 @@ public final class IdleThoughts extends CardImpl { // {2}: Draw a card if you have no cards in hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalOneShotEffect( + this.addAbility(new SimpleActivatedAbility(new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(2), new CardsInHandCondition(ComparisonType.EQUAL_TO, 0), "Draw a card if you have no cards in hand"), new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java b/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java index 470912fe537..9d5a8908f82 100644 --- a/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java +++ b/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java @@ -41,7 +41,7 @@ public final class IfhBiffEfreet extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}: Ifh-Biff Efreet deals 1 damage to each creature with flying and each player. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ManaCostsImpl<>("{G}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageAllEffect(1, filter), new ManaCostsImpl<>("{G}")); Effect effect = new DamagePlayersEffect(1); effect.setText("and each player"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/IgneousGolem.java b/Mage.Sets/src/mage/cards/i/IgneousGolem.java index d19235e9ff9..0b74cafe56a 100644 --- a/Mage.Sets/src/mage/cards/i/IgneousGolem.java +++ b/Mage.Sets/src/mage/cards/i/IgneousGolem.java @@ -27,7 +27,7 @@ public final class IgneousGolem extends CardImpl { this.toughness = new MageInt(4); // {2}: Igneous Golem gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private IgneousGolem(final IgneousGolem card) { diff --git a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java index 6d97c26c454..83e211f6309 100644 --- a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java +++ b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java @@ -45,7 +45,7 @@ public final class IgnitionTeam extends CardImpl { "with X +1/+1 counters on it, where X is the number of tapped lands on the battlefield.")); // {2}{R}, Remove a +1/+1 counter from Ignition Team: Target land becomes a 4/4 red Elemental creature until end of turn. It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect( + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect( new CreatureToken(4, 4, "4/4 red Elemental creature", SubType.ELEMENTAL).withColor("R"), false, true, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); @@ -90,4 +90,4 @@ class TappedLandsCount implements DynamicValue { public String getMessage() { return "tapped lands on the battlefield"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java index 2b6da907957..b07a4f825ce 100644 --- a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java +++ b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java @@ -34,7 +34,7 @@ public final class IizukaTheRuthless extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); // {2}{R}, Sacrifice a Samurai: Samurai creatures you control gain double strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, filter2, false), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, filter2, false), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java index cfa6cfb05f9..f2872bc6e68 100644 --- a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java +++ b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java @@ -41,7 +41,7 @@ public final class IlluminatedWings extends CardImpl { // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {2}, Sacrifice Illuminated Wings: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/Imagecrafter.java b/Mage.Sets/src/mage/cards/i/Imagecrafter.java index 2df1e864b53..021e5b8a974 100644 --- a/Mage.Sets/src/mage/cards/i/Imagecrafter.java +++ b/Mage.Sets/src/mage/cards/i/Imagecrafter.java @@ -28,7 +28,7 @@ public final class Imagecrafter extends CardImpl { this.toughness = new MageInt(1); // {tap}: 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 TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesChosenCreatureTypeTargetEffect(true), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java b/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java index 47177e71c57..d8fae0a783e 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java @@ -40,7 +40,7 @@ public final class ImmobilizerEldrazi extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {2}{C}: Each creature with toughness greater than its power can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{C}")); + Ability ability = new SimpleActivatedAbility(new CantBlockAllEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{C}")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java index 8ba5dc40e6f..f9f6032e764 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java @@ -49,7 +49,7 @@ public final class ImmobilizingInk extends CardImpl { Duration.WhileOnBattlefield,"Enchanted creature doesn't untap during its controller's untap step."))); // Enchanted creature has "{1}, Discard a card: Untap this creature." - Ability untapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); + Ability untapAbility = new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); untapAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(untapAbility, diff --git a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java index 03497b3ab8f..4b136e16cec 100644 --- a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java +++ b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java @@ -53,7 +53,7 @@ public final class ImpelledGiant extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Tap an untapped red creature you control other than Impelled Giant: Impelled Giant gets +X/+0 until end of turn, where X is the power of the creature tapped this way. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImpelledGiantBoostEffect(), new ImpelledGiantCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(new ImpelledGiantBoostEffect(), new ImpelledGiantCost(new TargetControlledPermanent(filter)))); } diff --git a/Mage.Sets/src/mage/cards/i/ImperialGunner.java b/Mage.Sets/src/mage/cards/i/ImperialGunner.java index 7b161bf5056..f3a146fbae4 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialGunner.java +++ b/Mage.Sets/src/mage/cards/i/ImperialGunner.java @@ -43,7 +43,7 @@ public final class ImperialGunner extends CardImpl { this.toughness = new MageInt(2); // {1},{T}: Imperial Gunner deals 1 damage to target player or Starship creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetPermanentOrPlayer(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java index 23038a6f48a..94540b7aec0 100644 --- a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java @@ -35,7 +35,7 @@ public final class ImperiousPerfect extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfWarriorToken(), 1), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ElfWarriorToken(), 1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java b/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java index 5124d9069c4..cbb18d11418 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java @@ -25,7 +25,7 @@ public final class ImplementOfCombustion extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {R}, Sacrifice Implement of Combustion: It deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java b/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java index f29d615389f..a811b7879fd 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java @@ -23,7 +23,7 @@ public final class ImplementOfExamination extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {U}, Sacrifice Implement of Examination: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java b/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java index 9c72077846d..b1e54103236 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java @@ -24,7 +24,7 @@ public final class ImplementOfImprovement extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {W}, Sacrifice Implement of Improvement: You gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java b/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java index eeadd157526..36315657699 100644 --- a/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java +++ b/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java @@ -39,7 +39,7 @@ public final class ImpromptuRaid extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R/G}"); // {2}{RG}: Reveal the top card of your library. If it isn't a creature card, put it into your graveyard. Otherwise, put that card onto the battlefield. That creature gains haste. Sacrifice it at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImpromptuRaidEffect(), new ManaCostsImpl<>("{2}{R/G}"))); + this.addAbility(new SimpleActivatedAbility(new ImpromptuRaidEffect(), new ManaCostsImpl<>("{2}{R/G}"))); } diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index 2b00f5361e7..28fe07109de 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -76,7 +76,7 @@ public final class InallaArchmageRitualist extends CardImpl { this.addAbility(ability); // Tap five untapped Wizards you control: Target player loses 7 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(7), new TapTargetCost(new TargetControlledPermanent(5, 5, filter2, true))); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(7), new TapTargetCost(new TargetControlledPermanent(5, 5, filter2, true))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IncitedRabble.java b/Mage.Sets/src/mage/cards/i/IncitedRabble.java index 2f0a75f75ca..91003feeba6 100644 --- a/Mage.Sets/src/mage/cards/i/IncitedRabble.java +++ b/Mage.Sets/src/mage/cards/i/IncitedRabble.java @@ -34,7 +34,7 @@ public final class IncitedRabble extends CardImpl { this.addAbility(new AttacksEachCombatStaticAbility()); // {2}: Incited Rabble gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private IncitedRabble(final IncitedRabble card) { diff --git a/Mage.Sets/src/mage/cards/i/IndigoFaerie.java b/Mage.Sets/src/mage/cards/i/IndigoFaerie.java index 8379a044693..0392935cd8e 100644 --- a/Mage.Sets/src/mage/cards/i/IndigoFaerie.java +++ b/Mage.Sets/src/mage/cards/i/IndigoFaerie.java @@ -39,7 +39,7 @@ public final class IndigoFaerie extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: Target permanent becomes blue in addition to its other colors until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBlueTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new BecomesBlueTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java b/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java index f415ca0c449..6be087b065c 100644 --- a/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java +++ b/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java @@ -41,7 +41,7 @@ public final class IndulgentAristocrat extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // {2}, Sacrifice a creature: Put a +1/+1 counter on each Vampire you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), new GenericManaCost(2)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfantryVeteran.java b/Mage.Sets/src/mage/cards/i/InfantryVeteran.java index a45a160a8e1..1b167730d71 100644 --- a/Mage.Sets/src/mage/cards/i/InfantryVeteran.java +++ b/Mage.Sets/src/mage/cards/i/InfantryVeteran.java @@ -31,7 +31,7 @@ public final class InfantryVeteran extends CardImpl { this.toughness = new MageInt(1); // {T}: Target attacking creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java index 8bb04e298e7..d9394c77581 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java +++ b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java @@ -54,7 +54,7 @@ public final class InfernalDenizen extends CardImpl { new GainControlTargetEffect(Duration.Custom, true), new SourceRemainsInZoneCondition(Zone.BATTLEFIELD), "gain control of target creature for as long as {this} remains on the battlefield"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfernalTribute.java b/Mage.Sets/src/mage/cards/i/InfernalTribute.java index 81e12a6ecc9..c57a7816721 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalTribute.java +++ b/Mage.Sets/src/mage/cards/i/InfernalTribute.java @@ -31,7 +31,7 @@ public final class InfernalTribute extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}{B}"); // {2}, Sacrifice a nontoken permanent: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfernoFist.java b/Mage.Sets/src/mage/cards/i/InfernoFist.java index 35ff9854743..66add951463 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoFist.java +++ b/Mage.Sets/src/mage/cards/i/InfernoFist.java @@ -43,7 +43,7 @@ public final class InfernoFist extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // {R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InfernoTitan.java b/Mage.Sets/src/mage/cards/i/InfernoTitan.java index 34f7103a944..c26e2b72051 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoTitan.java +++ b/Mage.Sets/src/mage/cards/i/InfernoTitan.java @@ -27,7 +27,7 @@ public final class InfernoTitan extends CardImpl { this.toughness = new MageInt(6); // {R}: Inferno Titan 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))); // Whenever Inferno Titan enters the battlefield or attacks, it deals 3 damage divided as you choose among one, two, or three targets. Ability ability = new EntersBattlefieldOrAttacksSourceTriggeredAbility(new DamageMultiEffect(3, "it")); diff --git a/Mage.Sets/src/mage/cards/i/InformationDealer.java b/Mage.Sets/src/mage/cards/i/InformationDealer.java index 9e6550f8862..6716bdf88be 100644 --- a/Mage.Sets/src/mage/cards/i/InformationDealer.java +++ b/Mage.Sets/src/mage/cards/i/InformationDealer.java @@ -37,7 +37,7 @@ public final class InformationDealer extends CardImpl { // {tap}: Look at the top X cards of your library, where X is the number of Wizards on the battlefield, then put them back in any order. Effect effect = new LookLibraryControllerEffect(new PermanentsOnBattlefieldCount(filter)); effect.setText("Look at the top X cards of your library, where X is the number of Wizards on the battlefield, then put them back in any order."); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(effect, new TapSourceCost())); } private InformationDealer(final InformationDealer card) { diff --git a/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java b/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java index df033da3bc0..77d0507884b 100644 --- a/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java +++ b/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java @@ -31,7 +31,7 @@ public final class IngeniousSkaab extends CardImpl { this.addAbility(new ProwessAbility()); // {U}: Ingenius Skaab gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private IngeniousSkaab(final IngeniousSkaab card) { diff --git a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java index bfe57449df6..d9ae50f79ff 100644 --- a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java +++ b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java @@ -47,7 +47,7 @@ public final class InkEyesServantOfOni extends CardImpl { this.addAbility(ability); // {1}{B}: Regenerate Ink-Eyes. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private InkEyesServantOfOni(final InkEyesServantOfOni card) { diff --git a/Mage.Sets/src/mage/cards/i/InkfathomWitch.java b/Mage.Sets/src/mage/cards/i/InkfathomWitch.java index 956d00ad437..46526b78b5f 100644 --- a/Mage.Sets/src/mage/cards/i/InkfathomWitch.java +++ b/Mage.Sets/src/mage/cards/i/InkfathomWitch.java @@ -38,7 +38,7 @@ public final class InkfathomWitch extends CardImpl { // Fear this.addAbility(FearAbility.getInstance()); // {2}{U}{B}: Each unblocked creature has base power and toughness 4/1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessAllEffect(4, 1, Duration.EndOfTurn, filter), new ManaCostsImpl<>("{2}{U}{B}"))); + this.addAbility(new SimpleActivatedAbility(new SetBasePowerToughnessAllEffect(4, 1, Duration.EndOfTurn, filter), new ManaCostsImpl<>("{2}{U}{B}"))); } private InkfathomWitch(final InkfathomWitch card) { diff --git a/Mage.Sets/src/mage/cards/i/InkmothNexus.java b/Mage.Sets/src/mage/cards/i/InkmothNexus.java index 5e6f66835e1..acd598f6676 100644 --- a/Mage.Sets/src/mage/cards/i/InkmothNexus.java +++ b/Mage.Sets/src/mage/cards/i/InkmothNexus.java @@ -34,7 +34,7 @@ public final class InkmothNexus extends CardImpl { // {1}: Inkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) Effect effect = new BecomesCreatureSourceEffect(new InkmothNexusToken(), CardType.LAND, Duration.EndOfTurn); effect.setText("{this} becomes a 1/1 Phyrexian Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(effect, new GenericManaCost(1))); } private InkmothNexus(final InkmothNexus card) { diff --git a/Mage.Sets/src/mage/cards/i/InnocenceKami.java b/Mage.Sets/src/mage/cards/i/InnocenceKami.java index 8ac260e9cee..9c6479f242c 100644 --- a/Mage.Sets/src/mage/cards/i/InnocenceKami.java +++ b/Mage.Sets/src/mage/cards/i/InnocenceKami.java @@ -31,7 +31,7 @@ public final class InnocenceKami extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InsolentNeonate.java b/Mage.Sets/src/mage/cards/i/InsolentNeonate.java index 8cd2b4a6755..bdebfdc5302 100644 --- a/Mage.Sets/src/mage/cards/i/InsolentNeonate.java +++ b/Mage.Sets/src/mage/cards/i/InsolentNeonate.java @@ -30,7 +30,7 @@ public final class InsolentNeonate extends CardImpl { // Menace this.addAbility(new MenaceAbility()); // Discard a card, Sacrifice Insolent Neonate: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new DiscardCardCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InspiredSphinx.java b/Mage.Sets/src/mage/cards/i/InspiredSphinx.java index bb6b5914cb5..39721e04021 100644 --- a/Mage.Sets/src/mage/cards/i/InspiredSphinx.java +++ b/Mage.Sets/src/mage/cards/i/InspiredSphinx.java @@ -37,7 +37,7 @@ public final class InspiredSphinx extends CardImpl { )); // {3}{U}: Create a colorless 1/1 Thopter artifact creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken()), new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new ThopterColorlessToken()), new ManaCostsImpl<>("{3}{U}"))); } private InspiredSphinx(final InspiredSphinx card) { diff --git a/Mage.Sets/src/mage/cards/i/InspiredSprite.java b/Mage.Sets/src/mage/cards/i/InspiredSprite.java index 1363a2fd650..8426b96b05c 100644 --- a/Mage.Sets/src/mage/cards/i/InspiredSprite.java +++ b/Mage.Sets/src/mage/cards/i/InspiredSprite.java @@ -39,7 +39,7 @@ public final class InspiredSprite extends CardImpl { this.addAbility(FlashAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); } private InspiredSprite(final InspiredSprite card) { diff --git a/Mage.Sets/src/mage/cards/i/Instigator.java b/Mage.Sets/src/mage/cards/i/Instigator.java index d1ea5b51f12..65a337498b5 100644 --- a/Mage.Sets/src/mage/cards/i/Instigator.java +++ b/Mage.Sets/src/mage/cards/i/Instigator.java @@ -39,7 +39,7 @@ public final class Instigator extends CardImpl { this.toughness = new MageInt(1); // {1}{B}{B}, {tap}, Discard a card: Creatures target player controls attack this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new InstigatorEffect(), new ManaCostsImpl<>("{1}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new InstigatorEffect(), new ManaCostsImpl<>("{1}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/i/IntrepidHero.java b/Mage.Sets/src/mage/cards/i/IntrepidHero.java index 3b99d1be74a..a22cf92ce3d 100644 --- a/Mage.Sets/src/mage/cards/i/IntrepidHero.java +++ b/Mage.Sets/src/mage/cards/i/IntrepidHero.java @@ -38,7 +38,7 @@ public final class IntrepidHero extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target creature with power 4 or greater. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IonCannon.java b/Mage.Sets/src/mage/cards/i/IonCannon.java index 4c6df594f7b..3b93fe12bdd 100644 --- a/Mage.Sets/src/mage/cards/i/IonCannon.java +++ b/Mage.Sets/src/mage/cards/i/IonCannon.java @@ -33,7 +33,7 @@ public final class IonCannon extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {T}: Target creature an opponent control loses spaceflight until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(SpaceflightAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseAbilityTargetEffect(SpaceflightAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetOpponentsCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IonStorm.java b/Mage.Sets/src/mage/cards/i/IonStorm.java index 0fb091e961c..1a1482eaa22 100644 --- a/Mage.Sets/src/mage/cards/i/IonStorm.java +++ b/Mage.Sets/src/mage/cards/i/IonStorm.java @@ -27,7 +27,7 @@ public final class IonStorm extends CardImpl { // {1}{R}, Remove a +1/+1 counter or a charge counter from a permanent you control: Ion Storm deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new OrCost("Remove a +1/+1 counter or a charge counter from a permanent you control", new RemoveCounterCost(new TargetControlledPermanent(), CounterType.P1P1), new RemoveCounterCost(new TargetControlledPermanent(), CounterType.CHARGE))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java index f47244ac051..72006d36d8e 100644 --- a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java +++ b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java @@ -46,7 +46,7 @@ public final class IpnuRivulet extends CardImpl { this.addAbility(manaAbility); // {1}{U}, {t}, Sacrifice a Desert: Target player puts the top four cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(4), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(4), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/i/IronHeartChimera.java b/Mage.Sets/src/mage/cards/i/IronHeartChimera.java index d69696056d1..799f7165b19 100644 --- a/Mage.Sets/src/mage/cards/i/IronHeartChimera.java +++ b/Mage.Sets/src/mage/cards/i/IronHeartChimera.java @@ -42,7 +42,7 @@ public final class IronHeartChimera extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Sacrifice Iron-Heart Chimera: Put a +2/+2 counter on target Chimera creature. It gains vigilance. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); ability.addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield) .setText("It gains vigilance. (This effect lasts indefinitely.)")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/i/IronLance.java b/Mage.Sets/src/mage/cards/i/IronLance.java index 77d6d14f912..366c2d388bb 100644 --- a/Mage.Sets/src/mage/cards/i/IronLance.java +++ b/Mage.Sets/src/mage/cards/i/IronLance.java @@ -25,7 +25,7 @@ public final class IronLance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java index 38bf68dd02d..88104e028b6 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java +++ b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java @@ -41,7 +41,7 @@ public final class IronclawBuzzardiers extends CardImpl { // Ironclaw Buzzardiers can't block creatures with power 2 or greater. this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // {R}: Ironclaw Buzzardiers gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private IronclawBuzzardiers(final IronclawBuzzardiers card) { diff --git a/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java index 01ba1e820af..cbee71ef5c8 100644 --- a/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java +++ b/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java @@ -43,7 +43,7 @@ public final class IsaoEnlightenedBushi extends CardImpl { this.addAbility(new CantBeCounteredSourceAbility()); this.addAbility(new BushidoAbility(2)); // {2}: Regenerate target Samurai. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java index de7aa20b2a4..137c3d68035 100644 --- a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java +++ b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java @@ -54,7 +54,7 @@ public final class IshkanahGrafwidow extends CardImpl { // {5}{B}: Target opponent loses 1 life for each Spider you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(count), new ManaCostsImpl<>("{6}{B}")); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(count), new ManaCostsImpl<>("{6}{B}")); ability.addTarget(new TargetOpponent()); ability.addHint(new ValueHint("Spiders you control", count)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IslandOfWakWak.java b/Mage.Sets/src/mage/cards/i/IslandOfWakWak.java index 7a37ea16a04..0b75eb02e36 100644 --- a/Mage.Sets/src/mage/cards/i/IslandOfWakWak.java +++ b/Mage.Sets/src/mage/cards/i/IslandOfWakWak.java @@ -36,7 +36,7 @@ public final class IslandOfWakWak extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // {tap}: Target creature with flying has base power 0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new IslandOfWakWakEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new IslandOfWakWakEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filterWithFlying)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IthHighArcanist.java b/Mage.Sets/src/mage/cards/i/IthHighArcanist.java index a267074641b..40fbfbe810f 100644 --- a/Mage.Sets/src/mage/cards/i/IthHighArcanist.java +++ b/Mage.Sets/src/mage/cards/i/IthHighArcanist.java @@ -39,7 +39,7 @@ public final class IthHighArcanist extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {T}: Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); ability.addEffect(effect); effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE, true); diff --git a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java index ff6a51a4633..97c3b1ccba2 100644 --- a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java +++ b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java @@ -43,7 +43,7 @@ public final class IxidorRealitySculptor extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {2}{U}: Turn target face-down creature face up. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TurnFaceUpTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new TurnFaceUpTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filterTarget)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IzzetCluestone.java b/Mage.Sets/src/mage/cards/i/IzzetCluestone.java index cb6131694a6..dd930a8d245 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetCluestone.java +++ b/Mage.Sets/src/mage/cards/i/IzzetCluestone.java @@ -32,7 +32,7 @@ public final class IzzetCluestone extends CardImpl { this.addAbility(new RedManaAbility()); // {U}{R}, {T}, Sacrifice Izzet Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{R}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java index 668accf8ab7..d6cc1938792 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java +++ b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java @@ -46,12 +46,12 @@ public final class IzzetGuildmage extends CardImpl { // ({UR} can be paid with either {U} or {R}.) // {2}{U}: Copy target instant spell you control with converted mana cost 2 or less. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetSpell(filterInstant)); this.addAbility(ability); // {2}{R}: Copy target sorcery spell you control with converted mana cost 2 or less. You may choose new targets for the copy. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{R}")); + ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetSpell(filterSorcery)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java b/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java index 47b212807e1..9b4bb2ad1a4 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java +++ b/Mage.Sets/src/mage/cards/i/IzzetStaticaster.java @@ -43,7 +43,7 @@ public final class IzzetStaticaster extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {T}: Izzet Staticaster deals 1 damage to target creature and each other creature with the same name as that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new IzzetStaticasterDamageEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new IzzetStaticasterDamageEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JabarisBanner.java b/Mage.Sets/src/mage/cards/j/JabarisBanner.java index c5fa549977a..bb7846bd382 100644 --- a/Mage.Sets/src/mage/cards/j/JabarisBanner.java +++ b/Mage.Sets/src/mage/cards/j/JabarisBanner.java @@ -25,7 +25,7 @@ public final class JabarisBanner extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}: Target creature gains flanking until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new FlankingAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new FlankingAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java b/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java index 236d422afda..1074fd8a119 100644 --- a/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java +++ b/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java @@ -54,7 +54,7 @@ public final class JabbaTheHutt extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {T}: Put a bounty counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java b/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java index e506f967fbe..12945820c6f 100644 --- a/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java +++ b/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java @@ -35,7 +35,7 @@ public final class JaceVrynsProdigy extends CardImpl { // {T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn's Prodigy, then return him to the battefield transformed under his owner's control. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(1, 1), new TapSourceCost()); Effect effect = new ConditionalOneShotEffect(new ExileAndReturnSourceEffect(PutCards.BATTLEFIELD_TRANSFORMED,Pronoun.HE), new CardsInControllerGraveyardCondition(5)); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JacesArchivist.java b/Mage.Sets/src/mage/cards/j/JacesArchivist.java index 64595e174c4..1abf2a0d790 100644 --- a/Mage.Sets/src/mage/cards/j/JacesArchivist.java +++ b/Mage.Sets/src/mage/cards/j/JacesArchivist.java @@ -33,7 +33,7 @@ public final class JacesArchivist extends CardImpl { this.toughness = new MageInt(2); // {U}, {T}: Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JacesArchivistEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new JacesArchivistEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JadeMage.java b/Mage.Sets/src/mage/cards/j/JadeMage.java index b8363aa1a0d..3dfb590ee7e 100644 --- a/Mage.Sets/src/mage/cards/j/JadeMage.java +++ b/Mage.Sets/src/mage/cards/j/JadeMage.java @@ -26,7 +26,7 @@ public final class JadeMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}"))); } private JadeMage(final JadeMage card) { diff --git a/Mage.Sets/src/mage/cards/j/JadeMonolith.java b/Mage.Sets/src/mage/cards/j/JadeMonolith.java index 2f992ce9092..9812521fe1c 100644 --- a/Mage.Sets/src/mage/cards/j/JadeMonolith.java +++ b/Mage.Sets/src/mage/cards/j/JadeMonolith.java @@ -33,7 +33,7 @@ public final class JadeMonolith extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {1}: The next time a source of your choice would deal damage to target creature this turn, that source deals that damage to you instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JadeMonolithRedirectionEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new JadeMonolithRedirectionEffect(), new GenericManaCost(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java b/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java index ca8196cec44..f7f1b8944a1 100644 --- a/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java +++ b/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java @@ -46,7 +46,7 @@ public final class JaggedScarArchers extends CardImpl { // Jagged-Scar Archers's power and toughness are each equal to the number of Elves you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(controlledElvesFilter)))); // {tap}: Jagged-Scar Archers deals damage equal to its power to target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE).setText("{this} deals damage equal to its power to target creature with flying"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE).setText("{this} deals damage equal to its power to target creature with flying"), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(flyingCreatureFilter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JalumGrifter.java b/Mage.Sets/src/mage/cards/j/JalumGrifter.java index ca3ab81af94..a8d4010dc4d 100644 --- a/Mage.Sets/src/mage/cards/j/JalumGrifter.java +++ b/Mage.Sets/src/mage/cards/j/JalumGrifter.java @@ -41,7 +41,7 @@ public final class JalumGrifter extends CardImpl { this.toughness = new MageInt(5); // {1}{R}, {T}: Shuffle Jalum Grifter and two lands you control face down. Target opponent chooses one of those cards. Turn the cards face up. If they chose Jalum Grifter, sacrifice it. Otherwise, destroy target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JalumGrifterEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new JalumGrifterEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/j/JalumTome.java b/Mage.Sets/src/mage/cards/j/JalumTome.java index ff26f144e53..4753c25a237 100644 --- a/Mage.Sets/src/mage/cards/j/JalumTome.java +++ b/Mage.Sets/src/mage/cards/j/JalumTome.java @@ -22,7 +22,7 @@ public final class JalumTome extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {2}, {tap}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JamuraanLion.java b/Mage.Sets/src/mage/cards/j/JamuraanLion.java index 6e73dc917cd..b9117985566 100644 --- a/Mage.Sets/src/mage/cards/j/JamuraanLion.java +++ b/Mage.Sets/src/mage/cards/j/JamuraanLion.java @@ -29,7 +29,7 @@ public final class JamuraanLion extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JandorsSaddlebags.java b/Mage.Sets/src/mage/cards/j/JandorsSaddlebags.java index ef565eb70b6..a2af3522c97 100644 --- a/Mage.Sets/src/mage/cards/j/JandorsSaddlebags.java +++ b/Mage.Sets/src/mage/cards/j/JandorsSaddlebags.java @@ -23,7 +23,7 @@ public final class JandorsSaddlebags extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JanjeetSentry.java b/Mage.Sets/src/mage/cards/j/JanjeetSentry.java index 16e034826da..5956fe71de1 100644 --- a/Mage.Sets/src/mage/cards/j/JanjeetSentry.java +++ b/Mage.Sets/src/mage/cards/j/JanjeetSentry.java @@ -35,7 +35,7 @@ public final class JanjeetSentry extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); // Tap, Pay {E}{E}: You may tap or untap target artifact or creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new TapSourceCost()); ability.addCost(new PayEnergyCost(2)); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java index bb9254cd211..9da62d017c8 100644 --- a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java @@ -50,7 +50,7 @@ public final class JaradGolgariLichLord extends CardImpl { this.addAbility(ability); // {1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(SacrificeCostCreaturesPower.instance), new ManaCostsImpl<>("{1}{B}{G}")); + ability = new SimpleActivatedAbility(new LoseLifeOpponentsEffect(SacrificeCostCreaturesPower.instance), new ManaCostsImpl<>("{1}{B}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JawboneSkulkin.java b/Mage.Sets/src/mage/cards/j/JawboneSkulkin.java index 173f64ed90d..ae1c7205381 100644 --- a/Mage.Sets/src/mage/cards/j/JawboneSkulkin.java +++ b/Mage.Sets/src/mage/cards/j/JawboneSkulkin.java @@ -35,7 +35,7 @@ public final class JawboneSkulkin extends CardImpl { this.subtype.add(SubType.SCARECROW); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filterRedCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java index 0d70fddfbe7..380075c4d7c 100644 --- a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java @@ -47,14 +47,14 @@ public final class JayaBallardTaskMage extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}, Discard a card: Destroy target blue permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // {1}{R}, {tap}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to any target. A creature dealt damage this way can't be regenerated this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{1}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); @@ -62,7 +62,7 @@ public final class JayaBallardTaskMage extends CardImpl { this.addAbility(ability, new DamagedByWatcher(false)); // {5}{R}{R}, {tap}, Discard a card: Jaya Ballard deals 6 damage to each creature and each player. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(6), new ManaCostsImpl<>("{5}{R}{R}")); + ability = new SimpleActivatedAbility(new DamageEverythingEffect(6), new ManaCostsImpl<>("{5}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JayemdaeTome.java b/Mage.Sets/src/mage/cards/j/JayemdaeTome.java index 0be8cd2ebc8..d044e0169e5 100644 --- a/Mage.Sets/src/mage/cards/j/JayemdaeTome.java +++ b/Mage.Sets/src/mage/cards/j/JayemdaeTome.java @@ -20,7 +20,7 @@ public final class JayemdaeTome extends CardImpl { public JayemdaeTome(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JediHolocron.java b/Mage.Sets/src/mage/cards/j/JediHolocron.java index ca7947c708e..23684a41e4f 100644 --- a/Mage.Sets/src/mage/cards/j/JediHolocron.java +++ b/Mage.Sets/src/mage/cards/j/JediHolocron.java @@ -29,7 +29,7 @@ public final class JediHolocron extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {T}: Put a charge counter on Jedi Holocron. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); // {T}, Remove a charge counter from Jedi Holocron: Add {G}, {W} or {U}. Cost cost = new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)); diff --git a/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java b/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java index 9b20b6b7223..6a8bc3c6316 100644 --- a/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java +++ b/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java @@ -32,7 +32,7 @@ public final class JenaraAsuraOfWar extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{W}"))); } private JenaraAsuraOfWar(final JenaraAsuraOfWar card) { diff --git a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java index d862a59e7a5..635a7875585 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java +++ b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java @@ -37,7 +37,7 @@ public final class JeskaWarriorAdept extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {tap}: Jeska, Warrior Adept 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/j/JeskaiBanner.java b/Mage.Sets/src/mage/cards/j/JeskaiBanner.java index 693729f8b24..5edae6d6c0a 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiBanner.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiBanner.java @@ -31,7 +31,7 @@ public final class JeskaiBanner extends CardImpl { this.addAbility(new WhiteManaAbility()); // {U}{R}{W}, {T}, Sacrifice Jeskai Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{R}{W}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{R}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JestersMask.java b/Mage.Sets/src/mage/cards/j/JestersMask.java index 6ee005dafa1..a517eb75002 100644 --- a/Mage.Sets/src/mage/cards/j/JestersMask.java +++ b/Mage.Sets/src/mage/cards/j/JestersMask.java @@ -28,7 +28,7 @@ public final class JestersMask extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {1}, {tap}, Sacrifice Jester's Mask: Target opponent puts the cards from their hand on top of their library. Search that player's library for that many cards. That player puts those cards into their hand, then shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReplaceOpponentCardsInHandWithSelectedEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new ReplaceOpponentCardsInHandWithSelectedEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/j/JestersScepter.java b/Mage.Sets/src/mage/cards/j/JestersScepter.java index ae56998df61..bb34acdfccd 100644 --- a/Mage.Sets/src/mage/cards/j/JestersScepter.java +++ b/Mage.Sets/src/mage/cards/j/JestersScepter.java @@ -43,7 +43,7 @@ public final class JestersScepter extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new JestersScepterLookAtCardEffect())); // {2}, {tap}, Put a card exiled with Jester's Scepter into its owner's graveyard: Counter target spell if it has the same name as that card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JestersScepterCounterEffect(), new ManaCostsImpl<>("{2}")); + Ability ability2 = new SimpleActivatedAbility(new JestersScepterCounterEffect(), new ManaCostsImpl<>("{2}")); ability2.addCost(new TapSourceCost()); ability2.addCost(new JestersScepterCost()); ability2.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/j/JeweledSpirit.java b/Mage.Sets/src/mage/cards/j/JeweledSpirit.java index 7b7a955d4f9..9473eade1ea 100644 --- a/Mage.Sets/src/mage/cards/j/JeweledSpirit.java +++ b/Mage.Sets/src/mage/cards/j/JeweledSpirit.java @@ -43,7 +43,7 @@ public final class JeweledSpirit extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice two lands: Jeweled Spirit gains protection from artifacts or from the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new JeweledSpiritEffect(), + this.addAbility(new SimpleActivatedAbility(new JeweledSpiritEffect(), new SacrificeTargetCost(2, StaticFilters.FILTER_LANDS))); } diff --git a/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java b/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java index 7d9ed0caaae..8883f3669b5 100644 --- a/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java +++ b/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java @@ -32,11 +32,11 @@ public final class JhessianBalmgiver extends CardImpl { this.toughness = new MageInt(1); // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {tap}: Target creature can't be blocked this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java b/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java index 24e97de6c9d..5f81e40efde 100644 --- a/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java +++ b/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java @@ -38,7 +38,7 @@ public final class JhoiraOfTheGhitu extends CardImpl { this.toughness = new MageInt(2); // {2}, Exile a nonland card from your hand: Put four time counters on the exiled card. If it doesn't have suspend, it gains suspend. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JhoiraOfTheGhituSuspendEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new JhoiraOfTheGhituSuspendEffect(), new GenericManaCost(2)); ability.addCost(new ExileFromHandCost(new TargetCardInHand(new FilterNonlandCard("a nonland card from your hand")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java b/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java index 4803d2f1a0a..69cc33b3dba 100644 --- a/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java +++ b/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java @@ -41,7 +41,7 @@ public final class JhoirasTimebug extends CardImpl { this.toughness = new MageInt(2); // {tap}: Choose target permanent you control or suspended card you own. If that permanent or card has a time counter on it, you may remove a time counter from it or put another time counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JhoirasTimebugEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new JhoirasTimebugEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanentOrSuspendedCard(filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java b/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java index 50fffe1cc86..e1609e6f9c9 100644 --- a/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java +++ b/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java @@ -35,7 +35,7 @@ public final class JhoirasToolbox extends CardImpl { this.toughness = new MageInt(1); // {2}: Regenerate target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JinxedChoker.java b/Mage.Sets/src/mage/cards/j/JinxedChoker.java index 9b443a8d5bc..6d139469066 100644 --- a/Mage.Sets/src/mage/cards/j/JinxedChoker.java +++ b/Mage.Sets/src/mage/cards/j/JinxedChoker.java @@ -44,7 +44,7 @@ public final class JinxedChoker extends CardImpl { this.addAbility(upkeepAbility); // {3}: Put a charge counter on Jinxed Choker or remove one from it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JinxedChokerCounterEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new JinxedChokerCounterEffect(), new ManaCostsImpl<>("{3}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JinxedIdol.java b/Mage.Sets/src/mage/cards/j/JinxedIdol.java index e1e9fe4bec9..415b1be4864 100644 --- a/Mage.Sets/src/mage/cards/j/JinxedIdol.java +++ b/Mage.Sets/src/mage/cards/j/JinxedIdol.java @@ -28,7 +28,7 @@ public final class JinxedIdol extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(2))); // Sacrifice a creature: Target opponent gains control of Jinxed Idol. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TargetPlayerGainControlSourceEffect(), + Ability ability = new SimpleActivatedAbility(new TargetPlayerGainControlSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JinxedRing.java b/Mage.Sets/src/mage/cards/j/JinxedRing.java index dec9e39c68f..208b1996135 100644 --- a/Mage.Sets/src/mage/cards/j/JinxedRing.java +++ b/Mage.Sets/src/mage/cards/j/JinxedRing.java @@ -36,7 +36,7 @@ public final class JinxedRing extends CardImpl { this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new DamageControllerEffect(1), false, filter, false, true)); // Sacrifice a creature: Target opponent gains control of Jinxed Ring. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TargetPlayerGainControlSourceEffect(), + Ability ability = new SimpleActivatedAbility(new TargetPlayerGainControlSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java b/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java index 3f0e267254c..40e1d750240 100644 --- a/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java +++ b/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java @@ -44,7 +44,7 @@ public final class JiwariTheEarthAflame extends CardImpl { this.toughness = new MageInt(3); // {X}{R}, {tap}: Jiwari, the Earth Aflame deals X damage to target creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java b/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java index 49b3aa72aee..f4d2e3e3a8d 100644 --- a/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java +++ b/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java @@ -29,7 +29,7 @@ public final class JohnnyComboPlayer extends CardImpl { this.toughness = new MageInt(1); // {4}: Search your library for a card, put that card into your hand, then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect( + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect( new TargetCardInLibrary(StaticFilters.FILTER_CARD_A), false, true), new ManaCostsImpl<>("{4}"))); } diff --git a/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java index 4ef0855a2a5..271ee71ea16 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java +++ b/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java @@ -39,7 +39,7 @@ public final class JolraelEmpressOfBeasts extends CardImpl { this.toughness = new MageInt(3); // {2}{G}, {tap}, Discard two cards: All lands target player controls become 3/3 creatures until end of turn. They're still lands. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JolraelEmpressOfBeastsEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new JolraelEmpressOfBeastsEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/j/JolraelsFavor.java b/Mage.Sets/src/mage/cards/j/JolraelsFavor.java index e5cc444361f..ce79a4437ec 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelsFavor.java +++ b/Mage.Sets/src/mage/cards/j/JolraelsFavor.java @@ -38,7 +38,7 @@ public final class JolraelsFavor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}{G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{1}{G}"))); } private JolraelsFavor(final JolraelsFavor card) { diff --git a/Mage.Sets/src/mage/cards/j/JoltingMerfolk.java b/Mage.Sets/src/mage/cards/j/JoltingMerfolk.java index f84794c8a61..fa7e1d963d1 100644 --- a/Mage.Sets/src/mage/cards/j/JoltingMerfolk.java +++ b/Mage.Sets/src/mage/cards/j/JoltingMerfolk.java @@ -31,7 +31,7 @@ public final class JoltingMerfolk extends CardImpl { // Fading 4 this.addAbility(new FadingAbility(4, this)); // Remove a fade counter from Jolting Merfolk: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java index a17769ed55c..e207271ca52 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java +++ b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java @@ -37,7 +37,7 @@ public final class JoragaAuxiliary extends CardImpl { this.toughness = new MageInt(3); // {4}{G}{W}: Support 2. (Put a +1/+1 counter on each of up to two other target creatures.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupportEffect(this, 2, true), new ManaCostsImpl<>("{4}{G}{W}")); + Ability ability = new SimpleActivatedAbility(new SupportEffect(this, 2, true), new ManaCostsImpl<>("{4}{G}{W}")); ability.addTarget(new TargetCreaturePermanent(0, 2, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java index 4c1422b6558..26b19b40900 100644 --- a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java +++ b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java @@ -48,7 +48,7 @@ public final class JorubaiMurkLurker extends CardImpl { new PermanentsOnTheBattlefieldCondition(filter), rule))); // {1}{B}: Target creature gains lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/Joven.java b/Mage.Sets/src/mage/cards/j/Joven.java index f0011e935fe..b41211c8f2e 100644 --- a/Mage.Sets/src/mage/cards/j/Joven.java +++ b/Mage.Sets/src/mage/cards/j/Joven.java @@ -38,7 +38,7 @@ public final class Joven extends CardImpl { this.toughness = new MageInt(3); // {R}{R}{R}, {tap}: Destroy target noncreature artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JovensTools.java b/Mage.Sets/src/mage/cards/j/JovensTools.java index 4d505871cb4..c17edff0955 100644 --- a/Mage.Sets/src/mage/cards/j/JovensTools.java +++ b/Mage.Sets/src/mage/cards/j/JovensTools.java @@ -31,7 +31,7 @@ public final class JovensTools extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {4}, {T}: Target creature can't be blocked this turn except by Walls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JundBattlemage.java b/Mage.Sets/src/mage/cards/j/JundBattlemage.java index a10af7076ea..cfe413271f6 100644 --- a/Mage.Sets/src/mage/cards/j/JundBattlemage.java +++ b/Mage.Sets/src/mage/cards/j/JundBattlemage.java @@ -31,11 +31,11 @@ public final class JundBattlemage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{G}")); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JundPanorama.java b/Mage.Sets/src/mage/cards/j/JundPanorama.java index f0f421b6b21..7a84beb4ea0 100644 --- a/Mage.Sets/src/mage/cards/j/JundPanorama.java +++ b/Mage.Sets/src/mage/cards/j/JundPanorama.java @@ -38,7 +38,7 @@ public final class JundPanorama extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.addAbility(new ColorlessManaAbility()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JunglePatrol.java b/Mage.Sets/src/mage/cards/j/JunglePatrol.java index 45605385062..3ac99317046 100644 --- a/Mage.Sets/src/mage/cards/j/JunglePatrol.java +++ b/Mage.Sets/src/mage/cards/j/JunglePatrol.java @@ -45,7 +45,7 @@ public final class JunglePatrol extends CardImpl { this.toughness = new MageInt(2); // {1}{G}, {T}: Create a 0/1 green Wall creature token with defender named Wood. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WoodToken()), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new WoodToken()), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JungleTroll.java b/Mage.Sets/src/mage/cards/j/JungleTroll.java index 3af07477492..2e2116a5e5c 100644 --- a/Mage.Sets/src/mage/cards/j/JungleTroll.java +++ b/Mage.Sets/src/mage/cards/j/JungleTroll.java @@ -25,10 +25,10 @@ public final class JungleTroll extends CardImpl { this.toughness = new MageInt(1); // {R}: Regenerate Jungle Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}"))); // {G}: Regenerate Jungle Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private JungleTroll(final JungleTroll card) { diff --git a/Mage.Sets/src/mage/cards/j/JuniperOrderDruid.java b/Mage.Sets/src/mage/cards/j/JuniperOrderDruid.java index 5b24c7c5dae..e815c61fd60 100644 --- a/Mage.Sets/src/mage/cards/j/JuniperOrderDruid.java +++ b/Mage.Sets/src/mage/cards/j/JuniperOrderDruid.java @@ -29,7 +29,7 @@ public final class JuniperOrderDruid extends CardImpl { this.toughness = new MageInt(1); // {tap}: 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/j/Junktroller.java b/Mage.Sets/src/mage/cards/j/Junktroller.java index 925b2beda83..9a6ecfbb0b8 100644 --- a/Mage.Sets/src/mage/cards/j/Junktroller.java +++ b/Mage.Sets/src/mage/cards/j/Junktroller.java @@ -30,7 +30,7 @@ public final class Junktroller extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {tap}: Put target card from a graveyard on the bottom of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JushiApprentice.java b/Mage.Sets/src/mage/cards/j/JushiApprentice.java index 1b01dcfab9d..d8162a7c2a9 100644 --- a/Mage.Sets/src/mage/cards/j/JushiApprentice.java +++ b/Mage.Sets/src/mage/cards/j/JushiApprentice.java @@ -40,7 +40,7 @@ public final class JushiApprentice extends CardImpl { this.flipCardName = "Tomoya the Revealer"; // {2}{U}, {tap}: Draw a card. If you have nine or more cards in hand, flip Jushi Apprentice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new FlipSourceEffect(new TomoyaTheRevealer()), new CardsInHandCondition(ComparisonType.MORE_THAN, 8), "If you have nine or more cards in hand, flip {this}")); @@ -70,7 +70,7 @@ class TomoyaTheRevealer extends TokenImpl { toughness = new MageInt(3); // {3}{U}{U},{T} : Target player draws X cards, where X is the number of cards in your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(CardsInControllerHandCount.instance), new ManaCostsImpl<>("{3}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardTargetEffect(CardsInControllerHandCount.instance), new ManaCostsImpl<>("{3}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); -- 2.47.2 From 1e4f68af057fb80d9a9898adc6d2869e66a170d8 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:28:28 -0500 Subject: [PATCH 37/50] refactor: SimpleActivatedAbility default zone (cards K) --- Mage.Sets/src/mage/cards/k/KabutoMoth.java | 2 +- Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java | 2 +- Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java | 2 +- Mage.Sets/src/mage/cards/k/KamahlPitFighter.java | 2 +- Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java | 2 +- Mage.Sets/src/mage/cards/k/KamiOfFalseHope.java | 2 +- Mage.Sets/src/mage/cards/k/KamiOfTwistedReflection.java | 2 +- Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java | 2 +- Mage.Sets/src/mage/cards/k/Karakas.java | 2 +- Mage.Sets/src/mage/cards/k/KarganDragonlord.java | 2 +- Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java | 2 +- Mage.Sets/src/mage/cards/k/KarnSilverGolem.java | 2 +- Mage.Sets/src/mage/cards/k/KarplusanYeti.java | 2 +- Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java | 2 +- Mage.Sets/src/mage/cards/k/KashiTribeReaver.java | 4 ++-- Mage.Sets/src/mage/cards/k/KathariRemnant.java | 2 +- Mage.Sets/src/mage/cards/k/KavuChameleon.java | 2 +- Mage.Sets/src/mage/cards/k/KavuGlider.java | 4 ++-- Mage.Sets/src/mage/cards/k/KavuRecluse.java | 2 +- Mage.Sets/src/mage/cards/k/KazarovSengirPureblood.java | 2 +- Mage.Sets/src/mage/cards/k/KeeningApparition.java | 2 +- Mage.Sets/src/mage/cards/k/KeeperOfKookus.java | 4 ++-- Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java | 2 +- Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java | 2 +- Mage.Sets/src/mage/cards/k/KefnetTheMindful.java | 2 +- Mage.Sets/src/mage/cards/k/KeiTakahashi.java | 2 +- Mage.Sets/src/mage/cards/k/KeldonArsonist.java | 2 +- Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java | 2 +- Mage.Sets/src/mage/cards/k/KeldonMantle.java | 6 +++--- Mage.Sets/src/mage/cards/k/KeldonNecropolis.java | 2 +- Mage.Sets/src/mage/cards/k/KessigProwler.java | 2 +- Mage.Sets/src/mage/cards/k/KherKeep.java | 2 +- Mage.Sets/src/mage/cards/k/KheruBloodsucker.java | 2 +- Mage.Sets/src/mage/cards/k/KheruDreadmaw.java | 2 +- Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java | 2 +- Mage.Sets/src/mage/cards/k/KillSuitCultist.java | 2 +- Mage.Sets/src/mage/cards/k/KillerBees.java | 2 +- Mage.Sets/src/mage/cards/k/KinTreeWarden.java | 2 +- Mage.Sets/src/mage/cards/k/KindredBoon.java | 2 +- Mage.Sets/src/mage/cards/k/KingCrab.java | 2 +- Mage.Sets/src/mage/cards/k/KingSuleiman.java | 2 +- Mage.Sets/src/mage/cards/k/KiorasFollower.java | 2 +- Mage.Sets/src/mage/cards/k/KirdChieftain.java | 2 +- Mage.Sets/src/mage/cards/k/KithkinDaggerdare.java | 2 +- Mage.Sets/src/mage/cards/k/KithkinHealer.java | 2 +- Mage.Sets/src/mage/cards/k/KithkinSpellduster.java | 2 +- Mage.Sets/src/mage/cards/k/KitsuneDiviner.java | 2 +- Mage.Sets/src/mage/cards/k/KitsuneHealer.java | 4 ++-- Mage.Sets/src/mage/cards/k/KitsuneLoreweaver.java | 2 +- Mage.Sets/src/mage/cards/k/KitsuneMystic.java | 2 +- Mage.Sets/src/mage/cards/k/KitsunePalliator.java | 2 +- Mage.Sets/src/mage/cards/k/KjeldoranDead.java | 2 +- Mage.Sets/src/mage/cards/k/KjeldoranKnight.java | 4 ++-- Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java | 2 +- Mage.Sets/src/mage/cards/k/KjeldoranOutrider.java | 2 +- Mage.Sets/src/mage/cards/k/KjeldoranRoyalGuard.java | 2 +- Mage.Sets/src/mage/cards/k/KnacksawClique.java | 2 +- Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java | 2 +- Mage.Sets/src/mage/cards/k/KnightOfDawn.java | 2 +- Mage.Sets/src/mage/cards/k/KnightOfStromgald.java | 4 ++-- Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java | 2 +- Mage.Sets/src/mage/cards/k/KnollspineInvocation.java | 2 +- Mage.Sets/src/mage/cards/k/KnowledgeVault.java | 2 +- Mage.Sets/src/mage/cards/k/KolaghanMonument.java | 2 +- Mage.Sets/src/mage/cards/k/Kookus.java | 2 +- Mage.Sets/src/mage/cards/k/KorHaven.java | 2 +- Mage.Sets/src/mage/cards/k/KorLineSlinger.java | 2 +- Mage.Sets/src/mage/cards/k/KorSkyClimber.java | 2 +- Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java | 2 +- Mage.Sets/src/mage/cards/k/KorozdaGorgon.java | 2 +- Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java | 2 +- Mage.Sets/src/mage/cards/k/KozileksPathfinder.java | 2 +- Mage.Sets/src/mage/cards/k/KozileksShrieker.java | 2 +- Mage.Sets/src/mage/cards/k/Krakilin.java | 2 +- Mage.Sets/src/mage/cards/k/Kranioceros.java | 2 +- Mage.Sets/src/mage/cards/k/KrarkClanEngineers.java | 2 +- Mage.Sets/src/mage/cards/k/KrarkClanGrunt.java | 2 +- Mage.Sets/src/mage/cards/k/KrarkClanOgre.java | 2 +- Mage.Sets/src/mage/cards/k/KrarkClanShaman.java | 2 +- Mage.Sets/src/mage/cards/k/KrasisIncubation.java | 2 +- Mage.Sets/src/mage/cards/k/KraulWarrior.java | 2 +- Mage.Sets/src/mage/cards/k/KrisMage.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanArcher.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanConstrictor.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java | 2 +- Mage.Sets/src/mage/cards/k/KrovikanHorror.java | 2 +- Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java | 6 +++--- Mage.Sets/src/mage/cards/k/KryShield.java | 2 +- Mage.Sets/src/mage/cards/k/KukemssaSerpent.java | 2 +- Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java | 2 +- Mage.Sets/src/mage/cards/k/KuroPitlord.java | 2 +- Mage.Sets/src/mage/cards/k/KurosTaken.java | 2 +- Mage.Sets/src/mage/cards/k/KusariGama.java | 2 +- Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java | 2 +- Mage.Sets/src/mage/cards/k/KytheonsIrregulars.java | 2 +- 95 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Mage.Sets/src/mage/cards/k/KabutoMoth.java b/Mage.Sets/src/mage/cards/k/KabutoMoth.java index 65ba04cdf9e..670b92b9a8e 100644 --- a/Mage.Sets/src/mage/cards/k/KabutoMoth.java +++ b/Mage.Sets/src/mage/cards/k/KabutoMoth.java @@ -29,7 +29,7 @@ public final class KabutoMoth extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java index 77bcab1dad0..7978845987c 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java @@ -35,7 +35,7 @@ public final class KalitasBloodchiefOfGhet extends CardImpl { this.subtype.add(SubType.WARRIOR); // {B}{B}{B}, {T}: Destroy target creature. If that creature dies this way, create a black Vampire creature token. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KalitasDestroyEffect(), new ManaCostsImpl<>("{B}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new KalitasDestroyEffect(), new ManaCostsImpl<>("{B}{B}{B}")); ability.addCost(new TapSourceCost()); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index f49c6eb3217..567a1add32d 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -55,7 +55,7 @@ public final class KalitasTraitorOfGhet extends CardImpl { this.addAbility(new SimpleStaticAbility(new KalitasTraitorOfGhetEffect())); // {2}{B}, Sacrifice another Vampire or Zombie: Put two +1/+1 counters on Kalitas, Traitor of Ghet. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java b/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java index 0f5243e2fe0..ac1cf76d260 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java +++ b/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java @@ -31,7 +31,7 @@ public final class KamahlPitFighter extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java b/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java index 9f582830af3..fd0ff78cb52 100644 --- a/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java +++ b/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java @@ -27,7 +27,7 @@ public final class KamiOfAncientLaw extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KamiOfFalseHope.java b/Mage.Sets/src/mage/cards/k/KamiOfFalseHope.java index c29a4a7a339..4c4a63a0985 100644 --- a/Mage.Sets/src/mage/cards/k/KamiOfFalseHope.java +++ b/Mage.Sets/src/mage/cards/k/KamiOfFalseHope.java @@ -28,7 +28,7 @@ public final class KamiOfFalseHope extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Kami of False Hope: Prevent all combat damage that would be dealt this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KamiOfTwistedReflection.java b/Mage.Sets/src/mage/cards/k/KamiOfTwistedReflection.java index 004a07f071e..3863e6a6a41 100644 --- a/Mage.Sets/src/mage/cards/k/KamiOfTwistedReflection.java +++ b/Mage.Sets/src/mage/cards/k/KamiOfTwistedReflection.java @@ -26,7 +26,7 @@ public final class KamiOfTwistedReflection extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java b/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java index 2420456d317..7cd00f1f7ab 100644 --- a/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java +++ b/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java @@ -40,7 +40,7 @@ public final class KaminoCloningFacility extends CardImpl { this.addAbility(new ConditionalAnyColorManaAbility(new TapSourceCost(), 1, new ConditionalSpellManaBuilder(FILTER), true)); // {5}, {T}: Create a 1/1 white Trooper creature tokens. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TrooperToken(), 1), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new TrooperToken(), 1), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/Karakas.java b/Mage.Sets/src/mage/cards/k/Karakas.java index 7924b200775..de9281807f1 100644 --- a/Mage.Sets/src/mage/cards/k/Karakas.java +++ b/Mage.Sets/src/mage/cards/k/Karakas.java @@ -33,7 +33,7 @@ public final class Karakas extends CardImpl { // {T}: Add {W}. this.addAbility(new WhiteManaAbility()); // {T}: Return target legendary creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KarganDragonlord.java b/Mage.Sets/src/mage/cards/k/KarganDragonlord.java index b3ba0f32f44..d4e33fbdcc0 100644 --- a/Mage.Sets/src/mage/cards/k/KarganDragonlord.java +++ b/Mage.Sets/src/mage/cards/k/KarganDragonlord.java @@ -43,7 +43,7 @@ public final class KarganDragonlord extends LevelerCard { Abilities abilities2 = new AbilitiesImpl<>(); abilities2.add(FlyingAbility.getInstance()); abilities2.add(TrampleAbility.getInstance()); - abilities2.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + abilities2.add(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); this.addAbilities(LevelerCardBuilder.construct( new LevelerCardBuilder.LevelAbility(4, 7, abilities1, 4, 4), diff --git a/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java b/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java index f4699076fbb..6dbbe226d0c 100644 --- a/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java +++ b/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java @@ -37,7 +37,7 @@ public final class KarlovOfTheGhostCouncil extends CardImpl { this.addAbility(new GainLifeControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), false)); // {W}{B}, Remove six +1/+1 counters from Karlov of the Ghost Council: Exile target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{W}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{W}{B}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(6))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java index 06335b5f131..ba29f49f494 100644 --- a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java +++ b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java @@ -40,7 +40,7 @@ public final class KarnSilverGolem extends CardImpl { this.addAbility(new BlocksOrBlockedSourceTriggeredAbility(new BoostSourceEffect(-4, +4, Duration.EndOfTurn, "it"))); // {1}: Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KarnSilverGolemEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new KarnSilverGolemEffect(), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetPermanent(filterNonCreature)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KarplusanYeti.java b/Mage.Sets/src/mage/cards/k/KarplusanYeti.java index b18261f5bbf..4a8e5be7fab 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanYeti.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanYeti.java @@ -27,7 +27,7 @@ public final class KarplusanYeti extends CardImpl { this.toughness = new MageInt(3); // {T}: Karplusan Yeti deals damage equal to its power to target creature. That creature deals damage equal to its power to Karplusan Yeti. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageEachOtherEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java b/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java index 556c3ee975a..a568229133e 100644 --- a/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java +++ b/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java @@ -31,7 +31,7 @@ public final class KasetoOrochiArchmage extends CardImpl { this.toughness = new MageInt(2); // {G}{U}: Target creature can't be blocked this turn. If that creature is a Snake, it gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KasetoEffect(), new ManaCostsImpl<>("{G}{U}")); + Ability ability = new SimpleActivatedAbility(new KasetoEffect(), new ManaCostsImpl<>("{G}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java b/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java index cd3b4f8efb6..d2fc715f089 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java @@ -36,7 +36,7 @@ public final class KashiTribeReaver extends CardImpl { ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability); // {1}{G}: Regenerate Kashi-Tribe Reaver. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private KashiTribeReaver(final KashiTribeReaver card) { @@ -47,4 +47,4 @@ public final class KashiTribeReaver extends CardImpl { public KashiTribeReaver copy() { return new KashiTribeReaver(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KathariRemnant.java b/Mage.Sets/src/mage/cards/k/KathariRemnant.java index 7c40519374d..ae5352c99b2 100644 --- a/Mage.Sets/src/mage/cards/k/KathariRemnant.java +++ b/Mage.Sets/src/mage/cards/k/KathariRemnant.java @@ -30,7 +30,7 @@ public final class KathariRemnant extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); this.addAbility(new CascadeAbility()); } diff --git a/Mage.Sets/src/mage/cards/k/KavuChameleon.java b/Mage.Sets/src/mage/cards/k/KavuChameleon.java index ee6c6dc4269..1b976662743 100644 --- a/Mage.Sets/src/mage/cards/k/KavuChameleon.java +++ b/Mage.Sets/src/mage/cards/k/KavuChameleon.java @@ -31,7 +31,7 @@ public final class KavuChameleon extends CardImpl { // Kavu Chameleon can't be countered. this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect())); // {G}: Kavu Chameleon becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private KavuChameleon(final KavuChameleon card) { diff --git a/Mage.Sets/src/mage/cards/k/KavuGlider.java b/Mage.Sets/src/mage/cards/k/KavuGlider.java index 0ee2ba885ba..af361145dc2 100644 --- a/Mage.Sets/src/mage/cards/k/KavuGlider.java +++ b/Mage.Sets/src/mage/cards/k/KavuGlider.java @@ -24,8 +24,8 @@ public final class KavuGlider extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } private KavuGlider(final KavuGlider card) { diff --git a/Mage.Sets/src/mage/cards/k/KavuRecluse.java b/Mage.Sets/src/mage/cards/k/KavuRecluse.java index b028eaa16dd..cadae414ee0 100644 --- a/Mage.Sets/src/mage/cards/k/KavuRecluse.java +++ b/Mage.Sets/src/mage/cards/k/KavuRecluse.java @@ -29,7 +29,7 @@ public final class KavuRecluse extends CardImpl { this.toughness = new MageInt(2); // {T}: Target land becomes a Forest until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.FOREST), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.FOREST), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KazarovSengirPureblood.java b/Mage.Sets/src/mage/cards/k/KazarovSengirPureblood.java index d09a18e848d..6dd6dacfceb 100644 --- a/Mage.Sets/src/mage/cards/k/KazarovSengirPureblood.java +++ b/Mage.Sets/src/mage/cards/k/KazarovSengirPureblood.java @@ -43,7 +43,7 @@ public final class KazarovSengirPureblood extends CardImpl { this.addAbility(new KazarovSengirPurebloodTriggeredAbility()); // {3}{R}: Kazarov deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeeningApparition.java b/Mage.Sets/src/mage/cards/k/KeeningApparition.java index ad798b10687..76b66c0ceaf 100644 --- a/Mage.Sets/src/mage/cards/k/KeeningApparition.java +++ b/Mage.Sets/src/mage/cards/k/KeeningApparition.java @@ -27,7 +27,7 @@ public final class KeeningApparition extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Keening Apparition: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(),new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfKookus.java b/Mage.Sets/src/mage/cards/k/KeeperOfKookus.java index 367bd16c35b..88f9171459d 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfKookus.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfKookus.java @@ -30,7 +30,7 @@ public final class KeeperOfKookus extends CardImpl { this.toughness = new MageInt(1); // {R}: Keeper of Kookus gains protection from red until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); this.addAbility(ability); } @@ -42,4 +42,4 @@ public final class KeeperOfKookus extends CardImpl { public KeeperOfKookus copy() { return new KeeperOfKookus(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java index f2248c34ff5..85b5284fff2 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java @@ -49,7 +49,7 @@ public final class KeeperOfTheDead extends CardImpl { this.toughness = new MageInt(2); // {B}, {T}: Choose target opponent who had at least two fewer creature cards in their graveyard than you did as you activated this ability. Destroy target nonblack creature they control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KeeperOfTheDeadEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new KeeperOfTheDeadEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{B}")); ability.addTarget(new TargetPlayer(1, 1, false, filter)); ability.addTarget(new KeeperOfTheDeadCreatureTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java index ed60924f333..63f36cc5ac3 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java @@ -42,7 +42,7 @@ public final class KeeperOfTheNineGales extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}, Tap two untapped Birds you control: Return target permanent to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java index 69231633b92..8b21ca0e2fb 100644 --- a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java +++ b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java @@ -44,7 +44,7 @@ public final class KefnetTheMindful extends CardImpl { this.addAbility(new SimpleStaticAbility(new KefnetTheMindfulRestrictionEffect())); // {3}{U}: Draw a card, then you may return a land you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KefnetTheMindfulEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new KefnetTheMindfulEffect(), new ManaCostsImpl<>("{3}{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeiTakahashi.java b/Mage.Sets/src/mage/cards/k/KeiTakahashi.java index d13c1e824db..45d70ae4f84 100644 --- a/Mage.Sets/src/mage/cards/k/KeiTakahashi.java +++ b/Mage.Sets/src/mage/cards/k/KeiTakahashi.java @@ -31,7 +31,7 @@ public final class KeiTakahashi extends CardImpl { this.toughness = new MageInt(2); // {tap}: Prevent the next 2 damage that would be dealt to target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KeldonArsonist.java b/Mage.Sets/src/mage/cards/k/KeldonArsonist.java index 04cf99ff74c..5b3e8397481 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonArsonist.java +++ b/Mage.Sets/src/mage/cards/k/KeldonArsonist.java @@ -31,7 +31,7 @@ public final class KeldonArsonist extends CardImpl { this.toughness = new MageInt(1); // {1}, Sacrifice two lands: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(2, StaticFilters.FILTER_LANDS)); ability.addTarget(new TargetLandPermanent().withChooseHint("to destroy")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java b/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java index 2f903e31c04..1543346e478 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java +++ b/Mage.Sets/src/mage/cards/k/KeldonBattlewagon.java @@ -58,7 +58,7 @@ public final class KeldonBattlewagon extends CardImpl { .setText("sacrifice it at end of combat"), false).setTriggerPhrase("When {this} attacks, ")); // Tap an untapped creature you control: Keldon Battlewagon gets +X/+0 until end of turn, where X is the power of the creature tapped this way. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new KeldonBattlewagonBoostEffect(), new KeldonBattlewagonCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(new KeldonBattlewagonBoostEffect(), new KeldonBattlewagonCost(new TargetControlledPermanent(filter)))); } diff --git a/Mage.Sets/src/mage/cards/k/KeldonMantle.java b/Mage.Sets/src/mage/cards/k/KeldonMantle.java index a266d1d94b9..2abfa63a87e 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonMantle.java +++ b/Mage.Sets/src/mage/cards/k/KeldonMantle.java @@ -39,12 +39,12 @@ public final class KeldonMantle extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {B}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {G}: Enchanted creature gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java index faf642b4b73..810636d2a8e 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java +++ b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java @@ -31,7 +31,7 @@ public final class KeldonNecropolis extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {4}{R}, {T}, Sacrifice a creature: Keldon Necropolis deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KessigProwler.java b/Mage.Sets/src/mage/cards/k/KessigProwler.java index 061f2967ed5..0a0ddad939d 100644 --- a/Mage.Sets/src/mage/cards/k/KessigProwler.java +++ b/Mage.Sets/src/mage/cards/k/KessigProwler.java @@ -30,7 +30,7 @@ public final class KessigProwler extends CardImpl { // {4}{G}: Transform Kessig Prowler. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{4}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{4}{G}"))); } private KessigProwler(final KessigProwler card) { diff --git a/Mage.Sets/src/mage/cards/k/KherKeep.java b/Mage.Sets/src/mage/cards/k/KherKeep.java index c9f9a6d1585..7e4a225db57 100644 --- a/Mage.Sets/src/mage/cards/k/KherKeep.java +++ b/Mage.Sets/src/mage/cards/k/KherKeep.java @@ -28,7 +28,7 @@ public final class KherKeep extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{R}, {T}: Create a 0/1 red Kobold creature token named Kobolds of Kher Keep. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KherKeepKoboldToken()), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new KherKeepKoboldToken()), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java b/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java index 4ec6296a2bf..d9a96cff04b 100644 --- a/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java +++ b/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java @@ -53,7 +53,7 @@ public final class KheruBloodsucker extends CardImpl { this.addAbility(ability); // {2}{B}, Sacrifice another creature: Put a +1/+1 counter on Kheru Bloodsucker. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}{B}")); + ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KheruDreadmaw.java b/Mage.Sets/src/mage/cards/k/KheruDreadmaw.java index c55b6befaa7..b85d9dee7bc 100644 --- a/Mage.Sets/src/mage/cards/k/KheruDreadmaw.java +++ b/Mage.Sets/src/mage/cards/k/KheruDreadmaw.java @@ -39,7 +39,7 @@ public final class KheruDreadmaw extends CardImpl { // {1}{G}, Sacrifice another creature: You gain life equal to the sacrificed creature's toughness. Effect effect = new GainLifeEffect(SacrificeCostCreaturesToughness.instance); effect.setText("You gain life equal to the sacrificed creature's toughness"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java index 1da89f902eb..321feeb05eb 100644 --- a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java +++ b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java @@ -49,7 +49,7 @@ public final class KikiJikiMirrorBreaker extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {T}: Create a token that's a copy of target nonlegendary creature you control, except it has haste. Sacrifice it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KikiJikiMirrorBreakerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new KikiJikiMirrorBreakerEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KillSuitCultist.java b/Mage.Sets/src/mage/cards/k/KillSuitCultist.java index 384789b555a..90067e545ea 100644 --- a/Mage.Sets/src/mage/cards/k/KillSuitCultist.java +++ b/Mage.Sets/src/mage/cards/k/KillSuitCultist.java @@ -38,7 +38,7 @@ public final class KillSuitCultist extends CardImpl { // Kill-Suit Cultist attacks each turn if able. this.addAbility(new AttacksEachCombatStaticAbility()); // {B}, Sacrifice Kill-Suit Cultist: The next time damage would be dealt to target creature this turn, destroy that creature instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KillSuitCultistEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new KillSuitCultistEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KillerBees.java b/Mage.Sets/src/mage/cards/k/KillerBees.java index 1f0b5eab335..9b773a7c7dc 100644 --- a/Mage.Sets/src/mage/cards/k/KillerBees.java +++ b/Mage.Sets/src/mage/cards/k/KillerBees.java @@ -30,7 +30,7 @@ public final class KillerBees extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}: Killer 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}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KinTreeWarden.java b/Mage.Sets/src/mage/cards/k/KinTreeWarden.java index eb1daf227bf..ee7a5ca9faa 100644 --- a/Mage.Sets/src/mage/cards/k/KinTreeWarden.java +++ b/Mage.Sets/src/mage/cards/k/KinTreeWarden.java @@ -29,7 +29,7 @@ public final class KinTreeWarden extends CardImpl { this.toughness = new MageInt(1); // {2}: Regenerate Kin-Tree Warden - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(2))); // Morph {G} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{G}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KindredBoon.java b/Mage.Sets/src/mage/cards/k/KindredBoon.java index f3e5e783820..17a146b6983 100644 --- a/Mage.Sets/src/mage/cards/k/KindredBoon.java +++ b/Mage.Sets/src/mage/cards/k/KindredBoon.java @@ -42,7 +42,7 @@ public final class KindredBoon extends CardImpl { // {1}{W}: Put a divinity counter on target creature you control of the chosen type. FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control of the chosen type"); filter.add(ChosenSubtypePredicate.TRUE); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KingCrab.java b/Mage.Sets/src/mage/cards/k/KingCrab.java index 293724f66a7..31e6bc413ec 100644 --- a/Mage.Sets/src/mage/cards/k/KingCrab.java +++ b/Mage.Sets/src/mage/cards/k/KingCrab.java @@ -38,7 +38,7 @@ public final class KingCrab extends CardImpl { this.toughness = new MageInt(5); // {1}{U}, {tap}: Put target green creature on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KingSuleiman.java b/Mage.Sets/src/mage/cards/k/KingSuleiman.java index 209f517c8cc..374cecac72e 100644 --- a/Mage.Sets/src/mage/cards/k/KingSuleiman.java +++ b/Mage.Sets/src/mage/cards/k/KingSuleiman.java @@ -38,7 +38,7 @@ public final class KingSuleiman extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target Djinn or Efreet. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KiorasFollower.java b/Mage.Sets/src/mage/cards/k/KiorasFollower.java index b87413fab6c..5e80b5f30fb 100644 --- a/Mage.Sets/src/mage/cards/k/KiorasFollower.java +++ b/Mage.Sets/src/mage/cards/k/KiorasFollower.java @@ -35,7 +35,7 @@ public final class KiorasFollower extends CardImpl { this.toughness = new MageInt(2); // {T}: Untap another target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KirdChieftain.java b/Mage.Sets/src/mage/cards/k/KirdChieftain.java index b6ea9a296dd..2c3c0bac46c 100644 --- a/Mage.Sets/src/mage/cards/k/KirdChieftain.java +++ b/Mage.Sets/src/mage/cards/k/KirdChieftain.java @@ -52,7 +52,7 @@ public final class KirdChieftain extends CardImpl { // {4}{G}: Target creature gets +2/+2 and gains trample until end of turn. Effect effect = new BoostTargetEffect(2, 2, Duration.EndOfTurn); effect.setText("Target creature gets +2/+2"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{4}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{4}{G}")); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/k/KithkinDaggerdare.java b/Mage.Sets/src/mage/cards/k/KithkinDaggerdare.java index 2a57acc11cc..5cc921e511b 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinDaggerdare.java +++ b/Mage.Sets/src/mage/cards/k/KithkinDaggerdare.java @@ -26,7 +26,7 @@ public final class KithkinDaggerdare extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KithkinHealer.java b/Mage.Sets/src/mage/cards/k/KithkinHealer.java index ac41429a20a..d597ef2b487 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinHealer.java +++ b/Mage.Sets/src/mage/cards/k/KithkinHealer.java @@ -28,7 +28,7 @@ public final class KithkinHealer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java b/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java index 965390d9c00..e187ff6cc05 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java +++ b/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java @@ -34,7 +34,7 @@ public final class KithkinSpellduster extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}, Sacrifice Kithkin Spellduster: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetEnchantmentPermanent()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java b/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java index d5f2e648d8f..06b7c1f5313 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java @@ -36,7 +36,7 @@ public final class KitsuneDiviner extends CardImpl { this.toughness = new MageInt(1); // {T}: Tap target Spirit. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java index eaadf7c8d7b..bcf1ba79a41 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java @@ -39,11 +39,11 @@ public final class KitsuneHealer extends CardImpl { this.toughness = new MageInt(2); // {T}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); // {T}: Prevent all damage that would be dealt to target legendary creature this turn. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new TapSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/k/KitsuneLoreweaver.java b/Mage.Sets/src/mage/cards/k/KitsuneLoreweaver.java index 5d4ae020710..2ac7d9148d3 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneLoreweaver.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneLoreweaver.java @@ -32,7 +32,7 @@ public final class KitsuneLoreweaver extends CardImpl { // {1}{W}: Kitsune Loreweaver gets +0/+X until end of turn, where X is the number of cards in your hand. Effect effect = new BoostSourceEffect(StaticValue.get(0), CardsInControllerHandCount.instance, Duration.EndOfTurn); effect.setText("{this} gets +0/+X until end of turn, where X is the number of cards in your hand"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}"))); } private KitsuneLoreweaver(final KitsuneLoreweaver card) { diff --git a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java index f6526d257bf..dc71085527f 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java @@ -75,7 +75,7 @@ class AutumnTailKitsuneSage extends TokenImpl { toughness = new MageInt(5); // {1}: Attach target Aura attached to a creature to another creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AutumnTailEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AutumnTailEffect(), new GenericManaCost(1)); ability.addTarget(new TargetPermanent(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KitsunePalliator.java b/Mage.Sets/src/mage/cards/k/KitsunePalliator.java index e47b071f95c..b8841071d9c 100644 --- a/Mage.Sets/src/mage/cards/k/KitsunePalliator.java +++ b/Mage.Sets/src/mage/cards/k/KitsunePalliator.java @@ -33,7 +33,7 @@ public final class KitsunePalliator extends CardImpl { this.toughness = new MageInt(2); // {T}: Prevent the next 1 damage that would be dealt to each creature and each player this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new KitsunePalliatorEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new KitsunePalliatorEffect(), new TapSourceCost())); } private KitsunePalliator(final KitsunePalliator card) { diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranDead.java b/Mage.Sets/src/mage/cards/k/KjeldoranDead.java index aed3b5e6dcb..3f98d25ad56 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranDead.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranDead.java @@ -33,7 +33,7 @@ public final class KjeldoranDead extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, null)); this.addAbility(ability); // {B}: Regenerate Kjeldoran Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private KjeldoranDead(final KjeldoranDead card) { diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranKnight.java b/Mage.Sets/src/mage/cards/k/KjeldoranKnight.java index 6eb36d413cd..73f498bc35e 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranKnight.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranKnight.java @@ -32,10 +32,10 @@ public final class KjeldoranKnight extends CardImpl { this.addAbility(BandingAbility.getInstance()); // {1}{W}: Kjeldoran Knight gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); // {W}{W}: Kjeldoran Knight gets +0/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private KjeldoranKnight(final KjeldoranKnight card) { diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java b/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java index b5fabae1b06..aaab3833755 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java @@ -40,7 +40,7 @@ public final class KjeldoranOutpost extends CardImpl { // {tap}: Add {W}. this.addAbility(new WhiteManaAbility()); // {1}{W}, {tap}: Create a 1/1 white Soldier creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranOutrider.java b/Mage.Sets/src/mage/cards/k/KjeldoranOutrider.java index b5ad32c345e..70418b71bbd 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranOutrider.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranOutrider.java @@ -27,7 +27,7 @@ public final class KjeldoranOutrider extends CardImpl { this.toughness = new MageInt(2); // {W}: Kjeldoran Outrider gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private KjeldoranOutrider(final KjeldoranOutrider card) { diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranRoyalGuard.java b/Mage.Sets/src/mage/cards/k/KjeldoranRoyalGuard.java index ec8c5247d89..16f83b34494 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranRoyalGuard.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranRoyalGuard.java @@ -37,7 +37,7 @@ public final class KjeldoranRoyalGuard extends CardImpl { this.toughness = new MageInt(5); // {tap}: All combat damage that would be dealt to you by unblocked creatures this turn is dealt to Kjeldoran Royal Guard instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new KjeldoranRoyalGuardEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new KjeldoranRoyalGuardEffect(), new TapSourceCost())); } private KjeldoranRoyalGuard(final KjeldoranRoyalGuard card) { diff --git a/Mage.Sets/src/mage/cards/k/KnacksawClique.java b/Mage.Sets/src/mage/cards/k/KnacksawClique.java index 23c97ddb412..03dff9bcdce 100644 --- a/Mage.Sets/src/mage/cards/k/KnacksawClique.java +++ b/Mage.Sets/src/mage/cards/k/KnacksawClique.java @@ -44,7 +44,7 @@ public final class KnacksawClique extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{U}, {untap}: Target opponent exiles the top card of their library. Until end of turn, you may play that card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KnacksawCliqueEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new KnacksawCliqueEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java b/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java index dc8c6dae5fa..592c87c3bb9 100644 --- a/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java +++ b/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java @@ -38,7 +38,7 @@ public final class KnightCaptainOfEos extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SoldierToken(), 2), false)); // {W}, Sacrifice a Soldier: Prevent all combat damage that would be dealt this turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KnightOfDawn.java b/Mage.Sets/src/mage/cards/k/KnightOfDawn.java index 781d80bc6c1..0ab69ee6aeb 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfDawn.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfDawn.java @@ -30,7 +30,7 @@ public final class KnightOfDawn extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {W}{W}: Knight of Dawn gains protection from the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private KnightOfDawn(final KnightOfDawn card) { diff --git a/Mage.Sets/src/mage/cards/k/KnightOfStromgald.java b/Mage.Sets/src/mage/cards/k/KnightOfStromgald.java index ec46a9a746f..257187e22ad 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfStromgald.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfStromgald.java @@ -35,10 +35,10 @@ public final class KnightOfStromgald extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // {B}: Knight of Stromgald gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {B}{B}: Knight of Stromgald gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); } private KnightOfStromgald(final KnightOfStromgald card) { diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java index 5771ee61306..94cbf5ef173 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java @@ -47,7 +47,7 @@ public final class KnightOfTheReliquary extends CardImpl { // {T}, Sacrifice a Forest or Plains: Search your library for a land card, put it onto the battlefield, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_LAND); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java index 3c6575704e3..f63a809d417 100644 --- a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java +++ b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java @@ -33,7 +33,7 @@ public final class KnollspineInvocation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); // {X}, Discard a card with converted mana cost X: Knollspine Invocation deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance, true), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance, true), new ManaCostsImpl<>("{X}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand(filter))); ability.addTarget(new TargetAnyTarget()); ability.setCostAdjuster(KnollspineInvocationAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/k/KnowledgeVault.java b/Mage.Sets/src/mage/cards/k/KnowledgeVault.java index e24f0d58ed8..b16572c7f98 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgeVault.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgeVault.java @@ -37,7 +37,7 @@ public final class KnowledgeVault extends CardImpl { this.addAbility(ability); // {0}: Sacrifice Knowledge Vault. If you do, discard your hand, then put all cards exiled with Knowledge Vault into their owner’s hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new KnowledgeVaultReturnEffect(), new GenericManaCost(0))); + this.addAbility(new SimpleActivatedAbility(new KnowledgeVaultReturnEffect(), new GenericManaCost(0))); // When Knowledge Vault leaves the battlefield, put all cards exiled with Knowledge Vault into their owner’s graveyard. this.addAbility(new LeavesBattlefieldTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/k/KolaghanMonument.java b/Mage.Sets/src/mage/cards/k/KolaghanMonument.java index f8fc596e942..6fc816ae5ca 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanMonument.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanMonument.java @@ -31,7 +31,7 @@ public final class KolaghanMonument extends CardImpl { this.addAbility(new RedManaAbility()); // {4}{B}{R}: Kolaghan Monument becomes a 4/4 black and red Dragon artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect (new KolaghanMonumentToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{B}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/k/Kookus.java b/Mage.Sets/src/mage/cards/k/Kookus.java index eaf313b0398..58f55d78a1a 100644 --- a/Mage.Sets/src/mage/cards/k/Kookus.java +++ b/Mage.Sets/src/mage/cards/k/Kookus.java @@ -58,7 +58,7 @@ public final class Kookus extends CardImpl { )); // {R}: Kookus 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))); } private Kookus(final Kookus card) { diff --git a/Mage.Sets/src/mage/cards/k/KorHaven.java b/Mage.Sets/src/mage/cards/k/KorHaven.java index 2b44ec1469c..77943628783 100644 --- a/Mage.Sets/src/mage/cards/k/KorHaven.java +++ b/Mage.Sets/src/mage/cards/k/KorHaven.java @@ -33,7 +33,7 @@ public final class KorHaven extends CardImpl { // {1}{W}, {tap}: Prevent all combat damage that would be dealt by target attacking creature this turn. Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt by target attacking creature this turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KorLineSlinger.java b/Mage.Sets/src/mage/cards/k/KorLineSlinger.java index 1e5dd08ba2f..35c54e7594d 100644 --- a/Mage.Sets/src/mage/cards/k/KorLineSlinger.java +++ b/Mage.Sets/src/mage/cards/k/KorLineSlinger.java @@ -36,7 +36,7 @@ public final class KorLineSlinger extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KorSkyClimber.java b/Mage.Sets/src/mage/cards/k/KorSkyClimber.java index 50664182187..b12f8529749 100644 --- a/Mage.Sets/src/mage/cards/k/KorSkyClimber.java +++ b/Mage.Sets/src/mage/cards/k/KorSkyClimber.java @@ -29,7 +29,7 @@ public final class KorSkyClimber extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Kor Sky Climber gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private KorSkyClimber(final KorSkyClimber card) { diff --git a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java index 15a6396541a..8ab3f8439a8 100644 --- a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java +++ b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java @@ -48,7 +48,7 @@ public final class KorlashHeirToBlackblade extends CardImpl { // {1}{B}: Regenerate Korlash. Effect effect = new RegenerateSourceEffect(); effect.setText("Regenerate Korlash."); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}"))); // Grandeur - Discard another card named Korlash, Heir to Blackblade: Search your library for up to two Swamp cards, put them onto the battlefield tapped, then shuffle your library. effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filterCard), true); diff --git a/Mage.Sets/src/mage/cards/k/KorozdaGorgon.java b/Mage.Sets/src/mage/cards/k/KorozdaGorgon.java index 0ba6dcf7c48..6291b546f4d 100644 --- a/Mage.Sets/src/mage/cards/k/KorozdaGorgon.java +++ b/Mage.Sets/src/mage/cards/k/KorozdaGorgon.java @@ -35,7 +35,7 @@ public final class KorozdaGorgon extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // {2}, Remove a +1/+1 counter from a creature you control: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1,-1, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1,-1, Duration.EndOfTurn), new GenericManaCost(2)); ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(), CounterType.P1P1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java b/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java index 51bd16acf08..a23bd556cb5 100644 --- a/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java +++ b/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java @@ -56,7 +56,7 @@ public final class KozilekTheGreatDistortion extends CardImpl { this.addAbility(new MenaceAbility(false)); // Discard a card with converted mana cost X: Counter target spell with converted mana cost X. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new KozilekDiscardCost()); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new KozilekDiscardCost()); ability.addTarget(new TargetSpell(new FilterSpell("spell with mana value X"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KozileksPathfinder.java b/Mage.Sets/src/mage/cards/k/KozileksPathfinder.java index 211b55974d1..451c9c05559 100644 --- a/Mage.Sets/src/mage/cards/k/KozileksPathfinder.java +++ b/Mage.Sets/src/mage/cards/k/KozileksPathfinder.java @@ -28,7 +28,7 @@ public final class KozileksPathfinder extends CardImpl { this.toughness = new MageInt(5); // {C}: Target creature can't block Kozilek's Pathfinder this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{C}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KozileksShrieker.java b/Mage.Sets/src/mage/cards/k/KozileksShrieker.java index 655c001b679..e65da90ff55 100644 --- a/Mage.Sets/src/mage/cards/k/KozileksShrieker.java +++ b/Mage.Sets/src/mage/cards/k/KozileksShrieker.java @@ -36,7 +36,7 @@ public final class KozileksShrieker extends CardImpl { // {C}: Kozilek's Shrieker gets +1/+0 and gains menace 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 ManaCostsImpl<>("{C}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{C}")); effect = new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn); effect.setText("and gains menace until end of turn. " + "(It can't be blocked except by two or more creatures. {C} represents colorless mana.)"); diff --git a/Mage.Sets/src/mage/cards/k/Krakilin.java b/Mage.Sets/src/mage/cards/k/Krakilin.java index 97f9aebbf40..96172afbb79 100644 --- a/Mage.Sets/src/mage/cards/k/Krakilin.java +++ b/Mage.Sets/src/mage/cards/k/Krakilin.java @@ -31,7 +31,7 @@ public final class Krakilin extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // {1}{G}: Regenerate Krakilin. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private Krakilin(final Krakilin card) { diff --git a/Mage.Sets/src/mage/cards/k/Kranioceros.java b/Mage.Sets/src/mage/cards/k/Kranioceros.java index 7541ce3a4b9..61501aec305 100644 --- a/Mage.Sets/src/mage/cards/k/Kranioceros.java +++ b/Mage.Sets/src/mage/cards/k/Kranioceros.java @@ -27,7 +27,7 @@ public final class Kranioceros extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private Kranioceros(final Kranioceros card) { diff --git a/Mage.Sets/src/mage/cards/k/KrarkClanEngineers.java b/Mage.Sets/src/mage/cards/k/KrarkClanEngineers.java index 9900e94f618..9892a8d8b8f 100644 --- a/Mage.Sets/src/mage/cards/k/KrarkClanEngineers.java +++ b/Mage.Sets/src/mage/cards/k/KrarkClanEngineers.java @@ -33,7 +33,7 @@ public final class KrarkClanEngineers extends CardImpl { this.toughness = new MageInt(2); // {R}, Sacrifice two artifacts: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(2, StaticFilters.FILTER_PERMANENT_ARTIFACTS)); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KrarkClanGrunt.java b/Mage.Sets/src/mage/cards/k/KrarkClanGrunt.java index 365cf44bd8b..22543f31738 100644 --- a/Mage.Sets/src/mage/cards/k/KrarkClanGrunt.java +++ b/Mage.Sets/src/mage/cards/k/KrarkClanGrunt.java @@ -39,7 +39,7 @@ public final class KrarkClanGrunt extends CardImpl { this.toughness = new MageInt(2); // Sacrifice an artifact: Krark-Clan Grunt gets +1/+0 and gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn) .setText("{this} gets +1/+0"), new SacrificeTargetCost(filter)); ability.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn) .setText("and gains first strike until end of turn")); diff --git a/Mage.Sets/src/mage/cards/k/KrarkClanOgre.java b/Mage.Sets/src/mage/cards/k/KrarkClanOgre.java index feea7369f40..ad59e628d80 100644 --- a/Mage.Sets/src/mage/cards/k/KrarkClanOgre.java +++ b/Mage.Sets/src/mage/cards/k/KrarkClanOgre.java @@ -33,7 +33,7 @@ public final class KrarkClanOgre extends CardImpl { this.toughness = new MageInt(3); // {R}, Sacrifice an artifact: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KrarkClanShaman.java b/Mage.Sets/src/mage/cards/k/KrarkClanShaman.java index b68e8e98d1b..d3e05fe92ae 100644 --- a/Mage.Sets/src/mage/cards/k/KrarkClanShaman.java +++ b/Mage.Sets/src/mage/cards/k/KrarkClanShaman.java @@ -39,7 +39,7 @@ public final class KrarkClanShaman extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filterTargetedCreatures), new SacrificeTargetCost(filterSacrificed))); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filterTargetedCreatures), new SacrificeTargetCost(filterSacrificed))); } private KrarkClanShaman(final KrarkClanShaman card) { diff --git a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java index f321fc3b281..61cf8647f27 100644 --- a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java +++ b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java @@ -42,7 +42,7 @@ public final class KrasisIncubation extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // {1}{G}{U}, Return Krasis Incubation to its owner's hand: Put two +1/+1 counters on enchanted creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(2), new ManaCostsImpl<>("{1}{G}{U}")); + ability = new SimpleActivatedAbility(new AddPlusOneCountersAttachedEffect(2), new ManaCostsImpl<>("{1}{G}{U}")); ability.addCost(new ReturnToHandFromBattlefieldSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KraulWarrior.java b/Mage.Sets/src/mage/cards/k/KraulWarrior.java index f6549b71274..3e62e06bb09 100644 --- a/Mage.Sets/src/mage/cards/k/KraulWarrior.java +++ b/Mage.Sets/src/mage/cards/k/KraulWarrior.java @@ -31,7 +31,7 @@ public final class KraulWarrior extends CardImpl { this.toughness = new MageInt(2); // {5}{G}: Kraul Warrior gets +3/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3,3,Duration.EndOfTurn), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(3,3,Duration.EndOfTurn), new ManaCostsImpl<>("{5}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KrisMage.java b/Mage.Sets/src/mage/cards/k/KrisMage.java index 3047d7b0108..571e928e5c3 100644 --- a/Mage.Sets/src/mage/cards/k/KrisMage.java +++ b/Mage.Sets/src/mage/cards/k/KrisMage.java @@ -30,7 +30,7 @@ public final class KrisMage extends CardImpl { this.toughness = new MageInt(1); // {R}, {tap}, Discard a card: Kris Mage deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KrosanArcher.java b/Mage.Sets/src/mage/cards/k/KrosanArcher.java index ba095d1e5a7..013c37deb65 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanArcher.java +++ b/Mage.Sets/src/mage/cards/k/KrosanArcher.java @@ -33,7 +33,7 @@ public final class KrosanArcher extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {G}, Discard a card: Krosan Archer gets +0/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0,2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(0,2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KrosanConstrictor.java b/Mage.Sets/src/mage/cards/k/KrosanConstrictor.java index 61f8efb8b85..fcdba83d14d 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanConstrictor.java +++ b/Mage.Sets/src/mage/cards/k/KrosanConstrictor.java @@ -40,7 +40,7 @@ public final class KrosanConstrictor extends CardImpl { // Swampwalk this.addAbility(new SwampwalkAbility()); // {tap}: Target black creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -0, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java b/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java index e964474c55d..0a8a6417c7c 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java +++ b/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java @@ -36,7 +36,7 @@ public final class KrosanGroundshaker extends CardImpl { this.toughness = new MageInt(6); // {G}: Target Beast creature gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java index f56226ff8cf..1127b1f174e 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java @@ -44,7 +44,7 @@ public final class KrovikanHorror extends CardImpl { )); // {1}, Sacrifice a creature: Krovikan Horror deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java b/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java index 8578dbffdb8..7f63e901360 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java @@ -41,12 +41,12 @@ public final class KrovikanSorcerer extends CardImpl { this.toughness = new MageInt(1); // {tap}, Discard a nonblack card: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(filterNonBlack))); this.addAbility(ability); // {tap}, Discard a black card: Draw two cards, then discard one of them. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardOneOfThemEffect(2), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DrawDiscardOneOfThemEffect(2), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(filterBlack))); this.addAbility(ability); } @@ -59,4 +59,4 @@ public final class KrovikanSorcerer extends CardImpl { public KrovikanSorcerer copy() { return new KrovikanSorcerer(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KryShield.java b/Mage.Sets/src/mage/cards/k/KryShield.java index d72c3d74843..3f4b0556562 100644 --- a/Mage.Sets/src/mage/cards/k/KryShield.java +++ b/Mage.Sets/src/mage/cards/k/KryShield.java @@ -30,7 +30,7 @@ public final class KryShield extends CardImpl { // {2}, {T}: Prevent all damage that would be dealt this turn by target creature you control. That creature gets +0/+X until end of turn, where X is its converted mana cost. Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, false); effect.setText("Prevent all damage that would be dealt this turn by target creature you control"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(2)); ability.addEffect(new BoostTargetEffect(StaticValue.get(0), TargetManaValue.instance, Duration.EndOfTurn) .setText("That creature gets +0/+X until end of turn, where X is its mana value")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java index 5dfa0f80147..55ec3a99f98 100644 --- a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java +++ b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java @@ -45,7 +45,7 @@ public final class KukemssaSerpent extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {U}, Sacrifice an Island: Target land an opponent controls becomes an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeTargetCost(filterControlledLand)); ability.addTarget(new TargetLandPermanent(filterOpponentLand)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java index 6415801d3a5..7c05a543bb0 100644 --- a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java @@ -30,7 +30,7 @@ public final class KumanoMasterYamabushi extends CardImpl { this.toughness = new MageInt(4); // {1}{R}: Kumano, Master Yamabushi deals 1 damage to any target. - 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 TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Kumano this turn would die, exile it instead. diff --git a/Mage.Sets/src/mage/cards/k/KuroPitlord.java b/Mage.Sets/src/mage/cards/k/KuroPitlord.java index ee3b52ce025..3253cc66e67 100644 --- a/Mage.Sets/src/mage/cards/k/KuroPitlord.java +++ b/Mage.Sets/src/mage/cards/k/KuroPitlord.java @@ -32,7 +32,7 @@ public final class KuroPitlord extends CardImpl { // At the beginning of your upkeep, sacrifice Kuro, Pitlord unless you pay {B}{B}{B}{B}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}{B}{B}{B}")))); // Pay 1 life: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new PayLifeCost(1)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new PayLifeCost(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KurosTaken.java b/Mage.Sets/src/mage/cards/k/KurosTaken.java index 80a896e18fb..dc803218618 100644 --- a/Mage.Sets/src/mage/cards/k/KurosTaken.java +++ b/Mage.Sets/src/mage/cards/k/KurosTaken.java @@ -28,7 +28,7 @@ public final class KurosTaken extends CardImpl { this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); // {1}{B}: Regenerate Kuro's Taken. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private KurosTaken(final KurosTaken card) { diff --git a/Mage.Sets/src/mage/cards/k/KusariGama.java b/Mage.Sets/src/mage/cards/k/KusariGama.java index ec3b687b642..ff3168ca07c 100644 --- a/Mage.Sets/src/mage/cards/k/KusariGama.java +++ b/Mage.Sets/src/mage/cards/k/KusariGama.java @@ -39,7 +39,7 @@ public final class KusariGama extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{2}: This creature gets +1/+0 until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); + Ability gainedAbility = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{2}: This creature gets +1/+0 until end of turn.\""); Ability ability = new SimpleStaticAbility(effect); diff --git a/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java b/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java index 6bba24fd31c..7e0f854d9b6 100644 --- a/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java +++ b/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java @@ -46,7 +46,7 @@ public final class KytheonHeroOfAkros extends CardImpl { + "then return him to the battlefield transformed under his owner's control."), new AttackedOrBlockedThisCombatWatcher()); // {2}{W}: Kytheon gains indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KytheonsIrregulars.java b/Mage.Sets/src/mage/cards/k/KytheonsIrregulars.java index d154b42e160..c29937fc681 100644 --- a/Mage.Sets/src/mage/cards/k/KytheonsIrregulars.java +++ b/Mage.Sets/src/mage/cards/k/KytheonsIrregulars.java @@ -33,7 +33,7 @@ public final class KytheonsIrregulars extends CardImpl { // if it isn't renowned // put a +1/+1 counter on it and it becomes renowned.)("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } -- 2.47.2 From c3e4b64ead9b762354d83ef80425a73ad203f8e9 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:28:52 -0500 Subject: [PATCH 38/50] refactor: SimpleActivatedAbility default zone (cards L M) --- Mage.Sets/src/mage/cards/l/LadyCaleria.java | 2 +- Mage.Sets/src/mage/cards/l/LadyEvangela.java | 2 +- Mage.Sets/src/mage/cards/l/LairOfTheHydra.java | 2 +- Mage.Sets/src/mage/cards/l/LancersEnKor.java | 2 +- Mage.Sets/src/mage/cards/l/LandsEdge.java | 2 +- Mage.Sets/src/mage/cards/l/LanternSpirit.java | 2 +- Mage.Sets/src/mage/cards/l/LaquatussChampion.java | 2 +- Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java | 2 +- Mage.Sets/src/mage/cards/l/LavaZombie.java | 2 +- Mage.Sets/src/mage/cards/l/LavaclawReaches.java | 4 ++-- Mage.Sets/src/mage/cards/l/LavamancersSkill.java | 4 ++-- Mage.Sets/src/mage/cards/l/LavastepRaider.java | 2 +- Mage.Sets/src/mage/cards/l/Lawbringer.java | 2 +- Mage.Sets/src/mage/cards/l/LeadBellyChimera.java | 2 +- Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java | 2 +- Mage.Sets/src/mage/cards/l/LeapingLizard.java | 2 +- Mage.Sets/src/mage/cards/l/LeapingMaster.java | 2 +- Mage.Sets/src/mage/cards/l/LeechBonder.java | 2 +- Mage.Sets/src/mage/cards/l/LegacysAllure.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninBattlemage.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninBladetrap.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninSunStandard.java | 2 +- Mage.Sets/src/mage/cards/l/LethalVapors.java | 2 +- Mage.Sets/src/mage/cards/l/LeyDruid.java | 2 +- Mage.Sets/src/mage/cards/l/LiarsPendulum.java | 2 +- Mage.Sets/src/mage/cards/l/LiberatedDwarf.java | 2 +- Mage.Sets/src/mage/cards/l/LieutenantKirtar.java | 2 +- Mage.Sets/src/mage/cards/l/Lifeforce.java | 2 +- Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java | 4 ++-- Mage.Sets/src/mage/cards/l/Lightbringer.java | 2 +- Mage.Sets/src/mage/cards/l/LightningCrafter.java | 2 +- Mage.Sets/src/mage/cards/l/LightningDragon.java | 4 ++-- Mage.Sets/src/mage/cards/l/LightningProwess.java | 2 +- Mage.Sets/src/mage/cards/l/LightningRigCrew.java | 2 +- Mage.Sets/src/mage/cards/l/LightningVolley.java | 2 +- Mage.Sets/src/mage/cards/l/LikenessLooter.java | 2 +- Mage.Sets/src/mage/cards/l/LilianasShade.java | 2 +- Mage.Sets/src/mage/cards/l/LiltingRefrain.java | 2 +- Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java | 2 +- Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java | 2 +- Mage.Sets/src/mage/cards/l/LimestoneGolem.java | 2 +- Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java | 2 +- Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java | 2 +- Mage.Sets/src/mage/cards/l/LionheartMaverick.java | 2 +- Mage.Sets/src/mage/cards/l/LiquimetalCoating.java | 2 +- Mage.Sets/src/mage/cards/l/LivingAirship.java | 2 +- Mage.Sets/src/mage/cards/l/LivingArmor.java | 2 +- Mage.Sets/src/mage/cards/l/LivingInferno.java | 2 +- Mage.Sets/src/mage/cards/l/LivingWall.java | 2 +- Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java | 2 +- Mage.Sets/src/mage/cards/l/LlanowarCavalry.java | 2 +- Mage.Sets/src/mage/cards/l/LlanowarMentor.java | 2 +- Mage.Sets/src/mage/cards/l/LobberCrew.java | 2 +- Mage.Sets/src/mage/cards/l/LobeLobber.java | 2 +- Mage.Sets/src/mage/cards/l/LochKorrigan.java | 2 +- Mage.Sets/src/mage/cards/l/LocustSwarm.java | 2 +- Mage.Sets/src/mage/cards/l/LodestoneBauble.java | 2 +- Mage.Sets/src/mage/cards/l/LodestoneMyr.java | 2 +- Mage.Sets/src/mage/cards/l/LongtuskCub.java | 2 +- Mage.Sets/src/mage/cards/l/LoomingShade.java | 2 +- Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfLineage.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java | 2 +- Mage.Sets/src/mage/cards/l/LoreBroker.java | 2 +- Mage.Sets/src/mage/cards/l/LowlandOaf.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonHierarch.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonMender.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonMystic.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonStalwart.java | 2 +- Mage.Sets/src/mage/cards/l/LoyalTauntaun.java | 2 +- Mage.Sets/src/mage/cards/l/LudevicsTestSubject.java | 2 +- Mage.Sets/src/mage/cards/l/LukeSkywalker.java | 2 +- Mage.Sets/src/mage/cards/l/LullmageMentor.java | 2 +- Mage.Sets/src/mage/cards/l/LumberingFalls.java | 2 +- Mage.Sets/src/mage/cards/l/LumengridAugur.java | 2 +- Mage.Sets/src/mage/cards/l/LuminousGuardian.java | 4 ++-- Mage.Sets/src/mage/cards/l/LunarAvenger.java | 2 +- Mage.Sets/src/mage/cards/l/LurkingEvil.java | 2 +- Mage.Sets/src/mage/cards/l/LurkingInformant.java | 2 +- Mage.Sets/src/mage/cards/l/LuxCannon.java | 4 ++-- Mage.Sets/src/mage/cards/l/LuxaRiverShrine.java | 2 +- Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java | 2 +- Mage.Sets/src/mage/cards/m/MadAuntie.java | 2 +- Mage.Sets/src/mage/cards/m/MadProphet.java | 2 +- Mage.Sets/src/mage/cards/m/MageIlVec.java | 2 +- Mage.Sets/src/mage/cards/m/MageRingNetwork.java | 2 +- Mage.Sets/src/mage/cards/m/MageRingResponder.java | 2 +- Mage.Sets/src/mage/cards/m/MagetaTheLion.java | 2 +- Mage.Sets/src/mage/cards/m/MagewrightsStone.java | 2 +- Mage.Sets/src/mage/cards/m/MagistratesScepter.java | 4 ++-- Mage.Sets/src/mage/cards/m/MagmaMine.java | 4 ++-- Mage.Sets/src/mage/cards/m/MagmaVein.java | 2 +- Mage.Sets/src/mage/cards/m/Magmaw.java | 2 +- Mage.Sets/src/mage/cards/m/MagnifyingGlass.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheArena.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheBazaar.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheCandelabra.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheDisk.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheMind.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java | 2 +- Mage.Sets/src/mage/cards/m/MaintenanceDroid.java | 2 +- Mage.Sets/src/mage/cards/m/MajorTeroh.java | 2 +- Mage.Sets/src/mage/cards/m/MalachOfTheDawn.java | 2 +- Mage.Sets/src/mage/cards/m/MalachiteGolem.java | 2 +- Mage.Sets/src/mage/cards/m/MalevolentAwakening.java | 2 +- Mage.Sets/src/mage/cards/m/MaliciousIntent.java | 2 +- Mage.Sets/src/mage/cards/m/ManaLeech.java | 2 +- Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java | 4 ++-- Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java | 2 +- Mage.Sets/src/mage/cards/m/MangarasTome.java | 2 +- .../src/mage/cards/m/MannichiTheFeveredDream.java | 2 +- Mage.Sets/src/mage/cards/m/ManorGargoyle.java | 2 +- Mage.Sets/src/mage/cards/m/ManorSkeleton.java | 2 +- Mage.Sets/src/mage/cards/m/ManrikiGusari.java | 2 +- Mage.Sets/src/mage/cards/m/MantaRiders.java | 2 +- Mage.Sets/src/mage/cards/m/MantisEngine.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java | 2 +- Mage.Sets/src/mage/cards/m/MarbleChalice.java | 2 +- Mage.Sets/src/mage/cards/m/MarchesasSmuggler.java | 2 +- Mage.Sets/src/mage/cards/m/MarduAscendancy.java | 2 +- Mage.Sets/src/mage/cards/m/MarduBanner.java | 2 +- Mage.Sets/src/mage/cards/m/MarduHateblade.java | 2 +- Mage.Sets/src/mage/cards/m/Marjhan.java | 2 +- Mage.Sets/src/mage/cards/m/MarkerBeetles.java | 2 +- Mage.Sets/src/mage/cards/m/MarkovDreadknight.java | 2 +- Mage.Sets/src/mage/cards/m/MarrowBats.java | 2 +- Mage.Sets/src/mage/cards/m/MarshFlitter.java | 2 +- Mage.Sets/src/mage/cards/m/MarshLurker.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrOfAshes.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrOfBones.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrOfFrost.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrOfSands.java | 2 +- Mage.Sets/src/mage/cards/m/MartyredRusalka.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrsCause.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrsTomb.java | 2 +- Mage.Sets/src/mage/cards/m/MasterApothecary.java | 2 +- Mage.Sets/src/mage/cards/m/MasterDecoy.java | 2 +- Mage.Sets/src/mage/cards/m/MasterHealer.java | 2 +- Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java | 2 +- Mage.Sets/src/mage/cards/m/MasterTransmuter.java | 2 +- Mage.Sets/src/mage/cards/m/MasteryOfTheUnseen.java | 2 +- Mage.Sets/src/mage/cards/m/Masticore.java | 4 ++-- Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java | 2 +- Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java | 2 +- Mage.Sets/src/mage/cards/m/MausoleumWanderer.java | 2 +- Mage.Sets/src/mage/cards/m/MawOfKozilek.java | 2 +- Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java | 2 +- Mage.Sets/src/mage/cards/m/Mawcor.java | 2 +- Mage.Sets/src/mage/cards/m/MazeOfIth.java | 2 +- Mage.Sets/src/mage/cards/m/MazeOfShadows.java | 2 +- Mage.Sets/src/mage/cards/m/MazesEnd.java | 2 +- Mage.Sets/src/mage/cards/m/MechHangar.java | 2 +- Mage.Sets/src/mage/cards/m/MedicineBag.java | 2 +- Mage.Sets/src/mage/cards/m/Megatog.java | 2 +- Mage.Sets/src/mage/cards/m/MeletisCharlatan.java | 2 +- Mage.Sets/src/mage/cards/m/Memnarch.java | 4 ++-- Mage.Sets/src/mage/cards/m/MemorialToFolly.java | 2 +- Mage.Sets/src/mage/cards/m/MemorialToGenius.java | 2 +- Mage.Sets/src/mage/cards/m/MemorialToGlory.java | 2 +- Mage.Sets/src/mage/cards/m/MemorialToWar.java | 2 +- Mage.Sets/src/mage/cards/m/MemoryJar.java | 2 +- Mage.Sets/src/mage/cards/m/MentalDiscipline.java | 2 +- Mage.Sets/src/mage/cards/m/MercadianBazaar.java | 2 +- Mage.Sets/src/mage/cards/m/MercenaryInformer.java | 2 +- Mage.Sets/src/mage/cards/m/MerchantsDockhand.java | 2 +- Mage.Sets/src/mage/cards/m/MercilessEternal.java | 2 +- Mage.Sets/src/mage/cards/m/MercurialChemister.java | 6 +++--- Mage.Sets/src/mage/cards/m/MercurialPretender.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkAssassin.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkLooter.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkMesmerist.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkSeastalkers.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkSovereign.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkThaumaturgist.java | 2 +- Mage.Sets/src/mage/cards/m/MerrowGrimeblotter.java | 2 +- Mage.Sets/src/mage/cards/m/MerrowLevitator.java | 2 +- Mage.Sets/src/mage/cards/m/MerrowWavebreakers.java | 2 +- Mage.Sets/src/mage/cards/m/MesaFalcon.java | 2 +- Mage.Sets/src/mage/cards/m/MesmericTrance.java | 2 +- Mage.Sets/src/mage/cards/m/Metallurgeon.java | 2 +- .../src/mage/cards/m/MetalspinnersPuzzleknot.java | 2 +- Mage.Sets/src/mage/cards/m/MetathranTransport.java | 2 +- Mage.Sets/src/mage/cards/m/MetathranZombie.java | 2 +- Mage.Sets/src/mage/cards/m/MeteorStorm.java | 2 +- Mage.Sets/src/mage/cards/m/Metrognome.java | 2 +- Mage.Sets/src/mage/cards/m/MetropolisSprite.java | 2 +- Mage.Sets/src/mage/cards/m/MetzaliTowerOfTriumph.java | 4 ++-- Mage.Sets/src/mage/cards/m/MidnightCovenant.java | 2 +- Mage.Sets/src/mage/cards/m/MidsummerRevel.java | 2 +- Mage.Sets/src/mage/cards/m/MightWeaver.java | 2 +- Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java | 2 +- Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java | 2 +- Mage.Sets/src/mage/cards/m/MilitantMonk.java | 2 +- Mage.Sets/src/mage/cards/m/Millstone.java | 2 +- Mage.Sets/src/mage/cards/m/MimicVat.java | 2 +- Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java | 2 +- .../src/mage/cards/m/MinamoSchoolAtWatersEdge.java | 2 +- Mage.Sets/src/mage/cards/m/MinamoSightbender.java | 2 +- Mage.Sets/src/mage/cards/m/MindOverMatter.java | 2 +- Mage.Sets/src/mage/cards/m/MindStone.java | 2 +- Mage.Sets/src/mage/cards/m/MindlashSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MindlessAutomaton.java | 4 ++-- Mage.Sets/src/mage/cards/m/Mindslaver.java | 2 +- Mage.Sets/src/mage/cards/m/MindwrackLiege.java | 2 +- Mage.Sets/src/mage/cards/m/MineBearer.java | 2 +- Mage.Sets/src/mage/cards/m/MineLayer.java | 2 +- Mage.Sets/src/mage/cards/m/MinersBane.java | 2 +- Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java | 2 +- Mage.Sets/src/mage/cards/m/MinisterOfImpediments.java | 2 +- Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java | 2 +- Mage.Sets/src/mage/cards/m/MinotaurIllusionist.java | 4 ++-- Mage.Sets/src/mage/cards/m/MinotaurSureshot.java | 2 +- Mage.Sets/src/mage/cards/m/MirageMirror.java | 2 +- Mage.Sets/src/mage/cards/m/MireBoa.java | 2 +- Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java | 2 +- Mage.Sets/src/mage/cards/m/MirrodinsCore.java | 2 +- Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java | 2 +- Mage.Sets/src/mage/cards/m/MirrorSheen.java | 2 +- Mage.Sets/src/mage/cards/m/Mirrorpool.java | 4 ++-- Mage.Sets/src/mage/cards/m/MirrorwoodTreefolk.java | 2 +- Mage.Sets/src/mage/cards/m/MischievousPoltergeist.java | 2 +- Mage.Sets/src/mage/cards/m/MischievousQuanar.java | 2 +- Mage.Sets/src/mage/cards/m/MiserysShadow.java | 2 +- Mage.Sets/src/mage/cards/m/MishrasBauble.java | 2 +- Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java | 2 +- Mage.Sets/src/mage/cards/m/MishrasHelix.java | 2 +- Mage.Sets/src/mage/cards/m/MistDragon.java | 6 +++--- Mage.Sets/src/mage/cards/m/MistformMutant.java | 2 +- Mage.Sets/src/mage/cards/m/MistformStalker.java | 2 +- Mage.Sets/src/mage/cards/m/MistmeadowWitch.java | 2 +- Mage.Sets/src/mage/cards/m/MizziumTransreliquat.java | 6 +++--- Mage.Sets/src/mage/cards/m/Mobilization.java | 2 +- Mage.Sets/src/mage/cards/m/MoggCannon.java | 2 +- Mage.Sets/src/mage/cards/m/MoggFanatic.java | 2 +- Mage.Sets/src/mage/cards/m/MoggRaider.java | 2 +- Mage.Sets/src/mage/cards/m/Moggcatcher.java | 2 +- Mage.Sets/src/mage/cards/m/MoistureFarm.java | 2 +- Mage.Sets/src/mage/cards/m/MoleWorms.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenRavager.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenSlagheap.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java | 4 ++-- Mage.Sets/src/mage/cards/m/MoltingSkin.java | 2 +- Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java | 2 +- Mage.Sets/src/mage/cards/m/MoonbowIllusionist.java | 2 +- Mage.Sets/src/mage/cards/m/MoongloveChangeling.java | 2 +- Mage.Sets/src/mage/cards/m/MoongloveExtract.java | 2 +- Mage.Sets/src/mage/cards/m/MoonlightGeist.java | 2 +- Mage.Sets/src/mage/cards/m/MoonlitStrider.java | 3 +-- Mage.Sets/src/mage/cards/m/MoonveilDragon.java | 2 +- Mage.Sets/src/mage/cards/m/MoonwingMoth.java | 2 +- Mage.Sets/src/mage/cards/m/MoorlandInquisitor.java | 2 +- Mage.Sets/src/mage/cards/m/MordantDragon.java | 2 +- Mage.Sets/src/mage/cards/m/MorgueThrull.java | 2 +- Mage.Sets/src/mage/cards/m/MoriokReplica.java | 2 +- Mage.Sets/src/mage/cards/m/Morphling.java | 10 +++++----- Mage.Sets/src/mage/cards/m/Mortipede.java | 2 +- Mage.Sets/src/mage/cards/m/Mortiphobia.java | 4 ++-- Mage.Sets/src/mage/cards/m/Mortivore.java | 2 +- Mage.Sets/src/mage/cards/m/MossbridgeTroll.java | 2 +- Mage.Sets/src/mage/cards/m/MothdustChangeling.java | 2 +- Mage.Sets/src/mage/cards/m/MotherOfRunes.java | 2 +- Mage.Sets/src/mage/cards/m/MountedArchers.java | 2 +- Mage.Sets/src/mage/cards/m/MournersShield.java | 4 ++-- Mage.Sets/src/mage/cards/m/MournfulZombie.java | 2 +- Mage.Sets/src/mage/cards/m/Mourning.java | 2 +- Mage.Sets/src/mage/cards/m/MouthOfRonom.java | 2 +- Mage.Sets/src/mage/cards/m/MrHousePresidentAndCEO.java | 2 +- Mage.Sets/src/mage/cards/m/MultiformWonder.java | 4 ++-- Mage.Sets/src/mage/cards/m/Mundungu.java | 2 +- Mage.Sets/src/mage/cards/m/MurderousBetrayal.java | 2 +- .../src/mage/cards/m/MuzzioVisionaryArchitect.java | 2 +- Mage.Sets/src/mage/cards/m/Mycologist.java | 4 ++-- Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java | 2 +- Mage.Sets/src/mage/cards/m/MyrIncubator.java | 2 +- Mage.Sets/src/mage/cards/m/MyrLandshaper.java | 2 +- Mage.Sets/src/mage/cards/m/MyrMatrix.java | 2 +- Mage.Sets/src/mage/cards/m/MyrMindservant.java | 2 +- Mage.Sets/src/mage/cards/m/MyrPropagator.java | 2 +- Mage.Sets/src/mage/cards/m/MyrQuadropod.java | 2 +- Mage.Sets/src/mage/cards/m/MyrWelder.java | 2 +- Mage.Sets/src/mage/cards/m/MyriadLandscape.java | 2 +- Mage.Sets/src/mage/cards/m/MysticCompass.java | 2 +- Mage.Sets/src/mage/cards/m/MysticMight.java | 2 +- Mage.Sets/src/mage/cards/m/MystifyingMaze.java | 2 +- Mage.Sets/src/mage/cards/m/MythRealized.java | 4 ++-- 293 files changed, 325 insertions(+), 326 deletions(-) diff --git a/Mage.Sets/src/mage/cards/l/LadyCaleria.java b/Mage.Sets/src/mage/cards/l/LadyCaleria.java index fdfc1556046..10ecf89c68c 100644 --- a/Mage.Sets/src/mage/cards/l/LadyCaleria.java +++ b/Mage.Sets/src/mage/cards/l/LadyCaleria.java @@ -30,7 +30,7 @@ public final class LadyCaleria extends CardImpl { this.toughness = new MageInt(6); // {T}: Lady Caleria deals 3 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LadyEvangela.java b/Mage.Sets/src/mage/cards/l/LadyEvangela.java index 4b9932bb1f4..60182ec7aa0 100644 --- a/Mage.Sets/src/mage/cards/l/LadyEvangela.java +++ b/Mage.Sets/src/mage/cards/l/LadyEvangela.java @@ -35,7 +35,7 @@ public final class LadyEvangela extends CardImpl { // {W}{B}, {tap}: Prevent all combat damage that would be dealt by target creature this turn. Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt by target creature this turn."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LairOfTheHydra.java b/Mage.Sets/src/mage/cards/l/LairOfTheHydra.java index 7a2993a524f..7a342afc6ee 100644 --- a/Mage.Sets/src/mage/cards/l/LairOfTheHydra.java +++ b/Mage.Sets/src/mage/cards/l/LairOfTheHydra.java @@ -55,7 +55,7 @@ public final class LairOfTheHydra extends CardImpl { break; } } - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LairOfTheHydraEffect(), manaCosts)); + this.addAbility(new SimpleActivatedAbility(new LairOfTheHydraEffect(), manaCosts)); } private LairOfTheHydra(final LairOfTheHydra card) { diff --git a/Mage.Sets/src/mage/cards/l/LancersEnKor.java b/Mage.Sets/src/mage/cards/l/LancersEnKor.java index 0daf62a6299..c9acdb81b8f 100644 --- a/Mage.Sets/src/mage/cards/l/LancersEnKor.java +++ b/Mage.Sets/src/mage/cards/l/LancersEnKor.java @@ -34,7 +34,7 @@ public final class LancersEnKor extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {0}: The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LandsEdge.java b/Mage.Sets/src/mage/cards/l/LandsEdge.java index df3a2cd96bd..43c77ed2cdc 100644 --- a/Mage.Sets/src/mage/cards/l/LandsEdge.java +++ b/Mage.Sets/src/mage/cards/l/LandsEdge.java @@ -31,7 +31,7 @@ public final class LandsEdge extends CardImpl { this.supertype.add(SuperType.WORLD); // Discard a card: If the discarded card was a land card, Land's Edge deals 2 damage to target player. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LandsEdgeEffect(), new DiscardCardCost(false)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new LandsEdgeEffect(), new DiscardCardCost(false)); ability.addTarget(new TargetPlayerOrPlaneswalker()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/l/LanternSpirit.java b/Mage.Sets/src/mage/cards/l/LanternSpirit.java index ca2bc272ede..49c74626d01 100644 --- a/Mage.Sets/src/mage/cards/l/LanternSpirit.java +++ b/Mage.Sets/src/mage/cards/l/LanternSpirit.java @@ -28,7 +28,7 @@ public final class LanternSpirit extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: Return Lantern Spirit to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}"))); } private LanternSpirit(final LanternSpirit card) { diff --git a/Mage.Sets/src/mage/cards/l/LaquatussChampion.java b/Mage.Sets/src/mage/cards/l/LaquatussChampion.java index 28c4a970ad9..3edd92d8bdf 100644 --- a/Mage.Sets/src/mage/cards/l/LaquatussChampion.java +++ b/Mage.Sets/src/mage/cards/l/LaquatussChampion.java @@ -46,7 +46,7 @@ public final class LaquatussChampion extends CardImpl { // When Laquatus's Champion leaves the battlefield, that player gains 6 life. this.addAbility(new LaquatussChampionLeavesBattlefieldTriggeredAbility()); // {B}: Regenerate Laquatus's Champion. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private LaquatussChampion(final LaquatussChampion card) { diff --git a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java index 40231d88d66..9c3eeb4a789 100644 --- a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java +++ b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java @@ -35,7 +35,7 @@ public final class LatullaKeldonOverseer extends CardImpl { this.toughness = new MageInt(3); // {X}{R}, {tap}, Discard two cards: Latulla, Keldon Overseer deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/l/LavaZombie.java b/Mage.Sets/src/mage/cards/l/LavaZombie.java index 5708debdf71..375665a8043 100644 --- a/Mage.Sets/src/mage/cards/l/LavaZombie.java +++ b/Mage.Sets/src/mage/cards/l/LavaZombie.java @@ -41,7 +41,7 @@ public final class LavaZombie extends CardImpl { // When Lava Zombie enters the battlefield, return a black or red creature you control to its owner's hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter), false)); // {2}: Lava Zombie gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private LavaZombie(final LavaZombie card) { diff --git a/Mage.Sets/src/mage/cards/l/LavaclawReaches.java b/Mage.Sets/src/mage/cards/l/LavaclawReaches.java index 722eabedc3f..a331f0c887e 100644 --- a/Mage.Sets/src/mage/cards/l/LavaclawReaches.java +++ b/Mage.Sets/src/mage/cards/l/LavaclawReaches.java @@ -36,7 +36,7 @@ public final class LavaclawReaches extends CardImpl { this.addAbility(new RedManaAbility()); // {1}{B}{R}: Until end of turn, Lavaclaw Reaches becomes a 2/2 black and red Elemental creature with ": This creature gets +X/+0 until end of turn." It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new LavaclawReachesToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new LavaclawReachesToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{B}{R}"))); } private LavaclawReaches(final LavaclawReaches card) { @@ -60,7 +60,7 @@ class LavaclawReachesToken extends TokenImpl { color.setBlack(true); power = new MageInt(2); toughness = new MageInt(2); - addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(GetXValue.instance, StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl<>("{X}"))); + addAbility(new SimpleActivatedAbility(new BoostSourceEffect(GetXValue.instance, StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl<>("{X}"))); } private LavaclawReachesToken(final LavaclawReachesToken token) { super(token); diff --git a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java index d027fd8908b..d5288f23786 100644 --- a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java +++ b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java @@ -38,13 +38,13 @@ public final class LavamancersSkill extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to target creature." - Ability pingAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability pingAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); pingAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(pingAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to target creature.\""))); // As long as enchanted creature is a Wizard, it has "{tap}: This creature deals 2 damage to target creature." - Ability pingTwoAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability pingTwoAbility = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); pingTwoAbility.addTarget(new TargetCreaturePermanent()); ContinuousEffect isWizardEffect = new GainAbilityAttachedEffect(pingTwoAbility, AttachmentType.AURA); SimpleStaticAbility ifWizardAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(isWizardEffect, new EnchantedCreatureSubtypeCondition(SubType.WIZARD), diff --git a/Mage.Sets/src/mage/cards/l/LavastepRaider.java b/Mage.Sets/src/mage/cards/l/LavastepRaider.java index 418e083b101..ff0f2b4fd70 100644 --- a/Mage.Sets/src/mage/cards/l/LavastepRaider.java +++ b/Mage.Sets/src/mage/cards/l/LavastepRaider.java @@ -27,7 +27,7 @@ public final class LavastepRaider extends CardImpl { this.toughness = new MageInt(2); // {2}{R}: Lavastep Raider gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); } private LavastepRaider(final LavastepRaider card) { diff --git a/Mage.Sets/src/mage/cards/l/Lawbringer.java b/Mage.Sets/src/mage/cards/l/Lawbringer.java index cc1488cc2d8..ef8f63002d1 100644 --- a/Mage.Sets/src/mage/cards/l/Lawbringer.java +++ b/Mage.Sets/src/mage/cards/l/Lawbringer.java @@ -38,7 +38,7 @@ public final class Lawbringer extends CardImpl { this.toughness = new MageInt(2); // {tap}, Sacrifice Lawbringer: Exile target red creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java b/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java index 917ddd8f8aa..4765a6e3fc2 100644 --- a/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java +++ b/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java @@ -42,7 +42,7 @@ public final class LeadBellyChimera extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Sacrifice Lead-Belly Chimera: Put a +2/+2 counter on target Chimera creature. It gains trample. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield) .setText("It gains trample. (This effect lasts indefinitely.)")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java index 4ebdaee66e6..bca307aba7a 100644 --- a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java +++ b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java @@ -41,7 +41,7 @@ public final class LeafdrakeRoost extends CardImpl { this.addAbility(ability); // Enchanted land has "{G}{U}, {tap}: Create a 2/2 green and blue Drake creature token with flying." - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LeafdrakeRoostDrakeToken()), new ManaCostsImpl<>("{G}{U}")); + Ability abilityToGain = new SimpleActivatedAbility(new CreateTokenEffect(new LeafdrakeRoostDrakeToken()), new ManaCostsImpl<>("{G}{U}")); abilityToGain.addCost(new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{G}{U}, {T}: Create a 2/2 green and blue Drake creature token with flying.\""))); diff --git a/Mage.Sets/src/mage/cards/l/LeapingLizard.java b/Mage.Sets/src/mage/cards/l/LeapingLizard.java index 1c4b6d9dd14..1d09ea85309 100644 --- a/Mage.Sets/src/mage/cards/l/LeapingLizard.java +++ b/Mage.Sets/src/mage/cards/l/LeapingLizard.java @@ -32,7 +32,7 @@ public final class LeapingLizard extends CardImpl { // {1}{G}: Leaping Lizard gets -0/-1 and gains flying until end of turn. Effect effect = new BoostSourceEffect(0, -1, Duration.EndOfTurn); effect.setText("{this} gets -0/-1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{G}")); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LeapingMaster.java b/Mage.Sets/src/mage/cards/l/LeapingMaster.java index 1bf0c722832..f3a5b58613b 100644 --- a/Mage.Sets/src/mage/cards/l/LeapingMaster.java +++ b/Mage.Sets/src/mage/cards/l/LeapingMaster.java @@ -29,7 +29,7 @@ public final class LeapingMaster extends CardImpl { this.toughness = new MageInt(1); // {2}{W}: Leaping Master gains flying until end of turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/l/LeechBonder.java b/Mage.Sets/src/mage/cards/l/LeechBonder.java index f13b277fe49..07759436689 100644 --- a/Mage.Sets/src/mage/cards/l/LeechBonder.java +++ b/Mage.Sets/src/mage/cards/l/LeechBonder.java @@ -47,7 +47,7 @@ public final class LeechBonder extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)), "with two -1/-1 counters on it")); // {U}, {untap}: Move a counter from target creature onto another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LeechBonderEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new LeechBonderEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new UntapSourceCost()); // target 1 TargetCreaturePermanent target1 = new TargetCreaturePermanent(new FilterCreaturePermanent("creature to remove counter from")); diff --git a/Mage.Sets/src/mage/cards/l/LegacysAllure.java b/Mage.Sets/src/mage/cards/l/LegacysAllure.java index 071cbbd1091..8f168ae6d8f 100644 --- a/Mage.Sets/src/mage/cards/l/LegacysAllure.java +++ b/Mage.Sets/src/mage/cards/l/LegacysAllure.java @@ -32,7 +32,7 @@ public final class LegacysAllure extends CardImpl { new AddCountersSourceEffect(CounterType.TREASURE.createInstance(), true), true)); // Sacrifice Legacy's Allure: Gain control of target creature with power less than or equal to the number of treasure counters on Legacy's Allure. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfGame, true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.EndOfGame, true), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); ability.setTargetAdjuster(new PowerTargetAdjuster(new CountersSourceCount(CounterType.TREASURE), ComparisonType.OR_LESS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LeoninBattlemage.java b/Mage.Sets/src/mage/cards/l/LeoninBattlemage.java index c955590e58c..7d3103dea6a 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninBattlemage.java +++ b/Mage.Sets/src/mage/cards/l/LeoninBattlemage.java @@ -31,7 +31,7 @@ public final class LeoninBattlemage extends CardImpl { this.toughness = new MageInt(3); // {tap}: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever you cast a spell, you may untap Leonin Battlemage. diff --git a/Mage.Sets/src/mage/cards/l/LeoninBladetrap.java b/Mage.Sets/src/mage/cards/l/LeoninBladetrap.java index 17439c59361..749bbe7e74d 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninBladetrap.java +++ b/Mage.Sets/src/mage/cards/l/LeoninBladetrap.java @@ -36,7 +36,7 @@ public final class LeoninBladetrap extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // {2}, Sacrifice Leonin Bladetrap: Leonin Bladetrap deals 2 damage to each attacking creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, "it", filter), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(2, "it", filter), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LeoninSunStandard.java b/Mage.Sets/src/mage/cards/l/LeoninSunStandard.java index f480bc705fa..b6df02c5220 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninSunStandard.java +++ b/Mage.Sets/src/mage/cards/l/LeoninSunStandard.java @@ -20,7 +20,7 @@ public final class LeoninSunStandard extends CardImpl { public LeoninSunStandard(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false), new ManaCostsImpl<>("{1}{W}"))); } private LeoninSunStandard(final LeoninSunStandard card) { diff --git a/Mage.Sets/src/mage/cards/l/LethalVapors.java b/Mage.Sets/src/mage/cards/l/LethalVapors.java index 0d71438ce62..66ee7ab7ac9 100644 --- a/Mage.Sets/src/mage/cards/l/LethalVapors.java +++ b/Mage.Sets/src/mage/cards/l/LethalVapors.java @@ -34,7 +34,7 @@ public final class LethalVapors extends CardImpl { false, SetTargetPointer.PERMANENT)); // {0}: Destroy Lethal Vapors. You skip your next turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroySourceEffect(), new ManaCostsImpl<>("{0}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DestroySourceEffect(), new ManaCostsImpl<>("{0}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new SkipNextTurnSourceEffect()); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/l/LeyDruid.java b/Mage.Sets/src/mage/cards/l/LeyDruid.java index dd38e13cb0f..48f7f21807e 100644 --- a/Mage.Sets/src/mage/cards/l/LeyDruid.java +++ b/Mage.Sets/src/mage/cards/l/LeyDruid.java @@ -30,7 +30,7 @@ public final class LeyDruid extends CardImpl { this.toughness = new MageInt(1); // {tap}: 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/l/LiarsPendulum.java b/Mage.Sets/src/mage/cards/l/LiarsPendulum.java index 2487558d379..90a2f926bd9 100644 --- a/Mage.Sets/src/mage/cards/l/LiarsPendulum.java +++ b/Mage.Sets/src/mage/cards/l/LiarsPendulum.java @@ -28,7 +28,7 @@ public final class LiarsPendulum extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {2}, {T}: Choose a card name. Target opponent guesses whether a card with that name is in your hand. You may reveal your hand. If you do and your opponent guessed wrong, draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LiarsPendulumEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new LiarsPendulumEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LiberatedDwarf.java b/Mage.Sets/src/mage/cards/l/LiberatedDwarf.java index b466bb19c2c..e4ad8a4f955 100644 --- a/Mage.Sets/src/mage/cards/l/LiberatedDwarf.java +++ b/Mage.Sets/src/mage/cards/l/LiberatedDwarf.java @@ -43,7 +43,7 @@ public final class LiberatedDwarf extends CardImpl { // {R}, Sacrifice Liberated Dwarf: Target green creature gets +1/+0 and gains first strike until end of turn. Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn); effect.setText("Target green creature gets +1/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains first strike until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java b/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java index db5105dca2c..844b69d7cd5 100644 --- a/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java +++ b/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java @@ -35,7 +35,7 @@ public final class LieutenantKirtar extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}, Sacrifice Lieutenant Kirtar: Exile target attacking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetAttackingCreature()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/Lifeforce.java b/Mage.Sets/src/mage/cards/l/Lifeforce.java index 599cdc87294..b555e8e67ca 100644 --- a/Mage.Sets/src/mage/cards/l/Lifeforce.java +++ b/Mage.Sets/src/mage/cards/l/Lifeforce.java @@ -30,7 +30,7 @@ public final class Lifeforce extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}{G}"); // {G}{G}: Counter target black spell. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{G}{G}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{G}{G}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java index d9fcb05ed8a..fb4f30293dc 100644 --- a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java +++ b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java @@ -38,7 +38,7 @@ public final class LifesparkSpellbomb extends CardImpl { this.addAbility(firstAbility); // {1}, Sacrifice Lifespark Spellbomb: Draw a card. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } @@ -52,4 +52,4 @@ public final class LifesparkSpellbomb extends CardImpl { return new LifesparkSpellbomb(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/Lightbringer.java b/Mage.Sets/src/mage/cards/l/Lightbringer.java index 6bee42f3562..434c8d603ba 100644 --- a/Mage.Sets/src/mage/cards/l/Lightbringer.java +++ b/Mage.Sets/src/mage/cards/l/Lightbringer.java @@ -38,7 +38,7 @@ public final class Lightbringer extends CardImpl { this.toughness = new MageInt(2); // {tap}, Sacrifice Lightbringer: Exile target black creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LightningCrafter.java b/Mage.Sets/src/mage/cards/l/LightningCrafter.java index a83e8999256..417f23fa9aa 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCrafter.java +++ b/Mage.Sets/src/mage/cards/l/LightningCrafter.java @@ -31,7 +31,7 @@ public final class LightningCrafter extends CardImpl { this.addAbility(new ChampionAbility(this, SubType.GOBLIN, SubType.SHAMAN)); // {T}: Lightning Crafter deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LightningDragon.java b/Mage.Sets/src/mage/cards/l/LightningDragon.java index 061de765e2b..82cd6794791 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDragon.java +++ b/Mage.Sets/src/mage/cards/l/LightningDragon.java @@ -32,7 +32,7 @@ public final class LightningDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new EchoAbility("{2}{R}{R}")); - 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))); } private LightningDragon(final LightningDragon card) { @@ -44,4 +44,4 @@ public final class LightningDragon extends CardImpl { return new LightningDragon(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/LightningProwess.java b/Mage.Sets/src/mage/cards/l/LightningProwess.java index e66746e8e4d..563f653e68a 100644 --- a/Mage.Sets/src/mage/cards/l/LightningProwess.java +++ b/Mage.Sets/src/mage/cards/l/LightningProwess.java @@ -37,7 +37,7 @@ public final class LightningProwess extends CardImpl { this.addAbility(ability); // Enchanted creature has haste and "{tap}: This creature deals 1 damage to any target." this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/l/LightningRigCrew.java b/Mage.Sets/src/mage/cards/l/LightningRigCrew.java index f7b4d3d368f..a7a79db90e0 100644 --- a/Mage.Sets/src/mage/cards/l/LightningRigCrew.java +++ b/Mage.Sets/src/mage/cards/l/LightningRigCrew.java @@ -38,7 +38,7 @@ public final class LightningRigCrew extends CardImpl { this.toughness = new MageInt(5); // {T}: Lightning-Rig Crew deals 1 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new TapSourceCost()); this.addAbility(ability); // Whenever you cast a Pirate spell, untap Lightning-Rig Crew. diff --git a/Mage.Sets/src/mage/cards/l/LightningVolley.java b/Mage.Sets/src/mage/cards/l/LightningVolley.java index 05d3a493435..97caefc695e 100644 --- a/Mage.Sets/src/mage/cards/l/LightningVolley.java +++ b/Mage.Sets/src/mage/cards/l/LightningVolley.java @@ -27,7 +27,7 @@ public final class LightningVolley extends CardImpl { // Until end of turn, creatures you control gain "{T}: This creature deals 1 damage to any target." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability grantedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); grantedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(grantedAbility, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("Until end of turn, creatures you control gain \"{T}: This creature deals 1 damage to any target.\""); diff --git a/Mage.Sets/src/mage/cards/l/LikenessLooter.java b/Mage.Sets/src/mage/cards/l/LikenessLooter.java index b1cc6215cea..84a533c384e 100644 --- a/Mage.Sets/src/mage/cards/l/LikenessLooter.java +++ b/Mage.Sets/src/mage/cards/l/LikenessLooter.java @@ -43,7 +43,7 @@ public final class LikenessLooter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {T}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); // {X}: Likeness Looter becomes a copy of target creature card in your graveyard with mana value X, except it has flying and this ability. Activate only as a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/l/LilianasShade.java b/Mage.Sets/src/mage/cards/l/LilianasShade.java index 0fbda14c09d..8e2b7f671be 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasShade.java +++ b/Mage.Sets/src/mage/cards/l/LilianasShade.java @@ -39,7 +39,7 @@ public final class LilianasShade extends CardImpl { // When Liliana's Shade enters the battlefield, you may search your library for a Swamp card, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); // {B}: Liliana's Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private LilianasShade(final LilianasShade card) { diff --git a/Mage.Sets/src/mage/cards/l/LiltingRefrain.java b/Mage.Sets/src/mage/cards/l/LiltingRefrain.java index 7d6d3fcb1dc..4297cb316b9 100644 --- a/Mage.Sets/src/mage/cards/l/LiltingRefrain.java +++ b/Mage.Sets/src/mage/cards/l/LiltingRefrain.java @@ -29,7 +29,7 @@ public final class LiltingRefrain extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.VERSE.createInstance()), true)); // Sacrifice Lilting Refrain: Counter target spell unless its controller pays {X}, where X is the number of verse counters on Lilting Refrain. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new CountersSourceCount(CounterType.VERSE)), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new CountersSourceCount(CounterType.VERSE)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java index a5ad9c70afb..96cae253c0d 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java @@ -48,7 +48,7 @@ public final class LimDulTheNecromancer extends CardImpl { this.addAbility(new DiesCreatureTriggeredAbility(new DoIfCostPaid(new LimDulTheNecromancerEffect(), new ManaCostsImpl<>("{1}{B}")), false, StaticFilters.FILTER_OPPONENTS_PERMANENT_A_CREATURE, true)); // {1}{B}: Regenerate target Zombie. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability2 = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability2.addTarget(new TargetPermanent(filter2)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java b/Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java index a0d95b8fc40..66bb9567adf 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java +++ b/Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java @@ -28,7 +28,7 @@ public final class LimDulsHighGuard extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {1}{B}: Regenerate Lim-Dul's High Guard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private LimDulsHighGuard(final LimDulsHighGuard card) { diff --git a/Mage.Sets/src/mage/cards/l/LimestoneGolem.java b/Mage.Sets/src/mage/cards/l/LimestoneGolem.java index 43968606ac2..88c9506c0ff 100644 --- a/Mage.Sets/src/mage/cards/l/LimestoneGolem.java +++ b/Mage.Sets/src/mage/cards/l/LimestoneGolem.java @@ -29,7 +29,7 @@ public final class LimestoneGolem extends CardImpl { this.toughness = new MageInt(4); // {2}, Sacrifice Limestone Golem: Target player draws a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DrawCardTargetEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index 1053d99d7e8..ac0136a5f0a 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -55,7 +55,7 @@ public final class LinSivviDefiantHero extends CardImpl { this.addAbility(ability); // {3}: Put target Rebel card from your graveyard on the bottom of your library. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false, rule), new GenericManaCost(3)); + ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false, rule), new GenericManaCost(3)); ability.addTarget(new TargetCardInYourGraveyard(1, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java index 57e56d2e9d7..48aeb84a05b 100644 --- a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java +++ b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java @@ -47,7 +47,7 @@ public final class LinessaZephyrMage extends CardImpl { this.toughness = new MageInt(3); // {X}{U}{U}, {tap}: Return target creature with converted mana cost X to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{X}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{X}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(new XManaValueTargetAdjuster()); diff --git a/Mage.Sets/src/mage/cards/l/LionheartMaverick.java b/Mage.Sets/src/mage/cards/l/LionheartMaverick.java index 757ba184b43..87a5fa81f8f 100644 --- a/Mage.Sets/src/mage/cards/l/LionheartMaverick.java +++ b/Mage.Sets/src/mage/cards/l/LionheartMaverick.java @@ -28,7 +28,7 @@ public final class LionheartMaverick extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}"))); } private LionheartMaverick(final LionheartMaverick card) { diff --git a/Mage.Sets/src/mage/cards/l/LiquimetalCoating.java b/Mage.Sets/src/mage/cards/l/LiquimetalCoating.java index 1cf69f4ec3f..323bce2d172 100644 --- a/Mage.Sets/src/mage/cards/l/LiquimetalCoating.java +++ b/Mage.Sets/src/mage/cards/l/LiquimetalCoating.java @@ -24,7 +24,7 @@ public final class LiquimetalCoating extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {T}: Target permanent becomes an artifact in addition to its other types until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.ARTIFACT), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.ARTIFACT), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LivingAirship.java b/Mage.Sets/src/mage/cards/l/LivingAirship.java index 5a62add9ea8..df2cd4414af 100644 --- a/Mage.Sets/src/mage/cards/l/LivingAirship.java +++ b/Mage.Sets/src/mage/cards/l/LivingAirship.java @@ -25,7 +25,7 @@ public final class LivingAirship extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private LivingAirship(final LivingAirship card) { diff --git a/Mage.Sets/src/mage/cards/l/LivingArmor.java b/Mage.Sets/src/mage/cards/l/LivingArmor.java index 7d6ebcca862..d79606112d7 100644 --- a/Mage.Sets/src/mage/cards/l/LivingArmor.java +++ b/Mage.Sets/src/mage/cards/l/LivingArmor.java @@ -27,7 +27,7 @@ public final class LivingArmor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {tap}, Sacrifice Living Armor: Put X +0/+1 counters on target creature, where X is that creature's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LivingArmorEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LivingArmorEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LivingInferno.java b/Mage.Sets/src/mage/cards/l/LivingInferno.java index dc9da2d5366..347f6af772f 100644 --- a/Mage.Sets/src/mage/cards/l/LivingInferno.java +++ b/Mage.Sets/src/mage/cards/l/LivingInferno.java @@ -34,7 +34,7 @@ public final class LivingInferno extends CardImpl { this.toughness = new MageInt(5); // {T}: Living Inferno deals damage equal to its power divided as you choose among any number of target creatures. Each of those creatures deals damage equal to its power to Living Inferno. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LivingInfernoEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LivingInfernoEffect(), new TapSourceCost()); ability.setTargetAdjuster(LivingInfernoAdjuster.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LivingWall.java b/Mage.Sets/src/mage/cards/l/LivingWall.java index 57c093ddce8..080270b6793 100644 --- a/Mage.Sets/src/mage/cards/l/LivingWall.java +++ b/Mage.Sets/src/mage/cards/l/LivingWall.java @@ -29,7 +29,7 @@ public final class LivingWall extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}: Regenerate Living Wall. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java b/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java index 2b80dab9d07..c5264808242 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarBehemoth.java @@ -35,7 +35,7 @@ public final class LlanowarBehemoth extends CardImpl { this.toughness = new MageInt(4); // Tap an untapped creature you control: Llanowar Behemoth gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); } private LlanowarBehemoth(final LlanowarBehemoth card) { diff --git a/Mage.Sets/src/mage/cards/l/LlanowarCavalry.java b/Mage.Sets/src/mage/cards/l/LlanowarCavalry.java index 2f2c0c25c6f..c66dfd6be8e 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarCavalry.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarCavalry.java @@ -28,7 +28,7 @@ public final class LlanowarCavalry extends CardImpl { this.toughness = new MageInt(4); // {W}: Llanowar Cavalry gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private LlanowarCavalry(final LlanowarCavalry card) { diff --git a/Mage.Sets/src/mage/cards/l/LlanowarMentor.java b/Mage.Sets/src/mage/cards/l/LlanowarMentor.java index 66989232c14..42a8b65f058 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarMentor.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarMentor.java @@ -29,7 +29,7 @@ public final class LlanowarMentor extends CardImpl { this.toughness = new MageInt(1); // {G}, {T}, Discard a card: Create a 1/1 green Elf Druid creature token named Llanowar Elves. It has "{T}: Add {G}." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LlanowarElvesToken()), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new LlanowarElvesToken()), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LobberCrew.java b/Mage.Sets/src/mage/cards/l/LobberCrew.java index 25f6606a9dd..8c362a3e1ed 100644 --- a/Mage.Sets/src/mage/cards/l/LobberCrew.java +++ b/Mage.Sets/src/mage/cards/l/LobberCrew.java @@ -34,7 +34,7 @@ public final class LobberCrew extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {T}: Lobber Crew deals 1 damage to each opponent. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new TapSourceCost())); // Whenever you cast a multicolored spell, untap Lobber Crew. this.addAbility(new SpellCastControllerTriggeredAbility( new UntapSourceEffect(), StaticFilters.FILTER_SPELL_A_MULTICOLORED, false)); diff --git a/Mage.Sets/src/mage/cards/l/LobeLobber.java b/Mage.Sets/src/mage/cards/l/LobeLobber.java index fdb7813f8be..6c975bdff91 100644 --- a/Mage.Sets/src/mage/cards/l/LobeLobber.java +++ b/Mage.Sets/src/mage/cards/l/LobeLobber.java @@ -31,7 +31,7 @@ public final class LobeLobber extends CardImpl { // Equipped creature has "T: This creature deals 1 damage to target player. Roll a six-sided die. On a 5 or higher, untap it." Effect effect = new LobeLobberEffect(); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/l/LochKorrigan.java b/Mage.Sets/src/mage/cards/l/LochKorrigan.java index a030f76204e..de0d5ec255b 100644 --- a/Mage.Sets/src/mage/cards/l/LochKorrigan.java +++ b/Mage.Sets/src/mage/cards/l/LochKorrigan.java @@ -26,7 +26,7 @@ public final class LochKorrigan extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/B}"))); } private LochKorrigan(final LochKorrigan card) { diff --git a/Mage.Sets/src/mage/cards/l/LocustSwarm.java b/Mage.Sets/src/mage/cards/l/LocustSwarm.java index ca51b3b5275..e09e86424c0 100644 --- a/Mage.Sets/src/mage/cards/l/LocustSwarm.java +++ b/Mage.Sets/src/mage/cards/l/LocustSwarm.java @@ -31,7 +31,7 @@ public final class LocustSwarm extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}: Regenerate Locust Swarm. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); // {G}: Untap Locust Swarm. Activate this ability only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{G}"))); diff --git a/Mage.Sets/src/mage/cards/l/LodestoneBauble.java b/Mage.Sets/src/mage/cards/l/LodestoneBauble.java index 0622ec591b7..32f8886f014 100644 --- a/Mage.Sets/src/mage/cards/l/LodestoneBauble.java +++ b/Mage.Sets/src/mage/cards/l/LodestoneBauble.java @@ -39,7 +39,7 @@ public final class LodestoneBauble extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}"); // {1}, {T}, Sacrifice Lodestone Bauble: Put up to four target basic land cards from a player's graveyard on top of their library in any order. That player draws a card at the beginning of the next turn's upkeep. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LodestoneBaubleEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new LodestoneBaubleEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new LodestoneBaubleDrawEffect()); diff --git a/Mage.Sets/src/mage/cards/l/LodestoneMyr.java b/Mage.Sets/src/mage/cards/l/LodestoneMyr.java index 4e17792b012..83b9158b7f8 100644 --- a/Mage.Sets/src/mage/cards/l/LodestoneMyr.java +++ b/Mage.Sets/src/mage/cards/l/LodestoneMyr.java @@ -34,7 +34,7 @@ public final class LodestoneMyr extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); } private LodestoneMyr(final LodestoneMyr card) { diff --git a/Mage.Sets/src/mage/cards/l/LongtuskCub.java b/Mage.Sets/src/mage/cards/l/LongtuskCub.java index f949b2f7087..abc4e6bf060 100644 --- a/Mage.Sets/src/mage/cards/l/LongtuskCub.java +++ b/Mage.Sets/src/mage/cards/l/LongtuskCub.java @@ -31,7 +31,7 @@ public final class LongtuskCub extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new GetEnergyCountersControllerEffect(2), false)); // Pay {E}{E}: Put a +1/+1 counter on Longtusk Cub. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new PayEnergyCost(2))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new PayEnergyCost(2))); } private LongtuskCub(final LongtuskCub card) { diff --git a/Mage.Sets/src/mage/cards/l/LoomingShade.java b/Mage.Sets/src/mage/cards/l/LoomingShade.java index a60586c7920..1925fab8f3b 100644 --- a/Mage.Sets/src/mage/cards/l/LoomingShade.java +++ b/Mage.Sets/src/mage/cards/l/LoomingShade.java @@ -26,7 +26,7 @@ public final class LoomingShade extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private LoomingShade(final LoomingShade card) { diff --git a/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java b/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java index 93803d030d3..feae082642f 100644 --- a/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java +++ b/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java @@ -45,7 +45,7 @@ public final class LootExuberantExplorer extends CardImpl { new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // {4}{G}{G}, {T}: Look at the top six cards of your library. You may reveal a creature card with mana value less than or equal to the number of lands you control from among them and put it onto the battlefield. Put the rest on the bottom in a random order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryAndPickControllerEffect( + Ability ability = new SimpleActivatedAbility(new LookLibraryAndPickControllerEffect( 6, 1, filter, PutCards.BATTLEFIELD, PutCards.BOTTOM_RANDOM ), new ManaCostsImpl<>("{4}{G}{G}")); diff --git a/Mage.Sets/src/mage/cards/l/LordOfLineage.java b/Mage.Sets/src/mage/cards/l/LordOfLineage.java index 544ede58b4d..3480656c2d1 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfLineage.java +++ b/Mage.Sets/src/mage/cards/l/LordOfLineage.java @@ -43,7 +43,7 @@ public final class LordOfLineage extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); // {T}: Create a 2/2 black Vampire creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new VampireToken()), new TapSourceCost())); } private LordOfLineage(final LordOfLineage card) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java b/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java index bab7384e2d8..cb1324948f4 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java @@ -38,7 +38,7 @@ public final class LordOfTheAccursed extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); //{2}{B}, Tap: All Zombies gain menace until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityAllEffect( new MenaceAbility(), Duration.EndOfTurn, filter, "All Zombies gain menace until end of turn."), diff --git a/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java b/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java index ed5bafbfa90..ae5fa26bd06 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java @@ -44,7 +44,7 @@ public final class LordOfTresserhorn extends CardImpl { this.addAbility(ability); // {B}: Regenerate Lord of Tresserhorn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private LordOfTresserhorn(final LordOfTresserhorn card) { diff --git a/Mage.Sets/src/mage/cards/l/LoreBroker.java b/Mage.Sets/src/mage/cards/l/LoreBroker.java index c59fc422329..d9342edec6e 100644 --- a/Mage.Sets/src/mage/cards/l/LoreBroker.java +++ b/Mage.Sets/src/mage/cards/l/LoreBroker.java @@ -29,7 +29,7 @@ public final class LoreBroker extends CardImpl { this.toughness = new MageInt(2); // {tap}: Each player draws a card, then discards a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardAllEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardAllEffect(1), new TapSourceCost()); ability.addEffect(new DiscardEachPlayerEffect().setText(", then discards a card")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LowlandOaf.java b/Mage.Sets/src/mage/cards/l/LowlandOaf.java index 92daf5a6b14..9ccd0920168 100644 --- a/Mage.Sets/src/mage/cards/l/LowlandOaf.java +++ b/Mage.Sets/src/mage/cards/l/LowlandOaf.java @@ -47,7 +47,7 @@ public final class LowlandOaf extends CardImpl { // {tap}: Target Goblin creature you control gets +1/+0 and gains flying until end of turn. Sacrifice that creature at the beginning of the next end step. Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn); effect.setText("Target Goblin creature you control gets +1/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java b/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java index d1ca2a7b3ca..cc8f7d60364 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java @@ -30,7 +30,7 @@ public final class LoxodonAnchorite extends CardImpl { this.toughness = new MageInt(3); // {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 TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java b/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java index 143c5da68db..1c9a8af96f9 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java @@ -36,7 +36,7 @@ public final class LoxodonHierarch extends CardImpl { Ability etbAbility = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(4)); this.addAbility(etbAbility); // {G}{W}, Sacrifice Loxodon Hierarch: Regenerate each creature you control. - Ability activated = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAllEffect(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED), new ManaCostsImpl<>("{G}{W}")); + Ability activated = new SimpleActivatedAbility(new RegenerateAllEffect(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED), new ManaCostsImpl<>("{G}{W}")); activated.addCost(new SacrificeSourceCost()); this.addAbility(activated); } diff --git a/Mage.Sets/src/mage/cards/l/LoxodonMender.java b/Mage.Sets/src/mage/cards/l/LoxodonMender.java index 179f6dda11a..0322f28252f 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonMender.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonMender.java @@ -35,7 +35,7 @@ public final class LoxodonMender extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LoxodonMystic.java b/Mage.Sets/src/mage/cards/l/LoxodonMystic.java index d911600051f..4381897ee3d 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonMystic.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonMystic.java @@ -29,7 +29,7 @@ public final class LoxodonMystic extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LoxodonStalwart.java b/Mage.Sets/src/mage/cards/l/LoxodonStalwart.java index 0cc203253e7..6162fdd39cb 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonStalwart.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonStalwart.java @@ -31,7 +31,7 @@ public final class LoxodonStalwart extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {W}: Loxodon Stalwart gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private LoxodonStalwart(final LoxodonStalwart card) { diff --git a/Mage.Sets/src/mage/cards/l/LoyalTauntaun.java b/Mage.Sets/src/mage/cards/l/LoyalTauntaun.java index 34465a19bbe..35a4f2c565d 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalTauntaun.java +++ b/Mage.Sets/src/mage/cards/l/LoyalTauntaun.java @@ -28,7 +28,7 @@ public final class LoyalTauntaun extends CardImpl { this.toughness = new MageInt(3); // {1}{G}, sacrifice Loyal Tauntaun: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LudevicsTestSubject.java b/Mage.Sets/src/mage/cards/l/LudevicsTestSubject.java index 794967ffa17..e14febe228d 100644 --- a/Mage.Sets/src/mage/cards/l/LudevicsTestSubject.java +++ b/Mage.Sets/src/mage/cards/l/LudevicsTestSubject.java @@ -39,7 +39,7 @@ public final class LudevicsTestSubject extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}{U}: Put a hatchling counter on Ludevic's Test Subject. Then if there are five or more hatchling counters on it, remove all of them and transform it. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.HATCHLING.createInstance()), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.HATCHLING.createInstance()), new ManaCostsImpl<>("{1}{U}")); ability.addEffect(new LudevicsTestSubjectEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LukeSkywalker.java b/Mage.Sets/src/mage/cards/l/LukeSkywalker.java index 30a20a2ab43..bdb8f111c8b 100644 --- a/Mage.Sets/src/mage/cards/l/LukeSkywalker.java +++ b/Mage.Sets/src/mage/cards/l/LukeSkywalker.java @@ -46,7 +46,7 @@ public final class LukeSkywalker extends CardImpl { StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); // Remove all +1/+1 counters from Luke Skywalker: Luke gains hexproof until end of turn. Activate this ability only if at least one +1/+1 counter is removed this way. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new LukeSkywalkerCost())); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new LukeSkywalkerCost())); } private LukeSkywalker(final LukeSkywalker card) { diff --git a/Mage.Sets/src/mage/cards/l/LullmageMentor.java b/Mage.Sets/src/mage/cards/l/LullmageMentor.java index d32a02ca48f..7c5ee49e240 100644 --- a/Mage.Sets/src/mage/cards/l/LullmageMentor.java +++ b/Mage.Sets/src/mage/cards/l/LullmageMentor.java @@ -44,7 +44,7 @@ public final class LullmageMentor extends CardImpl { this.addAbility(new SpellCounteredControllerTriggeredAbility(new CreateTokenEffect(new MerfolkToken()), true)); // Tap seven untapped Merfolk you control: Counter target spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapTargetCost(new TargetControlledPermanent(7, 7, filter, true))); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new TapTargetCost(new TargetControlledPermanent(7, 7, filter, true))); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LumberingFalls.java b/Mage.Sets/src/mage/cards/l/LumberingFalls.java index e10d9c8d85a..8d8100b6cfd 100644 --- a/Mage.Sets/src/mage/cards/l/LumberingFalls.java +++ b/Mage.Sets/src/mage/cards/l/LumberingFalls.java @@ -35,7 +35,7 @@ public final class LumberingFalls extends CardImpl { this.addAbility(new GreenManaAbility()); // {2}{G}{U}: Lumbering Falls becomes a 3/3 green and blue Elemental creature with hexproof until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new LumberingFallsToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{U}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new LumberingFallsToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{U}"))); } private LumberingFalls(final LumberingFalls card) { diff --git a/Mage.Sets/src/mage/cards/l/LumengridAugur.java b/Mage.Sets/src/mage/cards/l/LumengridAugur.java index d0ac7f652b6..a4c571bdcc8 100644 --- a/Mage.Sets/src/mage/cards/l/LumengridAugur.java +++ b/Mage.Sets/src/mage/cards/l/LumengridAugur.java @@ -34,7 +34,7 @@ public final class LumengridAugur extends CardImpl { this.toughness = new MageInt(2); // {1}, {T}: Target player draws a card, then discards a card. If that player discards an artifact card this way, untap Lumengrid Augur. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LumengridAugurEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new LumengridAugurEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LuminousGuardian.java b/Mage.Sets/src/mage/cards/l/LuminousGuardian.java index ae11a79c4e4..4910021be2b 100644 --- a/Mage.Sets/src/mage/cards/l/LuminousGuardian.java +++ b/Mage.Sets/src/mage/cards/l/LuminousGuardian.java @@ -29,9 +29,9 @@ public final class LuminousGuardian extends CardImpl { this.toughness = new MageInt(4); // {W}: Luminous Guardian gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {2}: Luminous Guardian can block an additional creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{2}"))); } private LuminousGuardian(final LuminousGuardian card) { diff --git a/Mage.Sets/src/mage/cards/l/LunarAvenger.java b/Mage.Sets/src/mage/cards/l/LunarAvenger.java index 1d6432af156..66f150deb9e 100644 --- a/Mage.Sets/src/mage/cards/l/LunarAvenger.java +++ b/Mage.Sets/src/mage/cards/l/LunarAvenger.java @@ -33,7 +33,7 @@ public final class LunarAvenger extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Remove a +1/+1 counter from Lunar Avenger: Lunar Avenger gains your choice of flying, first strike, or haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainsChoiceOfAbilitiesEffect(GainsChoiceOfAbilitiesEffect.TargetType.Source, + this.addAbility(new SimpleActivatedAbility(new GainsChoiceOfAbilitiesEffect(GainsChoiceOfAbilitiesEffect.TargetType.Source, FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), HasteAbility.getInstance()), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)))); } diff --git a/Mage.Sets/src/mage/cards/l/LurkingEvil.java b/Mage.Sets/src/mage/cards/l/LurkingEvil.java index 17849063957..a86976febbd 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingEvil.java +++ b/Mage.Sets/src/mage/cards/l/LurkingEvil.java @@ -33,7 +33,7 @@ public final class LurkingEvil extends CardImpl { // Pay half your life, rounded up: Lurking Evil becomes a 4/4 Horror creature with flying. Effect effect = new BecomesCreatureSourceEffect(new LurkingEvilToken(), null, Duration.EndOfGame); effect.setText("{this} becomes a 4/4 Phyrexian Horror creature with flying"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new LurkingEvilCost())); + this.addAbility(new SimpleActivatedAbility(effect, new LurkingEvilCost())); } private LurkingEvil(final LurkingEvil card) { diff --git a/Mage.Sets/src/mage/cards/l/LurkingInformant.java b/Mage.Sets/src/mage/cards/l/LurkingInformant.java index 346b4e5e54d..8b3832c4852 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingInformant.java +++ b/Mage.Sets/src/mage/cards/l/LurkingInformant.java @@ -30,7 +30,7 @@ public final class LurkingInformant extends CardImpl { // ({UB} can be paid with either {U} or {B}.) // {2}, {tap}: Look at the top card of target player's library. You may put that card into that player's graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(1, true), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new LookLibraryTopCardTargetPlayerEffect(1, true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LuxCannon.java b/Mage.Sets/src/mage/cards/l/LuxCannon.java index 4db93fa1ed4..ec190358cf3 100644 --- a/Mage.Sets/src/mage/cards/l/LuxCannon.java +++ b/Mage.Sets/src/mage/cards/l/LuxCannon.java @@ -24,8 +24,8 @@ public final class LuxCannon extends CardImpl { public LuxCannon (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LuxaRiverShrine.java b/Mage.Sets/src/mage/cards/l/LuxaRiverShrine.java index 9f54bc28695..4bac79d4cd7 100644 --- a/Mage.Sets/src/mage/cards/l/LuxaRiverShrine.java +++ b/Mage.Sets/src/mage/cards/l/LuxaRiverShrine.java @@ -29,7 +29,7 @@ public final class LuxaRiverShrine extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {1}, {T}: You gain 1 life. Put a brick counter on Luxa River Shrine. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AddCountersSourceEffect(CounterType.BRICK.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java index ea4b3dff14b..e374e842339 100644 --- a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java +++ b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java @@ -56,7 +56,7 @@ public final class LyzoldaTheBloodWitch extends CardImpl { new DamageTargetEffect(2), new SacrificedWasCondition(redFilter), "{this} deals 2 damage to any target if the sacrificed creature was red"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); effect = new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(1), new SacrificedWasCondition(blackFilter), diff --git a/Mage.Sets/src/mage/cards/m/MadAuntie.java b/Mage.Sets/src/mage/cards/m/MadAuntie.java index ac5bfeb3d2a..19aa0e37958 100644 --- a/Mage.Sets/src/mage/cards/m/MadAuntie.java +++ b/Mage.Sets/src/mage/cards/m/MadAuntie.java @@ -45,7 +45,7 @@ public final class MadAuntie extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true))); // {T}: Regenerate another target Goblin. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MadProphet.java b/Mage.Sets/src/mage/cards/m/MadProphet.java index bee9f42c403..9c1ce70c473 100644 --- a/Mage.Sets/src/mage/cards/m/MadProphet.java +++ b/Mage.Sets/src/mage/cards/m/MadProphet.java @@ -32,7 +32,7 @@ public final class MadProphet extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}, Discard a card: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MageIlVec.java b/Mage.Sets/src/mage/cards/m/MageIlVec.java index 87423d62215..c5ac600d00e 100644 --- a/Mage.Sets/src/mage/cards/m/MageIlVec.java +++ b/Mage.Sets/src/mage/cards/m/MageIlVec.java @@ -29,7 +29,7 @@ public final class MageIlVec extends CardImpl { this.toughness = new MageInt(2); // {tap}, Discard a card at random: Mage il-Vec 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.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MageRingNetwork.java b/Mage.Sets/src/mage/cards/m/MageRingNetwork.java index b92d5aa6bf4..148da1fd265 100644 --- a/Mage.Sets/src/mage/cards/m/MageRingNetwork.java +++ b/Mage.Sets/src/mage/cards/m/MageRingNetwork.java @@ -32,7 +32,7 @@ public final class MageRingNetwork extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Put a storage counter on Mage-Ring Network. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MageRingResponder.java b/Mage.Sets/src/mage/cards/m/MageRingResponder.java index 9401a4a33a8..56ce5c14dca 100644 --- a/Mage.Sets/src/mage/cards/m/MageRingResponder.java +++ b/Mage.Sets/src/mage/cards/m/MageRingResponder.java @@ -38,7 +38,7 @@ public final class MageRingResponder extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {7}: Untap Mage-Ring Responder. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{7}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{7}"))); // Whenever Mage-Ring Responder attacks, it deals 7 damage to target creature defending player controls. this.addAbility(new MageRingResponderAbility()); diff --git a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java index 42248e58eaa..29cfe081f25 100644 --- a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java +++ b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java @@ -43,7 +43,7 @@ public final class MagetaTheLion extends CardImpl { this.toughness = new MageInt(3); // {2}{W}{W}, {tap}, Discard two cards: Destroy all creatures except for Mageta the Lion. Those creatures can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, true), new ManaCostsImpl<>("{2}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyAllEffect(filter, true), new ManaCostsImpl<>("{2}{W}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagewrightsStone.java b/Mage.Sets/src/mage/cards/m/MagewrightsStone.java index c0490f0b5e0..64467e9ceb9 100644 --- a/Mage.Sets/src/mage/cards/m/MagewrightsStone.java +++ b/Mage.Sets/src/mage/cards/m/MagewrightsStone.java @@ -35,7 +35,7 @@ public final class MagewrightsStone extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {1}, {T}: Untap target creature that has an activated ability with {T} in its cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagistratesScepter.java b/Mage.Sets/src/mage/cards/m/MagistratesScepter.java index 43f60856298..c2621f8b18f 100644 --- a/Mage.Sets/src/mage/cards/m/MagistratesScepter.java +++ b/Mage.Sets/src/mage/cards/m/MagistratesScepter.java @@ -25,12 +25,12 @@ public final class MagistratesScepter extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {4}, {tap}: Put a charge counter on Magistrate's Scepter. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {tap}, Remove three charge counters from Magistrate's Scepter: Take an extra turn after this one. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost()); + ability = new SimpleActivatedAbility(new AddExtraTurnControllerEffect(), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MagmaMine.java b/Mage.Sets/src/mage/cards/m/MagmaMine.java index d25f3317955..70d00d6315a 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaMine.java +++ b/Mage.Sets/src/mage/cards/m/MagmaMine.java @@ -27,12 +27,12 @@ public final class MagmaMine extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {4}: Put a pressure counter on Magma Mine. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.PRESSURE.createInstance(), true), new GenericManaCost(4))); // {tap}, Sacrifice Magma Mine: Magma Mine deals damage equal to the number of pressure counters on it to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.PRESSURE)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.PRESSURE)), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagmaVein.java b/Mage.Sets/src/mage/cards/m/MagmaVein.java index 6c5e35b1b82..f395e1406f7 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaVein.java +++ b/Mage.Sets/src/mage/cards/m/MagmaVein.java @@ -37,7 +37,7 @@ public final class MagmaVein extends CardImpl { // {R}, Sacrifice a land: Magma Vein deals 1 damage to each creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(1, filter1), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/Magmaw.java b/Mage.Sets/src/mage/cards/m/Magmaw.java index 83ff87cd642..1aef2049c0e 100644 --- a/Mage.Sets/src/mage/cards/m/Magmaw.java +++ b/Mage.Sets/src/mage/cards/m/Magmaw.java @@ -36,7 +36,7 @@ public final class Magmaw extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagnifyingGlass.java b/Mage.Sets/src/mage/cards/m/MagnifyingGlass.java index aa5ea303aa2..2910c2e12ef 100644 --- a/Mage.Sets/src/mage/cards/m/MagnifyingGlass.java +++ b/Mage.Sets/src/mage/cards/m/MagnifyingGlass.java @@ -26,7 +26,7 @@ public final class MagnifyingGlass extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}, {T}: Investigate. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new InvestigateEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new InvestigateEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheArena.java b/Mage.Sets/src/mage/cards/m/MagusOfTheArena.java index d0149959ca0..8f40a763942 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheArena.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheArena.java @@ -35,7 +35,7 @@ public final class MagusOfTheArena extends CardImpl { this.toughness = new MageInt(5); // {3}, {tap}: Tap target creature you control and target creature of an opponent's choice they control. Those creatures fight each other. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MagusOfTheArenaEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new MagusOfTheArenaEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addTarget(new TargetOpponentsChoicePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_CREATURE, false)); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheBazaar.java b/Mage.Sets/src/mage/cards/m/MagusOfTheBazaar.java index b13182c13f3..4ef7c58443e 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheBazaar.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheBazaar.java @@ -26,7 +26,7 @@ public final class MagusOfTheBazaar extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw two cards, then discard three cards. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(2, 3), new TapSourceCost())); } + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(2, 3), new TapSourceCost())); } private MagusOfTheBazaar(final MagusOfTheBazaar card) { super(card); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheCandelabra.java b/Mage.Sets/src/mage/cards/m/MagusOfTheCandelabra.java index b02aa1e1377..5973d3bcdd2 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheCandelabra.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheCandelabra.java @@ -34,7 +34,7 @@ public final class MagusOfTheCandelabra extends CardImpl { // {X}, {T}: Untap X target lands. Effect effect = new UntapTargetEffect(); effect.setText("untap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); ability.setTargetAdjuster(new XTargetsCountAdjuster()); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheDisk.java b/Mage.Sets/src/mage/cards/m/MagusOfTheDisk.java index 8f512899500..c593cc4746f 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheDisk.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheDisk.java @@ -43,7 +43,7 @@ public final class MagusOfTheDisk extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {1}, {tap}: Destroy all artifacts, creatures, and enchantments. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, false), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyAllEffect(filter, false), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java index de973a9816c..8fe08257473 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMind.java @@ -34,7 +34,7 @@ public final class MagusOfTheMind extends CardImpl { this.toughness = new MageInt(5); // U, T, Sacrifice Magus of the Mind: Shuffle your library, then exile the top X cards, where X is one plus the number of spells cast this turn. Until end of turn, you may play cards exiled this way without paying their mana costs. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MagusOfTheMindEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new MagusOfTheMindEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java index e81d8b88672..ed29a8a5413 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java @@ -34,7 +34,7 @@ public final class MagusOfTheScroll extends CardImpl { this.toughness = new MageInt(1); // {3}, {tap}: Name a card. Reveal a card at random from your hand. If it's the named card, Magus of the Scroll deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl<>("{3}")); ability.addEffect(new MagusOfTheScrollEffect()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java b/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java index 3ee568fa393..54aeccaada4 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java @@ -48,7 +48,7 @@ public final class MagusOfTheUnseen extends CardImpl { this.toughness = new MageInt(1); // {1}{U}, {tap}: Untap target artifact an opponent controls and gain control of it until end of turn. It gains haste until end of turn. When you lose control of the artifact, tap it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent(filter)); Effect effect = new GainControlTargetEffect(Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java b/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java index a1d6411b90c..647a97dc541 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java @@ -33,7 +33,7 @@ public final class MagusOfTheWheel extends CardImpl { // {1}{R}, {T}, Sacrifice Magus of the Wheel: Each player discards their hand, then draws seven cards. Effect effect = new DrawCardAllEffect(7); effect.setText(", then draws seven cards"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardHandAllEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DiscardHandAllEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MaintenanceDroid.java b/Mage.Sets/src/mage/cards/m/MaintenanceDroid.java index 255182a189e..1baf9eabcb5 100644 --- a/Mage.Sets/src/mage/cards/m/MaintenanceDroid.java +++ b/Mage.Sets/src/mage/cards/m/MaintenanceDroid.java @@ -46,7 +46,7 @@ public final class MaintenanceDroid extends CardImpl { this.toughness = new MageInt(2); // {T}: Choose target card you own with a repair counter on it. You may remove a repair counter from it or put another repair counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MaintenanceDroidEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MaintenanceDroidEffect(), new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MajorTeroh.java b/Mage.Sets/src/mage/cards/m/MajorTeroh.java index 09f858e3439..b45af8f2e7b 100644 --- a/Mage.Sets/src/mage/cards/m/MajorTeroh.java +++ b/Mage.Sets/src/mage/cards/m/MajorTeroh.java @@ -42,7 +42,7 @@ public final class MajorTeroh extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {3}{W}{W}, Sacrifice Major Teroh: Exile all black creatures. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAllEffect(filter),new ManaCostsImpl<>("{3}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new ExileAllEffect(filter),new ManaCostsImpl<>("{3}{W}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MalachOfTheDawn.java b/Mage.Sets/src/mage/cards/m/MalachOfTheDawn.java index d5ad355b87c..582da712228 100644 --- a/Mage.Sets/src/mage/cards/m/MalachOfTheDawn.java +++ b/Mage.Sets/src/mage/cards/m/MalachOfTheDawn.java @@ -28,7 +28,7 @@ public final class MalachOfTheDawn extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {W}{W}{W}: Regenerate Malach of the Dawn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}{W}{W}"))); } private MalachOfTheDawn(final MalachOfTheDawn card) { diff --git a/Mage.Sets/src/mage/cards/m/MalachiteGolem.java b/Mage.Sets/src/mage/cards/m/MalachiteGolem.java index 31b004f8ac8..c39a914da96 100644 --- a/Mage.Sets/src/mage/cards/m/MalachiteGolem.java +++ b/Mage.Sets/src/mage/cards/m/MalachiteGolem.java @@ -25,7 +25,7 @@ public final class MalachiteGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(5); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private MalachiteGolem(final MalachiteGolem card) { diff --git a/Mage.Sets/src/mage/cards/m/MalevolentAwakening.java b/Mage.Sets/src/mage/cards/m/MalevolentAwakening.java index 012fccba0ef..fdb72557d02 100644 --- a/Mage.Sets/src/mage/cards/m/MalevolentAwakening.java +++ b/Mage.Sets/src/mage/cards/m/MalevolentAwakening.java @@ -33,7 +33,7 @@ public final class MalevolentAwakening extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); // {1}{B}{B}, Sacrifice a creature: Return target creature card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{1}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{1}{B}{B}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java index e2242f02218..dcd6d98341c 100644 --- a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java +++ b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java @@ -36,7 +36,7 @@ public final class MaliciousIntent extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: Target creature can't block this turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/m/ManaLeech.java b/Mage.Sets/src/mage/cards/m/ManaLeech.java index 6fcd13aae1f..b81c116012e 100644 --- a/Mage.Sets/src/mage/cards/m/ManaLeech.java +++ b/Mage.Sets/src/mage/cards/m/ManaLeech.java @@ -31,7 +31,7 @@ public final class ManaLeech extends CardImpl { // You may choose not to untap Mana Leech during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Tap target land. It doesn't untap during its controller's untap step for as long as Mana Leech remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java index 09b8265f03e..b3602f95bcd 100644 --- a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java @@ -37,9 +37,9 @@ public final class ManaclesOfDecay extends CardImpl { // Enchanted creature can't attack. this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // {B}: Enchanted creature gets -1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); // {R}: Enchanted creature can't block this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.AURA, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new CantBlockAttachedEffect(AttachmentType.AURA, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } diff --git a/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java b/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java index 5799cc6b045..35cb81be723 100644 --- a/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java +++ b/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java @@ -32,7 +32,7 @@ public final class MangaraOfCorondor extends CardImpl { this.toughness = new MageInt(1); // {T}: Exile Mangara of Corondor and target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileSourceEffect(), new TapSourceCost()); ability.addEffect(new ExileTargetEffect().setText("and target permanent")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MangarasTome.java b/Mage.Sets/src/mage/cards/m/MangarasTome.java index 5f8ee0411d8..2e5e294b122 100644 --- a/Mage.Sets/src/mage/cards/m/MangarasTome.java +++ b/Mage.Sets/src/mage/cards/m/MangarasTome.java @@ -37,7 +37,7 @@ public final class MangarasTome extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new MangarasTomeSearchEffect())); // {2}: The next time you would draw a card this turn, instead put the top card of the exiled pile into its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MangarasTomeReplacementEffect(), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new MangarasTomeReplacementEffect(), new GenericManaCost(2))); } private MangarasTome(final MangarasTome card) { diff --git a/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java b/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java index f6dd45e5551..f05264ebeb8 100644 --- a/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java +++ b/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java @@ -29,7 +29,7 @@ public final class MannichiTheFeveredDream extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Switch each creature's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessAllEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessAllEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private MannichiTheFeveredDream(final MannichiTheFeveredDream card) { diff --git a/Mage.Sets/src/mage/cards/m/ManorGargoyle.java b/Mage.Sets/src/mage/cards/m/ManorGargoyle.java index 98c9c9c83e4..5af4ba7a419 100644 --- a/Mage.Sets/src/mage/cards/m/ManorGargoyle.java +++ b/Mage.Sets/src/mage/cards/m/ManorGargoyle.java @@ -70,7 +70,7 @@ public final class ManorGargoyle extends CardImpl { ContinuousEffect effect2 = new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.EndOfTurn); effect2.addDependencyType(DependencyType.LooseDefenderEffect); effect2.setText("Until end of turn, {this} loses defender"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect2, new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(effect2, new ManaCostsImpl<>("{1}")); effect2 = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect2.setText("and gains flying"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/m/ManorSkeleton.java b/Mage.Sets/src/mage/cards/m/ManorSkeleton.java index cbc1c0438c3..e836b92393e 100644 --- a/Mage.Sets/src/mage/cards/m/ManorSkeleton.java +++ b/Mage.Sets/src/mage/cards/m/ManorSkeleton.java @@ -28,7 +28,7 @@ public final class ManorSkeleton extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {1}{B}: Regenerate Manor Skeleton. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private ManorSkeleton(final ManorSkeleton card) { diff --git a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java index 8bb16afc199..b22bc820adc 100644 --- a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java +++ b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java @@ -34,7 +34,7 @@ public final class ManrikiGusari extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+2 and has "{tap}: Destroy target Equipment." this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 2))); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT))); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/m/MantaRiders.java b/Mage.Sets/src/mage/cards/m/MantaRiders.java index 8b9b9f60bfd..a6209cd1846 100644 --- a/Mage.Sets/src/mage/cards/m/MantaRiders.java +++ b/Mage.Sets/src/mage/cards/m/MantaRiders.java @@ -23,7 +23,7 @@ public final class MantaRiders extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } private MantaRiders(final MantaRiders card) { diff --git a/Mage.Sets/src/mage/cards/m/MantisEngine.java b/Mage.Sets/src/mage/cards/m/MantisEngine.java index 1b056eaa8db..46223fc2cd0 100644 --- a/Mage.Sets/src/mage/cards/m/MantisEngine.java +++ b/Mage.Sets/src/mage/cards/m/MantisEngine.java @@ -28,10 +28,10 @@ public final class MantisEngine extends CardImpl { this.toughness = new MageInt(3); // {2}: Mantis Engine gains flying until end of turn. (It can't be blocked except by creatures with flying or reach.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); // {2}: Mantis Engine gains first strike until end of turn. (It deals combat damage before creatures without first strike.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); } private MantisEngine(final MantisEngine card) { diff --git a/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java b/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java index a0172a29d9d..723c3074f3d 100644 --- a/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java +++ b/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java @@ -26,7 +26,7 @@ public final class MarangRiverSkeleton extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Marang River Skeleton. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // Megamorph {3}{B} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}"), true)); diff --git a/Mage.Sets/src/mage/cards/m/MarbleChalice.java b/Mage.Sets/src/mage/cards/m/MarbleChalice.java index db4bfa091a3..4cf374eb4a3 100644 --- a/Mage.Sets/src/mage/cards/m/MarbleChalice.java +++ b/Mage.Sets/src/mage/cards/m/MarbleChalice.java @@ -20,7 +20,7 @@ public final class MarbleChalice extends CardImpl { public MarbleChalice (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}{W}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost())); } private MarbleChalice(final MarbleChalice card) { diff --git a/Mage.Sets/src/mage/cards/m/MarchesasSmuggler.java b/Mage.Sets/src/mage/cards/m/MarchesasSmuggler.java index 4427593d911..6a0efff2a16 100644 --- a/Mage.Sets/src/mage/cards/m/MarchesasSmuggler.java +++ b/Mage.Sets/src/mage/cards/m/MarchesasSmuggler.java @@ -36,7 +36,7 @@ public final class MarchesasSmuggler extends CardImpl { // Dethrone this.addAbility(new DethroneAbility()); // {1}{U}{R}: Target creature you control gains haste until end of turn and can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}{R}")); ability.addTarget(new TargetControlledCreaturePermanent()); Effect effect = new CantBeBlockedTargetEffect(Duration.EndOfTurn); effect.setText("and can't be blocked this turn"); diff --git a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java index 7a7fec8498b..8d1327347af 100644 --- a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java +++ b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java @@ -39,7 +39,7 @@ public final class MarduAscendancy extends CardImpl { this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 1, true, true), false, attackFilter)); // Sacrifice Mardu Ascendancy: Creatures you control get +0/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false), + this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/m/MarduBanner.java b/Mage.Sets/src/mage/cards/m/MarduBanner.java index d9ee6142c4f..e8da2c72668 100644 --- a/Mage.Sets/src/mage/cards/m/MarduBanner.java +++ b/Mage.Sets/src/mage/cards/m/MarduBanner.java @@ -31,7 +31,7 @@ public final class MarduBanner extends CardImpl { this.addAbility(new BlackManaAbility()); // {R}{W}{B}, {T}, Sacrifice Mardu Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}{W}{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}{W}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MarduHateblade.java b/Mage.Sets/src/mage/cards/m/MarduHateblade.java index d1965faee52..bb2edb7b9d7 100644 --- a/Mage.Sets/src/mage/cards/m/MarduHateblade.java +++ b/Mage.Sets/src/mage/cards/m/MarduHateblade.java @@ -30,7 +30,7 @@ public final class MarduHateblade extends CardImpl { this.toughness = new MageInt(1); // {B}: Mardu Hateblade gains deathtouch until end of turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } private MarduHateblade(final MarduHateblade card) { diff --git a/Mage.Sets/src/mage/cards/m/Marjhan.java b/Mage.Sets/src/mage/cards/m/Marjhan.java index 3f92a5a1480..647523eca49 100644 --- a/Mage.Sets/src/mage/cards/m/Marjhan.java +++ b/Mage.Sets/src/mage/cards/m/Marjhan.java @@ -61,7 +61,7 @@ public final class Marjhan extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {U}{U}: Marjhan gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{U}")); + ability = new SimpleActivatedAbility(new BoostSourceEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{U}")); ability.addEffect(new DamageTargetEffect(1, "and")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MarkerBeetles.java b/Mage.Sets/src/mage/cards/m/MarkerBeetles.java index 3d318103d4f..3688d344735 100644 --- a/Mage.Sets/src/mage/cards/m/MarkerBeetles.java +++ b/Mage.Sets/src/mage/cards/m/MarkerBeetles.java @@ -35,7 +35,7 @@ public final class MarkerBeetles extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Sacrifice Marker Beetles: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MarkovDreadknight.java b/Mage.Sets/src/mage/cards/m/MarkovDreadknight.java index 69152e81a5a..663023f9d52 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovDreadknight.java +++ b/Mage.Sets/src/mage/cards/m/MarkovDreadknight.java @@ -33,7 +33,7 @@ public final class MarkovDreadknight extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}{B}, Discard a card: Put two +1/+1 counters on Markhov Dreadknight. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MarrowBats.java b/Mage.Sets/src/mage/cards/m/MarrowBats.java index e1c96dfd920..8159530eade 100644 --- a/Mage.Sets/src/mage/cards/m/MarrowBats.java +++ b/Mage.Sets/src/mage/cards/m/MarrowBats.java @@ -29,7 +29,7 @@ public final class MarrowBats extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Pay 4 life: Regenerate Marrow Bats. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(4))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new PayLifeCost(4))); } private MarrowBats(final MarrowBats card) { diff --git a/Mage.Sets/src/mage/cards/m/MarshFlitter.java b/Mage.Sets/src/mage/cards/m/MarshFlitter.java index 30e2db8c098..96d7dd0c34d 100644 --- a/Mage.Sets/src/mage/cards/m/MarshFlitter.java +++ b/Mage.Sets/src/mage/cards/m/MarshFlitter.java @@ -46,7 +46,7 @@ public final class MarshFlitter extends CardImpl { // Sacrifice a Goblin: Marsh Flitter has base power and toughness 3/3 until end of turn. Effect effect = new SetBasePowerToughnessSourceEffect(3, 3, Duration.EndOfTurn); effect.setText("{this} has base power and toughness 3/3 until end of turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new SacrificeTargetCost(filter)); + Ability ability = new SimpleActivatedAbility(effect, new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MarshLurker.java b/Mage.Sets/src/mage/cards/m/MarshLurker.java index 1414d116f2b..2c478f7a374 100644 --- a/Mage.Sets/src/mage/cards/m/MarshLurker.java +++ b/Mage.Sets/src/mage/cards/m/MarshLurker.java @@ -34,7 +34,7 @@ public final class MarshLurker extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); } private MarshLurker(final MarshLurker card) { diff --git a/Mage.Sets/src/mage/cards/m/MartyrOfAshes.java b/Mage.Sets/src/mage/cards/m/MartyrOfAshes.java index 30917731cd9..e62bbc29d17 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrOfAshes.java +++ b/Mage.Sets/src/mage/cards/m/MartyrOfAshes.java @@ -50,7 +50,7 @@ public final class MartyrOfAshes extends CardImpl { // {2}, Reveal X red cards from your hand, Sacrifice Martyr of Ashes: Martyr of Ashes deals X damage to each creature without flying. Effect effect = new DamageAllEffect(RevealTargetFromHandCostCount.instance, filterCreature); effect.setText("Martyr of Ashes deals X damage to each creature without flying."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(2)); ability.addCost(new RevealTargetFromHandCost(new TargetCardInHand(0, Integer.MAX_VALUE, filterHand))); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MartyrOfBones.java b/Mage.Sets/src/mage/cards/m/MartyrOfBones.java index f2ce4b10120..a8404d419dc 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrOfBones.java +++ b/Mage.Sets/src/mage/cards/m/MartyrOfBones.java @@ -40,7 +40,7 @@ public final class MartyrOfBones extends CardImpl { this.toughness = new MageInt(1); // {1}, Reveal X black cards from your hand, Sacrifice Martyr of Bones: Exile up to X target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(1)); ability.addCost(new RevealVariableBlackCardsFromHandCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 1, new FilterCard("up to X target cards"))); diff --git a/Mage.Sets/src/mage/cards/m/MartyrOfFrost.java b/Mage.Sets/src/mage/cards/m/MartyrOfFrost.java index 8ca3c35962b..7b1730632d7 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrOfFrost.java +++ b/Mage.Sets/src/mage/cards/m/MartyrOfFrost.java @@ -44,7 +44,7 @@ public final class MartyrOfFrost extends CardImpl { // {2}, Reveal X blue cards from your hand, Sacrifice Martyr of Frost: Counter target spell unless its controller pays {X}. Effect effect = new CounterUnlessPaysEffect(RevealTargetFromHandCostCount.instance); effect.setText("Counter target spell unless its controller pays {X}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(2)); ability.addCost(new RevealTargetFromHandCost(new TargetCardInHand(0, Integer.MAX_VALUE, filter))); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/m/MartyrOfSands.java b/Mage.Sets/src/mage/cards/m/MartyrOfSands.java index c035d63a6b3..9ef62810bf5 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrOfSands.java +++ b/Mage.Sets/src/mage/cards/m/MartyrOfSands.java @@ -45,7 +45,7 @@ public final class MartyrOfSands extends CardImpl { // {1}, Reveal X white cards from your hand, Sacrifice Martyr of Sands: You gain three times X life. Effect effect = new GainLifeEffect(new MultipliedValue(RevealTargetFromHandCostCount.instance, 3)); effect.setText("You gain three times X life."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}")); ability.addCost(new RevealTargetFromHandCost(new TargetCardInHand(0, Integer.MAX_VALUE, filter))); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MartyredRusalka.java b/Mage.Sets/src/mage/cards/m/MartyredRusalka.java index 453c58c3fdd..ccff071e74c 100644 --- a/Mage.Sets/src/mage/cards/m/MartyredRusalka.java +++ b/Mage.Sets/src/mage/cards/m/MartyredRusalka.java @@ -31,7 +31,7 @@ public final class MartyredRusalka extends CardImpl { this.toughness = new MageInt(1); // {W}, Sacrifice a creature: Target creature can't attack this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MartyrsCause.java b/Mage.Sets/src/mage/cards/m/MartyrsCause.java index 70a2fbe617f..e3cbbdd08a9 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrsCause.java +++ b/Mage.Sets/src/mage/cards/m/MartyrsCause.java @@ -25,7 +25,7 @@ public final class MartyrsCause extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Sacrifice a creature: The next time a source of your choice would deal damage to any target this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MartyrsTomb.java b/Mage.Sets/src/mage/cards/m/MartyrsTomb.java index 11b4127161a..9d332fec9e5 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrsTomb.java +++ b/Mage.Sets/src/mage/cards/m/MartyrsTomb.java @@ -23,7 +23,7 @@ public final class MartyrsTomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{B}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new PayLifeCost(2)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new PayLifeCost(2)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MasterApothecary.java b/Mage.Sets/src/mage/cards/m/MasterApothecary.java index 1032d7eb069..552ac3521b2 100644 --- a/Mage.Sets/src/mage/cards/m/MasterApothecary.java +++ b/Mage.Sets/src/mage/cards/m/MasterApothecary.java @@ -39,7 +39,7 @@ public final class MasterApothecary extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped Cleric you control: Prevent the next 2 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MasterDecoy.java b/Mage.Sets/src/mage/cards/m/MasterDecoy.java index 8874c372538..b6f814ce295 100644 --- a/Mage.Sets/src/mage/cards/m/MasterDecoy.java +++ b/Mage.Sets/src/mage/cards/m/MasterDecoy.java @@ -29,7 +29,7 @@ public final class MasterDecoy extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MasterHealer.java b/Mage.Sets/src/mage/cards/m/MasterHealer.java index e1c94a14c62..9337e9c6f48 100644 --- a/Mage.Sets/src/mage/cards/m/MasterHealer.java +++ b/Mage.Sets/src/mage/cards/m/MasterHealer.java @@ -30,7 +30,7 @@ public final class MasterHealer extends CardImpl { this.toughness = new MageInt(4); // {tap}: Prevent the next 4 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java index b41e2ffc90a..63e08d01d3c 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java @@ -43,7 +43,7 @@ public final class MasterOfTheWildHunt extends CardImpl { new CreateTokenEffect(new WolfToken()))); // {T}: Tap all untapped Wolf creatures you control. Each Wolf tapped this way deals damage equal to its power to target creature. That creature deals damage equal to its power divided as its controller chooses among any number of those Wolves. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MasterOfTheWildHuntEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MasterOfTheWildHuntEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addHint(new ValueHint("Untapped wolfs you control", new PermanentsOnBattlefieldCount(MasterOfTheWildHuntEffect.filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MasterTransmuter.java b/Mage.Sets/src/mage/cards/m/MasterTransmuter.java index bec9232f749..b501c88a203 100644 --- a/Mage.Sets/src/mage/cards/m/MasterTransmuter.java +++ b/Mage.Sets/src/mage/cards/m/MasterTransmuter.java @@ -33,7 +33,7 @@ public final class MasterTransmuter extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}, Return an artifact you control to its owner's hand: You may put an artifact card from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(new FilterArtifactCard("an artifact card")), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(new FilterArtifactCard("an artifact card")), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MasteryOfTheUnseen.java b/Mage.Sets/src/mage/cards/m/MasteryOfTheUnseen.java index 7f99b3944dd..d7beda2e679 100644 --- a/Mage.Sets/src/mage/cards/m/MasteryOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/m/MasteryOfTheUnseen.java @@ -30,7 +30,7 @@ public final class MasteryOfTheUnseen extends CardImpl { new FilterControlledPermanent("a permanent you control"))); // {3}{W}: Manifest the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ManifestEffect(1), new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new ManifestEffect(1), new ManaCostsImpl<>("{3}{W}"))); } private MasteryOfTheUnseen(final MasteryOfTheUnseen card) { diff --git a/Mage.Sets/src/mage/cards/m/Masticore.java b/Mage.Sets/src/mage/cards/m/Masticore.java index a9fd003b675..c5a175d0d8c 100644 --- a/Mage.Sets/src/mage/cards/m/Masticore.java +++ b/Mage.Sets/src/mage/cards/m/Masticore.java @@ -36,11 +36,11 @@ public final class Masticore extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand())))); // {2}: Masticore deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}: Regenerate Masticore. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(2))); } private Masticore(final Masticore card) { diff --git a/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java b/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java index 9fd0cd665b1..9b4bfe95dcc 100644 --- a/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java +++ b/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java @@ -32,7 +32,7 @@ public final class MatsuTribeDecoy extends CardImpl { this.toughness = new MageInt(3); // {2}{G}: Target creature blocks Matsu-Tribe Decoy this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever Kashi-Tribe Reaver deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. diff --git a/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java b/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java index d889948437d..eee0f6b76cb 100644 --- a/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java +++ b/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java @@ -42,7 +42,7 @@ public final class MatsuTribeSniper extends CardImpl { this.toughness = new MageInt(1); // {t}: Matsu-Tribe Sniper deals 1 damage to target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java index 139ce4fda48..7dd8bc7475d 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java @@ -46,7 +46,7 @@ public final class MausoleumWanderer extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter)); // Sacrifice Mausoleum Wanderer: Counter target instant or sorcery spell unless its controller pays {X}, where X is Mausoleum Wanderer's power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(SourcePermanentPowerValue.NOT_NEGATIVE), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(SourcePermanentPowerValue.NOT_NEGATIVE), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(new FilterInstantOrSorcerySpell())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MawOfKozilek.java b/Mage.Sets/src/mage/cards/m/MawOfKozilek.java index b303f760faf..e0ea84bd373 100644 --- a/Mage.Sets/src/mage/cards/m/MawOfKozilek.java +++ b/Mage.Sets/src/mage/cards/m/MawOfKozilek.java @@ -31,7 +31,7 @@ public final class MawOfKozilek extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {C}: Maw of Kozilek gets +2/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{C}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{C}"))); } private MawOfKozilek(final MawOfKozilek card) { diff --git a/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java b/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java index 11c18952c00..8c07b82c1b2 100644 --- a/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java +++ b/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java @@ -25,7 +25,7 @@ public final class MawOfTheObzedat extends CardImpl { this.toughness = new MageInt(3); // Sacrifice a creature: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/m/Mawcor.java b/Mage.Sets/src/mage/cards/m/Mawcor.java index 96869ff8f32..592f24a30f6 100644 --- a/Mage.Sets/src/mage/cards/m/Mawcor.java +++ b/Mage.Sets/src/mage/cards/m/Mawcor.java @@ -28,7 +28,7 @@ public final class Mawcor extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - 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/m/MazeOfIth.java b/Mage.Sets/src/mage/cards/m/MazeOfIth.java index 0fa4580bfb8..b9c8e2c0638 100644 --- a/Mage.Sets/src/mage/cards/m/MazeOfIth.java +++ b/Mage.Sets/src/mage/cards/m/MazeOfIth.java @@ -27,7 +27,7 @@ public final class MazeOfIth extends CardImpl { // {T}: Untap target attacking creature. Prevent all combat damage that // would be dealt to and dealt by that creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); effect.setOutcome(Outcome.Detriment); diff --git a/Mage.Sets/src/mage/cards/m/MazeOfShadows.java b/Mage.Sets/src/mage/cards/m/MazeOfShadows.java index 36b3709f7e2..dcf00f8ba75 100644 --- a/Mage.Sets/src/mage/cards/m/MazeOfShadows.java +++ b/Mage.Sets/src/mage/cards/m/MazeOfShadows.java @@ -39,7 +39,7 @@ public final class MazeOfShadows extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {tap}: Untap target attacking creature with shadow. Prevent all combat damage that would be dealt to and dealt by that creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MazesEnd.java b/Mage.Sets/src/mage/cards/m/MazesEnd.java index 1c4f5b6d953..6a2b9581cf0 100644 --- a/Mage.Sets/src/mage/cards/m/MazesEnd.java +++ b/Mage.Sets/src/mage/cards/m/MazesEnd.java @@ -51,7 +51,7 @@ public final class MazesEnd extends CardImpl { this.addAbility(new ColorlessManaAbility()); // 3, {T}, Return Maze's End to its owner's hand: Search your library for a Gate card, put it onto the battlefield, then shuffle your library. If you control ten or more Gates with different names, you win the game. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterCard)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterCard)), new GenericManaCost(3)); ability.addEffect(new MazesEndEffect()); ability.addCost(new TapSourceCost()); ability.addCost(new ReturnToHandFromBattlefieldSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MechHangar.java b/Mage.Sets/src/mage/cards/m/MechHangar.java index 7bde7e2a278..d3354c99c56 100644 --- a/Mage.Sets/src/mage/cards/m/MechHangar.java +++ b/Mage.Sets/src/mage/cards/m/MechHangar.java @@ -43,7 +43,7 @@ public final class MechHangar extends CardImpl { this.addAbility(new ConditionalAnyColorManaAbility(new TapSourceCost(), 1, new ConditionalSpellManaBuilder(filter), true)); // {3}, {T}, Target Vehicle becomes an artifact creature until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCardTypeTargetEffect( + Ability ability = new SimpleActivatedAbility(new AddCardTypeTargetEffect( Duration.EndOfTurn, CardType.ARTIFACT, CardType.CREATURE) .setText("Target Vehicle becomes an artifact creature until end of turn"), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MedicineBag.java b/Mage.Sets/src/mage/cards/m/MedicineBag.java index c5a4edde6e3..688647b0012 100644 --- a/Mage.Sets/src/mage/cards/m/MedicineBag.java +++ b/Mage.Sets/src/mage/cards/m/MedicineBag.java @@ -24,7 +24,7 @@ public final class MedicineBag extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {1}, {tap}, Discard a card: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/m/Megatog.java b/Mage.Sets/src/mage/cards/m/Megatog.java index 374cb64caa1..00ebfde96eb 100644 --- a/Mage.Sets/src/mage/cards/m/Megatog.java +++ b/Mage.Sets/src/mage/cards/m/Megatog.java @@ -37,7 +37,7 @@ public final class Megatog extends CardImpl { this.toughness = new MageInt(4); // Sacrifice an artifact: Megatog gets +3/+3 and gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(3, 3, Duration.EndOfTurn) .setText("{this} gets +3/+3"), new SacrificeTargetCost(filter)); ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn) .setText("and gains trample until end of turn")); diff --git a/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java b/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java index 09c3865f608..813bd56603f 100644 --- a/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java +++ b/Mage.Sets/src/mage/cards/m/MeletisCharlatan.java @@ -35,7 +35,7 @@ public final class MeletisCharlatan extends CardImpl { this.toughness = new MageInt(3); // {2}{U}, {T}: The controller of target instant or sorcery spell copies it. That player may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MeletisCharlatanCopyTargetSpellEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new MeletisCharlatanCopyTargetSpellEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); Target target = new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/m/Memnarch.java b/Mage.Sets/src/mage/cards/m/Memnarch.java index d2583bd917c..f4700079cf5 100644 --- a/Mage.Sets/src/mage/cards/m/Memnarch.java +++ b/Mage.Sets/src/mage/cards/m/Memnarch.java @@ -35,12 +35,12 @@ public final class Memnarch extends CardImpl { // {1}{U}{U}: Target permanent becomes an artifact in addition to its other types. Effect effect = new AddCardTypeTargetEffect(Duration.Custom, CardType.ARTIFACT); effect.setText("Target permanent becomes an artifact in addition to its other types"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{U}{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{U}{U}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); // {3}{U}: Gain control of target artifact. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.WhileOnBattlefield), new ManaCostsImpl<>("{3}{U}")); + Ability ability2 = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.WhileOnBattlefield), new ManaCostsImpl<>("{3}{U}")); ability2.addTarget(new TargetArtifactPermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/m/MemorialToFolly.java b/Mage.Sets/src/mage/cards/m/MemorialToFolly.java index 0daf62f10fb..cf2194d803f 100644 --- a/Mage.Sets/src/mage/cards/m/MemorialToFolly.java +++ b/Mage.Sets/src/mage/cards/m/MemorialToFolly.java @@ -31,7 +31,7 @@ public final class MemorialToFolly extends CardImpl { this.addAbility(new BlackManaAbility()); // {2}{B}, {T}, Sacrifice Memorial to Folly: Return target creature card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect() + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect() .setText("Return target creature card from your graveyard to your hand"), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MemorialToGenius.java b/Mage.Sets/src/mage/cards/m/MemorialToGenius.java index b47c23538bc..89bb45273e3 100644 --- a/Mage.Sets/src/mage/cards/m/MemorialToGenius.java +++ b/Mage.Sets/src/mage/cards/m/MemorialToGenius.java @@ -30,7 +30,7 @@ public final class MemorialToGenius extends CardImpl { this.addAbility(new BlueManaAbility()); // {4}{U}, {T}, Sacrifice Memorial to Genius: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{4}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{4}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MemorialToGlory.java b/Mage.Sets/src/mage/cards/m/MemorialToGlory.java index 3cbdc35c922..0f57a91e6f8 100644 --- a/Mage.Sets/src/mage/cards/m/MemorialToGlory.java +++ b/Mage.Sets/src/mage/cards/m/MemorialToGlory.java @@ -31,7 +31,7 @@ public final class MemorialToGlory extends CardImpl { this.addAbility(new WhiteManaAbility()); // {3}{W}, {T}, Sacrifice Memorial to Glory: Creature two 1/1 white Soldier creature tokens. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken(), 2), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SoldierToken(), 2), new ManaCostsImpl<>("{3}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MemorialToWar.java b/Mage.Sets/src/mage/cards/m/MemorialToWar.java index c24fc1a1fcb..0a1699b6ff9 100644 --- a/Mage.Sets/src/mage/cards/m/MemorialToWar.java +++ b/Mage.Sets/src/mage/cards/m/MemorialToWar.java @@ -31,7 +31,7 @@ public final class MemorialToWar extends CardImpl { this.addAbility(new RedManaAbility()); // {4}{R}, {T}, Sacrifice Memorial to War: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{4}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{4}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/m/MemoryJar.java b/Mage.Sets/src/mage/cards/m/MemoryJar.java index d5aa4537057..565610fe09a 100644 --- a/Mage.Sets/src/mage/cards/m/MemoryJar.java +++ b/Mage.Sets/src/mage/cards/m/MemoryJar.java @@ -33,7 +33,7 @@ public final class MemoryJar extends CardImpl { // {T}, Sacrifice Memory Jar: Each player exiles all cards from their hand face down and draws seven cards. // At the beginning of the next end step, each player discards their hand and returns to their hand each //card they exiled this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MemoryJarEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MemoryJarEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MentalDiscipline.java b/Mage.Sets/src/mage/cards/m/MentalDiscipline.java index eaaf6126def..84071c2956c 100644 --- a/Mage.Sets/src/mage/cards/m/MentalDiscipline.java +++ b/Mage.Sets/src/mage/cards/m/MentalDiscipline.java @@ -22,7 +22,7 @@ public final class MentalDiscipline extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}{U}"); // {1}{U}, Discard a card: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MercadianBazaar.java b/Mage.Sets/src/mage/cards/m/MercadianBazaar.java index b0122d7d889..f49b043ad75 100644 --- a/Mage.Sets/src/mage/cards/m/MercadianBazaar.java +++ b/Mage.Sets/src/mage/cards/m/MercadianBazaar.java @@ -30,7 +30,7 @@ public final class MercadianBazaar extends CardImpl { // Mercadian Bazaar enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Put a storage counter on Mercadian Bazaar. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {tap}, Remove any number of storage counters from Mercadian Bazaar: Add {R} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.RedMana(1), diff --git a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java index 8293a54f2c2..6311c7fb0c7 100644 --- a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java +++ b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java @@ -50,7 +50,7 @@ public final class MercenaryInformer extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterBlack, Duration.WhileOnBattlefield))); // {2}{W}: Put target nontoken Mercenary on the bottom of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetPermanent(filterMercenary)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java index 75f86ddc779..0bdb1514f60 100644 --- a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java +++ b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java @@ -40,7 +40,7 @@ public final class MerchantsDockhand extends CardImpl { this.toughness = new MageInt(2); // {3}{U}, {T}, Tap X untapped artifacts you control: Look at the top X cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MerchantsDockhandEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new MerchantsDockhandEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapXTargetCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MercilessEternal.java b/Mage.Sets/src/mage/cards/m/MercilessEternal.java index fef37e1bf34..d210dc852dc 100644 --- a/Mage.Sets/src/mage/cards/m/MercilessEternal.java +++ b/Mage.Sets/src/mage/cards/m/MercilessEternal.java @@ -34,7 +34,7 @@ public final class MercilessEternal extends CardImpl { this.addAbility(new AfflictAbility(2)); // {2}{B}, Discard a card: Merciless Eternal gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new DiscardCardCost(false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MercurialChemister.java b/Mage.Sets/src/mage/cards/m/MercurialChemister.java index 6c9e04300d9..51aace61ac7 100644 --- a/Mage.Sets/src/mage/cards/m/MercurialChemister.java +++ b/Mage.Sets/src/mage/cards/m/MercurialChemister.java @@ -34,12 +34,12 @@ public final class MercurialChemister extends CardImpl { this.toughness = new MageInt(3); // {U}, {T}: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {R}, {T}, Discard a card: Mercurial Chemister deals damage to target creature equal to the discarded card's converted mana cost. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(DiscardCostCardManaValue.instance), new ManaCostsImpl<>("{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(DiscardCostCardManaValue.instance), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); @@ -54,4 +54,4 @@ public final class MercurialChemister extends CardImpl { public MercurialChemister copy() { return new MercurialChemister(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MercurialPretender.java b/Mage.Sets/src/mage/cards/m/MercurialPretender.java index f199007e8f0..f49e0a4548d 100644 --- a/Mage.Sets/src/mage/cards/m/MercurialPretender.java +++ b/Mage.Sets/src/mage/cards/m/MercurialPretender.java @@ -35,7 +35,7 @@ public final class MercurialPretender extends CardImpl { // You may have Mercurial Pretender enter the battlefield as a copy of any creature you control, // except it has "{2}{U}{U}: Return this creature to its owner's hand." Effect effect = new CopyPermanentEffect(StaticFilters.FILTER_CONTROLLED_CREATURE, - new AbilityCopyApplier(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}{U}")))); + new AbilityCopyApplier(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}{U}")))); effect.setText(effectText); this.addAbility(new EntersBattlefieldAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/m/MerfolkAssassin.java b/Mage.Sets/src/mage/cards/m/MerfolkAssassin.java index 369d5b37f3c..98873f31acd 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkAssassin.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkAssassin.java @@ -37,7 +37,7 @@ public final class MerfolkAssassin extends CardImpl { this.toughness = new MageInt(2); // {tap}: Destroy target creature with islandwalk. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MerfolkLooter.java b/Mage.Sets/src/mage/cards/m/MerfolkLooter.java index 6e5703dbf1e..84d618719c6 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkLooter.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkLooter.java @@ -25,7 +25,7 @@ public final class MerfolkLooter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); } private MerfolkLooter(final MerfolkLooter card) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkMesmerist.java b/Mage.Sets/src/mage/cards/m/MerfolkMesmerist.java index 83c8f7cbea3..811dae1c923 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkMesmerist.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkMesmerist.java @@ -29,7 +29,7 @@ public final class MerfolkMesmerist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - 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/m/MerfolkSeastalkers.java b/Mage.Sets/src/mage/cards/m/MerfolkSeastalkers.java index e7da36c8a0e..2d4d25f7e49 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSeastalkers.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSeastalkers.java @@ -39,7 +39,7 @@ public final class MerfolkSeastalkers extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new IslandwalkAbility()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java index dd6ded2f5f6..ca499fa5ac7 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java @@ -42,7 +42,7 @@ public final class MerfolkSovereign extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // {tap}: Target Merfolk creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MerfolkThaumaturgist.java b/Mage.Sets/src/mage/cards/m/MerfolkThaumaturgist.java index 47482533621..2c55c36f9a1 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkThaumaturgist.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkThaumaturgist.java @@ -29,7 +29,7 @@ public final class MerfolkThaumaturgist extends CardImpl { this.toughness = new MageInt(2); // {tap}: Switch target creature's power and toughness until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MerrowGrimeblotter.java b/Mage.Sets/src/mage/cards/m/MerrowGrimeblotter.java index 77129af7cee..747dbce1c48 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowGrimeblotter.java +++ b/Mage.Sets/src/mage/cards/m/MerrowGrimeblotter.java @@ -31,7 +31,7 @@ public final class MerrowGrimeblotter extends CardImpl { this.toughness = new MageInt(2); // {1}{UB}, {untap}: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U/B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U/B}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MerrowLevitator.java b/Mage.Sets/src/mage/cards/m/MerrowLevitator.java index 15a9d7354a5..20157f665cc 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowLevitator.java +++ b/Mage.Sets/src/mage/cards/m/MerrowLevitator.java @@ -41,7 +41,7 @@ public final class MerrowLevitator extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filterBlueSpell, true)); diff --git a/Mage.Sets/src/mage/cards/m/MerrowWavebreakers.java b/Mage.Sets/src/mage/cards/m/MerrowWavebreakers.java index d0e033f7a56..23128e7b8ce 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowWavebreakers.java +++ b/Mage.Sets/src/mage/cards/m/MerrowWavebreakers.java @@ -32,7 +32,7 @@ public final class MerrowWavebreakers extends CardImpl { this.toughness = new MageInt(3); // {1}{U}, {untap}: Merrow Wavebreakers gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MesaFalcon.java b/Mage.Sets/src/mage/cards/m/MesaFalcon.java index abfdd1bb3ed..4f84d3f92de 100644 --- a/Mage.Sets/src/mage/cards/m/MesaFalcon.java +++ b/Mage.Sets/src/mage/cards/m/MesaFalcon.java @@ -30,7 +30,7 @@ public final class MesaFalcon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Mesa Falcon gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private MesaFalcon(final MesaFalcon card) { diff --git a/Mage.Sets/src/mage/cards/m/MesmericTrance.java b/Mage.Sets/src/mage/cards/m/MesmericTrance.java index 271ac4e6551..c1f5716ad08 100644 --- a/Mage.Sets/src/mage/cards/m/MesmericTrance.java +++ b/Mage.Sets/src/mage/cards/m/MesmericTrance.java @@ -25,7 +25,7 @@ public final class MesmericTrance extends CardImpl { // Cumulative upkeep {1} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // {U}, Discard a card: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/Metallurgeon.java b/Mage.Sets/src/mage/cards/m/Metallurgeon.java index 6030423462f..b554010bcde 100644 --- a/Mage.Sets/src/mage/cards/m/Metallurgeon.java +++ b/Mage.Sets/src/mage/cards/m/Metallurgeon.java @@ -28,7 +28,7 @@ public final class Metallurgeon extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MetalspinnersPuzzleknot.java b/Mage.Sets/src/mage/cards/m/MetalspinnersPuzzleknot.java index 8d56e6ae3c1..a7902eeb85b 100644 --- a/Mage.Sets/src/mage/cards/m/MetalspinnersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/m/MetalspinnersPuzzleknot.java @@ -31,7 +31,7 @@ public final class MetalspinnersPuzzleknot extends CardImpl { this.addAbility(ability); // {2}{B}, Sacrifice Metalspinner's Puzzleknot: You draw a card and you lose 1 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, drawEffect, new ManaCostsImpl<>("{2}{B}")); + ability = new SimpleActivatedAbility(drawEffect, new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addEffect(lifeEffect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MetathranTransport.java b/Mage.Sets/src/mage/cards/m/MetathranTransport.java index 41f91e5440a..17e9f677a0d 100644 --- a/Mage.Sets/src/mage/cards/m/MetathranTransport.java +++ b/Mage.Sets/src/mage/cards/m/MetathranTransport.java @@ -44,7 +44,7 @@ public final class MetathranTransport extends CardImpl { // Metathran Transport can't be blocked by blue creatures. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); // {U}: Target creature becomes blue until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.BLUE, + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MetathranZombie.java b/Mage.Sets/src/mage/cards/m/MetathranZombie.java index 35300f37bcc..50129a3bc13 100644 --- a/Mage.Sets/src/mage/cards/m/MetathranZombie.java +++ b/Mage.Sets/src/mage/cards/m/MetathranZombie.java @@ -27,7 +27,7 @@ public final class MetathranZombie extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Metathran Zombie. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private MetathranZombie(final MetathranZombie card) { diff --git a/Mage.Sets/src/mage/cards/m/MeteorStorm.java b/Mage.Sets/src/mage/cards/m/MeteorStorm.java index 9abb362bf70..27043a47a6e 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorStorm.java +++ b/Mage.Sets/src/mage/cards/m/MeteorStorm.java @@ -26,7 +26,7 @@ public final class MeteorStorm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}{G}"); // {2}{R}{G}, Discard two cards at random: Meteor Storm deals 4 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl<>("{2}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new ManaCostsImpl<>("{2}{R}{G}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("cards at random")), true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/Metrognome.java b/Mage.Sets/src/mage/cards/m/Metrognome.java index ebf36ce2710..012cb2271c0 100644 --- a/Mage.Sets/src/mage/cards/m/Metrognome.java +++ b/Mage.Sets/src/mage/cards/m/Metrognome.java @@ -26,7 +26,7 @@ public final class Metrognome extends CardImpl { this.addAbility(new DiscardedByOpponentTriggeredAbility(new CreateTokenEffect(new GnomeToken(), 4), true)); // {4}, {tap}: Create a 1/1 colorless Gnome artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GnomeToken()), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GnomeToken()), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MetropolisSprite.java b/Mage.Sets/src/mage/cards/m/MetropolisSprite.java index c8fc2adce2f..7dac658302e 100644 --- a/Mage.Sets/src/mage/cards/m/MetropolisSprite.java +++ b/Mage.Sets/src/mage/cards/m/MetropolisSprite.java @@ -31,7 +31,7 @@ public final class MetropolisSprite extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Metropolis Sprite gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private MetropolisSprite(final MetropolisSprite card) { diff --git a/Mage.Sets/src/mage/cards/m/MetzaliTowerOfTriumph.java b/Mage.Sets/src/mage/cards/m/MetzaliTowerOfTriumph.java index 0fe4c52bd78..0581ccc1d20 100644 --- a/Mage.Sets/src/mage/cards/m/MetzaliTowerOfTriumph.java +++ b/Mage.Sets/src/mage/cards/m/MetzaliTowerOfTriumph.java @@ -43,12 +43,12 @@ public final class MetzaliTowerOfTriumph extends CardImpl { this.addAbility(new AnyColorManaAbility()); // {1}{R}, {T}: Metzali, Tower of Triumph deals 2 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(2, TargetController.OPPONENT), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(2, TargetController.OPPONENT), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {2}{W}, {T}: Choose a creature at random that attacked this turn. Destroy that creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MetzaliTowerOfTriumphEffect(), new ManaCostsImpl<>("{2}{W}")); + ability = new SimpleActivatedAbility(new MetzaliTowerOfTriumphEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java index b98e1a84a0f..bc8de65d45f 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java +++ b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java @@ -33,7 +33,7 @@ public final class MidnightCovenant extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." - this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); } private MidnightCovenant(final MidnightCovenant card) { diff --git a/Mage.Sets/src/mage/cards/m/MidsummerRevel.java b/Mage.Sets/src/mage/cards/m/MidsummerRevel.java index 2db1e81088d..f100552db6f 100644 --- a/Mage.Sets/src/mage/cards/m/MidsummerRevel.java +++ b/Mage.Sets/src/mage/cards/m/MidsummerRevel.java @@ -30,7 +30,7 @@ public final class MidsummerRevel extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility( new AddCountersSourceEffect(CounterType.VERSE.createInstance(), true), true)); // {G}, Sacrifice Midsummer Revel: create X 3/3 green Beast creature tokens, where X is the number of verse counters on Midsummer Revel. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken(), + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new BeastToken(), new CountersSourceCount(CounterType.VERSE)), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MightWeaver.java b/Mage.Sets/src/mage/cards/m/MightWeaver.java index 2520e63ebbd..29dc9d2cea2 100644 --- a/Mage.Sets/src/mage/cards/m/MightWeaver.java +++ b/Mage.Sets/src/mage/cards/m/MightWeaver.java @@ -41,7 +41,7 @@ public final class MightWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java index 5d40c1e31c0..a46f9b711e4 100644 --- a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java +++ b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java @@ -38,7 +38,7 @@ public final class MikaeusTheLunarch extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // {T}: Put a +1/+1 counter on Mikaeus. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new TapSourceCost())); // {T}, Remove a +1/+1 counter from Mikaeus: Put a +1/+1 counter on each other creature you control. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java b/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java index c5a67806011..9e3f13ffae5 100644 --- a/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java +++ b/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java @@ -26,7 +26,7 @@ public final class MikokoroCenterOfTheSea extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}: Each player draws a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardAllEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardAllEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MilitantMonk.java b/Mage.Sets/src/mage/cards/m/MilitantMonk.java index e04805a675e..2138da5e3dd 100644 --- a/Mage.Sets/src/mage/cards/m/MilitantMonk.java +++ b/Mage.Sets/src/mage/cards/m/MilitantMonk.java @@ -33,7 +33,7 @@ public final class MilitantMonk extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {T}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/Millstone.java b/Mage.Sets/src/mage/cards/m/Millstone.java index 06a4bcd902b..f6410289ed5 100644 --- a/Mage.Sets/src/mage/cards/m/Millstone.java +++ b/Mage.Sets/src/mage/cards/m/Millstone.java @@ -23,7 +23,7 @@ public final class Millstone extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, {tap}: Target player puts the top two cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(2), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(2), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MimicVat.java b/Mage.Sets/src/mage/cards/m/MimicVat.java index a3d40ccb50f..984c13b86c0 100644 --- a/Mage.Sets/src/mage/cards/m/MimicVat.java +++ b/Mage.Sets/src/mage/cards/m/MimicVat.java @@ -41,7 +41,7 @@ public final class MimicVat extends CardImpl { this.addAbility(new MimicVatTriggeredAbility()); // {3}, {tap}: Create a token that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MimicVatCreateTokenEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new MimicVatCreateTokenEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java index f907c1884e2..50bac4d891a 100644 --- a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java +++ b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java @@ -42,7 +42,7 @@ public final class MinaAndDennWildborn extends CardImpl { this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // {R}{G}, Return a land you control to its owner's hand: Target creature gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java b/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java index a02e53eea2d..c9cf7aace63 100644 --- a/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java +++ b/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java @@ -35,7 +35,7 @@ public final class MinamoSchoolAtWatersEdge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.supertype.add(SuperType.LEGENDARY); this.addAbility(new BlueManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MinamoSightbender.java b/Mage.Sets/src/mage/cards/m/MinamoSightbender.java index 15661be296f..5120222bc51 100644 --- a/Mage.Sets/src/mage/cards/m/MinamoSightbender.java +++ b/Mage.Sets/src/mage/cards/m/MinamoSightbender.java @@ -35,7 +35,7 @@ public final class MinamoSightbender extends CardImpl { this.toughness = new MageInt(2); // {X}, {T}: Target creature with power X or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{X}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.setTargetAdjuster(new PowerTargetAdjuster(ComparisonType.OR_LESS)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MindOverMatter.java b/Mage.Sets/src/mage/cards/m/MindOverMatter.java index 07310f10ee4..28cfe3f51d2 100644 --- a/Mage.Sets/src/mage/cards/m/MindOverMatter.java +++ b/Mage.Sets/src/mage/cards/m/MindOverMatter.java @@ -30,7 +30,7 @@ public final class MindOverMatter extends CardImpl { // Discard a card: You may tap or untap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new DiscardCardCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MindStone.java b/Mage.Sets/src/mage/cards/m/MindStone.java index 09f58f08ac2..d063424ebad 100644 --- a/Mage.Sets/src/mage/cards/m/MindStone.java +++ b/Mage.Sets/src/mage/cards/m/MindStone.java @@ -23,7 +23,7 @@ public final class MindStone extends CardImpl { public MindStone(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MindlashSliver.java b/Mage.Sets/src/mage/cards/m/MindlashSliver.java index aa4e1a1340d..27b9600f963 100644 --- a/Mage.Sets/src/mage/cards/m/MindlashSliver.java +++ b/Mage.Sets/src/mage/cards/m/MindlashSliver.java @@ -37,7 +37,7 @@ public final class MindlashSliver extends CardImpl { this.toughness = new MageInt(1); // All Slivers have "{1}, Sacrifice this permanent: Each player discards a card." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardEachPlayerEffect(),new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DiscardEachPlayerEffect(),new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/m/MindlessAutomaton.java b/Mage.Sets/src/mage/cards/m/MindlessAutomaton.java index 441caebe98f..cd490077e37 100644 --- a/Mage.Sets/src/mage/cards/m/MindlessAutomaton.java +++ b/Mage.Sets/src/mage/cards/m/MindlessAutomaton.java @@ -34,12 +34,12 @@ public final class MindlessAutomaton extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),"with two +1/+1 counters on it")); // {1}, Discard a card: Put a +1/+1 counter on Mindless Automaton. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // Remove two +1/+1 counters from Mindless Automaton: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } private MindlessAutomaton(final MindlessAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/m/Mindslaver.java b/Mage.Sets/src/mage/cards/m/Mindslaver.java index 1454bba80bf..377813f518f 100644 --- a/Mage.Sets/src/mage/cards/m/Mindslaver.java +++ b/Mage.Sets/src/mage/cards/m/Mindslaver.java @@ -25,7 +25,7 @@ public final class Mindslaver extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {4}, {T}, Sacrifice Mindslaver: You control target player during that player's next turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ControlTargetPlayerNextTurnEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new ControlTargetPlayerNextTurnEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java index 30936273e72..9d96169d8de 100644 --- a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java +++ b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java @@ -54,7 +54,7 @@ public final class MindwrackLiege extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); // {UR}{UR}{UR}{UR}: You may put a blue or red creature card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter3), new ManaCostsImpl<>("{U/R}{U/R}{U/R}{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter3), new ManaCostsImpl<>("{U/R}{U/R}{U/R}{U/R}"))); } private MindwrackLiege(final MindwrackLiege card) { diff --git a/Mage.Sets/src/mage/cards/m/MineBearer.java b/Mage.Sets/src/mage/cards/m/MineBearer.java index 2fe261c00db..40720ebb765 100644 --- a/Mage.Sets/src/mage/cards/m/MineBearer.java +++ b/Mage.Sets/src/mage/cards/m/MineBearer.java @@ -29,7 +29,7 @@ public final class MineBearer extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Mine Bearer: Destroy target attacking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MineLayer.java b/Mage.Sets/src/mage/cards/m/MineLayer.java index 08605e114e9..dcb788ffb23 100644 --- a/Mage.Sets/src/mage/cards/m/MineLayer.java +++ b/Mage.Sets/src/mage/cards/m/MineLayer.java @@ -41,7 +41,7 @@ public final class MineLayer extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, {tap}: Put a mine counter on target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.MINE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.MINE.createInstance()), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MinersBane.java b/Mage.Sets/src/mage/cards/m/MinersBane.java index fb8d1524639..15873be0f86 100644 --- a/Mage.Sets/src/mage/cards/m/MinersBane.java +++ b/Mage.Sets/src/mage/cards/m/MinersBane.java @@ -33,7 +33,7 @@ public final class MinersBane extends CardImpl { // {2}{R}: Miner's Bane gets +1/+0 and gains trample 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 ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{R}")); effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java index e9bced4f6ce..2dfd5989211 100644 --- a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java @@ -41,7 +41,7 @@ public final class MinionOfLeshrac extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new MinionLeshracEffect())); // {tap}: Destroy target creature or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURE_OR_LAND)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MinisterOfImpediments.java b/Mage.Sets/src/mage/cards/m/MinisterOfImpediments.java index 0cb6f62aed0..4393594f33b 100644 --- a/Mage.Sets/src/mage/cards/m/MinisterOfImpediments.java +++ b/Mage.Sets/src/mage/cards/m/MinisterOfImpediments.java @@ -28,7 +28,7 @@ public final class MinisterOfImpediments extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java b/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java index 8eb78cbd358..d79f0336d0b 100644 --- a/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java +++ b/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java @@ -34,7 +34,7 @@ public final class MinisterOfInquiries extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); // {T}. Pay {E}: Target player puts the top three cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(3), new TapSourceCost()); ability.addCost(new PayEnergyCost(1)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MinotaurIllusionist.java b/Mage.Sets/src/mage/cards/m/MinotaurIllusionist.java index 030cefb450f..dc0f87db8ed 100644 --- a/Mage.Sets/src/mage/cards/m/MinotaurIllusionist.java +++ b/Mage.Sets/src/mage/cards/m/MinotaurIllusionist.java @@ -35,12 +35,12 @@ public final class MinotaurIllusionist extends CardImpl { this.toughness = new MageInt(4); // {1}{U}: Minotaur Illusionist gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); // {R}, Sacrifice Minotaur Illusionist: Minotaur Illusionist deals damage equal to its power to target creature. Effect effect = new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE); effect.setText("it deals damage equal to its power to target creature."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MinotaurSureshot.java b/Mage.Sets/src/mage/cards/m/MinotaurSureshot.java index e8b6d274df3..caff51cd408 100644 --- a/Mage.Sets/src/mage/cards/m/MinotaurSureshot.java +++ b/Mage.Sets/src/mage/cards/m/MinotaurSureshot.java @@ -32,7 +32,7 @@ public final class MinotaurSureshot extends CardImpl { this.addAbility(ReachAbility.getInstance()); // {1}{R}: Minotaur Sureshot gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private MinotaurSureshot(final MinotaurSureshot card) { diff --git a/Mage.Sets/src/mage/cards/m/MirageMirror.java b/Mage.Sets/src/mage/cards/m/MirageMirror.java index 6645e2633c4..977dfb4f502 100644 --- a/Mage.Sets/src/mage/cards/m/MirageMirror.java +++ b/Mage.Sets/src/mage/cards/m/MirageMirror.java @@ -30,7 +30,7 @@ public final class MirageMirror extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}: Mirage Mirror becomes a copy of target artifact, creature, enchantment, or land until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MirageMirrorCopyEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new MirageMirrorCopyEffect(), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE_ENCHANTMENT_OR_LAND)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MireBoa.java b/Mage.Sets/src/mage/cards/m/MireBoa.java index 35e279a7946..b16dfbfc875 100644 --- a/Mage.Sets/src/mage/cards/m/MireBoa.java +++ b/Mage.Sets/src/mage/cards/m/MireBoa.java @@ -29,7 +29,7 @@ public final class MireBoa extends CardImpl { this.addAbility(new SwampwalkAbility()); // {G}: Regenerate Mire Boa. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private MireBoa(final MireBoa card) { diff --git a/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java b/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java index fadd4199985..804ddf45be0 100644 --- a/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java +++ b/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java @@ -35,7 +35,7 @@ public final class MirenTheMoaningWell extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}, {tap}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MirenTheMoaningWellEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new MirenTheMoaningWellEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MirrodinsCore.java b/Mage.Sets/src/mage/cards/m/MirrodinsCore.java index 814de658f21..67571f8736e 100644 --- a/Mage.Sets/src/mage/cards/m/MirrodinsCore.java +++ b/Mage.Sets/src/mage/cards/m/MirrodinsCore.java @@ -25,7 +25,7 @@ public final class MirrodinsCore extends CardImpl { public MirrodinsCore (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); Ability ability = new AnyColorManaAbility(); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java b/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java index a70b07a6856..02fc6b8c3e1 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java +++ b/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java @@ -36,7 +36,7 @@ public final class MirrorMadPhantasm extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{U}: Mirror-Mad Phantasm's owner shuffles it into their library. If that player does, they reveal cards from the top of that library until a card named Mirror-Mad Phantasm is revealed. That player puts that card onto the battlefield and all other cards revealed this way into their graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MirrorMadPhantasmEffect(), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new MirrorMadPhantasmEffect(), new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MirrorSheen.java b/Mage.Sets/src/mage/cards/m/MirrorSheen.java index 3007ddcde4c..b3cd37272aa 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorSheen.java +++ b/Mage.Sets/src/mage/cards/m/MirrorSheen.java @@ -37,7 +37,7 @@ public final class MirrorSheen extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U/R}{U/R}"); // {1}{UR}{UR}: Copy target instant or sorcery spell that targets you. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{1}{U/R}{U/R}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{1}{U/R}{U/R}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/Mirrorpool.java b/Mage.Sets/src/mage/cards/m/Mirrorpool.java index 33f1218608e..d119ea91720 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorpool.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorpool.java @@ -47,14 +47,14 @@ public final class Mirrorpool extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}{C}, {T}, Sacrifice Mirrorpool: Copy target instant or sorcery spell you control. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{C}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{C}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); // {4}{C}, {T}, Sacrifice Mirrorpool: Create a token that's a copy of target creature you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenCopyTargetEffect(), new ManaCostsImpl<>("{4}{C}")); + ability = new SimpleActivatedAbility(new CreateTokenCopyTargetEffect(), new ManaCostsImpl<>("{4}{C}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/m/MirrorwoodTreefolk.java b/Mage.Sets/src/mage/cards/m/MirrorwoodTreefolk.java index 64c64280f0f..43053bd6594 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorwoodTreefolk.java +++ b/Mage.Sets/src/mage/cards/m/MirrorwoodTreefolk.java @@ -31,7 +31,7 @@ public final class MirrorwoodTreefolk extends CardImpl { this.toughness = new MageInt(4); // {2}{R}{W}: The next time damage would be dealt to Mirrorwood Treefolk this turn, that damage is dealt to any target instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MirrorwoodTreefolkEffect(), new ManaCostsImpl<>("{2}{R}{W}")); + Ability ability = new SimpleActivatedAbility(new MirrorwoodTreefolkEffect(), new ManaCostsImpl<>("{2}{R}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MischievousPoltergeist.java b/Mage.Sets/src/mage/cards/m/MischievousPoltergeist.java index ef7783850a0..d2f984b1760 100644 --- a/Mage.Sets/src/mage/cards/m/MischievousPoltergeist.java +++ b/Mage.Sets/src/mage/cards/m/MischievousPoltergeist.java @@ -29,7 +29,7 @@ public final class MischievousPoltergeist extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Pay 1 life: Regenerate Mischievous Poltergeist. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new PayLifeCost(1))); } private MischievousPoltergeist(final MischievousPoltergeist card) { diff --git a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java index e7f4a309d69..d5b69471e7f 100644 --- a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java +++ b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java @@ -35,7 +35,7 @@ public final class MischievousQuanar extends CardImpl { // {3}{U}{U}: Turn Mischievous Quanar face down. Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL); effect.setText("Turn {this} face down. (It becomes a 2/2 creature.)"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{U}{U}"))); // Morph {1}{U}{U} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}{U}"))); diff --git a/Mage.Sets/src/mage/cards/m/MiserysShadow.java b/Mage.Sets/src/mage/cards/m/MiserysShadow.java index ca631769276..e0b1246a584 100644 --- a/Mage.Sets/src/mage/cards/m/MiserysShadow.java +++ b/Mage.Sets/src/mage/cards/m/MiserysShadow.java @@ -32,7 +32,7 @@ public final class MiserysShadow extends CardImpl { )); // {1}: Misery's Shadow gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(1))); } private MiserysShadow(final MiserysShadow card) { diff --git a/Mage.Sets/src/mage/cards/m/MishrasBauble.java b/Mage.Sets/src/mage/cards/m/MishrasBauble.java index 51f4cba4ba7..02021e2cb70 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasBauble.java +++ b/Mage.Sets/src/mage/cards/m/MishrasBauble.java @@ -27,7 +27,7 @@ public final class MishrasBauble extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); // {T}, Sacrifice Mishra's Bauble: Look at the top card of target player's library. Draw a card at the beginning of the next turn's upkeep. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LookLibraryTopCardTargetPlayerEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1), Duration.OneUse), false)); diff --git a/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java b/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java index 49b32bc66e1..267dc73b396 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java +++ b/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java @@ -26,7 +26,7 @@ public final class MishrasGroundbreaker extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {tap}, Sacrifice Mishra's Groundbreaker: Target land becomes a 3/3 artifact creature that's still a land. (This effect lasts indefinitely.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new MishrasGroundbreakerToken(), false, true, Duration.Custom), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect(new MishrasGroundbreakerToken(), false, true, Duration.Custom), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MishrasHelix.java b/Mage.Sets/src/mage/cards/m/MishrasHelix.java index 2b4d89721f6..5b55a8fa085 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasHelix.java +++ b/Mage.Sets/src/mage/cards/m/MishrasHelix.java @@ -27,7 +27,7 @@ public final class MishrasHelix extends CardImpl { // {X}, {tap}: Tap X target lands. Effect effect = new TapTargetEffect("tap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); ability.setTargetAdjuster(new XTargetsCountAdjuster()); diff --git a/Mage.Sets/src/mage/cards/m/MistDragon.java b/Mage.Sets/src/mage/cards/m/MistDragon.java index c57cf4abf42..7c4c45b48af 100644 --- a/Mage.Sets/src/mage/cards/m/MistDragon.java +++ b/Mage.Sets/src/mage/cards/m/MistDragon.java @@ -30,15 +30,15 @@ public final class MistDragon extends CardImpl { this.toughness = new MageInt(4); // {0}: Mist Dragon gains flying. This effect lasts indefinitely - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new GenericManaCost(0))); // {0}: Mist Dragon loses flying. This effect lasts indefinitely - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new LoseAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new GenericManaCost(0))); // {3}{U}{U}: Mist Dragon phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PhaseOutSourceEffect(), new ManaCostsImpl<>("{3}{U}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MistformMutant.java b/Mage.Sets/src/mage/cards/m/MistformMutant.java index 40a7400917d..65bf1749446 100644 --- a/Mage.Sets/src/mage/cards/m/MistformMutant.java +++ b/Mage.Sets/src/mage/cards/m/MistformMutant.java @@ -28,7 +28,7 @@ public final class MistformMutant extends CardImpl { this.toughness = new MageInt(4); // {1}{U}: 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 ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new BecomesChosenCreatureTypeTargetEffect(true), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MistformStalker.java b/Mage.Sets/src/mage/cards/m/MistformStalker.java index 9737dbdac09..4e0e8562b90 100644 --- a/Mage.Sets/src/mage/cards/m/MistformStalker.java +++ b/Mage.Sets/src/mage/cards/m/MistformStalker.java @@ -38,7 +38,7 @@ public final class MistformStalker extends CardImpl { // {2}{U}{U}: Mistform Stalker gets +2/+2 and gains flying until end of turn. Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn); effect.setText("{this} gets +2/+2"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{U}{U}")); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MistmeadowWitch.java b/Mage.Sets/src/mage/cards/m/MistmeadowWitch.java index 9b455c58d17..51a4e26436d 100644 --- a/Mage.Sets/src/mage/cards/m/MistmeadowWitch.java +++ b/Mage.Sets/src/mage/cards/m/MistmeadowWitch.java @@ -28,7 +28,7 @@ public final class MistmeadowWitch extends CardImpl { this.toughness = new MageInt(1); // {2}{W}{U}: Exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileReturnBattlefieldNextEndStepTargetEffect(), new ManaCostsImpl<>("{2}{W}{U}")); + Ability ability = new SimpleActivatedAbility(new ExileReturnBattlefieldNextEndStepTargetEffect(), new ManaCostsImpl<>("{2}{W}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MizziumTransreliquat.java b/Mage.Sets/src/mage/cards/m/MizziumTransreliquat.java index cda3e8bf7c5..5d09e13d9ba 100644 --- a/Mage.Sets/src/mage/cards/m/MizziumTransreliquat.java +++ b/Mage.Sets/src/mage/cards/m/MizziumTransreliquat.java @@ -27,12 +27,12 @@ public final class MizziumTransreliquat extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}: Mizzium Transreliquat becomes a copy of target artifact until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MizziumTransreliquatCopyEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new MizziumTransreliquatCopyEffect(), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); // {1}{U}{R}: Mizzium Transreliquat becomes a copy of target artifact, except it has this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MizziumTransreliquatCopyAndGainAbilityEffect(), new ManaCostsImpl<>("{1}{U}{R}")); + ability = new SimpleActivatedAbility(new MizziumTransreliquatCopyAndGainAbilityEffect(), new ManaCostsImpl<>("{1}{U}{R}")); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } @@ -97,7 +97,7 @@ class MizziumTransreliquatCopyAndGainAbilityEffect extends OneShotEffect { Permanent copyFromPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (sourcePermanent != null && copyFromPermanent != null) { Permanent newPermanent = game.copyPermanent(copyFromPermanent, sourcePermanent.getId(), source, new EmptyCopyApplier()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MizziumTransreliquatCopyAndGainAbilityEffect(), new ManaCostsImpl<>("{1}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new MizziumTransreliquatCopyAndGainAbilityEffect(), new ManaCostsImpl<>("{1}{U}{R}")); ability.addTarget(new TargetArtifactPermanent()); newPermanent.addAbility(ability, source.getSourceId(), game); return true; diff --git a/Mage.Sets/src/mage/cards/m/Mobilization.java b/Mage.Sets/src/mage/cards/m/Mobilization.java index 468af208f4a..1646efb94e4 100644 --- a/Mage.Sets/src/mage/cards/m/Mobilization.java +++ b/Mage.Sets/src/mage/cards/m/Mobilization.java @@ -33,7 +33,7 @@ public final class Mobilization extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken(), 1), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SoldierToken(), 1), new ManaCostsImpl<>("{2}{W}"))); } private Mobilization(final Mobilization card) { diff --git a/Mage.Sets/src/mage/cards/m/MoggCannon.java b/Mage.Sets/src/mage/cards/m/MoggCannon.java index 49b8b6f7337..31b296c21c4 100644 --- a/Mage.Sets/src/mage/cards/m/MoggCannon.java +++ b/Mage.Sets/src/mage/cards/m/MoggCannon.java @@ -29,7 +29,7 @@ public final class MoggCannon extends CardImpl { // {tap}: Target creature you control gets +1/+0 and gains flying until end of turn. Destroy that creature at the beginning of the next end step. Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn); effect.setText("target creature you control gets +1/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MoggFanatic.java b/Mage.Sets/src/mage/cards/m/MoggFanatic.java index d386cde732d..fefa91901f8 100644 --- a/Mage.Sets/src/mage/cards/m/MoggFanatic.java +++ b/Mage.Sets/src/mage/cards/m/MoggFanatic.java @@ -28,7 +28,7 @@ public final class MoggFanatic extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Mogg Fanatic: Mogg Fanatic deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoggRaider.java b/Mage.Sets/src/mage/cards/m/MoggRaider.java index 546d9aa2eb8..e29a01ff637 100644 --- a/Mage.Sets/src/mage/cards/m/MoggRaider.java +++ b/Mage.Sets/src/mage/cards/m/MoggRaider.java @@ -35,7 +35,7 @@ public final class MoggRaider extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(filter)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/Moggcatcher.java b/Mage.Sets/src/mage/cards/m/Moggcatcher.java index 420797c4e74..7288c0a7ee9 100644 --- a/Mage.Sets/src/mage/cards/m/Moggcatcher.java +++ b/Mage.Sets/src/mage/cards/m/Moggcatcher.java @@ -37,7 +37,7 @@ public final class Moggcatcher extends CardImpl { this.toughness = new MageInt(2); // {3}, {T}: Search your library for a Goblin permanent card and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoistureFarm.java b/Mage.Sets/src/mage/cards/m/MoistureFarm.java index 420f31dd197..433dc0ed454 100644 --- a/Mage.Sets/src/mage/cards/m/MoistureFarm.java +++ b/Mage.Sets/src/mage/cards/m/MoistureFarm.java @@ -29,7 +29,7 @@ public final class MoistureFarm extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {T}: Put a storage counter on Moisture Farm. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); // {T}, Remove a storage counter from Moisture Farm: Add one mana of any color. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MoleWorms.java b/Mage.Sets/src/mage/cards/m/MoleWorms.java index 6083621bafa..56a9fdcf020 100644 --- a/Mage.Sets/src/mage/cards/m/MoleWorms.java +++ b/Mage.Sets/src/mage/cards/m/MoleWorms.java @@ -31,7 +31,7 @@ public final class MoleWorms extends CardImpl { // You may choose not to untap Mole Worms during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Tap target land. It doesn't untap during its controller's untap step for as long as Mole Worms remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MoltenRavager.java b/Mage.Sets/src/mage/cards/m/MoltenRavager.java index 8a7ba5d2bb9..6f232e1f47b 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenRavager.java +++ b/Mage.Sets/src/mage/cards/m/MoltenRavager.java @@ -26,7 +26,7 @@ public final class MoltenRavager extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(4); - 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 MoltenRavager(final MoltenRavager card) { diff --git a/Mage.Sets/src/mage/cards/m/MoltenSlagheap.java b/Mage.Sets/src/mage/cards/m/MoltenSlagheap.java index e09fb62c2b9..bea22fd5fa7 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenSlagheap.java +++ b/Mage.Sets/src/mage/cards/m/MoltenSlagheap.java @@ -31,7 +31,7 @@ public final class MoltenSlagheap extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Molten Slagheap. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Molten Slagheap: Add X mana in any combination of {B} and/or {R}. diff --git a/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java b/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java index 23b4b33531d..66ae83e7b22 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java +++ b/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java @@ -41,12 +41,12 @@ public final class MoltenTailMasticore extends CardImpl { // At the beginning of your upkeep, sacrifice Molten-Tail Masticore unless you discard a card. this.addAbility(new MoltenTailMasticoreAbility()); // {4}, Exile a creature card from your graveyard: Molten-Tail Masticore deals 4 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new GenericManaCost(4)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {2}: Regenerate Molten-Tail Masticore. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(2))); } private MoltenTailMasticore(final MoltenTailMasticore card) { diff --git a/Mage.Sets/src/mage/cards/m/MoltingSkin.java b/Mage.Sets/src/mage/cards/m/MoltingSkin.java index dfd536e1385..f0f3d37a9cf 100644 --- a/Mage.Sets/src/mage/cards/m/MoltingSkin.java +++ b/Mage.Sets/src/mage/cards/m/MoltingSkin.java @@ -22,7 +22,7 @@ public final class MoltingSkin extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // Return Molting Skin to its owner's hand: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandFromBattlefieldSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ReturnToHandFromBattlefieldSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java index 342a730e1de..725e4089cf7 100644 --- a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java +++ b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java @@ -42,7 +42,7 @@ public final class MoltingSnakeskin extends CardImpl { // Enchanted creature gets +2/+0 and has "{2}{B}: Regenerate this creature." ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 0)); - Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}")), AttachmentType.AURA); + Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}")), AttachmentType.AURA); effect.setText("and has \"{2}{B}: Regenerate this creature.\""); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MoonbowIllusionist.java b/Mage.Sets/src/mage/cards/m/MoonbowIllusionist.java index 85e01d504e5..1e5fe0229d2 100644 --- a/Mage.Sets/src/mage/cards/m/MoonbowIllusionist.java +++ b/Mage.Sets/src/mage/cards/m/MoonbowIllusionist.java @@ -36,7 +36,7 @@ public final class MoonbowIllusionist extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Target land becomes the basic land type of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new GenericManaCost(2)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(new FilterControlledLandPermanent("land")))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MoongloveChangeling.java b/Mage.Sets/src/mage/cards/m/MoongloveChangeling.java index 81c52c736d3..40d18abb093 100644 --- a/Mage.Sets/src/mage/cards/m/MoongloveChangeling.java +++ b/Mage.Sets/src/mage/cards/m/MoongloveChangeling.java @@ -25,7 +25,7 @@ public final class MoongloveChangeling extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new ChangelingAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } private MoongloveChangeling(final MoongloveChangeling card) { diff --git a/Mage.Sets/src/mage/cards/m/MoongloveExtract.java b/Mage.Sets/src/mage/cards/m/MoongloveExtract.java index ebe05d62697..fae47eb1fe5 100644 --- a/Mage.Sets/src/mage/cards/m/MoongloveExtract.java +++ b/Mage.Sets/src/mage/cards/m/MoongloveExtract.java @@ -22,7 +22,7 @@ public final class MoongloveExtract extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Sacrifice Moonglove Extract: Moonglove Extract deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoonlightGeist.java b/Mage.Sets/src/mage/cards/m/MoonlightGeist.java index 7688ea85fa5..c55daf1c681 100644 --- a/Mage.Sets/src/mage/cards/m/MoonlightGeist.java +++ b/Mage.Sets/src/mage/cards/m/MoonlightGeist.java @@ -33,7 +33,7 @@ public final class MoonlightGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{W}: Prevent all combat damage that would be dealt to and dealt by Moonlight Geist this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventCombatDamageToSourceEffect(Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new PreventCombatDamageToSourceEffect(Duration.EndOfTurn) .setText("prevent all combat damage that would be dealt to"), new ManaCostsImpl<>("{3}{W}")); ability.addEffect(new PreventCombatDamageBySourceEffect(Duration.EndOfTurn) .setText("and dealt by {this} this turn")); diff --git a/Mage.Sets/src/mage/cards/m/MoonlitStrider.java b/Mage.Sets/src/mage/cards/m/MoonlitStrider.java index 5228d5054ac..67f93b264d2 100644 --- a/Mage.Sets/src/mage/cards/m/MoonlitStrider.java +++ b/Mage.Sets/src/mage/cards/m/MoonlitStrider.java @@ -30,7 +30,7 @@ public final class MoonlitStrider extends CardImpl { this.toughness = new MageInt(4); // Sacrifice Moonlit Strider: Target creature you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); @@ -47,4 +47,3 @@ public final class MoonlitStrider extends CardImpl { return new MoonlitStrider(this); } } - diff --git a/Mage.Sets/src/mage/cards/m/MoonveilDragon.java b/Mage.Sets/src/mage/cards/m/MoonveilDragon.java index c5169359379..832001cce0f 100644 --- a/Mage.Sets/src/mage/cards/m/MoonveilDragon.java +++ b/Mage.Sets/src/mage/cards/m/MoonveilDragon.java @@ -26,7 +26,7 @@ public final class MoonveilDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Each creature you control gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private MoonveilDragon(final MoonveilDragon card) { diff --git a/Mage.Sets/src/mage/cards/m/MoonwingMoth.java b/Mage.Sets/src/mage/cards/m/MoonwingMoth.java index b178d6b51b6..483b4cc19f7 100644 --- a/Mage.Sets/src/mage/cards/m/MoonwingMoth.java +++ b/Mage.Sets/src/mage/cards/m/MoonwingMoth.java @@ -25,7 +25,7 @@ public final class MoonwingMoth extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); // {W}: Moonwing Moth gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } private MoonwingMoth(final MoonwingMoth card) { diff --git a/Mage.Sets/src/mage/cards/m/MoorlandInquisitor.java b/Mage.Sets/src/mage/cards/m/MoorlandInquisitor.java index 109aba04646..95fdb8b1984 100644 --- a/Mage.Sets/src/mage/cards/m/MoorlandInquisitor.java +++ b/Mage.Sets/src/mage/cards/m/MoorlandInquisitor.java @@ -29,7 +29,7 @@ public final class MoorlandInquisitor extends CardImpl { this.toughness = new MageInt(2); // {2}{W}: Moorland Inquisitor gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MordantDragon.java b/Mage.Sets/src/mage/cards/m/MordantDragon.java index 3b3574bce72..d336d6a8a2f 100644 --- a/Mage.Sets/src/mage/cards/m/MordantDragon.java +++ b/Mage.Sets/src/mage/cards/m/MordantDragon.java @@ -38,7 +38,7 @@ public final class MordantDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Mordant Dragon gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); // Whenever Mordant Dragon deals combat damage to a player, you may have it deal that much damage to target creature that player controls. Effect effect = new DamageTargetEffect(SavedDamageValue.MUCH); diff --git a/Mage.Sets/src/mage/cards/m/MorgueThrull.java b/Mage.Sets/src/mage/cards/m/MorgueThrull.java index ff0fa7589ef..3387ebbaa0f 100644 --- a/Mage.Sets/src/mage/cards/m/MorgueThrull.java +++ b/Mage.Sets/src/mage/cards/m/MorgueThrull.java @@ -25,7 +25,7 @@ public final class MorgueThrull extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Morgue Thrull: Put the top three cards of your library into your graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsControllerEffect(3), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new MillCardsControllerEffect(3), new SacrificeSourceCost())); } private MorgueThrull(final MorgueThrull card) { diff --git a/Mage.Sets/src/mage/cards/m/MoriokReplica.java b/Mage.Sets/src/mage/cards/m/MoriokReplica.java index 981784d76c0..0bbd7b7f5da 100644 --- a/Mage.Sets/src/mage/cards/m/MoriokReplica.java +++ b/Mage.Sets/src/mage/cards/m/MoriokReplica.java @@ -32,7 +32,7 @@ public final class MoriokReplica extends CardImpl { // {1}{B}, Sacrifice Moriok Replica: You draw two cards and you lose 2 life. Effect effect = new DrawCardSourceControllerEffect(2); effect.setText("You draw two cards"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); effect = new LoseLifeSourceControllerEffect(2); effect.setText("and you lose 2 life"); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/Morphling.java b/Mage.Sets/src/mage/cards/m/Morphling.java index 1c9180b08b7..d476abf2041 100644 --- a/Mage.Sets/src/mage/cards/m/Morphling.java +++ b/Mage.Sets/src/mage/cards/m/Morphling.java @@ -29,15 +29,15 @@ public final class Morphling extends CardImpl { this.toughness = new MageInt(3); // {U}: Untap Morphling. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ColoredManaCost(ColoredManaSymbol.U))); // {U}: Morphling gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); // {U}: Morphling gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); // {1}: Morphling gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new GenericManaCost(1))); // {1}: Morphling gets -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new GenericManaCost(1))); } private Morphling(final Morphling card) { diff --git a/Mage.Sets/src/mage/cards/m/Mortipede.java b/Mage.Sets/src/mage/cards/m/Mortipede.java index 19f498659ba..c504c89ae65 100644 --- a/Mage.Sets/src/mage/cards/m/Mortipede.java +++ b/Mage.Sets/src/mage/cards/m/Mortipede.java @@ -26,7 +26,7 @@ public final class Mortipede extends CardImpl { this.toughness = new MageInt(1); // {2}{G}: All creatures able to block Mortipede this turn do so. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new MustBeBlockedByAllSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); } private Mortipede(final Mortipede card) { diff --git a/Mage.Sets/src/mage/cards/m/Mortiphobia.java b/Mage.Sets/src/mage/cards/m/Mortiphobia.java index aafcd5aab80..a2a02eb6832 100644 --- a/Mage.Sets/src/mage/cards/m/Mortiphobia.java +++ b/Mage.Sets/src/mage/cards/m/Mortiphobia.java @@ -24,12 +24,12 @@ public final class Mortiphobia extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}{B}"); // {1}{B}, Discard a card: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); // {1}{B}, Sacrifice Mortiphobia: Exile target card from a graveyard. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/Mortivore.java b/Mage.Sets/src/mage/cards/m/Mortivore.java index 71cff65d7f0..a2f67a837bf 100644 --- a/Mage.Sets/src/mage/cards/m/Mortivore.java +++ b/Mage.Sets/src/mage/cards/m/Mortivore.java @@ -30,7 +30,7 @@ public final class Mortivore extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new CardsInAllGraveyardsCount(new FilterCreatureCard("creature cards"))))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } private Mortivore(final Mortivore card) { diff --git a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java index a77f7ad3ef5..cd63deca655 100644 --- a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java +++ b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java @@ -44,7 +44,7 @@ public final class MossbridgeTroll extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new MossbridgeTrollReplacementEffect())); // Tap any number of untapped creatures you control other than Mossbridge Troll with total power 10 or greater: Mossbridge Troll gets +20/+20 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(20, 20, Duration.EndOfTurn), new MossbridgeTrollCost()); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(20, 20, Duration.EndOfTurn), new MossbridgeTrollCost()); ability.setAdditionalCostsRuleVisible(false); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MothdustChangeling.java b/Mage.Sets/src/mage/cards/m/MothdustChangeling.java index 5199d9bba10..43c8180cbe1 100644 --- a/Mage.Sets/src/mage/cards/m/MothdustChangeling.java +++ b/Mage.Sets/src/mage/cards/m/MothdustChangeling.java @@ -36,7 +36,7 @@ public final class MothdustChangeling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new ChangelingAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); } private MothdustChangeling(final MothdustChangeling card) { diff --git a/Mage.Sets/src/mage/cards/m/MotherOfRunes.java b/Mage.Sets/src/mage/cards/m/MotherOfRunes.java index df81a8cb9af..f1eb4f8c654 100644 --- a/Mage.Sets/src/mage/cards/m/MotherOfRunes.java +++ b/Mage.Sets/src/mage/cards/m/MotherOfRunes.java @@ -30,7 +30,7 @@ public final class MotherOfRunes extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MountedArchers.java b/Mage.Sets/src/mage/cards/m/MountedArchers.java index 7acd69ab75a..54c59a68df5 100644 --- a/Mage.Sets/src/mage/cards/m/MountedArchers.java +++ b/Mage.Sets/src/mage/cards/m/MountedArchers.java @@ -32,7 +32,7 @@ public final class MountedArchers extends CardImpl { this.addAbility(ReachAbility.getInstance()); // {W}: Mounted Archers can block an additional creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}"))); } private MountedArchers(final MountedArchers card) { diff --git a/Mage.Sets/src/mage/cards/m/MournersShield.java b/Mage.Sets/src/mage/cards/m/MournersShield.java index 20902ca4436..1362b980ab7 100644 --- a/Mage.Sets/src/mage/cards/m/MournersShield.java +++ b/Mage.Sets/src/mage/cards/m/MournersShield.java @@ -44,7 +44,7 @@ public final class MournersShield extends CardImpl { this.addAbility(ability); // {2}, {tap}: Prevent all damage that would be dealt this turn by a source of your choice that shares a color with the exiled card. - Ability preventAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MournersShieldEffect(), new GenericManaCost(2)); + Ability preventAbility = new SimpleActivatedAbility(new MournersShieldEffect(), new GenericManaCost(2)); preventAbility.addCost(new TapSourceCost()); this.addAbility(preventAbility); } @@ -161,4 +161,4 @@ class MournersShieldEffect extends PreventionEffectImpl { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MournfulZombie.java b/Mage.Sets/src/mage/cards/m/MournfulZombie.java index fb57d951fbd..e53d00d5b31 100644 --- a/Mage.Sets/src/mage/cards/m/MournfulZombie.java +++ b/Mage.Sets/src/mage/cards/m/MournfulZombie.java @@ -28,7 +28,7 @@ public final class MournfulZombie extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new GainLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/Mourning.java b/Mage.Sets/src/mage/cards/m/Mourning.java index 5e4b8de0111..bdad956b738 100644 --- a/Mage.Sets/src/mage/cards/m/Mourning.java +++ b/Mage.Sets/src/mage/cards/m/Mourning.java @@ -37,7 +37,7 @@ public final class Mourning extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, 0))); // {B}: Return Mourning to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}"))); } private Mourning(final Mourning card) { diff --git a/Mage.Sets/src/mage/cards/m/MouthOfRonom.java b/Mage.Sets/src/mage/cards/m/MouthOfRonom.java index a4a43d1f414..0cdbe765e87 100644 --- a/Mage.Sets/src/mage/cards/m/MouthOfRonom.java +++ b/Mage.Sets/src/mage/cards/m/MouthOfRonom.java @@ -29,7 +29,7 @@ public final class MouthOfRonom extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {4}{S}, {T}, Sacrifice Mouth of Ronom: Mouth of Ronom deals 4 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4, "it"), new ManaCostsImpl<>("{4}{S}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4, "it"), new ManaCostsImpl<>("{4}{S}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MrHousePresidentAndCEO.java b/Mage.Sets/src/mage/cards/m/MrHousePresidentAndCEO.java index 067d01439e5..5b537b0c5c8 100644 --- a/Mage.Sets/src/mage/cards/m/MrHousePresidentAndCEO.java +++ b/Mage.Sets/src/mage/cards/m/MrHousePresidentAndCEO.java @@ -38,7 +38,7 @@ public final class MrHousePresidentAndCEO extends CardImpl { this.addAbility(new MrHousePresidentAndCEOTriggeredAbility()); // {4}, {T}: Roll a six-sided die plus an additional six-sided die for each mana from Treasures spent to activate this ability. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MrHousePresidentAndCEODieRollEffect(), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new MrHousePresidentAndCEODieRollEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MultiformWonder.java b/Mage.Sets/src/mage/cards/m/MultiformWonder.java index 34d375cca48..1c7824180d1 100644 --- a/Mage.Sets/src/mage/cards/m/MultiformWonder.java +++ b/Mage.Sets/src/mage/cards/m/MultiformWonder.java @@ -38,11 +38,11 @@ public final class MultiformWonder extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(3), false)); // Pay {E}: Multiform Wonder gains your choice of flying, vigilance, or lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainsChoiceOfAbilitiesEffect(GainsChoiceOfAbilitiesEffect.TargetType.Source, + this.addAbility(new SimpleActivatedAbility(new GainsChoiceOfAbilitiesEffect(GainsChoiceOfAbilitiesEffect.TargetType.Source, FlyingAbility.getInstance(), VigilanceAbility.getInstance(), LifelinkAbility.getInstance()), new PayEnergyCost(1))); // Pay {E}: Multiform Wonder gets +2/-2 or -2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MultiformWonder2Effect(), new PayEnergyCost(1))); + this.addAbility(new SimpleActivatedAbility(new MultiformWonder2Effect(), new PayEnergyCost(1))); } private MultiformWonder(final MultiformWonder card) { diff --git a/Mage.Sets/src/mage/cards/m/Mundungu.java b/Mage.Sets/src/mage/cards/m/Mundungu.java index 73db795a90d..bca597a676b 100644 --- a/Mage.Sets/src/mage/cards/m/Mundungu.java +++ b/Mage.Sets/src/mage/cards/m/Mundungu.java @@ -36,7 +36,7 @@ public final class Mundungu extends CardImpl { costs.add(new GenericManaCost(1)); costs.add(new PayLifeCost(1)); costs.setText("{1} and 1 life"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(costs), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(costs), new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MurderousBetrayal.java b/Mage.Sets/src/mage/cards/m/MurderousBetrayal.java index 6f777ea72c2..4c6f66c45a0 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousBetrayal.java +++ b/Mage.Sets/src/mage/cards/m/MurderousBetrayal.java @@ -29,7 +29,7 @@ public final class MurderousBetrayal extends CardImpl { // {B}{B}, Pay half your life, rounded up: Destroy target nonblack creature. It can't be regenerated. Effect effect = new DestroyTargetEffect(true); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new MurderousBetrayalCost()); + Ability ability = new SimpleActivatedAbility(effect, new MurderousBetrayalCost()); ability.addCost(new ManaCostsImpl<>("{B}{B}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java b/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java index 3f8b6f0fd3b..9bb7daa6e4c 100644 --- a/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java +++ b/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java @@ -37,7 +37,7 @@ public final class MuzzioVisionaryArchitect extends CardImpl { this.toughness = new MageInt(3); // {3}{U}, {tap}: Look at the top X cards of your library, where X is the highest converted mana cost among artifacts you control. You may reveal an artifact card from among them and put it onto the battlefield. Put the rest on the bottom of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MuzzioVisionaryArchitectEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new MuzzioVisionaryArchitectEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/Mycologist.java b/Mage.Sets/src/mage/cards/m/Mycologist.java index 67b94469a8f..2cd9fe6c165 100644 --- a/Mage.Sets/src/mage/cards/m/Mycologist.java +++ b/Mage.Sets/src/mage/cards/m/Mycologist.java @@ -41,10 +41,10 @@ public final class Mycologist extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Mycologist: 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: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java index 4b726e19de2..e5940688acb 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java @@ -53,7 +53,7 @@ public final class MyojinOfCleansingFire extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Cleansing Fire: Destroy all other creatures. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); } private MyojinOfCleansingFire(final MyojinOfCleansingFire card) { diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java index 2e27b5c0ed7..892579d88fa 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java @@ -47,7 +47,7 @@ public final class MyojinOfInfiniteRage extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(StaticFilters.FILTER_LANDS), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new DestroyAllEffect(StaticFilters.FILTER_LANDS), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); } private MyojinOfInfiniteRage(final MyojinOfInfiniteRage card) { diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java index 6d96b0a8ab1..51601100243 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java @@ -49,7 +49,7 @@ public final class MyojinOfLifesWeb extends CardImpl { new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Life's Web: Put any number of creature cards from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyojinOfLifesWebPutCreatureOnBattlefieldEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); + Ability ability = new SimpleActivatedAbility(new MyojinOfLifesWebPutCreatureOnBattlefieldEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java index 3949c5c80c2..553a7087663 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java @@ -45,7 +45,7 @@ public final class MyojinOfNightsReach extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards their hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); + Ability ability = new SimpleActivatedAbility(new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java index 15f45e0210d..2bf2b913baa 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java @@ -50,7 +50,7 @@ public final class MyojinOfSeeingWinds extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyrIncubator.java b/Mage.Sets/src/mage/cards/m/MyrIncubator.java index 60693b84285..35d15db8299 100644 --- a/Mage.Sets/src/mage/cards/m/MyrIncubator.java +++ b/Mage.Sets/src/mage/cards/m/MyrIncubator.java @@ -31,7 +31,7 @@ public final class MyrIncubator extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // {6}, {tap}, Sacrifice Myr Incubator: Search your library for any number of artifact cards, exile them, then put that many 1/1 colorless Myr artifact creature tokens onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyrIncubatorEffect(), new ManaCostsImpl<>("{6}")); + Ability ability = new SimpleActivatedAbility(new MyrIncubatorEffect(), new ManaCostsImpl<>("{6}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MyrLandshaper.java b/Mage.Sets/src/mage/cards/m/MyrLandshaper.java index 96fc023027c..bad87cf2e08 100644 --- a/Mage.Sets/src/mage/cards/m/MyrLandshaper.java +++ b/Mage.Sets/src/mage/cards/m/MyrLandshaper.java @@ -29,7 +29,7 @@ public final class MyrLandshaper extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target land becomes an artifact in addition to its other types until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.ARTIFACT), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.ARTIFACT), new TapSourceCost()); Target target = new TargetLandPermanent(); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MyrMatrix.java b/Mage.Sets/src/mage/cards/m/MyrMatrix.java index b51b04913d3..4a0db40d06a 100644 --- a/Mage.Sets/src/mage/cards/m/MyrMatrix.java +++ b/Mage.Sets/src/mage/cards/m/MyrMatrix.java @@ -34,7 +34,7 @@ public final class MyrMatrix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); this.addAbility(IndestructibleAbility.getInstance()); this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MyrToken()), new GenericManaCost(5))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new MyrToken()), new GenericManaCost(5))); } diff --git a/Mage.Sets/src/mage/cards/m/MyrMindservant.java b/Mage.Sets/src/mage/cards/m/MyrMindservant.java index c91a7b67c86..91a2cbeea30 100644 --- a/Mage.Sets/src/mage/cards/m/MyrMindservant.java +++ b/Mage.Sets/src/mage/cards/m/MyrMindservant.java @@ -27,7 +27,7 @@ public final class MyrMindservant extends CardImpl { this.toughness = new MageInt(1); // {2}, {tap}: Shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyrPropagator.java b/Mage.Sets/src/mage/cards/m/MyrPropagator.java index 16712ff9c2f..604efe4c50d 100644 --- a/Mage.Sets/src/mage/cards/m/MyrPropagator.java +++ b/Mage.Sets/src/mage/cards/m/MyrPropagator.java @@ -28,7 +28,7 @@ public final class MyrPropagator extends CardImpl { this.toughness = new MageInt(1); // {3}, {tap}: Create a token that's a copy of Myr Propagator. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenCopySourceEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CreateTokenCopySourceEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyrQuadropod.java b/Mage.Sets/src/mage/cards/m/MyrQuadropod.java index 37039100667..45172246f50 100644 --- a/Mage.Sets/src/mage/cards/m/MyrQuadropod.java +++ b/Mage.Sets/src/mage/cards/m/MyrQuadropod.java @@ -27,7 +27,7 @@ public final class MyrQuadropod extends CardImpl { this.toughness = new MageInt(4); // {3}: Switch Myr Quadropod's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); } private MyrQuadropod(final MyrQuadropod card) { diff --git a/Mage.Sets/src/mage/cards/m/MyrWelder.java b/Mage.Sets/src/mage/cards/m/MyrWelder.java index c48b3c2bb69..0cd2a52251f 100644 --- a/Mage.Sets/src/mage/cards/m/MyrWelder.java +++ b/Mage.Sets/src/mage/cards/m/MyrWelder.java @@ -32,7 +32,7 @@ public final class MyrWelder extends CardImpl { this.toughness = new MageInt(4); // Imprint - {tap}: Exile target artifact card from a graveyard - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyrWelderEffect(), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new MyrWelderEffect(), new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(filter)); this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); diff --git a/Mage.Sets/src/mage/cards/m/MyriadLandscape.java b/Mage.Sets/src/mage/cards/m/MyriadLandscape.java index 77200e67efd..09a3a1cf82f 100644 --- a/Mage.Sets/src/mage/cards/m/MyriadLandscape.java +++ b/Mage.Sets/src/mage/cards/m/MyriadLandscape.java @@ -42,7 +42,7 @@ public final class MyriadLandscape extends CardImpl { // {2}, {tap}, Sacrifice Myriad Landscape: Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle your library. Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrarySharingLandType(0, 2), true); effect.setText("Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MysticCompass.java b/Mage.Sets/src/mage/cards/m/MysticCompass.java index 06b4331da87..df9a75bd19a 100644 --- a/Mage.Sets/src/mage/cards/m/MysticCompass.java +++ b/Mage.Sets/src/mage/cards/m/MysticCompass.java @@ -25,7 +25,7 @@ public final class MysticCompass extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}: Target land becomes the basic land type of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); Target target = new TargetLandPermanent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/m/MysticMight.java b/Mage.Sets/src/mage/cards/m/MysticMight.java index ad13a0a720e..64746330874 100644 --- a/Mage.Sets/src/mage/cards/m/MysticMight.java +++ b/Mage.Sets/src/mage/cards/m/MysticMight.java @@ -43,7 +43,7 @@ public final class MysticMight extends CardImpl { // Cumulative upkeep {1}{U} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}{U}"))); // Enchanted land has "{tap}: Target creature gets +2/+2 until end of turn." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, 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 +2/+2 until end of turn.\""))); diff --git a/Mage.Sets/src/mage/cards/m/MystifyingMaze.java b/Mage.Sets/src/mage/cards/m/MystifyingMaze.java index a9e226132b0..6ff0835d94f 100644 --- a/Mage.Sets/src/mage/cards/m/MystifyingMaze.java +++ b/Mage.Sets/src/mage/cards/m/MystifyingMaze.java @@ -42,7 +42,7 @@ public final class MystifyingMaze extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}, {T}: Exile target attacking creature an opponent controls. At the beginning of the next end step, return it to the battlefield tapped under its owner's control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MystifyingMazeEffect(), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new MystifyingMazeEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MythRealized.java b/Mage.Sets/src/mage/cards/m/MythRealized.java index eb28b7840a1..4d6ce44d4f2 100644 --- a/Mage.Sets/src/mage/cards/m/MythRealized.java +++ b/Mage.Sets/src/mage/cards/m/MythRealized.java @@ -35,11 +35,11 @@ public final class MythRealized extends CardImpl { StaticFilters.FILTER_SPELL_A_NON_CREATURE, false)); // {2}{W}: Put a lore counter on Myth Realized. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.LORE.createInstance()), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.LORE.createInstance()), new ManaCostsImpl<>("{2}{W}"))); // {W}: Until end of turn, Myth Realized becomes a Monk Avatar creature in addition to its other types and gains "This creature's power and toughness are each equal to the number of lore counters on it." Effect effect = new BecomesCreatureSourceEffect(new MythRealizedToken(), CardType.ENCHANTMENT, Duration.EndOfTurn).withDurationRuleAtStart(true); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}")); ability.addEffect(new SetBasePowerToughnessSourceEffect(loreCounterCount, Duration.EndOfTurn) .setText("and gains \"This creature's power and toughness are each equal to the number of lore counters on it.\"")); -- 2.47.2 From cc6f78dfb4b1206586eef31e480d071b366a7e7b Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:29:14 -0500 Subject: [PATCH 39/50] refactor: SimpleActivatedAbility default zone (cards N O) --- Mage.Sets/src/mage/cards/n/NacatlHuntPride.java | 4 ++-- Mage.Sets/src/mage/cards/n/NahirisMachinations.java | 2 +- Mage.Sets/src/mage/cards/n/NantukoDisciple.java | 2 +- Mage.Sets/src/mage/cards/n/NantukoHusk.java | 2 +- Mage.Sets/src/mage/cards/n/NantukoMentor.java | 2 +- Mage.Sets/src/mage/cards/n/NantukoShade.java | 2 +- Mage.Sets/src/mage/cards/n/Narcissism.java | 4 ++-- Mage.Sets/src/mage/cards/n/NarstadScrapper.java | 2 +- Mage.Sets/src/mage/cards/n/NaturesBlessing.java | 2 +- Mage.Sets/src/mage/cards/n/NavigatorsCompass.java | 2 +- Mage.Sets/src/mage/cards/n/NayaBattlemage.java | 4 ++-- Mage.Sets/src/mage/cards/n/NayaPanorama.java | 2 +- Mage.Sets/src/mage/cards/n/NecraDisciple.java | 2 +- Mage.Sets/src/mage/cards/n/Necratog.java | 4 ++-- Mage.Sets/src/mage/cards/n/NecrogenCenser.java | 2 +- Mage.Sets/src/mage/cards/n/NecrogenSpellbomb.java | 4 ++-- Mage.Sets/src/mage/cards/n/Necrogenesis.java | 2 +- Mage.Sets/src/mage/cards/n/NecronOverlord.java | 2 +- Mage.Sets/src/mage/cards/n/Necropolis.java | 2 +- Mage.Sets/src/mage/cards/n/Necropotence.java | 2 +- Mage.Sets/src/mage/cards/n/NecroticSliver.java | 2 +- Mage.Sets/src/mage/cards/n/NectarFaerie.java | 2 +- Mage.Sets/src/mage/cards/n/NeedForSpeed.java | 2 +- Mage.Sets/src/mage/cards/n/NeedleSpires.java | 2 +- Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java | 4 ++-- Mage.Sets/src/mage/cards/n/NeophyteHateflayer.java | 2 +- Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java | 2 +- Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java | 2 +- Mage.Sets/src/mage/cards/n/NetterEnDal.java | 2 +- Mage.Sets/src/mage/cards/n/NettleDrone.java | 2 +- Mage.Sets/src/mage/cards/n/NeurokProdigy.java | 2 +- Mage.Sets/src/mage/cards/n/NeurokReplica.java | 2 +- Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java | 2 +- Mage.Sets/src/mage/cards/n/NeurokTransmuter.java | 4 ++-- Mage.Sets/src/mage/cards/n/NevinyrralsDisk.java | 2 +- Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java | 2 +- Mage.Sets/src/mage/cards/n/NezumiGraverobber.java | 4 ++-- Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java | 2 +- Mage.Sets/src/mage/cards/n/NezumiShortfang.java | 2 +- Mage.Sets/src/mage/cards/n/NiallSilvain.java | 2 +- Mage.Sets/src/mage/cards/n/NiblisOfTheBreath.java | 2 +- Mage.Sets/src/mage/cards/n/NightSoil.java | 2 +- Mage.Sets/src/mage/cards/n/NightfireGiant.java | 2 +- Mage.Sets/src/mage/cards/n/NightscapeApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/n/NightscapeMaster.java | 4 ++-- Mage.Sets/src/mage/cards/n/NightwingShade.java | 2 +- Mage.Sets/src/mage/cards/n/NimReplica.java | 2 +- Mage.Sets/src/mage/cards/n/NimShambler.java | 2 +- Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java | 2 +- Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java | 2 +- .../src/mage/cards/n/NivixAerieOfTheFiremind.java | 2 +- Mage.Sets/src/mage/cards/n/NivixGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/n/NoblePanther.java | 2 +- Mage.Sets/src/mage/cards/n/NobleVestige.java | 2 +- Mage.Sets/src/mage/cards/n/NomadMythmaker.java | 2 +- Mage.Sets/src/mage/cards/n/NomadsEnKor.java | 2 +- Mage.Sets/src/mage/cards/n/NooseConstrictor.java | 2 +- Mage.Sets/src/mage/cards/n/Norritt.java | 2 +- Mage.Sets/src/mage/cards/n/NorthernPaladin.java | 2 +- Mage.Sets/src/mage/cards/n/NosyGoblin.java | 2 +- Mage.Sets/src/mage/cards/n/NotoriousAssassin.java | 2 +- Mage.Sets/src/mage/cards/n/NovaCleric.java | 2 +- Mage.Sets/src/mage/cards/n/NovaPentacle.java | 2 +- Mage.Sets/src/mage/cards/n/NovijenHeartOfProgress.java | 2 +- Mage.Sets/src/mage/cards/n/NovijenSages.java | 2 +- Mage.Sets/src/mage/cards/n/NoxiousField.java | 2 +- Mage.Sets/src/mage/cards/n/NuisanceEngine.java | 2 +- Mage.Sets/src/mage/cards/n/NullBrooch.java | 2 +- Mage.Sets/src/mage/cards/n/NullChampion.java | 2 +- Mage.Sets/src/mage/cards/n/NullmageAdvocate.java | 2 +- Mage.Sets/src/mage/cards/n/NullmageShepherd.java | 2 +- Mage.Sets/src/mage/cards/n/NumaiOutcast.java | 2 +- Mage.Sets/src/mage/cards/n/NurturingLicid.java | 2 +- Mage.Sets/src/mage/cards/n/NuteGunray.java | 2 +- Mage.Sets/src/mage/cards/n/NyxWeaver.java | 2 +- Mage.Sets/src/mage/cards/o/Oasis.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfLimDul.java | 2 +- Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java | 10 +++++----- Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java | 2 +- Mage.Sets/src/mage/cards/o/OblivionCrown.java | 2 +- Mage.Sets/src/mage/cards/o/OblivionStone.java | 4 ++-- Mage.Sets/src/mage/cards/o/OboroBreezecaller.java | 2 +- Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java | 2 +- Mage.Sets/src/mage/cards/o/ObscuringAether.java | 2 +- Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java | 4 ++-- Mage.Sets/src/mage/cards/o/OcularHalo.java | 4 ++-- Mage.Sets/src/mage/cards/o/OdiousTrow.java | 2 +- Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java | 2 +- Mage.Sets/src/mage/cards/o/OgreMenial.java | 2 +- Mage.Sets/src/mage/cards/o/OgreShaman.java | 2 +- Mage.Sets/src/mage/cards/o/OhranYeti.java | 2 +- Mage.Sets/src/mage/cards/o/OjutaiMonument.java | 2 +- Mage.Sets/src/mage/cards/o/OketraTheTrue.java | 2 +- .../src/mage/cards/o/OkinaTempleToTheGrandfathers.java | 2 +- Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java | 2 +- Mage.Sets/src/mage/cards/o/OliviasDragoon.java | 2 +- Mage.Sets/src/mage/cards/o/Omnibian.java | 2 +- Mage.Sets/src/mage/cards/o/OngoingInvestigation.java | 2 +- Mage.Sets/src/mage/cards/o/OnyxGoblet.java | 2 +- Mage.Sets/src/mage/cards/o/OnyxMage.java | 2 +- Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java | 2 +- Mage.Sets/src/mage/cards/o/OonasProwler.java | 2 +- Mage.Sets/src/mage/cards/o/OozeFlux.java | 2 +- Mage.Sets/src/mage/cards/o/OpalAcrolith.java | 2 +- Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java | 4 ++-- Mage.Sets/src/mage/cards/o/Opportunist.java | 2 +- Mage.Sets/src/mage/cards/o/Opposition.java | 2 +- Mage.Sets/src/mage/cards/o/OracleOfDust.java | 2 +- Mage.Sets/src/mage/cards/o/OracleOfNectars.java | 2 +- Mage.Sets/src/mage/cards/o/OraclesAttendants.java | 2 +- Mage.Sets/src/mage/cards/o/OraclesInsight.java | 2 +- Mage.Sets/src/mage/cards/o/OraclesVault.java | 2 +- Mage.Sets/src/mage/cards/o/OranRiefInvoker.java | 2 +- Mage.Sets/src/mage/cards/o/OranRiefTheVastwood.java | 2 +- Mage.Sets/src/mage/cards/o/OrcGeneral.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishArtillery.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishCannoneers.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishCaptain.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishHealer.java | 6 +++--- Mage.Sets/src/mage/cards/o/OrcishLibrarian.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishMechanics.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishSettlers.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishSpy.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishVandal.java | 2 +- Mage.Sets/src/mage/cards/o/OrcishVeteran.java | 2 +- Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java | 2 +- Mage.Sets/src/mage/cards/o/OrdruunCommando.java | 2 +- Mage.Sets/src/mage/cards/o/OrganGrinder.java | 2 +- Mage.Sets/src/mage/cards/o/OriginSpellbomb.java | 2 +- Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java | 2 +- Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java | 2 +- Mage.Sets/src/mage/cards/o/OrnateKanzashi.java | 2 +- Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java | 2 +- Mage.Sets/src/mage/cards/o/OrochiHatchery.java | 2 +- Mage.Sets/src/mage/cards/o/OrtolanKeyboardist.java | 2 +- Mage.Sets/src/mage/cards/o/OrzhovCluestone.java | 2 +- Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java | 2 +- Mage.Sets/src/mage/cards/o/OrzhovLocket.java | 2 +- .../src/mage/cards/o/OrzhovaTheChurchOfDeals.java | 2 +- Mage.Sets/src/mage/cards/o/OsaiVultures.java | 2 +- Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java | 2 +- Mage.Sets/src/mage/cards/o/OstiaryThrull.java | 2 +- Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java | 2 +- Mage.Sets/src/mage/cards/o/OtherworldAtlas.java | 4 ++-- Mage.Sets/src/mage/cards/o/OupheVandals.java | 2 +- Mage.Sets/src/mage/cards/o/OutlawHolocron.java | 2 +- Mage.Sets/src/mage/cards/o/OutriderEnKor.java | 2 +- Mage.Sets/src/mage/cards/o/OvergrownEstate.java | 2 +- Mage.Sets/src/mage/cards/o/Overtaker.java | 2 +- Mage.Sets/src/mage/cards/o/Ovinomancer.java | 2 +- .../src/mage/cards/o/OviyaPashiriSageLifecrafter.java | 4 ++-- 158 files changed, 186 insertions(+), 186 deletions(-) diff --git a/Mage.Sets/src/mage/cards/n/NacatlHuntPride.java b/Mage.Sets/src/mage/cards/n/NacatlHuntPride.java index 0064767fb70..159b4178598 100644 --- a/Mage.Sets/src/mage/cards/n/NacatlHuntPride.java +++ b/Mage.Sets/src/mage/cards/n/NacatlHuntPride.java @@ -36,13 +36,13 @@ public final class NacatlHuntPride extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {R}, {tap}: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {G}, {tap}: Target creature blocks this turn if able. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability2 = new SimpleActivatedAbility(new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/n/NahirisMachinations.java b/Mage.Sets/src/mage/cards/n/NahirisMachinations.java index 74a6e839bdb..a37a28dda48 100644 --- a/Mage.Sets/src/mage/cards/n/NahirisMachinations.java +++ b/Mage.Sets/src/mage/cards/n/NahirisMachinations.java @@ -33,7 +33,7 @@ public final class NahirisMachinations extends CardImpl { this.addAbility(ability); // {1}{R}: Nahiri's Machinations deals 1 damage to target blocking creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature("blocking creature"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NantukoDisciple.java b/Mage.Sets/src/mage/cards/n/NantukoDisciple.java index 8324cbae1ed..00cfdfdd9ec 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoDisciple.java +++ b/Mage.Sets/src/mage/cards/n/NantukoDisciple.java @@ -31,7 +31,7 @@ public final class NantukoDisciple extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NantukoHusk.java b/Mage.Sets/src/mage/cards/n/NantukoHusk.java index a8f186cd15e..b8e04398b3b 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoHusk.java +++ b/Mage.Sets/src/mage/cards/n/NantukoHusk.java @@ -30,7 +30,7 @@ public final class NantukoHusk extends CardImpl { this.toughness = new MageInt(2); // Sacrifice a creature: Nantuko Husk gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/n/NantukoMentor.java b/Mage.Sets/src/mage/cards/n/NantukoMentor.java index eef90fbc1bc..da848c409d8 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoMentor.java +++ b/Mage.Sets/src/mage/cards/n/NantukoMentor.java @@ -37,7 +37,7 @@ public final class NantukoMentor extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, {tap}: Target creature gets +X/+X until end of turn, where X is that creature's power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NantukoMentorEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new NantukoMentorEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NantukoShade.java b/Mage.Sets/src/mage/cards/n/NantukoShade.java index 106976e1a92..ad674133b05 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoShade.java +++ b/Mage.Sets/src/mage/cards/n/NantukoShade.java @@ -28,7 +28,7 @@ public final class NantukoShade extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private NantukoShade(final NantukoShade card) { diff --git a/Mage.Sets/src/mage/cards/n/Narcissism.java b/Mage.Sets/src/mage/cards/n/Narcissism.java index de4002f48a8..403bb575ff1 100644 --- a/Mage.Sets/src/mage/cards/n/Narcissism.java +++ b/Mage.Sets/src/mage/cards/n/Narcissism.java @@ -25,12 +25,12 @@ public final class Narcissism extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // {G}, Discard a card: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {G}, Sacrifice Narcissism: Target creature gets +2/+2 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NarstadScrapper.java b/Mage.Sets/src/mage/cards/n/NarstadScrapper.java index 4c8c03d62f9..65b20fc48e2 100644 --- a/Mage.Sets/src/mage/cards/n/NarstadScrapper.java +++ b/Mage.Sets/src/mage/cards/n/NarstadScrapper.java @@ -27,7 +27,7 @@ public final class NarstadScrapper extends CardImpl { this.toughness = new MageInt(3); // {2}: Narstad Scrapper gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2))); } private NarstadScrapper(final NarstadScrapper card) { diff --git a/Mage.Sets/src/mage/cards/n/NaturesBlessing.java b/Mage.Sets/src/mage/cards/n/NaturesBlessing.java index ff46817fc05..1c9f4c4cd08 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesBlessing.java +++ b/Mage.Sets/src/mage/cards/n/NaturesBlessing.java @@ -37,7 +37,7 @@ public final class NaturesBlessing extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{W}"); // {G}{W}, Discard a card: Put a +1/+1 counter on target creature or that creature gains banding, first strike, or trample. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NaturesBlessingEffect(), new ManaCostsImpl<>("{G}{W}")); + Ability ability = new SimpleActivatedAbility(new NaturesBlessingEffect(), new ManaCostsImpl<>("{G}{W}")); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NavigatorsCompass.java b/Mage.Sets/src/mage/cards/n/NavigatorsCompass.java index 253eb76019a..ead16269fc1 100644 --- a/Mage.Sets/src/mage/cards/n/NavigatorsCompass.java +++ b/Mage.Sets/src/mage/cards/n/NavigatorsCompass.java @@ -29,7 +29,7 @@ public final class NavigatorsCompass extends CardImpl { Ability etbAbility = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3)); this.addAbility(etbAbility); // {tap}: Until end of turn, target land you control becomes the basic land type of your choice in addition to its other types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, true, false) + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, true, false) .setText("Until end of turn, target land you control becomes the basic land type of your choice in addition to its other types"), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND)); diff --git a/Mage.Sets/src/mage/cards/n/NayaBattlemage.java b/Mage.Sets/src/mage/cards/n/NayaBattlemage.java index 7b142cd7595..29199045526 100644 --- a/Mage.Sets/src/mage/cards/n/NayaBattlemage.java +++ b/Mage.Sets/src/mage/cards/n/NayaBattlemage.java @@ -31,11 +31,11 @@ public final class NayaBattlemage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NayaPanorama.java b/Mage.Sets/src/mage/cards/n/NayaPanorama.java index 0f673eaa1b7..63128b373c5 100644 --- a/Mage.Sets/src/mage/cards/n/NayaPanorama.java +++ b/Mage.Sets/src/mage/cards/n/NayaPanorama.java @@ -39,7 +39,7 @@ public final class NayaPanorama extends CardImpl { this.addAbility(new ColorlessManaAbility()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NecraDisciple.java b/Mage.Sets/src/mage/cards/n/NecraDisciple.java index 0c179759c3a..bcdcaa04f86 100644 --- a/Mage.Sets/src/mage/cards/n/NecraDisciple.java +++ b/Mage.Sets/src/mage/cards/n/NecraDisciple.java @@ -30,7 +30,7 @@ public final class NecraDisciple extends CardImpl { Ability firstAbility = new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G)); firstAbility.addCost(new TapSourceCost()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); + Ability secondAbility = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetAnyTarget()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/n/Necratog.java b/Mage.Sets/src/mage/cards/n/Necratog.java index 22130542933..836f1f6fae2 100644 --- a/Mage.Sets/src/mage/cards/n/Necratog.java +++ b/Mage.Sets/src/mage/cards/n/Necratog.java @@ -26,7 +26,7 @@ public final class Necratog extends CardImpl { this.toughness = new MageInt(2); // Exile the top creature card of your graveyard: Necratog gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ExileTopCreatureCardOfGraveyardCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ExileTopCreatureCardOfGraveyardCost(1))); } private Necratog(final Necratog card) { @@ -37,4 +37,4 @@ public final class Necratog extends CardImpl { public Necratog copy() { return new Necratog(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NecrogenCenser.java b/Mage.Sets/src/mage/cards/n/NecrogenCenser.java index 36ae8e3b5e7..a72f4d41e87 100644 --- a/Mage.Sets/src/mage/cards/n/NecrogenCenser.java +++ b/Mage.Sets/src/mage/cards/n/NecrogenCenser.java @@ -26,7 +26,7 @@ public final class NecrogenCenser extends CardImpl { public NecrogenCenser (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)), "with two charge counters on it")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NecrogenSpellbomb.java b/Mage.Sets/src/mage/cards/n/NecrogenSpellbomb.java index c81a1f1996f..416861ff5d7 100644 --- a/Mage.Sets/src/mage/cards/n/NecrogenSpellbomb.java +++ b/Mage.Sets/src/mage/cards/n/NecrogenSpellbomb.java @@ -24,11 +24,11 @@ public final class NecrogenSpellbomb extends CardImpl { public NecrogenSpellbomb(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); + Ability firstAbility = new SimpleActivatedAbility(new DiscardTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/n/Necrogenesis.java b/Mage.Sets/src/mage/cards/n/Necrogenesis.java index acc9be3f15e..cf830e4f3e4 100644 --- a/Mage.Sets/src/mage/cards/n/Necrogenesis.java +++ b/Mage.Sets/src/mage/cards/n/Necrogenesis.java @@ -25,7 +25,7 @@ public final class Necrogenesis extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{G}"); // {2}: Exile target creature card from a graveyard. Create a 1/1 green Saproling creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); ability.addEffect(new CreateTokenEffect(new SaprolingToken())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NecronOverlord.java b/Mage.Sets/src/mage/cards/n/NecronOverlord.java index 7dcf86c23ae..915f04aa3b5 100644 --- a/Mage.Sets/src/mage/cards/n/NecronOverlord.java +++ b/Mage.Sets/src/mage/cards/n/NecronOverlord.java @@ -39,7 +39,7 @@ public final class NecronOverlord extends CardImpl { this.toughness = new MageInt(5); // Relentless March -- {X}, {T}, Tap X untapped artifacts you control: Target opponent loses X life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}")); ability.addTarget(new TargetOpponent()); ability.addCost(new TapSourceCost()); ability.addCost(new NecronOverlordTapVariableArtifactCost()); diff --git a/Mage.Sets/src/mage/cards/n/Necropolis.java b/Mage.Sets/src/mage/cards/n/Necropolis.java index f45749a485f..a8804d88a95 100644 --- a/Mage.Sets/src/mage/cards/n/Necropolis.java +++ b/Mage.Sets/src/mage/cards/n/Necropolis.java @@ -38,7 +38,7 @@ public final class Necropolis extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Exile a creature card from your graveyard: Put X +0/+1 counters on Necropolis, where X is the exiled card's converted mana cost. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.P0P1.createInstance(0), new NecropolisValue(), true).setText("Put X +0/+1 counters on {this}, where X is the exiled card's mana value"), new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card"))))); } diff --git a/Mage.Sets/src/mage/cards/n/Necropotence.java b/Mage.Sets/src/mage/cards/n/Necropotence.java index b274067b770..b833ca208ed 100644 --- a/Mage.Sets/src/mage/cards/n/Necropotence.java +++ b/Mage.Sets/src/mage/cards/n/Necropotence.java @@ -43,7 +43,7 @@ public final class Necropotence extends CardImpl { effect.setText("exile that card from your graveyard"); this.addAbility(new NecropotenceTriggeredAbility(effect)); // Pay 1 life: Exile the top card of your library face down. Put that card into your hand at the beginning of your next end step. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new NecropotenceEffect(), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new NecropotenceEffect(), new PayLifeCost(1))); } diff --git a/Mage.Sets/src/mage/cards/n/NecroticSliver.java b/Mage.Sets/src/mage/cards/n/NecroticSliver.java index ad78e73389d..c078d17e121 100644 --- a/Mage.Sets/src/mage/cards/n/NecroticSliver.java +++ b/Mage.Sets/src/mage/cards/n/NecroticSliver.java @@ -33,7 +33,7 @@ public final class NecroticSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{3}, Sacrifice this permanent: Destroy target permanent." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(3)); ability.addTarget(new TargetPermanent()); this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/n/NectarFaerie.java b/Mage.Sets/src/mage/cards/n/NectarFaerie.java index 7d4d844ea3c..2c24abb0e6d 100644 --- a/Mage.Sets/src/mage/cards/n/NectarFaerie.java +++ b/Mage.Sets/src/mage/cards/n/NectarFaerie.java @@ -38,7 +38,7 @@ public final class NectarFaerie extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); // {B}, {tap}: Target Faerie or Elf gains lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn) .setText("target Faerie or Elf gains lifelink until end of turn"), new ColoredManaCost(ColoredManaSymbol.B)); diff --git a/Mage.Sets/src/mage/cards/n/NeedForSpeed.java b/Mage.Sets/src/mage/cards/n/NeedForSpeed.java index 0f630b8ab87..8c3cf5eaef9 100644 --- a/Mage.Sets/src/mage/cards/n/NeedForSpeed.java +++ b/Mage.Sets/src/mage/cards/n/NeedForSpeed.java @@ -30,7 +30,7 @@ public final class NeedForSpeed extends CardImpl { // Sacrifice a land: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/n/NeedleSpires.java b/Mage.Sets/src/mage/cards/n/NeedleSpires.java index bec1102a2df..fdb245b6bed 100644 --- a/Mage.Sets/src/mage/cards/n/NeedleSpires.java +++ b/Mage.Sets/src/mage/cards/n/NeedleSpires.java @@ -38,7 +38,7 @@ public final class NeedleSpires extends CardImpl { // {2}{R}{W}: Needle Spires becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land. Effect effect = new BecomesCreatureSourceEffect(new NeedleSpiresToken(), CardType.LAND, Duration.EndOfTurn); effect.setText("{this} becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{R}{W}"))); } private NeedleSpires(final NeedleSpires card) { diff --git a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java index 5f89e15f905..30245f96f4a 100644 --- a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java @@ -38,9 +38,9 @@ public final class NemataGroveGuardian extends CardImpl { this.toughness = new MageInt(5); // {2}{G}: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}"))); // Sacrifice a Saproling: Saproling creatures get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(filter1))); + this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(filter1))); } private NemataGroveGuardian(final NemataGroveGuardian card) { diff --git a/Mage.Sets/src/mage/cards/n/NeophyteHateflayer.java b/Mage.Sets/src/mage/cards/n/NeophyteHateflayer.java index 80108b8588d..2d39998947b 100644 --- a/Mage.Sets/src/mage/cards/n/NeophyteHateflayer.java +++ b/Mage.Sets/src/mage/cards/n/NeophyteHateflayer.java @@ -28,7 +28,7 @@ public final class NeophyteHateflayer extends CardImpl { this.toughness = new MageInt(1); // {T}, Pay 1 life: Each opponent loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeOpponentsEffect(1), new TapSourceCost()); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java b/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java index 51df662a62c..b09b7b47bae 100644 --- a/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java +++ b/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java @@ -26,7 +26,7 @@ public final class NephaliaDrownyard extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{U}{B}, {T}: Target player puts the top three cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java b/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java index 096c3411c8e..42bb23a4cad 100644 --- a/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java +++ b/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java @@ -30,7 +30,7 @@ public final class NephaliaSmuggler extends CardImpl { this.toughness = new MageInt(1); // {3}{U}, {tap}: Exile another target creature you control, then return that card to the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileThenReturnTargetEffect(true, true), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new ExileThenReturnTargetEffect(true, true), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NetterEnDal.java b/Mage.Sets/src/mage/cards/n/NetterEnDal.java index aa80c165246..9bc537405b0 100644 --- a/Mage.Sets/src/mage/cards/n/NetterEnDal.java +++ b/Mage.Sets/src/mage/cards/n/NetterEnDal.java @@ -31,7 +31,7 @@ public final class NetterEnDal extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}, Discard a card: Target creature can't attack this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/n/NettleDrone.java b/Mage.Sets/src/mage/cards/n/NettleDrone.java index 16f6257d2db..6aa8264384f 100644 --- a/Mage.Sets/src/mage/cards/n/NettleDrone.java +++ b/Mage.Sets/src/mage/cards/n/NettleDrone.java @@ -41,7 +41,7 @@ public final class NettleDrone extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {T}: Nettle Drone deals 1 damage to each opponent. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new TapSourceCost())); // Whenever you cast a colorless spell, untap Nettle Drone. this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filterSpell, false)); diff --git a/Mage.Sets/src/mage/cards/n/NeurokProdigy.java b/Mage.Sets/src/mage/cards/n/NeurokProdigy.java index 39e8b383b9e..6fa761d9fef 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokProdigy.java +++ b/Mage.Sets/src/mage/cards/n/NeurokProdigy.java @@ -39,7 +39,7 @@ public final class NeurokProdigy extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Discard an artifact card: Return Neurok Prodigy to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new DiscardTargetCost(new TargetCardInHand(filter)))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new DiscardTargetCost(new TargetCardInHand(filter)))); } private NeurokProdigy(final NeurokProdigy card) { diff --git a/Mage.Sets/src/mage/cards/n/NeurokReplica.java b/Mage.Sets/src/mage/cards/n/NeurokReplica.java index 0c60b61563a..70b5665243f 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokReplica.java +++ b/Mage.Sets/src/mage/cards/n/NeurokReplica.java @@ -27,7 +27,7 @@ public final class NeurokReplica extends CardImpl { this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(4); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java b/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java index 1d6d5f62e3d..f56d649f857 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java +++ b/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java @@ -33,7 +33,7 @@ public final class NeurokStealthsuit extends CardImpl { // Equipped creature has shroud. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); // {U}{U}: Attach Neurok Stealthsuit to target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java b/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java index bc0801e0905..0e81a40e425 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java +++ b/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java @@ -40,13 +40,13 @@ public final class NeurokTransmuter extends CardImpl { this.toughness = new MageInt(2); // {U}: Target creature becomes an artifact in addition to its other types until end of turn. - Ability becomeArtifactAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.ARTIFACT), new ManaCostsImpl<>("{U}")); + Ability becomeArtifactAbility = new SimpleActivatedAbility(new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.ARTIFACT), new ManaCostsImpl<>("{U}")); becomeArtifactAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(becomeArtifactAbility); // {U}: Until end of turn, target artifact creature becomes blue and isn't an artifact. Effect blueEffect = new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn); blueEffect.setText("Until end of turn, target artifact creature becomes blue"); - Ability becomeBlueAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, blueEffect, new ManaCostsImpl<>("{U}")); + Ability becomeBlueAbility = new SimpleActivatedAbility(blueEffect, new ManaCostsImpl<>("{U}")); becomeBlueAbility.addTarget(new TargetCreaturePermanent(filter)); Effect loseArtifactEffect = new LoseArtifactTypeTargetEffect(Duration.EndOfTurn); loseArtifactEffect.setText("and isn't an artifact"); diff --git a/Mage.Sets/src/mage/cards/n/NevinyrralsDisk.java b/Mage.Sets/src/mage/cards/n/NevinyrralsDisk.java index c1a3926a84e..355adb8e996 100644 --- a/Mage.Sets/src/mage/cards/n/NevinyrralsDisk.java +++ b/Mage.Sets/src/mage/cards/n/NevinyrralsDisk.java @@ -38,7 +38,7 @@ public final class NevinyrralsDisk extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {1}, {tap}: Destroy all artifacts, creatures, and enchantments. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, false), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyAllEffect(filter, false), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java b/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java index 842b94f119a..30cd3aa9a26 100644 --- a/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java +++ b/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java @@ -43,13 +43,13 @@ public final class NewPrahvGuildmage extends CardImpl { this.toughness = new MageInt(2); // {W}{U}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}{U}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {3}{W}{U}: Detain target nonland permanent an opponent controls. // (Until your next turn, that permanent can't attack or block and its activated abilities can't be activated.) - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DetainTargetEffect(), new ManaCostsImpl<>("{3}{W}{U}")); + ability = new SimpleActivatedAbility(new DetainTargetEffect(), new ManaCostsImpl<>("{3}{W}{U}")); TargetNonlandPermanent target = new TargetNonlandPermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java b/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java index 5bfbdf46d97..0a92d7a4f92 100644 --- a/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java +++ b/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java @@ -50,7 +50,7 @@ public final class NezahalPrimalTide extends CardImpl { new DrawCardSourceControllerEffect(1), StaticFilters.FILTER_SPELL_A_NON_CREATURE, false, SetTargetPointer.NONE)); // Discard three cards: Exile Nezahal. Return it to the battlefield tapped under its owner's control at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(true), + this.addAbility(new SimpleActivatedAbility(new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(true), new DiscardTargetCost(new TargetCardInHand(3, StaticFilters.FILTER_CARD_CARDS)))); } diff --git a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java index 0e8c8978a75..59f0344e03f 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java +++ b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java @@ -44,7 +44,7 @@ public final class NezumiGraverobber extends CardImpl { this.flipCardName = "Nighteyes the Desecrator"; // {1}{B}: Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip Nezumi Graverobber. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); Target target = new TargetCardInOpponentsGraveyard(new FilterCard("card from an opponent's graveyard")); ability.addTarget(target); ability.addEffect(new NezumiGraverobberFlipEffect()); @@ -105,7 +105,7 @@ class NighteyesTheDesecratorToken extends TokenImpl { power = new MageInt(4); toughness = new MageInt(2); // {4}{B}: Put target creature card from a graveyard onto the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{B}")); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java b/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java index 5a7c846fa13..e54a76ea827 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java +++ b/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java @@ -35,7 +35,7 @@ public final class NezumiShadowWatcher extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Nezumi Shadow-Watcher: Destroy target Ninja. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java index e9f99bb019e..3f40b64c101 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java +++ b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java @@ -37,7 +37,7 @@ public final class NezumiShortfang extends CardImpl { this.flipCardName = "Stabwhisker the Odious"; // {1}{B}, {tap}: Target opponent discards a card. Then if that player has no cards in hand, flip Nezumi Shortfang. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new DiscardTargetEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); ability.addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/cards/n/NiallSilvain.java b/Mage.Sets/src/mage/cards/n/NiallSilvain.java index 1256435e61a..660ec844a22 100644 --- a/Mage.Sets/src/mage/cards/n/NiallSilvain.java +++ b/Mage.Sets/src/mage/cards/n/NiallSilvain.java @@ -28,7 +28,7 @@ public final class NiallSilvain extends CardImpl { this.toughness = new MageInt(2); // {G}{G}{G}{G}, {tap}: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}{G}{G}{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}{G}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NiblisOfTheBreath.java b/Mage.Sets/src/mage/cards/n/NiblisOfTheBreath.java index ed97c25a10f..55cf4d48d94 100644 --- a/Mage.Sets/src/mage/cards/n/NiblisOfTheBreath.java +++ b/Mage.Sets/src/mage/cards/n/NiblisOfTheBreath.java @@ -32,7 +32,7 @@ public final class NiblisOfTheBreath extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NightSoil.java b/Mage.Sets/src/mage/cards/n/NightSoil.java index 6d8651d3511..9e01fe613a9 100644 --- a/Mage.Sets/src/mage/cards/n/NightSoil.java +++ b/Mage.Sets/src/mage/cards/n/NightSoil.java @@ -24,7 +24,7 @@ public final class NightSoil extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}{G}"); // {1}, Exile two creature cards from a single graveyard: Create a 1/1 green Saproling creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new ExileFromGraveCost(new TargetCardInASingleGraveyard(2, 2, new FilterCreatureCard("creature cards")))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NightfireGiant.java b/Mage.Sets/src/mage/cards/n/NightfireGiant.java index 812bb86f0cb..c1f25f254c9 100644 --- a/Mage.Sets/src/mage/cards/n/NightfireGiant.java +++ b/Mage.Sets/src/mage/cards/n/NightfireGiant.java @@ -41,7 +41,7 @@ public final class NightfireGiant extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {4}{R}: Nightfire Giant deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NightscapeApprentice.java b/Mage.Sets/src/mage/cards/n/NightscapeApprentice.java index 807e8a575a8..389fbfb3bf9 100644 --- a/Mage.Sets/src/mage/cards/n/NightscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/n/NightscapeApprentice.java @@ -34,12 +34,12 @@ public final class NightscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {U}, {T}: Put target creature you control on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // {R}, {T}: Target creature gains first strike until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), + ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java b/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java index 81129d9e843..524181d30c3 100644 --- a/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java @@ -42,7 +42,7 @@ public final class NightscapeFamiliar extends CardImpl { this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // {1}{B}: Regenerate Nightscape Familiar. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private NightscapeFamiliar(final NightscapeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/n/NightscapeMaster.java b/Mage.Sets/src/mage/cards/n/NightscapeMaster.java index 617f84f14f3..a08e0dad504 100644 --- a/Mage.Sets/src/mage/cards/n/NightscapeMaster.java +++ b/Mage.Sets/src/mage/cards/n/NightscapeMaster.java @@ -30,13 +30,13 @@ public final class NightscapeMaster extends CardImpl { this.toughness = new MageInt(2); // {U}{U}, {tap}: Return target creature to its owner's hand. - Ability returnAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability returnAbility = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}")); returnAbility.addTarget(new TargetCreaturePermanent()); returnAbility.addCost(new TapSourceCost()); this.addAbility(returnAbility); // {R}{R}, {tap}: Nightscape Master deals 2 damage to target creature. - Ability damageAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{R}")); + Ability damageAbility = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{R}")); damageAbility.addTarget(new TargetCreaturePermanent()); damageAbility.addCost(new TapSourceCost()); this.addAbility(damageAbility); diff --git a/Mage.Sets/src/mage/cards/n/NightwingShade.java b/Mage.Sets/src/mage/cards/n/NightwingShade.java index 37aac5407c9..06cd5259da6 100644 --- a/Mage.Sets/src/mage/cards/n/NightwingShade.java +++ b/Mage.Sets/src/mage/cards/n/NightwingShade.java @@ -29,7 +29,7 @@ public final class NightwingShade extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private NightwingShade(final NightwingShade card) { diff --git a/Mage.Sets/src/mage/cards/n/NimReplica.java b/Mage.Sets/src/mage/cards/n/NimReplica.java index 112883bd9c8..c4dc856e25b 100644 --- a/Mage.Sets/src/mage/cards/n/NimReplica.java +++ b/Mage.Sets/src/mage/cards/n/NimReplica.java @@ -27,7 +27,7 @@ public final class NimReplica extends CardImpl { this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(3); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NimShambler.java b/Mage.Sets/src/mage/cards/n/NimShambler.java index 7c5f4c5b515..20a9a49e259 100644 --- a/Mage.Sets/src/mage/cards/n/NimShambler.java +++ b/Mage.Sets/src/mage/cards/n/NimShambler.java @@ -38,7 +38,7 @@ public final class NimShambler extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java index 6129c5a4491..3131bb09d00 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java @@ -41,7 +41,7 @@ public final class NivMizzetDracogenius extends CardImpl { this.addAbility(new DealsDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); // {U}{R}: Niv-Mizzet, Dracogenius deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl<>("{U}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1),new ManaCostsImpl<>("{U}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java index 2b7e33e96a6..efe015ad2ec 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java @@ -42,7 +42,7 @@ public final class NivMizzetTheFiremind extends CardImpl { this.addAbility(ability); // {T}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost())); } private NivMizzetTheFiremind(final NivMizzetTheFiremind card) { diff --git a/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java b/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java index f7fe6f6a140..c11dae866d8 100644 --- a/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java +++ b/Mage.Sets/src/mage/cards/n/NivixAerieOfTheFiremind.java @@ -33,7 +33,7 @@ public final class NivixAerieOfTheFiremind extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}{U}{R}, {tap}: Exile the top card of your library. Until your next turn, you may cast that card if it's an instant or sorcery card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NivixAerieOfTheFiremindEffect(), new ManaCostsImpl<>("{2}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new NivixAerieOfTheFiremindEffect(), new ManaCostsImpl<>("{2}{U}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NivixGuildmage.java b/Mage.Sets/src/mage/cards/n/NivixGuildmage.java index a1f91350df7..2a58790ddfb 100644 --- a/Mage.Sets/src/mage/cards/n/NivixGuildmage.java +++ b/Mage.Sets/src/mage/cards/n/NivixGuildmage.java @@ -43,10 +43,10 @@ public final class NivixGuildmage extends CardImpl { this.toughness = new MageInt(2); // {1}{U}{R}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}{R}"))); // {2}{U}{R}: Copy target instant or sorcery spell you control. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{2}{U}{R}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NoblePanther.java b/Mage.Sets/src/mage/cards/n/NoblePanther.java index aabfc47ca2d..66f61cae03a 100644 --- a/Mage.Sets/src/mage/cards/n/NoblePanther.java +++ b/Mage.Sets/src/mage/cards/n/NoblePanther.java @@ -28,7 +28,7 @@ public final class NoblePanther extends CardImpl { this.toughness = new MageInt(3); // {1}: Noble Panther gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private NoblePanther(final NoblePanther card) { diff --git a/Mage.Sets/src/mage/cards/n/NobleVestige.java b/Mage.Sets/src/mage/cards/n/NobleVestige.java index 589637407b2..c0189554ff0 100644 --- a/Mage.Sets/src/mage/cards/n/NobleVestige.java +++ b/Mage.Sets/src/mage/cards/n/NobleVestige.java @@ -30,7 +30,7 @@ public final class NobleVestige extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java index 014d3fc71c2..193af209d5b 100644 --- a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java +++ b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java @@ -44,7 +44,7 @@ public final class NomadMythmaker extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Put target Aura card from a graveyard onto the battlefield under your control attached to a creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NomadMythmakerEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new NomadMythmakerEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(1, FILTER)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NomadsEnKor.java b/Mage.Sets/src/mage/cards/n/NomadsEnKor.java index 43b3cd57d3b..f6839dc0ab5 100644 --- a/Mage.Sets/src/mage/cards/n/NomadsEnKor.java +++ b/Mage.Sets/src/mage/cards/n/NomadsEnKor.java @@ -32,7 +32,7 @@ public final class NomadsEnKor extends CardImpl { this.toughness = new MageInt(1); // {0}: The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NooseConstrictor.java b/Mage.Sets/src/mage/cards/n/NooseConstrictor.java index 56f1815c29b..c24391443e0 100644 --- a/Mage.Sets/src/mage/cards/n/NooseConstrictor.java +++ b/Mage.Sets/src/mage/cards/n/NooseConstrictor.java @@ -30,7 +30,7 @@ public final class NooseConstrictor extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Discard a card: Noose Constrictor gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new DiscardCardCost())); } private NooseConstrictor(final NooseConstrictor card) { diff --git a/Mage.Sets/src/mage/cards/n/Norritt.java b/Mage.Sets/src/mage/cards/n/Norritt.java index 84aa8f4f123..6d00e0954ba 100644 --- a/Mage.Sets/src/mage/cards/n/Norritt.java +++ b/Mage.Sets/src/mage/cards/n/Norritt.java @@ -55,7 +55,7 @@ public final class Norritt extends CardImpl { this.toughness = new MageInt(1); // {T}: Untap target blue creature. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability1 = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability1.addTarget(new TargetCreaturePermanent(filterBlue)); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/n/NorthernPaladin.java b/Mage.Sets/src/mage/cards/n/NorthernPaladin.java index 4c9821f5516..5630bd24c50 100644 --- a/Mage.Sets/src/mage/cards/n/NorthernPaladin.java +++ b/Mage.Sets/src/mage/cards/n/NorthernPaladin.java @@ -38,7 +38,7 @@ public final class NorthernPaladin extends CardImpl { this.toughness = new MageInt(3); // {W}{W}, {tap}: Destroy target black permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NosyGoblin.java b/Mage.Sets/src/mage/cards/n/NosyGoblin.java index d045eea88b5..aef639a100d 100644 --- a/Mage.Sets/src/mage/cards/n/NosyGoblin.java +++ b/Mage.Sets/src/mage/cards/n/NosyGoblin.java @@ -36,7 +36,7 @@ public final class NosyGoblin extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Nosy Goblin: Destroy target face-down creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NotoriousAssassin.java b/Mage.Sets/src/mage/cards/n/NotoriousAssassin.java index 13fdf1558b2..95def99ef00 100644 --- a/Mage.Sets/src/mage/cards/n/NotoriousAssassin.java +++ b/Mage.Sets/src/mage/cards/n/NotoriousAssassin.java @@ -31,7 +31,7 @@ public final class NotoriousAssassin extends CardImpl { this.toughness = new MageInt(2); // {2}{B}, {tap}, Discard a card: Destroy target nonblack creature. It can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); diff --git a/Mage.Sets/src/mage/cards/n/NovaCleric.java b/Mage.Sets/src/mage/cards/n/NovaCleric.java index 00865331ec5..20c71af7b12 100644 --- a/Mage.Sets/src/mage/cards/n/NovaCleric.java +++ b/Mage.Sets/src/mage/cards/n/NovaCleric.java @@ -30,7 +30,7 @@ public final class NovaCleric extends CardImpl { this.toughness = new MageInt(2); // {2}{W}, {tap}, Sacrifice Nova Cleric: Destroy all enchantments. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(new FilterEnchantmentPermanent("enchantments")), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyAllEffect(new FilterEnchantmentPermanent("enchantments")), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NovaPentacle.java b/Mage.Sets/src/mage/cards/n/NovaPentacle.java index 7ab6107cfa0..b19929dd3c1 100644 --- a/Mage.Sets/src/mage/cards/n/NovaPentacle.java +++ b/Mage.Sets/src/mage/cards/n/NovaPentacle.java @@ -31,7 +31,7 @@ public final class NovaPentacle extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {tap}: The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature of an opponent's choice instead - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NovaPentacleEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new NovaPentacleEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponentsChoicePermanent(1, 1, new FilterCreaturePermanent(), false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NovijenHeartOfProgress.java b/Mage.Sets/src/mage/cards/n/NovijenHeartOfProgress.java index d1fb4e40e07..0532f662a22 100644 --- a/Mage.Sets/src/mage/cards/n/NovijenHeartOfProgress.java +++ b/Mage.Sets/src/mage/cards/n/NovijenHeartOfProgress.java @@ -33,7 +33,7 @@ public final class NovijenHeartOfProgress extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {G}{U}, {T}: Put a +1/+1 counter on each creature that entered the battlefield this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NovijenHeartOfProgressEffect(), new ManaCostsImpl<>("{G}{U}")); + Ability ability = new SimpleActivatedAbility(new NovijenHeartOfProgressEffect(), new ManaCostsImpl<>("{G}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NovijenSages.java b/Mage.Sets/src/mage/cards/n/NovijenSages.java index 5db1619e8cd..ef0e4346db3 100644 --- a/Mage.Sets/src/mage/cards/n/NovijenSages.java +++ b/Mage.Sets/src/mage/cards/n/NovijenSages.java @@ -43,7 +43,7 @@ public final class NovijenSages extends CardImpl { this.addAbility(new GraftAbility(this, 4)); // {1}, Remove two +1/+1 counters from among creatures you control: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability.addCost(new RemoveCounterCost(new TargetPermanent(1, 2, filter, true), CounterType.P1P1, 2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NoxiousField.java b/Mage.Sets/src/mage/cards/n/NoxiousField.java index 684ce2056db..16f4223f355 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousField.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousField.java @@ -38,7 +38,7 @@ public final class NoxiousField extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: This land deals 1 damage to each creature and each player." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageEverythingEffect(1), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: This land deals 1 damage to each creature and each player.\""); this.addAbility(new SimpleStaticAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/n/NuisanceEngine.java b/Mage.Sets/src/mage/cards/n/NuisanceEngine.java index ebb39c1f45f..6196fbaf9a2 100644 --- a/Mage.Sets/src/mage/cards/n/NuisanceEngine.java +++ b/Mage.Sets/src/mage/cards/n/NuisanceEngine.java @@ -20,7 +20,7 @@ public final class NuisanceEngine extends CardImpl { public NuisanceEngine(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PestToken(), 1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new PestToken(), 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NullBrooch.java b/Mage.Sets/src/mage/cards/n/NullBrooch.java index 9b5550e418f..075852bce11 100644 --- a/Mage.Sets/src/mage/cards/n/NullBrooch.java +++ b/Mage.Sets/src/mage/cards/n/NullBrooch.java @@ -25,7 +25,7 @@ public final class NullBrooch extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}, Discard your hand: Counter target noncreature spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardHandCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_NON_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/n/NullChampion.java b/Mage.Sets/src/mage/cards/n/NullChampion.java index ac8216f0659..7c60fd3d795 100644 --- a/Mage.Sets/src/mage/cards/n/NullChampion.java +++ b/Mage.Sets/src/mage/cards/n/NullChampion.java @@ -36,7 +36,7 @@ public final class NullChampion extends LevelerCard { Abilities abilities1 = new AbilitiesImpl<>(); Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + abilities2.add(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); this.addAbilities(LevelerCardBuilder.construct( new LevelerCardBuilder.LevelAbility(1, 3, abilities1, 4, 2), diff --git a/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java b/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java index 68574a3d7ac..587dac4ec00 100644 --- a/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java @@ -37,7 +37,7 @@ public final class NullmageAdvocate extends CardImpl { // {tap}: Return two target cards from an opponent's graveyard to their hand. Destroy target artifact or enchantment. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("Return two target cards from an opponent's graveyard to their hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new DestroyTargetEffect("Destroy target artifact or enchantment"); effect.setTargetPointer(new SecondTargetPointer()); diff --git a/Mage.Sets/src/mage/cards/n/NullmageShepherd.java b/Mage.Sets/src/mage/cards/n/NullmageShepherd.java index aa23eb3db3c..1918253be4c 100644 --- a/Mage.Sets/src/mage/cards/n/NullmageShepherd.java +++ b/Mage.Sets/src/mage/cards/n/NullmageShepherd.java @@ -39,7 +39,7 @@ public final class NullmageShepherd extends CardImpl { this.toughness = new MageInt(4); // Tap four untapped creatures you control: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(4, 4, filterCost, true))); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(4, 4, filterCost, true))); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NumaiOutcast.java b/Mage.Sets/src/mage/cards/n/NumaiOutcast.java index c170bd1a802..7b552ec97e5 100644 --- a/Mage.Sets/src/mage/cards/n/NumaiOutcast.java +++ b/Mage.Sets/src/mage/cards/n/NumaiOutcast.java @@ -31,7 +31,7 @@ public final class NumaiOutcast extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(2)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new PayLifeCost(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NurturingLicid.java b/Mage.Sets/src/mage/cards/n/NurturingLicid.java index d7fbdc29b25..ec1f053ad78 100644 --- a/Mage.Sets/src/mage/cards/n/NurturingLicid.java +++ b/Mage.Sets/src/mage/cards/n/NurturingLicid.java @@ -31,7 +31,7 @@ public final class NurturingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.G), new ColoredManaCost(ColoredManaSymbol.G))); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ColoredManaCost(ColoredManaSymbol.G))); } private NurturingLicid(final NurturingLicid card) { diff --git a/Mage.Sets/src/mage/cards/n/NuteGunray.java b/Mage.Sets/src/mage/cards/n/NuteGunray.java index ae2e3fe0eaa..1c6d05ee367 100644 --- a/Mage.Sets/src/mage/cards/n/NuteGunray.java +++ b/Mage.Sets/src/mage/cards/n/NuteGunray.java @@ -48,7 +48,7 @@ public final class NuteGunray extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)), new FilterArtifactPermanent())); // {1}{T}, Sacrifice a non-token artifact: Create a 1/1 colorless Battle Droid artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DroidToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new DroidToken()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NyxWeaver.java b/Mage.Sets/src/mage/cards/n/NyxWeaver.java index 30a67de5f42..91ea465087b 100644 --- a/Mage.Sets/src/mage/cards/n/NyxWeaver.java +++ b/Mage.Sets/src/mage/cards/n/NyxWeaver.java @@ -36,7 +36,7 @@ public final class NyxWeaver extends CardImpl { // At the beginning of your upkeep, put the top two cards of your library into your graveyard. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new MillCardsControllerEffect(2))); // {1}{B}{G}, Exile Nyx Weaver: Return target card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{1}{B}{G}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{1}{B}{G}")); ability.addCost(new ExileSourceCost()); ability.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/Oasis.java b/Mage.Sets/src/mage/cards/o/Oasis.java index 07a60ea146d..d29a7fc3db1 100644 --- a/Mage.Sets/src/mage/cards/o/Oasis.java +++ b/Mage.Sets/src/mage/cards/o/Oasis.java @@ -23,7 +23,7 @@ public final class Oasis extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); // {tap}: Prevent the next 1 damage that would be dealt to target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java index 15d9883acb0..46aab0dff8a 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java @@ -37,7 +37,7 @@ public final class OathOfLimDul extends CardImpl { this.addAbility(new OathOfLimDulTriggeredAbility()); // {B}{B}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java b/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java index dfed6a949ab..bf247844f08 100644 --- a/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java +++ b/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java @@ -28,25 +28,25 @@ public final class ObeliskOfAlara extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // {1}{W}, {tap}: You gain 5 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(5), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}{U}, {tap}: Draw a card, then discard a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}")); + ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}{B}, {tap}: Target creature gets -2/-2 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}{R}, {tap}: Obelisk of Alara deals 3 damage to target player. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{1}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); // {1}{G}, {tap}: Target creature gets +4/+4 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); + ability = new SimpleActivatedAbility(new BoostTargetEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java b/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java index 5c6311f38c1..ce19944a353 100644 --- a/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java +++ b/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java @@ -31,7 +31,7 @@ public final class ObeliskOfUndoing extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {6}, {tap}: Return target permanent you both own and control to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{6}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{6}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OblivionCrown.java b/Mage.Sets/src/mage/cards/o/OblivionCrown.java index a604e4a9b03..190ce7d4096 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionCrown.java +++ b/Mage.Sets/src/mage/cards/o/OblivionCrown.java @@ -41,7 +41,7 @@ public final class OblivionCrown extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "Discard a card: This creature gets +1/+1 until end of turn." - this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn),new DiscardCardCost()), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn),new DiscardCardCost()), AttachmentType.AURA))); } private OblivionCrown(final OblivionCrown card) { diff --git a/Mage.Sets/src/mage/cards/o/OblivionStone.java b/Mage.Sets/src/mage/cards/o/OblivionStone.java index 31420a3138b..fec6ebd2090 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionStone.java +++ b/Mage.Sets/src/mage/cards/o/OblivionStone.java @@ -29,12 +29,12 @@ public final class OblivionStone extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {4}, {tap}: Put a fate counter on target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.FATE.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); // {5}, {tap}, Sacrifice Oblivion Stone: Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OblivionStoneEffect(), new GenericManaCost(5)); + ability = new SimpleActivatedAbility(new OblivionStoneEffect(), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OboroBreezecaller.java b/Mage.Sets/src/mage/cards/o/OboroBreezecaller.java index 279267ba55c..04f8fa8eaa2 100644 --- a/Mage.Sets/src/mage/cards/o/OboroBreezecaller.java +++ b/Mage.Sets/src/mage/cards/o/OboroBreezecaller.java @@ -39,7 +39,7 @@ public final class OboroBreezecaller extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Untap target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(2)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java b/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java index 9ed752ba5e0..a4200a6e4fd 100644 --- a/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java +++ b/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java @@ -24,7 +24,7 @@ public final class OboroPalaceInTheClouds extends CardImpl { // {tap}: Add {U}. this.addAbility(new BlueManaAbility()); // {1}: Return Oboro, Palace in the Clouds to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new GenericManaCost(1))); } private OboroPalaceInTheClouds(final OboroPalaceInTheClouds card) { diff --git a/Mage.Sets/src/mage/cards/o/ObscuringAether.java b/Mage.Sets/src/mage/cards/o/ObscuringAether.java index 1cdd14ad479..193c8973747 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuringAether.java +++ b/Mage.Sets/src/mage/cards/o/ObscuringAether.java @@ -28,7 +28,7 @@ public final class ObscuringAether extends CardImpl { // {1}{G}: Turn Obscuring Aether face down. Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL); effect.setText("Turn {this} face down. (It becomes a 2/2 creature.)"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java b/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java index 9ab202da26e..2ad8d85eb0b 100644 --- a/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java +++ b/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java @@ -32,10 +32,10 @@ public final class ObsessiveStitcher extends CardImpl { this.toughness = new MageInt(3); // {T}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); // {2}{U}{B}, {T}, Sacrifice Obsessive Stitcher: Return target creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{U}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/o/OcularHalo.java b/Mage.Sets/src/mage/cards/o/OcularHalo.java index 85da48fdf04..77769d0946f 100644 --- a/Mage.Sets/src/mage/cards/o/OcularHalo.java +++ b/Mage.Sets/src/mage/cards/o/OcularHalo.java @@ -41,11 +41,11 @@ public final class OcularHalo extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: Draw a card." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); // {W}: Enchanted creature gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/o/OdiousTrow.java b/Mage.Sets/src/mage/cards/o/OdiousTrow.java index 69a5b825228..23d0c17cc9d 100644 --- a/Mage.Sets/src/mage/cards/o/OdiousTrow.java +++ b/Mage.Sets/src/mage/cards/o/OdiousTrow.java @@ -25,7 +25,7 @@ public final class OdiousTrow extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B/G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B/G}"))); } private OdiousTrow(final OdiousTrow card) { diff --git a/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java b/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java index 033a22895ba..ba66f0db836 100644 --- a/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java +++ b/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java @@ -41,7 +41,7 @@ public final class OdunosRiverTrawler extends CardImpl { ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); // {W}, Sacrifice Odunos River Trawler: Return target enchantment creature card from your graveyard to your hand. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OgreMenial.java b/Mage.Sets/src/mage/cards/o/OgreMenial.java index 67377ec3872..1cef8875f07 100644 --- a/Mage.Sets/src/mage/cards/o/OgreMenial.java +++ b/Mage.Sets/src/mage/cards/o/OgreMenial.java @@ -31,7 +31,7 @@ public final class OgreMenial extends CardImpl { this.addAbility(InfectAbility.getInstance()); // {R}: Ogre Menial 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 OgreMenial(final OgreMenial card) { diff --git a/Mage.Sets/src/mage/cards/o/OgreShaman.java b/Mage.Sets/src/mage/cards/o/OgreShaman.java index e4a9a27bd10..1f7ebb7b994 100644 --- a/Mage.Sets/src/mage/cards/o/OgreShaman.java +++ b/Mage.Sets/src/mage/cards/o/OgreShaman.java @@ -29,7 +29,7 @@ public final class OgreShaman extends CardImpl { this.toughness = new MageInt(3); // {2}, Discard a card at random: Ogre Shaman deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new GenericManaCost(2)); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OhranYeti.java b/Mage.Sets/src/mage/cards/o/OhranYeti.java index 98fe1949bb9..092a8f5f895 100644 --- a/Mage.Sets/src/mage/cards/o/OhranYeti.java +++ b/Mage.Sets/src/mage/cards/o/OhranYeti.java @@ -38,7 +38,7 @@ public final class OhranYeti extends CardImpl { this.toughness = new MageInt(3); // {2}{S}: Target snow creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{S}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java index 72bce24ad26..fc21333660f 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java @@ -31,7 +31,7 @@ public final class OjutaiMonument extends CardImpl { this.addAbility(new BlueManaAbility()); // {4}{W}{U}: Ojutai Monument becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect (new OjutaiMonumentToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java index bc570530c79..8ab13c84aa7 100644 --- a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java +++ b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java @@ -44,7 +44,7 @@ public final class OketraTheTrue extends CardImpl { this.addAbility(new SimpleStaticAbility(new OketraTheTrueRestrictionEffect())); // {3}{W}: Create a 1/1 white Warrior creature token with vigilance. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WarriorVigilantToken()), new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new WarriorVigilantToken()), new ManaCostsImpl<>("{3}{W}"))); } private OketraTheTrue(final OketraTheTrue card) { diff --git a/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java b/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java index 6120bd32bd1..3e7981f06fc 100644 --- a/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java +++ b/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java @@ -30,7 +30,7 @@ public final class OkinaTempleToTheGrandfathers extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.supertype.add(SuperType.LEGENDARY); this.addAbility(new GreenManaAbility()); - 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.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java b/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java index 3a4df847f96..a277949ac54 100644 --- a/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java +++ b/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java @@ -45,7 +45,7 @@ public final class OliviasBloodsworn extends CardImpl { this.addAbility(new CantBlockAbility()); // {R}: Target Vampire gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OliviasDragoon.java b/Mage.Sets/src/mage/cards/o/OliviasDragoon.java index 49f5c3fd2d0..b59217dfb9b 100644 --- a/Mage.Sets/src/mage/cards/o/OliviasDragoon.java +++ b/Mage.Sets/src/mage/cards/o/OliviasDragoon.java @@ -28,7 +28,7 @@ public final class OliviasDragoon extends CardImpl { this.toughness = new MageInt(2); // Discard a card: Olivia's Dragoon gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); } private OliviasDragoon(final OliviasDragoon card) { diff --git a/Mage.Sets/src/mage/cards/o/Omnibian.java b/Mage.Sets/src/mage/cards/o/Omnibian.java index b24763ad960..25a9fa96e5f 100644 --- a/Mage.Sets/src/mage/cards/o/Omnibian.java +++ b/Mage.Sets/src/mage/cards/o/Omnibian.java @@ -30,7 +30,7 @@ public final class Omnibian extends CardImpl { this.toughness = new MageInt(3); // {T}: Target creature becomes a 3/3 Frog until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect( + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect( new CreatureToken(3, 3, "Frog with base power and toughness 3/3", SubType.FROG), false, false, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java b/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java index d3f10d45983..a94a6c5a090 100644 --- a/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java +++ b/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java @@ -29,7 +29,7 @@ public final class OngoingInvestigation extends CardImpl { this.addAbility(new DealCombatDamageControlledTriggeredAbility(new InvestigateEffect())); // {1}{G}, Exile a creature card from your graveyard: Investigate. You gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new InvestigateEffect().setText("investigate"), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new InvestigateEffect().setText("investigate"), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); ability.addEffect(new GainLifeEffect(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OnyxGoblet.java b/Mage.Sets/src/mage/cards/o/OnyxGoblet.java index 93a73c7ca67..1f74392cad9 100644 --- a/Mage.Sets/src/mage/cards/o/OnyxGoblet.java +++ b/Mage.Sets/src/mage/cards/o/OnyxGoblet.java @@ -23,7 +23,7 @@ public final class OnyxGoblet extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}{B}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OnyxMage.java b/Mage.Sets/src/mage/cards/o/OnyxMage.java index 8d347153bab..319ef1bf81a 100644 --- a/Mage.Sets/src/mage/cards/o/OnyxMage.java +++ b/Mage.Sets/src/mage/cards/o/OnyxMage.java @@ -29,7 +29,7 @@ public final class OnyxMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java index 44c222a1e5f..70adce28e25 100644 --- a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java +++ b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java @@ -36,7 +36,7 @@ public final class OonaQueenOfTheFae extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {X}{UB}: Choose a color. Target opponent exiles the top X cards of their library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OonaQueenOfTheFaeEffect(), new ManaCostsImpl<>("{X}{U/B}")); + Ability ability = new SimpleActivatedAbility(new OonaQueenOfTheFaeEffect(), new ManaCostsImpl<>("{X}{U/B}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OonasProwler.java b/Mage.Sets/src/mage/cards/o/OonasProwler.java index 1b5be84a737..4c1a315d267 100644 --- a/Mage.Sets/src/mage/cards/o/OonasProwler.java +++ b/Mage.Sets/src/mage/cards/o/OonasProwler.java @@ -33,7 +33,7 @@ public final class OonasProwler extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Discard a card: Oona's Prowler gets -2/-0 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-2,-0, Duration.EndOfTurn) , new DiscardCardCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostSourceEffect(-2,-0, Duration.EndOfTurn) , new DiscardCardCost()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OozeFlux.java b/Mage.Sets/src/mage/cards/o/OozeFlux.java index b5638031a8a..9786c974973 100644 --- a/Mage.Sets/src/mage/cards/o/OozeFlux.java +++ b/Mage.Sets/src/mage/cards/o/OozeFlux.java @@ -30,7 +30,7 @@ public final class OozeFlux extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); // {1}{G}, Remove one or more +1/+1 counters from among creatures you control: Create an X/X green Ooze creature token, where X is the number of +1/+1 counters removed this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OozeFluxCreateTokenEffect(new OozeToken()),new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new OozeFluxCreateTokenEffect(new OozeToken()),new ManaCostsImpl<>("{1}{G}")); ability.addCost(new RemoveVariableCountersTargetCost(StaticFilters.FILTER_CONTROLLED_CREATURES, CounterType.P1P1, "one or more", 1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OpalAcrolith.java b/Mage.Sets/src/mage/cards/o/OpalAcrolith.java index 7bc343c247a..3faf035927a 100644 --- a/Mage.Sets/src/mage/cards/o/OpalAcrolith.java +++ b/Mage.Sets/src/mage/cards/o/OpalAcrolith.java @@ -42,7 +42,7 @@ public final class OpalAcrolith extends CardImpl { "Whenever an opponent casts a creature spell, if Opal Acrolith is an enchantment, Opal Acrolith becomes a 2/4 Soldier creature.")); // {0}: Opal Acrolith becomes an enchantment. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesEnchantmentSourceEffect(), new ManaCostsImpl<>("{0}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesEnchantmentSourceEffect(), new ManaCostsImpl<>("{0}"))); } diff --git a/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java b/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java index 296c5d7342f..5877e50a482 100644 --- a/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java +++ b/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java @@ -43,10 +43,10 @@ public final class OpalEyeKondasYojimbo extends CardImpl { this.addAbility(new BushidoAbility(1)); // {T}: The next time a source of your choice would deal damage this turn, that damage is dealt to Opal-Eye, Konda's Yojimbo instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new OpalEyeKondasYojimboRedirectionEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new OpalEyeKondasYojimboRedirectionEffect(), new TapSourceCost())); // {1}{W}: Prevent the next 1 damage that would be dealt to Opal-Eye this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/o/Opportunist.java b/Mage.Sets/src/mage/cards/o/Opportunist.java index bb5d87edcd4..91e118c0703 100644 --- a/Mage.Sets/src/mage/cards/o/Opportunist.java +++ b/Mage.Sets/src/mage/cards/o/Opportunist.java @@ -37,7 +37,7 @@ public final class Opportunist extends CardImpl { this.toughness = new MageInt(2); // {T}: Opportunist deals 1 damage to target creature that was dealt damage this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/Opposition.java b/Mage.Sets/src/mage/cards/o/Opposition.java index 304cda8f240..dee70abeef5 100644 --- a/Mage.Sets/src/mage/cards/o/Opposition.java +++ b/Mage.Sets/src/mage/cards/o/Opposition.java @@ -44,7 +44,7 @@ public final class Opposition extends CardImpl { this.color.setBlue(true); // Tap an untapped creature you control: Tap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(untappedcreatureyoucontrol))); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(untappedcreatureyoucontrol))); ability.addTarget(new TargetPermanent(artifactcreatureorland)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OracleOfDust.java b/Mage.Sets/src/mage/cards/o/OracleOfDust.java index 2f8a6049dc0..da54ee343d7 100644 --- a/Mage.Sets/src/mage/cards/o/OracleOfDust.java +++ b/Mage.Sets/src/mage/cards/o/OracleOfDust.java @@ -31,7 +31,7 @@ public final class OracleOfDust extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // {2}, Put a card an opponent owns from exile into that player's graveyard: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{2}")); ability.addCost(new ExileOpponentsCardFromExileToGraveyardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OracleOfNectars.java b/Mage.Sets/src/mage/cards/o/OracleOfNectars.java index 97dba68e3db..b27ab62e4b8 100644 --- a/Mage.Sets/src/mage/cards/o/OracleOfNectars.java +++ b/Mage.Sets/src/mage/cards/o/OracleOfNectars.java @@ -30,7 +30,7 @@ public final class OracleOfNectars extends CardImpl { this.toughness = new MageInt(2); // {X}, {tap}: You gain X life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(GetXValue.instance), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(GetXValue.instance), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OraclesAttendants.java b/Mage.Sets/src/mage/cards/o/OraclesAttendants.java index 1e190ad2016..914464b732b 100644 --- a/Mage.Sets/src/mage/cards/o/OraclesAttendants.java +++ b/Mage.Sets/src/mage/cards/o/OraclesAttendants.java @@ -37,7 +37,7 @@ public final class OraclesAttendants extends CardImpl { this.toughness = new MageInt(5); // {tap}: All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OraclesAttendantsReplacementEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new OraclesAttendantsReplacementEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OraclesInsight.java b/Mage.Sets/src/mage/cards/o/OraclesInsight.java index acd12b07cd1..72da9fe12c5 100644 --- a/Mage.Sets/src/mage/cards/o/OraclesInsight.java +++ b/Mage.Sets/src/mage/cards/o/OraclesInsight.java @@ -40,7 +40,7 @@ public final class OraclesInsight extends CardImpl { this.addAbility(ability); // Enchanted creature has "{T}: Scry 1, then draw a card." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new TapSourceCost()); + ability = new SimpleActivatedAbility(new ScryEffect(1, false), new TapSourceCost()); Effect effect = new DrawCardSourceControllerEffect(1).concatBy(", then"); ability.addEffect(effect); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/o/OraclesVault.java b/Mage.Sets/src/mage/cards/o/OraclesVault.java index 76e60083014..94b7f095643 100644 --- a/Mage.Sets/src/mage/cards/o/OraclesVault.java +++ b/Mage.Sets/src/mage/cards/o/OraclesVault.java @@ -29,7 +29,7 @@ public final class OraclesVault extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Exile the top card of your library. Until end of turn, you may play that card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTopXMayPlayUntilEffect(1, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new ExileTopXMayPlayUntilEffect(1, Duration.EndOfTurn) .withTextOptions("that card", false), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/o/OranRiefInvoker.java b/Mage.Sets/src/mage/cards/o/OranRiefInvoker.java index 3d4fb0b6369..f4b6393f069 100644 --- a/Mage.Sets/src/mage/cards/o/OranRiefInvoker.java +++ b/Mage.Sets/src/mage/cards/o/OranRiefInvoker.java @@ -33,7 +33,7 @@ public final class OranRiefInvoker extends CardImpl { // {8}: Oran-Rief Invoker gets +5/+5 and gains trample until end of turn. Effect effect = new BoostSourceEffect(5, 5, Duration.EndOfTurn); effect.setText("{this} gets +5/+5"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(8)); effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OranRiefTheVastwood.java b/Mage.Sets/src/mage/cards/o/OranRiefTheVastwood.java index 1ada582fb33..b86bbdcebf4 100644 --- a/Mage.Sets/src/mage/cards/o/OranRiefTheVastwood.java +++ b/Mage.Sets/src/mage/cards/o/OranRiefTheVastwood.java @@ -31,7 +31,7 @@ public final class OranRiefTheVastwood extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new GreenManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new OranRiefTheVastwoodEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new OranRiefTheVastwoodEffect(), new TapSourceCost())); } private OranRiefTheVastwood(final OranRiefTheVastwood card) { diff --git a/Mage.Sets/src/mage/cards/o/OrcGeneral.java b/Mage.Sets/src/mage/cards/o/OrcGeneral.java index 161278b49cb..bc76f6b55a4 100644 --- a/Mage.Sets/src/mage/cards/o/OrcGeneral.java +++ b/Mage.Sets/src/mage/cards/o/OrcGeneral.java @@ -43,7 +43,7 @@ public final class OrcGeneral extends CardImpl { this.toughness = new MageInt(2); // {tap}, Sacrifice another Orc or Goblin: Other Orc creatures get +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filterOrc, true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1, 1, Duration.EndOfTurn, filterOrc, true), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filterOrcOrGoblin)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishArtillery.java b/Mage.Sets/src/mage/cards/o/OrcishArtillery.java index 950b948a4a5..c4589153f12 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishArtillery.java +++ b/Mage.Sets/src/mage/cards/o/OrcishArtillery.java @@ -30,7 +30,7 @@ public final class OrcishArtillery extends CardImpl { this.toughness = new MageInt(3); // {tap}: Orcish Artillery deals 2 damage to any target and 3 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DamageControllerEffect(3).setText("and 3 damage to you")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java b/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java index 48c62fcd9b0..bbf7ffe6b71 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java +++ b/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java @@ -31,7 +31,7 @@ public final class OrcishBloodpainter extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a creature: Orcish Bloodpainter 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.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java b/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java index eb7fb71e293..bf873ae3736 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java +++ b/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java @@ -31,7 +31,7 @@ public final class OrcishCannoneers extends CardImpl { this.toughness = new MageInt(3); // {tap}: Orcish Cannoneers deals 2 damage to any target and 3 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new DamageControllerEffect(3); effect.setText("and 3 damage to you"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OrcishCaptain.java b/Mage.Sets/src/mage/cards/o/OrcishCaptain.java index 87ee6da92e2..7babdaf7515 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishCaptain.java +++ b/Mage.Sets/src/mage/cards/o/OrcishCaptain.java @@ -37,7 +37,7 @@ public final class OrcishCaptain extends CardImpl { this.toughness = new MageInt(1); // {1}: Flip a coin. If you win the flip, target Orc creature gets +2/+0 until end of turn. If you lose the flip, it gets -0/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrcishCaptainEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new OrcishCaptainEffect(), new GenericManaCost(1)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishHealer.java b/Mage.Sets/src/mage/cards/o/OrcishHealer.java index 4baf9349f3e..f3628345b66 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishHealer.java +++ b/Mage.Sets/src/mage/cards/o/OrcishHealer.java @@ -43,19 +43,19 @@ public final class OrcishHealer extends CardImpl { this.toughness = new MageInt(1); // {R}{R}, {tap}: Target creature can't be regenerated this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}{B}{R}, {tap}: Regenerate target black or green creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{B}{B}{R}")); + ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{B}{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {R}{G}{G}, {tap}: Regenerate target black or green creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{R}{G}{G}")); + ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{R}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java b/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java index dfd86db5495..96f905275b0 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java +++ b/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java @@ -36,7 +36,7 @@ public final class OrcishLibrarian extends CardImpl { this.toughness = new MageInt(1); // {R}, {tap}: Look at the top eight cards of your library. Exile four of them at random, then put the rest on top of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrcishLibrarianEffect(), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new OrcishLibrarianEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishMechanics.java b/Mage.Sets/src/mage/cards/o/OrcishMechanics.java index d4e2a3609fd..0993770a7eb 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishMechanics.java +++ b/Mage.Sets/src/mage/cards/o/OrcishMechanics.java @@ -31,7 +31,7 @@ public final class OrcishMechanics extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice an artifact: Orcish Mechanics deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrcishSettlers.java b/Mage.Sets/src/mage/cards/o/OrcishSettlers.java index 0b868203a44..2d33e36f563 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishSettlers.java +++ b/Mage.Sets/src/mage/cards/o/OrcishSettlers.java @@ -38,7 +38,7 @@ public final class OrcishSettlers extends CardImpl { this.toughness = new MageInt(1); // {X}{X}{R}, {tap}, Sacrifice Orcish Settlers: Destroy X target lands. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrcishSettlersEffect(), new ManaCostsImpl<>("{X}{X}{R}")); + Ability ability = new SimpleActivatedAbility(new OrcishSettlersEffect(), new ManaCostsImpl<>("{X}{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrcishSpy.java b/Mage.Sets/src/mage/cards/o/OrcishSpy.java index 153a93c92fe..f31d0e7cac1 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishSpy.java +++ b/Mage.Sets/src/mage/cards/o/OrcishSpy.java @@ -28,7 +28,7 @@ public final class OrcishSpy extends CardImpl { this.toughness = new MageInt(1); // {T}: Look at the top three cards of target player's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LookLibraryTopCardTargetPlayerEffect(3), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishVandal.java b/Mage.Sets/src/mage/cards/o/OrcishVandal.java index a7df87c18c3..fc15ac9d0fc 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishVandal.java +++ b/Mage.Sets/src/mage/cards/o/OrcishVandal.java @@ -37,7 +37,7 @@ public final class OrcishVandal extends CardImpl { this.toughness = new MageInt(1); // {t}, Sacrifice an artifact: Orcish Vandal deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java index f9f2397b8fe..0df06ccee6f 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java +++ b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java @@ -44,7 +44,7 @@ public final class OrcishVeteran extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // {R}: Orcish Veteran gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private OrcishVeteran(final OrcishVeteran card) { diff --git a/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java b/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java index bacd30fd543..9b5cb4eed67 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java @@ -35,10 +35,10 @@ public final class OrderOfLeitbur extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}: Order of Leitbur gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {W}{W}: Order of Leitbur gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private OrderOfLeitbur(final OrderOfLeitbur card) { diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java b/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java index c86d891b3e3..1e2ea06c217 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java @@ -34,10 +34,10 @@ public final class OrderOfTheEbonHand extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // {B}: Order of the Ebon Hand gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); } private OrderOfTheEbonHand(final OrderOfTheEbonHand card) { diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java b/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java index 180c9c81074..feedb7fb3bd 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java @@ -34,10 +34,10 @@ public final class OrderOfTheWhiteShield extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}: Order of the White Shield gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {W}{W}: Order of the White Shield gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private OrderOfTheWhiteShield(final OrderOfTheWhiteShield card) { diff --git a/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java b/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java index 260732aca82..831a18286d7 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java @@ -41,7 +41,7 @@ public final class OrderOfWhiteclay extends CardImpl { this.toughness = new MageInt(4); // {1}{W}{W}, {untap}: Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{1}{W}{W}")); ability.addCost(new UntapSourceCost()); Target target = new TargetCardInYourGraveyard(filter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/o/OrdruunCommando.java b/Mage.Sets/src/mage/cards/o/OrdruunCommando.java index dfae5051ef3..bf391227ff5 100644 --- a/Mage.Sets/src/mage/cards/o/OrdruunCommando.java +++ b/Mage.Sets/src/mage/cards/o/OrdruunCommando.java @@ -27,7 +27,7 @@ public final class OrdruunCommando extends CardImpl { this.toughness = new MageInt(1); // {W}: Prevent the next 1 damage that would be dealt to Ordruun Commando this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}"))); } private OrdruunCommando(final OrdruunCommando card) { diff --git a/Mage.Sets/src/mage/cards/o/OrganGrinder.java b/Mage.Sets/src/mage/cards/o/OrganGrinder.java index ca5bde46e78..d9094ad99ff 100644 --- a/Mage.Sets/src/mage/cards/o/OrganGrinder.java +++ b/Mage.Sets/src/mage/cards/o/OrganGrinder.java @@ -30,7 +30,7 @@ public final class OrganGrinder extends CardImpl { this.toughness = new MageInt(1); // {tap}, Exile three cards from your graveyard: Target player loses 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(3), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(3, 3, new FilterCard("cards from your graveyard")))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java b/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java index 028f900a5f5..c5b0ca2a28f 100644 --- a/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java +++ b/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java @@ -27,7 +27,7 @@ public final class OriginSpellbomb extends CardImpl { public OriginSpellbomb (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MyrToken(), 1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new MyrToken(), 1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java index d43f335963a..ea0cdc55f37 100644 --- a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java +++ b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java @@ -30,7 +30,7 @@ public final class OrimSamiteHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {tap}: Prevent the next 3 damage that would be dealt to any target this turn. diff --git a/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java b/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java index 5afb8234567..d6b940473ab 100644 --- a/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java +++ b/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java @@ -39,7 +39,7 @@ public final class OrissSamiteGuardian extends CardImpl { this.toughness = new MageInt(3); // {T}: 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 TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java b/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java index 28522d235f1..8bd550bfa3a 100644 --- a/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java +++ b/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java @@ -36,7 +36,7 @@ public final class OrnateKanzashi extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {2}, {T}: Target opponent exiles the top card of their library. You may play that card this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrnateKanzashiEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new OrnateKanzashiEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java index 321294c322a..138a47deb8d 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java @@ -45,7 +45,7 @@ public final class OrochiEggwatcher extends CardImpl { // {2}{G}, {T}: Create a 1/1 green Snake creature token. If you control ten or more creatures, flip Orochi Eggwatcher. Ability ability; - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SnakeToken()), new ManaCostsImpl<>("{2}{G}")); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new SnakeToken()), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new FlipSourceEffect(new ShidakoBroodmistress()), new PermanentsOnTheBattlefieldCondition(new FilterControlledCreaturePermanent(), ComparisonType.MORE_THAN, 9), "If you control ten or more creatures, flip {this}")); diff --git a/Mage.Sets/src/mage/cards/o/OrochiHatchery.java b/Mage.Sets/src/mage/cards/o/OrochiHatchery.java index 48b6f97e8db..d469dd43519 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiHatchery.java +++ b/Mage.Sets/src/mage/cards/o/OrochiHatchery.java @@ -29,7 +29,7 @@ public final class OrochiHatchery extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.CHARGE.createInstance()))); // {5}, {T}: Create a 1/1 green Snake creature token for each charge counter on Orochi Hatchery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SnakeToken(), new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SnakeToken(), new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrtolanKeyboardist.java b/Mage.Sets/src/mage/cards/o/OrtolanKeyboardist.java index c41f4dfdfcb..1bb91e7bb49 100644 --- a/Mage.Sets/src/mage/cards/o/OrtolanKeyboardist.java +++ b/Mage.Sets/src/mage/cards/o/OrtolanKeyboardist.java @@ -25,7 +25,7 @@ public final class OrtolanKeyboardist extends CardImpl { this.toughness = new MageInt(1); // {T}: Draw a card then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java b/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java index 765c2ee4b42..449bde28687 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java @@ -32,7 +32,7 @@ public final class OrzhovCluestone extends CardImpl { this.addAbility(new BlackManaAbility()); // {W}{B}, {T}, Sacrifice Orzhov Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java b/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java index e3a1f299c00..b84290d5f7f 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java @@ -29,12 +29,12 @@ public final class OrzhovGuildmage extends CardImpl { this.toughness = new MageInt(2); // {2}{W}: Target player gains 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(1), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeTargetEffect(1), new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetPlayer(1)); this.addAbility(ability); // {2}{B}: Each player loses 1 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(1), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new LoseLifeAllPlayersEffect(1), new ManaCostsImpl<>("{2}{B}"))); } private OrzhovGuildmage(final OrzhovGuildmage card) { diff --git a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java index 66fd4b70f5a..42167876032 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java @@ -30,7 +30,7 @@ public final class OrzhovKeyrune extends CardImpl { this.addAbility(new BlackManaAbility()); // {W}{B}: Orzhov Keyrune becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new OrzhovKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new OrzhovKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{B}"))); } private OrzhovKeyrune(final OrzhovKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/o/OrzhovLocket.java b/Mage.Sets/src/mage/cards/o/OrzhovLocket.java index 3ed59825bd8..d18de245a13 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovLocket.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovLocket.java @@ -28,7 +28,7 @@ public final class OrzhovLocket extends CardImpl { this.addAbility(new BlackManaAbility()); // {W/B}{W/B}{W/B}{W/B}, {T}, Sacrifice Orzhov Locket: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{W/B}{W/B}{W/B}{W/B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{W/B}{W/B}{W/B}{W/B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java b/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java index 6095b5e0ab2..e09e0806387 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java @@ -24,7 +24,7 @@ public final class OrzhovaTheChurchOfDeals extends CardImpl { public OrzhovaTheChurchOfDeals(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{3}{W}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{3}{W}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new GainLifeEffect(1).concatBy("and")); ability.addTarget(new TargetPlayer(1)); diff --git a/Mage.Sets/src/mage/cards/o/OsaiVultures.java b/Mage.Sets/src/mage/cards/o/OsaiVultures.java index 77e9ea8fc17..878f35c85c8 100644 --- a/Mage.Sets/src/mage/cards/o/OsaiVultures.java +++ b/Mage.Sets/src/mage/cards/o/OsaiVultures.java @@ -40,7 +40,7 @@ public final class OsaiVultures extends CardImpl { TargetController.ANY, new AddCountersSourceEffect(CounterType.CARRION.createInstance()), false), MorbidCondition.instance, "At the beginning of each end step, if a creature died this turn, put a carrion counter on {this}.").addHint(MorbidHint.instance)); // Remove two carrion counters from Osai Vultures: Osai Vultures gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CARRION.createInstance(2)))); } diff --git a/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java b/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java index 72bb088da9a..5f2208a423b 100644 --- a/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java +++ b/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java @@ -50,7 +50,7 @@ public final class OsgirTheReconstructor extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {1}, Sacrifice an artifact: Target creature you control gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OstiaryThrull.java b/Mage.Sets/src/mage/cards/o/OstiaryThrull.java index c84588ecd7c..13dad8d4194 100644 --- a/Mage.Sets/src/mage/cards/o/OstiaryThrull.java +++ b/Mage.Sets/src/mage/cards/o/OstiaryThrull.java @@ -28,7 +28,7 @@ public final class OstiaryThrull extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java index 60c0b6d85fd..88824db9976 100644 --- a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java +++ b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java @@ -46,7 +46,7 @@ public final class OtepecHuntmaster extends CardImpl { this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // {T}: Target Dinosaur gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OtherworldAtlas.java b/Mage.Sets/src/mage/cards/o/OtherworldAtlas.java index a075814b57d..c86d8ffd06f 100644 --- a/Mage.Sets/src/mage/cards/o/OtherworldAtlas.java +++ b/Mage.Sets/src/mage/cards/o/OtherworldAtlas.java @@ -26,10 +26,10 @@ public final class OtherworldAtlas extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {tap}: Put a charge counter on Otherworld Atlas. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); // {tap}: Each player draws a card for each charge counter on Otherworld Atlas. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new OtherworldAtlasDrawEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new OtherworldAtlasDrawEffect(), new TapSourceCost())); } private OtherworldAtlas(final OtherworldAtlas card) { diff --git a/Mage.Sets/src/mage/cards/o/OupheVandals.java b/Mage.Sets/src/mage/cards/o/OupheVandals.java index 7623e2f3897..93e942a5cb6 100644 --- a/Mage.Sets/src/mage/cards/o/OupheVandals.java +++ b/Mage.Sets/src/mage/cards/o/OupheVandals.java @@ -42,7 +42,7 @@ public final class OupheVandals extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice Ouphe Vandals: Counter target activated ability from an artifact source and destroy that artifact if it's on the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OupheVandalsEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new OupheVandalsEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetActivatedAbility(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OutlawHolocron.java b/Mage.Sets/src/mage/cards/o/OutlawHolocron.java index c6effb4ae00..fffa36864ab 100644 --- a/Mage.Sets/src/mage/cards/o/OutlawHolocron.java +++ b/Mage.Sets/src/mage/cards/o/OutlawHolocron.java @@ -29,7 +29,7 @@ public final class OutlawHolocron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {T}: Put a charge counter on Outlaw Holocron. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); // {T}, Remove a charge counter from Outlaw Holocron: Add {B}, {R} or {G}. Cost cost = new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)); diff --git a/Mage.Sets/src/mage/cards/o/OutriderEnKor.java b/Mage.Sets/src/mage/cards/o/OutriderEnKor.java index c066614c484..0e5103a11ae 100644 --- a/Mage.Sets/src/mage/cards/o/OutriderEnKor.java +++ b/Mage.Sets/src/mage/cards/o/OutriderEnKor.java @@ -35,7 +35,7 @@ public final class OutriderEnKor extends CardImpl { this.addAbility(new FlankingAbility()); // {0}: The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OvergrownEstate.java b/Mage.Sets/src/mage/cards/o/OvergrownEstate.java index eb0e5011710..c4a4e4007d2 100644 --- a/Mage.Sets/src/mage/cards/o/OvergrownEstate.java +++ b/Mage.Sets/src/mage/cards/o/OvergrownEstate.java @@ -24,7 +24,7 @@ public final class OvergrownEstate extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}{B}{G}"); // Sacrifice a land: You gain 3 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(3), new SacrificeTargetCost(filter))); } private OvergrownEstate(final OvergrownEstate card) { diff --git a/Mage.Sets/src/mage/cards/o/Overtaker.java b/Mage.Sets/src/mage/cards/o/Overtaker.java index c710da37192..a1981c055e5 100644 --- a/Mage.Sets/src/mage/cards/o/Overtaker.java +++ b/Mage.Sets/src/mage/cards/o/Overtaker.java @@ -35,7 +35,7 @@ public final class Overtaker extends CardImpl { this.toughness = new MageInt(1); // {3}{U}, {tap}, Discard a card: Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/o/Ovinomancer.java b/Mage.Sets/src/mage/cards/o/Ovinomancer.java index 35353c2f853..1964a508e02 100644 --- a/Mage.Sets/src/mage/cards/o/Ovinomancer.java +++ b/Mage.Sets/src/mage/cards/o/Ovinomancer.java @@ -49,7 +49,7 @@ public final class Ovinomancer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(3, 3, filter, true))))); // {T}, Return Ovinomancer to its owner's hand: Destroy target creature. It can't be regenerated. That creature's controller creates a 0/1 green Sheep creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new TapSourceCost()); ability.addEffect(new OvinomancerEffect()); ability.addCost(new ReturnToHandFromBattlefieldSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java b/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java index 58cbfbbb7af..4f673a4c3ac 100644 --- a/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java +++ b/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java @@ -33,11 +33,11 @@ public final class OviyaPashiriSageLifecrafter extends CardImpl { this.toughness = new MageInt(2); // {2}{G}, {T}: Create a 1/1 colorless Servo artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ServoToken(), 1), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ServoToken(), 1), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}{G}, {T}: Create an X/X colorless Construct artifact creature token, where X is the number of creatures you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OviyaPashiriSageLifecrafterEffect(), new ManaCostsImpl<>("{4}{G}")); + ability = new SimpleActivatedAbility(new OviyaPashiriSageLifecrafterEffect(), new ManaCostsImpl<>("{4}{G}")); ability.addCost(new TapSourceCost()); ability.addHint(CreaturesYouControlHint.instance); this.addAbility(ability); -- 2.47.2 From a2323481c6ba1789f1d65d588d60f4342b08de2e Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:29:29 -0500 Subject: [PATCH 40/50] refactor: SimpleActivatedAbility default zone (cards P) --- Mage.Sets/src/mage/cards/p/PacificationArray.java | 2 +- Mage.Sets/src/mage/cards/p/PackRat.java | 2 +- Mage.Sets/src/mage/cards/p/PainKami.java | 2 +- Mage.Sets/src/mage/cards/p/PaleWayfarer.java | 2 +- Mage.Sets/src/mage/cards/p/Palinchron.java | 2 +- Mage.Sets/src/mage/cards/p/PanicSpellbomb.java | 2 +- Mage.Sets/src/mage/cards/p/PanopticMirror.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java | 2 +- Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java | 2 +- Mage.Sets/src/mage/cards/p/ParallaxTide.java | 2 +- Mage.Sets/src/mage/cards/p/ParallaxWave.java | 2 +- Mage.Sets/src/mage/cards/p/ParapetWatchers.java | 2 +- Mage.Sets/src/mage/cards/p/PardicCollaborator.java | 2 +- Mage.Sets/src/mage/cards/p/PardicDragon.java | 2 +- Mage.Sets/src/mage/cards/p/PardicLancer.java | 4 ++-- Mage.Sets/src/mage/cards/p/PardicMiner.java | 2 +- Mage.Sets/src/mage/cards/p/PardicSwordsmith.java | 2 +- Mage.Sets/src/mage/cards/p/PatagiaGolem.java | 2 +- Mage.Sets/src/mage/cards/p/PatchworkGnomes.java | 2 +- Mage.Sets/src/mage/cards/p/PathmakerInitiate.java | 2 +- Mage.Sets/src/mage/cards/p/PathwayArrows.java | 2 +- Mage.Sets/src/mage/cards/p/PatrolHound.java | 2 +- Mage.Sets/src/mage/cards/p/PatrolSignaler.java | 2 +- Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java | 2 +- Mage.Sets/src/mage/cards/p/PatronWizard.java | 2 +- Mage.Sets/src/mage/cards/p/PavelMaliki.java | 2 +- Mage.Sets/src/mage/cards/p/PeaceOfMind.java | 2 +- Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java | 2 +- Mage.Sets/src/mage/cards/p/PearlDragon.java | 2 +- Mage.Sets/src/mage/cards/p/PearlLakeAncient.java | 2 +- Mage.Sets/src/mage/cards/p/PearlspearCourier.java | 2 +- Mage.Sets/src/mage/cards/p/PeemaAetherSeer.java | 2 +- Mage.Sets/src/mage/cards/p/PegasusRefuge.java | 2 +- Mage.Sets/src/mage/cards/p/PemminsAura.java | 8 ++++---- Mage.Sets/src/mage/cards/p/Penance.java | 2 +- Mage.Sets/src/mage/cards/p/Pendelhaven.java | 2 +- Mage.Sets/src/mage/cards/p/PendelhavenElder.java | 2 +- Mage.Sets/src/mage/cards/p/PendulumOfPatterns.java | 2 +- Mage.Sets/src/mage/cards/p/PentagramOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/p/PentarchPaladin.java | 2 +- Mage.Sets/src/mage/cards/p/Pentavus.java | 4 ++-- Mage.Sets/src/mage/cards/p/PerilousShadow.java | 2 +- Mage.Sets/src/mage/cards/p/PerniciousDeed.java | 2 +- Mage.Sets/src/mage/cards/p/PersonalIncarnation.java | 2 +- Mage.Sets/src/mage/cards/p/Pestilence.java | 2 +- Mage.Sets/src/mage/cards/p/PestilenceDemon.java | 2 +- Mage.Sets/src/mage/cards/p/PestilentKathari.java | 2 +- Mage.Sets/src/mage/cards/p/PetraSphinx.java | 2 +- Mage.Sets/src/mage/cards/p/Petradon.java | 2 +- Mage.Sets/src/mage/cards/p/PetrifiedField.java | 2 +- Mage.Sets/src/mage/cards/p/PewterGolem.java | 2 +- Mage.Sets/src/mage/cards/p/PhantasmalFiend.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhantasmalMount.java | 2 +- Mage.Sets/src/mage/cards/p/PhantomNantuko.java | 3 +-- Mage.Sets/src/mage/cards/p/Phelddagrif.java | 6 +++--- Mage.Sets/src/mage/cards/p/PhyrexianBroodlings.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianDebaser.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianDefiler.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianDenouncer.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhyrexianGhoul.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianGremlins.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianPortal.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianProwler.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianSplicer.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianTotem.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianVault.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexiasCore.java | 2 +- Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java | 2 +- Mage.Sets/src/mage/cards/p/PiaNalaar.java | 4 ++-- Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java | 2 +- Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java | 2 +- Mage.Sets/src/mage/cards/p/PiousEvangel.java | 2 +- Mage.Sets/src/mage/cards/p/PiousKitsune.java | 2 +- Mage.Sets/src/mage/cards/p/PirateShip.java | 2 +- Mage.Sets/src/mage/cards/p/PitTrap.java | 2 +- Mage.Sets/src/mage/cards/p/PixieQueen.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueBoiler.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueDogs.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueWitch.java | 2 +- Mage.Sets/src/mage/cards/p/Plaguebearer.java | 2 +- Mage.Sets/src/mage/cards/p/PlaguedRusalka.java | 2 +- Mage.Sets/src/mage/cards/p/PlaguemawBeast.java | 2 +- Mage.Sets/src/mage/cards/p/PlanarGuide.java | 2 +- Mage.Sets/src/mage/cards/p/PlanarPortal.java | 2 +- Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java | 2 +- Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java | 2 +- Mage.Sets/src/mage/cards/p/PlaxcasterFrogling.java | 2 +- Mage.Sets/src/mage/cards/p/PoolingVenom.java | 2 +- Mage.Sets/src/mage/cards/p/PoulticeSliver.java | 2 +- Mage.Sets/src/mage/cards/p/PowderKeg.java | 2 +- Mage.Sets/src/mage/cards/p/PowerArmor.java | 2 +- Mage.Sets/src/mage/cards/p/PowerConduit.java | 2 +- Mage.Sets/src/mage/cards/p/PowerMatrix.java | 2 +- Mage.Sets/src/mage/cards/p/PowerOfFire.java | 2 +- Mage.Sets/src/mage/cards/p/PradeshGypsies.java | 2 +- Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java | 2 +- Mage.Sets/src/mage/cards/p/Preacher.java | 2 +- Mage.Sets/src/mage/cards/p/PredatorFlagship.java | 4 ++-- Mage.Sets/src/mage/cards/p/PredatoryUrge.java | 2 +- Mage.Sets/src/mage/cards/p/PresenceOfGond.java | 2 +- Mage.Sets/src/mage/cards/p/PrestonTheVanisher.java | 2 +- Mage.Sets/src/mage/cards/p/PrideSovereign.java | 2 +- Mage.Sets/src/mage/cards/p/PriestOfIroas.java | 2 +- Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java | 2 +- Mage.Sets/src/mage/cards/p/PrimevalShambler.java | 2 +- Mage.Sets/src/mage/cards/p/PrismArray.java | 2 +- Mage.Sets/src/mage/cards/p/PrismaticCircle.java | 2 +- Mage.Sets/src/mage/cards/p/PrizedElephant.java | 2 +- Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java | 2 +- Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java | 2 +- Mage.Sets/src/mage/cards/p/ProfaneProcession.java | 2 +- Mage.Sets/src/mage/cards/p/ProgenitorsIcon.java | 2 +- Mage.Sets/src/mage/cards/p/PrognosticSphinx.java | 2 +- Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java | 2 +- Mage.Sets/src/mage/cards/p/PropheticRavings.java | 2 +- Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java | 2 +- Mage.Sets/src/mage/cards/p/ProtomatterPowder.java | 2 +- Mage.Sets/src/mage/cards/p/ProudMentor.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicEntity.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicGift.java | 2 +- Mage.Sets/src/mage/cards/p/Psychatog.java | 4 ++-- Mage.Sets/src/mage/cards/p/PsychicOverload.java | 2 +- Mage.Sets/src/mage/cards/p/PsychicTrance.java | 2 +- Mage.Sets/src/mage/cards/p/PteronGhost.java | 2 +- Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java | 2 +- Mage.Sets/src/mage/cards/p/PuppetConjurer.java | 2 +- Mage.Sets/src/mage/cards/p/PuppetStrings.java | 2 +- Mage.Sets/src/mage/cards/p/Puppeteer.java | 2 +- Mage.Sets/src/mage/cards/p/PuresightMerrow.java | 2 +- Mage.Sets/src/mage/cards/p/PursuitOfFlight.java | 2 +- Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java | 2 +- Mage.Sets/src/mage/cards/p/PusKami.java | 2 +- Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java | 2 +- Mage.Sets/src/mage/cards/p/PygmyTroll.java | 2 +- Mage.Sets/src/mage/cards/p/Pyramids.java | 2 +- Mage.Sets/src/mage/cards/p/PyreCharger.java | 2 +- Mage.Sets/src/mage/cards/p/PyreZombie.java | 2 +- Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java | 4 ++-- Mage.Sets/src/mage/cards/p/Pyrohemia.java | 2 +- Mage.Sets/src/mage/cards/p/Pyromancy.java | 2 +- Mage.Sets/src/mage/cards/p/Pyromania.java | 4 ++-- 151 files changed, 165 insertions(+), 166 deletions(-) diff --git a/Mage.Sets/src/mage/cards/p/PacificationArray.java b/Mage.Sets/src/mage/cards/p/PacificationArray.java index 2d4b09df955..2fd8fb90750 100644 --- a/Mage.Sets/src/mage/cards/p/PacificationArray.java +++ b/Mage.Sets/src/mage/cards/p/PacificationArray.java @@ -23,7 +23,7 @@ public final class PacificationArray extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {2}, {t}: Tap target artifact or creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PackRat.java b/Mage.Sets/src/mage/cards/p/PackRat.java index 5bcedecf411..1efa21d5162 100644 --- a/Mage.Sets/src/mage/cards/p/PackRat.java +++ b/Mage.Sets/src/mage/cards/p/PackRat.java @@ -55,7 +55,7 @@ public final class PackRat extends CardImpl { // Pack Rat's power and toughness are each equal to the number of Rats you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter)))); // {2}{B}, Discard a card: Create a token that's a copy of Pack Rat. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenCopySourceEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenCopySourceEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PainKami.java b/Mage.Sets/src/mage/cards/p/PainKami.java index 329e693c226..ac816134f25 100644 --- a/Mage.Sets/src/mage/cards/p/PainKami.java +++ b/Mage.Sets/src/mage/cards/p/PainKami.java @@ -28,7 +28,7 @@ public final class PainKami extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PaleWayfarer.java b/Mage.Sets/src/mage/cards/p/PaleWayfarer.java index 152469c62e0..a239bbc2369 100644 --- a/Mage.Sets/src/mage/cards/p/PaleWayfarer.java +++ b/Mage.Sets/src/mage/cards/p/PaleWayfarer.java @@ -45,7 +45,7 @@ public final class PaleWayfarer extends CardImpl { this.toughness = new MageInt(4); // {2}{W}{W}, {untap}: Target creature gains protection from the color of its controller's choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PaleWayfarerEffect(), new ManaCostsImpl<>("{2}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new PaleWayfarerEffect(), new ManaCostsImpl<>("{2}{W}{W}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Palinchron.java b/Mage.Sets/src/mage/cards/p/Palinchron.java index 31b64ed16f0..bf748a05aef 100644 --- a/Mage.Sets/src/mage/cards/p/Palinchron.java +++ b/Mage.Sets/src/mage/cards/p/Palinchron.java @@ -33,7 +33,7 @@ public final class Palinchron extends CardImpl { // When Palinchron enters the battlefield, untap up to seven lands. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapLandsEffect(7))); // {2}{U}{U}: Return Palinchron to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}{U}"))); } private Palinchron(final Palinchron card) { diff --git a/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java b/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java index 64c80b2f99b..ba9481ce46d 100644 --- a/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java +++ b/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java @@ -27,7 +27,7 @@ public final class PanicSpellbomb extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Tap, Sacrifice Panic Spellbomb: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PanopticMirror.java b/Mage.Sets/src/mage/cards/p/PanopticMirror.java index 4ffe5ef062e..90aba31ddf8 100644 --- a/Mage.Sets/src/mage/cards/p/PanopticMirror.java +++ b/Mage.Sets/src/mage/cards/p/PanopticMirror.java @@ -31,7 +31,7 @@ public final class PanopticMirror extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // Imprint - {X}, {tap}: You may exile an instant or sorcery card with converted mana cost X from your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PanopticMirrorExileEffect(), new VariableManaCost(VariableCostType.NORMAL)); + Ability ability = new SimpleActivatedAbility(new PanopticMirrorExileEffect(), new VariableManaCost(VariableCostType.NORMAL)); ability.addCost(new TapSourceCost()); this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); // At the beginning of your upkeep, you may copy a card exiled with Panoptic Mirror. If you do, you may cast the copy without paying its mana cost. diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java index ad94079ac81..f7f6694dad8 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java @@ -52,7 +52,7 @@ public final class ParagonOfEternalWilds extends CardImpl { // Other green creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // {G}, {t}: Another target green creature you control gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterGreen2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java index 51746395bc3..cae821f9fbc 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java @@ -51,7 +51,7 @@ public final class ParagonOfFierceDefiance extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {R}, {T}: Another target red creature you control gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java index c1152c91359..24f337a3faa 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java @@ -53,7 +53,7 @@ public final class ParagonOfGatheringMists extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); // {U}, {T}: Another target blue creature you control gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterBlue2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java index 95dc97cb3c7..388b30f9e13 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java @@ -52,7 +52,7 @@ public final class ParagonOfNewDawns extends CardImpl { // Other white creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter, true))); // {W}, {T}: Another target white creature you control gains vigilance until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java index 76607767b8b..6be69435b21 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java @@ -51,7 +51,7 @@ public final class ParagonOfOpenGraves extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {2}{B}, {T}: Another target black creature you control gains deathtouch until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxTide.java b/Mage.Sets/src/mage/cards/p/ParallaxTide.java index 9e2a74b8f1a..db761c9eb4e 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxTide.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxTide.java @@ -28,7 +28,7 @@ public final class ParallaxTide extends CardImpl { this.addAbility(new FadingAbility(5, this)); // Remove a fade counter from Parallax Tide: Exile target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); + Ability ability = new SimpleActivatedAbility(new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxWave.java b/Mage.Sets/src/mage/cards/p/ParallaxWave.java index 98799688b86..ce7b7f400b5 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxWave.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxWave.java @@ -30,7 +30,7 @@ public final class ParallaxWave extends CardImpl { this.addAbility(new FadingAbility(5, this)); // Remove a fade counter from Parallax Wave: Exile target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); + Ability ability = new SimpleActivatedAbility(new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParapetWatchers.java b/Mage.Sets/src/mage/cards/p/ParapetWatchers.java index 4e2550471d6..2b151099d73 100644 --- a/Mage.Sets/src/mage/cards/p/ParapetWatchers.java +++ b/Mage.Sets/src/mage/cards/p/ParapetWatchers.java @@ -27,7 +27,7 @@ public final class ParapetWatchers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W/U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W/U}"))); } private ParapetWatchers(final ParapetWatchers card) { diff --git a/Mage.Sets/src/mage/cards/p/PardicCollaborator.java b/Mage.Sets/src/mage/cards/p/PardicCollaborator.java index e46013ddd76..af827588505 100644 --- a/Mage.Sets/src/mage/cards/p/PardicCollaborator.java +++ b/Mage.Sets/src/mage/cards/p/PardicCollaborator.java @@ -30,7 +30,7 @@ public final class PardicCollaborator extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {B}: Pardic Collaborator gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private PardicCollaborator(final PardicCollaborator card) { diff --git a/Mage.Sets/src/mage/cards/p/PardicDragon.java b/Mage.Sets/src/mage/cards/p/PardicDragon.java index c30cb93e0d3..111136610b6 100644 --- a/Mage.Sets/src/mage/cards/p/PardicDragon.java +++ b/Mage.Sets/src/mage/cards/p/PardicDragon.java @@ -39,7 +39,7 @@ public final class PardicDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Pardic 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))); // Suspend 2-{R}{R} this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{R}{R}"), this, true)); diff --git a/Mage.Sets/src/mage/cards/p/PardicLancer.java b/Mage.Sets/src/mage/cards/p/PardicLancer.java index b7c14920d0a..77b27bb3965 100644 --- a/Mage.Sets/src/mage/cards/p/PardicLancer.java +++ b/Mage.Sets/src/mage/cards/p/PardicLancer.java @@ -33,7 +33,7 @@ public final class PardicLancer extends CardImpl { // Discard a card at random: Pardic Lancer gets +1/+0 and gains first strike 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 DiscardCardCost(true)); + Ability ability = new SimpleActivatedAbility(effect, new DiscardCardCost(true)); effect = new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains first strike until end of turn"); ability.addEffect(effect); @@ -48,4 +48,4 @@ public final class PardicLancer extends CardImpl { public PardicLancer copy() { return new PardicLancer(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/p/PardicMiner.java b/Mage.Sets/src/mage/cards/p/PardicMiner.java index f61f5a0fb8f..261e21fde85 100644 --- a/Mage.Sets/src/mage/cards/p/PardicMiner.java +++ b/Mage.Sets/src/mage/cards/p/PardicMiner.java @@ -29,7 +29,7 @@ public final class PardicMiner extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Pardic Miner: Target player can't play lands this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PardicMinerEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new PardicMinerEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java b/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java index 3c2b8b72e63..3c501e414c7 100644 --- a/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java +++ b/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java @@ -29,7 +29,7 @@ public final class PardicSwordsmith extends CardImpl { this.toughness = new MageInt(1); // {R}, Discard a card at random: Pardic Swordsmith gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PatagiaGolem.java b/Mage.Sets/src/mage/cards/p/PatagiaGolem.java index e1163f91cba..004150b9cde 100644 --- a/Mage.Sets/src/mage/cards/p/PatagiaGolem.java +++ b/Mage.Sets/src/mage/cards/p/PatagiaGolem.java @@ -29,7 +29,7 @@ public final class PatagiaGolem extends CardImpl { this.toughness = new MageInt(3); // {3}: Patagia Golem gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PatchworkGnomes.java b/Mage.Sets/src/mage/cards/p/PatchworkGnomes.java index 8a974bc4362..4055e8a341f 100644 --- a/Mage.Sets/src/mage/cards/p/PatchworkGnomes.java +++ b/Mage.Sets/src/mage/cards/p/PatchworkGnomes.java @@ -28,7 +28,7 @@ public final class PatchworkGnomes extends CardImpl { this.toughness = new MageInt(1); // Discard a card: Regenerate Patchwork Gnomes. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardTargetCost(new TargetCardInHand(new FilterCard("a card"))))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new DiscardTargetCost(new TargetCardInHand(new FilterCard("a card"))))); } private PatchworkGnomes(final PatchworkGnomes card) { diff --git a/Mage.Sets/src/mage/cards/p/PathmakerInitiate.java b/Mage.Sets/src/mage/cards/p/PathmakerInitiate.java index 212d9282af6..83df1f90516 100644 --- a/Mage.Sets/src/mage/cards/p/PathmakerInitiate.java +++ b/Mage.Sets/src/mage/cards/p/PathmakerInitiate.java @@ -39,7 +39,7 @@ public final class PathmakerInitiate extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PathwayArrows.java b/Mage.Sets/src/mage/cards/p/PathwayArrows.java index fd7ad2eebe1..b644a2ff807 100644 --- a/Mage.Sets/src/mage/cards/p/PathwayArrows.java +++ b/Mage.Sets/src/mage/cards/p/PathwayArrows.java @@ -33,7 +33,7 @@ public final class PathwayArrows extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{2}, {T}: This creature deals 1 damage to target creature. If a colorless creature is dealt damage this way, tap it." - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PathwayArrowsEffect(), new GenericManaCost(2)); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(new PathwayArrowsEffect(), new GenericManaCost(2)); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/p/PatrolHound.java b/Mage.Sets/src/mage/cards/p/PatrolHound.java index 9bb5c796eb7..692170b9b6d 100644 --- a/Mage.Sets/src/mage/cards/p/PatrolHound.java +++ b/Mage.Sets/src/mage/cards/p/PatrolHound.java @@ -28,7 +28,7 @@ public final class PatrolHound extends CardImpl { this.toughness = new MageInt(2); // Discard a card: Patrol Hound gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); } private PatrolHound(final PatrolHound card) { diff --git a/Mage.Sets/src/mage/cards/p/PatrolSignaler.java b/Mage.Sets/src/mage/cards/p/PatrolSignaler.java index ddf6797cf17..baf74d9f7ef 100644 --- a/Mage.Sets/src/mage/cards/p/PatrolSignaler.java +++ b/Mage.Sets/src/mage/cards/p/PatrolSignaler.java @@ -29,7 +29,7 @@ public final class PatrolSignaler extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {untap}: Create a 1/1 white Kithkin Soldier creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KithkinSoldierToken()), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new KithkinSoldierToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java b/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java index 077a561392b..0e2d733f5b1 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java @@ -42,7 +42,7 @@ public final class PatronOfTheMoon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}: Put up to two land cards from your hand onto the battlefield tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PatronOfTheMoonEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new PatronOfTheMoonEffect(), new ManaCostsImpl<>("{1}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PatronWizard.java b/Mage.Sets/src/mage/cards/p/PatronWizard.java index 3ea451315d3..80702c69a72 100644 --- a/Mage.Sets/src/mage/cards/p/PatronWizard.java +++ b/Mage.Sets/src/mage/cards/p/PatronWizard.java @@ -40,7 +40,7 @@ public final class PatronWizard extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped Wizard you control: Counter target spell unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapTargetCost(new TargetControlledPermanent(filter))); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PavelMaliki.java b/Mage.Sets/src/mage/cards/p/PavelMaliki.java index c3f5bb7da9d..e50113c36e9 100644 --- a/Mage.Sets/src/mage/cards/p/PavelMaliki.java +++ b/Mage.Sets/src/mage/cards/p/PavelMaliki.java @@ -28,7 +28,7 @@ public final class PavelMaliki extends CardImpl { this.toughness = new MageInt(3); // {B}{R}: Pavel Maliki gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); } private PavelMaliki(final PavelMaliki card) { diff --git a/Mage.Sets/src/mage/cards/p/PeaceOfMind.java b/Mage.Sets/src/mage/cards/p/PeaceOfMind.java index 6c15253f513..e407f932a1e 100644 --- a/Mage.Sets/src/mage/cards/p/PeaceOfMind.java +++ b/Mage.Sets/src/mage/cards/p/PeaceOfMind.java @@ -23,7 +23,7 @@ public final class PeaceOfMind extends CardImpl { // {W}, Discard a card: You gain 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(3), new ManaCostsImpl<>("{W}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java index 2ea88045c18..20caa8125f5 100644 --- a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java +++ b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java @@ -42,7 +42,7 @@ public final class PeacewalkerColossus extends CardImpl { // {1}{W}: Another target Vehicle you control becomes an artifact creature until end of turn. Effect effect = new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.CREATURE); effect.setText("Another target Vehicle you control becomes an artifact creature 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 TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PearlDragon.java b/Mage.Sets/src/mage/cards/p/PearlDragon.java index c637ebb62ec..00c6a114ec9 100644 --- a/Mage.Sets/src/mage/cards/p/PearlDragon.java +++ b/Mage.Sets/src/mage/cards/p/PearlDragon.java @@ -30,7 +30,7 @@ public final class PearlDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Pearl Dragon gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private PearlDragon(final PearlDragon card) { diff --git a/Mage.Sets/src/mage/cards/p/PearlLakeAncient.java b/Mage.Sets/src/mage/cards/p/PearlLakeAncient.java index 13f9842a05e..fd7e8c7c8bb 100644 --- a/Mage.Sets/src/mage/cards/p/PearlLakeAncient.java +++ b/Mage.Sets/src/mage/cards/p/PearlLakeAncient.java @@ -40,7 +40,7 @@ public final class PearlLakeAncient extends CardImpl { this.addAbility(new ProwessAbility()); // Return three lands you control to their owner's hand: Return Pearl Lake Ancient to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(3, 3, new FilterControlledLandPermanent("lands"), true)))); } diff --git a/Mage.Sets/src/mage/cards/p/PearlspearCourier.java b/Mage.Sets/src/mage/cards/p/PearlspearCourier.java index 019b5ca2163..5936dee1d0f 100644 --- a/Mage.Sets/src/mage/cards/p/PearlspearCourier.java +++ b/Mage.Sets/src/mage/cards/p/PearlspearCourier.java @@ -44,7 +44,7 @@ public final class PearlspearCourier extends CardImpl { // You may choose not to untap Pearlspear Courier during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}{W}, {tap}: Target Soldier creature gets +2/+2 and has vigilance for as long as Pearlspear Courier remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target Soldier creature gets +2/+2"), new ManaCostsImpl<>("{2}{W}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/p/PeemaAetherSeer.java b/Mage.Sets/src/mage/cards/p/PeemaAetherSeer.java index efd9bb7d68b..60d0ae73e03 100644 --- a/Mage.Sets/src/mage/cards/p/PeemaAetherSeer.java +++ b/Mage.Sets/src/mage/cards/p/PeemaAetherSeer.java @@ -39,7 +39,7 @@ public final class PeemaAetherSeer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // Pay {E}{E}{E}: Target creature blocks this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new PayEnergyCost(3)); + Ability ability = new SimpleActivatedAbility(new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new PayEnergyCost(3)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PegasusRefuge.java b/Mage.Sets/src/mage/cards/p/PegasusRefuge.java index 014dc6b2fc5..443bbdac38b 100644 --- a/Mage.Sets/src/mage/cards/p/PegasusRefuge.java +++ b/Mage.Sets/src/mage/cards/p/PegasusRefuge.java @@ -23,7 +23,7 @@ public final class PegasusRefuge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // {2}, Discard a card: Create a 1/1 white Pegasus creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PemminsAura.java b/Mage.Sets/src/mage/cards/p/PemminsAura.java index 7f979edc8fe..3f06a23b35c 100644 --- a/Mage.Sets/src/mage/cards/p/PemminsAura.java +++ b/Mage.Sets/src/mage/cards/p/PemminsAura.java @@ -42,18 +42,18 @@ public final class PemminsAura extends CardImpl { this.addAbility(ability); // {U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapAttachedEffect(), new ManaCostsImpl<>("{U}"))); // {U}: Enchanted creature gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // {U}: Enchanted creature gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // {1}: Enchanted creature gets +1/-1 or -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PemminsAuraBoostEnchantedEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new PemminsAuraBoostEnchantedEffect(), new ManaCostsImpl<>("{1}"))); } private PemminsAura(final PemminsAura card) { diff --git a/Mage.Sets/src/mage/cards/p/Penance.java b/Mage.Sets/src/mage/cards/p/Penance.java index 5f44789f2ae..db6296fa3b1 100644 --- a/Mage.Sets/src/mage/cards/p/Penance.java +++ b/Mage.Sets/src/mage/cards/p/Penance.java @@ -27,7 +27,7 @@ public final class Penance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Put a card from your hand on top of your library: The next time a black or red source of your choice would deal damage this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PenanceEffect(), new PutCardFromHandOnTopOfLibraryCost())); + this.addAbility(new SimpleActivatedAbility(new PenanceEffect(), new PutCardFromHandOnTopOfLibraryCost())); } diff --git a/Mage.Sets/src/mage/cards/p/Pendelhaven.java b/Mage.Sets/src/mage/cards/p/Pendelhaven.java index 6f9a8dd4771..cd9b63cdcbe 100644 --- a/Mage.Sets/src/mage/cards/p/Pendelhaven.java +++ b/Mage.Sets/src/mage/cards/p/Pendelhaven.java @@ -37,7 +37,7 @@ public final class Pendelhaven extends CardImpl { // {tap}: Add {G}. this.addAbility(new GreenManaAbility()); // {tap}: Target 1/1 creature gets +1/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PendelhavenElder.java b/Mage.Sets/src/mage/cards/p/PendelhavenElder.java index e597f9406c9..d9cdaf6f593 100644 --- a/Mage.Sets/src/mage/cards/p/PendelhavenElder.java +++ b/Mage.Sets/src/mage/cards/p/PendelhavenElder.java @@ -40,7 +40,7 @@ public final class PendelhavenElder extends CardImpl { this.toughness = new MageInt(1); // {tap}: Each 1/1 creature you control gets +1/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 2, Duration.EndOfTurn, filter, false) + this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(1, 2, Duration.EndOfTurn, filter, false) .setText("Each 1/1 creature you control gets +1/+2 until end of turn."), new TapSourceCost() )); diff --git a/Mage.Sets/src/mage/cards/p/PendulumOfPatterns.java b/Mage.Sets/src/mage/cards/p/PendulumOfPatterns.java index 8212e448e30..629f7ee9697 100644 --- a/Mage.Sets/src/mage/cards/p/PendulumOfPatterns.java +++ b/Mage.Sets/src/mage/cards/p/PendulumOfPatterns.java @@ -28,7 +28,7 @@ public final class PendulumOfPatterns extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3))); // {5}, {T}, Sacrifice Pendulum of Patterns: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PentagramOfTheAges.java b/Mage.Sets/src/mage/cards/p/PentagramOfTheAges.java index f080439e584..5c3c1130f7d 100644 --- a/Mage.Sets/src/mage/cards/p/PentagramOfTheAges.java +++ b/Mage.Sets/src/mage/cards/p/PentagramOfTheAges.java @@ -23,7 +23,7 @@ public final class PentagramOfTheAges extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {4}, {tap}: The next time a source of your choice would deal damage to you this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PentarchPaladin.java b/Mage.Sets/src/mage/cards/p/PentarchPaladin.java index 4a105c5f3bb..af993cb1120 100644 --- a/Mage.Sets/src/mage/cards/p/PentarchPaladin.java +++ b/Mage.Sets/src/mage/cards/p/PentarchPaladin.java @@ -48,7 +48,7 @@ public final class PentarchPaladin extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment))); // {W}{W}, {tap}: Destroy target permanent of the chosen color. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(PentarchPaladinAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/p/Pentavus.java b/Mage.Sets/src/mage/cards/p/Pentavus.java index d1954c12d0b..179ce5d1716 100644 --- a/Mage.Sets/src/mage/cards/p/Pentavus.java +++ b/Mage.Sets/src/mage/cards/p/Pentavus.java @@ -44,12 +44,12 @@ public final class Pentavus extends CardImpl { "with five +1/+1 counters on it")); // {1}, Remove a +1/+1 counter from Pentavus: Create a 1/1 colorless Pentavite artifact creature token with flying. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PentaviteToken(), 1), new GenericManaCost(1)); + Ability firstAbility = new SimpleActivatedAbility(new CreateTokenEffect(new PentaviteToken(), 1), new GenericManaCost(1)); firstAbility.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(firstAbility); // {1}, Sacrifice a Pentavite: Put a +1/+1 counter on Pentavus. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(1)); secondAbility.addCost(new SacrificeTargetCost(filter)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/p/PerilousShadow.java b/Mage.Sets/src/mage/cards/p/PerilousShadow.java index fad2116d4a1..08d93f174a6 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousShadow.java +++ b/Mage.Sets/src/mage/cards/p/PerilousShadow.java @@ -29,7 +29,7 @@ public final class PerilousShadow extends CardImpl { // {1}{B}: Perilous Shadow gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2,2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/p/PerniciousDeed.java b/Mage.Sets/src/mage/cards/p/PerniciousDeed.java index ecb80b093a3..b9e69b1af42 100644 --- a/Mage.Sets/src/mage/cards/p/PerniciousDeed.java +++ b/Mage.Sets/src/mage/cards/p/PerniciousDeed.java @@ -30,7 +30,7 @@ public final class PerniciousDeed extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{G}"); // {X}, Sacrifice Pernicious Deed: Destroy each artifact, creature, and enchantment with converted mana cost X or less. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PerniciousDeedEffect(), new VariableManaCost(VariableCostType.NORMAL)); + Ability ability = new SimpleActivatedAbility(new PerniciousDeedEffect(), new VariableManaCost(VariableCostType.NORMAL)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java b/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java index ee2a72d927e..570a4c2f0ce 100644 --- a/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java +++ b/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java @@ -37,7 +37,7 @@ public final class PersonalIncarnation extends CardImpl { this.toughness = new MageInt(6); // {0}: The next 1 damage that would be dealt to Personal Incarnation this turn is dealt to its owner instead. Only Personal Incarnation's owner may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PersonalIncarnationRedirectEffect(), new GenericManaCost(0)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new PersonalIncarnationRedirectEffect(), new GenericManaCost(0)); ability.setMayActivate(TargetController.OWNER); this.addAbility(ability); // When Personal Incarnation dies, its owner loses half their life, rounded up. diff --git a/Mage.Sets/src/mage/cards/p/Pestilence.java b/Mage.Sets/src/mage/cards/p/Pestilence.java index d78763b4828..4ebedff43af 100644 --- a/Mage.Sets/src/mage/cards/p/Pestilence.java +++ b/Mage.Sets/src/mage/cards/p/Pestilence.java @@ -33,7 +33,7 @@ public final class Pestilence extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(triggered, new CreatureCountCondition(0, TargetController.ANY), ruleText)); // {B}: Pestilence deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}"))); } private Pestilence(final Pestilence card) { diff --git a/Mage.Sets/src/mage/cards/p/PestilenceDemon.java b/Mage.Sets/src/mage/cards/p/PestilenceDemon.java index b355d9f0a9b..03e24434d35 100644 --- a/Mage.Sets/src/mage/cards/p/PestilenceDemon.java +++ b/Mage.Sets/src/mage/cards/p/PestilenceDemon.java @@ -35,7 +35,7 @@ public final class PestilenceDemon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {B}: Pestilence Demon deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PestilenceDemonEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new PestilenceDemonEffect(), new ManaCostsImpl<>("{B}"))); } private PestilenceDemon(final PestilenceDemon card) { diff --git a/Mage.Sets/src/mage/cards/p/PestilentKathari.java b/Mage.Sets/src/mage/cards/p/PestilentKathari.java index efcb10eff2c..0cee90847ce 100644 --- a/Mage.Sets/src/mage/cards/p/PestilentKathari.java +++ b/Mage.Sets/src/mage/cards/p/PestilentKathari.java @@ -32,7 +32,7 @@ public final class PestilentKathari extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); this.addAbility(DeathtouchAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); } private PestilentKathari(final PestilentKathari card) { diff --git a/Mage.Sets/src/mage/cards/p/PetraSphinx.java b/Mage.Sets/src/mage/cards/p/PetraSphinx.java index 9766ce8cf30..14a11a14d75 100644 --- a/Mage.Sets/src/mage/cards/p/PetraSphinx.java +++ b/Mage.Sets/src/mage/cards/p/PetraSphinx.java @@ -31,7 +31,7 @@ public final class PetraSphinx extends CardImpl { this.toughness = new MageInt(4); // {tap}: Target player chooses a card name, then reveals the top card of their library. If that card has the chosen name, that player puts it into their hand. If it doesn't, the player puts it into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PetraSphinxEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PetraSphinxEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Petradon.java b/Mage.Sets/src/mage/cards/p/Petradon.java index 634ae5333d8..63f4deb60a6 100644 --- a/Mage.Sets/src/mage/cards/p/Petradon.java +++ b/Mage.Sets/src/mage/cards/p/Petradon.java @@ -41,7 +41,7 @@ public final class Petradon extends CardImpl { .withText(true, true, false), false)); // {R}: Petradon 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 Petradon(final Petradon card) { diff --git a/Mage.Sets/src/mage/cards/p/PetrifiedField.java b/Mage.Sets/src/mage/cards/p/PetrifiedField.java index f9009d20c92..e6d82fe4054 100644 --- a/Mage.Sets/src/mage/cards/p/PetrifiedField.java +++ b/Mage.Sets/src/mage/cards/p/PetrifiedField.java @@ -31,7 +31,7 @@ public final class PetrifiedField extends CardImpl { // {tap}, Sacrifice Petrified Field: Return target land card from your graveyard to your hand. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("Return target land card from your graveyard to your hand."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(new FilterLandCard())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PewterGolem.java b/Mage.Sets/src/mage/cards/p/PewterGolem.java index 1eefd276eb4..39e600c4ad7 100644 --- a/Mage.Sets/src/mage/cards/p/PewterGolem.java +++ b/Mage.Sets/src/mage/cards/p/PewterGolem.java @@ -23,7 +23,7 @@ public final class PewterGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(4); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private PewterGolem(final PewterGolem card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java b/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java index 7a838739fab..c186540e232 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java @@ -28,10 +28,10 @@ public final class PhantasmalFiend extends CardImpl { this.toughness = new MageInt(5); // {B}: Phantasmal Fiend gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {1}{U}: Switch Phantasmal Fiend's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private PhantasmalFiend(final PhantasmalFiend card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalMount.java b/Mage.Sets/src/mage/cards/p/PhantasmalMount.java index 07ffcb8a32e..886bc73d5f7 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalMount.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalMount.java @@ -53,7 +53,7 @@ public final class PhantasmalMount extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Target creature you control with toughness 2 or less gets +1/+1 and gains flying until end of turn. When Phantasmal Mount leaves the battlefield this turn, sacrifice that creature. When the creature leaves the battlefield this turn, sacrifice Phantasmal Mount. - Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhantasmalMountEffect(), new TapSourceCost()); + Ability activatedAbility = new SimpleActivatedAbility(new PhantasmalMountEffect(), new TapSourceCost()); activatedAbility.addTarget(new TargetControlledCreaturePermanent(filter)); this.addAbility(activatedAbility); diff --git a/Mage.Sets/src/mage/cards/p/PhantomNantuko.java b/Mage.Sets/src/mage/cards/p/PhantomNantuko.java index e4d22e5c842..6ff5fb1470f 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomNantuko.java +++ b/Mage.Sets/src/mage/cards/p/PhantomNantuko.java @@ -40,7 +40,7 @@ public final class PhantomNantuko extends CardImpl { new PreventDamageAndRemoveCountersEffect(false, false, false).withPhantomText() ), PreventDamageAndRemoveCountersEffect.createWatcher()); // {tap}: Put a +1/+1 counter on Phantom Nantuko. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new TapSourceCost())); } private PhantomNantuko(final PhantomNantuko card) { @@ -52,4 +52,3 @@ public final class PhantomNantuko extends CardImpl { return new PhantomNantuko(this); } } - diff --git a/Mage.Sets/src/mage/cards/p/Phelddagrif.java b/Mage.Sets/src/mage/cards/p/Phelddagrif.java index 9a082d27292..16071eb50b3 100644 --- a/Mage.Sets/src/mage/cards/p/Phelddagrif.java +++ b/Mage.Sets/src/mage/cards/p/Phelddagrif.java @@ -37,19 +37,19 @@ public final class Phelddagrif extends CardImpl { this.toughness = new MageInt(4); // {G}: Phelddagrif gains trample until end of turn. Target opponent creates a 1/1 green Hippo creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addEffect(new CreateTokenTargetEffect(new HippoToken())); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {W}: Phelddagrif gains flying until end of turn. Target opponent gains 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addEffect(new GainLifeTargetEffect(2)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {U}: Return Phelddagrif to its owner's hand. Target opponent may draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}")); + ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}")); ability.addEffect(new DrawCardTargetEffect(1, true)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianBroodlings.java b/Mage.Sets/src/mage/cards/p/PhyrexianBroodlings.java index a0c69f915f7..3c1c31bd49e 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianBroodlings.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianBroodlings.java @@ -32,7 +32,7 @@ public final class PhyrexianBroodlings extends CardImpl { this.toughness = new MageInt(2); // {1}, Sacrifice a creature: Put a +1/+1 counter on Phyrexian Broodlings. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDebaser.java b/Mage.Sets/src/mage/cards/p/PhyrexianDebaser.java index d97cbdfaa63..610d58e0048 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDebaser.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDebaser.java @@ -35,7 +35,7 @@ public final class PhyrexianDebaser extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}, Sacrifice Phyrexian Debaser: Target creature gets -2/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDefiler.java b/Mage.Sets/src/mage/cards/p/PhyrexianDefiler.java index 6d0a9a24f10..18e88ebc8f3 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDefiler.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDefiler.java @@ -31,7 +31,7 @@ public final class PhyrexianDefiler extends CardImpl { this.toughness = new MageInt(3); // {tap}, Sacrifice Phyrexian Defiler: Target creature gets -3/-3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDenouncer.java b/Mage.Sets/src/mage/cards/p/PhyrexianDenouncer.java index 5c596ffad95..84428afa3c3 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDenouncer.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDenouncer.java @@ -31,7 +31,7 @@ public final class PhyrexianDenouncer extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Phyrexian Denouncer: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java b/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java index efeae298ce3..fc279b18a55 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java @@ -41,7 +41,7 @@ public final class PhyrexianDevourer extends CardImpl { this.addAbility(new PhyrexianDevourerStateTriggeredAbility()); // Exile the top card of your library: Put X +1/+1 counters on Phyrexian Devourer, where X is the exiled card's converted mana cost. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianDevourerEffect(), new ExileTopCardLibraryCost())); + this.addAbility(new SimpleActivatedAbility(new PhyrexianDevourerEffect(), new ExileTopCardLibraryCost())); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java b/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java index dd353d25ff8..5bbd15e355c 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java @@ -31,12 +31,12 @@ public final class PhyrexianFurnace extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {tap}: Exile the bottom card of target player's graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianFurnaceEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PhyrexianFurnaceEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {1}, Sacrifice Phyrexian Furnace: Exile target card from a graveyard. Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianGhoul.java b/Mage.Sets/src/mage/cards/p/PhyrexianGhoul.java index 161b1adec1b..2d084d6fa61 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianGhoul.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianGhoul.java @@ -28,7 +28,7 @@ public final class PhyrexianGhoul extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianGremlins.java b/Mage.Sets/src/mage/cards/p/PhyrexianGremlins.java index a96aeb80ccc..7daad39b722 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianGremlins.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianGremlins.java @@ -32,7 +32,7 @@ public final class PhyrexianGremlins extends CardImpl { // You may choose not to untap Phyrexian Gremlins during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Tap target artifact. It doesn't untap during its controller's untap step for as long as Phyrexian Gremlins remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java b/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java index 737136d519e..0c2581b8155 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java @@ -33,7 +33,7 @@ public final class PhyrexianGrimoire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {4}, {tap}: Target opponent chooses one of the top two cards of your graveyard. Exile that card and put the other one into your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianGrimoireEffect(), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new PhyrexianGrimoireEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java b/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java index 25b284b54d1..8359880c37b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java @@ -29,7 +29,7 @@ public final class PhyrexianInfiltrator extends CardImpl { this.toughness = new MageInt(2); // {2}{U}{U}: Exchange control of Phyrexian Infiltrator and target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExchangeControlTargetEffect(Duration.EndOfGame, + Ability ability = new SimpleActivatedAbility(new ExchangeControlTargetEffect(Duration.EndOfGame, "Exchange control of {this} and target creature", true), new ManaCostsImpl<>("{2}{U}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java index f9279a3717b..745989e1fe0 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java @@ -33,7 +33,7 @@ public final class PhyrexianIronfoot extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {1}{S}: Untap Phyrexian Ironfoot. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}{S}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{1}{S}"))); } private PhyrexianIronfoot(final PhyrexianIronfoot card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java b/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java index 7c5f0a7f393..8411fb5465b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java @@ -26,7 +26,7 @@ public final class PhyrexianMonitor extends CardImpl { this.toughness = new MageInt(2); // {B}: Regenerate Phyrexian Monitor. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private PhyrexianMonitor(final PhyrexianMonitor card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java b/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java index 3670a42c517..bbe8a22f4a2 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java @@ -32,7 +32,7 @@ public final class PhyrexianPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}: If your library has ten or more cards in it, target opponent looks at the top ten cards of your library and separates them into two face-down piles. Exile one of those piles. Search the other pile for a card, put it into your hand, then shuffle the rest of that pile into your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianPortalEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new PhyrexianPortalEffect(), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianProwler.java b/Mage.Sets/src/mage/cards/p/PhyrexianProwler.java index 92db310ee74..88f6b0ed199 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianProwler.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianProwler.java @@ -32,7 +32,7 @@ public final class PhyrexianProwler extends CardImpl { // Fading 3 this.addAbility(new FadingAbility(3, this)); // Remove a fade counter from Phyrexian Prowler: Phyrexian Prowler gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.FADE.createInstance()))); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java index 524ac85cd92..d3533d1aa13 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java @@ -32,7 +32,7 @@ public final class PhyrexianSnowcrusher extends CardImpl { // Phyrexian Snowcrusher attacks each turn if able. this.addAbility(new AttacksEachCombatStaticAbility()); // {1}{S}: Phyrexian Snowcrusher gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{S}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{S}"))); } private PhyrexianSnowcrusher(final PhyrexianSnowcrusher card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianSplicer.java b/Mage.Sets/src/mage/cards/p/PhyrexianSplicer.java index b466c5f0467..c8fa26ea220 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianSplicer.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianSplicer.java @@ -62,7 +62,7 @@ public final class PhyrexianSplicer extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {T}, Choose flying, first strike, trample, or shadow: Until end of turn, target creature with the chosen ability loses it and another target creature gains it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianSplicerEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new PhyrexianSplicerEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new PhyrexianSplicerChooseCost()); ability.addTarget(new TargetPermanent(filterLose).withChooseHint("to lose ability").setTargetTag(1)); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java index af89b977e0d..6c95c79c44c 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java @@ -36,7 +36,7 @@ public final class PhyrexianTotem extends CardImpl { // {tap}: Add {B}. this.addAbility(new BlackManaAbility()); // {2}{B}: {this} becomes a 5/5 black Horror artifact creature with trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new PhyrexianTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); // Whenever {this} is dealt damage, if it's a creature, sacrifice that many permanents. this.addAbility(new PhyrexianTotemTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianVault.java b/Mage.Sets/src/mage/cards/p/PhyrexianVault.java index 9d6f6ebb9bc..aa195f49e82 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianVault.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianVault.java @@ -23,7 +23,7 @@ public final class PhyrexianVault extends CardImpl { public PhyrexianVault(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexiasCore.java b/Mage.Sets/src/mage/cards/p/PhyrexiasCore.java index cf3f87ceb65..d60f392d410 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexiasCore.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexiasCore.java @@ -31,7 +31,7 @@ public final class PhyrexiasCore extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java index 117a8e758bb..45c8d446422 100644 --- a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java @@ -43,7 +43,7 @@ public final class PiaAndKiranNalaar extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // {2}{R}, Sacrifice an artifact: Pia and Kiran Nalaar deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PiaNalaar.java b/Mage.Sets/src/mage/cards/p/PiaNalaar.java index 316bc869270..80fcf8fee88 100644 --- a/Mage.Sets/src/mage/cards/p/PiaNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaNalaar.java @@ -43,12 +43,12 @@ public final class PiaNalaar extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken()))); // {1}{R}: Target artifact creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE)); this.addAbility(ability); // {1}, Sacrifice an artifact: Target creature can't block this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new GenericManaCost(1)); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java b/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java index 521347adba6..e0355b3a919 100644 --- a/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java +++ b/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java @@ -38,7 +38,7 @@ public final class PilgrimOfJustice extends CardImpl { // Protection from red this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {W}, Sacrifice Pilgrim of Justice: The next time a red source of your choice would deal damage this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfJusticeEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PilgrimOfJusticeEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java b/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java index f7fa244cd89..74507f97418 100644 --- a/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java +++ b/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java @@ -38,7 +38,7 @@ public final class PilgrimOfVirtue extends CardImpl { // Protection from black this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}, Sacrifice Pilgrim of Virtue: The next time a black source of your choice would deal damage this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfVirtueEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PilgrimOfVirtueEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PiousEvangel.java b/Mage.Sets/src/mage/cards/p/PiousEvangel.java index 978018c9451..1de94395713 100644 --- a/Mage.Sets/src/mage/cards/p/PiousEvangel.java +++ b/Mage.Sets/src/mage/cards/p/PiousEvangel.java @@ -48,7 +48,7 @@ public final class PiousEvangel extends CardImpl { // {2}, {T}, Sacrifice another permanent: Transform Pious Evangel. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new TransformSourceEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PiousKitsune.java b/Mage.Sets/src/mage/cards/p/PiousKitsune.java index b8158168b71..a7b3bab6af2 100644 --- a/Mage.Sets/src/mage/cards/p/PiousKitsune.java +++ b/Mage.Sets/src/mage/cards/p/PiousKitsune.java @@ -41,7 +41,7 @@ public final class PiousKitsune extends CardImpl { // At the beginning of your upkeep, put a devotion counter on Pious Kitsune. Then if a creature named Eight-and-a-Half-Tails is on the battlefield, you gain 1 life for each devotion counter on Pious Kitsune. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PiousKitsuneEffect())); // {tap}, Remove a devotion counter from Pious Kitsune: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.DEVOTION.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PirateShip.java b/Mage.Sets/src/mage/cards/p/PirateShip.java index c18df14e5a1..11a25f21549 100644 --- a/Mage.Sets/src/mage/cards/p/PirateShip.java +++ b/Mage.Sets/src/mage/cards/p/PirateShip.java @@ -36,7 +36,7 @@ public final class PirateShip extends CardImpl { // Pirate Ship can't attack unless defending player controls an Island. this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {tap}: Pirate Ship deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // When you control no Islands, sacrifice Pirate Ship. diff --git a/Mage.Sets/src/mage/cards/p/PitTrap.java b/Mage.Sets/src/mage/cards/p/PitTrap.java index bf3e8d622ed..ab33fd73e2c 100644 --- a/Mage.Sets/src/mage/cards/p/PitTrap.java +++ b/Mage.Sets/src/mage/cards/p/PitTrap.java @@ -33,7 +33,7 @@ public final class PitTrap extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {tap}, Sacrifice Pit Trap: Destroy target attacking creature without flying. It can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/p/PixieQueen.java b/Mage.Sets/src/mage/cards/p/PixieQueen.java index 29ddaffe311..bb78015d42f 100644 --- a/Mage.Sets/src/mage/cards/p/PixieQueen.java +++ b/Mage.Sets/src/mage/cards/p/PixieQueen.java @@ -33,7 +33,7 @@ public final class PixieQueen extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}{G}{G}, {tap}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}{G}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PlagueBoiler.java b/Mage.Sets/src/mage/cards/p/PlagueBoiler.java index ffd537a9c90..8eb038c5958 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueBoiler.java +++ b/Mage.Sets/src/mage/cards/p/PlagueBoiler.java @@ -35,7 +35,7 @@ public final class PlagueBoiler extends CardImpl { // At the beginning of your upkeep, put a plague counter on Plague Boiler. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.PLAGUE.createInstance()))); // {1}{B}{G}: Put a plague counter on Plague Boiler or remove a plague counter from it. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlagueBoilerEffect(), new ManaCostsImpl<>("{1}{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new PlagueBoilerEffect(), new ManaCostsImpl<>("{1}{B}{G}"))); // When Plague Boiler has three or more plague counters on it, sacrifice it. If you do, destroy all nonland permanents. this.addAbility(new PlagueBoilerTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PlagueDogs.java b/Mage.Sets/src/mage/cards/p/PlagueDogs.java index 6c5058f85e9..464c6ac9abe 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueDogs.java +++ b/Mage.Sets/src/mage/cards/p/PlagueDogs.java @@ -34,7 +34,7 @@ public final class PlagueDogs extends CardImpl { // When Plague Dogs dies, all creatures get -1/-1 until end of turn. this.addAbility(new DiesSourceTriggeredAbility(new BoostAllEffect(-1, -1, Duration.EndOfTurn), false)); // {2}, Sacrifice Plague Dogs: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlagueWitch.java b/Mage.Sets/src/mage/cards/p/PlagueWitch.java index baf493095e5..1399f4d7df2 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueWitch.java +++ b/Mage.Sets/src/mage/cards/p/PlagueWitch.java @@ -31,7 +31,7 @@ public final class PlagueWitch extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}, Discard a card: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/Plaguebearer.java b/Mage.Sets/src/mage/cards/p/Plaguebearer.java index 5dac7bb4161..17a0a1fed73 100644 --- a/Mage.Sets/src/mage/cards/p/Plaguebearer.java +++ b/Mage.Sets/src/mage/cards/p/Plaguebearer.java @@ -39,7 +39,7 @@ public final class Plaguebearer extends CardImpl { this.toughness = new MageInt(1); // {X}{X}{B}: Destroy target nonblack creature with converted mana cost X. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{B}")); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(new XManaValueTargetAdjuster()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PlaguedRusalka.java b/Mage.Sets/src/mage/cards/p/PlaguedRusalka.java index b1a61dd5689..cedec3aabd3 100644 --- a/Mage.Sets/src/mage/cards/p/PlaguedRusalka.java +++ b/Mage.Sets/src/mage/cards/p/PlaguedRusalka.java @@ -27,7 +27,7 @@ public final class PlaguedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PlaguemawBeast.java b/Mage.Sets/src/mage/cards/p/PlaguemawBeast.java index fee2a6640b9..6c802051607 100644 --- a/Mage.Sets/src/mage/cards/p/PlaguemawBeast.java +++ b/Mage.Sets/src/mage/cards/p/PlaguemawBeast.java @@ -31,7 +31,7 @@ public final class PlaguemawBeast extends CardImpl { this.toughness = new MageInt(3); // {T}, Sacrifice a creature: Proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ProliferateEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlanarGuide.java b/Mage.Sets/src/mage/cards/p/PlanarGuide.java index 3d6f447a59d..bb2c066b42e 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarGuide.java +++ b/Mage.Sets/src/mage/cards/p/PlanarGuide.java @@ -39,7 +39,7 @@ public final class PlanarGuide extends CardImpl { this.toughness = new MageInt(1); // {3}{W}, Exile Planar Guide: Exile all creatures. At the beginning of the next end step, return those cards to the battlefield under their owners' control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlanarGuideExileEffect(), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new PlanarGuideExileEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlanarPortal.java b/Mage.Sets/src/mage/cards/p/PlanarPortal.java index 05a5af0a11a..9c2e2a7c055 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarPortal.java +++ b/Mage.Sets/src/mage/cards/p/PlanarPortal.java @@ -23,7 +23,7 @@ public final class PlanarPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {6}, {tap}: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{6}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{6}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java index 287468d1417..9c7acd07e6d 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java @@ -34,7 +34,7 @@ public final class PlaneswalkersFavor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // {3}{G}: Target opponent reveals a card at random from their hand. Target creature gets +X/+X until end of turn, where X is the revealed card's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFavorEffect(), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new PlaneswalkersFavorEffect(), new ManaCostsImpl<>("{3}{G}")); Target target = new TargetOpponent(); ability.addTarget(target); target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java index 30c55f2f6d1..0ac6266ee9f 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java @@ -28,7 +28,7 @@ public final class PlaneswalkersMirth extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); // {3}{W}: Target opponent reveals a card at random from their hand. You gain life equal to that card's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersMirthEffect(), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new PlaneswalkersMirthEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlaxcasterFrogling.java b/Mage.Sets/src/mage/cards/p/PlaxcasterFrogling.java index 0b7ab75fdc6..a217ad0388f 100644 --- a/Mage.Sets/src/mage/cards/p/PlaxcasterFrogling.java +++ b/Mage.Sets/src/mage/cards/p/PlaxcasterFrogling.java @@ -35,7 +35,7 @@ public final class PlaxcasterFrogling extends CardImpl { this.addAbility(new GraftAbility(this, 3)); // {2}: Target creature with a +1/+1 counter on it gains shroud until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PoolingVenom.java b/Mage.Sets/src/mage/cards/p/PoolingVenom.java index 92a44b95604..554be5e343e 100644 --- a/Mage.Sets/src/mage/cards/p/PoolingVenom.java +++ b/Mage.Sets/src/mage/cards/p/PoolingVenom.java @@ -38,7 +38,7 @@ public final class PoolingVenom extends CardImpl { // Whenever enchanted land becomes tapped, its controller loses 2 life. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new LoseLifeControllerAttachedEffect(2), "enchanted land")); // {3}{B}: Destroy enchanted land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAttachedToEffect("enchanted land"), new ManaCostsImpl<>("{3}{B}"))); + this.addAbility(new SimpleActivatedAbility(new DestroyAttachedToEffect("enchanted land"), new ManaCostsImpl<>("{3}{B}"))); } private PoolingVenom(final PoolingVenom card) { diff --git a/Mage.Sets/src/mage/cards/p/PoulticeSliver.java b/Mage.Sets/src/mage/cards/p/PoulticeSliver.java index a723abbee14..eca6543bcd4 100644 --- a/Mage.Sets/src/mage/cards/p/PoulticeSliver.java +++ b/Mage.Sets/src/mage/cards/p/PoulticeSliver.java @@ -33,7 +33,7 @@ public final class PoulticeSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{2}, {tap}: Regenerate target Sliver." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ALL_SLIVERS)); diff --git a/Mage.Sets/src/mage/cards/p/PowderKeg.java b/Mage.Sets/src/mage/cards/p/PowderKeg.java index f81f61d7ba4..003ef0cdb6b 100644 --- a/Mage.Sets/src/mage/cards/p/PowderKeg.java +++ b/Mage.Sets/src/mage/cards/p/PowderKeg.java @@ -35,7 +35,7 @@ public final class PowderKeg extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.FUSE.createInstance(), true), true)); // {T}, Sacrifice Powder Keg: Destroy each artifact and creature with converted mana cost equal to the number of fuse counters on Powder Keg. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PowderKegEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PowderKegEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PowerArmor.java b/Mage.Sets/src/mage/cards/p/PowerArmor.java index 200ce7296c4..016a4af0447 100644 --- a/Mage.Sets/src/mage/cards/p/PowerArmor.java +++ b/Mage.Sets/src/mage/cards/p/PowerArmor.java @@ -27,7 +27,7 @@ public final class PowerArmor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Domain - {3}, {tap}: Target creature gets +1/+1 until end of turn for each basic land type among lands you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect( + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect( DomainValue.REGULAR, DomainValue.REGULAR, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PowerConduit.java b/Mage.Sets/src/mage/cards/p/PowerConduit.java index c4c0c321477..10fbc264f58 100644 --- a/Mage.Sets/src/mage/cards/p/PowerConduit.java +++ b/Mage.Sets/src/mage/cards/p/PowerConduit.java @@ -28,7 +28,7 @@ public final class PowerConduit extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}, Remove a counter from a permanent you control: Choose one - Put a charge counter on target artifact; or put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability.addCost(new RemoveCounterCost(new TargetControlledPermanent(1, 1, new FilterControlledPermanent(), true))); ability.addTarget(new TargetArtifactPermanent()); Mode mode = new Mode(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); diff --git a/Mage.Sets/src/mage/cards/p/PowerMatrix.java b/Mage.Sets/src/mage/cards/p/PowerMatrix.java index 78f45e81ded..0959bccc9d7 100644 --- a/Mage.Sets/src/mage/cards/p/PowerMatrix.java +++ b/Mage.Sets/src/mage/cards/p/PowerMatrix.java @@ -31,7 +31,7 @@ public final class PowerMatrix extends CardImpl { // {tap}: Target creature gets +1/+1 and gains flying, first strike, and trample until end of turn. Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn); effect.setText("Target creature gets +1/+1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/PowerOfFire.java b/Mage.Sets/src/mage/cards/p/PowerOfFire.java index 76c6441f783..917a82504e4 100644 --- a/Mage.Sets/src/mage/cards/p/PowerOfFire.java +++ b/Mage.Sets/src/mage/cards/p/PowerOfFire.java @@ -41,7 +41,7 @@ public final class PowerOfFire extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to any target." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); diff --git a/Mage.Sets/src/mage/cards/p/PradeshGypsies.java b/Mage.Sets/src/mage/cards/p/PradeshGypsies.java index d500aac6565..b9bc1836507 100644 --- a/Mage.Sets/src/mage/cards/p/PradeshGypsies.java +++ b/Mage.Sets/src/mage/cards/p/PradeshGypsies.java @@ -31,7 +31,7 @@ public final class PradeshGypsies extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {tap}: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java b/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java index 01d3a0e5a17..5d2ab8b1010 100644 --- a/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java +++ b/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java @@ -26,7 +26,7 @@ public final class PrahvSpiresOfOrder extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}{W}{U}, {T}: Prevent all damage a source of your choice would deal this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageBySourceEffect(), new ManaCostsImpl<>("{4}{W}{U}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageBySourceEffect(), new ManaCostsImpl<>("{4}{W}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Preacher.java b/Mage.Sets/src/mage/cards/p/Preacher.java index 03b109e8d13..51aac092c12 100644 --- a/Mage.Sets/src/mage/cards/p/Preacher.java +++ b/Mage.Sets/src/mage/cards/p/Preacher.java @@ -37,7 +37,7 @@ public final class Preacher extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {T}: Gain control of target creature of an opponent's choice that they control for as long as Preacher remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreacherEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreacherEffect(), new TapSourceCost()); ability.addTarget(new TargetOpponentsChoicePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_CREATURE, false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PredatorFlagship.java b/Mage.Sets/src/mage/cards/p/PredatorFlagship.java index 7ce3beca71b..3ad925e2fb1 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorFlagship.java +++ b/Mage.Sets/src/mage/cards/p/PredatorFlagship.java @@ -36,12 +36,12 @@ public final class PredatorFlagship extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {2}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {5}, {T}: Destroy target creature with flying. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{5}")); + ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java index 6d259fe78db..5dff570551f 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java @@ -40,7 +40,7 @@ public final class PredatoryUrge extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals damage equal to its power to target creature. // That creature deals damage equal to its power to this creature." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageEachOtherEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted creature has \"{T}: This creature deals damage equal to its power to target creature. That creature deals damage equal to its power to this creature.\""); diff --git a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java index 86c7a127be8..0971bf66b6a 100644 --- a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java +++ b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java @@ -35,7 +35,7 @@ public final class PresenceOfGond extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: Create a 1/1 green Elf Warrior creature token." - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfWarriorToken()), new TapSourceCost()); + Ability abilityToGain = new SimpleActivatedAbility(new CreateTokenEffect(new ElfWarriorToken()), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: Create a 1/1 green Elf Warrior creature token.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PrestonTheVanisher.java b/Mage.Sets/src/mage/cards/p/PrestonTheVanisher.java index 5b7a9209816..4e1e4322bd4 100644 --- a/Mage.Sets/src/mage/cards/p/PrestonTheVanisher.java +++ b/Mage.Sets/src/mage/cards/p/PrestonTheVanisher.java @@ -59,7 +59,7 @@ public final class PrestonTheVanisher extends CardImpl { this.addAbility(new EntersBattlefieldCastTriggeredAbility(Zone.BATTLEFIELD, effect, triggerFilter, false, SetTargetPointer.PERMANENT, false)); // {1}{W}, Sacrifice five Illusions: Exile target nonland permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeTargetCost(5, activeCostFilter)); ability.addTarget(new TargetNonlandPermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java index f080fc3bd68..43380775630 100644 --- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java +++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java @@ -44,7 +44,7 @@ public final class PrideSovereign extends CardImpl { DynamicValue otherCats = new PermanentsOnBattlefieldCount(filter); this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); // {W}, {t}, Exert Pride Sovereign: Create two 1/1 white Cat creature tokens with lifelink. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExertSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PriestOfIroas.java b/Mage.Sets/src/mage/cards/p/PriestOfIroas.java index ed5ff28f405..eea235e3d51 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfIroas.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfIroas.java @@ -30,7 +30,7 @@ public final class PriestOfIroas extends CardImpl { this.toughness = new MageInt(1); // {3}{W}, Sacrifice Priest of Iroas: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java index 9ffcc85b840..015f930602a 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java @@ -48,7 +48,7 @@ public final class PriestOfTheWakeningSun extends CardImpl { // {3}{W}{W}, Sacrifice Priest of the Wakening Sun: Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(target, true), new ManaCostsImpl<>("{3}{W}{W}")); + Ability ability2 = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(target, true), new ManaCostsImpl<>("{3}{W}{W}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/PrimevalShambler.java b/Mage.Sets/src/mage/cards/p/PrimevalShambler.java index dc2a8768530..edbd45e37d4 100644 --- a/Mage.Sets/src/mage/cards/p/PrimevalShambler.java +++ b/Mage.Sets/src/mage/cards/p/PrimevalShambler.java @@ -29,7 +29,7 @@ public final class PrimevalShambler extends CardImpl { this.toughness = new MageInt(3); // {B}: Primeval Shambler gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private PrimevalShambler(final PrimevalShambler card) { diff --git a/Mage.Sets/src/mage/cards/p/PrismArray.java b/Mage.Sets/src/mage/cards/p/PrismArray.java index 0a1e7278c3f..45ba34d6606 100644 --- a/Mage.Sets/src/mage/cards/p/PrismArray.java +++ b/Mage.Sets/src/mage/cards/p/PrismArray.java @@ -40,7 +40,7 @@ public final class PrismArray extends CardImpl { this.addAbility(ability); // {W}{U}{B}{R}{G}: Scry 3. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(3), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(3), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); } private PrismArray(final PrismArray card) { diff --git a/Mage.Sets/src/mage/cards/p/PrismaticCircle.java b/Mage.Sets/src/mage/cards/p/PrismaticCircle.java index 91be2dabb3c..630f20e22a3 100644 --- a/Mage.Sets/src/mage/cards/p/PrismaticCircle.java +++ b/Mage.Sets/src/mage/cards/p/PrismaticCircle.java @@ -36,7 +36,7 @@ public final class PrismaticCircle extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); // {1}: The next time a source of your choice of the chosen color would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PrismaticCircleEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new PrismaticCircleEffect(), new ManaCostsImpl<>("{1}"))); } private PrismaticCircle(final PrismaticCircle card) { diff --git a/Mage.Sets/src/mage/cards/p/PrizedElephant.java b/Mage.Sets/src/mage/cards/p/PrizedElephant.java index f1dbf3af72f..5365e0334e0 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedElephant.java +++ b/Mage.Sets/src/mage/cards/p/PrizedElephant.java @@ -47,7 +47,7 @@ public final class PrizedElephant extends CardImpl { new PermanentsOnTheBattlefieldCondition(filter), rule))); // {G}: Prized Elephant gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java b/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java index 531be384afd..55f8753a190 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java @@ -30,7 +30,7 @@ public final class ProdigalPyromancer extends CardImpl { this.toughness = new MageInt(1); // {T} : Prodigal Pyromancer 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/p/ProdigalSorcerer.java b/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java index df25ef5a11d..e66cba544c6 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java @@ -28,7 +28,7 @@ public final class ProdigalSorcerer extends CardImpl { this.toughness = new MageInt(1); //{T}: Prodigal Sorcerer deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ProfaneProcession.java b/Mage.Sets/src/mage/cards/p/ProfaneProcession.java index 83ea7e6a3f2..ae78c26a88a 100644 --- a/Mage.Sets/src/mage/cards/p/ProfaneProcession.java +++ b/Mage.Sets/src/mage/cards/p/ProfaneProcession.java @@ -37,7 +37,7 @@ public final class ProfaneProcession extends CardImpl { // {3}{W}{B}: Exile target creature. Then if there are three or more cards exiled with Profane Procession, transform it. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProfaneProcessionEffect(), new ManaCostsImpl<>("{3}{W}{B}")); + Ability ability = new SimpleActivatedAbility(new ProfaneProcessionEffect(), new ManaCostsImpl<>("{3}{W}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ProgenitorsIcon.java b/Mage.Sets/src/mage/cards/p/ProgenitorsIcon.java index 762037cfc4a..2b74e7b4430 100644 --- a/Mage.Sets/src/mage/cards/p/ProgenitorsIcon.java +++ b/Mage.Sets/src/mage/cards/p/ProgenitorsIcon.java @@ -36,7 +36,7 @@ public final class ProgenitorsIcon extends CardImpl { // {T}: The next spell of the chosen type you cast this turn can be cast as though it had flash. // Based on Ride the Avalanche - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProgenitorsIconAsThoughEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ProgenitorsIconAsThoughEffect(), new TapSourceCost()); ability.addWatcher(new ProgenitorsIconWatcher()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PrognosticSphinx.java b/Mage.Sets/src/mage/cards/p/PrognosticSphinx.java index 13ef0dcc240..e10c55915c5 100644 --- a/Mage.Sets/src/mage/cards/p/PrognosticSphinx.java +++ b/Mage.Sets/src/mage/cards/p/PrognosticSphinx.java @@ -36,7 +36,7 @@ public final class PrognosticSphinx extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Discard a card: Prognostic Sphinx gains hexproof until end of turn. Tap it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost()); Effect effect = new TapSourceEffect(); effect.setText("Tap it"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java b/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java index 79610abb57d..6929a71911f 100644 --- a/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java +++ b/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java @@ -30,7 +30,7 @@ public final class ProphetOfDistortion extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {3}{C}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{C}"))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{C}"))); } private ProphetOfDistortion(final ProphetOfDistortion card) { diff --git a/Mage.Sets/src/mage/cards/p/PropheticRavings.java b/Mage.Sets/src/mage/cards/p/PropheticRavings.java index d8f4788270d..8b346a17b36 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticRavings.java +++ b/Mage.Sets/src/mage/cards/p/PropheticRavings.java @@ -42,7 +42,7 @@ public final class PropheticRavings extends CardImpl { // Enchanted creature has haste and "{T}, Discard a card: Draw a card." ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA)); - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability abilityToGain = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); abilityToGain.addCost(new DiscardCardCost()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA); effect.setText("and \"{T}, Discard a card: Draw a card.\""); diff --git a/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java b/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java index 0d15ca99a85..b3a845f91ce 100644 --- a/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java +++ b/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java @@ -40,7 +40,7 @@ public final class ProsshSkyraiderOfKher extends CardImpl { // When you cast Prossh, Skyraider of Kher, create X 0/1 red Kobold creature tokens named Kobolds of Kher Keep, where X is the amount of mana spent to cast Prossh. this.addAbility(new CastSourceTriggeredAbility(new CreateTokenEffect(new KherKeepKoboldToken(), ManaSpentToCastCount.instance), false)); // Sacrifice another creature: Prossh gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java b/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java index f53ac66d86d..0d3d31ea52c 100644 --- a/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java +++ b/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java @@ -25,7 +25,7 @@ public final class ProtomatterPowder extends CardImpl { // {4}{W}, {tap}, Sacrifice Protomatter Powder: Return target artifact card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{W}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/p/ProudMentor.java b/Mage.Sets/src/mage/cards/p/ProudMentor.java index 7699e3825e6..99cc08eeb73 100644 --- a/Mage.Sets/src/mage/cards/p/ProudMentor.java +++ b/Mage.Sets/src/mage/cards/p/ProudMentor.java @@ -35,7 +35,7 @@ public final class ProudMentor extends CardImpl { this.addAbility(new PartnerWithAbility("Impetuous Protege")); // {W}, {T}: Tap target creature - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PsionicEntity.java b/Mage.Sets/src/mage/cards/p/PsionicEntity.java index ecd41c7e85d..02b0b3a1e10 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicEntity.java +++ b/Mage.Sets/src/mage/cards/p/PsionicEntity.java @@ -29,7 +29,7 @@ public final class PsionicEntity extends CardImpl { this.toughness = new MageInt(2); // {tap}: Psionic Entity deals 2 damage to any target and 3 damage to itself. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addEffect(new DamageSelfEffect(3).setText("and 3 damage to itself")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PsionicGift.java b/Mage.Sets/src/mage/cards/p/PsionicGift.java index ef1c7f684bb..7f3ebb643fc 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicGift.java +++ b/Mage.Sets/src/mage/cards/p/PsionicGift.java @@ -40,7 +40,7 @@ public final class PsionicGift extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to any target." - Ability psiAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability psiAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); psiAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/p/Psychatog.java b/Mage.Sets/src/mage/cards/p/Psychatog.java index 011fec63897..2064b5dd3fb 100644 --- a/Mage.Sets/src/mage/cards/p/Psychatog.java +++ b/Mage.Sets/src/mage/cards/p/Psychatog.java @@ -30,10 +30,10 @@ public final class Psychatog extends CardImpl { this.toughness = new MageInt(2); // Discard a card: Psychatog gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,1,Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,1,Duration.EndOfTurn), new DiscardCardCost())); // Exile two cards from your graveyard: Psychatog gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,1,Duration.EndOfTurn), new ExileFromGraveCost(new TargetCardInYourGraveyard(2, StaticFilters.FILTER_CARDS_FROM_YOUR_GRAVEYARD)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,1,Duration.EndOfTurn), new ExileFromGraveCost(new TargetCardInYourGraveyard(2, StaticFilters.FILTER_CARDS_FROM_YOUR_GRAVEYARD)))); } diff --git a/Mage.Sets/src/mage/cards/p/PsychicOverload.java b/Mage.Sets/src/mage/cards/p/PsychicOverload.java index ff09a5c8924..2c60a6c892f 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicOverload.java +++ b/Mage.Sets/src/mage/cards/p/PsychicOverload.java @@ -48,7 +48,7 @@ public final class PsychicOverload extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); // Enchanted permanent has "Discard two artifact cards: Untap this permanent." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new DiscardTargetCost(new TargetCardInHand(2, new FilterArtifactCard("two artifact cards")))); + Ability gainedAbility = new SimpleActivatedAbility(new UntapSourceEffect(), new DiscardTargetCost(new TargetCardInHand(2, new FilterArtifactCard("two artifact cards")))); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted permanent has \"Discard two artifact cards: Untap this permanent.\""); this.addAbility(new SimpleStaticAbility( effect)); } diff --git a/Mage.Sets/src/mage/cards/p/PsychicTrance.java b/Mage.Sets/src/mage/cards/p/PsychicTrance.java index 5dc9eb1193b..39a7b640ea4 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicTrance.java +++ b/Mage.Sets/src/mage/cards/p/PsychicTrance.java @@ -33,7 +33,7 @@ public final class PsychicTrance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); // Until end of turn, Wizards you control gain "{tap}: Counter target spell." - Ability abilityToAdd = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapSourceCost()); + Ability abilityToAdd = new SimpleActivatedAbility(new CounterTargetEffect(), new TapSourceCost()); abilityToAdd.addTarget(new TargetSpell()); Effect effect = new GainAbilityControlledEffect(abilityToAdd, Duration.EndOfTurn, filter); effect.setText("until end of turn, Wizards you control gain \"{T}: Counter target spell.\""); diff --git a/Mage.Sets/src/mage/cards/p/PteronGhost.java b/Mage.Sets/src/mage/cards/p/PteronGhost.java index d5d1300b068..d10a4cce992 100644 --- a/Mage.Sets/src/mage/cards/p/PteronGhost.java +++ b/Mage.Sets/src/mage/cards/p/PteronGhost.java @@ -35,7 +35,7 @@ public final class PteronGhost extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java b/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java index b7b42126007..b4387362e9d 100644 --- a/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java +++ b/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java @@ -44,7 +44,7 @@ public final class PulsemageAdvocate extends CardImpl { this.toughness = new MageInt(3); // {tap}: Return three target cards from an opponent's graveyard to their hand. Return target creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PulsemageAdvocateEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PulsemageAdvocateEffect(), new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(3, 3, filter)); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java index 273b1049412..0380ad48d7a 100644 --- a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java +++ b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java @@ -35,7 +35,7 @@ public final class PuppetConjurer extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}: Create a 0/1 blue Homunculus artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // At the beginning of your upkeep, sacrifice a Homunculus. diff --git a/Mage.Sets/src/mage/cards/p/PuppetStrings.java b/Mage.Sets/src/mage/cards/p/PuppetStrings.java index 6df6df99179..991a17296cb 100644 --- a/Mage.Sets/src/mage/cards/p/PuppetStrings.java +++ b/Mage.Sets/src/mage/cards/p/PuppetStrings.java @@ -23,7 +23,7 @@ public final class PuppetStrings extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {2}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Puppeteer.java b/Mage.Sets/src/mage/cards/p/Puppeteer.java index d30e60e96d2..05b850d4714 100644 --- a/Mage.Sets/src/mage/cards/p/Puppeteer.java +++ b/Mage.Sets/src/mage/cards/p/Puppeteer.java @@ -31,7 +31,7 @@ public final class Puppeteer extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PuresightMerrow.java b/Mage.Sets/src/mage/cards/p/PuresightMerrow.java index 1e955e5f10e..7d98652b9f1 100644 --- a/Mage.Sets/src/mage/cards/p/PuresightMerrow.java +++ b/Mage.Sets/src/mage/cards/p/PuresightMerrow.java @@ -36,7 +36,7 @@ public final class PuresightMerrow extends CardImpl { this.toughness = new MageInt(2); // {WU}, {untap}: Look at the top card of your library. You may exile that card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PuresightMerrowEffect(), new ManaCostsImpl<>("{W/U}")); + Ability ability = new SimpleActivatedAbility(new PuresightMerrowEffect(), new ManaCostsImpl<>("{W/U}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java index 70bcf57d5cb..aa5dd754779 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java @@ -41,7 +41,7 @@ public final class PursuitOfFlight extends CardImpl { // Enchanted creature gets +2/+2 and has "{U}: This creature gains flying until end of turn." SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); - ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); + ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java b/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java index 6ae0fe8dcf0..d4e8dc02aed 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java @@ -34,7 +34,7 @@ public final class PursuitOfKnowledge extends CardImpl { this.addAbility(new SimpleStaticAbility(new PursuitOfKnowledgeEffect())); // Remove three study counters from Pursuit of Knowledge, Sacrifice Pursuit of Knowledge: Draw seven cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(7), + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(7), new RemoveCountersSourceCost(CounterType.STUDY.createInstance(3))); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PusKami.java b/Mage.Sets/src/mage/cards/p/PusKami.java index 1014c5b7deb..ac715e4c406 100644 --- a/Mage.Sets/src/mage/cards/p/PusKami.java +++ b/Mage.Sets/src/mage/cards/p/PusKami.java @@ -30,7 +30,7 @@ public final class PusKami extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); // {B}, Sacrifice Pus Kami: Destroy target nonblack creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java b/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java index 46a083b3be1..78f0bf4a9ab 100644 --- a/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java +++ b/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java @@ -30,7 +30,7 @@ public final class PygmyPyrosaur extends CardImpl { // Pygmy Pyrosaur can't block. this.addAbility(new CantBlockAbility()); // {R}: Pygmy Pyrosaur 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 PygmyPyrosaur(final PygmyPyrosaur card) { diff --git a/Mage.Sets/src/mage/cards/p/PygmyTroll.java b/Mage.Sets/src/mage/cards/p/PygmyTroll.java index d023481edd0..67462b0cefc 100644 --- a/Mage.Sets/src/mage/cards/p/PygmyTroll.java +++ b/Mage.Sets/src/mage/cards/p/PygmyTroll.java @@ -31,7 +31,7 @@ public final class PygmyTroll extends CardImpl { this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false)); // {G}: Regenerate Pygmy Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private PygmyTroll(final PygmyTroll card) { diff --git a/Mage.Sets/src/mage/cards/p/Pyramids.java b/Mage.Sets/src/mage/cards/p/Pyramids.java index 24002b8bab7..d6b2cb597a8 100644 --- a/Mage.Sets/src/mage/cards/p/Pyramids.java +++ b/Mage.Sets/src/mage/cards/p/Pyramids.java @@ -37,7 +37,7 @@ public final class Pyramids extends CardImpl { // {2}: Choose one // - Destroy target Aura attached to a land - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetPermanent(filter)); // - The next time target land would be destroyed this turn, remove all damage marked on it instead. Mode mode = new Mode(new PyramidsEffect()); diff --git a/Mage.Sets/src/mage/cards/p/PyreCharger.java b/Mage.Sets/src/mage/cards/p/PyreCharger.java index 1997609e2a2..f6ed08c5694 100644 --- a/Mage.Sets/src/mage/cards/p/PyreCharger.java +++ b/Mage.Sets/src/mage/cards/p/PyreCharger.java @@ -29,7 +29,7 @@ public final class PyreCharger extends CardImpl { this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - 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 PyreCharger(final PyreCharger card) { diff --git a/Mage.Sets/src/mage/cards/p/PyreZombie.java b/Mage.Sets/src/mage/cards/p/PyreZombie.java index b6e7920bd8b..9a67214ee97 100644 --- a/Mage.Sets/src/mage/cards/p/PyreZombie.java +++ b/Mage.Sets/src/mage/cards/p/PyreZombie.java @@ -38,7 +38,7 @@ public final class PyreZombie extends CardImpl { false).withInterveningIf(SourceInGraveyardCondition.instance)); // {1}{R}{R}, Sacrifice Pyre Zombie: Pyre Zombie deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{1}{R}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java b/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java index e808e3e388d..3398aafe3d2 100644 --- a/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java +++ b/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java @@ -24,11 +24,11 @@ public final class PyriteSpellbomb extends CardImpl { public PyriteSpellbomb(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ColoredManaCost(ColoredManaSymbol.R)); + Ability firstAbility = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/p/Pyrohemia.java b/Mage.Sets/src/mage/cards/p/Pyrohemia.java index 523f6706252..5ebe14c9cdc 100644 --- a/Mage.Sets/src/mage/cards/p/Pyrohemia.java +++ b/Mage.Sets/src/mage/cards/p/Pyrohemia.java @@ -33,7 +33,7 @@ public final class Pyrohemia extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(triggered, new CreatureCountCondition(0, TargetController.ANY), ruleText)); // {R}: Pyrohemia deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new DamageEverythingEffect(1), new ManaCostsImpl<>("{R}"))); } private Pyrohemia(final Pyrohemia card) { diff --git a/Mage.Sets/src/mage/cards/p/Pyromancy.java b/Mage.Sets/src/mage/cards/p/Pyromancy.java index 18b43223f48..b0f22d43df9 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromancy.java +++ b/Mage.Sets/src/mage/cards/p/Pyromancy.java @@ -25,7 +25,7 @@ public final class Pyromancy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}"); // {3}, Discard a card at random: Pyromancy deals damage to any target equal to the converted mana cost of the discarded card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(DiscardCostCardManaValue.instance), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(DiscardCostCardManaValue.instance), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Pyromania.java b/Mage.Sets/src/mage/cards/p/Pyromania.java index 5f1b70ff3b1..b2f3cb62928 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromania.java +++ b/Mage.Sets/src/mage/cards/p/Pyromania.java @@ -24,12 +24,12 @@ public final class Pyromania extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // {1}{R}, Discard a card at random: Pyromania deals 1 damage to any target. - 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.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {1}{R}, Sacrifice Pyromania: Pyromania deals 1 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); -- 2.47.2 From f529030b95b40481cf553e74a63daa4a6d50698c Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:29:49 -0500 Subject: [PATCH 41/50] refactor: SimpleActivatedAbility default zone (cards Q R) --- Mage.Sets/src/mage/cards/q/QarsiHighPriest.java | 2 +- Mage.Sets/src/mage/cards/q/QasaliPridemage.java | 2 +- Mage.Sets/src/mage/cards/q/QuagmireDruid.java | 2 +- Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java | 6 +++--- Mage.Sets/src/mage/cards/q/QuicksilverDagger.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverDragon.java | 2 +- Mage.Sets/src/mage/cards/q/QuilledSliver.java | 2 +- Mage.Sets/src/mage/cards/q/QuilledWolf.java | 2 +- Mage.Sets/src/mage/cards/q/Quillspike.java | 2 +- Mage.Sets/src/mage/cards/q/QuirionDruid.java | 2 +- Mage.Sets/src/mage/cards/r/RabidRats.java | 2 +- Mage.Sets/src/mage/cards/r/RacecourseFury.java | 2 +- Mage.Sets/src/mage/cards/r/RadiantKavu.java | 2 +- Mage.Sets/src/mage/cards/r/RadjanSpirit.java | 2 +- Mage.Sets/src/mage/cards/r/RagDealer.java | 2 +- Mage.Sets/src/mage/cards/r/RageWeaver.java | 2 +- Mage.Sets/src/mage/cards/r/RagingRavine.java | 2 +- Mage.Sets/src/mage/cards/r/RagingSpirit.java | 2 +- Mage.Sets/src/mage/cards/r/Ragnar.java | 2 +- Mage.Sets/src/mage/cards/r/RaidingParty.java | 2 +- Mage.Sets/src/mage/cards/r/RainbowCrow.java | 2 +- Mage.Sets/src/mage/cards/r/RainbowEfreet.java | 2 +- Mage.Sets/src/mage/cards/r/RakaDisciple.java | 4 ++-- Mage.Sets/src/mage/cards/r/RakdosCluestone.java | 2 +- Mage.Sets/src/mage/cards/r/RakdosGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/r/RakdosIckspitter.java | 2 +- Mage.Sets/src/mage/cards/r/RakdosKeyrune.java | 2 +- Mage.Sets/src/mage/cards/r/RakdosLocket.java | 2 +- Mage.Sets/src/mage/cards/r/RakdosRingleader.java | 2 +- Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java | 4 ++-- Mage.Sets/src/mage/cards/r/RamosianCaptain.java | 2 +- Mage.Sets/src/mage/cards/r/RamosianCommander.java | 2 +- Mage.Sets/src/mage/cards/r/RamosianLieutenant.java | 2 +- Mage.Sets/src/mage/cards/r/RamosianRevivalist.java | 2 +- Mage.Sets/src/mage/cards/r/RamosianSergeant.java | 2 +- Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java | 2 +- Mage.Sets/src/mage/cards/r/RampantElephant.java | 2 +- Mage.Sets/src/mage/cards/r/RamsesOverdark.java | 2 +- Mage.Sets/src/mage/cards/r/RamunapRuins.java | 2 +- Mage.Sets/src/mage/cards/r/RangerEnVec.java | 2 +- Mage.Sets/src/mage/cards/r/RappellingScouts.java | 2 +- Mage.Sets/src/mage/cards/r/RashidaScalebane.java | 2 +- Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java | 2 +- Mage.Sets/src/mage/cards/r/RatchetBomb.java | 4 ++-- Mage.Sets/src/mage/cards/r/RathiAssassin.java | 4 ++-- Mage.Sets/src/mage/cards/r/RathiFiend.java | 2 +- Mage.Sets/src/mage/cards/r/RathiIntimidator.java | 2 +- Mage.Sets/src/mage/cards/r/RathiTrapper.java | 2 +- Mage.Sets/src/mage/cards/r/RathsEdge.java | 2 +- Mage.Sets/src/mage/cards/r/RatsOfRath.java | 2 +- Mage.Sets/src/mage/cards/r/RavenousBaloth.java | 2 +- Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java | 2 +- Mage.Sets/src/mage/cards/r/RavenousIntruder.java | 2 +- Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java | 2 +- Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java | 2 +- Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java | 2 +- Mage.Sets/src/mage/cards/r/RazorfinHunter.java | 2 +- Mage.Sets/src/mage/cards/r/RazortipWhip.java | 2 +- Mage.Sets/src/mage/cards/r/RealmSeekers.java | 2 +- Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java | 4 ++-- Mage.Sets/src/mage/cards/r/RebelInformer.java | 2 +- Mage.Sets/src/mage/cards/r/Recantation.java | 2 +- Mage.Sets/src/mage/cards/r/RecklessAssault.java | 2 +- Mage.Sets/src/mage/cards/r/RecklessEmbermage.java | 2 +- Mage.Sets/src/mage/cards/r/RecklessReveler.java | 2 +- Mage.Sets/src/mage/cards/r/RecklessScholar.java | 2 +- Mage.Sets/src/mage/cards/r/Reconnaissance.java | 2 +- Mage.Sets/src/mage/cards/r/ReefShaman.java | 2 +- Mage.Sets/src/mage/cards/r/Regeneration.java | 2 +- Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java | 2 +- Mage.Sets/src/mage/cards/r/ReitoLantern.java | 2 +- Mage.Sets/src/mage/cards/r/RejuvenationChamber.java | 2 +- Mage.Sets/src/mage/cards/r/RelentlessHunter.java | 2 +- Mage.Sets/src/mage/cards/r/RelicBarrier.java | 2 +- Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java | 4 ++-- Mage.Sets/src/mage/cards/r/RemorsefulCleric.java | 2 +- Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java | 2 +- Mage.Sets/src/mage/cards/r/RenownedWeaver.java | 2 +- Mage.Sets/src/mage/cards/r/ResearchAssistant.java | 2 +- Mage.Sets/src/mage/cards/r/ResilientWanderer.java | 3 +-- Mage.Sets/src/mage/cards/r/ResistanceFighter.java | 2 +- Mage.Sets/src/mage/cards/r/ResplendentMentor.java | 2 +- Mage.Sets/src/mage/cards/r/RestlessApparition.java | 2 +- Mage.Sets/src/mage/cards/r/RestlessBones.java | 4 ++-- Mage.Sets/src/mage/cards/r/RestlessDead.java | 2 +- Mage.Sets/src/mage/cards/r/RetractionHelix.java | 2 +- Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java | 2 +- Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java | 2 +- Mage.Sets/src/mage/cards/r/ReveredDead.java | 2 +- Mage.Sets/src/mage/cards/r/ReveredElder.java | 2 +- Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java | 2 +- Mage.Sets/src/mage/cards/r/Rhox.java | 2 +- Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java | 4 ++-- Mage.Sets/src/mage/cards/r/RhysticDeluge.java | 2 +- Mage.Sets/src/mage/cards/r/RibbonSnake.java | 2 +- Mage.Sets/src/mage/cards/r/Riddleform.java | 2 +- Mage.Sets/src/mage/cards/r/RidgedKusite.java | 2 +- Mage.Sets/src/mage/cards/r/RidgelineRager.java | 2 +- Mage.Sets/src/mage/cards/r/RiftElemental.java | 2 +- Mage.Sets/src/mage/cards/r/RighteousAura.java | 2 +- Mage.Sets/src/mage/cards/r/RimeTransfusion.java | 2 +- Mage.Sets/src/mage/cards/r/RimeboundDead.java | 2 +- Mage.Sets/src/mage/cards/r/RingOfGix.java | 2 +- Mage.Sets/src/mage/cards/r/RingOfImmortals.java | 2 +- Mage.Sets/src/mage/cards/r/RingOfMaruf.java | 2 +- Mage.Sets/src/mage/cards/r/RingOfRenewal.java | 2 +- Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideChronologist.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideLaboratory.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideReplicator.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java | 2 +- Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java | 2 +- Mage.Sets/src/mage/cards/r/RishadanPawnshop.java | 2 +- Mage.Sets/src/mage/cards/r/RishadanPort.java | 2 +- Mage.Sets/src/mage/cards/r/RiverBoa.java | 2 +- Mage.Sets/src/mage/cards/r/RiverHoopoe.java | 2 +- Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java | 6 +++--- Mage.Sets/src/mage/cards/r/RockHydra.java | 2 +- Mage.Sets/src/mage/cards/r/RodOfRuin.java | 2 +- Mage.Sets/src/mage/cards/r/RodOfSpanking.java | 2 +- Mage.Sets/src/mage/cards/r/RoguesPassage.java | 2 +- Mage.Sets/src/mage/cards/r/RonomUnicorn.java | 2 +- Mage.Sets/src/mage/cards/r/RoofstalkerWight.java | 2 +- Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java | 2 +- Mage.Sets/src/mage/cards/r/RootGreevil.java | 2 +- Mage.Sets/src/mage/cards/r/RootKinAlly.java | 2 +- Mage.Sets/src/mage/cards/r/Rootrunner.java | 2 +- Mage.Sets/src/mage/cards/r/RootwaterAlligator.java | 2 +- Mage.Sets/src/mage/cards/r/RootwaterHunter.java | 2 +- Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java | 2 +- Mage.Sets/src/mage/cards/r/RootwaterMystic.java | 2 +- Mage.Sets/src/mage/cards/r/RoyalAssassin.java | 2 +- Mage.Sets/src/mage/cards/r/RoyalHerbalist.java | 2 +- Mage.Sets/src/mage/cards/r/RuinGhost.java | 2 +- Mage.Sets/src/mage/cards/r/RuinousGremlin.java | 2 +- Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java | 2 +- Mage.Sets/src/mage/cards/r/RumblingCrescendo.java | 2 +- Mage.Sets/src/mage/cards/r/RummagingGoblin.java | 2 +- Mage.Sets/src/mage/cards/r/RunWild.java | 2 +- Mage.Sets/src/mage/cards/r/RuneCervinRider.java | 2 +- Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java | 2 +- Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java | 2 +- Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java | 2 +- Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java | 2 +- Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java | 2 +- Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java | 2 +- Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java | 2 +- Mage.Sets/src/mage/cards/r/Runesword.java | 2 +- Mage.Sets/src/mage/cards/r/RushwoodGrove.java | 2 +- Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java | 2 +- Mage.Sets/src/mage/cards/r/RustTick.java | 2 +- Mage.Sets/src/mage/cards/r/RustedSlasher.java | 2 +- Mage.Sets/src/mage/cards/r/RuthlessKnave.java | 2 +- 153 files changed, 166 insertions(+), 167 deletions(-) diff --git a/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java b/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java index 0efe20e02ad..6d7578c2ff1 100644 --- a/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java +++ b/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java @@ -31,7 +31,7 @@ public final class QarsiHighPriest extends CardImpl { this.toughness = new MageInt(2); // {1}{B}, {t}, Sacrifice another creature: Manifest the top card of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ManifestEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new ManifestEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/q/QasaliPridemage.java b/Mage.Sets/src/mage/cards/q/QasaliPridemage.java index cdc15a7eb65..88f63911079 100644 --- a/Mage.Sets/src/mage/cards/q/QasaliPridemage.java +++ b/Mage.Sets/src/mage/cards/q/QasaliPridemage.java @@ -36,7 +36,7 @@ public final class QasaliPridemage extends CardImpl { this.addAbility(new ExaltedAbility()); // {1}, Sacrifice Qasali Pridemage: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); Target target = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/q/QuagmireDruid.java b/Mage.Sets/src/mage/cards/q/QuagmireDruid.java index 1120474ca79..c0a3de747ca 100644 --- a/Mage.Sets/src/mage/cards/q/QuagmireDruid.java +++ b/Mage.Sets/src/mage/cards/q/QuagmireDruid.java @@ -34,7 +34,7 @@ public final class QuagmireDruid extends CardImpl { this.toughness = new MageInt(2); // {G}, {T}, Sacrifice a creature: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java index 831e428ec22..561dc838e7a 100644 --- a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java +++ b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java @@ -37,21 +37,21 @@ public final class QuestingPhelddagrif extends CardImpl { this.toughness = new MageInt(4); // {G}: Questing Phelddagrif gets +1/+1 until end of turn. Target opponent creates a 1/1 green Hippo creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addEffect(new CreateTokenTargetEffect(new HippoToken())); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {W}: Questing Phelddagrif gains protection from black and from red until end of turn. Target opponent gains 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), + ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addEffect(new GainLifeTargetEffect(2)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {U}: Questing Phelddagrif gains flying until end of turn. Target opponent may draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), + ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addEffect(new DrawCardTargetEffect(1, true)); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java index 69b83129fa1..91eccb9a09c 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java @@ -41,7 +41,7 @@ public final class QuicksilverDagger extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to target player. You draw a card." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); gainAbility.addTarget(new TargetPlayerOrPlaneswalker()); gainAbility.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java index 610782b724f..99a6a9a5632 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java @@ -38,7 +38,7 @@ public final class QuicksilverDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: If target spell has only one target and that target is Quicksilver Dragon, change that spell's target to another creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new QuicksilverDragonEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new QuicksilverDragonEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/q/QuilledSliver.java b/Mage.Sets/src/mage/cards/q/QuilledSliver.java index 82cc91da7a6..a753f336d9c 100644 --- a/Mage.Sets/src/mage/cards/q/QuilledSliver.java +++ b/Mage.Sets/src/mage/cards/q/QuilledSliver.java @@ -37,7 +37,7 @@ public final class QuilledSliver extends CardImpl { this.toughness = new MageInt(1); // All Slivers have "{tap}: This permanent deals 1 damage to target attacking or blocking creature." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, diff --git a/Mage.Sets/src/mage/cards/q/QuilledWolf.java b/Mage.Sets/src/mage/cards/q/QuilledWolf.java index 90c03fb76de..433191a4838 100644 --- a/Mage.Sets/src/mage/cards/q/QuilledWolf.java +++ b/Mage.Sets/src/mage/cards/q/QuilledWolf.java @@ -26,7 +26,7 @@ public final class QuilledWolf extends CardImpl { this.toughness = new MageInt(2); // {5}{G}: Quilled Wolf gets +4/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{5}{G}"))); } private QuilledWolf(final QuilledWolf card) { diff --git a/Mage.Sets/src/mage/cards/q/Quillspike.java b/Mage.Sets/src/mage/cards/q/Quillspike.java index 4c5d820b33b..be4613b38a2 100644 --- a/Mage.Sets/src/mage/cards/q/Quillspike.java +++ b/Mage.Sets/src/mage/cards/q/Quillspike.java @@ -33,7 +33,7 @@ public final class Quillspike extends CardImpl { this.toughness = new MageInt(1); // {BG}, Remove a -1/-1 counter from a creature you control: Quillspike gets +3/+3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{B/G}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{B/G}")); TargetPermanent target = new TargetPermanent(1, 1, StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED, true); ability.addCost(new RemoveCounterCost(target, CounterType.M1M1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/q/QuirionDruid.java b/Mage.Sets/src/mage/cards/q/QuirionDruid.java index 950220e99f6..bb24a6a8423 100644 --- a/Mage.Sets/src/mage/cards/q/QuirionDruid.java +++ b/Mage.Sets/src/mage/cards/q/QuirionDruid.java @@ -35,7 +35,7 @@ public final class QuirionDruid extends CardImpl { this.toughness = new MageInt(2); // {G}, {T}: Target land becomes a 2/2 green creature that’s still a land. (This effect lasts indefinitely.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new QuirionDruidToken(), false, true, Duration.Custom), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect(new QuirionDruidToken(), false, true, Duration.Custom), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RabidRats.java b/Mage.Sets/src/mage/cards/r/RabidRats.java index 92e42e6be85..77a86379821 100644 --- a/Mage.Sets/src/mage/cards/r/RabidRats.java +++ b/Mage.Sets/src/mage/cards/r/RabidRats.java @@ -29,7 +29,7 @@ public final class RabidRats extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target blocking creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RacecourseFury.java b/Mage.Sets/src/mage/cards/r/RacecourseFury.java index d5ec8eb54cc..bba3d2a1497 100644 --- a/Mage.Sets/src/mage/cards/r/RacecourseFury.java +++ b/Mage.Sets/src/mage/cards/r/RacecourseFury.java @@ -45,7 +45,7 @@ public final class RacecourseFury extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Target creature gains haste until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/cards/r/RadiantKavu.java b/Mage.Sets/src/mage/cards/r/RadiantKavu.java index 21707b1cabf..3df303c362d 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantKavu.java +++ b/Mage.Sets/src/mage/cards/r/RadiantKavu.java @@ -35,7 +35,7 @@ public final class RadiantKavu extends CardImpl { this.toughness = new MageInt(3); // {R}{G}{W}: Prevent all combat damage blue creatures and black creatures would deal this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, (new PreventAllDamageByAllPermanentsEffect(filter, + this.addAbility(new SimpleActivatedAbility((new PreventAllDamageByAllPermanentsEffect(filter, Duration.EndOfTurn, true)), new ManaCostsImpl<>("{R}{G}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RadjanSpirit.java b/Mage.Sets/src/mage/cards/r/RadjanSpirit.java index 2182ea6cfc5..47895314868 100644 --- a/Mage.Sets/src/mage/cards/r/RadjanSpirit.java +++ b/Mage.Sets/src/mage/cards/r/RadjanSpirit.java @@ -30,7 +30,7 @@ public final class RadjanSpirit extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature loses flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RagDealer.java b/Mage.Sets/src/mage/cards/r/RagDealer.java index fec9163fb01..fb91ae378f7 100644 --- a/Mage.Sets/src/mage/cards/r/RagDealer.java +++ b/Mage.Sets/src/mage/cards/r/RagDealer.java @@ -30,7 +30,7 @@ public final class RagDealer extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, {T}: Exile up to three target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 3, StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RageWeaver.java b/Mage.Sets/src/mage/cards/r/RageWeaver.java index e644004518e..293a3e8f18e 100644 --- a/Mage.Sets/src/mage/cards/r/RageWeaver.java +++ b/Mage.Sets/src/mage/cards/r/RageWeaver.java @@ -41,7 +41,7 @@ public final class RageWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RagingRavine.java b/Mage.Sets/src/mage/cards/r/RagingRavine.java index eb7afb16a7a..bbd02a65bdd 100644 --- a/Mage.Sets/src/mage/cards/r/RagingRavine.java +++ b/Mage.Sets/src/mage/cards/r/RagingRavine.java @@ -43,7 +43,7 @@ public final class RagingRavine extends CardImpl { CardType.LAND, Duration.EndOfTurn); effect.setText("Until end of turn, {this} becomes a 3/3 red and green Elemental creature"); // {2}{R}{G}: Until end of turn, Raging Ravine becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{R}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{R}{G}")); effect = new GainAbilitySourceEffect(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), Duration.EndOfTurn); effect.setText("with \"Whenever this creature attacks, put a +1/+1 counter on it.\" It's still a land"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RagingSpirit.java b/Mage.Sets/src/mage/cards/r/RagingSpirit.java index f82f0bd60b2..c2af42b7448 100644 --- a/Mage.Sets/src/mage/cards/r/RagingSpirit.java +++ b/Mage.Sets/src/mage/cards/r/RagingSpirit.java @@ -27,7 +27,7 @@ public final class RagingSpirit extends CardImpl { this.toughness = new MageInt(3); // {2}: Raging Spirit becomes colorless until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private RagingSpirit(final RagingSpirit card) { diff --git a/Mage.Sets/src/mage/cards/r/Ragnar.java b/Mage.Sets/src/mage/cards/r/Ragnar.java index f5325d187f2..d59b4c7005f 100644 --- a/Mage.Sets/src/mage/cards/r/Ragnar.java +++ b/Mage.Sets/src/mage/cards/r/Ragnar.java @@ -31,7 +31,7 @@ public final class Ragnar extends CardImpl { this.toughness = new MageInt(2); // {G}{W}{U}, {tap}: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}{W}{U}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}{W}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RaidingParty.java b/Mage.Sets/src/mage/cards/r/RaidingParty.java index aefa5d7112b..4284c5b0a1a 100644 --- a/Mage.Sets/src/mage/cards/r/RaidingParty.java +++ b/Mage.Sets/src/mage/cards/r/RaidingParty.java @@ -51,7 +51,7 @@ public final class RaidingParty extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); // Sacrifice an Orc: Each player may tap any number of untapped white creatures they control. For each creature tapped this way, that player chooses up to two Plains. Then destroy all Plains that weren't chosen this way by any player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RaidingPartyEffect(), new SacrificeTargetCost(filterOrc))); + this.addAbility(new SimpleActivatedAbility(new RaidingPartyEffect(), new SacrificeTargetCost(filterOrc))); } private RaidingParty(final RaidingParty card) { diff --git a/Mage.Sets/src/mage/cards/r/RainbowCrow.java b/Mage.Sets/src/mage/cards/r/RainbowCrow.java index 0de48439e64..2e23d459411 100644 --- a/Mage.Sets/src/mage/cards/r/RainbowCrow.java +++ b/Mage.Sets/src/mage/cards/r/RainbowCrow.java @@ -31,7 +31,7 @@ public final class RainbowCrow extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // // {1}: Rainbow Crow becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private RainbowCrow(final RainbowCrow card) { diff --git a/Mage.Sets/src/mage/cards/r/RainbowEfreet.java b/Mage.Sets/src/mage/cards/r/RainbowEfreet.java index fde2f266746..1a6e811f622 100644 --- a/Mage.Sets/src/mage/cards/r/RainbowEfreet.java +++ b/Mage.Sets/src/mage/cards/r/RainbowEfreet.java @@ -29,7 +29,7 @@ public final class RainbowEfreet extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}{U}: Rainbow Efreet phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutSourceEffect(), new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new PhaseOutSourceEffect(), new ManaCostsImpl<>("{U}{U}"))); } private RainbowEfreet(final RainbowEfreet card) { diff --git a/Mage.Sets/src/mage/cards/r/RakaDisciple.java b/Mage.Sets/src/mage/cards/r/RakaDisciple.java index 46e657ccb4a..c62e6277588 100644 --- a/Mage.Sets/src/mage/cards/r/RakaDisciple.java +++ b/Mage.Sets/src/mage/cards/r/RakaDisciple.java @@ -28,11 +28,11 @@ public final class RakaDisciple extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); + Ability firstAbility = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); + Ability secondAbility = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/r/RakdosCluestone.java b/Mage.Sets/src/mage/cards/r/RakdosCluestone.java index f0ca410a806..482c7ad7e4b 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosCluestone.java +++ b/Mage.Sets/src/mage/cards/r/RakdosCluestone.java @@ -32,7 +32,7 @@ public final class RakdosCluestone extends CardImpl { this.addAbility(new RedManaAbility()); // {B}{R}, {T}, Sacrifice Rakdos Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java index 031d9bf00dc..141b0fb98e5 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java +++ b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java @@ -36,13 +36,13 @@ public final class RakdosGuildmage extends CardImpl { // ({BR} can be paid with either {B} or {R}.) // {3}{B}, Discard a card: Target creature gets -2/-2 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // {3}{R}: Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RakdosGuildmageEffect(), new ManaCostsImpl<>("{3}{R}")); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(new RakdosGuildmageEffect(), new ManaCostsImpl<>("{3}{R}")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java b/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java index 9508daf5385..6663a117d8c 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java +++ b/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java @@ -29,7 +29,7 @@ public final class RakdosIckspitter extends CardImpl { this.toughness = new MageInt(1); // {tap}: Rakdos Ickspitter deals 1 damage to target creature and that creature's controller loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); Effect effect = new LoseLifeTargetControllerEffect(1); effect.setText("and that creature's controller loses 1 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java index c7c8968fc95..c2d9a9f4018 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java +++ b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java @@ -30,7 +30,7 @@ public final class RakdosKeyrune extends CardImpl { this.addAbility(new RedManaAbility()); // {B}{R}: Rakdos Keyrune becomes a 3/1 black and red Devil artifact creature with first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); } private RakdosKeyrune(final RakdosKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosLocket.java b/Mage.Sets/src/mage/cards/r/RakdosLocket.java index a7fc9e3ebaa..ef679d908fd 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosLocket.java +++ b/Mage.Sets/src/mage/cards/r/RakdosLocket.java @@ -28,7 +28,7 @@ public final class RakdosLocket extends CardImpl { this.addAbility(new RedManaAbility()); // {B/R}{B/R}{B/R}{B/R}, {T}, Sacrifice Rakdos Locket: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{B/R}{B/R}{B/R}{B/R}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{B/R}{B/R}{B/R}{B/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RakdosRingleader.java b/Mage.Sets/src/mage/cards/r/RakdosRingleader.java index 25d1c1d7a49..88907565494 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosRingleader.java +++ b/Mage.Sets/src/mage/cards/r/RakdosRingleader.java @@ -36,7 +36,7 @@ public final class RakdosRingleader extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1, true), false, true)); // {B}: Regenerate Rakdos Ringleader. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private RakdosRingleader(final RakdosRingleader card) { diff --git a/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java b/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java index 903e3b0bb77..0b504464ab6 100644 --- a/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java +++ b/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java @@ -28,9 +28,9 @@ public final class RakshasaDeathdealer extends CardImpl { this.toughness = new MageInt(2); // {B}{G}: Rakshasa Deathdealer gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); // {B}{G}: Regenerate Rakshasa Deathdealer. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{G}"))); } private RakshasaDeathdealer(final RakshasaDeathdealer card) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java index 291831096f1..f6c7e17b4b6 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java @@ -43,7 +43,7 @@ public final class RamosianCaptain extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {5}, {T}: Search your library for a Rebel permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianCommander.java b/Mage.Sets/src/mage/cards/r/RamosianCommander.java index f005b32bbc1..08b1b743810 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCommander.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCommander.java @@ -39,7 +39,7 @@ public final class RamosianCommander extends CardImpl { this.toughness = new MageInt(4); // {6}, {T}: Search your library for a Rebel permanent card with converted mana cost 5 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(6)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java index 9addd4cee58..8ba98f33ae7 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java @@ -39,7 +39,7 @@ public final class RamosianLieutenant extends CardImpl { this.toughness = new MageInt(2); // {4}, {T}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(4)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java index bfda4bedcbc..d3b00479ed7 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java +++ b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java @@ -40,7 +40,7 @@ public final class RamosianRevivalist extends CardImpl { this.toughness = new MageInt(2); // {6}, {tap}: Return target Rebel permanent card with converted mana cost 5 or less from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(6)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java index e2b592925d6..67e300f212a 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java @@ -38,7 +38,7 @@ public final class RamosianSergeant extends CardImpl { this.toughness = new MageInt(1); // {3}, {T}: Search your library for a Rebel permanent card with converted mana cost 2 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java index 71fc7fb68ef..20a8ec932bb 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java @@ -44,7 +44,7 @@ public final class RamosianSkyMarshal extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {7}, {T}: Search your library for a Rebel permanent card with converted mana cost 6 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(7)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RampantElephant.java b/Mage.Sets/src/mage/cards/r/RampantElephant.java index f932376d12e..21be7ec0f9e 100644 --- a/Mage.Sets/src/mage/cards/r/RampantElephant.java +++ b/Mage.Sets/src/mage/cards/r/RampantElephant.java @@ -27,7 +27,7 @@ public final class RampantElephant extends CardImpl { this.toughness = new MageInt(2); // {G}: Target creature blocks Rampant Elephant this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamsesOverdark.java b/Mage.Sets/src/mage/cards/r/RamsesOverdark.java index d5b2b9c4b81..93a86234a2a 100644 --- a/Mage.Sets/src/mage/cards/r/RamsesOverdark.java +++ b/Mage.Sets/src/mage/cards/r/RamsesOverdark.java @@ -38,7 +38,7 @@ public final class RamsesOverdark extends CardImpl { this.toughness = new MageInt(3); // {tap}: Destroy target enchanted creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamunapRuins.java b/Mage.Sets/src/mage/cards/r/RamunapRuins.java index 9549f6155e1..bae168f7d0c 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapRuins.java +++ b/Mage.Sets/src/mage/cards/r/RamunapRuins.java @@ -48,7 +48,7 @@ public final class RamunapRuins extends CardImpl { this.addAbility(manaAbility); // {2}{R}{R}, {t}, Sacrifice a Desert: Ramunap Ruins deals 2 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(Outcome.Damage, StaticValue.get(2), TargetController.OPPONENT), + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(Outcome.Damage, StaticValue.get(2), TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/r/RangerEnVec.java b/Mage.Sets/src/mage/cards/r/RangerEnVec.java index ef35032fd7d..e39b8bd6ab4 100644 --- a/Mage.Sets/src/mage/cards/r/RangerEnVec.java +++ b/Mage.Sets/src/mage/cards/r/RangerEnVec.java @@ -31,7 +31,7 @@ public final class RangerEnVec extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); } private RangerEnVec(final RangerEnVec card) { diff --git a/Mage.Sets/src/mage/cards/r/RappellingScouts.java b/Mage.Sets/src/mage/cards/r/RappellingScouts.java index f8aaf6a5432..9b9d8d18d2d 100644 --- a/Mage.Sets/src/mage/cards/r/RappellingScouts.java +++ b/Mage.Sets/src/mage/cards/r/RappellingScouts.java @@ -31,7 +31,7 @@ public final class RappellingScouts extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{W}: Rappelling Scouts gains protection from the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); } private RappellingScouts(final RappellingScouts card) { diff --git a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java index 3af693111ef..9e93758cf35 100644 --- a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java +++ b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java @@ -44,7 +44,7 @@ public final class RashidaScalebane extends CardImpl { this.toughness = new MageInt(4); // {tap}: Destroy target attacking or blocking Dragon. It can't be regenerated. You gain life equal to its power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new TapSourceCost()); Effect effect = new GainLifeEffect(TargetPermanentPowerCount.instance); effect.setText("You gain life equal to its power"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java index ce6db651f63..ae03012f912 100644 --- a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java +++ b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java @@ -51,7 +51,7 @@ public final class RasputinDreamweaver extends CardImpl { new CountersSourceCount(CounterType.DREAM))); // Remove a dream counter from Rasputin: Prevent the next 1 damage that would be dealt to Rasputin this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new RemoveCountersSourceCost(CounterType.DREAM.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new RemoveCountersSourceCost(CounterType.DREAM.createInstance()))); // At the beginning of your upkeep, if Rasputin started the turn untapped, put a dream counter on it. this.addAbility( diff --git a/Mage.Sets/src/mage/cards/r/RatchetBomb.java b/Mage.Sets/src/mage/cards/r/RatchetBomb.java index c6668d48da6..12693d8b64b 100644 --- a/Mage.Sets/src/mage/cards/r/RatchetBomb.java +++ b/Mage.Sets/src/mage/cards/r/RatchetBomb.java @@ -27,10 +27,10 @@ public final class RatchetBomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {T}: Put a charge counter on Ratchet Bomb. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); // {T}, Sacrifice Ratchet Bomb: Destroy each nonland permanent with a converted mana cost equal to the number of charge counters on Ratchet Bomb. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RatchetBombEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RatchetBombEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RathiAssassin.java b/Mage.Sets/src/mage/cards/r/RathiAssassin.java index 494c62f650a..7e5ae73b63b 100644 --- a/Mage.Sets/src/mage/cards/r/RathiAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RathiAssassin.java @@ -53,13 +53,13 @@ public final class RathiAssassin extends CardImpl { this.toughness = new MageInt(2); // {1}{B}{B}, {T}: Destroy target tapped nonblack creature. - Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}{B}")); + Ability destroyAbility = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}{B}")); destroyAbility.addCost(new TapSourceCost()); destroyAbility.addTarget(new TargetCreaturePermanent(destroyFilter)); this.addAbility(destroyAbility); // {3}, {T}: Search your library for a Mercenary permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RathiFiend.java b/Mage.Sets/src/mage/cards/r/RathiFiend.java index 33fd7ba6e00..fe2d80ec7d7 100644 --- a/Mage.Sets/src/mage/cards/r/RathiFiend.java +++ b/Mage.Sets/src/mage/cards/r/RathiFiend.java @@ -45,7 +45,7 @@ public final class RathiFiend extends CardImpl { // When Rathi Fiend enters the battlefield, each player loses 3 life. this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeAllPlayersEffect(3), false)); // {3}, {T}: Search your library for a Mercenary permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java index ef24ef2eff6..a10d31b8a5b 100644 --- a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java +++ b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java @@ -43,7 +43,7 @@ public final class RathiIntimidator extends CardImpl { this.addAbility(FearAbility.getInstance()); // {2}, {T}: Search your library for a Mercenary permanent card with converted mana cost 2 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RathiTrapper.java b/Mage.Sets/src/mage/cards/r/RathiTrapper.java index c4fcd7f8b10..71db310be2d 100644 --- a/Mage.Sets/src/mage/cards/r/RathiTrapper.java +++ b/Mage.Sets/src/mage/cards/r/RathiTrapper.java @@ -31,7 +31,7 @@ public final class RathiTrapper extends CardImpl { this.toughness = new MageInt(2); // {B}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RathsEdge.java b/Mage.Sets/src/mage/cards/r/RathsEdge.java index 4ab90ece4e1..cb4795c4c5d 100644 --- a/Mage.Sets/src/mage/cards/r/RathsEdge.java +++ b/Mage.Sets/src/mage/cards/r/RathsEdge.java @@ -33,7 +33,7 @@ public final class RathsEdge extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {4}, {tap}, Sacrifice a land: Rath's Edge deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RatsOfRath.java b/Mage.Sets/src/mage/cards/r/RatsOfRath.java index bf971bcc6ee..85c464e026e 100644 --- a/Mage.Sets/src/mage/cards/r/RatsOfRath.java +++ b/Mage.Sets/src/mage/cards/r/RatsOfRath.java @@ -44,7 +44,7 @@ public final class RatsOfRath extends CardImpl { // {B}: Destroy target artifact, creature, or land you control. Effect effect = new DestroyTargetEffect(); effect.setOutcome(Outcome.AIDontUseIt); // AI can't handle this - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(effect, new ColoredManaCost(ColoredManaSymbol.B)); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RavenousBaloth.java b/Mage.Sets/src/mage/cards/r/RavenousBaloth.java index 71bfccd8872..f7eaa7f50cc 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousBaloth.java +++ b/Mage.Sets/src/mage/cards/r/RavenousBaloth.java @@ -29,7 +29,7 @@ public final class RavenousBaloth extends CardImpl { this.toughness = new MageInt(4); // Sacrifice a Beast: You gain 4 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(4), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java b/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java index 66e2d6d21fb..a8efb23d205 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java +++ b/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java @@ -27,7 +27,7 @@ public final class RavenousBloodseeker extends CardImpl { this.toughness = new MageInt(3); // Discard a card: Ravenous Bloodseeker gets +2/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new DiscardCardCost())); } private RavenousBloodseeker(final RavenousBloodseeker card) { diff --git a/Mage.Sets/src/mage/cards/r/RavenousIntruder.java b/Mage.Sets/src/mage/cards/r/RavenousIntruder.java index c8c3561eaf9..327eb151b79 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousIntruder.java +++ b/Mage.Sets/src/mage/cards/r/RavenousIntruder.java @@ -35,7 +35,7 @@ public final class RavenousIntruder extends CardImpl { this.toughness = new MageInt(2); // Sacrifice an artifact: Ravenous Intruder gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); } private RavenousIntruder(final RavenousIntruder card) { diff --git a/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java b/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java index f16bc876ea3..e14ec9c7c74 100644 --- a/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java +++ b/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java @@ -41,7 +41,7 @@ public final class RazakethTheFoulblooded extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Pay 2 life, Sacrifice another creature: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new PayLifeCost(2)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new PayLifeCost(2)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java index 950660d97d7..efe756e5831 100644 --- a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java @@ -52,7 +52,7 @@ public final class RaziaBorosArchangel extends CardImpl { // {T}: The next 3 damage that would be dealt to target creature you control this turn is dealt to another target creature instead. Effect effect = new RaziaBorosArchangelEffect(Duration.EndOfTurn, 3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); Target target = new TargetControlledCreaturePermanent(); target.setTargetTag(1); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java b/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java index 52d466341f4..5eb4ebe3cbf 100644 --- a/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java +++ b/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java @@ -39,7 +39,7 @@ public final class RazorfinAbolisher extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: Return target creature with a counter on it to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/r/RazorfinHunter.java b/Mage.Sets/src/mage/cards/r/RazorfinHunter.java index 33a523dff9d..d946e016fce 100644 --- a/Mage.Sets/src/mage/cards/r/RazorfinHunter.java +++ b/Mage.Sets/src/mage/cards/r/RazorfinHunter.java @@ -28,7 +28,7 @@ public final class RazorfinHunter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - 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/r/RazortipWhip.java b/Mage.Sets/src/mage/cards/r/RazortipWhip.java index 2ed2549ece5..96aa6b4d1aa 100644 --- a/Mage.Sets/src/mage/cards/r/RazortipWhip.java +++ b/Mage.Sets/src/mage/cards/r/RazortipWhip.java @@ -23,7 +23,7 @@ public final class RazortipWhip extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {1}, {tap}: Razortip Whip deals 1 damage to target opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RealmSeekers.java b/Mage.Sets/src/mage/cards/r/RealmSeekers.java index 86a0368257d..2047230781f 100644 --- a/Mage.Sets/src/mage/cards/r/RealmSeekers.java +++ b/Mage.Sets/src/mage/cards/r/RealmSeekers.java @@ -42,7 +42,7 @@ public final class RealmSeekers extends CardImpl { "with X +1/+1 counters on it, where X is the total number of cards in all players' hands")); // {2}{G}, Remove a +1/+1 counter from Realm Seekers: Search your library for a land card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterLandCard()), true), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterLandCard()), true), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java b/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java index 2e1c087fc35..6995996db26 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java @@ -33,9 +33,9 @@ public final class ReaperOfTheWilds extends CardImpl { // Whenever another creature dies, scry 1. this.addAbility(new DiesCreatureTriggeredAbility(new ScryEffect(1, false), false, true)); // {B}: Reaper of the Wilds gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {1}{G}: Reaper of the Wilds gains hexproof until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private ReaperOfTheWilds(final ReaperOfTheWilds card) { diff --git a/Mage.Sets/src/mage/cards/r/RebelInformer.java b/Mage.Sets/src/mage/cards/r/RebelInformer.java index 7dfd244380f..ab8004124b6 100644 --- a/Mage.Sets/src/mage/cards/r/RebelInformer.java +++ b/Mage.Sets/src/mage/cards/r/RebelInformer.java @@ -50,7 +50,7 @@ public final class RebelInformer extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); // {3}: Put target nontoken Rebel on the bottom of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); ability.addTarget(new TargetPermanent(filterRebel)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/Recantation.java b/Mage.Sets/src/mage/cards/r/Recantation.java index 6848bf4e656..227c19ebd45 100644 --- a/Mage.Sets/src/mage/cards/r/Recantation.java +++ b/Mage.Sets/src/mage/cards/r/Recantation.java @@ -36,7 +36,7 @@ public final class Recantation extends CardImpl { // {U}, Sacrifice Recantation: Return up to X target permanents to their owners' hands, where X is the number of verse counters on Recantation. Effect effect = new ReturnToHandTargetEffect(); effect.setText("Return up to X target permanents to their owners' hands, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, new FilterPermanent("up to X target permanents, where X is the number of verse counters on {this}."), false)); ability.setTargetAdjuster(new TargetsCountAdjuster(new CountersSourceCount(CounterType.VERSE))); diff --git a/Mage.Sets/src/mage/cards/r/RecklessAssault.java b/Mage.Sets/src/mage/cards/r/RecklessAssault.java index a84a9b4ead0..72b3262da42 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAssault.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAssault.java @@ -24,7 +24,7 @@ public final class RecklessAssault extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{R}"); // {1}, Pay 2 life: Reckless Assault deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new PayLifeCost(2)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java index 03f5da202c6..9446db91015 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java +++ b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java @@ -30,7 +30,7 @@ public final class RecklessEmbermage extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Reckless Embermage deals 1 damage to any target and 1 damage to itself. - 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.addEffect(new DamageSelfEffect(1).setText("and 1 damage to itself")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RecklessReveler.java b/Mage.Sets/src/mage/cards/r/RecklessReveler.java index 42864228173..0f49bb5b6ca 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessReveler.java +++ b/Mage.Sets/src/mage/cards/r/RecklessReveler.java @@ -29,7 +29,7 @@ public final class RecklessReveler extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Reckless Reveler: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/r/RecklessScholar.java b/Mage.Sets/src/mage/cards/r/RecklessScholar.java index d55eaaf39d3..6606208497d 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessScholar.java +++ b/Mage.Sets/src/mage/cards/r/RecklessScholar.java @@ -29,7 +29,7 @@ public final class RecklessScholar extends CardImpl { this.toughness = new MageInt(1); // {T}: Target player draws a card, then discards a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardTargetEffect(1, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawDiscardTargetEffect(1, 1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/Reconnaissance.java b/Mage.Sets/src/mage/cards/r/Reconnaissance.java index 2a511d9ea91..3c0555a76d0 100644 --- a/Mage.Sets/src/mage/cards/r/Reconnaissance.java +++ b/Mage.Sets/src/mage/cards/r/Reconnaissance.java @@ -34,7 +34,7 @@ public final class Reconnaissance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); // {0}: Remove target attacking creature you control from combat and untap it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReconnaissanceRemoveFromCombatEffect(), new ManaCostsImpl<>("{0}")); + Ability ability = new SimpleActivatedAbility(new ReconnaissanceRemoveFromCombatEffect(), new ManaCostsImpl<>("{0}")); ability.addTarget(new TargetControlledCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ReefShaman.java b/Mage.Sets/src/mage/cards/r/ReefShaman.java index cd609feb9c5..dbe4e24bce4 100644 --- a/Mage.Sets/src/mage/cards/r/ReefShaman.java +++ b/Mage.Sets/src/mage/cards/r/ReefShaman.java @@ -29,7 +29,7 @@ public final class ReefShaman extends CardImpl { this.toughness = new MageInt(2); // {T}: Target land 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()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/Regeneration.java b/Mage.Sets/src/mage/cards/r/Regeneration.java index bc6e1e5b8a0..f670a21c839 100644 --- a/Mage.Sets/src/mage/cards/r/Regeneration.java +++ b/Mage.Sets/src/mage/cards/r/Regeneration.java @@ -31,7 +31,7 @@ public final class Regeneration extends CardImpl { this.addAbility(ability); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{G}"))); } private Regeneration(final Regeneration card) { diff --git a/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java b/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java index 5dad4af8b38..0611c53ec7a 100644 --- a/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java +++ b/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java @@ -29,7 +29,7 @@ public final class ReinforcedBulwark extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {tap}: Prevent the next 1 damage that would be dealt to you this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost())); } private ReinforcedBulwark(final ReinforcedBulwark card) { diff --git a/Mage.Sets/src/mage/cards/r/ReitoLantern.java b/Mage.Sets/src/mage/cards/r/ReitoLantern.java index d211646246b..29e6e55e177 100644 --- a/Mage.Sets/src/mage/cards/r/ReitoLantern.java +++ b/Mage.Sets/src/mage/cards/r/ReitoLantern.java @@ -22,7 +22,7 @@ public final class ReitoLantern extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Put target card from a graveyard on the bottom of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java b/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java index 1a5a1d51145..9783a2b6844 100644 --- a/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java +++ b/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java @@ -23,7 +23,7 @@ public final class RejuvenationChamber extends CardImpl { // Fading 2 this.addAbility(new FadingAbility(2, this)); // {tap}: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new TapSourceCost())); } private RejuvenationChamber(final RejuvenationChamber card) { diff --git a/Mage.Sets/src/mage/cards/r/RelentlessHunter.java b/Mage.Sets/src/mage/cards/r/RelentlessHunter.java index bd20f4310d5..18fb6e20a57 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessHunter.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessHunter.java @@ -33,7 +33,7 @@ public final class RelentlessHunter extends CardImpl { // {1}{R}{G}: Relentless Hunter gets +1/+1 and gains trample until end of turn. Effect effect1 = new BoostSourceEffect(1, 1, Duration.EndOfTurn); effect1.setText("{this} gets +1/+1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl<>("{1}{R}{G}")); + Ability ability = new SimpleActivatedAbility(effect1, new ManaCostsImpl<>("{1}{R}{G}")); Effect effect2 = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect2.setText("and gains trample until end of turn"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/r/RelicBarrier.java b/Mage.Sets/src/mage/cards/r/RelicBarrier.java index 87b431cb100..3414979df05 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBarrier.java +++ b/Mage.Sets/src/mage/cards/r/RelicBarrier.java @@ -22,7 +22,7 @@ public final class RelicBarrier extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}: Tap target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java index d5ce931e452..a0dae504ccf 100644 --- a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java +++ b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java @@ -33,11 +33,11 @@ public final class RelicOfProgenitus extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {tap}: Target player exiles a card from their graveyard. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RelicOfProgenitusEffect(), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(new RelicOfProgenitusEffect(), new TapSourceCost()); firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); // {1}, Exile Relic of Progenitus: Exile all cards from all graveyards. Draw a card. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new ExileGraveyardAllPlayersEffect(), new GenericManaCost(1)); secondAbility.addCost(new ExileSourceCost()); secondAbility.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java b/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java index 5ba43523f87..780e5436c0d 100644 --- a/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java +++ b/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java @@ -32,7 +32,7 @@ public final class RemorsefulCleric extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Contrite Cleric: Exile all cards in target player's graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllTargetPlayerEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileGraveyardAllTargetPlayerEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java index 5082f721496..7d58324439e 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java @@ -42,7 +42,7 @@ public final class RenownedWeaponsmith extends CardImpl { this.addAbility(new ConditionalColorlessManaAbility(new TapSourceCost(), 2, new RenownedWeaponsmithManaBuilder())); // {U}, {T}: Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RenownedWeaponsmithEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new RenownedWeaponsmithEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java index 6ebc3031b62..04827e6dd3a 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java @@ -30,7 +30,7 @@ public final class RenownedWeaver extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Renowned Weaver: Create a 1/3 green Spider enchantment creature token with reach. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ResearchAssistant.java b/Mage.Sets/src/mage/cards/r/ResearchAssistant.java index 8b5b9203e4b..957bdc5c0be 100644 --- a/Mage.Sets/src/mage/cards/r/ResearchAssistant.java +++ b/Mage.Sets/src/mage/cards/r/ResearchAssistant.java @@ -29,7 +29,7 @@ public final class ResearchAssistant extends CardImpl { this.toughness = new MageInt(3); // {3}{U}, {T}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ResilientWanderer.java b/Mage.Sets/src/mage/cards/r/ResilientWanderer.java index 0dfff57d63d..de53e7976ac 100644 --- a/Mage.Sets/src/mage/cards/r/ResilientWanderer.java +++ b/Mage.Sets/src/mage/cards/r/ResilientWanderer.java @@ -32,7 +32,7 @@ public final class ResilientWanderer extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Discard a card: Resilient Wanderer gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new DiscardCardCost()); this.addAbility(ability); } @@ -45,4 +45,3 @@ public final class ResilientWanderer extends CardImpl { return new ResilientWanderer(this); } } - diff --git a/Mage.Sets/src/mage/cards/r/ResistanceFighter.java b/Mage.Sets/src/mage/cards/r/ResistanceFighter.java index e9723de6e88..feee6c0e615 100644 --- a/Mage.Sets/src/mage/cards/r/ResistanceFighter.java +++ b/Mage.Sets/src/mage/cards/r/ResistanceFighter.java @@ -30,7 +30,7 @@ public final class ResistanceFighter extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Resistance Fighter: Prevent all combat damage target creature would deal this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageByTargetEffect(Duration.EndOfTurn, true) + Ability ability = new SimpleActivatedAbility(new PreventDamageByTargetEffect(Duration.EndOfTurn, true) .withTextOptions(false, true), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ResplendentMentor.java b/Mage.Sets/src/mage/cards/r/ResplendentMentor.java index d47b2d7f711..b142c770b01 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentMentor.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentMentor.java @@ -40,7 +40,7 @@ public final class ResplendentMentor extends CardImpl { this.toughness = new MageInt(2); // White creatures you control have {tap}: You gain 1 life. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/r/RestlessApparition.java b/Mage.Sets/src/mage/cards/r/RestlessApparition.java index b4c37445ce1..bfbbacbac79 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessApparition.java +++ b/Mage.Sets/src/mage/cards/r/RestlessApparition.java @@ -28,7 +28,7 @@ public final class RestlessApparition extends CardImpl { this.toughness = new MageInt(2); // {WB}{WB}{WB}: Restless Apparition gets +3/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}{W/B}"))); // Persist this.addAbility(new PersistAbility()); } diff --git a/Mage.Sets/src/mage/cards/r/RestlessBones.java b/Mage.Sets/src/mage/cards/r/RestlessBones.java index 0d085aae1f3..d91f1b0c631 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessBones.java +++ b/Mage.Sets/src/mage/cards/r/RestlessBones.java @@ -30,11 +30,11 @@ public final class RestlessBones extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private RestlessBones(final RestlessBones card) { diff --git a/Mage.Sets/src/mage/cards/r/RestlessDead.java b/Mage.Sets/src/mage/cards/r/RestlessDead.java index 9f02b735320..4db0ef37e0f 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RestlessDead.java @@ -26,7 +26,7 @@ public final class RestlessDead extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Restless Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private RestlessDead(final RestlessDead card) { diff --git a/Mage.Sets/src/mage/cards/r/RetractionHelix.java b/Mage.Sets/src/mage/cards/r/RetractionHelix.java index f92169d115c..99b46eae61d 100644 --- a/Mage.Sets/src/mage/cards/r/RetractionHelix.java +++ b/Mage.Sets/src/mage/cards/r/RetractionHelix.java @@ -28,7 +28,7 @@ public final class RetractionHelix extends CardImpl { // Until end of turn, target creature gains "{T}: Return target nonland permanent to its owner's hand." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapSourceCost()); Target target = new TargetNonlandPermanent(); gainedAbility.addTarget(target); Effect effect = new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java b/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java index 1e08686c095..8be03098127 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java +++ b/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java @@ -31,7 +31,7 @@ public final class ReturnedPhalanx extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {1}{U}: Returned Phalanx can attack this turn as though it didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private ReturnedPhalanx(final ReturnedPhalanx card) { diff --git a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java index 9d4f7bc425c..90e37cf5f64 100644 --- a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java +++ b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java @@ -31,7 +31,7 @@ public final class RevekaWizardSavant extends CardImpl { this.toughness = new MageInt(1); // {tap}: Reveka, Wizard Savant deals 2 damage to any target and doesn't untap during your next untap step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DontUntapInControllersNextUntapStepSourceEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ReveredDead.java b/Mage.Sets/src/mage/cards/r/ReveredDead.java index 7fdd4fbfc53..ab4932c3f9d 100644 --- a/Mage.Sets/src/mage/cards/r/ReveredDead.java +++ b/Mage.Sets/src/mage/cards/r/ReveredDead.java @@ -26,7 +26,7 @@ public final class ReveredDead extends CardImpl { this.toughness = new MageInt(1); // {W}: Regenerate Revered Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); } private ReveredDead(final ReveredDead card) { diff --git a/Mage.Sets/src/mage/cards/r/ReveredElder.java b/Mage.Sets/src/mage/cards/r/ReveredElder.java index 6035b1c447c..185282b0065 100644 --- a/Mage.Sets/src/mage/cards/r/ReveredElder.java +++ b/Mage.Sets/src/mage/cards/r/ReveredElder.java @@ -27,7 +27,7 @@ public final class ReveredElder extends CardImpl { this.toughness = new MageInt(2); // {1}: Prevent the next 1 damage that would be dealt to Revered Elder this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}"))); } private ReveredElder(final ReveredElder card) { diff --git a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java index 460661c28f5..34ac88a308b 100644 --- a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java +++ b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java @@ -51,7 +51,7 @@ public final class RhonasTheIndomitable extends CardImpl { // {2}{G}: Another target creature gets +2/+0 and gains trample until end of turn. Effect effect = new BoostTargetEffect(2, 0, Duration.EndOfTurn); effect.setText("Another target creature gets +2/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{G}")); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/Rhox.java b/Mage.Sets/src/mage/cards/r/Rhox.java index d72e3a7c09a..583636a3554 100644 --- a/Mage.Sets/src/mage/cards/r/Rhox.java +++ b/Mage.Sets/src/mage/cards/r/Rhox.java @@ -30,7 +30,7 @@ public final class Rhox extends CardImpl { // You may have Rhox assign its combat damage as though it weren't blocked. this.addAbility(DamageAsThoughNotBlockedAbility.getInstance()); // {2}{G}: Regenerate Rhox. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private Rhox(final Rhox card) { diff --git a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java index c729359f8e3..8f81452ae61 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java @@ -41,12 +41,12 @@ public final class RhysTheRedeemed extends CardImpl { this.toughness = new MageInt(1); // {2}{GW}, {tap}: Create a 1/1 green and white Elf Warrior creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GreenWhiteElfWarriorToken()), new ManaCostsImpl<>("{2}{G/W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GreenWhiteElfWarriorToken()), new ManaCostsImpl<>("{2}{G/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}{GW}{GW}, {tap}: For each creature token you control, create a token that's a copy of that creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RhysTheRedeemedEffect(), new ManaCostsImpl<>("{4}{G/W}{G/W}")); + Ability ability2 = new SimpleActivatedAbility(new RhysTheRedeemedEffect(), new ManaCostsImpl<>("{4}{G/W}{G/W}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/r/RhysticDeluge.java b/Mage.Sets/src/mage/cards/r/RhysticDeluge.java index 2549700cc7b..c5e7bb876a1 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticDeluge.java +++ b/Mage.Sets/src/mage/cards/r/RhysticDeluge.java @@ -23,7 +23,7 @@ public final class RhysticDeluge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // {U}: Tap target creature unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new TapTargetEffect(), new ManaCostsImpl<>("{1}")), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new TapTargetEffect(), new ManaCostsImpl<>("{1}")), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RibbonSnake.java b/Mage.Sets/src/mage/cards/r/RibbonSnake.java index 605c60e9729..95a527868ba 100644 --- a/Mage.Sets/src/mage/cards/r/RibbonSnake.java +++ b/Mage.Sets/src/mage/cards/r/RibbonSnake.java @@ -31,7 +31,7 @@ public final class RibbonSnake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}: Ribbon Snake loses flying until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( + SimpleActivatedAbility ability = new SimpleActivatedAbility(new LoseAbilitySourceEffect( FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/r/Riddleform.java b/Mage.Sets/src/mage/cards/r/Riddleform.java index acdbe79a9b3..882d325facf 100644 --- a/Mage.Sets/src/mage/cards/r/Riddleform.java +++ b/Mage.Sets/src/mage/cards/r/Riddleform.java @@ -34,7 +34,7 @@ public final class Riddleform extends CardImpl { this.addAbility(new SpellCastControllerTriggeredAbility(effect, StaticFilters.FILTER_SPELL_A_NON_CREATURE, true)); // {2}{U}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1), new ManaCostsImpl<>("{2}{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RidgedKusite.java b/Mage.Sets/src/mage/cards/r/RidgedKusite.java index ad27f2ca912..be39b8edb25 100644 --- a/Mage.Sets/src/mage/cards/r/RidgedKusite.java +++ b/Mage.Sets/src/mage/cards/r/RidgedKusite.java @@ -36,7 +36,7 @@ public final class RidgedKusite extends CardImpl { // {1}{B}, {tap}, Discard a card: Target creature gets +1/+0 and gains first strike until end of turn. Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn); effect.setText("Target creature gets +1/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains first strike until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RidgelineRager.java b/Mage.Sets/src/mage/cards/r/RidgelineRager.java index b5a8d3d2dc7..d1c97e1fb55 100644 --- a/Mage.Sets/src/mage/cards/r/RidgelineRager.java +++ b/Mage.Sets/src/mage/cards/r/RidgelineRager.java @@ -27,7 +27,7 @@ public final class RidgelineRager extends CardImpl { this.toughness = new MageInt(2); // {R}: Ridgeline Rager 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 RidgelineRager(final RidgelineRager card) { diff --git a/Mage.Sets/src/mage/cards/r/RiftElemental.java b/Mage.Sets/src/mage/cards/r/RiftElemental.java index 6910b54c0a2..cb9a06e5890 100644 --- a/Mage.Sets/src/mage/cards/r/RiftElemental.java +++ b/Mage.Sets/src/mage/cards/r/RiftElemental.java @@ -40,7 +40,7 @@ public final class RiftElemental extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, Remove a time counter from a permanent you control or suspended card you own: Rift Elemental gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new RiftElementalCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RighteousAura.java b/Mage.Sets/src/mage/cards/r/RighteousAura.java index b8ba3ca8faf..68e05258df6 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousAura.java +++ b/Mage.Sets/src/mage/cards/r/RighteousAura.java @@ -23,7 +23,7 @@ public final class RighteousAura extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // {W}, Pay 2 life: The next time a source of your choice would deal damage to you this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java index 71e1ab12fef..94ee250aea7 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java +++ b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java @@ -49,7 +49,7 @@ public final class RimeTransfusion extends CardImpl { // Enchanted creature gets +2/+1 and has "{S}: This creature can't be blocked this turn except by snow creatures." SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn))),new ManaCostsImpl<>("{S}")); + Ability gainedAbility = new SimpleActivatedAbility(new GainAbilitySourceEffect(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn))),new ManaCostsImpl<>("{S}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/r/RimeboundDead.java b/Mage.Sets/src/mage/cards/r/RimeboundDead.java index 6ecf1f2f294..013d935efac 100644 --- a/Mage.Sets/src/mage/cards/r/RimeboundDead.java +++ b/Mage.Sets/src/mage/cards/r/RimeboundDead.java @@ -27,7 +27,7 @@ public final class RimeboundDead extends CardImpl { this.toughness = new MageInt(1); // {S}: Regenerate Rimebound Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{S}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{S}"))); } private RimeboundDead(final RimeboundDead card) { diff --git a/Mage.Sets/src/mage/cards/r/RingOfGix.java b/Mage.Sets/src/mage/cards/r/RingOfGix.java index 06384a75659..6efb7297533 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfGix.java +++ b/Mage.Sets/src/mage/cards/r/RingOfGix.java @@ -38,7 +38,7 @@ public final class RingOfGix extends CardImpl { this.addAbility(new EchoAbility("{3}")); // {1}, {tap}: Tap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java index acb4891dc22..06f23ddd3bb 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java +++ b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java @@ -35,7 +35,7 @@ public final class RingOfImmortals extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {3}, {tap}: Counter target instant or Aura spell that targets a permanent you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RingOfMaruf.java b/Mage.Sets/src/mage/cards/r/RingOfMaruf.java index 25fddf0d9f2..cc7ca17ed00 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfMaruf.java +++ b/Mage.Sets/src/mage/cards/r/RingOfMaruf.java @@ -30,7 +30,7 @@ public final class RingOfMaruf extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {5}, {Tap}, Exile Ring of Maruf: The next time you would draw a card this turn, instead choose a card you own from outside the game and put it into your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RingOfMarufEffect(), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new RingOfMarufEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExileSourceCost()); ability.addHint(OpenSideboardHint.instance); diff --git a/Mage.Sets/src/mage/cards/r/RingOfRenewal.java b/Mage.Sets/src/mage/cards/r/RingOfRenewal.java index a2ce8dd7ad1..c6a8a96501e 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfRenewal.java +++ b/Mage.Sets/src/mage/cards/r/RingOfRenewal.java @@ -24,7 +24,7 @@ public final class RingOfRenewal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {5}, {tap}: Discard a card at random, then draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1, true), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new DiscardControllerEffect(1, true), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); Effect effect = new DrawCardSourceControllerEffect(2); effect.setText(", then draw two cards"); diff --git a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java index 2356d1fbd8b..0619ac3869d 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java +++ b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java @@ -29,7 +29,7 @@ public final class RingOfThreeWishes extends CardImpl { // Ring of Three Wishes enters the battlefield with three wish counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.WISH.createInstance(3)), "with three wish counters on it")); // {5}, {T}, Remove a wish counter from Ring of Three Wishes: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.WISH.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java index 008d239514e..b00be3adf1d 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java @@ -35,7 +35,7 @@ public final class RiptideChronologist extends CardImpl { this.toughness = new MageInt(3); // {U}, Sacrifice Riptide Chronologist: Untap all creatures of the creature type of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideChronologistEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new RiptideChronologistEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java index 0b0d22cdb67..3188cd79e22 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java +++ b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java @@ -35,7 +35,7 @@ public final class RiptideLaboratory extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{U}, {tap}: Return target Wizard you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java index b8559024486..e59f4a62952 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java +++ b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java @@ -44,7 +44,7 @@ public final class RiptideReplicator extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.CHARGE.createInstance()))); // {4}, {T}: Create an X/X creature token of the chosen color and type, where X is the number of charge counters on Riptide Replicator. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideReplicatorEffect(), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new RiptideReplicatorEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java b/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java index 223ba8509dc..a815e3925a7 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java +++ b/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java @@ -33,7 +33,7 @@ public final class RiptideShapeshifter extends CardImpl { this.toughness = new MageInt(3); // {2}{U}{U}, Sacrifice Riptide Shapeshifter: Choose a creature type. Reveal cards from the top of your library until you reveal a creature card of that type. Put that card onto the battlefield and shuffle the rest into your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideShapeshifterEffect(), new ManaCostsImpl<>("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new RiptideShapeshifterEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java index d0cdf4602fb..a425674fae7 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java @@ -52,7 +52,7 @@ public final class RiseOfTheHobgoblins extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new RiseOfTheHobgoblinsEffect())); // {RW}: Red creatures and white creatures you control gain first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter), new ManaCostsImpl<>("{R/W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter), new ManaCostsImpl<>("{R/W}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java index a86adfc6b7f..3b3d1f5c215 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java @@ -38,7 +38,7 @@ public final class RishadanPawnshop extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Shuffle target nontoken permanent you control into its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RishadanPawnshopShuffleIntoLibraryEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new RishadanPawnshopShuffleIntoLibraryEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RishadanPort.java b/Mage.Sets/src/mage/cards/r/RishadanPort.java index ce59a1300ec..6c928a69685 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPort.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPort.java @@ -25,7 +25,7 @@ public final class RishadanPort extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Tap target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiverBoa.java b/Mage.Sets/src/mage/cards/r/RiverBoa.java index b3071bf88ea..8f32174193e 100644 --- a/Mage.Sets/src/mage/cards/r/RiverBoa.java +++ b/Mage.Sets/src/mage/cards/r/RiverBoa.java @@ -27,7 +27,7 @@ public final class RiverBoa extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new IslandwalkAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private RiverBoa(final RiverBoa card) { diff --git a/Mage.Sets/src/mage/cards/r/RiverHoopoe.java b/Mage.Sets/src/mage/cards/r/RiverHoopoe.java index bfaafdcb6fd..fde83844329 100644 --- a/Mage.Sets/src/mage/cards/r/RiverHoopoe.java +++ b/Mage.Sets/src/mage/cards/r/RiverHoopoe.java @@ -33,7 +33,7 @@ public final class RiverHoopoe extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{G}{U}: You gain 2 life and draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{3}{G}{U}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{3}{G}{U}")); Effect effect = new DrawCardSourceControllerEffect(1); effect.setText("and draw a card"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java b/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java index 3547cbf91e4..d1e671cd5fb 100644 --- a/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java +++ b/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java @@ -44,12 +44,12 @@ public final class RixMaadiGuildmage extends CardImpl { this.toughness = new MageInt(2); // {B}{R}: Target blocking creature gets -1/-1 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl<>("{B}{R}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl<>("{B}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {B}{R}: Target player who lost life this turn loses 1 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}{R}")); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}{R}")); ability.addTarget(new TargetPlayer(1,1,false, playerFilter)); this.addAbility(ability); } @@ -83,4 +83,4 @@ class PlayerLostLifePredicate implements Predicate { public String toString() { return "Player lost life"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RockHydra.java b/Mage.Sets/src/mage/cards/r/RockHydra.java index 77c48f5d9fe..dc794a77e46 100644 --- a/Mage.Sets/src/mage/cards/r/RockHydra.java +++ b/Mage.Sets/src/mage/cards/r/RockHydra.java @@ -43,7 +43,7 @@ public final class RockHydra extends CardImpl { // For each 1 damage that would be dealt to Rock Hydra, if it has a +1/+1 counter on it, remove a +1/+1 counter from it and prevent that 1 damage. this.addAbility(new SimpleStaticAbility(new RockHydraEffect())); // {R}: Prevent the next 1 damage that would be dealt to Rock Hydra this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{R}"))); // {R}{R}{R}: Put a +1/+1 counter on Rock Hydra. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{R}{R}{R}"), new IsStepCondition(PhaseStep.UPKEEP), null)); } diff --git a/Mage.Sets/src/mage/cards/r/RodOfRuin.java b/Mage.Sets/src/mage/cards/r/RodOfRuin.java index 99d74516505..bbefb2546ec 100644 --- a/Mage.Sets/src/mage/cards/r/RodOfRuin.java +++ b/Mage.Sets/src/mage/cards/r/RodOfRuin.java @@ -21,7 +21,7 @@ public final class RodOfRuin extends CardImpl { public RodOfRuin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RodOfSpanking.java b/Mage.Sets/src/mage/cards/r/RodOfSpanking.java index 13f0a96ae68..0aeca2cee0f 100644 --- a/Mage.Sets/src/mage/cards/r/RodOfSpanking.java +++ b/Mage.Sets/src/mage/cards/r/RodOfSpanking.java @@ -30,7 +30,7 @@ public final class RodOfSpanking extends CardImpl { // 2, T: Rod of Spanking deals 1 damage to target player. Then untap Rod of // Spanking unless that player says "Thank you, sir. May I have another?" - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RodOfSpankingEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new RodOfSpankingEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RoguesPassage.java b/Mage.Sets/src/mage/cards/r/RoguesPassage.java index dbb9ef557e8..1843d1a585d 100644 --- a/Mage.Sets/src/mage/cards/r/RoguesPassage.java +++ b/Mage.Sets/src/mage/cards/r/RoguesPassage.java @@ -27,7 +27,7 @@ public final class RoguesPassage extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new TapSourceCost())); // {4}, {T}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RonomUnicorn.java b/Mage.Sets/src/mage/cards/r/RonomUnicorn.java index f108b3c23bc..99034e7bc8a 100644 --- a/Mage.Sets/src/mage/cards/r/RonomUnicorn.java +++ b/Mage.Sets/src/mage/cards/r/RonomUnicorn.java @@ -28,7 +28,7 @@ public final class RonomUnicorn extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Ronom Unicorn: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java b/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java index 8ca6de938dc..50a4a4c9892 100644 --- a/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java +++ b/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java @@ -27,7 +27,7 @@ public final class RoofstalkerWight extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private RoofstalkerWight(final RoofstalkerWight card) { diff --git a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java index eafd2fc37d6..b28621a44f0 100644 --- a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java +++ b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java @@ -38,7 +38,7 @@ public final class RoonOfTheHiddenRealm extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {2}, {tap}: Exile another target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileReturnBattlefieldNextEndStepTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ExileReturnBattlefieldNextEndStepTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RootGreevil.java b/Mage.Sets/src/mage/cards/r/RootGreevil.java index cb48a78c633..4086ac17dad 100644 --- a/Mage.Sets/src/mage/cards/r/RootGreevil.java +++ b/Mage.Sets/src/mage/cards/r/RootGreevil.java @@ -35,7 +35,7 @@ public final class RootGreevil extends CardImpl { this.toughness = new MageInt(3); // {2}{G}, {tap}, Sacrifice Root Greevil: Destroy all enchantments of the color of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RootGreevilEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new RootGreevilEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RootKinAlly.java b/Mage.Sets/src/mage/cards/r/RootKinAlly.java index 00a8d441f54..a3ae36850e9 100644 --- a/Mage.Sets/src/mage/cards/r/RootKinAlly.java +++ b/Mage.Sets/src/mage/cards/r/RootKinAlly.java @@ -39,7 +39,7 @@ public final class RootKinAlly extends CardImpl { this.addAbility(new ConvokeAbility()); // Tap two untapped creatures you control: Root-Kin Ally gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true)))); } private RootKinAlly(final RootKinAlly card) { diff --git a/Mage.Sets/src/mage/cards/r/Rootrunner.java b/Mage.Sets/src/mage/cards/r/Rootrunner.java index ef51c205541..9681aa5a164 100644 --- a/Mage.Sets/src/mage/cards/r/Rootrunner.java +++ b/Mage.Sets/src/mage/cards/r/Rootrunner.java @@ -30,7 +30,7 @@ public final class Rootrunner extends CardImpl { this.toughness = new MageInt(3); //{G}{G}, Sacrifice Rootrunner: Put target land on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{G}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java b/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java index f66faf5b9d3..072d5bb893f 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java @@ -33,7 +33,7 @@ public final class RootwaterAlligator extends CardImpl { this.toughness = new MageInt(2); // Sacrifice a Forest: Regenerate Rootwater Alligator. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); } private RootwaterAlligator(final RootwaterAlligator card) { diff --git a/Mage.Sets/src/mage/cards/r/RootwaterHunter.java b/Mage.Sets/src/mage/cards/r/RootwaterHunter.java index 6ae0dea37b4..6527fadc2fd 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterHunter.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterHunter.java @@ -26,7 +26,7 @@ public final class RootwaterHunter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - 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/r/RootwaterMatriarch.java b/Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java index 64455fd0f3a..223ee6e3677 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java @@ -33,7 +33,7 @@ public final class RootwaterMatriarch extends CardImpl { // {T}: Gain control of target creature for as long as that creature is enchanted ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), EnchantedTargetCondition.instance, "Gain control of target creature for as long as that creature is enchanted"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RootwaterMystic.java b/Mage.Sets/src/mage/cards/r/RootwaterMystic.java index 0a6100f30c5..38230b6dd9b 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterMystic.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterMystic.java @@ -28,7 +28,7 @@ public final class RootwaterMystic extends CardImpl { this.toughness = new MageInt(1); // {1}{U}: Look at the top card of target player's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new LookLibraryTopCardTargetPlayerEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RoyalAssassin.java b/Mage.Sets/src/mage/cards/r/RoyalAssassin.java index 1f4f5c9eab9..f806d427d94 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RoyalAssassin.java @@ -37,7 +37,7 @@ public final class RoyalAssassin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java index e902d457f42..2b4e912aa3e 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java +++ b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java @@ -29,7 +29,7 @@ public final class RoyalHerbalist extends CardImpl { this.toughness = new MageInt(1); // {2}, Exile the top card of your library: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new ExileFromTopOfLibraryCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RuinGhost.java b/Mage.Sets/src/mage/cards/r/RuinGhost.java index 8ca1d14eeba..1546951777b 100644 --- a/Mage.Sets/src/mage/cards/r/RuinGhost.java +++ b/Mage.Sets/src/mage/cards/r/RuinGhost.java @@ -29,7 +29,7 @@ public final class RuinGhost extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}: Exile target land you control, then return it to the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileThenReturnTargetEffect(true, false), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new ExileThenReturnTargetEffect(true, false), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuinousGremlin.java b/Mage.Sets/src/mage/cards/r/RuinousGremlin.java index 33166498d53..cc062764c54 100644 --- a/Mage.Sets/src/mage/cards/r/RuinousGremlin.java +++ b/Mage.Sets/src/mage/cards/r/RuinousGremlin.java @@ -28,7 +28,7 @@ public final class RuinousGremlin extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, Sacrifice Ruinous Gremlin: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java index af6f977faac..b1890609b7b 100644 --- a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java +++ b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java @@ -39,7 +39,7 @@ public final class RuinsOfOranRief extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {T}: Put a +1/+1 counter on target colorless creature that entered the battlefield this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java b/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java index 5e668b1f707..5fb2906740a 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java +++ b/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java @@ -42,7 +42,7 @@ public final class RumblingCrescendo extends CardImpl { // {R}, Sacrifice Rumbling Crescendo: Destroy up to X target lands, where X is the number of verse counters on Rumbling Crescendo. Effect effect = new DestroyTargetEffect(true); effect.setText("Destroy up to X target lands, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}")); 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/r/RummagingGoblin.java b/Mage.Sets/src/mage/cards/r/RummagingGoblin.java index 9d90f24207d..6df92d6f778 100644 --- a/Mage.Sets/src/mage/cards/r/RummagingGoblin.java +++ b/Mage.Sets/src/mage/cards/r/RummagingGoblin.java @@ -29,7 +29,7 @@ public final class RummagingGoblin extends CardImpl { this.toughness = new MageInt(1); // {tap}, Discard a card: Draw a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RunWild.java b/Mage.Sets/src/mage/cards/r/RunWild.java index f70f37ff61f..8b78ffd9bb6 100644 --- a/Mage.Sets/src/mage/cards/r/RunWild.java +++ b/Mage.Sets/src/mage/cards/r/RunWild.java @@ -30,7 +30,7 @@ public final class RunWild extends CardImpl { effect1.setText("Until end of turn, target creature gains trample"); this.getSpellAbility().addEffect(effect1); - Effect effect2 = new GainAbilityTargetEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")), Duration.EndOfTurn); + Effect effect2 = new GainAbilityTargetEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")), Duration.EndOfTurn); effect2.setText("and \"{G}: Regenerate this creature.\""); this.getSpellAbility().addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/r/RuneCervinRider.java b/Mage.Sets/src/mage/cards/r/RuneCervinRider.java index b05f8340c60..7b2727cc4e4 100644 --- a/Mage.Sets/src/mage/cards/r/RuneCervinRider.java +++ b/Mage.Sets/src/mage/cards/r/RuneCervinRider.java @@ -29,7 +29,7 @@ public final class RuneCervinRider extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G/W}{G/W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G/W}{G/W}"))); } private RuneCervinRider(final RuneCervinRider card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java index 5743d0a33a9..b754410f49e 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionArtifacts extends CardImpl { // {W}: The next time an artifact source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java index 29b5c3cf83b..ea231aaeb73 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionBlack extends CardImpl { // {W}: The next time a black source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java index 52e9aa1fd78..299bc336506 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionBlue extends CardImpl { // {W}: The next time a blue source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java index 6c8f583779b..17e83c87fa0 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionGreen extends CardImpl { // {W}: The next time a green source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java index e4302456b8f..e620e0b7fa0 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionLands extends CardImpl { // {W}: The next time a land source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java index 84c22a3deff..4af3ccfee3b 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionRed extends CardImpl { // {W}: The next time a red source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java index 5d9d77bd283..2624dd6d2ff 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionWhite extends CardImpl { // {W}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/Runesword.java b/Mage.Sets/src/mage/cards/r/Runesword.java index 8f225fe4b90..81b71c72ff6 100644 --- a/Mage.Sets/src/mage/cards/r/Runesword.java +++ b/Mage.Sets/src/mage/cards/r/Runesword.java @@ -40,7 +40,7 @@ public final class Runesword extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {3}, {T}: Target attacking creature gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new GenericManaCost(3)); // When that creature leaves the battlefield this turn, sacrifice Runesword. ability.addEffect(new RuneswordCreateTriggeredAbilityEffect()); // If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn. diff --git a/Mage.Sets/src/mage/cards/r/RushwoodGrove.java b/Mage.Sets/src/mage/cards/r/RushwoodGrove.java index 6e0ebdf05ff..c6476100d26 100644 --- a/Mage.Sets/src/mage/cards/r/RushwoodGrove.java +++ b/Mage.Sets/src/mage/cards/r/RushwoodGrove.java @@ -30,7 +30,7 @@ public final class RushwoodGrove extends CardImpl { // Rushwood Grove enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {T}: Put a storage counter on Rushwood Grove. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {T}, Remove any number of storage counters from Rushwood Grove: Add {G} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.GreenMana(1), diff --git a/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java b/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java index 346ce984782..0d5bfef7fc3 100644 --- a/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java +++ b/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java @@ -30,7 +30,7 @@ public final class RushwoodHerbalist extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}, Discard a card: 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 DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/r/RustTick.java b/Mage.Sets/src/mage/cards/r/RustTick.java index 6da15573aaf..fa71ece5514 100644 --- a/Mage.Sets/src/mage/cards/r/RustTick.java +++ b/Mage.Sets/src/mage/cards/r/RustTick.java @@ -33,7 +33,7 @@ public final class RustTick extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {1}, {tap}: Tap target artifact. It doesn't untap during its controller's untap step for as long as Rust Tick remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); diff --git a/Mage.Sets/src/mage/cards/r/RustedSlasher.java b/Mage.Sets/src/mage/cards/r/RustedSlasher.java index fa796f32ecd..8963ba5d19e 100644 --- a/Mage.Sets/src/mage/cards/r/RustedSlasher.java +++ b/Mage.Sets/src/mage/cards/r/RustedSlasher.java @@ -32,7 +32,7 @@ public final class RustedSlasher extends CardImpl { this.subtype.add(SubType.HORROR); this.power = new MageInt(4); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); } private RustedSlasher(final RustedSlasher card) { diff --git a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java index b1666045de7..67dafce5755 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java @@ -41,7 +41,7 @@ public final class RuthlessKnave extends CardImpl { this.toughness = new MageInt(2); // {2}{B}, Sacrifice a creature: Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TreasureToken(), 2), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new TreasureToken(), 2), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); -- 2.47.2 From 2b30a678e885448ea2249b4d4a2010ae85e2af97 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:30:11 -0500 Subject: [PATCH 42/50] refactor: SimpleActivatedAbility default zone (cards S) --- Mage.Sets/src/mage/cards/s/SaberclawGolem.java | 2 +- Mage.Sets/src/mage/cards/s/SacellumArchers.java | 2 +- Mage.Sets/src/mage/cards/s/SacredArmory.java | 2 +- Mage.Sets/src/mage/cards/s/SacredMesa.java | 2 +- Mage.Sets/src/mage/cards/s/Safeguard.java | 2 +- Mage.Sets/src/mage/cards/s/SafeholdSentry.java | 2 +- Mage.Sets/src/mage/cards/s/SageOfLatNam.java | 2 +- Mage.Sets/src/mage/cards/s/SageOfTheMaze.java | 2 +- Mage.Sets/src/mage/cards/s/Sailmonger.java | 2 +- Mage.Sets/src/mage/cards/s/SakuraTribeElder.java | 2 +- Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java | 2 +- Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java | 2 +- Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java | 2 +- Mage.Sets/src/mage/cards/s/SalvagingStation.java | 2 +- Mage.Sets/src/mage/cards/s/SamiteArcher.java | 4 ++-- Mage.Sets/src/mage/cards/s/SamiteBlessing.java | 2 +- Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java | 2 +- Mage.Sets/src/mage/cards/s/SamiteElder.java | 2 +- Mage.Sets/src/mage/cards/s/SamiteHealer.java | 2 +- Mage.Sets/src/mage/cards/s/SamitePilgrim.java | 2 +- Mage.Sets/src/mage/cards/s/SamiteSanctuary.java | 2 +- Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java | 2 +- Mage.Sets/src/mage/cards/s/SanctumCustodian.java | 2 +- Mage.Sets/src/mage/cards/s/SanctumGuardian.java | 2 +- .../src/mage/cards/s/SanctumOfShatteredHeights.java | 2 +- Mage.Sets/src/mage/cards/s/SandSquid.java | 2 +- Mage.Sets/src/mage/cards/s/SandsOfDelirium.java | 2 +- Mage.Sets/src/mage/cards/s/Sandsower.java | 2 +- Mage.Sets/src/mage/cards/s/SandstoneWarrior.java | 2 +- Mage.Sets/src/mage/cards/s/SandstormEidolon.java | 2 +- Mage.Sets/src/mage/cards/s/SanguineGuard.java | 2 +- Mage.Sets/src/mage/cards/s/SanguinePraetor.java | 2 +- Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java | 2 +- Mage.Sets/src/mage/cards/s/SaprazzanCove.java | 2 +- Mage.Sets/src/mage/cards/s/SaprolingBurst.java | 2 +- Mage.Sets/src/mage/cards/s/SaprolingCluster.java | 2 +- Mage.Sets/src/mage/cards/s/SarcomiteMyr.java | 4 ++-- Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java | 2 +- Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java | 2 +- Mage.Sets/src/mage/cards/s/SatyrPiper.java | 2 +- Mage.Sets/src/mage/cards/s/SavaenElves.java | 2 +- Mage.Sets/src/mage/cards/s/SavageGorilla.java | 2 +- Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java | 4 ++-- Mage.Sets/src/mage/cards/s/SavageThallid.java | 4 ++-- Mage.Sets/src/mage/cards/s/SawbackManticore.java | 2 +- Mage.Sets/src/mage/cards/s/SawtoothThresher.java | 2 +- Mage.Sets/src/mage/cards/s/ScaldingDevil.java | 2 +- Mage.Sets/src/mage/cards/s/Scaldkin.java | 2 +- Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java | 2 +- Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java | 2 +- Mage.Sets/src/mage/cards/s/ScarbladeElite.java | 2 +- Mage.Sets/src/mage/cards/s/Scarecrone.java | 4 ++-- Mage.Sets/src/mage/cards/s/Scarecrow.java | 2 +- Mage.Sets/src/mage/cards/s/ScattershotArcher.java | 2 +- Mage.Sets/src/mage/cards/s/ScavengerFolk.java | 2 +- Mage.Sets/src/mage/cards/s/ScavengingGhoul.java | 2 +- Mage.Sets/src/mage/cards/s/ScavengingOoze.java | 2 +- Mage.Sets/src/mage/cards/s/ScepterOfDominance.java | 2 +- Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java | 2 +- Mage.Sets/src/mage/cards/s/ScepterOfInsight.java | 2 +- Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java | 2 +- Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java | 2 +- Mage.Sets/src/mage/cards/s/ScorchedRusalka.java | 2 +- Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java | 4 ++-- Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java | 2 +- Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java | 2 +- Mage.Sets/src/mage/cards/s/Scrapbasket.java | 2 +- Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java | 2 +- Mage.Sets/src/mage/cards/s/ScreechingGriffin.java | 2 +- Mage.Sets/src/mage/cards/s/ScreechingHarpy.java | 2 +- Mage.Sets/src/mage/cards/s/ScreechingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/ScribNibblers.java | 2 +- Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java | 2 +- Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java | 2 +- Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java | 2 +- Mage.Sets/src/mage/cards/s/ScrollRack.java | 2 +- Mage.Sets/src/mage/cards/s/ScryingGlass.java | 2 +- Mage.Sets/src/mage/cards/s/ScryingSheets.java | 2 +- Mage.Sets/src/mage/cards/s/Scuttlemutt.java | 2 +- Mage.Sets/src/mage/cards/s/ScuttlingDeath.java | 2 +- Mage.Sets/src/mage/cards/s/SeaSnidd.java | 2 +- Mage.Sets/src/mage/cards/s/SeaSpirit.java | 2 +- Mage.Sets/src/mage/cards/s/Seahunter.java | 2 +- Mage.Sets/src/mage/cards/s/SealOfCleansing.java | 2 +- Mage.Sets/src/mage/cards/s/SealOfDoom.java | 2 +- Mage.Sets/src/mage/cards/s/SealOfFire.java | 2 +- Mage.Sets/src/mage/cards/s/SealOfPrimordium.java | 2 +- Mage.Sets/src/mage/cards/s/SealOfRemoval.java | 2 +- Mage.Sets/src/mage/cards/s/SealOfStrength.java | 2 +- Mage.Sets/src/mage/cards/s/SearingSpearAskari.java | 2 +- Mage.Sets/src/mage/cards/s/SeasideHaven.java | 2 +- Mage.Sets/src/mage/cards/s/SeasonedTactician.java | 2 +- Mage.Sets/src/mage/cards/s/SecondWind.java | 4 ++-- Mage.Sets/src/mage/cards/s/SecurityBlockade.java | 2 +- Mage.Sets/src/mage/cards/s/SedgeSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SedgeTroll.java | 2 +- Mage.Sets/src/mage/cards/s/SeedcradleWitch.java | 2 +- Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java | 2 +- Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java | 2 +- Mage.Sets/src/mage/cards/s/SeersLantern.java | 2 +- Mage.Sets/src/mage/cards/s/SeismicMage.java | 2 +- Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java | 2 +- Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java | 2 +- Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java | 2 +- Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java | 2 +- Mage.Sets/src/mage/cards/s/SelesnyaSentry.java | 2 +- Mage.Sets/src/mage/cards/s/SelflessCathar.java | 2 +- Mage.Sets/src/mage/cards/s/SelflessSpirit.java | 2 +- Mage.Sets/src/mage/cards/s/SenateGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/s/SengirNosferatu.java | 2 +- Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java | 4 ++-- Mage.Sets/src/mage/cards/s/SentinelTotem.java | 2 +- Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java | 2 +- Mage.Sets/src/mage/cards/s/SequesteredStash.java | 2 +- Mage.Sets/src/mage/cards/s/SerendibSorcerer.java | 2 +- Mage.Sets/src/mage/cards/s/SerpentGenerator.java | 2 +- Mage.Sets/src/mage/cards/s/SerpentSkin.java | 2 +- Mage.Sets/src/mage/cards/s/SerpentineKavu.java | 2 +- Mage.Sets/src/mage/cards/s/SerraAdvocate.java | 2 +- Mage.Sets/src/mage/cards/s/SerrasLiturgy.java | 2 +- Mage.Sets/src/mage/cards/s/SerratedBiskelion.java | 2 +- Mage.Sets/src/mage/cards/s/ServantOfTymaret.java | 2 +- Mage.Sets/src/mage/cards/s/SetessanTactics.java | 2 +- Mage.Sets/src/mage/cards/s/Sewerdreg.java | 2 +- Mage.Sets/src/mage/cards/s/Shackles.java | 2 +- Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java | 2 +- Mage.Sets/src/mage/cards/s/ShadesForm.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShadowLance.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowbornApostle.java | 2 +- Mage.Sets/src/mage/cards/s/ShamanEnKor.java | 2 +- Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java | 2 +- Mage.Sets/src/mage/cards/s/ShamblingShell.java | 2 +- Mage.Sets/src/mage/cards/s/ShamblingStrider.java | 2 +- Mage.Sets/src/mage/cards/s/ShamblingVent.java | 2 +- Mage.Sets/src/mage/cards/s/ShaperGuildmage.java | 6 +++--- Mage.Sets/src/mage/cards/s/ShapersOfNature.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShardPhoenix.java | 2 +- Mage.Sets/src/mage/cards/s/ShattergangBrothers.java | 6 +++--- Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java | 2 +- Mage.Sets/src/mage/cards/s/ShaukusMinion.java | 2 +- Mage.Sets/src/mage/cards/s/ShelkinBrownie.java | 2 +- Mage.Sets/src/mage/cards/s/ShellSkulkin.java | 2 +- Mage.Sets/src/mage/cards/s/ShepherdOfRot.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldDancer.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldMate.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java | 2 +- Mage.Sets/src/mage/cards/s/ShimianNightStalker.java | 2 +- Mage.Sets/src/mage/cards/s/ShimmeringWings.java | 2 +- .../src/mage/cards/s/ShinkaTheBloodsoakedKeep.java | 2 +- Mage.Sets/src/mage/cards/s/ShipwreckMoray.java | 2 +- Mage.Sets/src/mage/cards/s/ShivanDragon.java | 2 +- Mage.Sets/src/mage/cards/s/ShivanGorge.java | 2 +- Mage.Sets/src/mage/cards/s/ShivanHarvest.java | 2 +- Mage.Sets/src/mage/cards/s/ShivanHellkite.java | 2 +- Mage.Sets/src/mage/cards/s/ShivsEmbrace.java | 2 +- Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java | 2 +- Mage.Sets/src/mage/cards/s/ShockTroops.java | 2 +- Mage.Sets/src/mage/cards/s/ShoreKeeper.java | 2 +- Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShrillHowler.java | 2 +- Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java | 2 +- Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java | 2 +- Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java | 2 +- Mage.Sets/src/mage/cards/s/SiegeGangCommander.java | 2 +- Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java | 2 +- Mage.Sets/src/mage/cards/s/SigardianPriest.java | 2 +- Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java | 2 +- Mage.Sets/src/mage/cards/s/SigilTracer.java | 2 +- Mage.Sets/src/mage/cards/s/SigiledStarfish.java | 2 +- Mage.Sets/src/mage/cards/s/SilentAttendant.java | 4 ++-- Mage.Sets/src/mage/cards/s/SilkbindFaerie.java | 2 +- Mage.Sets/src/mage/cards/s/SilkwingScout.java | 2 +- Mage.Sets/src/mage/cards/s/SilumgarMonument.java | 2 +- Mage.Sets/src/mage/cards/s/SilverchaseFox.java | 2 +- Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java | 2 +- Mage.Sets/src/mage/cards/s/SimianBrawler.java | 2 +- Mage.Sets/src/mage/cards/s/SimicAscendancy.java | 2 +- Mage.Sets/src/mage/cards/s/SimicBasilisk.java | 2 +- Mage.Sets/src/mage/cards/s/SimicCluestone.java | 2 +- Mage.Sets/src/mage/cards/s/SimicFluxmage.java | 2 +- Mage.Sets/src/mage/cards/s/SimicGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/s/SimicKeyrune.java | 2 +- Mage.Sets/src/mage/cards/s/SimicLocket.java | 2 +- Mage.Sets/src/mage/cards/s/SimicManipulator.java | 2 +- Mage.Sets/src/mage/cards/s/SimicRagworm.java | 2 +- Mage.Sets/src/mage/cards/s/Sindbad.java | 2 +- Mage.Sets/src/mage/cards/s/SingingBellStrike.java | 2 +- Mage.Sets/src/mage/cards/s/SingingTree.java | 2 +- Mage.Sets/src/mage/cards/s/SinisterConcoction.java | 2 +- Mage.Sets/src/mage/cards/s/SinkingFeeling.java | 2 +- Mage.Sets/src/mage/cards/s/SirenSongLyre.java | 2 +- Mage.Sets/src/mage/cards/s/SirenStormtamer.java | 2 +- Mage.Sets/src/mage/cards/s/SisaysIngenuity.java | 2 +- Mage.Sets/src/mage/cards/s/SithEvoker.java | 2 +- Mage.Sets/src/mage/cards/s/SithHolocron.java | 2 +- Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java | 2 +- Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java | 2 +- Mage.Sets/src/mage/cards/s/SkeletalChangeling.java | 2 +- Mage.Sets/src/mage/cards/s/SkeletalGrimace.java | 2 +- Mage.Sets/src/mage/cards/s/SkeletalKathari.java | 2 +- Mage.Sets/src/mage/cards/s/SkeletalVampire.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkeletalWurm.java | 2 +- Mage.Sets/src/mage/cards/s/SkeletonShip.java | 2 +- Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java | 2 +- Mage.Sets/src/mage/cards/s/SkirsdagCultist.java | 2 +- Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java | 2 +- Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java | 2 +- .../src/mage/cards/s/SkithiryxTheBlightDragon.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkullCatapult.java | 2 +- Mage.Sets/src/mage/cards/s/SkullCollector.java | 2 +- Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkyWeaver.java | 2 +- Mage.Sets/src/mage/cards/s/Skyshaper.java | 2 +- Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java | 2 +- Mage.Sets/src/mage/cards/s/SkyshroudArcher.java | 2 +- Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java | 2 +- Mage.Sets/src/mage/cards/s/SkyshroudTroll.java | 2 +- Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java | 2 +- Mage.Sets/src/mage/cards/s/SlateOfAncestry.java | 2 +- Mage.Sets/src/mage/cards/s/SlaughterDrone.java | 2 +- Mage.Sets/src/mage/cards/s/SlimyKavu.java | 2 +- Mage.Sets/src/mage/cards/s/SlingshotGoblin.java | 2 +- Mage.Sets/src/mage/cards/s/SlinkingSkirge.java | 2 +- Mage.Sets/src/mage/cards/s/SlithBloodletter.java | 2 +- Mage.Sets/src/mage/cards/s/SlitheringShade.java | 2 +- Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java | 4 ++-- Mage.Sets/src/mage/cards/s/SliverOverlord.java | 4 ++-- Mage.Sets/src/mage/cards/s/SliverQueen.java | 2 +- Mage.Sets/src/mage/cards/s/Sliversmith.java | 2 +- Mage.Sets/src/mage/cards/s/SludgeCrawler.java | 2 +- Mage.Sets/src/mage/cards/s/SmokeTeller.java | 2 +- Mage.Sets/src/mage/cards/s/SmokespewInvoker.java | 2 +- Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java | 4 ++-- Mage.Sets/src/mage/cards/s/SnarlingUndorak.java | 2 +- Mage.Sets/src/mage/cards/s/SnowFortress.java | 6 +++--- Mage.Sets/src/mage/cards/s/SnowHound.java | 2 +- Mage.Sets/src/mage/cards/s/SnowMercy.java | 2 +- Mage.Sets/src/mage/cards/s/SoaringHope.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviDigger.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviExcavations.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviHeretic.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviSage.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java | 2 +- Mage.Sets/src/mage/cards/s/SoldierOfFortune.java | 2 +- Mage.Sets/src/mage/cards/s/SoldierReplica.java | 2 +- Mage.Sets/src/mage/cards/s/Soliton.java | 2 +- Mage.Sets/src/mage/cards/s/SoltariCrusader.java | 2 +- Mage.Sets/src/mage/cards/s/SoltariEmissary.java | 2 +- Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java | 2 +- Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java | 2 +- Mage.Sets/src/mage/cards/s/Soothsaying.java | 4 ++-- Mage.Sets/src/mage/cards/s/SophicCentaur.java | 2 +- Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java | 4 ++-- Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java | 2 +- Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java | 2 +- Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java | 2 +- Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java | 2 +- Mage.Sets/src/mage/cards/s/SoratamiSavant.java | 2 +- Mage.Sets/src/mage/cards/s/SoratamiSeer.java | 2 +- Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java | 2 +- Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java | 2 +- Mage.Sets/src/mage/cards/s/SorceressQueen.java | 2 +- Mage.Sets/src/mage/cards/s/SoulChanneling.java | 2 +- Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java | 2 +- Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java | 2 +- Mage.Sets/src/mage/cards/s/SoulOfRavnica.java | 3 +-- Mage.Sets/src/mage/cards/s/SoulOfShandalar.java | 2 +- Mage.Sets/src/mage/cards/s/SoulOfTheros.java | 2 +- Mage.Sets/src/mage/cards/s/SoulOfZendikar.java | 2 +- Mage.Sets/src/mage/cards/s/SoulSeparator.java | 2 +- Mage.Sets/src/mage/cards/s/SoulShepherd.java | 2 +- Mage.Sets/src/mage/cards/s/Souldrinker.java | 2 +- Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java | 2 +- Mage.Sets/src/mage/cards/s/Soulmender.java | 2 +- Mage.Sets/src/mage/cards/s/SoulswornJury.java | 2 +- Mage.Sets/src/mage/cards/s/SouthernPaladin.java | 2 +- Mage.Sets/src/mage/cards/s/Sparksmith.java | 2 +- Mage.Sets/src/mage/cards/s/Sparkspitter.java | 2 +- Mage.Sets/src/mage/cards/s/SparringCollar.java | 2 +- Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/s/SpawningBed.java | 2 +- Mage.Sets/src/mage/cards/s/SpawningGrounds.java | 2 +- Mage.Sets/src/mage/cards/s/SpawningPit.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpawningPool.java | 2 +- Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralLynx.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralSliver.java | 2 +- Mage.Sets/src/mage/cards/s/Spellskite.java | 2 +- Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java | 2 +- Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java | 2 +- Mage.Sets/src/mage/cards/s/SphinxsTutelage.java | 2 +- Mage.Sets/src/mage/cards/s/SpikeBreeder.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeColony.java | 2 +- Mage.Sets/src/mage/cards/s/SpikeDrone.java | 2 +- Mage.Sets/src/mage/cards/s/SpikeFeeder.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeHatcher.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeRogue.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeSoldier.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeTiller.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeWeaver.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeWorker.java | 2 +- Mage.Sets/src/mage/cards/s/SpikeshotElder.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java | 2 +- Mage.Sets/src/mage/cards/s/SpiketailDrake.java | 2 +- Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java | 2 +- Mage.Sets/src/mage/cards/s/SpiketailHatchling.java | 2 +- Mage.Sets/src/mage/cards/s/SpinalParasite.java | 2 +- Mage.Sets/src/mage/cards/s/SpinalVillain.java | 2 +- Mage.Sets/src/mage/cards/s/SpinedFluke.java | 2 +- Mage.Sets/src/mage/cards/s/SpinyStarfish.java | 2 +- Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritMirror.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritShield.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritWeaver.java | 2 +- Mage.Sets/src/mage/cards/s/Spiritmonger.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpiteflameWitch.java | 2 +- Mage.Sets/src/mage/cards/s/SpitfireBastion.java | 2 +- Mage.Sets/src/mage/cards/s/SpitfireHandler.java | 2 +- Mage.Sets/src/mage/cards/s/SpittingHydra.java | 2 +- Mage.Sets/src/mage/cards/s/SpittingSpider.java | 2 +- Mage.Sets/src/mage/cards/s/SplinterTwin.java | 2 +- Mage.Sets/src/mage/cards/s/SplinteringWind.java | 2 +- Mage.Sets/src/mage/cards/s/SplitTailMiko.java | 2 +- Mage.Sets/src/mage/cards/s/SporeFrog.java | 2 +- Mage.Sets/src/mage/cards/s/SporebackTroll.java | 2 +- Mage.Sets/src/mage/cards/s/SporesowerThallid.java | 2 +- Mage.Sets/src/mage/cards/s/SporolothAncient.java | 2 +- Mage.Sets/src/mage/cards/s/SpringjackPasture.java | 2 +- Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java | 2 +- Mage.Sets/src/mage/cards/s/SpurredWolverine.java | 2 +- Mage.Sets/src/mage/cards/s/SquallDrifter.java | 2 +- Mage.Sets/src/mage/cards/s/Squallmonger.java | 2 +- Mage.Sets/src/mage/cards/s/SqueesToy.java | 2 +- Mage.Sets/src/mage/cards/s/SquirrelNest.java | 2 +- Mage.Sets/src/mage/cards/s/SquirrelWrangler.java | 4 ++-- Mage.Sets/src/mage/cards/s/StaffOfDomination.java | 10 +++++----- Mage.Sets/src/mage/cards/s/StaffOfNin.java | 2 +- Mage.Sets/src/mage/cards/s/StaffOfZegon.java | 2 +- Mage.Sets/src/mage/cards/s/StalkingAssassin.java | 4 ++-- Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java | 2 +- Mage.Sets/src/mage/cards/s/StalkingStones.java | 2 +- Mage.Sets/src/mage/cards/s/Stamina.java | 2 +- Mage.Sets/src/mage/cards/s/StampedeDriver.java | 2 +- Mage.Sets/src/mage/cards/s/StarDestroyer.java | 6 +++--- Mage.Sets/src/mage/cards/s/StarkeOfRath.java | 2 +- Mage.Sets/src/mage/cards/s/StarlightInvoker.java | 2 +- Mage.Sets/src/mage/cards/s/StarlitSanctum.java | 4 ++-- Mage.Sets/src/mage/cards/s/StarvedRusalka.java | 2 +- Mage.Sets/src/mage/cards/s/StasisCell.java | 2 +- Mage.Sets/src/mage/cards/s/SteamSpitter.java | 2 +- Mage.Sets/src/mage/cards/s/Steamclaw.java | 4 ++-- Mage.Sets/src/mage/cards/s/SteelOverseer.java | 2 +- Mage.Sets/src/mage/cards/s/SteelSquirrel.java | 2 +- Mage.Sets/src/mage/cards/s/StensiaBloodhall.java | 2 +- Mage.Sets/src/mage/cards/s/SteppeGlider.java | 2 +- Mage.Sets/src/mage/cards/s/SterlingGrove.java | 2 +- Mage.Sets/src/mage/cards/s/SternConstable.java | 2 +- Mage.Sets/src/mage/cards/s/SternMentor.java | 2 +- Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java | 2 +- Mage.Sets/src/mage/cards/s/StillLife.java | 2 +- Mage.Sets/src/mage/cards/s/StillmoonCavalier.java | 6 +++--- Mage.Sets/src/mage/cards/s/StingingBarrier.java | 2 +- Mage.Sets/src/mage/cards/s/Stingmoggie.java | 2 +- Mage.Sets/src/mage/cards/s/StirringWildwood.java | 2 +- Mage.Sets/src/mage/cards/s/StitcherGeralf.java | 2 +- Mage.Sets/src/mage/cards/s/StitchersApprentice.java | 2 +- Mage.Sets/src/mage/cards/s/StoneHavenMedic.java | 2 +- Mage.Sets/src/mage/cards/s/StoneKavu.java | 4 ++-- Mage.Sets/src/mage/cards/s/StonefareCrocodile.java | 2 +- Mage.Sets/src/mage/cards/s/StoneforgeMystic.java | 2 +- Mage.Sets/src/mage/cards/s/Stonehands.java | 2 +- Mage.Sets/src/mage/cards/s/StonehornChanter.java | 2 +- Mage.Sets/src/mage/cards/s/StonewiseFortifier.java | 2 +- Mage.Sets/src/mage/cards/s/StonewoodInvoker.java | 2 +- Mage.Sets/src/mage/cards/s/Stonewright.java | 2 +- Mage.Sets/src/mage/cards/s/StonybrookAngler.java | 2 +- Mage.Sets/src/mage/cards/s/StormElemental.java | 4 ++-- Mage.Sets/src/mage/cards/s/StormFront.java | 2 +- Mage.Sets/src/mage/cards/s/StormShaman.java | 2 +- Mage.Sets/src/mage/cards/s/StormSpirit.java | 2 +- Mage.Sets/src/mage/cards/s/Stormbind.java | 2 +- Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java | 2 +- Mage.Sets/src/mage/cards/s/StormcallersBoon.java | 2 +- Mage.Sets/src/mage/cards/s/StormchaserChimera.java | 2 +- Mage.Sets/src/mage/cards/s/StormcloudDjinn.java | 2 +- Mage.Sets/src/mage/cards/s/StormscapeApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/s/StormscapeMaster.java | 4 ++-- Mage.Sets/src/mage/cards/s/StormwatchEagle.java | 2 +- Mage.Sets/src/mage/cards/s/StoryCircle.java | 2 +- Mage.Sets/src/mage/cards/s/StrandsOfNight.java | 2 +- Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java | 2 +- Mage.Sets/src/mage/cards/s/StreamHopper.java | 2 +- Mage.Sets/src/mage/cards/s/StripMine.java | 2 +- Mage.Sets/src/mage/cards/s/StromgaldCabal.java | 2 +- Mage.Sets/src/mage/cards/s/StromgaldCrusader.java | 4 ++-- Mage.Sets/src/mage/cards/s/StrongholdAssassin.java | 2 +- Mage.Sets/src/mage/cards/s/StrongholdMachinist.java | 2 +- Mage.Sets/src/mage/cards/s/StrongholdOverseer.java | 2 +- Mage.Sets/src/mage/cards/s/StuffyDoll.java | 2 +- Mage.Sets/src/mage/cards/s/StunSniper.java | 2 +- Mage.Sets/src/mage/cards/s/SturdyHatchling.java | 2 +- Mage.Sets/src/mage/cards/s/SubterraneanHangar.java | 2 +- Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java | 2 +- Mage.Sets/src/mage/cards/s/SuicidalCharge.java | 2 +- Mage.Sets/src/mage/cards/s/SultaiBanner.java | 2 +- Mage.Sets/src/mage/cards/s/SummoningStation.java | 2 +- Mage.Sets/src/mage/cards/s/SunClasp.java | 2 +- Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java | 4 ++-- Mage.Sets/src/mage/cards/s/Suncrusher.java | 4 ++-- Mage.Sets/src/mage/cards/s/SunflareShaman.java | 2 +- Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java | 2 +- .../src/mage/cards/s/SunhomeFortressOfTheLegion.java | 2 +- Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/s/SunkenField.java | 2 +- Mage.Sets/src/mage/cards/s/SunscapeApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/s/SunscapeMaster.java | 4 ++-- Mage.Sets/src/mage/cards/s/SunsetPyramid.java | 4 ++-- Mage.Sets/src/mage/cards/s/Sunstone.java | 2 +- Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java | 2 +- Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java | 2 +- Mage.Sets/src/mage/cards/s/SurgeNode.java | 2 +- Mage.Sets/src/mage/cards/s/SurveyorsScope.java | 2 +- Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java | 2 +- Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java | 2 +- Mage.Sets/src/mage/cards/s/Sustenance.java | 2 +- Mage.Sets/src/mage/cards/s/SutureSpirit.java | 2 +- .../src/mage/cards/s/SvogthosTheRestlessTomb.java | 2 +- Mage.Sets/src/mage/cards/s/Swarmyard.java | 2 +- Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java | 2 +- Mage.Sets/src/mage/cards/s/SwoopingTalon.java | 2 +- Mage.Sets/src/mage/cards/s/SwordDancer.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java | 2 +- Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java | 2 +- Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java | 4 ++-- Mage.Sets/src/mage/cards/s/SyggRiverGuide.java | 2 +- Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java | 2 +- Mage.Sets/src/mage/cards/s/SylvokReplica.java | 2 +- Mage.Sets/src/mage/cards/s/SymbioticDeployment.java | 2 +- Mage.Sets/src/mage/cards/s/SynodArtificer.java | 4 ++-- Mage.Sets/src/mage/cards/s/SynodSanctum.java | 4 ++-- 447 files changed, 513 insertions(+), 514 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SaberclawGolem.java b/Mage.Sets/src/mage/cards/s/SaberclawGolem.java index d27398d8d6c..c5982af9bb2 100644 --- a/Mage.Sets/src/mage/cards/s/SaberclawGolem.java +++ b/Mage.Sets/src/mage/cards/s/SaberclawGolem.java @@ -26,7 +26,7 @@ public final class SaberclawGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(4); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private SaberclawGolem(final SaberclawGolem card) { diff --git a/Mage.Sets/src/mage/cards/s/SacellumArchers.java b/Mage.Sets/src/mage/cards/s/SacellumArchers.java index 2d85929bf90..3c015049e37 100644 --- a/Mage.Sets/src/mage/cards/s/SacellumArchers.java +++ b/Mage.Sets/src/mage/cards/s/SacellumArchers.java @@ -30,7 +30,7 @@ public final class SacellumArchers extends CardImpl { this.toughness = new MageInt(3); // {R}{W}, {tap}: Sacellum Archers deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SacredArmory.java b/Mage.Sets/src/mage/cards/s/SacredArmory.java index 692c292b8ed..37b643d80b2 100644 --- a/Mage.Sets/src/mage/cards/s/SacredArmory.java +++ b/Mage.Sets/src/mage/cards/s/SacredArmory.java @@ -23,7 +23,7 @@ public final class SacredArmory extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SacredMesa.java b/Mage.Sets/src/mage/cards/s/SacredMesa.java index 55b6e17be93..42319096dda 100644 --- a/Mage.Sets/src/mage/cards/s/SacredMesa.java +++ b/Mage.Sets/src/mage/cards/s/SacredMesa.java @@ -34,7 +34,7 @@ public final class SacredMesa extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new SacrificeTargetCost(filter)))); // {1}{W}: Create a 1/1 white Pegasus creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{1}{W}"))); } private SacredMesa(final SacredMesa card) { diff --git a/Mage.Sets/src/mage/cards/s/Safeguard.java b/Mage.Sets/src/mage/cards/s/Safeguard.java index b08325625f1..cbdb2583cc0 100644 --- a/Mage.Sets/src/mage/cards/s/Safeguard.java +++ b/Mage.Sets/src/mage/cards/s/Safeguard.java @@ -26,7 +26,7 @@ public final class Safeguard extends CardImpl { // {2}{W}: Prevent all combat damage that would be dealt by target creature this turn. Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt by target creature this turn."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SafeholdSentry.java b/Mage.Sets/src/mage/cards/s/SafeholdSentry.java index 8a90858a9e2..f835e37246b 100644 --- a/Mage.Sets/src/mage/cards/s/SafeholdSentry.java +++ b/Mage.Sets/src/mage/cards/s/SafeholdSentry.java @@ -31,7 +31,7 @@ public final class SafeholdSentry extends CardImpl { this.toughness = new MageInt(2); // {2}{W}, {untap}: Safehold Sentry gets +0/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SageOfLatNam.java b/Mage.Sets/src/mage/cards/s/SageOfLatNam.java index b99151a59a0..0bcaef31a57 100644 --- a/Mage.Sets/src/mage/cards/s/SageOfLatNam.java +++ b/Mage.Sets/src/mage/cards/s/SageOfLatNam.java @@ -31,7 +31,7 @@ public final class SageOfLatNam extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice an artifact: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java b/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java index 4f3865daba4..67524f8a8c0 100644 --- a/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java +++ b/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java @@ -55,7 +55,7 @@ public final class SageOfTheMaze extends CardImpl { this.addAbility(ability); // Tap an untapped Gate you control: Untap Sage of the Maze. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(1, filter))); + ability = new SimpleActivatedAbility(new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(1, filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Sailmonger.java b/Mage.Sets/src/mage/cards/s/Sailmonger.java index 2e4fb79d3a9..217742aae00 100644 --- a/Mage.Sets/src/mage/cards/s/Sailmonger.java +++ b/Mage.Sets/src/mage/cards/s/Sailmonger.java @@ -31,7 +31,7 @@ public final class Sailmonger extends CardImpl { this.toughness = new MageInt(3); // {2}: Target creature gains flying until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java b/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java index 3c404c3c7c7..47ce7173ac6 100644 --- a/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java +++ b/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java @@ -29,7 +29,7 @@ public final class SakuraTribeElder extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, true), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true, true), new SacrificeSourceCost())); } private SakuraTribeElder(final SakuraTribeElder card) { diff --git a/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java b/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java index cfe562fdf61..2501e86e2be 100644 --- a/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java +++ b/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java @@ -36,7 +36,7 @@ public final class SaltRoadQuartermasters extends CardImpl { "with two +1/+1 counters on it")); // {2}{G}, Remove a +1/+1 counter from Salt Road Quartermasters: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java b/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java index 48649c20c4d..a845006301c 100644 --- a/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java +++ b/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java @@ -31,7 +31,7 @@ public final class SaltcrustedSteppe extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Saltcrusted Steppe. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Saltcrusted Steppe: Add X mana in any combination of {G} and/or {W}. diff --git a/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java b/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java index ed7936881e9..ff061c7c2bc 100644 --- a/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java +++ b/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java @@ -31,7 +31,7 @@ public final class SaltfieldRecluse extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2,0, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2,0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SalvagingStation.java b/Mage.Sets/src/mage/cards/s/SalvagingStation.java index f2adc872eca..51d4283cc6e 100644 --- a/Mage.Sets/src/mage/cards/s/SalvagingStation.java +++ b/Mage.Sets/src/mage/cards/s/SalvagingStation.java @@ -36,7 +36,7 @@ public final class SalvagingStation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {tap}: Return target noncreature artifact card with converted mana cost 1 or less from your graveyard to the battlefield. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new TapSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new TapSourceCost()); secondAbility.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(secondAbility); // Whenever a creature dies, you may untap Salvaging Station. diff --git a/Mage.Sets/src/mage/cards/s/SamiteArcher.java b/Mage.Sets/src/mage/cards/s/SamiteArcher.java index 2863af6572a..5ffaba8aa95 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteArcher.java +++ b/Mage.Sets/src/mage/cards/s/SamiteArcher.java @@ -32,12 +32,12 @@ public final class SamiteArcher extends CardImpl { this.toughness = new MageInt(1); // {T}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {T}: Samite Archer deals 1 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java index d5d382f01cb..1e0a80ef316 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java +++ b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java @@ -41,7 +41,7 @@ public final class SamiteBlessing extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: The next time a source of your choice would deal damage to target creature this turn, prevent that damage." - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); diff --git a/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java b/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java index b1ce188a82d..a97785a1f0c 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java +++ b/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java @@ -34,7 +34,7 @@ public final class SamiteCenserBearer extends CardImpl { this.toughness = new MageInt(1); // {W}, Sacrifice Samite Censer-Bearer: Prevent the next 1 damage that would be dealt to each creature you control this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamiteCenserBearerEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new SamiteCenserBearerEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteElder.java b/Mage.Sets/src/mage/cards/s/SamiteElder.java index bc291e0b931..6f3448c584d 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteElder.java +++ b/Mage.Sets/src/mage/cards/s/SamiteElder.java @@ -37,7 +37,7 @@ public final class SamiteElder extends CardImpl { this.toughness = new MageInt(2); // {T}: Creatures you control gain protection from the colors of target permanent you control until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamiteElderEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SamiteElderEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteHealer.java b/Mage.Sets/src/mage/cards/s/SamiteHealer.java index b9aed60cbae..86a49ce4708 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteHealer.java +++ b/Mage.Sets/src/mage/cards/s/SamiteHealer.java @@ -28,7 +28,7 @@ public final class SamiteHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamitePilgrim.java b/Mage.Sets/src/mage/cards/s/SamitePilgrim.java index 312cd820cda..d67d815d796 100644 --- a/Mage.Sets/src/mage/cards/s/SamitePilgrim.java +++ b/Mage.Sets/src/mage/cards/s/SamitePilgrim.java @@ -30,7 +30,7 @@ public final class SamitePilgrim extends CardImpl { this.toughness = new MageInt(1); // Domain - {T}: Prevent the next X damage that would be dealt to target creature this turn, where X is the number of basic land types among lands you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamitePilgrimPreventDamageToTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SamitePilgrimPreventDamageToTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); diff --git a/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java b/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java index ed20c56e6e3..0cb699b8fee 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java +++ b/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java @@ -24,7 +24,7 @@ public final class SamiteSanctuary extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // {2}: Prevent the next 1 damage that would be dealt to target creature this turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java index 589997d2a19..f3439375be3 100644 --- a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java +++ b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java @@ -64,7 +64,7 @@ public final class SamutVoiceOfDissent extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); //W, Tap: Untap another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent(filter2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java index 375b48c52ef..943fa3147df 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java @@ -29,7 +29,7 @@ public final class SanctumCustodian extends CardImpl { this.toughness = new MageInt(2); // {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 TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java index ce1f970b295..4a58c3e06e0 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java @@ -29,7 +29,7 @@ public final class SanctumGuardian extends CardImpl { this.toughness = new MageInt(4); // Sacrifice Sanctum Guardian: The next time a source of your choice would deal damage to any target this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java b/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java index a81369dedb1..e12069ab73c 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java @@ -44,7 +44,7 @@ public final class SanctumOfShatteredHeights extends CardImpl { this.subtype.add(SubType.SHRINE); // {1}, Discard a land card or Shrine card: Sanctum of Shattered Heights deals X damage to target creature or planeswalker, where X is the number of Shrines you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(xValue) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(xValue) .setText("Sanctum of Shattered Heights deals X damage to target creature or planeswalker, where X is the number of Shrines you control"), new ManaCostsImpl<>("{1}")) .addHint(new ValueHint("Shrines you control", xValue)); diff --git a/Mage.Sets/src/mage/cards/s/SandSquid.java b/Mage.Sets/src/mage/cards/s/SandSquid.java index c7f7392e445..9b8b59eda9f 100644 --- a/Mage.Sets/src/mage/cards/s/SandSquid.java +++ b/Mage.Sets/src/mage/cards/s/SandSquid.java @@ -35,7 +35,7 @@ public final class SandSquid extends CardImpl { // You may choose not to untap Sand Squid during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Tap target creature. That creature doesn't untap during its controller's untap step for as long as Sand Squid remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java b/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java index eebbfcedee6..0a3fed6c243 100644 --- a/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java +++ b/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java @@ -24,7 +24,7 @@ public final class SandsOfDelirium extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {X}, {tap}: Target player puts the top X cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(GetXValue.instance), new VariableManaCost(VariableCostType.NORMAL)); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(GetXValue.instance), new VariableManaCost(VariableCostType.NORMAL)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Sandsower.java b/Mage.Sets/src/mage/cards/s/Sandsower.java index b3eae1e704b..6f66eef7c64 100644 --- a/Mage.Sets/src/mage/cards/s/Sandsower.java +++ b/Mage.Sets/src/mage/cards/s/Sandsower.java @@ -37,7 +37,7 @@ public final class Sandsower extends CardImpl { this.toughness = new MageInt(3); // Tap three untapped creatures you control: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java b/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java index 0f9977c23ae..5a1d37ec985 100644 --- a/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java +++ b/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java @@ -29,7 +29,7 @@ public final class SandstoneWarrior extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {R}: Sandstone Warrior 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))); } private SandstoneWarrior(final SandstoneWarrior card) { diff --git a/Mage.Sets/src/mage/cards/s/SandstormEidolon.java b/Mage.Sets/src/mage/cards/s/SandstormEidolon.java index 00c4b36671a..7e61246eb1d 100644 --- a/Mage.Sets/src/mage/cards/s/SandstormEidolon.java +++ b/Mage.Sets/src/mage/cards/s/SandstormEidolon.java @@ -29,7 +29,7 @@ public final class SandstormEidolon extends CardImpl { this.toughness = new MageInt(2); // {R}, Sacrifice Sandstorm Eidolon: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanguineGuard.java b/Mage.Sets/src/mage/cards/s/SanguineGuard.java index d0eb456cd02..d8c7bace50e 100644 --- a/Mage.Sets/src/mage/cards/s/SanguineGuard.java +++ b/Mage.Sets/src/mage/cards/s/SanguineGuard.java @@ -29,7 +29,7 @@ public final class SanguineGuard extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SanguineGuard(final SanguineGuard card) { diff --git a/Mage.Sets/src/mage/cards/s/SanguinePraetor.java b/Mage.Sets/src/mage/cards/s/SanguinePraetor.java index 63532b89b1d..dd55104910b 100644 --- a/Mage.Sets/src/mage/cards/s/SanguinePraetor.java +++ b/Mage.Sets/src/mage/cards/s/SanguinePraetor.java @@ -35,7 +35,7 @@ public final class SanguinePraetor extends CardImpl { this.toughness = new MageInt(5); // {B}, Sacrifice a creature: Destroy each creature with the same converted mana cost as the sacrificed creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SanguinePraetorEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new SanguinePraetorEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java b/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java index e3953752f50..f5ed528c55c 100644 --- a/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java +++ b/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java @@ -29,7 +29,7 @@ public final class SaprazzanBreaker extends CardImpl { this.toughness = new MageInt(3); // {U}: Put the top card of your library into your graveyard. If that card is a land card, Saprazzan Breaker can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SaprazzanBreakerEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new SaprazzanBreakerEffect(), new ManaCostsImpl<>("{U}"))); } private SaprazzanBreaker(final SaprazzanBreaker card) { diff --git a/Mage.Sets/src/mage/cards/s/SaprazzanCove.java b/Mage.Sets/src/mage/cards/s/SaprazzanCove.java index 111cb356495..2553b3dd9ff 100644 --- a/Mage.Sets/src/mage/cards/s/SaprazzanCove.java +++ b/Mage.Sets/src/mage/cards/s/SaprazzanCove.java @@ -30,7 +30,7 @@ public final class SaprazzanCove extends CardImpl { // Saprazzan Cove enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Put a storage counter on Saprazzan Cove. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {tap}, Remove any number of storage counters from Saprazzan Cove: Add {U} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.BlueMana(1), diff --git a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java index 1fac1bbcabf..2487504c569 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java @@ -38,7 +38,7 @@ public final class SaprolingBurst extends CardImpl { this.addAbility(new FadingAbility(7, this)); // Remove a fade counter from Saproling Burst: create a green Saproling creature token. It has "This creature's power and toughness are each equal to the number of fade counters on Saproling Burst." - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SaprolingBurstCreateTokenEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new SaprolingBurstCreateTokenEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()))); // When Saproling Burst leaves the battlefield, destroy all tokens created with Saproling Burst. They can't be regenerated. this.addAbility(new SaprolingBurstLeavesBattlefieldTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/s/SaprolingCluster.java b/Mage.Sets/src/mage/cards/s/SaprolingCluster.java index 967aa8f6d77..c35f4f7ebc9 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingCluster.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingCluster.java @@ -24,7 +24,7 @@ public final class SaprolingCluster extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // {1}, Discard a card: Create a 1/1 green Saproling creature token. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()) , new GenericManaCost(1)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()) , new GenericManaCost(1)); ability.addCost(new DiscardCardCost()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java b/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java index 5a26130a84f..63bb964c2e0 100644 --- a/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java +++ b/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java @@ -30,8 +30,8 @@ public final class SarcomiteMyr extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java index aef44943fbb..bbdfb56eef5 100644 --- a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java +++ b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java @@ -35,7 +35,7 @@ public final class SarpadianEmpiresVolVII extends CardImpl { // As Sarpadian Empires, Vol. VII enters the battlefield, choose white Citizen, blue Camarid, black Thrull, red Goblin, or green Saproling. this.addAbility(new AsEntersBattlefieldAbility(new SarpadianEmpiresChooseTokenEffect())); // {3}, {T}: Create a 1/1 creature token of the chosen color and type. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SarpadianEmpiresCreateSelectedTokenEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new SarpadianEmpiresCreateSelectedTokenEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java index fa0f4be0b4f..8699e75a72d 100644 --- a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java +++ b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java @@ -51,7 +51,7 @@ public final class SasayaOrochiAscendant extends CardImpl { // Reveal your hand: If you have seven or more land cards in your hand, flip Sasaya, Orochi Ascendant. Effect effect = new SasayaOrochiAscendantFlipEffect(); effect.setOutcome(Outcome.AIDontUseIt); // repetition issues need to be fixed for the AI to use this effectively - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new RevealHandSourceControllerCost())); + this.addAbility(new SimpleActivatedAbility(effect, new RevealHandSourceControllerCost())); } private SasayaOrochiAscendant(final SasayaOrochiAscendant card) { diff --git a/Mage.Sets/src/mage/cards/s/SatyrPiper.java b/Mage.Sets/src/mage/cards/s/SatyrPiper.java index e421e0b51cf..319d0aece14 100644 --- a/Mage.Sets/src/mage/cards/s/SatyrPiper.java +++ b/Mage.Sets/src/mage/cards/s/SatyrPiper.java @@ -30,7 +30,7 @@ public final class SatyrPiper extends CardImpl { this.toughness = new MageInt(1); // {3}{G}: Target creature must be blocked this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SavaenElves.java b/Mage.Sets/src/mage/cards/s/SavaenElves.java index 1f493bb6a45..68900662f13 100644 --- a/Mage.Sets/src/mage/cards/s/SavaenElves.java +++ b/Mage.Sets/src/mage/cards/s/SavaenElves.java @@ -43,7 +43,7 @@ public final class SavaenElves extends CardImpl { // {G}{G}, {tap}: Destroy target Aura attached to a land. Effect effect = new DestroyTargetEffect(); effect.setText("Destroy target Aura attached to a land"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{G}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SavageGorilla.java b/Mage.Sets/src/mage/cards/s/SavageGorilla.java index ab6bce013e5..1e577042c3c 100644 --- a/Mage.Sets/src/mage/cards/s/SavageGorilla.java +++ b/Mage.Sets/src/mage/cards/s/SavageGorilla.java @@ -30,7 +30,7 @@ public final class SavageGorilla extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java b/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java index e96da01726e..543c04bd434 100644 --- a/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java +++ b/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java @@ -35,10 +35,10 @@ public final class SavageKnuckleblade extends CardImpl { this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); // {2}{U}: Return Savage Knuckleblade to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); // {R}: Savage Knuckleblade gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SavageThallid.java b/Mage.Sets/src/mage/cards/s/SavageThallid.java index 79951df43cb..4f247ed69e9 100644 --- a/Mage.Sets/src/mage/cards/s/SavageThallid.java +++ b/Mage.Sets/src/mage/cards/s/SavageThallid.java @@ -45,9 +45,9 @@ public final class SavageThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Savage Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Savage Thallid: 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: Regenerate target Fungus. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new SacrificeTargetCost(filter2)); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SawbackManticore.java b/Mage.Sets/src/mage/cards/s/SawbackManticore.java index 31c955a984f..bfb221d90ec 100644 --- a/Mage.Sets/src/mage/cards/s/SawbackManticore.java +++ b/Mage.Sets/src/mage/cards/s/SawbackManticore.java @@ -34,7 +34,7 @@ public final class SawbackManticore extends CardImpl { this.toughness = new MageInt(4); // {4}: Sawback Manticore gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(4))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(4))); // {1}: Sawback Manticore deals 2 damage to target attacking or blocking creature. Activate this ability only if Sawback Manticore is attacking or blocking and only once each turn. Ability ability = new LimitedTimesPerTurnActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/s/SawtoothThresher.java b/Mage.Sets/src/mage/cards/s/SawtoothThresher.java index ff2c56f6f63..2b642885436 100644 --- a/Mage.Sets/src/mage/cards/s/SawtoothThresher.java +++ b/Mage.Sets/src/mage/cards/s/SawtoothThresher.java @@ -31,7 +31,7 @@ public final class SawtoothThresher extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Remove two +1/+1 counters from Sawtooth Thresher: Sawtooth Thresher gets +4/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(4, 4, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } private SawtoothThresher(final SawtoothThresher card) { diff --git a/Mage.Sets/src/mage/cards/s/ScaldingDevil.java b/Mage.Sets/src/mage/cards/s/ScaldingDevil.java index d1ec30eaf35..5729e8f5513 100644 --- a/Mage.Sets/src/mage/cards/s/ScaldingDevil.java +++ b/Mage.Sets/src/mage/cards/s/ScaldingDevil.java @@ -28,7 +28,7 @@ public final class ScaldingDevil extends CardImpl { this.toughness = new MageInt(1); // {2}{R}: Scalding Devil 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/s/Scaldkin.java b/Mage.Sets/src/mage/cards/s/Scaldkin.java index c774f73f01d..48a4c91e631 100644 --- a/Mage.Sets/src/mage/cards/s/Scaldkin.java +++ b/Mage.Sets/src/mage/cards/s/Scaldkin.java @@ -32,7 +32,7 @@ public final class Scaldkin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{R}, Sacrifice Scaldkin: Scaldkin deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java b/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java index 0f86dcbee7b..510b9157c3d 100644 --- a/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java +++ b/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java @@ -28,7 +28,7 @@ public final class ScaleOfChissGoria extends CardImpl { // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java index 7e76a0b4e6e..a1954cf71ed 100644 --- a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java @@ -36,7 +36,7 @@ public final class ScarabOfTheUnseen extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {T}, Sacrifice Scarab of the Unseen: Return all Auras attached to target permanent you own to their owners’ hands. Draw a card at the beginning of the next turn’s upkeep. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScarabOfTheUnseenEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScarabOfTheUnseenEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false)); diff --git a/Mage.Sets/src/mage/cards/s/ScarbladeElite.java b/Mage.Sets/src/mage/cards/s/ScarbladeElite.java index 5d2916daa3b..6d5f345830f 100644 --- a/Mage.Sets/src/mage/cards/s/ScarbladeElite.java +++ b/Mage.Sets/src/mage/cards/s/ScarbladeElite.java @@ -36,7 +36,7 @@ public final class ScarbladeElite extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Scarecrone.java b/Mage.Sets/src/mage/cards/s/Scarecrone.java index 96be5665410..bec813c4ea0 100644 --- a/Mage.Sets/src/mage/cards/s/Scarecrone.java +++ b/Mage.Sets/src/mage/cards/s/Scarecrone.java @@ -39,12 +39,12 @@ public final class Scarecrone extends CardImpl { this.toughness = new MageInt(2); // {1}, Sacrifice a Scarecrow: Draw a card. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability firstAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); firstAbility.addCost(new SacrificeTargetCost(filterScarecrow)); this.addAbility(firstAbility); // {4}, {T}: Return target artifact creature card from your graveyard to the battlefield. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(4)); + Ability secondAbility = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(4)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/s/Scarecrow.java b/Mage.Sets/src/mage/cards/s/Scarecrow.java index 64671dbb32e..efbf684284a 100644 --- a/Mage.Sets/src/mage/cards/s/Scarecrow.java +++ b/Mage.Sets/src/mage/cards/s/Scarecrow.java @@ -35,7 +35,7 @@ public final class Scarecrow extends CardImpl { this.toughness = new MageInt(2); // {6}, {T}: Prevent all damage that would be dealt to you this turn by attacking creatures without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScarecrowEffect(), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new ScarecrowEffect(), new GenericManaCost(6)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScattershotArcher.java b/Mage.Sets/src/mage/cards/s/ScattershotArcher.java index 25c4f93f510..47b70bb743f 100644 --- a/Mage.Sets/src/mage/cards/s/ScattershotArcher.java +++ b/Mage.Sets/src/mage/cards/s/ScattershotArcher.java @@ -36,7 +36,7 @@ public final class ScattershotArcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: Scattershot Archer deals 1 damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new TapSourceCost())); } private ScattershotArcher(final ScattershotArcher card) { diff --git a/Mage.Sets/src/mage/cards/s/ScavengerFolk.java b/Mage.Sets/src/mage/cards/s/ScavengerFolk.java index 7898d7f558d..ebcefa766d1 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengerFolk.java +++ b/Mage.Sets/src/mage/cards/s/ScavengerFolk.java @@ -30,7 +30,7 @@ public final class ScavengerFolk extends CardImpl { this.toughness = new MageInt(1); // {G}, {T}, Sacrifice Scavenger Folk: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java b/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java index d09225cc010..203265cc073 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java +++ b/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java @@ -34,7 +34,7 @@ public final class ScavengingGhoul extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new AddCountersSourceEffect(CounterType.CORPSE.createInstance(), CreaturesDiedThisTurnCount.instance, true), false).addHint(CreaturesDiedThisTurnHint.instance)); // Remove a corpse counter from Scavenging Ghoul: Regenerate Scavenging Ghoul. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.CORPSE.createInstance()))); } diff --git a/Mage.Sets/src/mage/cards/s/ScavengingOoze.java b/Mage.Sets/src/mage/cards/s/ScavengingOoze.java index 1aa6f37e7ab..1a2d1772ee1 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengingOoze.java +++ b/Mage.Sets/src/mage/cards/s/ScavengingOoze.java @@ -34,7 +34,7 @@ public final class ScavengingOoze extends CardImpl { this.toughness = new MageInt(2); // {G}: Exile target card from a graveyard. If it was a creature card, put a +1/+1 counter on Scavenging Ooze and you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScavengingOozeEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new ScavengingOozeEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java b/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java index b5131cbe4bf..7dfcdb9a595 100644 --- a/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java +++ b/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java @@ -23,7 +23,7 @@ public final class ScepterOfDominance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{W}{W}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java b/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java index 821d119473a..e28cb424043 100644 --- a/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java +++ b/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java @@ -24,7 +24,7 @@ public final class ScepterOfEmpires extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {tap}: Scepter of Empires deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScepterOfEmpiresEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScepterOfEmpiresEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java b/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java index d9e23e97242..0eef02c7901 100644 --- a/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java +++ b/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java @@ -22,7 +22,7 @@ public final class ScepterOfInsight extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{U}{U}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java b/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java index 43e93d72c24..dc0d5c68025 100644 --- a/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java +++ b/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java @@ -27,7 +27,7 @@ public final class ScholarOfAthreos extends CardImpl { this.toughness = new MageInt(4); // {2}{B}: Each opponent loses 1 life. You gain life equal to the life lost this way. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsYouGainLifeLostEffect(1), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new LoseLifeOpponentsYouGainLifeLostEffect(1), new ManaCostsImpl<>("{2}{B}"))); } private ScholarOfAthreos(final ScholarOfAthreos card) { diff --git a/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java b/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java index 5c44c99b842..66c4b89a8d6 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java @@ -27,7 +27,7 @@ public final class ScionOfGlaciers extends CardImpl { this.toughness = new MageInt(5); // {U}: Scion of Glaciers gets +1/-1 until end of turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private ScionOfGlaciers(final ScionOfGlaciers card) { diff --git a/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java b/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java index b30d7b0e329..589574564e7 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java +++ b/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java @@ -30,7 +30,7 @@ public final class ScorchedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java index 44aece15c4b..01d93aa8264 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java @@ -43,11 +43,11 @@ public final class ScourgeOfKherRidges extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Scourge of Kher Ridges deals 2 damage to each creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, filter), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(2, filter), new ManaCostsImpl<>("{1}{R}")); this.addAbility(ability); // {5}{R}: Scourge of Kher Ridges deals 6 damage to each other creature with flying. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(6, filter2), new ManaCostsImpl<>("{5}{R}")); + Ability ability2 = new SimpleActivatedAbility(new DamageAllEffect(6, filter2), new ManaCostsImpl<>("{5}{R}")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java b/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java index 1c7bd561386..8ae71f20f7f 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java @@ -45,7 +45,7 @@ public final class ScourgeOfSkolaVale extends CardImpl { effect.setText("with two +1/+1 counters on it"); this.addAbility(new EntersBattlefieldAbility(effect)); // {T}, Sacrifice another creature: Put a number of +1/+1 counters on Scourge of Skola Vale equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScourgeOfSkolaValeEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScourgeOfSkolaValeEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java index 16e547b24dd..ebbfc6a1120 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java @@ -41,7 +41,7 @@ public final class ScourgeOfTheNobilis extends CardImpl { // As long as enchanted creature is red, it gets +1/+1 and has "{RW}: This creature gets +1/+0 until end of turn." SimpleStaticAbility redAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect( - new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}")), AttachmentType.AURA), + new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}")), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has \"{R/W}: This creature gets +1/+0 until end of turn.\"")); this.addAbility(redAbility); diff --git a/Mage.Sets/src/mage/cards/s/Scrapbasket.java b/Mage.Sets/src/mage/cards/s/Scrapbasket.java index 79840d6a946..e13663aad2f 100644 --- a/Mage.Sets/src/mage/cards/s/Scrapbasket.java +++ b/Mage.Sets/src/mage/cards/s/Scrapbasket.java @@ -32,7 +32,7 @@ public final class Scrapbasket extends CardImpl { this.toughness = new MageInt(2); // {1}: Scrapbasket becomes all colors until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesAllColorsEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesAllColorsEffect(), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java b/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java index d1743d9d7c3..7afdce340f3 100644 --- a/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java @@ -24,7 +24,7 @@ public final class ScreamsOfTheDamned extends CardImpl { // {1}{B}, Exile a card from your graveyard: Screams of the Damned deals 1 damage to each creature and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new DamageEverythingEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java b/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java index 08d6cdbd62c..033c62fa1aa 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java @@ -32,7 +32,7 @@ public final class ScreechingGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Target creature can't block Screeching Griffin this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java b/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java index e9c748d52c8..e489ca16ce0 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java @@ -27,7 +27,7 @@ public final class ScreechingHarpy extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private ScreechingHarpy(final ScreechingHarpy card) { diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java index 2c6f5f63abb..ee9a57eea4c 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java @@ -32,7 +32,7 @@ public final class ScreechingSliver extends CardImpl { this.toughness = new MageInt(1); // All Slivers have "{T}: Target player puts the top card of their library into their graveyard." - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new MillCardsTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/s/ScribNibblers.java b/Mage.Sets/src/mage/cards/s/ScribNibblers.java index 35cdf6b7de9..e1ba03d4386 100644 --- a/Mage.Sets/src/mage/cards/s/ScribNibblers.java +++ b/Mage.Sets/src/mage/cards/s/ScribNibblers.java @@ -33,7 +33,7 @@ public final class ScribNibblers extends CardImpl { this.toughness = new MageInt(1); // {tap}: Exile the top card of target player's library. If it's a land card, you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScribNibblersEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScribNibblersEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java b/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java index 141f3f00dc9..b9c195b3560 100644 --- a/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java +++ b/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java @@ -44,7 +44,7 @@ public final class ScribeOfTheMindful extends CardImpl { // {1}, {T}, Sacrifice Scribe of the Mindful: Return target instant or sorcery card from your graveyard to your hand. Effect effect = new ReturnToHandTargetEffect(); effect.setText("Return target instant or sorcery card from your graveyard to your hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java b/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java index 2bd0e129827..3f198f3d572 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java +++ b/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java @@ -32,7 +32,7 @@ public final class ScrollOfAvacyn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Scroll of Avacyn: Draw a card. If you control an Angel, you gain 5 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new GainLifeEffect(5), new PermanentsOnTheBattlefieldCondition(filter), "If you control an Angel, you gain 5 life")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java b/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java index 1c9404b91d8..657c7610105 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java +++ b/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java @@ -33,7 +33,7 @@ public final class ScrollOfGriselbrand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Scroll of Griselbrand: Target opponent discards a card. If you control a Demon, that player loses 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DiscardTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new LoseLifeTargetEffect(3), new PermanentsOnTheBattlefieldCondition(filter), "If you control a Demon, that player loses 3 life")); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/s/ScrollRack.java b/Mage.Sets/src/mage/cards/s/ScrollRack.java index 560ab770d14..cb54b43f881 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollRack.java +++ b/Mage.Sets/src/mage/cards/s/ScrollRack.java @@ -30,7 +30,7 @@ public final class ScrollRack extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {1}, {tap}: Exile any number of cards from your hand face down. Put that many cards from the top of your library into your hand. Then look at the exiled cards and put them on top of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScrollRackEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ScrollRackEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScryingGlass.java b/Mage.Sets/src/mage/cards/s/ScryingGlass.java index f01ec33449a..edd9daa8369 100644 --- a/Mage.Sets/src/mage/cards/s/ScryingGlass.java +++ b/Mage.Sets/src/mage/cards/s/ScryingGlass.java @@ -28,7 +28,7 @@ public final class ScryingGlass extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Choose a number greater than 0 and a color. Target opponent reveals their hand. If that opponent reveals exactly the chosen number of cards of the chosen color, you draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryingGlassEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new ScryingGlassEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScryingSheets.java b/Mage.Sets/src/mage/cards/s/ScryingSheets.java index 3dca234ec98..65be778723a 100644 --- a/Mage.Sets/src/mage/cards/s/ScryingSheets.java +++ b/Mage.Sets/src/mage/cards/s/ScryingSheets.java @@ -34,7 +34,7 @@ public final class ScryingSheets extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{S}, {T}: Look at the top card of your library. If that card is snow, you may reveal it and put it into your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryingSheetsEffect(), new ManaCostsImpl<>("{1}{S}")); + Ability ability = new SimpleActivatedAbility(new ScryingSheetsEffect(), new ManaCostsImpl<>("{1}{S}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Scuttlemutt.java b/Mage.Sets/src/mage/cards/s/Scuttlemutt.java index 91274cced62..675da8772a2 100644 --- a/Mage.Sets/src/mage/cards/s/Scuttlemutt.java +++ b/Mage.Sets/src/mage/cards/s/Scuttlemutt.java @@ -32,7 +32,7 @@ public final class Scuttlemutt extends CardImpl { this.addAbility(new AnyColorManaAbility()); // {T}: Target creature becomes the color or colors of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java b/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java index 6f3251c4f2c..964e61a4603 100644 --- a/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java +++ b/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java @@ -28,7 +28,7 @@ public final class ScuttlingDeath extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(4)); diff --git a/Mage.Sets/src/mage/cards/s/SeaSnidd.java b/Mage.Sets/src/mage/cards/s/SeaSnidd.java index 1976a3b811e..0247590333b 100644 --- a/Mage.Sets/src/mage/cards/s/SeaSnidd.java +++ b/Mage.Sets/src/mage/cards/s/SeaSnidd.java @@ -28,7 +28,7 @@ public final class SeaSnidd extends CardImpl { this.toughness = new MageInt(3); // {T}: Target land 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()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeaSpirit.java b/Mage.Sets/src/mage/cards/s/SeaSpirit.java index b6e4afb8386..f9f16faf873 100644 --- a/Mage.Sets/src/mage/cards/s/SeaSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SeaSpirit.java @@ -28,7 +28,7 @@ public final class SeaSpirit extends CardImpl { this.toughness = new MageInt(3); // {U}: Sea Spirit gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, +0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(+1, +0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Seahunter.java b/Mage.Sets/src/mage/cards/s/Seahunter.java index bebacdf3fd6..cd60794b087 100644 --- a/Mage.Sets/src/mage/cards/s/Seahunter.java +++ b/Mage.Sets/src/mage/cards/s/Seahunter.java @@ -37,7 +37,7 @@ public final class Seahunter extends CardImpl { this.toughness = new MageInt(2); // {3}, {T}: Search your library for a Merfolk permanent card and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfCleansing.java b/Mage.Sets/src/mage/cards/s/SealOfCleansing.java index 2b8c29eaa2a..04fe7e145a2 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfCleansing.java +++ b/Mage.Sets/src/mage/cards/s/SealOfCleansing.java @@ -24,7 +24,7 @@ public final class SealOfCleansing extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // Sacrifice Seal of Cleansing: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfDoom.java b/Mage.Sets/src/mage/cards/s/SealOfDoom.java index aa520bbe9fc..64ca2f487eb 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfDoom.java +++ b/Mage.Sets/src/mage/cards/s/SealOfDoom.java @@ -20,7 +20,7 @@ public final class SealOfDoom extends CardImpl { public SealOfDoom(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfFire.java b/Mage.Sets/src/mage/cards/s/SealOfFire.java index 448448a5fe4..62571660d12 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfFire.java +++ b/Mage.Sets/src/mage/cards/s/SealOfFire.java @@ -23,7 +23,7 @@ public final class SealOfFire extends CardImpl { // Sacrifice Seal of Fire: Seal of Fire deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java b/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java index 99a2bbc60b5..9849e8c085a 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java +++ b/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java @@ -24,7 +24,7 @@ public final class SealOfPrimordium extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // Sacrifice Seal of Primordium: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfRemoval.java b/Mage.Sets/src/mage/cards/s/SealOfRemoval.java index c820b5334a8..f0718182240 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfRemoval.java +++ b/Mage.Sets/src/mage/cards/s/SealOfRemoval.java @@ -24,7 +24,7 @@ public final class SealOfRemoval extends CardImpl { // Sacrifice Seal of Removal: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfStrength.java b/Mage.Sets/src/mage/cards/s/SealOfStrength.java index 1fcd59feeda..084ba309469 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfStrength.java +++ b/Mage.Sets/src/mage/cards/s/SealOfStrength.java @@ -24,7 +24,7 @@ public final class SealOfStrength extends CardImpl { // Sacrifice Seal of Strength: Target creature gets +3/+3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java b/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java index a54553c6895..eab742a77d3 100644 --- a/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java +++ b/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java @@ -33,7 +33,7 @@ public final class SearingSpearAskari extends CardImpl { this.addAbility(new FlankingAbility()); // {1}{R}: Searing Spear Askari gains menace until end of turn. (It can't be blocked except by two or more creatures.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private SearingSpearAskari(final SearingSpearAskari card) { diff --git a/Mage.Sets/src/mage/cards/s/SeasideHaven.java b/Mage.Sets/src/mage/cards/s/SeasideHaven.java index bb6584bc2a2..80796ec0f46 100644 --- a/Mage.Sets/src/mage/cards/s/SeasideHaven.java +++ b/Mage.Sets/src/mage/cards/s/SeasideHaven.java @@ -35,7 +35,7 @@ public final class SeasideHaven extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {W}{U}, {tap}, Sacrifice a Bird: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SeasonedTactician.java b/Mage.Sets/src/mage/cards/s/SeasonedTactician.java index 3d83c670ab1..909dff399bb 100644 --- a/Mage.Sets/src/mage/cards/s/SeasonedTactician.java +++ b/Mage.Sets/src/mage/cards/s/SeasonedTactician.java @@ -30,7 +30,7 @@ public final class SeasonedTactician extends CardImpl { this.toughness = new MageInt(3); // {3}, Exile the top four cards of your library: The next time a source of your choice would deal damage to you this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new ExileFromTopOfLibraryCost(4)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SecondWind.java b/Mage.Sets/src/mage/cards/s/SecondWind.java index b84b803d843..de0c52e2e89 100644 --- a/Mage.Sets/src/mage/cards/s/SecondWind.java +++ b/Mage.Sets/src/mage/cards/s/SecondWind.java @@ -34,10 +34,10 @@ public final class SecondWind extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // {tap}: Tap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new TapEnchantedEffect(), new TapSourceCost())); // {tap}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new UntapAttachedEffect(), new TapSourceCost())); } private SecondWind(final SecondWind card) { diff --git a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java index 995adfd3f2c..057027b2910 100644 --- a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java +++ b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java @@ -48,7 +48,7 @@ public final class SecurityBlockade extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KnightToken()))); // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to you this turn." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/cards/s/SedgeSliver.java b/Mage.Sets/src/mage/cards/s/SedgeSliver.java index 81336897609..e9fab11d510 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeSliver.java +++ b/Mage.Sets/src/mage/cards/s/SedgeSliver.java @@ -43,7 +43,7 @@ public final class SedgeSliver extends CardImpl { new GainAbilityAllEffect(boost, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"This creature gets +1/+1 as long as you control a Swamp.\""))); // All Slivers have "{B}: Regenerate this permanent." - Ability regenerate = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability regenerate = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(regenerate, Duration.WhileOnBattlefield, filterSlivers, "All Slivers have \"{B}: Regenerate this permanent.\""))); diff --git a/Mage.Sets/src/mage/cards/s/SedgeTroll.java b/Mage.Sets/src/mage/cards/s/SedgeTroll.java index 2ee30c17062..5a447725502 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeTroll.java +++ b/Mage.Sets/src/mage/cards/s/SedgeTroll.java @@ -36,7 +36,7 @@ public final class SedgeTroll extends CardImpl { // Sedge Troll gets +1/+1 as long as you control a Swamp. this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {B}: Regenerate Sedge Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private SedgeTroll(final SedgeTroll card) { diff --git a/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java b/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java index 5f007d31469..5a54d2de897 100644 --- a/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java +++ b/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java @@ -30,7 +30,7 @@ public final class SeedcradleWitch extends CardImpl { this.toughness = new MageInt(1); // {2}{G}{W}: Target creature gets +3/+3 until end of turn. Untap that creature. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{W}")); ability.addEffect(new UntapTargetEffect().setText("untap that creature")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java b/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java index 40dbbfd60bb..8a9753c7304 100644 --- a/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java +++ b/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java @@ -26,7 +26,7 @@ public final class SeekerOfSkybreak extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java index 5a3d2cd6158..d05dc33d427 100644 --- a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java +++ b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java @@ -31,7 +31,7 @@ public final class SeerOfTheLastTomorrow extends CardImpl { this.toughness = new MageInt(4); // {U}, {T}, Discard a card: Target player puts the top three cards of their library into their graveyard. - 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 TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/SeersLantern.java b/Mage.Sets/src/mage/cards/s/SeersLantern.java index ea6aab14b50..93209e0567c 100644 --- a/Mage.Sets/src/mage/cards/s/SeersLantern.java +++ b/Mage.Sets/src/mage/cards/s/SeersLantern.java @@ -26,7 +26,7 @@ public final class SeersLantern extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeismicMage.java b/Mage.Sets/src/mage/cards/s/SeismicMage.java index af2165ad319..65360614059 100644 --- a/Mage.Sets/src/mage/cards/s/SeismicMage.java +++ b/Mage.Sets/src/mage/cards/s/SeismicMage.java @@ -30,7 +30,7 @@ public final class SeismicMage extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, {tap}, Discard a card: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java b/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java index 268cc82d5cf..5c099a1c47e 100644 --- a/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java +++ b/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java @@ -34,7 +34,7 @@ public final class SeleniaDarkAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Pay 2 life: Return Selenia, Dark Angel to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new PayLifeCost(2))); } private SeleniaDarkAngel(final SeleniaDarkAngel card) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java b/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java index 8746ef2e954..eecfdcc6ece 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java @@ -32,7 +32,7 @@ public final class SelesnyaCluestone extends CardImpl { this.addAbility(new WhiteManaAbility()); // {G}{W}, {T}, Sacrifice Selesnya Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{W}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java index d3c25cb4dec..228442bf655 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java @@ -40,7 +40,7 @@ public final class SelesnyaEvangel extends CardImpl { this.toughness = new MageInt(2); // {1}, {tap}, Tap an untapped creature you control: Create a 1/1 green Saproling creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java b/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java index 86910a3dfc6..1e7e2cc454a 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java @@ -32,9 +32,9 @@ public final class SelesnyaGuildmage extends CardImpl { this.toughness = new MageInt(2); // {3}{G}: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{3}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{3}{G}"))); // {3}{W}: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); } private SelesnyaGuildmage(final SelesnyaGuildmage card) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java index 7c445afd27c..d1923d26d1b 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java @@ -29,7 +29,7 @@ public final class SelesnyaKeyrune extends CardImpl { this.addAbility(new WhiteManaAbility()); // {G}{W}: Selesnya Keyrune becomes a 3/3 green and white Wolf artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SelesnyaKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SelesnyaKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{W}"))); } private SelesnyaKeyrune(final SelesnyaKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java b/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java index a70865edc78..bf770d66ac2 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java @@ -27,7 +27,7 @@ public final class SelesnyaSentry extends CardImpl { this.toughness = new MageInt(2); // {5}{G}: Regenerate Selesnya Sentry. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); } private SelesnyaSentry(final SelesnyaSentry card) { diff --git a/Mage.Sets/src/mage/cards/s/SelflessCathar.java b/Mage.Sets/src/mage/cards/s/SelflessCathar.java index 28d5794da24..f66bdb5f59e 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessCathar.java +++ b/Mage.Sets/src/mage/cards/s/SelflessCathar.java @@ -29,7 +29,7 @@ public final class SelflessCathar extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, Sacrifice Selfless Cathar: Creatures you control get +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SelflessSpirit.java b/Mage.Sets/src/mage/cards/s/SelflessSpirit.java index 98a3f3d5ba7..ecb8c25bd62 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SelflessSpirit.java @@ -33,7 +33,7 @@ public final class SelflessSpirit extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Selfless Spirit: Creatures you control gain indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, + this.addAbility(new SimpleActivatedAbility(new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SenateGuildmage.java b/Mage.Sets/src/mage/cards/s/SenateGuildmage.java index 23ea9afcc25..0b6a8224a34 100644 --- a/Mage.Sets/src/mage/cards/s/SenateGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SenateGuildmage.java @@ -28,12 +28,12 @@ public final class SenateGuildmage extends CardImpl { this.toughness = new MageInt(2); // {W}, {T}: You gain 2 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); ability1.addCost(new TapSourceCost()); this.addAbility(ability1); // {U}, {T}: Draw a card, then discard a card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); + Ability ability2 = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java index 62080c300c9..2578082ec8b 100644 --- a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java +++ b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java @@ -43,7 +43,7 @@ public final class SengirNosferatu extends CardImpl { // {1}{B}, Exile Sengir Nosferatu: Create a 1/2 black Bat creature token with flying. It has "{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control." Effect effect = new CreateTokenEffect(new SengirNosferatuBatToken(), 1); effect.setText("Create a 1/2 black Bat creature token with flying. It has \"{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control.\""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java b/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java index 5d4c1a47d3b..da61df5554b 100644 --- a/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java +++ b/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java @@ -26,9 +26,9 @@ public final class SenseisDiviningTop extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {1}: Look at the top three cards of your library, then put them back in any order. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(3), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(3), new GenericManaCost(1))); // {T}: Draw a card, then put Sensei's Divining Top on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addEffect(new SenseisDiviningTopEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SentinelTotem.java b/Mage.Sets/src/mage/cards/s/SentinelTotem.java index 3e40211ac27..1d7477075b2 100644 --- a/Mage.Sets/src/mage/cards/s/SentinelTotem.java +++ b/Mage.Sets/src/mage/cards/s/SentinelTotem.java @@ -27,7 +27,7 @@ public final class SentinelTotem extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(1))); // {T}, Exile Sentinel Totem: Exile all cards from all graveyards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileGraveyardAllPlayersEffect(), new TapSourceCost()); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java b/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java index 5c1ae95bb22..cb40ad7d525 100644 --- a/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java @@ -35,7 +35,7 @@ public final class SentryOfTheUnderworld extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {W}{B}, Pay 3 life: Regenerate Sentry of the Underworld. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}{B}")); ability.addCost(new PayLifeCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SequesteredStash.java b/Mage.Sets/src/mage/cards/s/SequesteredStash.java index bcf70ccd1ad..415144e2163 100644 --- a/Mage.Sets/src/mage/cards/s/SequesteredStash.java +++ b/Mage.Sets/src/mage/cards/s/SequesteredStash.java @@ -33,7 +33,7 @@ public final class SequesteredStash extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4},{T}, Sacrifice Sequestered Stash: Put the top five cards of your library into your graveyard. Then you may put an artifact card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsControllerEffect(5), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new MillCardsControllerEffect(5), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new SequesteredStashEffect()); diff --git a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java index 2243db64a33..32afdb747a2 100644 --- a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java +++ b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java @@ -37,7 +37,7 @@ public final class SerendibSorcerer extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature other than Serendib Sorcerer becomes 0/2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SerpentGenerator.java b/Mage.Sets/src/mage/cards/s/SerpentGenerator.java index b142e9ae6e8..6327d4d1e34 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentGenerator.java +++ b/Mage.Sets/src/mage/cards/s/SerpentGenerator.java @@ -26,7 +26,7 @@ public final class SerpentGenerator extends CardImpl { // {4}, {tap}: Create a 1/1 colorless Snake artifact creature token. It has "Whenever this creature deals damage to a player, that player gets a poison counter." Effect effect = new CreateTokenEffect(new SerpentGeneratorSnakeToken()); effect.setText("Create a 1/1 colorless Snake artifact creature token. It has \"Whenever this creature deals damage to a player, that player gets a poison counter.\""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SerpentSkin.java b/Mage.Sets/src/mage/cards/s/SerpentSkin.java index ccc9576ba20..e54961b0e6a 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentSkin.java +++ b/Mage.Sets/src/mage/cards/s/SerpentSkin.java @@ -38,7 +38,7 @@ public final class SerpentSkin extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA),new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA),new ColoredManaCost(ColoredManaSymbol.G))); } private SerpentSkin(final SerpentSkin card) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentineKavu.java b/Mage.Sets/src/mage/cards/s/SerpentineKavu.java index e5634701732..5bdff84cdce 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentineKavu.java +++ b/Mage.Sets/src/mage/cards/s/SerpentineKavu.java @@ -27,7 +27,7 @@ public final class SerpentineKavu extends CardImpl { this.toughness = new MageInt(4); // {R}: Serpentine Kavu gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private SerpentineKavu(final SerpentineKavu card) { diff --git a/Mage.Sets/src/mage/cards/s/SerraAdvocate.java b/Mage.Sets/src/mage/cards/s/SerraAdvocate.java index a3318feb51a..fedb8c4d002 100644 --- a/Mage.Sets/src/mage/cards/s/SerraAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/SerraAdvocate.java @@ -33,7 +33,7 @@ public final class SerraAdvocate extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Target attacking or blocking creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java b/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java index 2b670c9dfb3..e497b1396a2 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java +++ b/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java @@ -46,7 +46,7 @@ public final class SerrasLiturgy extends CardImpl { // {W}, Sacrifice Serra's Liturgy: Destroy up to X target artifacts and/or enchantments, where X is the number of verse counters on Serra's Liturgy. Effect effect = new DestroyTargetEffect(true); effect.setText("Destroy up to X target artifacts and/or enchantments, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}")); 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/s/SerratedBiskelion.java b/Mage.Sets/src/mage/cards/s/SerratedBiskelion.java index e639c36cc4b..18eaa33830a 100644 --- a/Mage.Sets/src/mage/cards/s/SerratedBiskelion.java +++ b/Mage.Sets/src/mage/cards/s/SerratedBiskelion.java @@ -30,7 +30,7 @@ public final class SerratedBiskelion extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put a -1/-1 counter on Serrated Biskelion and a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.M1M1.createInstance(), true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(), true), new TapSourceCost()); ability.addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance()).setText("and a -1/-1 counter on target creature")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java b/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java index 52e171b52fa..d85624b03d8 100644 --- a/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java +++ b/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java @@ -31,7 +31,7 @@ public final class ServantOfTymaret extends CardImpl { this.addAbility(new InspiredAbility(new LoseLifeOpponentsYouGainLifeLostEffect(1))); // {2}{B}: Regenerate Servant of Tymaret. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private ServantOfTymaret(final ServantOfTymaret card) { diff --git a/Mage.Sets/src/mage/cards/s/SetessanTactics.java b/Mage.Sets/src/mage/cards/s/SetessanTactics.java index b5aa64fb14e..9a2ab8bb6f9 100644 --- a/Mage.Sets/src/mage/cards/s/SetessanTactics.java +++ b/Mage.Sets/src/mage/cards/s/SetessanTactics.java @@ -41,7 +41,7 @@ public final class SetessanTactics extends CardImpl { Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn); effect.setText("Until end of turn, any number of target creatures each get +1/+1"); this.getSpellAbility().addEffect(effect); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FightTargetSourceEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new FightTargetSourceEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn, "and gain \"{T}: This creature fights another target creature.\"")); diff --git a/Mage.Sets/src/mage/cards/s/Sewerdreg.java b/Mage.Sets/src/mage/cards/s/Sewerdreg.java index d298c82d44f..3abdff276f2 100644 --- a/Mage.Sets/src/mage/cards/s/Sewerdreg.java +++ b/Mage.Sets/src/mage/cards/s/Sewerdreg.java @@ -31,7 +31,7 @@ public final class Sewerdreg extends CardImpl { this.addAbility(new SwampwalkAbility()); // Sacrifice Sewerdreg: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Shackles.java b/Mage.Sets/src/mage/cards/s/Shackles.java index 2b4fbe28204..3c6ba3badeb 100644 --- a/Mage.Sets/src/mage/cards/s/Shackles.java +++ b/Mage.Sets/src/mage/cards/s/Shackles.java @@ -40,7 +40,7 @@ public final class Shackles extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // {W}: Return Shackles to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); } private Shackles(final Shackles card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java b/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java index d823258d40c..fcc8e06488a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java +++ b/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java @@ -29,7 +29,7 @@ public final class ShadeOfTrokair extends CardImpl { this.toughness = new MageInt(2); // {W}: Shade of Trokair gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); // Suspend 3-{W} this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{W}"), this)); diff --git a/Mage.Sets/src/mage/cards/s/ShadesForm.java b/Mage.Sets/src/mage/cards/s/ShadesForm.java index 757151b7c9e..0eec7937406 100644 --- a/Mage.Sets/src/mage/cards/s/ShadesForm.java +++ b/Mage.Sets/src/mage/cards/s/ShadesForm.java @@ -34,7 +34,7 @@ public final class ShadesForm extends CardImpl { this.addAbility(ability); // Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + Ability gainedAbility = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java index 1a1b1bb6ba7..af5c2d262a4 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java @@ -31,13 +31,13 @@ public final class ShadowGuildmage extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}: Put target creature you control on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // {R}, {tap}: Shadow Guildmage deals 1 damage to any target and 1 damage to you. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1).setText("and 1 damage to you")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/ShadowLance.java b/Mage.Sets/src/mage/cards/s/ShadowLance.java index b2eb4b89745..b08d8ea46d7 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowLance.java +++ b/Mage.Sets/src/mage/cards/s/ShadowLance.java @@ -34,7 +34,7 @@ public final class ShadowLance extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private ShadowLance(final ShadowLance card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java index 9b0284512ed..c109ffff51c 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java +++ b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java @@ -46,7 +46,7 @@ public final class ShadowbornApostle extends CardImpl { this.getSpellAbility().addEffect(new InfoEffect("A deck can have any number of cards named Shadowborn Apostle.")); // {B}, Sacrifice six creatures named Shadowborn Apostle: Search your library for a Demon creature and put it onto the battlefield. Then shuffle your library. Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(6, filterApostle)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java index 4f69a01c9e5..7b56565fa1f 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java +++ b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java @@ -51,7 +51,7 @@ public final class ShamanEnKor extends CardImpl { this.addAbility(ability); // {1}{W}: The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShamanEnKorRedirectFromTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + ability = new SimpleActivatedAbility(new ShamanEnKorRedirectFromTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java b/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java index 2d2d4b3cf7e..c19df03f171 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java +++ b/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java @@ -58,7 +58,7 @@ public final class ShamanOfTheGreatHunt extends CardImpl { // Ferocious — {2}{G/U}{G/U}: Draw a card for each creature you control with power 4 or greater. DynamicValue amount = new PermanentsOnBattlefieldCount(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(amount), new ManaCostsImpl<>("{2}{G/U}{G/U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(amount), new ManaCostsImpl<>("{2}{G/U}{G/U}")); ability.setAbilityWord(AbilityWord.FEROCIOUS); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShamblingShell.java b/Mage.Sets/src/mage/cards/s/ShamblingShell.java index e4cd15dd441..066a7a60247 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingShell.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingShell.java @@ -31,7 +31,7 @@ public final class ShamblingShell extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Shambling Shell: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Dredge 3 diff --git a/Mage.Sets/src/mage/cards/s/ShamblingStrider.java b/Mage.Sets/src/mage/cards/s/ShamblingStrider.java index a6ca632c317..f0750d6d000 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingStrider.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingStrider.java @@ -26,7 +26,7 @@ public final class ShamblingStrider extends CardImpl { this.toughness = new MageInt(5); // {R}{G}: Shambling Strider gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}"))); } private ShamblingStrider(final ShamblingStrider card) { diff --git a/Mage.Sets/src/mage/cards/s/ShamblingVent.java b/Mage.Sets/src/mage/cards/s/ShamblingVent.java index 6eacb4f3819..c3f3169ca69 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingVent.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingVent.java @@ -35,7 +35,7 @@ public final class ShamblingVent extends CardImpl { this.addAbility(new BlackManaAbility()); // {1}{W}{B}: Shambling Vent becomes a 2/3 white and black Elemental creature with lifelink until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new ShamblingVentToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java b/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java index 5251200ccbf..edd9bd613dc 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java @@ -32,13 +32,13 @@ public final class ShaperGuildmage extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}, {tap}: Target creature gets +1/+0 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -52,4 +52,4 @@ public final class ShaperGuildmage extends CardImpl { public ShaperGuildmage copy() { return new ShaperGuildmage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ShapersOfNature.java b/Mage.Sets/src/mage/cards/s/ShapersOfNature.java index 3deaabc1347..4a0953eb937 100644 --- a/Mage.Sets/src/mage/cards/s/ShapersOfNature.java +++ b/Mage.Sets/src/mage/cards/s/ShapersOfNature.java @@ -33,12 +33,12 @@ public final class ShapersOfNature extends CardImpl { this.toughness = new MageInt(3); // {3}{G}: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}{U}, Remove a +1/+1 counter from a creature you control: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(), CounterType.P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShardPhoenix.java b/Mage.Sets/src/mage/cards/s/ShardPhoenix.java index fbb686f32b3..8fe4588d762 100644 --- a/Mage.Sets/src/mage/cards/s/ShardPhoenix.java +++ b/Mage.Sets/src/mage/cards/s/ShardPhoenix.java @@ -43,7 +43,7 @@ public final class ShardPhoenix extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Shard Phoenix: Shard Phoenix deals 2 damage to each creature without flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, "it", filter), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(2, "it", filter), new SacrificeSourceCost())); // {R}{R}{R}: Return Shard Phoenix from your graveyard to your hand. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.GRAVEYARD, diff --git a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java index 3796730b7b8..e53f17c4538 100644 --- a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java +++ b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java @@ -36,15 +36,15 @@ public final class ShattergangBrothers extends CardImpl { this.toughness = new MageInt(3); // {2}{B}, Sacrifice a creature: Each other player sacrifices a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_CREATURE), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_CREATURE), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); // {2}{R}, Sacrifice an artifact: Each other player sacrifices an artifact. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT), new ManaCostsImpl<>("{2}{R}")); + ability = new SimpleActivatedAbility(new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); this.addAbility(ability); // {2}{G}, Sacrifice an enchantment: Each other player sacrifices an enchantment. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ENCHANTMENT), new ManaCostsImpl<>("{2}{G}")); + ability = new SimpleActivatedAbility(new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ENCHANTMENT), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java index db831872fff..5e2c8581c43 100644 --- a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java +++ b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java @@ -44,7 +44,7 @@ public final class ShaukuEndbringer extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(3))); // {T}: Exile target creature and put a +1/+1 counter on Shauku. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).concatBy("and")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShaukusMinion.java b/Mage.Sets/src/mage/cards/s/ShaukusMinion.java index 339402edac1..e5bf360d0ca 100644 --- a/Mage.Sets/src/mage/cards/s/ShaukusMinion.java +++ b/Mage.Sets/src/mage/cards/s/ShaukusMinion.java @@ -39,7 +39,7 @@ public final class ShaukusMinion extends CardImpl { this.toughness = new MageInt(2); // {B}{R}, {tap}: Shauku's Minion deals 2 damage to target white creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java b/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java index de11c3eda17..e80594fd3ff 100644 --- a/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java +++ b/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java @@ -29,7 +29,7 @@ public final class ShelkinBrownie extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature loses all "bands with other" abilities until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(new BandsWithOtherAbility(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseAbilityTargetEffect(new BandsWithOtherAbility(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShellSkulkin.java b/Mage.Sets/src/mage/cards/s/ShellSkulkin.java index aa6eb9073d9..216337992b3 100644 --- a/Mage.Sets/src/mage/cards/s/ShellSkulkin.java +++ b/Mage.Sets/src/mage/cards/s/ShellSkulkin.java @@ -35,7 +35,7 @@ public final class ShellSkulkin extends CardImpl { this.subtype.add(SubType.SCARECROW); this.power = new MageInt(3); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java index 2e6b7ee70d1..3a4c88df3cb 100644 --- a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java +++ b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java @@ -37,7 +37,7 @@ public final class ShepherdOfRot extends CardImpl { this.toughness = new MageInt(1); // {tap}: Each player loses 1 life for each Zombie on the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(new PermanentsOnBattlefieldCount(filter), rule), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new LoseLifeAllPlayersEffect(new PermanentsOnBattlefieldCount(filter), rule), new TapSourceCost())); } private ShepherdOfRot(final ShepherdOfRot card) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldDancer.java b/Mage.Sets/src/mage/cards/s/ShieldDancer.java index 603355b1f98..ccb9256909c 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldDancer.java +++ b/Mage.Sets/src/mage/cards/s/ShieldDancer.java @@ -35,7 +35,7 @@ public final class ShieldDancer extends CardImpl { this.toughness = new MageInt(3); // {2}{W}: The next time target attacking creature would deal combat damage to Shield Dancer this turn, that creature deals that damage to itself instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShieldDancerRedirectionEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new ShieldDancerRedirectionEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldMate.java b/Mage.Sets/src/mage/cards/s/ShieldMate.java index 656c7087649..d89fda3e217 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldMate.java +++ b/Mage.Sets/src/mage/cards/s/ShieldMate.java @@ -30,7 +30,7 @@ public final class ShieldMate extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Shield Mate: Target creature gets +0/+4 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 4, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 4, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java index 7d4885155c2..e52fc7f07db 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java @@ -21,7 +21,7 @@ public final class ShieldOfTheAges extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}: Prevent the next 1 damage that would be dealt to you this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new GenericManaCost(2))); } private ShieldOfTheAges(final ShieldOfTheAges card) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java b/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java index 43546ff001d..9ea613ba63a 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java +++ b/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java @@ -38,7 +38,7 @@ public final class ShieldedAetherThief extends CardImpl { this.addAbility(new BlocksSourceTriggeredAbility(new GetEnergyCountersControllerEffect(1), false)); // {T}, Pay {E}{E}{E}: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new PayEnergyCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java index 7816b5e1222..5292792f6ef 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java @@ -40,7 +40,7 @@ public final class ShieldmageAdvocate extends CardImpl { // {tap}: Return target card from an opponent's graveyard to their hand. Prevent all damage that would be dealt to any target this turn by a source of your choice. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("Return target card from an opponent's graveyard to their hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new ShieldmageAdvocateEffect(); effect.setTargetPointer(new SecondTargetPointer()); diff --git a/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java b/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java index 191a30f90fd..2dcf1f9f60c 100644 --- a/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java +++ b/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java @@ -41,7 +41,7 @@ public final class ShimianNightStalker extends CardImpl { this.toughness = new MageInt(4); // {B}, {T}: All damage that would be dealt to you this turn by target attacking creature is dealt to Shimian Night Stalker instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShimianNightStalkerRedirectDamageEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new ShimianNightStalkerRedirectDamageEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java index b9880e5ac36..9ad228f44b0 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java +++ b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java @@ -39,7 +39,7 @@ public final class ShimmeringWings extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {U}: Return Shimmering Wings to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.U))); } private ShimmeringWings(final ShimmeringWings card) { diff --git a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java index 6cc2369eeac..9081fb808d2 100644 --- a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java @@ -31,7 +31,7 @@ public final class ShinkaTheBloodsoakedKeep extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.supertype.add(SuperType.LEGENDARY); this.addAbility(new RedManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java b/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java index 5259ce0f1ea..51a93423f2b 100644 --- a/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java +++ b/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java @@ -32,7 +32,7 @@ public final class ShipwreckMoray extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(4))); // Pay {E}: Shipwreck Moray gets +2/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new PayEnergyCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new PayEnergyCost(1))); } private ShipwreckMoray(final ShipwreckMoray card) { diff --git a/Mage.Sets/src/mage/cards/s/ShivanDragon.java b/Mage.Sets/src/mage/cards/s/ShivanDragon.java index 1881f91dc66..9aa2489b510 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShivanDragon.java @@ -24,7 +24,7 @@ public final class ShivanDragon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - 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))); } private ShivanDragon(final ShivanDragon card) { diff --git a/Mage.Sets/src/mage/cards/s/ShivanGorge.java b/Mage.Sets/src/mage/cards/s/ShivanGorge.java index b9a97e376b7..ed8e15b1d80 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanGorge.java +++ b/Mage.Sets/src/mage/cards/s/ShivanGorge.java @@ -28,7 +28,7 @@ public final class ShivanGorge extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}{R}, {tap}: Shivan Gorge deals 1 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShivanHarvest.java b/Mage.Sets/src/mage/cards/s/ShivanHarvest.java index 9fddff068bf..5dd3c7cbf2d 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanHarvest.java +++ b/Mage.Sets/src/mage/cards/s/ShivanHarvest.java @@ -25,7 +25,7 @@ public final class ShivanHarvest extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // {1}{R}, Sacrifice a creature: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShivanHellkite.java b/Mage.Sets/src/mage/cards/s/ShivanHellkite.java index 971c7296f41..c0a858dfb49 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanHellkite.java +++ b/Mage.Sets/src/mage/cards/s/ShivanHellkite.java @@ -28,7 +28,7 @@ public final class ShivanHellkite extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - 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 TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java index 649c01dc229..5d46b7b1eaa 100644 --- a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java @@ -47,7 +47,7 @@ public final class ShivsEmbrace extends CardImpl { ability.addEffect(effect); this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java index a525af9edbb..b83ffcc7b96 100644 --- a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java +++ b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java @@ -31,7 +31,7 @@ public final class ShizoDeathsStorehouse extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.supertype.add(SuperType.LEGENDARY); this.addAbility(new BlackManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShockTroops.java b/Mage.Sets/src/mage/cards/s/ShockTroops.java index 760156f6675..10af9754436 100644 --- a/Mage.Sets/src/mage/cards/s/ShockTroops.java +++ b/Mage.Sets/src/mage/cards/s/ShockTroops.java @@ -29,7 +29,7 @@ public final class ShockTroops extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Shock Troops: Shock Troops deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShoreKeeper.java b/Mage.Sets/src/mage/cards/s/ShoreKeeper.java index 4d4646498e7..795c11e9ddd 100644 --- a/Mage.Sets/src/mage/cards/s/ShoreKeeper.java +++ b/Mage.Sets/src/mage/cards/s/ShoreKeeper.java @@ -29,7 +29,7 @@ public final class ShoreKeeper extends CardImpl { this.toughness = new MageInt(3); // {7}{u}, {t}, Sacrifice Shore Keeper: Draw three cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new ManaCostsImpl<>("{7}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(3), new ManaCostsImpl<>("{7}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java index f7021556b76..ef12f9ae351 100644 --- a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java +++ b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java @@ -38,10 +38,10 @@ public final class ShorecrasherElemental extends CardImpl { this.toughness = new MageInt(3); // {U}: Exile Shorecrasher Elemental, then return it to the battlefield face down under its owner's control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShorecrasherElementalEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new ShorecrasherElementalEffect(), new ManaCostsImpl<>("{U}"))); // {1}: Shorecrasher Elemental gets +1/-1 or -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShorecrasherElementalBoostEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new ShorecrasherElementalBoostEffect(), new ManaCostsImpl<>("{1}"))); // Megamorph {4}{U} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"), true)); diff --git a/Mage.Sets/src/mage/cards/s/ShrillHowler.java b/Mage.Sets/src/mage/cards/s/ShrillHowler.java index ac54bf8be79..40e9b05ce39 100644 --- a/Mage.Sets/src/mage/cards/s/ShrillHowler.java +++ b/Mage.Sets/src/mage/cards/s/ShrillHowler.java @@ -35,7 +35,7 @@ public final class ShrillHowler extends CardImpl { // {5}{G}: Transform Shrill Howler. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java b/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java index 08a5794d4d6..91cc8771309 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java @@ -44,7 +44,7 @@ public final class ShrineOfBurningRage extends CardImpl { new SpellCastControllerTriggeredAbility(null, filter, false))); //{3}, {T}, Sacrifice Shrine of Burning Rage: It deals damage equal to the number of charge counters on it to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.CHARGE)) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.CHARGE)) .setText("it deals damage equal to the number of charge counters on it to any target"), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java b/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java index 5bc70db335f..65fbcef11ab 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java @@ -44,7 +44,7 @@ public final class ShrineOfLimitlessPower extends CardImpl { new SpellCastControllerTriggeredAbility(null, filter, false))); //{4}, {T}, Sacrifice Shrine of Limitless Power: Target player discards a card for each charge counter on Shrine of Limitless Power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DiscardTargetEffect(new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java b/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java index 4579aa3b935..703c5549457 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java @@ -51,7 +51,7 @@ public final class ShrineOfPiercingVision extends CardImpl { // {tap}, Sacrifice Shrine of Piercing Vision: Look at the top X cards of your library, where X is the number of charge counters on Shrine of Piercing Vision. // Put one of those cards into your hand and the rest on the bottom of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShrineOfPiercingVisionEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ShrineOfPiercingVisionEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java index 2b9b9f16e53..e7833cad077 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java +++ b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java @@ -39,7 +39,7 @@ public final class SiegeGangCommander extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 3), false)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java index cb503d95772..20da964fa73 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java @@ -52,7 +52,7 @@ public final class SigardaHeronsGrace extends CardImpl { this.addAbility(ability); // {2}, Exile a card from your graveyard: Create a 1/1 white Human Soldier creature token. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanSoldierToken()), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new HumanSoldierToken()), new GenericManaCost(2)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SigardianPriest.java b/Mage.Sets/src/mage/cards/s/SigardianPriest.java index 3b46a1ffcf4..16ebf8d4d88 100644 --- a/Mage.Sets/src/mage/cards/s/SigardianPriest.java +++ b/Mage.Sets/src/mage/cards/s/SigardianPriest.java @@ -37,7 +37,7 @@ public final class SigardianPriest extends CardImpl { this.toughness = new MageInt(2); // {1}, {T}: Tap target non-Human creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(1, 1, filter, false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java b/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java index a6605087293..ce5b8e69ca7 100644 --- a/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java +++ b/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java @@ -30,7 +30,7 @@ public final class SightedCasteSorcerer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private SightedCasteSorcerer(final SightedCasteSorcerer card) { diff --git a/Mage.Sets/src/mage/cards/s/SigilTracer.java b/Mage.Sets/src/mage/cards/s/SigilTracer.java index eefb0b7c410..3d1ca28e199 100644 --- a/Mage.Sets/src/mage/cards/s/SigilTracer.java +++ b/Mage.Sets/src/mage/cards/s/SigilTracer.java @@ -40,7 +40,7 @@ public final class SigilTracer extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, Tap two untapped Wizards you control: Copy target instant or sorcery spell. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SigiledStarfish.java b/Mage.Sets/src/mage/cards/s/SigiledStarfish.java index 59fa53bf7fb..44816acf9e6 100644 --- a/Mage.Sets/src/mage/cards/s/SigiledStarfish.java +++ b/Mage.Sets/src/mage/cards/s/SigiledStarfish.java @@ -26,7 +26,7 @@ public final class SigiledStarfish extends CardImpl { this.toughness = new MageInt(3); // {T}: Scry 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1), new TapSourceCost())); } private SigiledStarfish(final SigiledStarfish card) { diff --git a/Mage.Sets/src/mage/cards/s/SilentAttendant.java b/Mage.Sets/src/mage/cards/s/SilentAttendant.java index cfa52178409..d971b76a8ce 100644 --- a/Mage.Sets/src/mage/cards/s/SilentAttendant.java +++ b/Mage.Sets/src/mage/cards/s/SilentAttendant.java @@ -26,7 +26,7 @@ public final class SilentAttendant extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost())); } private SilentAttendant(final SilentAttendant card) { @@ -37,4 +37,4 @@ public final class SilentAttendant extends CardImpl { public SilentAttendant copy() { return new SilentAttendant(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java b/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java index 076305a3528..691f93bd737 100644 --- a/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java +++ b/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java @@ -34,7 +34,7 @@ public final class SilkbindFaerie extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{WU}, {untap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}{W/U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{1}{W/U}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SilkwingScout.java b/Mage.Sets/src/mage/cards/s/SilkwingScout.java index 99651042e0a..0f39d99573e 100644 --- a/Mage.Sets/src/mage/cards/s/SilkwingScout.java +++ b/Mage.Sets/src/mage/cards/s/SilkwingScout.java @@ -35,7 +35,7 @@ public final class SilkwingScout extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}, Sacrifice Silkwing Scout: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java index 30935227b1c..4ebb7842328 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java @@ -31,7 +31,7 @@ public final class SilumgarMonument extends CardImpl { this.addAbility(new BlackManaAbility()); // {4}{U}{B}: Silumgar Monument becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect (new OjutaiMonumentToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{U}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SilverchaseFox.java b/Mage.Sets/src/mage/cards/s/SilverchaseFox.java index 55cc6f69cf3..c34e715fcf0 100644 --- a/Mage.Sets/src/mage/cards/s/SilverchaseFox.java +++ b/Mage.Sets/src/mage/cards/s/SilverchaseFox.java @@ -28,7 +28,7 @@ public final class SilverchaseFox extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, Sacrifice Silverchase Fox: Exile target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetEnchantmentPermanent()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java b/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java index ef2e520bf80..821b2ed7f1c 100644 --- a/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java +++ b/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java @@ -31,7 +31,7 @@ public final class SilvosRogueElemental extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {G}: Regenerate Silvos, Rogue Elemental. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private SilvosRogueElemental(final SilvosRogueElemental card) { diff --git a/Mage.Sets/src/mage/cards/s/SimianBrawler.java b/Mage.Sets/src/mage/cards/s/SimianBrawler.java index 8d36380cc9c..cdc30baa7e0 100644 --- a/Mage.Sets/src/mage/cards/s/SimianBrawler.java +++ b/Mage.Sets/src/mage/cards/s/SimianBrawler.java @@ -28,7 +28,7 @@ public final class SimianBrawler extends CardImpl { this.toughness = new MageInt(3); // Discard a land card: Simian Brawler gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new DiscardCardCost(new FilterLandCard("a land card")))); } diff --git a/Mage.Sets/src/mage/cards/s/SimicAscendancy.java b/Mage.Sets/src/mage/cards/s/SimicAscendancy.java index e5441d8e3ec..597f89cae71 100644 --- a/Mage.Sets/src/mage/cards/s/SimicAscendancy.java +++ b/Mage.Sets/src/mage/cards/s/SimicAscendancy.java @@ -33,7 +33,7 @@ public final class SimicAscendancy extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}{U}"); // {1}{G}{U}: Put a +1/+1 counter on target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{G}{U}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{G}{U}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicBasilisk.java b/Mage.Sets/src/mage/cards/s/SimicBasilisk.java index cac9aa40e44..67e5997661d 100644 --- a/Mage.Sets/src/mage/cards/s/SimicBasilisk.java +++ b/Mage.Sets/src/mage/cards/s/SimicBasilisk.java @@ -42,7 +42,7 @@ public final class SimicBasilisk extends CardImpl { Effect effect = new CreateDelayedTriggeredAbilityEffect( new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect()), true); effect.setText("destroy that creature at end of combat"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( new DealsDamageToACreatureTriggeredAbility(effect, true, false, true), Duration.EndOfTurn) .setText("Until end of turn, target creature with a +1/+1 counter on it gains \"Whenever this creature deals combat damage to a creature, destroy that creature at end of combat.\""), new ManaCostsImpl<>("{1}{G}")); diff --git a/Mage.Sets/src/mage/cards/s/SimicCluestone.java b/Mage.Sets/src/mage/cards/s/SimicCluestone.java index 1556c34e241..fd5c8bc1cf8 100644 --- a/Mage.Sets/src/mage/cards/s/SimicCluestone.java +++ b/Mage.Sets/src/mage/cards/s/SimicCluestone.java @@ -32,7 +32,7 @@ public final class SimicCluestone extends CardImpl { this.addAbility(new BlueManaAbility()); // {G}{U}, {T}, Sacrifice Simic Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicFluxmage.java b/Mage.Sets/src/mage/cards/s/SimicFluxmage.java index 71860c9afc7..94318dc0e80 100644 --- a/Mage.Sets/src/mage/cards/s/SimicFluxmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicFluxmage.java @@ -34,7 +34,7 @@ public final class SimicFluxmage extends CardImpl { this.addAbility(new EvolveAbility()); // 1{U}, {T}: Move a +1/+1 counter from Simic Fluxmage onto target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCountersFromSourceToTargetEffect(),new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new MoveCountersFromSourceToTargetEffect(),new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java index 53f81c91cb4..861474e5e91 100644 --- a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java @@ -51,7 +51,7 @@ public final class SimicGuildmage extends CardImpl { this.toughness = new MageInt(2); // {1}{G}: Move a +1/+1 counter from target creature onto another target creature with the same controller. - Ability countersAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCounterFromTargetToTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability countersAbility = new SimpleActivatedAbility(new MoveCounterFromTargetToTargetEffect(), new ManaCostsImpl<>("{1}{G}")); TargetCreaturePermanent target = new TargetCreaturePermanent( new FilterCreaturePermanent("creature (you take counter from)")); target.setTargetTag(1); @@ -67,7 +67,7 @@ public final class SimicGuildmage extends CardImpl { this.addAbility(countersAbility); // {1}{U}: Attach target Aura enchanting a permanent to another permanent with the same controller. - Ability auraAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveAuraEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability auraAbility = new SimpleActivatedAbility(new MoveAuraEffect(), new ManaCostsImpl<>("{1}{U}")); auraAbility.addTarget(new TargetPermanent(auraFilter)); this.addAbility(auraAbility); diff --git a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java index 12d4c0037e5..eb2401d0764 100644 --- a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java @@ -31,7 +31,7 @@ public final class SimicKeyrune extends CardImpl { this.addAbility(new BlueManaAbility()); // {G}{U}: Simic Keyrune becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SimicKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{U}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SimicKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{U}"))); } private SimicKeyrune(final SimicKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/s/SimicLocket.java b/Mage.Sets/src/mage/cards/s/SimicLocket.java index 28227c9f8b6..70b0fba848b 100644 --- a/Mage.Sets/src/mage/cards/s/SimicLocket.java +++ b/Mage.Sets/src/mage/cards/s/SimicLocket.java @@ -28,7 +28,7 @@ public final class SimicLocket extends CardImpl { this.addAbility(new BlueManaAbility()); // {G/U}{G/U}{G/U}{G/U}, {T}, Sacrifice Simic Locket: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{G/U}{G/U}{G/U}{G/U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{G/U}{G/U}{G/U}{G/U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicManipulator.java b/Mage.Sets/src/mage/cards/s/SimicManipulator.java index b86d77495ce..74b39998a51 100644 --- a/Mage.Sets/src/mage/cards/s/SimicManipulator.java +++ b/Mage.Sets/src/mage/cards/s/SimicManipulator.java @@ -46,7 +46,7 @@ public final class SimicManipulator extends CardImpl { this.addAbility(new EvolveAbility()); // {T}, Remove one or more +1/+1 counters from Simic Manipulator: Gain control of target creature with power less than or equal to the number of +1/+1 counters removed this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom, true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.Custom, true), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1, 1, "Remove one or more +1/+1 counters from {this}")); ability.setTargetAdjuster(new PowerTargetAdjuster(GetXValue.instance, ComparisonType.OR_LESS)); diff --git a/Mage.Sets/src/mage/cards/s/SimicRagworm.java b/Mage.Sets/src/mage/cards/s/SimicRagworm.java index 2c86eac06aa..a7d019caa2c 100644 --- a/Mage.Sets/src/mage/cards/s/SimicRagworm.java +++ b/Mage.Sets/src/mage/cards/s/SimicRagworm.java @@ -25,7 +25,7 @@ public final class SimicRagworm extends CardImpl { this.toughness = new MageInt(3); // {U}: Untap Simic Ragworm. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); } private SimicRagworm(final SimicRagworm card) { diff --git a/Mage.Sets/src/mage/cards/s/Sindbad.java b/Mage.Sets/src/mage/cards/s/Sindbad.java index ed407a4b33a..90bec43d26b 100644 --- a/Mage.Sets/src/mage/cards/s/Sindbad.java +++ b/Mage.Sets/src/mage/cards/s/Sindbad.java @@ -30,7 +30,7 @@ public final class Sindbad extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card and reveal it. If it isn't a land card, discard it. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SindbadEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SindbadEffect(), new TapSourceCost())); } private Sindbad(final Sindbad card) { diff --git a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java index e25f287f012..1c00c32034f 100644 --- a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java +++ b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java @@ -48,7 +48,7 @@ public final class SingingBellStrike extends CardImpl { // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Enchanted creature has "{6}: Untap this creature." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new GenericManaCost(6)); + Ability gainedAbility = new SimpleActivatedAbility(new UntapSourceEffect(), new GenericManaCost(6)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"{6}: Untap this creature.\""); this.addAbility(new SimpleStaticAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/s/SingingTree.java b/Mage.Sets/src/mage/cards/s/SingingTree.java index 9f33b537049..ed88f887331 100644 --- a/Mage.Sets/src/mage/cards/s/SingingTree.java +++ b/Mage.Sets/src/mage/cards/s/SingingTree.java @@ -32,7 +32,7 @@ public final class SingingTree extends CardImpl { this.toughness = new MageInt(3); // {tap}: Target attacking creature's power becomes 0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SingingTreeEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SingingTreeEffect(), new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SinisterConcoction.java b/Mage.Sets/src/mage/cards/s/SinisterConcoction.java index 67a26f69dd2..8db80090e2c 100644 --- a/Mage.Sets/src/mage/cards/s/SinisterConcoction.java +++ b/Mage.Sets/src/mage/cards/s/SinisterConcoction.java @@ -26,7 +26,7 @@ public final class SinisterConcoction extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); // {B}, Pay 1 life, Put the top card of your library into your graveyard, Discard a card, Sacrifice Sinister Concoction: Destroy target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new PayLifeCost(1)); ability.addCost(new MillCardsCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java index 5c787a8527e..4439304b560 100644 --- a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java +++ b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java @@ -46,7 +46,7 @@ public final class SinkingFeeling extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Enchanted creature has "{1}, Put a -1/-1 counter on this creature: Untap this creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); + Ability ability2 = new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); ability2.addCost(new PutCountersSourceCost(CounterType.M1M1.createInstance()).setText("put a -1/-1 counter on this creature")); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.Custom, "Enchanted creature has \"{1}, Put a -1/-1 counter on this creature: Untap this creature.\""))); diff --git a/Mage.Sets/src/mage/cards/s/SirenSongLyre.java b/Mage.Sets/src/mage/cards/s/SirenSongLyre.java index 2ce1344f656..84155e8aa4d 100644 --- a/Mage.Sets/src/mage/cards/s/SirenSongLyre.java +++ b/Mage.Sets/src/mage/cards/s/SirenSongLyre.java @@ -31,7 +31,7 @@ public final class SirenSongLyre extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{2}, {T}: Tap target creature." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); + Ability grantedAbility = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(2)); grantedAbility.addCost(new TapSourceCost()); grantedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(grantedAbility, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/s/SirenStormtamer.java b/Mage.Sets/src/mage/cards/s/SirenStormtamer.java index a6752fb7ff4..4800139e41d 100644 --- a/Mage.Sets/src/mage/cards/s/SirenStormtamer.java +++ b/Mage.Sets/src/mage/cards/s/SirenStormtamer.java @@ -45,7 +45,7 @@ public final class SirenStormtamer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}, Sacrifice Siren Stormtamer: Counter target spell or ability that targets you or a creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new SirenStormtamerTargetObject()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java index 532fe9cb4fc..3b6f50cb795 100644 --- a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java +++ b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java @@ -43,7 +43,7 @@ public final class SisaysIngenuity extends CardImpl { // When Sisay's Ingenuity enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has "{2}{U}: Target creature becomes the color of your choice until end of turn." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(Duration.EndOfTurn), + ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); diff --git a/Mage.Sets/src/mage/cards/s/SithEvoker.java b/Mage.Sets/src/mage/cards/s/SithEvoker.java index a7757930560..5361cf4ac16 100644 --- a/Mage.Sets/src/mage/cards/s/SithEvoker.java +++ b/Mage.Sets/src/mage/cards/s/SithEvoker.java @@ -42,7 +42,7 @@ public final class SithEvoker extends CardImpl { this.toughness = new MageInt(3); // {T}, {B}, Sacrifice a creature: You gain life equal to that creature's power or toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SithEvokerEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new SithEvokerEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/s/SithHolocron.java b/Mage.Sets/src/mage/cards/s/SithHolocron.java index 07d27c0c236..44c6af691dd 100644 --- a/Mage.Sets/src/mage/cards/s/SithHolocron.java +++ b/Mage.Sets/src/mage/cards/s/SithHolocron.java @@ -29,7 +29,7 @@ public final class SithHolocron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {T}: Put a charge counter on Sith Holocron. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); // {T}, Remove a charge counter from Sith Holocron: Add {U}, {B} or {R}. Cost cost = new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)); diff --git a/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java b/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java index a6b143211a5..37b72e192d4 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java @@ -39,7 +39,7 @@ public final class SkarrgGuildmage extends CardImpl { Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), "Creatures you control gain trample until end of turn"), new ManaCostsImpl<>("{R}{G}"))); // {1}{R}{G}: Target land you control becomes a 4/4 Elemental creature until end of turn. It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect( + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect( new CreatureToken(4, 4, "4/4 Elemental creature", SubType.ELEMENTAL), false, true, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{G}") ); ability.addTarget(new TargetPermanent(new FilterControlledLandPermanent())); @@ -55,4 +55,4 @@ public final class SkarrgGuildmage extends CardImpl { public SkarrgGuildmage copy() { return new SkarrgGuildmage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java b/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java index a5a02dfa033..11b5e57a0fd 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java +++ b/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java @@ -26,7 +26,7 @@ public final class SkarrgTheRagePits extends CardImpl { public SkarrgTheRagePits(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn) .setText("target creature gets +1/+1"), new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java index 3d34361c8f7..e8ed5249a1e 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java +++ b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java @@ -34,7 +34,7 @@ public final class SkarrganSkybreaker extends CardImpl { // Bloodthirst 3 this.addAbility(new BloodthirstAbility(3)); // {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("It deals damage equal to its power to any target"), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java b/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java index a53e04f1238..d2617891bc1 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java @@ -28,7 +28,7 @@ public final class SkeletalChangeling extends CardImpl { // Changeling this.addAbility(new ChangelingAbility()); // {1}{B}: Regenerate Skeletal Changeling. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SkeletalChangeling(final SkeletalChangeling card) { diff --git a/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java b/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java index 0efec5787ea..81bd11a9d21 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java @@ -39,7 +39,7 @@ public final class SkeletalGrimace extends CardImpl { // Enchanted creature gets +1/+1 and has "{B}: Regenerate this creature." Ability staticAbility = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability gainedAbility = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); staticAbility.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA) .setText("and has \"{B}: Regenerate this creature.\"")); this.addAbility(staticAbility); diff --git a/Mage.Sets/src/mage/cards/s/SkeletalKathari.java b/Mage.Sets/src/mage/cards/s/SkeletalKathari.java index e4b6232ed1a..a0a3ed27b5a 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalKathari.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalKathari.java @@ -32,7 +32,7 @@ public final class SkeletalKathari extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java index 32986991c66..39417e93404 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java @@ -39,11 +39,11 @@ public final class SkeletalVampire extends CardImpl { // When Skeletal Vampire enters the battlefield, create two 1/1 black Bat creature tokens with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BatToken(), 2))); // {3}{B}{B}, Sacrifice a Bat: Create two 1/1 black Bat creature tokens with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BatToken(), 2), new ManaCostsImpl<>("{3}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new BatToken(), 2), new ManaCostsImpl<>("{3}{B}{B}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); // Sacrifice a Bat: Regenerate Skeletal Vampire. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); } private SkeletalVampire(final SkeletalVampire card) { diff --git a/Mage.Sets/src/mage/cards/s/SkeletalWurm.java b/Mage.Sets/src/mage/cards/s/SkeletalWurm.java index bdcf8a164b9..51aab4f01f1 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalWurm.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalWurm.java @@ -26,7 +26,7 @@ public final class SkeletalWurm extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(6); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private SkeletalWurm(final SkeletalWurm card) { diff --git a/Mage.Sets/src/mage/cards/s/SkeletonShip.java b/Mage.Sets/src/mage/cards/s/SkeletonShip.java index 2c8cf8606c1..63982def91b 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletonShip.java +++ b/Mage.Sets/src/mage/cards/s/SkeletonShip.java @@ -35,7 +35,7 @@ public final class SkeletonShip extends CardImpl { new SacrificeSourceEffect())); // {tap}: Put a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java b/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java index ebacc960bd7..4dd01f45e2f 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java +++ b/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java @@ -30,7 +30,7 @@ public final class SkirkRidgeExhumer extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}, Discard a card: Create a 1/1 black Zombie Goblin creature token named Festering Goblin. It has "When Festering Goblin dies, target creature gets -1/-1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new FesteringGoblinToken()), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new FesteringGoblinToken()), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java index 24d4fc882d2..3026a78baa0 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java @@ -32,7 +32,7 @@ public final class SkirsdagCultist extends CardImpl { this.toughness = new MageInt(2); // {R}, {T}, Sacrifice a creature: Skirsdag Cultist deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java b/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java index 3002830eccb..6bb60e0b00b 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java @@ -33,7 +33,7 @@ public final class SkirsdagFlayer extends CardImpl { this.toughness = new MageInt(1); // {3}{B}, {tap}, Sacrifice a Human: Destroy target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java b/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java index 4584ef08357..38ed811cc8e 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java @@ -29,7 +29,7 @@ public final class SkirsdagSupplicant extends CardImpl { this.toughness = new MageInt(3); // {B}, {T}, Discard a card: Each player loses 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(2), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeAllPlayersEffect(2), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java b/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java index 277489fe902..0d5d415618b 100644 --- a/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java +++ b/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java @@ -36,8 +36,8 @@ public final class SkithiryxTheBlightDragon extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{B}"))); } private SkithiryxTheBlightDragon(final SkithiryxTheBlightDragon card) { diff --git a/Mage.Sets/src/mage/cards/s/SkullCatapult.java b/Mage.Sets/src/mage/cards/s/SkullCatapult.java index 0bcdde70303..a8c57185b69 100644 --- a/Mage.Sets/src/mage/cards/s/SkullCatapult.java +++ b/Mage.Sets/src/mage/cards/s/SkullCatapult.java @@ -26,7 +26,7 @@ public final class SkullCatapult extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {1}, {tap}, Sacrifice a creature: Skull Catapult deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkullCollector.java b/Mage.Sets/src/mage/cards/s/SkullCollector.java index 6fa42f59508..fd150caa16f 100644 --- a/Mage.Sets/src/mage/cards/s/SkullCollector.java +++ b/Mage.Sets/src/mage/cards/s/SkullCollector.java @@ -39,7 +39,7 @@ public final class SkullCollector extends CardImpl { // At the beginning of your upkeep, return a black creature you control to its owner's hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter))); // {1}{B}: Regenerate Skull Collector. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SkullCollector(final SkullCollector card) { diff --git a/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java b/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java index bd118590c3b..d7518dc39d0 100644 --- a/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java +++ b/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java @@ -22,11 +22,11 @@ public final class SkullmeadCauldron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {tap}: You gain 1 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); this.addAbility(ability1); // {tap}, Discard a card: You gain 3 life. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new GainLifeEffect(3), new TapSourceCost()); ability2.addCost(new DiscardCardCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SkyWeaver.java b/Mage.Sets/src/mage/cards/s/SkyWeaver.java index 8e79a2c1d06..d94cae2c327 100644 --- a/Mage.Sets/src/mage/cards/s/SkyWeaver.java +++ b/Mage.Sets/src/mage/cards/s/SkyWeaver.java @@ -41,7 +41,7 @@ public final class SkyWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Skyshaper.java b/Mage.Sets/src/mage/cards/s/Skyshaper.java index 8bea3731cfa..94fa44f25b1 100644 --- a/Mage.Sets/src/mage/cards/s/Skyshaper.java +++ b/Mage.Sets/src/mage/cards/s/Skyshaper.java @@ -23,7 +23,7 @@ public final class Skyshaper extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Sacrifice Skyshaper: Creatures you control gain flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilityControlledEffect( FlyingAbility.getInstance(), Duration.EndOfTurn, diff --git a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java index 63bf9d55249..18681cad8e2 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java +++ b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java @@ -38,7 +38,7 @@ public final class SkyshipWeatherlight extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SkyshipWeatherlightEffect(), false)); // {4}, {tap}, Choose a card at random that was removed from the game with Skyship Weatherlight. Put that card into your hand. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SkyshipWeatherlightEffect2(), new GenericManaCost(4)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new SkyshipWeatherlightEffect2(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java b/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java index 81a25767e53..def019a5a0b 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java @@ -38,7 +38,7 @@ public final class SkyshroudArcher extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature with flying gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java b/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java index 168cb5aae03..c1ece1d982e 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java @@ -37,7 +37,7 @@ public final class SkyshroudPoacher extends CardImpl { this.toughness = new MageInt(2); // {3}, {tap}: Search your library for an Elf permanent card and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java b/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java index cfb1f111486..28ea69e0000 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java @@ -25,7 +25,7 @@ public final class SkyshroudTroll extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private SkyshroudTroll(final SkyshroudTroll card) { diff --git a/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java b/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java index 34b67309baf..7948b71877f 100644 --- a/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java +++ b/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java @@ -30,7 +30,7 @@ public final class SkywardEyeProphets extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {tap}: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealTopLandToBattlefieldElseHandEffect("it"), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RevealTopLandToBattlefieldElseHandEffect("it"), new TapSourceCost())); } private SkywardEyeProphets(final SkywardEyeProphets card) { diff --git a/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java b/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java index 9af1a025949..f7b6abff5b6 100644 --- a/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java +++ b/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java @@ -25,7 +25,7 @@ public final class SlateOfAncestry extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {4}, {tap}, Discard your hand: Draw a card for each creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED)), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SlaughterDrone.java b/Mage.Sets/src/mage/cards/s/SlaughterDrone.java index 86c1d8f1cfb..ad8e9a6f49e 100644 --- a/Mage.Sets/src/mage/cards/s/SlaughterDrone.java +++ b/Mage.Sets/src/mage/cards/s/SlaughterDrone.java @@ -31,7 +31,7 @@ public final class SlaughterDrone extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // {C}: Slaughter Drone gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{C}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SlimyKavu.java b/Mage.Sets/src/mage/cards/s/SlimyKavu.java index 9d436ab3c3b..b060720ed2d 100644 --- a/Mage.Sets/src/mage/cards/s/SlimyKavu.java +++ b/Mage.Sets/src/mage/cards/s/SlimyKavu.java @@ -29,7 +29,7 @@ public final class SlimyKavu extends CardImpl { this.toughness = new MageInt(2); // {T}: Target land becomes a Swamp until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.SWAMP), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.SWAMP), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java b/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java index 275f9c60bca..16cd0477d76 100644 --- a/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java @@ -38,7 +38,7 @@ public final class SlingshotGoblin extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}: Slingshot Goblin deals 2 damage to target blue creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java b/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java index 33b1f7d3d86..021fd1b25a6 100644 --- a/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java +++ b/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java @@ -31,7 +31,7 @@ public final class SlinkingSkirge extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}, Sacrifice Slinking Skirge: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SlithBloodletter.java b/Mage.Sets/src/mage/cards/s/SlithBloodletter.java index c13a7a3c8ee..26170fa730a 100644 --- a/Mage.Sets/src/mage/cards/s/SlithBloodletter.java +++ b/Mage.Sets/src/mage/cards/s/SlithBloodletter.java @@ -28,7 +28,7 @@ public final class SlithBloodletter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SlithBloodletter(final SlithBloodletter card) { diff --git a/Mage.Sets/src/mage/cards/s/SlitheringShade.java b/Mage.Sets/src/mage/cards/s/SlitheringShade.java index 5ddb67e0159..28d94f6a667 100644 --- a/Mage.Sets/src/mage/cards/s/SlitheringShade.java +++ b/Mage.Sets/src/mage/cards/s/SlitheringShade.java @@ -36,7 +36,7 @@ public final class SlitheringShade extends CardImpl { this.addAbility(DefenderAbility.getInstance()); //{B}: Slithering Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // Hellbent — Slithering Shade can attack as though it didn't have defender as long as you have no cards in hand. Effect effect = new ConditionalAsThoughEffect( diff --git a/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java b/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java index eb73d8a4c91..3a05afba653 100644 --- a/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java +++ b/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java @@ -59,7 +59,7 @@ public final class SlivdraziMonstrosity extends CardImpl { this.addAbility(ability); // {3}: Create a 1/1 colorless Eldrazi Sliver creature token. It has “Sacrifice this creature: Add {C}.” - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSliverToken()), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new EldraziSliverToken()), new ManaCostsImpl<>("{3}"))); } private SlivdraziMonstrosity(final SlivdraziMonstrosity card) { @@ -106,4 +106,4 @@ class SlivdraziMonstrosityEffect extends ContinuousEffectImpl { private SlivdraziMonstrosityEffect(final SlivdraziMonstrosityEffect effect) { super(effect); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SliverOverlord.java b/Mage.Sets/src/mage/cards/s/SliverOverlord.java index a5e5a484ec9..9378ad98deb 100644 --- a/Mage.Sets/src/mage/cards/s/SliverOverlord.java +++ b/Mage.Sets/src/mage/cards/s/SliverOverlord.java @@ -39,10 +39,10 @@ public final class SliverOverlord extends CardImpl { this.toughness = new MageInt(7); // {3}: Search your library for a Sliver card, reveal that card, and put it into your hand. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ManaCostsImpl<>("{3}"))); // {3}: Gain control of target Sliver. - Ability ability = (new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{3}"))); + Ability ability = (new SimpleActivatedAbility(new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{3}"))); Target target = new TargetPermanent(new FilterCreaturePermanent(SubType.SLIVER,"Sliver")); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SliverQueen.java b/Mage.Sets/src/mage/cards/s/SliverQueen.java index 54a1574f35d..c8a0ab31a50 100644 --- a/Mage.Sets/src/mage/cards/s/SliverQueen.java +++ b/Mage.Sets/src/mage/cards/s/SliverQueen.java @@ -29,7 +29,7 @@ public final class SliverQueen extends CardImpl { this.toughness = new MageInt(7); // {2}: Create a 1/1 colorless Sliver creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SliverToken()), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SliverToken()), new ManaCostsImpl<>("{2}"))); } private SliverQueen(final SliverQueen card) { diff --git a/Mage.Sets/src/mage/cards/s/Sliversmith.java b/Mage.Sets/src/mage/cards/s/Sliversmith.java index 39a8d1f1f3f..bf85f66c4d8 100644 --- a/Mage.Sets/src/mage/cards/s/Sliversmith.java +++ b/Mage.Sets/src/mage/cards/s/Sliversmith.java @@ -28,7 +28,7 @@ public final class Sliversmith extends CardImpl { this.toughness = new MageInt(1); // {1}, {T}, Discard a card: Create a 1/1 colorless Sliver artifact creature token named Metallic Sliver. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MetallicSliverToken()), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new MetallicSliverToken()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SludgeCrawler.java b/Mage.Sets/src/mage/cards/s/SludgeCrawler.java index ef1e65895dc..33c5148ce51 100644 --- a/Mage.Sets/src/mage/cards/s/SludgeCrawler.java +++ b/Mage.Sets/src/mage/cards/s/SludgeCrawler.java @@ -34,7 +34,7 @@ public final class SludgeCrawler extends CardImpl { // Ingest this.addAbility(new IngestAbility()); // {2}: Sludge Crawler gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2))); } private SludgeCrawler(final SludgeCrawler card) { diff --git a/Mage.Sets/src/mage/cards/s/SmokeTeller.java b/Mage.Sets/src/mage/cards/s/SmokeTeller.java index 6218bc6d059..77efc054b4e 100644 --- a/Mage.Sets/src/mage/cards/s/SmokeTeller.java +++ b/Mage.Sets/src/mage/cards/s/SmokeTeller.java @@ -43,7 +43,7 @@ public final class SmokeTeller extends CardImpl { this.toughness = new MageInt(2); // 1U: Look at target face-down creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SmokeTellerLookFaceDownEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new SmokeTellerLookFaceDownEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java b/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java index 88b7c3c2467..752ff991fda 100644 --- a/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java +++ b/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java @@ -29,7 +29,7 @@ public final class SmokespewInvoker extends CardImpl { this.toughness = new MageInt(1); // {7}{B}: Target creature gets -3/-3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{7}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java b/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java index f7868ec7478..4edc054e0f8 100644 --- a/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java +++ b/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java @@ -42,7 +42,7 @@ public final class SmolderingWerewolf extends CardImpl { // {4}{R}{R}: Transform Smoldering Werewolf. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{4}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{4}{R}{R}"))); } private SmolderingWerewolf(final SmolderingWerewolf card) { @@ -53,4 +53,4 @@ public final class SmolderingWerewolf extends CardImpl { public SmolderingWerewolf copy() { return new SmolderingWerewolf(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java index 4d7d511583d..c9e393437e2 100644 --- a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java +++ b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java @@ -36,7 +36,7 @@ public final class SnarlingUndorak extends CardImpl { this.toughness = new MageInt(3); // {2}{G}: Target Beast creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Morph {1}{G}{G} diff --git a/Mage.Sets/src/mage/cards/s/SnowFortress.java b/Mage.Sets/src/mage/cards/s/SnowFortress.java index 910b5830720..1276c396fdf 100644 --- a/Mage.Sets/src/mage/cards/s/SnowFortress.java +++ b/Mage.Sets/src/mage/cards/s/SnowFortress.java @@ -44,13 +44,13 @@ public final class SnowFortress extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}: Snow Fortress gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); // {1}: Snow Fortress gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(1))); // {3}: Snow Fortress deals 1 damage to target creature without flying that's attacking you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SnowHound.java b/Mage.Sets/src/mage/cards/s/SnowHound.java index ba72ef47f7d..eafb9f224bb 100644 --- a/Mage.Sets/src/mage/cards/s/SnowHound.java +++ b/Mage.Sets/src/mage/cards/s/SnowHound.java @@ -41,7 +41,7 @@ public final class SnowHound extends CardImpl { // {1}, {tap}: Return Snow Hound and target green or blue creature you control to their owner's hand. Effect effect = new ReturnToHandSourceEffect(true); effect.setText("Return {this}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); effect = new ReturnToHandTargetEffect(); effect.setText("and target green or blue creature you control to their owner's hand"); diff --git a/Mage.Sets/src/mage/cards/s/SnowMercy.java b/Mage.Sets/src/mage/cards/s/SnowMercy.java index 684b43d4132..3f903c42cce 100644 --- a/Mage.Sets/src/mage/cards/s/SnowMercy.java +++ b/Mage.Sets/src/mage/cards/s/SnowMercy.java @@ -44,7 +44,7 @@ public final class SnowMercy extends CardImpl { this.addAbility(new AddGlobeCountersAbility()); // {t},{q},{t},{q},{t}: Tap all creatures with globe counters on them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(filter), new SnowMercyCost()); + Ability ability = new SimpleActivatedAbility(new TapAllEffect(filter), new SnowMercyCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoaringHope.java b/Mage.Sets/src/mage/cards/s/SoaringHope.java index a243b491527..5e2a7a7cccb 100644 --- a/Mage.Sets/src/mage/cards/s/SoaringHope.java +++ b/Mage.Sets/src/mage/cards/s/SoaringHope.java @@ -47,7 +47,7 @@ public final class SoaringHope extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {W}: Put Soaring Hope on top of it's owner's library - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{W}"))); } private SoaringHope(final SoaringHope card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviDigger.java b/Mage.Sets/src/mage/cards/s/SoldeviDigger.java index c4184cddfd3..b2b4f206618 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviDigger.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviDigger.java @@ -25,7 +25,7 @@ public final class SoldeviDigger extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}: Put the top card of your graveyard on the bottom of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoldeviDiggerEffect(), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new SoldeviDiggerEffect(), new ManaCostsImpl<>("{2}"))); } private SoldeviDigger(final SoldeviDigger card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java index ee00953d068..e4a86a3936b 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java @@ -44,7 +44,7 @@ public final class SoldeviExcavations extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 0, 0, 0, 0, 1), new TapSourceCost())); // {1}, {tap}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1, false), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java b/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java index fdf987f70ea..dae99be9702 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java @@ -34,7 +34,7 @@ public final class SoldeviHeretic extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature this turn. Target opponent may draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,2), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn ,2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); Effect effect = new DrawCardTargetEffect(1, true); diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSage.java b/Mage.Sets/src/mage/cards/s/SoldeviSage.java index da91d3f2402..9a4e3332163 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSage.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSage.java @@ -32,7 +32,7 @@ public final class SoldeviSage extends CardImpl { this.toughness = new MageInt(1); // {T}, Sacrifice two lands: Draw three cards, then discard one of them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardOneOfThemEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawDiscardOneOfThemEffect(3), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(2, StaticFilters.FILTER_LANDS)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java b/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java index 23980f84302..fb87ef9cf46 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java @@ -30,7 +30,7 @@ public final class SoldeviSimulacrum extends CardImpl { // Cumulative upkeep {1} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // {1}: Soldevi Simulacrum gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private SoldeviSimulacrum(final SoldeviSimulacrum card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java b/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java index aaa5bc6a884..0b425e19297 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java @@ -33,7 +33,7 @@ public final class SoldeviSteamBeast extends CardImpl { this.addAbility(ability); // {2}: Regenerate Soldevi Steam Beast. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(2))); } private SoldeviSteamBeast(final SoldeviSteamBeast card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java b/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java index 42f8da210a6..4d85e8b8ceb 100644 --- a/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java +++ b/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java @@ -30,7 +30,7 @@ public final class SoldierOfFortune extends CardImpl { this.toughness = new MageInt(1); // {R}, {T}: Target player shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibraryTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ShuffleLibraryTargetEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoldierReplica.java b/Mage.Sets/src/mage/cards/s/SoldierReplica.java index fb76a2119b9..302d0c9aa97 100644 --- a/Mage.Sets/src/mage/cards/s/SoldierReplica.java +++ b/Mage.Sets/src/mage/cards/s/SoldierReplica.java @@ -27,7 +27,7 @@ public final class SoldierReplica extends CardImpl { this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3, "it"), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3, "it"), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Soliton.java b/Mage.Sets/src/mage/cards/s/Soliton.java index 4ca9d1fc070..cc3ec252179 100644 --- a/Mage.Sets/src/mage/cards/s/Soliton.java +++ b/Mage.Sets/src/mage/cards/s/Soliton.java @@ -24,7 +24,7 @@ public final class Soliton extends CardImpl { this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); } private Soliton(final Soliton card) { diff --git a/Mage.Sets/src/mage/cards/s/SoltariCrusader.java b/Mage.Sets/src/mage/cards/s/SoltariCrusader.java index 5860aea0c83..51fac98a127 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariCrusader.java +++ b/Mage.Sets/src/mage/cards/s/SoltariCrusader.java @@ -30,7 +30,7 @@ public final class SoltariCrusader extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {1}{W}: Soltari Crusader gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private SoltariCrusader(final SoltariCrusader card) { diff --git a/Mage.Sets/src/mage/cards/s/SoltariEmissary.java b/Mage.Sets/src/mage/cards/s/SoltariEmissary.java index 3b811104d9c..6188925a7b2 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariEmissary.java +++ b/Mage.Sets/src/mage/cards/s/SoltariEmissary.java @@ -29,7 +29,7 @@ public final class SoltariEmissary extends CardImpl { this.toughness = new MageInt(1); // {W}: Soltari Emissary gains shadow until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private SoltariEmissary(final SoltariEmissary card) { diff --git a/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java b/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java index 98a67dee050..d55c4560628 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java +++ b/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java @@ -39,7 +39,7 @@ public final class SoltariGuerrillas extends CardImpl { this.addAbility(ShadowAbility.getInstance()); // {0}: The next time Soltari Guerrillas would deal combat damage to an opponent this turn, it deals that damage to target creature instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoltariGuerrillasReplacementEffect(), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new SoltariGuerrillasReplacementEffect(), new GenericManaCost(0)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java index 84826cbedfe..8f276651c45 100644 --- a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java +++ b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java @@ -45,7 +45,7 @@ public final class SomberwaldAlpha extends CardImpl { this.addAbility(new BecomesBlockedAllTriggeredAbility(effect, false, filter, true)); // {1}{G}: Target creature you control gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/Soothsaying.java b/Mage.Sets/src/mage/cards/s/Soothsaying.java index 82a7200ccc9..45e9411451e 100644 --- a/Mage.Sets/src/mage/cards/s/Soothsaying.java +++ b/Mage.Sets/src/mage/cards/s/Soothsaying.java @@ -24,12 +24,12 @@ public final class Soothsaying extends CardImpl { // {3}{U}{U}: Shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{3}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{3}{U}{U}"))); // {X}: Look at the top X cards of your library, then put them back in any order. Effect effect = new LookLibraryControllerEffect(GetXValue.instance); effect.setText("Look at the top X cards of your library, then put them back in any order"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}"))); } private Soothsaying(final Soothsaying card) { diff --git a/Mage.Sets/src/mage/cards/s/SophicCentaur.java b/Mage.Sets/src/mage/cards/s/SophicCentaur.java index 171504dcd8b..23c59fe3e70 100644 --- a/Mage.Sets/src/mage/cards/s/SophicCentaur.java +++ b/Mage.Sets/src/mage/cards/s/SophicCentaur.java @@ -36,7 +36,7 @@ public final class SophicCentaur extends CardImpl { DynamicValue lifeToGainAmount = new MultipliedValue(CardsInControllerHandCount.instance, 2); Effect effect = new GainLifeEffect(lifeToGainAmount); effect.setText("You gain 2 life for each card in your hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java b/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java index 2bab6e90dd7..f9d465f320e 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java @@ -28,7 +28,7 @@ public final class SoratamiCloudChariot extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {2}: Target creature you control gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); @@ -36,7 +36,7 @@ public final class SoratamiCloudChariot extends CardImpl { Effect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); // and dealt by target creature you control this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("and dealt by target creature you control this turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java b/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java index a7ad947015c..e89aadcbd53 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java @@ -37,7 +37,7 @@ public final class SoratamiCloudskater extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new GenericManaCost(2)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(1, 1, filter, true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java b/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java index 37721380861..fad971a7a4b 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java @@ -47,7 +47,7 @@ public final class SoratamiMirrorGuard extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new GenericManaCost(2)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java b/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java index 6e8a6cadacf..fe788c62fd9 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java @@ -38,7 +38,7 @@ public final class SoratamiMirrorMage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return three lands you control to their owner's hand: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new GenericManaCost(3)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(3, 3, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java b/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java index e2bbb9a9276..c3df8c097c3 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java @@ -41,7 +41,7 @@ public final class SoratamiRainshaper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return a land you control to its owner's hand: Target creature you control gains shroud until end of turn. (It can't be the target of spells or abilities.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiSavant.java b/Mage.Sets/src/mage/cards/s/SoratamiSavant.java index 35d5fc2c9ef..258cba90b21 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiSavant.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiSavant.java @@ -39,7 +39,7 @@ public final class SoratamiSavant extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return a land you control to its owner's hand: Counter target spell unless its controller pays {3}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), new GenericManaCost(3)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiSeer.java b/Mage.Sets/src/mage/cards/s/SoratamiSeer.java index e3aae8f5939..0d678be5071 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiSeer.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiSeer.java @@ -37,7 +37,7 @@ public final class SoratamiSeer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {4}, Return two lands you control to their owner's hand: Discard all the cards in your hand, then draw that many cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardHandDrawSameNumberSourceEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DiscardHandDrawSameNumberSourceEffect(), new GenericManaCost(4)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2, 2, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java b/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java index 665923a8f20..7548831e065 100644 --- a/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java +++ b/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java @@ -38,7 +38,7 @@ public final class SorayaTheFalconer extends CardImpl { new FilterCreaturePermanent(SubType.BIRD, "Bird creatures"), false))); // {1}{W}: Target Bird creature gains banding until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent(SubType.BIRD, "Bird creature"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java b/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java index 81ad49b9dee..a5f1b8be4f0 100644 --- a/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java +++ b/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java @@ -29,7 +29,7 @@ public final class SorcerersStrongbox extends CardImpl { Effect effect = new DrawCardSourceControllerEffect(3); effect.setText("and draw three cards"); flipCoinEffect.addEffectWon(effect); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, flipCoinEffect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(flipCoinEffect, new TapSourceCost()); ability.addCost(new GenericManaCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SorceressQueen.java b/Mage.Sets/src/mage/cards/s/SorceressQueen.java index 7a03b9669cd..1c7f147aefe 100644 --- a/Mage.Sets/src/mage/cards/s/SorceressQueen.java +++ b/Mage.Sets/src/mage/cards/s/SorceressQueen.java @@ -37,7 +37,7 @@ public final class SorceressQueen extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature other than Sorceress Queen becomes 0/2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulChanneling.java b/Mage.Sets/src/mage/cards/s/SoulChanneling.java index 5cd357e0563..87fe3d3fc2c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulChanneling.java +++ b/Mage.Sets/src/mage/cards/s/SoulChanneling.java @@ -32,7 +32,7 @@ public final class SoulChanneling extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Pay 2 life: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new PayLifeCost(2))); } private SoulChanneling(final SoulChanneling card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java b/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java index 0d2ea57b980..4cf29bc3c24 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java @@ -32,7 +32,7 @@ public final class SoulOfInnistrad extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // {3}{B}{B}: Return up to three target creature cards from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}{B}")); ability.addTarget(new TargetCardInYourGraveyard(0, 3, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java b/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java index cc289bfa397..d6a0310f35a 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java @@ -34,7 +34,7 @@ public final class SoulOfNewPhyrexia extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {5}: Permanents you control gain indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(5))); + this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(5))); // {5}, Exile Soul of New Phyrexia from your graveyard: Permanents you control gain indestructible until end of turn. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(5)); ability.addCost(new ExileSourceFromGraveCost()); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java b/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java index 4b0e86e84f5..dad384c2e10 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java @@ -33,7 +33,7 @@ public final class SoulOfRavnica extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {5}{U}{U}: Draw a card for each color among permanents you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardForEachColorAmongControlledPermanentsEffect(), new ManaCostsImpl<>("{5}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new DrawCardForEachColorAmongControlledPermanentsEffect(), new ManaCostsImpl<>("{5}{U}{U}"))); // {5}{U}{U}, Exile Soul of Ravnica from your graveyard: Draw a card for each color among permanents you control. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new DrawCardForEachColorAmongControlledPermanentsEffect(), new ManaCostsImpl<>("{5}{U}{U}")); @@ -50,4 +50,3 @@ public final class SoulOfRavnica extends CardImpl { return new SoulOfRavnica(this); } } - diff --git a/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java b/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java index b703a6b901a..c26c14ca77b 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java @@ -42,7 +42,7 @@ public final class SoulOfShandalar extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {3}{R}{R}: Soul of Shandalar deals 3 damage to target player and 3 damage to up to one target creature that player controls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulOfShandalarEffect(), new ManaCostsImpl<>("{3}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new SoulOfShandalarEffect(), new ManaCostsImpl<>("{3}{R}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); ability.addTarget(new SoulOfShandalarTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfTheros.java b/Mage.Sets/src/mage/cards/s/SoulOfTheros.java index 333e70bb19e..7021dd5f75d 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfTheros.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfTheros.java @@ -40,7 +40,7 @@ public final class SoulOfTheros extends CardImpl { // {4}{W}{W}: Creatures you control get +2/+2 and gain first strike and lifelink until end of turn. Effect effect1 = new BoostControlledEffect(2, 2, Duration.EndOfTurn); effect1.setText("Creatures you control get +2/+2"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl<>("{4}{W}{W}")); + Ability ability = new SimpleActivatedAbility(effect1, new ManaCostsImpl<>("{4}{W}{W}")); Effect effect2 = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES); effect2.setText("and gain first strike"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java b/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java index fb093224fd7..b2719b8149c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java @@ -32,7 +32,7 @@ public final class SoulOfZendikar extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {3}{G}{G}: Create a 3/3 green Beast creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken()), new ManaCostsImpl<>("{3}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new BeastToken()), new ManaCostsImpl<>("{3}{G}{G}"))); // {3}{G}{G}, Exile Soul of Zendikar from your graveyard: Create a 3/3 green Beast creature token. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new BeastToken()), new ManaCostsImpl<>("{3}{G}{G}")); ability.addCost(new ExileSourceFromGraveCost()); diff --git a/Mage.Sets/src/mage/cards/s/SoulSeparator.java b/Mage.Sets/src/mage/cards/s/SoulSeparator.java index a9d940acf1c..c883e419e91 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSeparator.java +++ b/Mage.Sets/src/mage/cards/s/SoulSeparator.java @@ -43,7 +43,7 @@ public final class SoulSeparator extends CardImpl { CreateTokenCopyTargetEffect copyEffect = new CreateTokenCopyTargetEffect(null, null, false, 1, false, false, null, 1, 1, true); copyEffect.withAdditionalSubType(SubType.SPIRIT); copyEffect.setText("Exile target creature card from your graveyard. Create a token that's a copy of that card, except it's 1/1, it's a Spirit in addition to its other types, and it has flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, copyEffect, new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(copyEffect, new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/s/SoulShepherd.java b/Mage.Sets/src/mage/cards/s/SoulShepherd.java index 65b4288bf3b..79c99ab0450 100644 --- a/Mage.Sets/src/mage/cards/s/SoulShepherd.java +++ b/Mage.Sets/src/mage/cards/s/SoulShepherd.java @@ -30,7 +30,7 @@ public final class SoulShepherd extends CardImpl { this.toughness = new MageInt(1); // {W}, Exile a creature card from your graveyard: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Souldrinker.java b/Mage.Sets/src/mage/cards/s/Souldrinker.java index 186982cfd89..85f9b49bef3 100644 --- a/Mage.Sets/src/mage/cards/s/Souldrinker.java +++ b/Mage.Sets/src/mage/cards/s/Souldrinker.java @@ -25,7 +25,7 @@ public final class Souldrinker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new PayLifeCost(3))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new PayLifeCost(3))); } private Souldrinker(final Souldrinker card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java index fba280ab757..b6e6f71b085 100644 --- a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java +++ b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java @@ -52,7 +52,7 @@ public final class SoulfireGrandMaster extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {2}{U/R}{U/R}: The next time you cast an instant or sorcery spell from your hand this turn, put that card into your hand instead of your graveyard as it resolves. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulfireGrandMasterCastFromHandReplacementEffect(), new ManaCostsImpl<>("{2}{U/R}{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new SoulfireGrandMasterCastFromHandReplacementEffect(), new ManaCostsImpl<>("{2}{U/R}{U/R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/Soulmender.java b/Mage.Sets/src/mage/cards/s/Soulmender.java index dfc5445b725..bee0b8a23f7 100644 --- a/Mage.Sets/src/mage/cards/s/Soulmender.java +++ b/Mage.Sets/src/mage/cards/s/Soulmender.java @@ -27,7 +27,7 @@ public final class Soulmender extends CardImpl { this.toughness = new MageInt(1); // {T}: You gain 1 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SoulswornJury.java b/Mage.Sets/src/mage/cards/s/SoulswornJury.java index 6e0dd31d0d5..513ee008522 100644 --- a/Mage.Sets/src/mage/cards/s/SoulswornJury.java +++ b/Mage.Sets/src/mage/cards/s/SoulswornJury.java @@ -33,7 +33,7 @@ public final class SoulswornJury extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}{U}, Sacrifice Soulsworn Jury: Counter target creature spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_CREATURE)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SouthernPaladin.java b/Mage.Sets/src/mage/cards/s/SouthernPaladin.java index 89ee478a054..e4eb0984aa1 100644 --- a/Mage.Sets/src/mage/cards/s/SouthernPaladin.java +++ b/Mage.Sets/src/mage/cards/s/SouthernPaladin.java @@ -39,7 +39,7 @@ public final class SouthernPaladin extends CardImpl { this.toughness = new MageInt(3); // {W}{W}, {tap}: Destroy target red permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Sparksmith.java b/Mage.Sets/src/mage/cards/s/Sparksmith.java index 2213e8335bf..40fd6b3e42f 100644 --- a/Mage.Sets/src/mage/cards/s/Sparksmith.java +++ b/Mage.Sets/src/mage/cards/s/Sparksmith.java @@ -36,7 +36,7 @@ public final class Sparksmith extends CardImpl { this.toughness = new MageInt(1); // {tap}: Sparksmith deals X damage to target creature and X damage to you, where X is the number of Goblins on the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new DamageControllerEffect(new PermanentsOnBattlefieldCount(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Sparkspitter.java b/Mage.Sets/src/mage/cards/s/Sparkspitter.java index d76ed213efb..35f995cea76 100644 --- a/Mage.Sets/src/mage/cards/s/Sparkspitter.java +++ b/Mage.Sets/src/mage/cards/s/Sparkspitter.java @@ -30,7 +30,7 @@ public final class Sparkspitter extends CardImpl { this.toughness = new MageInt(3); // {R}, {tap}, Discard a card: Create a 3/1 red Elemental creature token named Spark Elemental. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SparkElementalToken()), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SparkElementalToken()), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SparringCollar.java b/Mage.Sets/src/mage/cards/s/SparringCollar.java index 78326ab733b..421b9430645 100644 --- a/Mage.Sets/src/mage/cards/s/SparringCollar.java +++ b/Mage.Sets/src/mage/cards/s/SparringCollar.java @@ -33,7 +33,7 @@ public final class SparringCollar extends CardImpl { // Equipped creature has first strike. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // {R}{R}: Attach Sparring Collar to target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{R}{R}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java b/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java index 9b2c6557ef3..1d8e956bd62 100644 --- a/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java @@ -38,7 +38,7 @@ public final class SpatulaOfTheAges extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {4}, {T}, Sacrifice Spatula of the Ages: You may put a silver-bordered permanent card from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpawningBed.java b/Mage.Sets/src/mage/cards/s/SpawningBed.java index cae999fecbd..bbd1177f37c 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningBed.java +++ b/Mage.Sets/src/mage/cards/s/SpawningBed.java @@ -27,7 +27,7 @@ public final class SpawningBed extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {6}, {T}, Sacrifice Spawning Bed: Create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziScionToken(), 3).withTextOptions(true), new ManaCostsImpl<>("{6}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new EldraziScionToken(), 3).withTextOptions(true), new ManaCostsImpl<>("{6}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java index dce5724f80f..8cb81dce4b2 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java +++ b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java @@ -40,7 +40,7 @@ public final class SpawningGrounds extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}: Create a 5/5 green Beast creature token with trample." - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningGroundsBeastToken(), 1), new TapSourceCost()); + Ability abilityToGain = new SimpleActivatedAbility(new CreateTokenEffect(new SpawningGroundsBeastToken(), 1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Create a 5/5 green Beast creature token with trample.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SpawningPit.java b/Mage.Sets/src/mage/cards/s/SpawningPit.java index bfdf83c41b3..965d4904db6 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningPit.java +++ b/Mage.Sets/src/mage/cards/s/SpawningPit.java @@ -26,9 +26,9 @@ public final class SpawningPit extends CardImpl { public SpawningPit(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningPitToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SpawningPitToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(2))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpawningPool.java b/Mage.Sets/src/mage/cards/s/SpawningPool.java index f0f6f2cedeb..f7e1da8e06c 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningPool.java +++ b/Mage.Sets/src/mage/cards/s/SpawningPool.java @@ -22,7 +22,7 @@ public final class SpawningPool extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlackManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SkeletonRegenerateToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SkeletonRegenerateToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private SpawningPool(final SpawningPool card) { diff --git a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java index 416b861d79d..469f7a4b5fb 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java @@ -41,7 +41,7 @@ public final class SpawnsireOfUlamog extends CardImpl { this.addAbility(new AnnihilatorAbility(1)); // {4}: Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}." - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSpawnToken(), 2).withTextOptions(true), new GenericManaCost(4))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new EldraziSpawnToken(), 2).withTextOptions(true), new GenericManaCost(4))); // {20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/s/SpectralLynx.java b/Mage.Sets/src/mage/cards/s/SpectralLynx.java index 7c980c52792..e9aafd039a7 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralLynx.java +++ b/Mage.Sets/src/mage/cards/s/SpectralLynx.java @@ -31,7 +31,7 @@ public final class SpectralLynx extends CardImpl { // Protection from green this.addAbility(ProtectionAbility.from(ObjectColor.GREEN)); // {B}: Regenerate Spectral Lynx. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private SpectralLynx(final SpectralLynx card) { diff --git a/Mage.Sets/src/mage/cards/s/SpectralSliver.java b/Mage.Sets/src/mage/cards/s/SpectralSliver.java index 2f15918713c..6f6bbac6d9f 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralSliver.java +++ b/Mage.Sets/src/mage/cards/s/SpectralSliver.java @@ -32,7 +32,7 @@ public final class SpectralSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have "{2}: This creature gets +1/+1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn).setText("this creature gets +1/+1 until end of turn"), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn).setText("this creature gets +1/+1 until end of turn"), new ManaCostsImpl<>("{2}")); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/s/Spellskite.java b/Mage.Sets/src/mage/cards/s/Spellskite.java index 4fe7615e3ca..8b10e2afdc7 100644 --- a/Mage.Sets/src/mage/cards/s/Spellskite.java +++ b/Mage.Sets/src/mage/cards/s/Spellskite.java @@ -38,7 +38,7 @@ public final class Spellskite extends CardImpl { this.toughness = new MageInt(4); // {U/P}: Change a target of target spell or ability to Spellskite. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpellskiteEffect(), new ManaCostsImpl<>("{U/P}")); + Ability ability = new SimpleActivatedAbility(new SpellskiteEffect(), new ManaCostsImpl<>("{U/P}")); ability.addTarget(new TargetStackObject()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java b/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java index e5f1b209957..1ffdc37bd98 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java +++ b/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java @@ -30,7 +30,7 @@ public final class SphinxOfMagosi extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).concatBy(", then")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java b/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java index b8fc0a5eb21..7d5070a531b 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java +++ b/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java @@ -39,7 +39,7 @@ public final class SphinxOfTheChimes extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Discard two nonland cards with the same name: Draw four cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(4), new DiscardTwoNonlandCardsWithTheSameNameCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(4), new DiscardTwoNonlandCardsWithTheSameNameCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java b/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java index d15bf69e264..c3d35e6d9ae 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java +++ b/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java @@ -36,7 +36,7 @@ public final class SphinxsTutelage extends CardImpl { this.addAbility(ability); // {5}{U}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{5}{U}"))); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{5}{U}"))); } private SphinxsTutelage(final SphinxsTutelage card) { diff --git a/Mage.Sets/src/mage/cards/s/SpikeBreeder.java b/Mage.Sets/src/mage/cards/s/SpikeBreeder.java index e50ba85ac60..2954e19dae4 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeBreeder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeBreeder.java @@ -36,13 +36,13 @@ public final class SpikeBreeder extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Breeder: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from Spike Breeder: Create a 1/1 green Spike creature token. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpikeToken()), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new CreateTokenEffect(new SpikeToken()), new GenericManaCost(2)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SpikeColony.java b/Mage.Sets/src/mage/cards/s/SpikeColony.java index 994843b6987..01f89881bb2 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeColony.java +++ b/Mage.Sets/src/mage/cards/s/SpikeColony.java @@ -34,7 +34,7 @@ public final class SpikeColony extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)), "with four +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Colony: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpikeDrone.java b/Mage.Sets/src/mage/cards/s/SpikeDrone.java index 6d32b17ef8a..619fe1ce9fc 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeDrone.java +++ b/Mage.Sets/src/mage/cards/s/SpikeDrone.java @@ -34,7 +34,7 @@ public final class SpikeDrone extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), "with a +1/+1 counter on it")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpikeFeeder.java b/Mage.Sets/src/mage/cards/s/SpikeFeeder.java index 68730943b67..3be08fa3891 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeFeeder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeFeeder.java @@ -35,12 +35,12 @@ public final class SpikeFeeder extends CardImpl { // Spike Feeder enters the battlefield with two +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Feeder: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Remove a +1/+1 counter from Spike Feeder: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); } private SpikeFeeder(final SpikeFeeder card) { diff --git a/Mage.Sets/src/mage/cards/s/SpikeHatcher.java b/Mage.Sets/src/mage/cards/s/SpikeHatcher.java index 572380b3fcd..56c0085137c 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeHatcher.java +++ b/Mage.Sets/src/mage/cards/s/SpikeHatcher.java @@ -35,13 +35,13 @@ public final class SpikeHatcher extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6)), "with six +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Hatcher: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}, Remove a +1/+1 counter from Spike Hatcher: Regenerate Spike Hatcher. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(1)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SpikeRogue.java b/Mage.Sets/src/mage/cards/s/SpikeRogue.java index 741e66d9c8b..60054497861 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeRogue.java +++ b/Mage.Sets/src/mage/cards/s/SpikeRogue.java @@ -36,13 +36,13 @@ public final class SpikeRogue extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Rogue: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from a creature you control: Put a +1/+1 counter on Spike Rogue. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability2.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_CREATURE, true), CounterType.P1P1)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeSoldier.java b/Mage.Sets/src/mage/cards/s/SpikeSoldier.java index b1c05e27949..3784ea6d470 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeSoldier.java +++ b/Mage.Sets/src/mage/cards/s/SpikeSoldier.java @@ -36,12 +36,12 @@ public final class SpikeSoldier extends CardImpl { // Spike Soldier enters the battlefield with three +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Soldier: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Remove a +1/+1 counter from Spike Soldier: Spike Soldier gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeTiller.java b/Mage.Sets/src/mage/cards/s/SpikeTiller.java index 489dc318354..2a88bc0ffcc 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeTiller.java +++ b/Mage.Sets/src/mage/cards/s/SpikeTiller.java @@ -39,13 +39,13 @@ public final class SpikeTiller extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Tiller: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from Spike Tiller: Target land becomes a 2/2 creature that's still a land. Put a +1/+1 counter on it. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new CreatureToken(2, 2), false, true, Duration.EndOfGame).setText("Target land becomes a 2/2 creature that's still a land"), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new BecomesCreatureTargetEffect(new CreatureToken(2, 2), false, true, Duration.EndOfGame).setText("Target land becomes a 2/2 creature that's still a land"), new GenericManaCost(2)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability2.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance()).setText("Put a +1/+1 counter on it.")); ability2.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SpikeWeaver.java b/Mage.Sets/src/mage/cards/s/SpikeWeaver.java index fab4e60b170..7c69fcf748d 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeWeaver.java +++ b/Mage.Sets/src/mage/cards/s/SpikeWeaver.java @@ -37,13 +37,13 @@ public final class SpikeWeaver extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Weaver: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}, Remove a +1/+1 counter from Spike Weaver: Prevent all combat damage that would be dealt this turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new GenericManaCost(1)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeWorker.java b/Mage.Sets/src/mage/cards/s/SpikeWorker.java index 18352b9eaaa..58be2311098 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeWorker.java +++ b/Mage.Sets/src/mage/cards/s/SpikeWorker.java @@ -33,7 +33,7 @@ public final class SpikeWorker extends CardImpl { // Spike Worker enters the battlefield with two +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Worker: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java index 9e5dc870403..3777045c44f 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java @@ -30,7 +30,7 @@ public final class SpikeshotElder extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotElderEffect(), new ManaCostsImpl<>("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new SpikeshotElderEffect(), new ManaCostsImpl<>("{1}{R}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } @@ -85,4 +85,4 @@ class SpikeshotElderEffect extends OneShotEffect { return new SpikeshotElderEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java index 214bc43e0d2..d4ab1d5f00c 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java @@ -30,7 +30,7 @@ public final class SpikeshotGoblin extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}: Spikeshot Goblin deals damage equal to its power to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotGoblinEffect(), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new SpikeshotGoblinEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpiketailDrake.java b/Mage.Sets/src/mage/cards/s/SpiketailDrake.java index 1bf115a8d75..361edc7ab5f 100644 --- a/Mage.Sets/src/mage/cards/s/SpiketailDrake.java +++ b/Mage.Sets/src/mage/cards/s/SpiketailDrake.java @@ -31,7 +31,7 @@ public final class SpiketailDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice Spiketail Drake: Counter target spell unless its controller pays {3}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{3}")), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{3}")), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } private SpiketailDrake(final SpiketailDrake card) { diff --git a/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java b/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java index a01e3b7d8b3..929da893e86 100644 --- a/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java +++ b/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java @@ -32,7 +32,7 @@ public final class SpiketailDrakeling extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice Spiketail Drakeling: Counter target spell unless its controller pays {2}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(2)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java b/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java index b1dc5d4aa05..0491be2bbff 100644 --- a/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java +++ b/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java @@ -29,7 +29,7 @@ public final class SpiketailHatchling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpinalParasite.java b/Mage.Sets/src/mage/cards/s/SpinalParasite.java index bfef870cc92..653693bc81d 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalParasite.java +++ b/Mage.Sets/src/mage/cards/s/SpinalParasite.java @@ -31,7 +31,7 @@ public final class SpinalParasite extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Remove two +1/+1 counters from Spinal Parasite: Remove a counter from target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterTargetEffect(), + Ability ability = new SimpleActivatedAbility(new RemoveCounterTargetEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpinalVillain.java b/Mage.Sets/src/mage/cards/s/SpinalVillain.java index 7ade6b7d5e8..024d66d413c 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalVillain.java +++ b/Mage.Sets/src/mage/cards/s/SpinalVillain.java @@ -36,7 +36,7 @@ public final class SpinalVillain extends CardImpl { this.toughness = new MageInt(2); // {tap}: Destroy target blue creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpinedFluke.java b/Mage.Sets/src/mage/cards/s/SpinedFluke.java index e4b46bf04c3..12bd7d751f7 100644 --- a/Mage.Sets/src/mage/cards/s/SpinedFluke.java +++ b/Mage.Sets/src/mage/cards/s/SpinedFluke.java @@ -34,7 +34,7 @@ public final class SpinedFluke extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, ""))); // {B}: Regenerate Spined Fluke. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } private SpinedFluke(final SpinedFluke card) { diff --git a/Mage.Sets/src/mage/cards/s/SpinyStarfish.java b/Mage.Sets/src/mage/cards/s/SpinyStarfish.java index b0bab22a115..a4b9a5b1f5e 100644 --- a/Mage.Sets/src/mage/cards/s/SpinyStarfish.java +++ b/Mage.Sets/src/mage/cards/s/SpinyStarfish.java @@ -35,7 +35,7 @@ public final class SpinyStarfish extends CardImpl { this.toughness = new MageInt(1); // {U}: Regenerate Spiny Starfish. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{U}"))); // At the beginning of each end step, if Spiny Starfish regenerated this turn, create a 0/1 blue Starfish creature token for each time it regenerated this turn. this.addAbility( diff --git a/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java b/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java index 54f34b45176..09c1026c17e 100644 --- a/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java +++ b/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java @@ -41,7 +41,7 @@ public final class SpiresOfOrazca extends CardImpl { // {T}: Untap target attacking creature an opponent controls and remove it from combat. Effect effect = new UntapTargetEffect(); effect.setText("Untap target attacking creature an opponent controls and remove it from combat."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new RemoveFromCombatTargetEffect(); effect.setText(" "); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SpiritMirror.java b/Mage.Sets/src/mage/cards/s/SpiritMirror.java index 1208df0f810..27046c43c6f 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritMirror.java +++ b/Mage.Sets/src/mage/cards/s/SpiritMirror.java @@ -42,7 +42,7 @@ public final class SpiritMirror extends CardImpl { "At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token.")); // {0}: Destroy target Reflection. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(0)); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpiritShield.java b/Mage.Sets/src/mage/cards/s/SpiritShield.java index 0938284f06b..294a41b8393 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritShield.java +++ b/Mage.Sets/src/mage/cards/s/SpiritShield.java @@ -29,7 +29,7 @@ public final class SpiritShield extends CardImpl { // You may choose not to untap Spirit Shield during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: Target creature gets +0/+2 for as long as Spirit Shield remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(0, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +0/+2 for as long as {this} remains tapped"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SpiritWeaver.java b/Mage.Sets/src/mage/cards/s/SpiritWeaver.java index a761b6479e4..15767aca4b7 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritWeaver.java +++ b/Mage.Sets/src/mage/cards/s/SpiritWeaver.java @@ -40,7 +40,7 @@ public final class SpiritWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Spiritmonger.java b/Mage.Sets/src/mage/cards/s/Spiritmonger.java index afcbc5ba343..1858684cbc1 100644 --- a/Mage.Sets/src/mage/cards/s/Spiritmonger.java +++ b/Mage.Sets/src/mage/cards/s/Spiritmonger.java @@ -33,9 +33,9 @@ public final class Spiritmonger extends CardImpl { // Whenever Spiritmonger deals damage to a creature, put a +1/+1 counter on Spiritmonger. this.addAbility(new DealsDamageToACreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(), true), false, false, false)); // {B}: Regenerate Spiritmonger. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // {G}: Spiritmonger becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private Spiritmonger(final Spiritmonger card) { diff --git a/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java b/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java index 3ff1fc06d6d..fbbfda61e20 100644 --- a/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java +++ b/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java @@ -26,7 +26,7 @@ public final class SpiteflameWitch extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(1), new ManaCostsImpl<>("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new LoseLifeAllPlayersEffect(1), new ManaCostsImpl<>("{B}{R}"))); } private SpiteflameWitch(final SpiteflameWitch card) { diff --git a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java index 7b721906358..89482efbd3e 100644 --- a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java +++ b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java @@ -31,7 +31,7 @@ public final class SpitfireBastion extends CardImpl { this.addAbility(new RedManaAbility()); // {2}{R}, {T}: Spitfire Bastion deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpitfireHandler.java b/Mage.Sets/src/mage/cards/s/SpitfireHandler.java index 1b3c11cfcdf..b4760b23651 100644 --- a/Mage.Sets/src/mage/cards/s/SpitfireHandler.java +++ b/Mage.Sets/src/mage/cards/s/SpitfireHandler.java @@ -31,7 +31,7 @@ public final class SpitfireHandler extends CardImpl { this.addAbility(new SimpleStaticAbility(new SpitfireHandlerCantBlockEffect())); // {R}: Spitfire Handler 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))); } private SpitfireHandler(final SpitfireHandler card) { diff --git a/Mage.Sets/src/mage/cards/s/SpittingHydra.java b/Mage.Sets/src/mage/cards/s/SpittingHydra.java index 7967b111746..88794506863 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingHydra.java +++ b/Mage.Sets/src/mage/cards/s/SpittingHydra.java @@ -37,7 +37,7 @@ public final class SpittingHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(effect)); // {1}{R}, Remove a +1/+1 counter from Spitting Hydra: Spitting Hydra deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpittingSpider.java b/Mage.Sets/src/mage/cards/s/SpittingSpider.java index 982db42fd36..cf98843aa42 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingSpider.java +++ b/Mage.Sets/src/mage/cards/s/SpittingSpider.java @@ -38,7 +38,7 @@ public final class SpittingSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Sacrifice a land: Spitting Spider deals 1 damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); } private SpittingSpider(final SpittingSpider card) { diff --git a/Mage.Sets/src/mage/cards/s/SplinterTwin.java b/Mage.Sets/src/mage/cards/s/SplinterTwin.java index af0df452683..87719f9040e 100644 --- a/Mage.Sets/src/mage/cards/s/SplinterTwin.java +++ b/Mage.Sets/src/mage/cards/s/SplinterTwin.java @@ -44,7 +44,7 @@ public final class SplinterTwin extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: Create a token that's a copy of this creature, except it has haste. Exile it at the beginning of the next end step." - SimpleActivatedAbility gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SplinterTwinEffect(), new TapSourceCost()); + SimpleActivatedAbility gainedAbility = new SimpleActivatedAbility(new SplinterTwinEffect(), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/s/SplinteringWind.java b/Mage.Sets/src/mage/cards/s/SplinteringWind.java index e9bc5fccd87..902abe374b4 100644 --- a/Mage.Sets/src/mage/cards/s/SplinteringWind.java +++ b/Mage.Sets/src/mage/cards/s/SplinteringWind.java @@ -35,7 +35,7 @@ public final class SplinteringWind extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); // {2}{G}: Splintering Wind deals 1 damage to target creature. Create a 1/1 green Splinter creature token. It has flying and “Cumulative upkeep {G}.” When it leaves the battlefield, it deals 1 damage to you and each creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{G}")); ability.addEffect(new SplinteringWindCreateTokenEffect()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java index 220acb9182f..111649e28f7 100644 --- a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java +++ b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java @@ -27,7 +27,7 @@ public final class SplitTailMiko extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // {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 ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SporeFrog.java b/Mage.Sets/src/mage/cards/s/SporeFrog.java index e5bd9a1c5e4..507fc99bd2a 100644 --- a/Mage.Sets/src/mage/cards/s/SporeFrog.java +++ b/Mage.Sets/src/mage/cards/s/SporeFrog.java @@ -28,7 +28,7 @@ public final class SporeFrog extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Spore Frog: Prevent all combat damage that would be dealt this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SporebackTroll.java b/Mage.Sets/src/mage/cards/s/SporebackTroll.java index 42ffe51f147..d5ef05423f6 100644 --- a/Mage.Sets/src/mage/cards/s/SporebackTroll.java +++ b/Mage.Sets/src/mage/cards/s/SporebackTroll.java @@ -33,7 +33,7 @@ public final class SporebackTroll extends CardImpl { this.addAbility(new GraftAbility(this, 2)); // {1}{G}: Regenerate target creature with a +1/+1 counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java index ac5f37c4bce..e68eefa60a0 100644 --- a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java +++ b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java @@ -40,7 +40,7 @@ public final class SporesowerThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on each Fungus you control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.SPORE.createInstance(), filter))); // Remove three spore counters from Sporesower Thallid: 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)))); } private SporesowerThallid(final SporesowerThallid card) { diff --git a/Mage.Sets/src/mage/cards/s/SporolothAncient.java b/Mage.Sets/src/mage/cards/s/SporolothAncient.java index 9c833fd1166..1a53aaee39b 100644 --- a/Mage.Sets/src/mage/cards/s/SporolothAncient.java +++ b/Mage.Sets/src/mage/cards/s/SporolothAncient.java @@ -38,7 +38,7 @@ public final class SporolothAncient extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Creatures you control have "Remove two spore counters from this creature: Create a 1/1 green Saproling creature token." Effect effect = new GainAbilityControlledEffect( - new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(2))), + new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(2))), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures you control") ); diff --git a/Mage.Sets/src/mage/cards/s/SpringjackPasture.java b/Mage.Sets/src/mage/cards/s/SpringjackPasture.java index 27f896bb520..9b310b6a022 100644 --- a/Mage.Sets/src/mage/cards/s/SpringjackPasture.java +++ b/Mage.Sets/src/mage/cards/s/SpringjackPasture.java @@ -35,7 +35,7 @@ public final class SpringjackPasture extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}, {tap}: Create a 0/1 white Goat creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GoatToken()), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java index 112d15558aa..a1db48400fd 100644 --- a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java @@ -40,7 +40,7 @@ public final class SpurnmageAdvocate extends CardImpl { this.toughness = new MageInt(1); // {T}: Return two target cards from an opponent's graveyard to their hand. Destroy target attacking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect() + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect() .setText("return two target cards from an opponent's graveyard to their hand"), new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(2, 2, filter)); Effect effect = new DestroyTargetEffect(); diff --git a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java index baecbfdb590..f16c245f6cf 100644 --- a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java +++ b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java @@ -40,7 +40,7 @@ public final class SpurredWolverine extends CardImpl { this.toughness = new MageInt(2); // Tap two untapped Beasts you control: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SquallDrifter.java b/Mage.Sets/src/mage/cards/s/SquallDrifter.java index 3840ecd38d0..cd1ca5dd579 100644 --- a/Mage.Sets/src/mage/cards/s/SquallDrifter.java +++ b/Mage.Sets/src/mage/cards/s/SquallDrifter.java @@ -34,7 +34,7 @@ public final class SquallDrifter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Squallmonger.java b/Mage.Sets/src/mage/cards/s/Squallmonger.java index 6d58257913d..e23adb6b275 100644 --- a/Mage.Sets/src/mage/cards/s/Squallmonger.java +++ b/Mage.Sets/src/mage/cards/s/Squallmonger.java @@ -38,7 +38,7 @@ public final class Squallmonger extends CardImpl { this.toughness = new MageInt(3); // {2}: Squallmonger deals 1 damage to each creature with flying and each player. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageAllEffect(1, filter), new ManaCostsImpl<>("{2}")); Effect effect = new DamagePlayersEffect(1); effect.setText("and each player"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SqueesToy.java b/Mage.Sets/src/mage/cards/s/SqueesToy.java index 27bc38c294f..e36121d70a8 100644 --- a/Mage.Sets/src/mage/cards/s/SqueesToy.java +++ b/Mage.Sets/src/mage/cards/s/SqueesToy.java @@ -21,7 +21,7 @@ public final class SqueesToy extends CardImpl { public SqueesToy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SquirrelNest.java b/Mage.Sets/src/mage/cards/s/SquirrelNest.java index 905425f11cf..c4666702641 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelNest.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelNest.java @@ -41,7 +41,7 @@ public final class SquirrelNest extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}: Create a 1/1 green Squirrel creature token." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken()), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new CreateTokenEffect(new SquirrelToken()), new TapSourceCost()); this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Create a 1/1 green Squirrel creature token.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java b/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java index 552ff358e78..f2c0bd6471f 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java @@ -37,12 +37,12 @@ public final class SquirrelWrangler extends CardImpl { this.toughness = new MageInt(2); // {1}{G}, Sacrifice a land: Create two 1/1 green Squirrel creature tokens. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken(), 2), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SquirrelToken(), 2), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); this.addAbility(ability); // {1}{G}, Sacrifice a land: Squirrel creatures get +1/+1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{1}{G}")); + ability = new SimpleActivatedAbility(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StaffOfDomination.java b/Mage.Sets/src/mage/cards/s/StaffOfDomination.java index 8816dbd9c23..37bdb860596 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfDomination.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfDomination.java @@ -27,23 +27,23 @@ public final class StaffOfDomination extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {1}: Untap Staff of Domination. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{1}"))); // {2}, {tap}: You gain 1 life. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability2 = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); // {3}, {tap}: Untap target creature. - Ability ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability3 = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{3}")); ability3.addCost(new TapSourceCost()); ability3.addTarget(new TargetCreaturePermanent()); this.addAbility(ability3); // {4}, {tap}: Tap target creature. - Ability ability4 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{4}")); + Ability ability4 = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{4}")); ability4.addCost(new TapSourceCost()); ability4.addTarget(new TargetCreaturePermanent()); this.addAbility(ability4); // {5}, {tap}: Draw a card. - Ability ability5 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{5}")); + Ability ability5 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{5}")); ability5.addCost(new TapSourceCost()); this.addAbility(ability5); } diff --git a/Mage.Sets/src/mage/cards/s/StaffOfNin.java b/Mage.Sets/src/mage/cards/s/StaffOfNin.java index e279e4c48a2..ba4d0afb2aa 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfNin.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfNin.java @@ -26,7 +26,7 @@ public final class StaffOfNin extends CardImpl { // At the beginning of your upkeep, draw a card. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1))); // {tap}: Staff of Nin 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/s/StaffOfZegon.java b/Mage.Sets/src/mage/cards/s/StaffOfZegon.java index 7a4023bda5b..fa57413efa5 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfZegon.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfZegon.java @@ -24,7 +24,7 @@ public final class StaffOfZegon extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {3}, {tap}: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StalkingAssassin.java b/Mage.Sets/src/mage/cards/s/StalkingAssassin.java index 7759c4f6305..f0dfc6a5b67 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingAssassin.java +++ b/Mage.Sets/src/mage/cards/s/StalkingAssassin.java @@ -39,12 +39,12 @@ public final class StalkingAssassin extends CardImpl { this.toughness = new MageInt(1); // {3}{U}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {3}{B}, {T}: Destroy target tapped creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); + ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java b/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java index 48529d87719..79dbb234d16 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java +++ b/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java @@ -32,7 +32,7 @@ public final class StalkingBloodsucker extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{B}, Discard a card: Stalking Bloodsucker gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StalkingStones.java b/Mage.Sets/src/mage/cards/s/StalkingStones.java index c84830bc90f..a3957fb69e6 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingStones.java +++ b/Mage.Sets/src/mage/cards/s/StalkingStones.java @@ -23,7 +23,7 @@ public final class StalkingStones extends CardImpl { public StalkingStones(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StalkingStonesToken(), CardType.LAND, Duration.WhileOnBattlefield) + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new StalkingStonesToken(), CardType.LAND, Duration.WhileOnBattlefield) .setText("{this} becomes a 3/3 Elemental artifact creature that's still a land"), new GenericManaCost(6))); } diff --git a/Mage.Sets/src/mage/cards/s/Stamina.java b/Mage.Sets/src/mage/cards/s/Stamina.java index 9b046750f1d..ec2d7b4f22f 100644 --- a/Mage.Sets/src/mage/cards/s/Stamina.java +++ b/Mage.Sets/src/mage/cards/s/Stamina.java @@ -43,7 +43,7 @@ public final class Stamina extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); // Sacrifice Stamina: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } private Stamina(final Stamina card) { diff --git a/Mage.Sets/src/mage/cards/s/StampedeDriver.java b/Mage.Sets/src/mage/cards/s/StampedeDriver.java index 03cf3daa8a3..1984083d6ac 100644 --- a/Mage.Sets/src/mage/cards/s/StampedeDriver.java +++ b/Mage.Sets/src/mage/cards/s/StampedeDriver.java @@ -35,7 +35,7 @@ public final class StampedeDriver extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {T}, Discard a card: Creatures you control get +1/+1 and gain trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn) .setText("creatures you control get +1/+1"), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); diff --git a/Mage.Sets/src/mage/cards/s/StarDestroyer.java b/Mage.Sets/src/mage/cards/s/StarDestroyer.java index 7da690f2d3f..274c770005a 100644 --- a/Mage.Sets/src/mage/cards/s/StarDestroyer.java +++ b/Mage.Sets/src/mage/cards/s/StarDestroyer.java @@ -46,15 +46,15 @@ public final class StarDestroyer extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // {2}{U}: Tap target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filter1)); this.addAbility(ability); // {2}{B}: Create a 1/1 black Starship artifact creature token with spaceflight named TIE Fighter. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TIEFighterToken()), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new TIEFighterToken()), new ManaCostsImpl<>("{2}{B}"))); // {2}{R}: Star Destroyer deals 2 damge to target non-Starship creature or player. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreatureOrPlayer(filter3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StarkeOfRath.java b/Mage.Sets/src/mage/cards/s/StarkeOfRath.java index 404a1bf4de3..15d53cb1f1c 100644 --- a/Mage.Sets/src/mage/cards/s/StarkeOfRath.java +++ b/Mage.Sets/src/mage/cards/s/StarkeOfRath.java @@ -34,7 +34,7 @@ public final class StarkeOfRath extends CardImpl { this.toughness = new MageInt(2); // {tap}: Destroy target artifact or creature. That permanent's controller gains control of Starke of Rath. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StarkeOfRathEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new StarkeOfRathEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StarlightInvoker.java b/Mage.Sets/src/mage/cards/s/StarlightInvoker.java index abba8b57010..f009ac583e4 100644 --- a/Mage.Sets/src/mage/cards/s/StarlightInvoker.java +++ b/Mage.Sets/src/mage/cards/s/StarlightInvoker.java @@ -26,7 +26,7 @@ public final class StarlightInvoker extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl<>("{7}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(5), new ManaCostsImpl<>("{7}{W}"))); } private StarlightInvoker(final StarlightInvoker card) { diff --git a/Mage.Sets/src/mage/cards/s/StarlitSanctum.java b/Mage.Sets/src/mage/cards/s/StarlitSanctum.java index 87393395334..07f0bf8557c 100644 --- a/Mage.Sets/src/mage/cards/s/StarlitSanctum.java +++ b/Mage.Sets/src/mage/cards/s/StarlitSanctum.java @@ -35,12 +35,12 @@ public final class StarlitSanctum extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {W}, {T}, Sacrifice a Cleric creature: You gain life equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StarlitSanctumWhiteEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new StarlitSanctumWhiteEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); // {B}, {T}, Sacrifice a Cleric creature: Target player loses life equal to the sacrificed creature's power. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StarlitSanctumBlackEffect(), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new StarlitSanctumBlackEffect(), new ManaCostsImpl<>("{B}")); ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/s/StarvedRusalka.java b/Mage.Sets/src/mage/cards/s/StarvedRusalka.java index 1b60cfee1a5..4712526ef67 100644 --- a/Mage.Sets/src/mage/cards/s/StarvedRusalka.java +++ b/Mage.Sets/src/mage/cards/s/StarvedRusalka.java @@ -29,7 +29,7 @@ public final class StarvedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StasisCell.java b/Mage.Sets/src/mage/cards/s/StasisCell.java index 7fd85f3d85d..98eb8dc362a 100644 --- a/Mage.Sets/src/mage/cards/s/StasisCell.java +++ b/Mage.Sets/src/mage/cards/s/StasisCell.java @@ -39,7 +39,7 @@ public final class StasisCell extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // {3}{U}: Attach Stasis Cell to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature"), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new AttachEffect(Outcome.Detriment, "Attach {this} to target creature"), new ManaCostsImpl<>("{3}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SteamSpitter.java b/Mage.Sets/src/mage/cards/s/SteamSpitter.java index 28e2ee4bb0e..d8a2e2e4959 100644 --- a/Mage.Sets/src/mage/cards/s/SteamSpitter.java +++ b/Mage.Sets/src/mage/cards/s/SteamSpitter.java @@ -29,7 +29,7 @@ public final class SteamSpitter extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {R}: Steam Spitter 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 SteamSpitter(final SteamSpitter card) { diff --git a/Mage.Sets/src/mage/cards/s/Steamclaw.java b/Mage.Sets/src/mage/cards/s/Steamclaw.java index 79fad49a395..e312e32439a 100644 --- a/Mage.Sets/src/mage/cards/s/Steamclaw.java +++ b/Mage.Sets/src/mage/cards/s/Steamclaw.java @@ -24,13 +24,13 @@ public final class Steamclaw extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); // {1}, Sacrifice Steamclaw: Exile target card from a graveyard. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SteelOverseer.java b/Mage.Sets/src/mage/cards/s/SteelOverseer.java index aecb2f3ceba..75a31f9ead5 100644 --- a/Mage.Sets/src/mage/cards/s/SteelOverseer.java +++ b/Mage.Sets/src/mage/cards/s/SteelOverseer.java @@ -36,7 +36,7 @@ public final class SteelOverseer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), new TapSourceCost())); } private SteelOverseer(final SteelOverseer card) { diff --git a/Mage.Sets/src/mage/cards/s/SteelSquirrel.java b/Mage.Sets/src/mage/cards/s/SteelSquirrel.java index cb4543b17ba..35ebf5908a4 100644 --- a/Mage.Sets/src/mage/cards/s/SteelSquirrel.java +++ b/Mage.Sets/src/mage/cards/s/SteelSquirrel.java @@ -36,7 +36,7 @@ public final class SteelSquirrel extends CardImpl { this.addAbility(new SteelSquirrelTriggeredAbility()); // 6: Roll a six-sided die. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new RollDiceEffect(6), new GenericManaCost(6)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java b/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java index a9702dd00a9..2e3fd56d482 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java +++ b/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java @@ -26,7 +26,7 @@ public final class StensiaBloodhall extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SteppeGlider.java b/Mage.Sets/src/mage/cards/s/SteppeGlider.java index d822ef9aa8e..5b01012e024 100644 --- a/Mage.Sets/src/mage/cards/s/SteppeGlider.java +++ b/Mage.Sets/src/mage/cards/s/SteppeGlider.java @@ -40,7 +40,7 @@ public final class SteppeGlider extends CardImpl { // {1}{W}: Target creature with a +1/+1 counter on it gains flying and vigilance until end of turn. Effect effect = new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target creature with a +1/+1 counter on it gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}")); effect = new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn); effect.setText("and vigilance until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SterlingGrove.java b/Mage.Sets/src/mage/cards/s/SterlingGrove.java index bc40b994165..51c7ac61242 100644 --- a/Mage.Sets/src/mage/cards/s/SterlingGrove.java +++ b/Mage.Sets/src/mage/cards/s/SterlingGrove.java @@ -32,7 +32,7 @@ public final class SterlingGrove extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterEnchantmentPermanent("enchantments"), true))); // {1}, Sacrifice Sterling Grove: Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(new FilterEnchantmentCard("enchantment card")), true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(new FilterEnchantmentCard("enchantment card")), true), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SternConstable.java b/Mage.Sets/src/mage/cards/s/SternConstable.java index e3097516522..25e8cd2ee7d 100644 --- a/Mage.Sets/src/mage/cards/s/SternConstable.java +++ b/Mage.Sets/src/mage/cards/s/SternConstable.java @@ -30,7 +30,7 @@ public final class SternConstable extends CardImpl { this.toughness = new MageInt(1); // {T}, Discard a card: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect("tap target creature"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect("tap target creature"), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SternMentor.java b/Mage.Sets/src/mage/cards/s/SternMentor.java index 616b2289999..e962932ea98 100644 --- a/Mage.Sets/src/mage/cards/s/SternMentor.java +++ b/Mage.Sets/src/mage/cards/s/SternMentor.java @@ -37,7 +37,7 @@ public final class SternMentor extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Stern Mentor is paired with another creature, each of those creatures has "{T}: Target player puts the top two cards of their library into their graveyard." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java b/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java index 73d8ab4ef0b..d5492257deb 100644 --- a/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java +++ b/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java @@ -33,7 +33,7 @@ public final class StewardOfSolidarity extends CardImpl { // {T}, Exert Steward of Solidarity: Create a 1/1 white Warrior creature token with vigilance. Effect effect = new CreateTokenEffect(new WarriorVigilantToken()); effect.setText("Create a 1/1 white Warrior creature token with vigilance"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addCost(new ExertSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StillLife.java b/Mage.Sets/src/mage/cards/s/StillLife.java index 5f8748e10b0..5e3350096fd 100644 --- a/Mage.Sets/src/mage/cards/s/StillLife.java +++ b/Mage.Sets/src/mage/cards/s/StillLife.java @@ -25,7 +25,7 @@ public final class StillLife extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}{G}"); // {G}{G}: Still Life becomes a 4/3 Centaur creature until end of turn. It's still an enchantment. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StillLifeCentaur(), CardType.ENCHANTMENT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new StillLifeCentaur(), CardType.ENCHANTMENT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}"))); } private StillLife(final StillLife card) { diff --git a/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java b/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java index 3d6219f0596..c9cc735b04f 100644 --- a/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java +++ b/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java @@ -35,11 +35,11 @@ public final class StillmoonCavalier extends CardImpl { // Protection from white and from black this.addAbility(ProtectionAbility.from(ObjectColor.WHITE, ObjectColor.BLACK)); // {WB}: Stillmoon Cavalier gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); // {WB}: Stillmoon Cavalier gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); // {WB}{WB}: Stillmoon Cavalier gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}"))); } private StillmoonCavalier(final StillmoonCavalier card) { diff --git a/Mage.Sets/src/mage/cards/s/StingingBarrier.java b/Mage.Sets/src/mage/cards/s/StingingBarrier.java index 97abc3a5b4b..739ba96a408 100644 --- a/Mage.Sets/src/mage/cards/s/StingingBarrier.java +++ b/Mage.Sets/src/mage/cards/s/StingingBarrier.java @@ -30,7 +30,7 @@ public final class StingingBarrier extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {U}, {tap}: Stinging Barrier deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Stingmoggie.java b/Mage.Sets/src/mage/cards/s/Stingmoggie.java index f69162f0d6a..5346d0efae1 100644 --- a/Mage.Sets/src/mage/cards/s/Stingmoggie.java +++ b/Mage.Sets/src/mage/cards/s/Stingmoggie.java @@ -45,7 +45,7 @@ public final class Stingmoggie extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),"with two +1/+1 counters on it")); // {3}{R}, Remove a +1/+1 counter from Stingmoggie: Destroy target artifact or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StirringWildwood.java b/Mage.Sets/src/mage/cards/s/StirringWildwood.java index b54b88d00fb..d017d4307af 100644 --- a/Mage.Sets/src/mage/cards/s/StirringWildwood.java +++ b/Mage.Sets/src/mage/cards/s/StirringWildwood.java @@ -30,7 +30,7 @@ public final class StirringWildwood extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new GreenManaAbility()); this.addAbility(new WhiteManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StirringWildwoodToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new StirringWildwoodToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{G}{W}"))); } private StirringWildwood(final StirringWildwood card) { diff --git a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java index d74e47300d3..bd9436d8a04 100644 --- a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java +++ b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java @@ -37,7 +37,7 @@ public final class StitcherGeralf extends CardImpl { this.toughness = new MageInt(4); // {2}{U}, {tap}: Each player puts the top three cards of their library into their graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StitcherGeralfEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new StitcherGeralfEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StitchersApprentice.java b/Mage.Sets/src/mage/cards/s/StitchersApprentice.java index 207afa3db9e..38087a1456c 100644 --- a/Mage.Sets/src/mage/cards/s/StitchersApprentice.java +++ b/Mage.Sets/src/mage/cards/s/StitchersApprentice.java @@ -31,7 +31,7 @@ public final class StitchersApprentice extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: Create a 2/2 blue Homunculus creature token, then sacrifice a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new StitchersApprenticeHomunculusToken()), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new StitchersApprenticeHomunculusToken()), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addEffect(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, ", then")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java b/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java index 5499a272c9b..f9a151bbbc0 100644 --- a/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java +++ b/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java @@ -28,7 +28,7 @@ public final class StoneHavenMedic extends CardImpl { this.toughness = new MageInt(3); // {W}, {T}: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StoneKavu.java b/Mage.Sets/src/mage/cards/s/StoneKavu.java index d09944766a7..dfecaf489d6 100644 --- a/Mage.Sets/src/mage/cards/s/StoneKavu.java +++ b/Mage.Sets/src/mage/cards/s/StoneKavu.java @@ -27,9 +27,9 @@ public final class StoneKavu extends CardImpl { this.toughness = new MageInt(3); // {R}: Stone Kavu 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}"))); // {W}: Stone Kavu gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private StoneKavu(final StoneKavu card) { diff --git a/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java b/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java index d27bf4768ff..4cbefde53f8 100644 --- a/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java +++ b/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java @@ -28,7 +28,7 @@ public final class StonefareCrocodile extends CardImpl { this.toughness = new MageInt(2); // {2}{B}: Stonefare Crocodile gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); } private StonefareCrocodile(final StonefareCrocodile card) { diff --git a/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java b/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java index fc66a5671e2..1a73daf275f 100644 --- a/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java +++ b/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java @@ -43,7 +43,7 @@ public final class StoneforgeMystic extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); // {1}{W}, {T}: You may put an Equipment card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{1}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Stonehands.java b/Mage.Sets/src/mage/cards/s/Stonehands.java index 3ccafa57429..b74119ae513 100644 --- a/Mage.Sets/src/mage/cards/s/Stonehands.java +++ b/Mage.Sets/src/mage/cards/s/Stonehands.java @@ -41,7 +41,7 @@ public final class Stonehands extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private Stonehands(final Stonehands card) { diff --git a/Mage.Sets/src/mage/cards/s/StonehornChanter.java b/Mage.Sets/src/mage/cards/s/StonehornChanter.java index 7adcf9ae4ba..b19e5f0977a 100644 --- a/Mage.Sets/src/mage/cards/s/StonehornChanter.java +++ b/Mage.Sets/src/mage/cards/s/StonehornChanter.java @@ -30,7 +30,7 @@ public final class StonehornChanter extends CardImpl { this.toughness = new MageInt(4); // {5}{W}: Stonehorn Chanter gains vigilance and lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn) .setText("{this} gains vigilance"), new ManaCostsImpl<>("{5}{W}")); ability.addEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn) .setText("and lifelink until end of turn")); diff --git a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java index 5d10eab61bb..e9efff07687 100644 --- a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java +++ b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java @@ -35,7 +35,7 @@ public final class StonewiseFortifier extends CardImpl { this.toughness = new MageInt(2); // {4}{W}: Prevent all damage that would be dealt to Stonewise Fortifier by target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StonewiseFortifierPreventAllDamageToEffect(), new ManaCostsImpl<>("{4}{W}")); + Ability ability = new SimpleActivatedAbility(new StonewiseFortifierPreventAllDamageToEffect(), new ManaCostsImpl<>("{4}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java b/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java index 15375153a69..61360221fbe 100644 --- a/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java +++ b/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java @@ -28,7 +28,7 @@ public final class StonewoodInvoker extends CardImpl { this.toughness = new MageInt(2); // {7}{G}: Stonewood Invoker gets +5/+5 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(5,5,Duration.EndOfTurn), new ManaCostsImpl<>("{7}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(5,5,Duration.EndOfTurn), new ManaCostsImpl<>("{7}{G}"))); } private StonewoodInvoker(final StonewoodInvoker card) { diff --git a/Mage.Sets/src/mage/cards/s/Stonewright.java b/Mage.Sets/src/mage/cards/s/Stonewright.java index 60d8c29db32..93a659fcfe8 100644 --- a/Mage.Sets/src/mage/cards/s/Stonewright.java +++ b/Mage.Sets/src/mage/cards/s/Stonewright.java @@ -36,7 +36,7 @@ public final class Stonewright extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Stonewright is paired with another creature, each of those creatures has "{R}: This creature gets +1/+0 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/cards/s/StonybrookAngler.java b/Mage.Sets/src/mage/cards/s/StonybrookAngler.java index 987f179e7de..b51504c462f 100644 --- a/Mage.Sets/src/mage/cards/s/StonybrookAngler.java +++ b/Mage.Sets/src/mage/cards/s/StonybrookAngler.java @@ -30,7 +30,7 @@ public final class StonybrookAngler extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StormElemental.java b/Mage.Sets/src/mage/cards/s/StormElemental.java index 7ccef8bfdfc..41673d298e1 100644 --- a/Mage.Sets/src/mage/cards/s/StormElemental.java +++ b/Mage.Sets/src/mage/cards/s/StormElemental.java @@ -44,13 +44,13 @@ public final class StormElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}, Exile the top card of your library: Tap target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new ExileTopCardLibraryCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {U}, Exile the top card of your library: If the exiled card is a snow land, Storm Elemental gets +1/+1 until end of turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StormElementalEffect(), new ManaCostsImpl<>("{U}")); + Ability ability2 = new SimpleActivatedAbility(new StormElementalEffect(), new ManaCostsImpl<>("{U}")); ability2.addCost(new ExileTopCardLibraryCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/StormFront.java b/Mage.Sets/src/mage/cards/s/StormFront.java index 5c88d0bf640..c5eebd53499 100644 --- a/Mage.Sets/src/mage/cards/s/StormFront.java +++ b/Mage.Sets/src/mage/cards/s/StormFront.java @@ -31,7 +31,7 @@ public final class StormFront extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // {G}{G}: Tap target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{G}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StormShaman.java b/Mage.Sets/src/mage/cards/s/StormShaman.java index 15afdf8a975..3a9fa2fa768 100644 --- a/Mage.Sets/src/mage/cards/s/StormShaman.java +++ b/Mage.Sets/src/mage/cards/s/StormShaman.java @@ -29,7 +29,7 @@ public final class StormShaman extends CardImpl { this.toughness = new MageInt(4); // {R}: Storm Shaman 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 StormShaman(final StormShaman card) { diff --git a/Mage.Sets/src/mage/cards/s/StormSpirit.java b/Mage.Sets/src/mage/cards/s/StormSpirit.java index 9d446ce1eb7..ffae2b547cb 100644 --- a/Mage.Sets/src/mage/cards/s/StormSpirit.java +++ b/Mage.Sets/src/mage/cards/s/StormSpirit.java @@ -31,7 +31,7 @@ public final class StormSpirit extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Storm Spirit deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Stormbind.java b/Mage.Sets/src/mage/cards/s/Stormbind.java index fcde28f9454..31e148ecd6e 100644 --- a/Mage.Sets/src/mage/cards/s/Stormbind.java +++ b/Mage.Sets/src/mage/cards/s/Stormbind.java @@ -24,7 +24,7 @@ public final class Stormbind extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{G}"); // {2}, Discard a card at random: Stormbind deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java b/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java index 9f0845fecd3..c4f2bc10154 100644 --- a/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java +++ b/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java @@ -30,7 +30,7 @@ public final class StormcallerOfKeranos extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {1}{U}: Scry 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1), new ManaCostsImpl<>("{1}{U}"))); } private StormcallerOfKeranos(final StormcallerOfKeranos card) { diff --git a/Mage.Sets/src/mage/cards/s/StormcallersBoon.java b/Mage.Sets/src/mage/cards/s/StormcallersBoon.java index 3ffd65b7ff5..93a6530b5e4 100644 --- a/Mage.Sets/src/mage/cards/s/StormcallersBoon.java +++ b/Mage.Sets/src/mage/cards/s/StormcallersBoon.java @@ -27,7 +27,7 @@ public final class StormcallersBoon extends CardImpl { // Sacrifice Stormcaller's Boon: Creatures you control gain flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures")), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures")), new SacrificeSourceCost())); this.addAbility(new CascadeAbility()); } diff --git a/Mage.Sets/src/mage/cards/s/StormchaserChimera.java b/Mage.Sets/src/mage/cards/s/StormchaserChimera.java index 2b0cc4284cf..a8f25dec02d 100644 --- a/Mage.Sets/src/mage/cards/s/StormchaserChimera.java +++ b/Mage.Sets/src/mage/cards/s/StormchaserChimera.java @@ -40,7 +40,7 @@ public final class StormchaserChimera extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{U}{R}: Scry 1, then reveal the top card of your library. Stormchaser Chimera gets +X/+0 until end of turn, where X is that card's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new ManaCostsImpl<>("{2}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1, false), new ManaCostsImpl<>("{2}{U}{R}")); ability.addEffect(new StormchaserChimeraEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java b/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java index b3aa559488f..ea5289ad853 100644 --- a/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java +++ b/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java @@ -35,7 +35,7 @@ public final class StormcloudDjinn extends CardImpl { // Stormcloud Djinn can block only creatures with flying. this.addAbility(new CanBlockOnlyFlyingAbility()); // {R}{R}: Stormcloud Djinn gets +2/+0 until end of turn and deals 1 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); Effect effect = new DamageControllerEffect(1); effect.setText("and deals 1 damage to you"); diff --git a/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java b/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java index 2090746f790..47acb9a6cc8 100644 --- a/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java @@ -32,12 +32,12 @@ public final class StormscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}, {T}: Target player loses 1 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StormscapeMaster.java b/Mage.Sets/src/mage/cards/s/StormscapeMaster.java index f272e72bbe6..16dfdce0731 100644 --- a/Mage.Sets/src/mage/cards/s/StormscapeMaster.java +++ b/Mage.Sets/src/mage/cards/s/StormscapeMaster.java @@ -37,13 +37,13 @@ public final class StormscapeMaster extends CardImpl { // {W}{W}, {T}: Target creature gains protection from the color of your choice until end of turn. Effect effect = new GainProtectionFromColorTargetEffect(Duration.EndOfTurn); effect.setText("Target creature gains protection from the color of your choice until end of turn."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}{B}, {T}: Target player loses 2 life and you gain 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); ability.addEffect(new GainLifeEffect(2).setText("and you gain 2 life")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/StormwatchEagle.java b/Mage.Sets/src/mage/cards/s/StormwatchEagle.java index a744cef048c..bed20024051 100644 --- a/Mage.Sets/src/mage/cards/s/StormwatchEagle.java +++ b/Mage.Sets/src/mage/cards/s/StormwatchEagle.java @@ -32,7 +32,7 @@ public final class StormwatchEagle extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice a land: Return Stormwatch Eagle to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ReturnToHandSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); } diff --git a/Mage.Sets/src/mage/cards/s/StoryCircle.java b/Mage.Sets/src/mage/cards/s/StoryCircle.java index 3156d8a9f75..c39f8929f05 100644 --- a/Mage.Sets/src/mage/cards/s/StoryCircle.java +++ b/Mage.Sets/src/mage/cards/s/StoryCircle.java @@ -32,7 +32,7 @@ public final class StoryCircle extends CardImpl { // As Story Circle enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); // {W}: The next time a source of your choice of the chosen color would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new StoryCircleEffect(), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new StoryCircleEffect(), new ManaCostsImpl<>("{W}"))); } private StoryCircle(final StoryCircle card) { diff --git a/Mage.Sets/src/mage/cards/s/StrandsOfNight.java b/Mage.Sets/src/mage/cards/s/StrandsOfNight.java index 25614ec56c7..311f7b10c51 100644 --- a/Mage.Sets/src/mage/cards/s/StrandsOfNight.java +++ b/Mage.Sets/src/mage/cards/s/StrandsOfNight.java @@ -34,7 +34,7 @@ public final class StrandsOfNight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); // {B}{B}, Pay 2 life, Sacrifice a Swamp: Return target creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{B}{B}")); ability.addCost(new PayLifeCost(2)); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java b/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java index 3529d541a82..234b3f26a9d 100644 --- a/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java +++ b/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java @@ -38,7 +38,7 @@ public final class StrandsOfUndeath extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); Ability abilityDiscard = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(2)); abilityDiscard.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/StreamHopper.java b/Mage.Sets/src/mage/cards/s/StreamHopper.java index 68bdd5c3e03..c35ea94f701 100644 --- a/Mage.Sets/src/mage/cards/s/StreamHopper.java +++ b/Mage.Sets/src/mage/cards/s/StreamHopper.java @@ -27,7 +27,7 @@ public final class StreamHopper extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } private StreamHopper(final StreamHopper card) { diff --git a/Mage.Sets/src/mage/cards/s/StripMine.java b/Mage.Sets/src/mage/cards/s/StripMine.java index a1eee3244c5..0836967bd2a 100644 --- a/Mage.Sets/src/mage/cards/s/StripMine.java +++ b/Mage.Sets/src/mage/cards/s/StripMine.java @@ -27,7 +27,7 @@ public final class StripMine extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {T}, Sacrifice Strip Mine: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StromgaldCabal.java b/Mage.Sets/src/mage/cards/s/StromgaldCabal.java index 096269cadac..5c129322202 100644 --- a/Mage.Sets/src/mage/cards/s/StromgaldCabal.java +++ b/Mage.Sets/src/mage/cards/s/StromgaldCabal.java @@ -39,7 +39,7 @@ public final class StromgaldCabal extends CardImpl { this.toughness = new MageInt(2); // {tap}, Pay 1 life: Counter target white spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new TapSourceCost()); ability.addCost(new PayLifeCost(1)); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java b/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java index bdde6f6bef1..88291e83a54 100644 --- a/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java +++ b/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java @@ -35,10 +35,10 @@ public final class StromgaldCrusader extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // {B}: Stromgald Crusader gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {B}{B}: Stromgald Crusader gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); } private StromgaldCrusader(final StromgaldCrusader card) { diff --git a/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java b/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java index 5bb96282802..cfa0017f30c 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java @@ -33,7 +33,7 @@ public final class StrongholdAssassin extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a creature: Destroy target nonblack creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); Target target = new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java b/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java index 34dbe63064d..1d82359bb80 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java @@ -32,7 +32,7 @@ public final class StrongholdMachinist extends CardImpl { this.toughness = new MageInt(1); // {U}{U}, {tap}, Discard a card: Counter target noncreature 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 TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_NON_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java b/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java index 1ad200544cf..c9877b19a32 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java @@ -45,7 +45,7 @@ public final class StrongholdOverseer extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {B}{B}: Creatures with shadow get +1/+0 until end of turn and creatures without shadow get -1/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{B}{B}")); Effect effect = new BoostAllEffect(-1, 0, Duration.EndOfTurn, filter2, false); effect.setText("and creatures without shadow get -1/-0 until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/StuffyDoll.java b/Mage.Sets/src/mage/cards/s/StuffyDoll.java index 28f4560693f..2a323e1af7b 100644 --- a/Mage.Sets/src/mage/cards/s/StuffyDoll.java +++ b/Mage.Sets/src/mage/cards/s/StuffyDoll.java @@ -42,7 +42,7 @@ public final class StuffyDoll extends CardImpl { // Whenever Stuffy Doll is dealt damage, it deals that much damage to the chosen player. this.addAbility(new DealtDamageToSourceTriggeredAbility(new StuffyDollEffect(), false)); // {T}: Stuffy Doll deals 1 damage to itself. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageSelfEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageSelfEffect(1), new TapSourceCost())); } private StuffyDoll(final StuffyDoll card) { diff --git a/Mage.Sets/src/mage/cards/s/StunSniper.java b/Mage.Sets/src/mage/cards/s/StunSniper.java index 92ed19b6b47..ce965c19ad1 100644 --- a/Mage.Sets/src/mage/cards/s/StunSniper.java +++ b/Mage.Sets/src/mage/cards/s/StunSniper.java @@ -31,7 +31,7 @@ public final class StunSniper extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - 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 TapSourceCost()); ability.addEffect(new TapTargetEffect().setText("tap that creature")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SturdyHatchling.java b/Mage.Sets/src/mage/cards/s/SturdyHatchling.java index 1dd0a756fc1..a9934ba016c 100644 --- a/Mage.Sets/src/mage/cards/s/SturdyHatchling.java +++ b/Mage.Sets/src/mage/cards/s/SturdyHatchling.java @@ -46,7 +46,7 @@ public final class SturdyHatchling extends CardImpl { // Sturdy Hatchling enters the battlefield with four -1/-1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(4)),"with four -1/-1 counters on it")); // {G/U}: Sturdy Hatchling gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}"))); // Whenever you cast a green spell, remove a -1/-1 counter from Sturdy Hatchling. this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterGreenSpell, false)); // Whenever you cast a blue spell, remove a -1/-1 counter from Sturdy Hatchling. diff --git a/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java b/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java index d6c96264990..86ebb39b7d6 100644 --- a/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java +++ b/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java @@ -30,7 +30,7 @@ public final class SubterraneanHangar extends CardImpl { // Subterranean Hangar enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Put a storage counter on Subterranean Hangar. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {tap}, Remove any number of storage counters from Subterranean Hangar: Add {B} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.BlackMana(1), diff --git a/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java b/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java index 6dc4536597b..e305d5fc234 100644 --- a/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java @@ -43,7 +43,7 @@ public final class SubterraneanSpirit extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {tap}: Subterranean Spirit deals 1 damage to each creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(1, filter), new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SuicidalCharge.java b/Mage.Sets/src/mage/cards/s/SuicidalCharge.java index 446ae61f5f6..a85eb2ebf1b 100644 --- a/Mage.Sets/src/mage/cards/s/SuicidalCharge.java +++ b/Mage.Sets/src/mage/cards/s/SuicidalCharge.java @@ -26,7 +26,7 @@ public final class SuicidalCharge extends CardImpl { // Sacrifice Suicidal Charge: Creatures your opponents control get -1/-1 until end of turn. Those creatures attack this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostOpponentsEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addEffect(new SuicidalChargeEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SultaiBanner.java b/Mage.Sets/src/mage/cards/s/SultaiBanner.java index ec098570bc9..e7e37fd2f92 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiBanner.java +++ b/Mage.Sets/src/mage/cards/s/SultaiBanner.java @@ -31,7 +31,7 @@ public final class SultaiBanner extends CardImpl { this.addAbility(new BlueManaAbility()); // {B}{G}{U}, {T}, Sacrifice Sultai Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{G}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{G}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SummoningStation.java b/Mage.Sets/src/mage/cards/s/SummoningStation.java index 85c9c110046..58dd3f3d9bb 100644 --- a/Mage.Sets/src/mage/cards/s/SummoningStation.java +++ b/Mage.Sets/src/mage/cards/s/SummoningStation.java @@ -24,7 +24,7 @@ public final class SummoningStation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{7}"); // {tap}: Create a 2/2 colorless Pincher creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PincherToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new PincherToken()), new TapSourceCost())); // Whenever an artifact is put into a graveyard from the battlefield, you may untap Summoning Station. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new UntapSourceEffect(), true, StaticFilters.FILTER_PERMANENT_ARTIFACT_AN, false)); } diff --git a/Mage.Sets/src/mage/cards/s/SunClasp.java b/Mage.Sets/src/mage/cards/s/SunClasp.java index afb4684b3e0..f09522f6f63 100644 --- a/Mage.Sets/src/mage/cards/s/SunClasp.java +++ b/Mage.Sets/src/mage/cards/s/SunClasp.java @@ -40,7 +40,7 @@ public final class SunClasp extends CardImpl { // Enchanted creature gets +1/+3. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); // {W}: Return enchanted creature to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SunClaspReturnEffect(), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new SunClaspReturnEffect(), new ColoredManaCost(ColoredManaSymbol.W))); } private SunClasp(final SunClasp card) { diff --git a/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java b/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java index 431bff2ebd7..1d7dc5b37d3 100644 --- a/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java +++ b/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java @@ -23,10 +23,10 @@ public final class SunbeamSpellbomb extends CardImpl { public SunbeamSpellbomb(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ColoredManaCost(ColoredManaSymbol.W)); + Ability firstAbility = new SimpleActivatedAbility(new GainLifeEffect(5), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new SacrificeSourceCost()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/s/Suncrusher.java b/Mage.Sets/src/mage/cards/s/Suncrusher.java index 1bde3d9e197..c8a5877bbc2 100644 --- a/Mage.Sets/src/mage/cards/s/Suncrusher.java +++ b/Mage.Sets/src/mage/cards/s/Suncrusher.java @@ -35,13 +35,13 @@ public final class Suncrusher extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // {4}, {tap}, Remove a +1/+1 counter from Suncrusher: Destroy target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from Suncrusher: Return Suncrusher to its owner's hand. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SunflareShaman.java b/Mage.Sets/src/mage/cards/s/SunflareShaman.java index f8b346a3395..70e6d1ada1a 100644 --- a/Mage.Sets/src/mage/cards/s/SunflareShaman.java +++ b/Mage.Sets/src/mage/cards/s/SunflareShaman.java @@ -35,7 +35,7 @@ public final class SunflareShaman extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, {tap}: Sunflare Shaman deals X damage to any target and X damage to itself, where X is the number of Elemental cards in your graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SunflareShamanEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new SunflareShamanEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java b/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java index 17b9dbcc0a5..941a1158697 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java @@ -36,7 +36,7 @@ public final class SunhomeEnforcer extends CardImpl { this.addAbility(new SunhomeEnforcerTriggeredAbility()); // {1}{R}: Sunhome Enforcer gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private SunhomeEnforcer(final SunhomeEnforcer card) { diff --git a/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java b/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java index 21e5cfcea51..4763d932d7a 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java @@ -25,7 +25,7 @@ public final class SunhomeFortressOfTheLegion extends CardImpl { public SunhomeFortressOfTheLegion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java index 189b02df32b..baa330e0679 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java @@ -29,10 +29,10 @@ public final class SunhomeGuildmage extends CardImpl { this.toughness = new MageInt(2); //{1}{R}{W}: Creatures you control get +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{W}"))); //{2}{R}{W}: Create a 1/1 red and white Soldier creature token with haste. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierTokenWithHaste()), new ManaCostsImpl<>("{2}{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SoldierTokenWithHaste()), new ManaCostsImpl<>("{2}{R}{W}"))); } private SunhomeGuildmage(final SunhomeGuildmage card) { diff --git a/Mage.Sets/src/mage/cards/s/SunkenField.java b/Mage.Sets/src/mage/cards/s/SunkenField.java index b0633c291c0..30dd13d2a7d 100644 --- a/Mage.Sets/src/mage/cards/s/SunkenField.java +++ b/Mage.Sets/src/mage/cards/s/SunkenField.java @@ -40,7 +40,7 @@ public final class SunkenField extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Counter target spell unless its controller pays {1}." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), new TapSourceCost()); + ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), new TapSourceCost()); ability.addTarget(new TargetSpell()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Counter target spell unless its controller pays {1}.\""); diff --git a/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java b/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java index 80bd1d8ebe7..b13a6db93a6 100644 --- a/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java @@ -33,13 +33,13 @@ public final class SunscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}, {tap}: Put target creature you control on top of its owner's library. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), + ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SunscapeMaster.java b/Mage.Sets/src/mage/cards/s/SunscapeMaster.java index 8dfa9c11c6b..0de50d6fa6a 100644 --- a/Mage.Sets/src/mage/cards/s/SunscapeMaster.java +++ b/Mage.Sets/src/mage/cards/s/SunscapeMaster.java @@ -34,14 +34,14 @@ public final class SunscapeMaster extends CardImpl { // {G}{G}, {tap}: Creatures you control get +2/+2 until end of turn. Effect effect1 = new BoostControlledEffect(2, 2, Duration.EndOfTurn); effect1.setText("Creatures you control get +2/+2 until end of turn"); - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl<>("{G}{G}")); + Ability ability1 = new SimpleActivatedAbility(effect1, new ManaCostsImpl<>("{G}{G}")); ability1.addCost(new TapSourceCost()); this.addAbility(ability1); // {U}{U}, {tap}: Return target creature to its owner's hand. Effect effect2 = new ReturnToHandTargetEffect(); effect2.setText("Return target creature to its owner's hand."); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect2, new ManaCostsImpl<>("{U}{U}")); + Ability ability2 = new SimpleActivatedAbility(effect2, new ManaCostsImpl<>("{U}{U}")); ability2.addTarget(new TargetCreaturePermanent()); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SunsetPyramid.java b/Mage.Sets/src/mage/cards/s/SunsetPyramid.java index 7c02537b622..ae696fdef07 100644 --- a/Mage.Sets/src/mage/cards/s/SunsetPyramid.java +++ b/Mage.Sets/src/mage/cards/s/SunsetPyramid.java @@ -30,13 +30,13 @@ public final class SunsetPyramid extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.BRICK.createInstance(3)), "with three brick counters on it")); // {2}, {T}, Remove a brick counter from Sunset Pyramid: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.BRICK.createInstance())); this.addAbility(ability); // {2}, {T}: Scry 1. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new ScryEffect(1, false), new GenericManaCost(2)); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/Sunstone.java b/Mage.Sets/src/mage/cards/s/Sunstone.java index f6454431ee5..504d0d20949 100644 --- a/Mage.Sets/src/mage/cards/s/Sunstone.java +++ b/Mage.Sets/src/mage/cards/s/Sunstone.java @@ -35,7 +35,7 @@ public final class Sunstone extends CardImpl { // {2}, Sacrifice a snow land: Prevent all combat damage that would be dealt this turn. Effect effect = new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt this turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java index dc3844a54af..007dad01b53 100644 --- a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java +++ b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java @@ -48,7 +48,7 @@ public final class SunstrikeLegionnaire extends CardImpl { // Whenever another creature enters the battlefield, untap Sunstrike Legionnaire. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), untapFilter, false)); // {tap}: Tap target creature with converted mana cost 3 or less. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(tapFilter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java index 5e904f668d9..b35f178f0e5 100644 --- a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java +++ b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java @@ -44,7 +44,7 @@ public final class SuqAtaFirewalker extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterRed, Duration.WhileOnBattlefield))); //{T}: Suq'Ata Firewalker deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SurgeNode.java b/Mage.Sets/src/mage/cards/s/SurgeNode.java index f8e87474f1a..8ab73e841c0 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeNode.java +++ b/Mage.Sets/src/mage/cards/s/SurgeNode.java @@ -27,7 +27,7 @@ public final class SurgeNode extends CardImpl { public SurgeNode(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(6)), "with six charge counters on it")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SurveyorsScope.java b/Mage.Sets/src/mage/cards/s/SurveyorsScope.java index 4c0a852cffa..aef5df6fd73 100644 --- a/Mage.Sets/src/mage/cards/s/SurveyorsScope.java +++ b/Mage.Sets/src/mage/cards/s/SurveyorsScope.java @@ -30,7 +30,7 @@ public final class SurveyorsScope extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}, Exile Surveyor's Scope: Search your library for up to X basic land cards, where X is the number of players who control at least two more lands than you. Put those cards onto the battlefield, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SurveyorsScopeEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SurveyorsScopeEffect(), new TapSourceCost()); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java index 5021f8ffa32..dfb5a44adb2 100644 --- a/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java +++ b/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java @@ -27,7 +27,7 @@ public final class SurvivalOfTheFittest extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // {G}, Discard a creature card: Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true, true), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true, true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java b/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java index 69d72c70102..920f7dc923b 100644 --- a/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java @@ -38,7 +38,7 @@ public final class SurvivorOfTheUnseen extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // {T}: Draw two cards, then put a card from your hand on top of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SurvivorOfTheUnseenEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SurvivorOfTheUnseenEffect(), new TapSourceCost())); } private SurvivorOfTheUnseen(final SurvivorOfTheUnseen card) { diff --git a/Mage.Sets/src/mage/cards/s/Sustenance.java b/Mage.Sets/src/mage/cards/s/Sustenance.java index 19b9b3fb427..5b9ae0fb4ca 100644 --- a/Mage.Sets/src/mage/cards/s/Sustenance.java +++ b/Mage.Sets/src/mage/cards/s/Sustenance.java @@ -27,7 +27,7 @@ public final class Sustenance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // {1}, Sacrifice a land: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SutureSpirit.java b/Mage.Sets/src/mage/cards/s/SutureSpirit.java index 012c14d69b9..95074dac33b 100644 --- a/Mage.Sets/src/mage/cards/s/SutureSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SutureSpirit.java @@ -28,7 +28,7 @@ public final class SutureSpirit extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{W/B}{W/B}{W/B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{W/B}{W/B}{W/B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java b/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java index d08faa37a01..cb7c56cadeb 100644 --- a/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java +++ b/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java @@ -29,7 +29,7 @@ public final class SvogthosTheRestlessTomb extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {3}{B}{G}: Until end of turn, Svogthos, the Restless Tomb becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SvogthosToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{3}{B}{G}")); + Ability ability = new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SvogthosToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{3}{B}{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Swarmyard.java b/Mage.Sets/src/mage/cards/s/Swarmyard.java index 77fd70c4ebe..b1833ba27e9 100644 --- a/Mage.Sets/src/mage/cards/s/Swarmyard.java +++ b/Mage.Sets/src/mage/cards/s/Swarmyard.java @@ -40,7 +40,7 @@ public final class Swarmyard extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {tap}: Regenerate target Insect, Rat, Spider, or Squirrel. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java b/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java index 314fca9ee00..c10e1a02c9c 100644 --- a/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java +++ b/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java @@ -30,7 +30,7 @@ public final class SwirlingSpriggan extends CardImpl { this.toughness = new MageInt(3); // {GU}{GU}: Target creature you control becomes the color or colors of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}{G/U}")); + Ability ability = new SimpleActivatedAbility(new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}{G/U}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SwoopingTalon.java b/Mage.Sets/src/mage/cards/s/SwoopingTalon.java index 07dc5796025..b8be29e892c 100644 --- a/Mage.Sets/src/mage/cards/s/SwoopingTalon.java +++ b/Mage.Sets/src/mage/cards/s/SwoopingTalon.java @@ -31,7 +31,7 @@ public final class SwoopingTalon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}: Swooping Talon loses flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new LoseAbilitySourceEffect( FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); // Provoke this.addAbility(new ProvokeAbility()); diff --git a/Mage.Sets/src/mage/cards/s/SwordDancer.java b/Mage.Sets/src/mage/cards/s/SwordDancer.java index cfe99b2eb83..4ae32e46df0 100644 --- a/Mage.Sets/src/mage/cards/s/SwordDancer.java +++ b/Mage.Sets/src/mage/cards/s/SwordDancer.java @@ -30,7 +30,7 @@ public final class SwordDancer extends CardImpl { this.toughness = new MageInt(2); // {W}{W}: Target attacking creature gets -1/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}")); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java index 9ed885d513e..22683df8858 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java @@ -43,7 +43,7 @@ public final class SwordOfTheAges extends CardImpl { cost.setText("Sacrifice {this} and any number of creatures you control"); Cost cost2 = new SacrificeTargetCost(new TargetSacrifice(0, Integer.MAX_VALUE, StaticFilters.FILTER_PERMANENT_CREATURES)); cost2.setText(""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwordOfTheAgesEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SwordOfTheAgesEffect(), new TapSourceCost()); ability.addCost(cost); ability.addCost(cost2); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java index 53fae9db0d2..cdb30c613c3 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java @@ -32,7 +32,7 @@ public final class SwordOfTheChosen extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {tap}: Target legendary creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java index 84b69f93865..d57aded4b8b 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java @@ -54,7 +54,7 @@ public final class SwordOfTheParuns extends CardImpl { ))); // {3}: You may tap or untap equipped creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapAttachedEffect(), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new MayTapOrUntapAttachedEffect(), new GenericManaCost(3))); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), false)); } diff --git a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java index f1df57ec0ff..6cba8effd37 100644 --- a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java @@ -46,13 +46,13 @@ public final class SydriGalvanicGenius extends CardImpl { this.toughness = new MageInt(2); // {U}: Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SydriGalvanicGeniusEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new SydriGalvanicGeniusEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetPermanent(filterNonCreature)); this.addAbility(ability); // {W}{B}: Target artifact creature gains deathtouch and lifelink until end of turn. Effect effect = new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, "Target artifact creature gains deathtouch"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{B}")); + ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}{B}")); ability.addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, "and lifelink until end of turn")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java b/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java index cf3651929ec..ee980560b4f 100644 --- a/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java +++ b/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java @@ -33,7 +33,7 @@ public final class SyggRiverGuide extends CardImpl { // Islandwalk this.addAbility(new IslandwalkAbility()); // {1}{W}: Target Merfolk you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java b/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java index d812973f995..77e8efdad53 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java +++ b/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java @@ -34,7 +34,7 @@ public final class SylvanSafekeeper extends CardImpl { this.toughness = new MageInt(1); // Sacrifice a land: Target creature you control gains shroud until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SylvokReplica.java b/Mage.Sets/src/mage/cards/s/SylvokReplica.java index 5b985911ae6..b6f880c1531 100644 --- a/Mage.Sets/src/mage/cards/s/SylvokReplica.java +++ b/Mage.Sets/src/mage/cards/s/SylvokReplica.java @@ -30,7 +30,7 @@ public final class SylvokReplica extends CardImpl { this.toughness = new MageInt(3); // {G}, Sacrifice Sylvok Replica: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{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/s/SymbioticDeployment.java b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java index c55c98ab5d6..bae31e2a3b7 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java @@ -36,7 +36,7 @@ public final class SymbioticDeployment extends CardImpl { this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // {1}, Tap two untapped creatures you control: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SynodArtificer.java b/Mage.Sets/src/mage/cards/s/SynodArtificer.java index a73a1a1b414..02624f9da43 100644 --- a/Mage.Sets/src/mage/cards/s/SynodArtificer.java +++ b/Mage.Sets/src/mage/cards/s/SynodArtificer.java @@ -43,7 +43,7 @@ public final class SynodArtificer extends CardImpl { // {X}, {tap}: Tap X target noncreature artifacts. Effect tapEffect = new TapTargetEffect(); tapEffect.setText("Tap X target noncreature artifacts."); - Ability tapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, tapEffect, new ManaCostsImpl<>("{X}")); + Ability tapAbility = new SimpleActivatedAbility(tapEffect, new ManaCostsImpl<>("{X}")); tapAbility.addCost(new TapSourceCost()); tapAbility.addTarget(new TargetPermanent(filter)); tapAbility.setTargetAdjuster(new XTargetsCountAdjuster()); @@ -52,7 +52,7 @@ public final class SynodArtificer extends CardImpl { // {X}, {tap}: Untap X target noncreature artifacts. Effect untapEffect = new UntapTargetEffect(); untapEffect.setText("Untap X target noncreature artifacts."); - Ability untapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, untapEffect, new ManaCostsImpl<>("{X}")); + Ability untapAbility = new SimpleActivatedAbility(untapEffect, new ManaCostsImpl<>("{X}")); untapAbility.addCost(new TapSourceCost()); untapAbility.addTarget(new TargetPermanent(filter)); untapAbility.setTargetAdjuster(new XTargetsCountAdjuster()); diff --git a/Mage.Sets/src/mage/cards/s/SynodSanctum.java b/Mage.Sets/src/mage/cards/s/SynodSanctum.java index 8347bc49892..3f300841cdf 100644 --- a/Mage.Sets/src/mage/cards/s/SynodSanctum.java +++ b/Mage.Sets/src/mage/cards/s/SynodSanctum.java @@ -41,7 +41,7 @@ public final class SynodSanctum extends CardImpl { // {2}, {tap}: Exile target permanent you control. SynodSanctumEffect effect = new SynodSanctumEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); Target target = new TargetPermanent(filter); ability.addTarget(target); @@ -49,7 +49,7 @@ public final class SynodSanctum extends CardImpl { // {2}, Sacrifice Synod Sanctum: Return all cards exiled with Synod Sanctum to the battlefield under your control. SynodSanctumEffect2 effect2 = new SynodSanctumEffect2(); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect2, new ManaCostsImpl<>("{2}")); + Ability ability2 = new SimpleActivatedAbility(effect2, new ManaCostsImpl<>("{2}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); } -- 2.47.2 From 76d422b548bd0703b5ecf3c0fbc50958da958858 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:30:27 -0500 Subject: [PATCH 43/50] refactor: SimpleActivatedAbility default zone (cards T) --- Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java | 2 +- Mage.Sets/src/mage/cards/t/TalonOfPain.java | 2 +- Mage.Sets/src/mage/cards/t/Talonrend.java | 2 +- Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java | 2 +- Mage.Sets/src/mage/cards/t/TamiyosJournal.java | 2 +- Mage.Sets/src/mage/cards/t/TangleAngler.java | 4 ++-- Mage.Sets/src/mage/cards/t/TangleHulk.java | 2 +- Mage.Sets/src/mage/cards/t/Tanglebloom.java | 2 +- Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java | 2 +- Mage.Sets/src/mage/cards/t/TarPitcher.java | 2 +- Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java | 2 +- Mage.Sets/src/mage/cards/t/TatteredDrake.java | 2 +- Mage.Sets/src/mage/cards/t/TattermungeWitch.java | 2 +- Mage.Sets/src/mage/cards/t/TavernSwindler.java | 2 +- Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java | 2 +- Mage.Sets/src/mage/cards/t/TawnossCoffin.java | 2 +- Mage.Sets/src/mage/cards/t/TawnossWand.java | 2 +- Mage.Sets/src/mage/cards/t/TawnossWeaponry.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisCare.java | 4 ++-- Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java | 2 +- Mage.Sets/src/mage/cards/t/TelJiladExile.java | 2 +- Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java | 2 +- Mage.Sets/src/mage/cards/t/TelJiladStylus.java | 2 +- Mage.Sets/src/mage/cards/t/TelekineticSliver.java | 2 +- Mage.Sets/src/mage/cards/t/Telethopter.java | 2 +- Mage.Sets/src/mage/cards/t/TelimTorsDarts.java | 2 +- Mage.Sets/src/mage/cards/t/TempleBell.java | 2 +- Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java | 2 +- Mage.Sets/src/mage/cards/t/TemporalAdept.java | 2 +- Mage.Sets/src/mage/cards/t/TemporalAperture.java | 2 +- Mage.Sets/src/mage/cards/t/TemurBanner.java | 2 +- Mage.Sets/src/mage/cards/t/TemurSabertooth.java | 2 +- Mage.Sets/src/mage/cards/t/TerminalMoraine.java | 2 +- Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java | 2 +- Mage.Sets/src/mage/cards/t/ThalakosDrifters.java | 2 +- Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java | 2 +- Mage.Sets/src/mage/cards/t/ThalakosScout.java | 2 +- Mage.Sets/src/mage/cards/t/Thallid.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidDevourer.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidGerminator.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThallidOmnivore.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidShellDweller.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java | 2 +- Mage.Sets/src/mage/cards/t/ThassasIre.java | 2 +- Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java | 2 +- Mage.Sets/src/mage/cards/t/TheBigIdea.java | 4 ++-- Mage.Sets/src/mage/cards/t/TheBrute.java | 2 +- Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java | 2 +- Mage.Sets/src/mage/cards/t/TheDeathStar.java | 6 +++--- Mage.Sets/src/mage/cards/t/TheHive.java | 2 +- Mage.Sets/src/mage/cards/t/TheLocustGod.java | 2 +- Mage.Sets/src/mage/cards/t/TheScarabGod.java | 2 +- Mage.Sets/src/mage/cards/t/TheScorpionGod.java | 2 +- Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java | 2 +- Mage.Sets/src/mage/cards/t/TheloniteMonk.java | 2 +- Mage.Sets/src/mage/cards/t/ThermalDetonator.java | 2 +- Mage.Sets/src/mage/cards/t/ThermalNavigator.java | 2 +- Mage.Sets/src/mage/cards/t/Thermopod.java | 2 +- Mage.Sets/src/mage/cards/t/ThespiansStage.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThopterFoundry.java | 2 +- Mage.Sets/src/mage/cards/t/ThornThrashViashino.java | 2 +- Mage.Sets/src/mage/cards/t/ThornbiteStaff.java | 2 +- Mage.Sets/src/mage/cards/t/Thornling.java | 10 +++++----- Mage.Sets/src/mage/cards/t/ThornscapeMaster.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThornwindFaeries.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtCourier.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtDissector.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtLash.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java | 2 +- Mage.Sets/src/mage/cards/t/ThousandYearElixir.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenHeretic.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java | 2 +- Mage.Sets/src/mage/cards/t/ThranFoundry.java | 2 +- Mage.Sets/src/mage/cards/t/ThranWeaponry.java | 2 +- Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java | 2 +- Mage.Sets/src/mage/cards/t/ThrashingWumpus.java | 2 +- Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java | 2 +- Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java | 2 +- Mage.Sets/src/mage/cards/t/ThroneOfGeth.java | 2 +- Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullParasite.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullRetainer.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullWizard.java | 2 +- Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderWall.java | 2 +- Mage.Sets/src/mage/cards/t/ThundercloudElemental.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThunderingSpineback.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderstaff.java | 2 +- Mage.Sets/src/mage/cards/t/TickingGnomes.java | 2 +- Mage.Sets/src/mage/cards/t/TidalControl.java | 2 +- Mage.Sets/src/mage/cards/t/TidalCourier.java | 2 +- Mage.Sets/src/mage/cards/t/TidalFlats.java | 2 +- Mage.Sets/src/mage/cards/t/TidalVisionary.java | 2 +- Mage.Sets/src/mage/cards/t/TidalWarrior.java | 2 +- Mage.Sets/src/mage/cards/t/TidewaterMinion.java | 2 +- Mage.Sets/src/mage/cards/t/TimeBomb.java | 2 +- Mage.Sets/src/mage/cards/t/TimeElemental.java | 2 +- Mage.Sets/src/mage/cards/t/TimeSieve.java | 2 +- Mage.Sets/src/mage/cards/t/TimeVault.java | 2 +- Mage.Sets/src/mage/cards/t/TinStreetMarket.java | 2 +- Mage.Sets/src/mage/cards/t/TinWingChimera.java | 2 +- Mage.Sets/src/mage/cards/t/TirelessTribe.java | 2 +- Mage.Sets/src/mage/cards/t/TitanForge.java | 4 ++-- Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java | 2 +- Mage.Sets/src/mage/cards/t/TitaniumGolem.java | 2 +- Mage.Sets/src/mage/cards/t/TolarianSentinel.java | 2 +- Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java | 2 +- Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java | 2 +- Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java | 2 +- Mage.Sets/src/mage/cards/t/TombRobber.java | 4 ++-- Mage.Sets/src/mage/cards/t/TonicPeddler.java | 2 +- Mage.Sets/src/mage/cards/t/ToothAndClaw.java | 2 +- Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java | 2 +- Mage.Sets/src/mage/cards/t/TopanAscetic.java | 2 +- Mage.Sets/src/mage/cards/t/TorWauki.java | 2 +- Mage.Sets/src/mage/cards/t/TorchDrake.java | 2 +- Mage.Sets/src/mage/cards/t/TorchFiend.java | 2 +- Mage.Sets/src/mage/cards/t/TormodsCrypt.java | 2 +- Mage.Sets/src/mage/cards/t/TorturedExistence.java | 2 +- Mage.Sets/src/mage/cards/t/Touchstone.java | 2 +- Mage.Sets/src/mage/cards/t/TourachsGate.java | 2 +- Mage.Sets/src/mage/cards/t/TowerDrake.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfCalamities.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfChampions.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfCoireall.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfEons.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfFortunes.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java | 2 +- Mage.Sets/src/mage/cards/t/ToweringThunderfist.java | 2 +- Mage.Sets/src/mage/cards/t/TownGossipmonger.java | 4 ++-- Mage.Sets/src/mage/cards/t/ToxicNim.java | 2 +- Mage.Sets/src/mage/cards/t/Toymaker.java | 2 +- Mage.Sets/src/mage/cards/t/Tracker.java | 2 +- .../src/mage/cards/t/TradeFederationBattleship.java | 2 +- Mage.Sets/src/mage/cards/t/TradeRoutes.java | 4 ++-- Mage.Sets/src/mage/cards/t/TradewindRider.java | 2 +- Mage.Sets/src/mage/cards/t/TradingPost.java | 8 ++++---- Mage.Sets/src/mage/cards/t/TragicPoet.java | 2 +- Mage.Sets/src/mage/cards/t/TrainedPronghorn.java | 4 +--- Mage.Sets/src/mage/cards/t/TranquilGrove.java | 2 +- Mage.Sets/src/mage/cards/t/Transluminant.java | 2 +- Mage.Sets/src/mage/cards/t/TrapDigger.java | 4 ++-- Mage.Sets/src/mage/cards/t/TravelersAmulet.java | 2 +- Mage.Sets/src/mage/cards/t/TreasureCove.java | 2 +- Mage.Sets/src/mage/cards/t/TreasureMap.java | 2 +- Mage.Sets/src/mage/cards/t/TreasureTrove.java | 2 +- Mage.Sets/src/mage/cards/t/TreeOfPerdition.java | 2 +- Mage.Sets/src/mage/cards/t/TreeOfRedemption.java | 2 +- Mage.Sets/src/mage/cards/t/TreetopVillage.java | 2 +- Mage.Sets/src/mage/cards/t/TrenchWurm.java | 2 +- Mage.Sets/src/mage/cards/t/TrespasserIlVec.java | 2 +- Mage.Sets/src/mage/cards/t/TrestleTroll.java | 4 ++-- Mage.Sets/src/mage/cards/t/TriadOfFates.java | 6 +++--- Mage.Sets/src/mage/cards/t/TricksterMage.java | 2 +- Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfMending.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfRage.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfThought.java | 4 ++-- Mage.Sets/src/mage/cards/t/TripNoose.java | 2 +- Mage.Sets/src/mage/cards/t/Triskelavus.java | 2 +- Mage.Sets/src/mage/cards/t/Triskelion.java | 2 +- Mage.Sets/src/mage/cards/t/TrollAscetic.java | 2 +- Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java | 2 +- Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java | 2 +- Mage.Sets/src/mage/cards/t/TruefirePaladin.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java | 2 +- Mage.Sets/src/mage/cards/t/TsaboTavoc.java | 2 +- Mage.Sets/src/mage/cards/t/TuknirDeathlock.java | 2 +- Mage.Sets/src/mage/cards/t/TundraKavu.java | 2 +- Mage.Sets/src/mage/cards/t/TunnelerWurm.java | 2 +- Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java | 2 +- Mage.Sets/src/mage/cards/t/TwilightDrover.java | 2 +- Mage.Sets/src/mage/cards/t/TwistedAbomination.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java | 2 +- Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java | 2 +- Mage.Sets/src/mage/cards/t/TyrantsMachine.java | 2 +- Mage.Sets/src/mage/cards/t/Tyrranax.java | 2 +- 185 files changed, 217 insertions(+), 219 deletions(-) diff --git a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java index 75f9d3cf8e2..c32375af098 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java @@ -34,7 +34,7 @@ public final class TahngarthTalruumHero extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {1}{R}, {tap}: Tahngarth, Talruum Hero deals damage equal to its power to target creature. That creature deals damage equal to its power to Tahngarth. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageEachOtherEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TalonOfPain.java b/Mage.Sets/src/mage/cards/t/TalonOfPain.java index ecb6b7222c3..6582912bf66 100644 --- a/Mage.Sets/src/mage/cards/t/TalonOfPain.java +++ b/Mage.Sets/src/mage/cards/t/TalonOfPain.java @@ -43,7 +43,7 @@ public final class TalonOfPain extends CardImpl { this.addAbility(new TalonOfPainTriggeredAbility()); // {X}, {T}, Remove X charge counters from Talon of Pain: Talon of Pain deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addCost(new TalonOfPainRemoveVariableCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/Talonrend.java b/Mage.Sets/src/mage/cards/t/Talonrend.java index ad181db0e29..f60ea0daec0 100644 --- a/Mage.Sets/src/mage/cards/t/Talonrend.java +++ b/Mage.Sets/src/mage/cards/t/Talonrend.java @@ -27,7 +27,7 @@ public final class Talonrend extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } private Talonrend(final Talonrend card) { diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java index cfc3fe2ff6c..1aa5966421e 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java @@ -40,7 +40,7 @@ public final class TalonsOfFalkenrath extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{1}{R}: This creature gets +2/+0 until end of turn." this.addAbility(new SimpleStaticAbility( - new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")), + new GainAbilityAttachedEffect(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java index 8e5ac103922..d20fb32195a 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java +++ b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java @@ -35,7 +35,7 @@ public final class TamiyosJournal extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InvestigateEffect())); // {T}, Sacrifice three Clues: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(3, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TangleAngler.java b/Mage.Sets/src/mage/cards/t/TangleAngler.java index 312f301427c..718256eafe2 100644 --- a/Mage.Sets/src/mage/cards/t/TangleAngler.java +++ b/Mage.Sets/src/mage/cards/t/TangleAngler.java @@ -30,7 +30,7 @@ public final class TangleAngler extends CardImpl { this.toughness = new MageInt(5); this.addAbility(InfectAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -44,4 +44,4 @@ public final class TangleAngler extends CardImpl { return new TangleAngler(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TangleHulk.java b/Mage.Sets/src/mage/cards/t/TangleHulk.java index ad454f798a2..f3109ec61e1 100644 --- a/Mage.Sets/src/mage/cards/t/TangleHulk.java +++ b/Mage.Sets/src/mage/cards/t/TangleHulk.java @@ -25,7 +25,7 @@ public final class TangleHulk extends CardImpl { this.subtype.add(SubType.BEAST); this.power = new MageInt(5); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private TangleHulk(final TangleHulk card) { diff --git a/Mage.Sets/src/mage/cards/t/Tanglebloom.java b/Mage.Sets/src/mage/cards/t/Tanglebloom.java index 23d5531dc9d..2899d3bc902 100644 --- a/Mage.Sets/src/mage/cards/t/Tanglebloom.java +++ b/Mage.Sets/src/mage/cards/t/Tanglebloom.java @@ -20,7 +20,7 @@ public final class Tanglebloom extends CardImpl { public Tanglebloom(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, {tap}: You gain 1 life. diff --git a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java index 7ac373df9d8..4777b4073b6 100644 --- a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java +++ b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java @@ -36,7 +36,7 @@ public final class TangleclawWerewolf extends CardImpl { // {6}{G}: Transform Tangleclaw Werewolf. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{6}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{6}{G}"))); } private TangleclawWerewolf(final TangleclawWerewolf card) { diff --git a/Mage.Sets/src/mage/cards/t/TarPitcher.java b/Mage.Sets/src/mage/cards/t/TarPitcher.java index c2404286e2a..8ff666c8d9b 100644 --- a/Mage.Sets/src/mage/cards/t/TarPitcher.java +++ b/Mage.Sets/src/mage/cards/t/TarPitcher.java @@ -31,7 +31,7 @@ public final class TarPitcher extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // {tap}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java b/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java index f70585844be..2a11a1f5d54 100644 --- a/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java +++ b/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java @@ -37,7 +37,7 @@ public final class TarielReckonerOfSouls extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {T}: Choose a creature card at random from target opponent's graveyard. Put that card onto the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TarielReckonerOfSoulsEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TarielReckonerOfSoulsEffect(), new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TatteredDrake.java b/Mage.Sets/src/mage/cards/t/TatteredDrake.java index 2ec2a197dc4..6a61b8e79e5 100644 --- a/Mage.Sets/src/mage/cards/t/TatteredDrake.java +++ b/Mage.Sets/src/mage/cards/t/TatteredDrake.java @@ -28,7 +28,7 @@ public final class TatteredDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private TatteredDrake(final TatteredDrake card) { diff --git a/Mage.Sets/src/mage/cards/t/TattermungeWitch.java b/Mage.Sets/src/mage/cards/t/TattermungeWitch.java index 6983c456942..2f4b04af09f 100644 --- a/Mage.Sets/src/mage/cards/t/TattermungeWitch.java +++ b/Mage.Sets/src/mage/cards/t/TattermungeWitch.java @@ -38,7 +38,7 @@ public final class TattermungeWitch extends CardImpl { this.toughness = new MageInt(1); // {R}{G}: Each blocked creature gets +1/+0 and gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false).setText("each blocked creature gets +1/+0"), new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false).setText("each blocked creature gets +1/+0"), new ManaCostsImpl<>("{R}{G}")); ability.addEffect(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, filter, "and gains trample until end of turn")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TavernSwindler.java b/Mage.Sets/src/mage/cards/t/TavernSwindler.java index d25296f42cf..ecc0cca34e6 100644 --- a/Mage.Sets/src/mage/cards/t/TavernSwindler.java +++ b/Mage.Sets/src/mage/cards/t/TavernSwindler.java @@ -32,7 +32,7 @@ public final class TavernSwindler extends CardImpl { this.toughness = new MageInt(2); // {T}, Pay 3 life: Flip a coin. If you win the flip, you gain 6 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TavernSwindlerEffect(),new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TavernSwindlerEffect(),new TapSourceCost()); ability.addCost(new PayLifeCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java index 917dbb37304..edd6695ff7b 100644 --- a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java +++ b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java @@ -42,7 +42,7 @@ public final class TawnosUrzasApprentice extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {U}{R}, {T}: Copy target activated or triggered ability you control from an artifact source. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{U}{R}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{U}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetActivatedOrTriggeredAbility(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TawnossCoffin.java b/Mage.Sets/src/mage/cards/t/TawnossCoffin.java index 77c7ff63908..94133d3d2bd 100644 --- a/Mage.Sets/src/mage/cards/t/TawnossCoffin.java +++ b/Mage.Sets/src/mage/cards/t/TawnossCoffin.java @@ -45,7 +45,7 @@ public final class TawnossCoffin extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {3}, {T}: Exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TawnossCoffinEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TawnossCoffinEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TawnossWand.java b/Mage.Sets/src/mage/cards/t/TawnossWand.java index b7852d9e4d5..34c1271b4e8 100644 --- a/Mage.Sets/src/mage/cards/t/TawnossWand.java +++ b/Mage.Sets/src/mage/cards/t/TawnossWand.java @@ -32,7 +32,7 @@ public final class TawnossWand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}: Target creature with power 2 or less is unblockable this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java b/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java index 1ca1009206a..03844f94748 100644 --- a/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java +++ b/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java @@ -29,7 +29,7 @@ public final class TawnossWeaponry extends CardImpl { // You may choose not to untap Tawnos's Weaponry during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: Target creature gets +1/+1 for as long as Tawnos's Weaponry remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(1, 1, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +1/+1 for as long as {this} remains tapped"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TeferisCare.java b/Mage.Sets/src/mage/cards/t/TeferisCare.java index 1cd6a9ae295..deca4044a2a 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisCare.java +++ b/Mage.Sets/src/mage/cards/t/TeferisCare.java @@ -37,12 +37,12 @@ public final class TeferisCare extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); // {W}, Sacrifice an enchantment: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); // {3}{U}{U}: Counter target enchantment spell. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{3}{U}{U}")); + ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{3}{U}{U}")); ability.addTarget(new TargetSpell(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java b/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java index ac64fb97e06..5784d065779 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java +++ b/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java @@ -30,7 +30,7 @@ public final class TeferisHonorGuard extends CardImpl { this.addAbility(new FlankingAbility()); // {U}{U}: Teferi's Honor Guard phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutSourceEffect(), new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new PhaseOutSourceEffect(), new ManaCostsImpl<>("{U}{U}"))); } private TeferisHonorGuard(final TeferisHonorGuard card) { diff --git a/Mage.Sets/src/mage/cards/t/TelJiladExile.java b/Mage.Sets/src/mage/cards/t/TelJiladExile.java index 6b4b514608b..039d5e13985 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladExile.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladExile.java @@ -25,7 +25,7 @@ public final class TelJiladExile extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private TelJiladExile(final TelJiladExile card) { diff --git a/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java b/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java index f3b1689ffd2..7f4b12d97c0 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java @@ -38,7 +38,7 @@ public final class TelJiladLifebreather extends CardImpl { this.toughness = new MageInt(2); // {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/t/TelJiladStylus.java b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java index bd321df4704..732fa282866 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladStylus.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java @@ -32,7 +32,7 @@ public final class TelJiladStylus extends CardImpl { // {T}: Put target permanent you own on the bottom of your library. Effect effect = new PutOnLibraryTargetEffect(false,"put target permanent you own on the bottom of your library"); - 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/t/TelekineticSliver.java b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java index ae8a0ed07d4..e2c106c1647 100644 --- a/Mage.Sets/src/mage/cards/t/TelekineticSliver.java +++ b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java @@ -33,7 +33,7 @@ public final class TelekineticSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{T}: Tap target permanent." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Tap target permanent.\""))); diff --git a/Mage.Sets/src/mage/cards/t/Telethopter.java b/Mage.Sets/src/mage/cards/t/Telethopter.java index 3ab16844e89..14ffaeed362 100644 --- a/Mage.Sets/src/mage/cards/t/Telethopter.java +++ b/Mage.Sets/src/mage/cards/t/Telethopter.java @@ -33,7 +33,7 @@ public final class Telethopter extends CardImpl { this.subtype.add(SubType.THOPTER); this.power = new MageInt(3); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); } private Telethopter(final Telethopter card) { diff --git a/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java b/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java index e72667da0ae..6f4b003ab42 100644 --- a/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java +++ b/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java @@ -23,7 +23,7 @@ public final class TelimTorsDarts extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {tap}: Telim'Tor's Darts deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TempleBell.java b/Mage.Sets/src/mage/cards/t/TempleBell.java index 5bc10f0ecca..fb68fc72beb 100644 --- a/Mage.Sets/src/mage/cards/t/TempleBell.java +++ b/Mage.Sets/src/mage/cards/t/TempleBell.java @@ -19,7 +19,7 @@ public final class TempleBell extends CardImpl { public TempleBell(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardAllEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardAllEffect(1), new TapSourceCost())); } private TempleBell(final TempleBell card) { diff --git a/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java b/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java index de71f820e1a..9493630ae49 100644 --- a/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java +++ b/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java @@ -36,7 +36,7 @@ public final class TempleOfAclazotz extends CardImpl { this.addAbility(new BlackManaAbility()); // {T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TempleOfAclazotzEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TempleOfAclazotzEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TemporalAdept.java b/Mage.Sets/src/mage/cards/t/TemporalAdept.java index eaad47f7944..5e48965c6af 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalAdept.java +++ b/Mage.Sets/src/mage/cards/t/TemporalAdept.java @@ -30,7 +30,7 @@ public final class TemporalAdept extends CardImpl { this.toughness = new MageInt(1); // {U}{U}{U}, {tap}: Return target permanent to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TemporalAperture.java b/Mage.Sets/src/mage/cards/t/TemporalAperture.java index 9aa9db3d216..466aef04ed3 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalAperture.java +++ b/Mage.Sets/src/mage/cards/t/TemporalAperture.java @@ -23,7 +23,7 @@ public final class TemporalAperture extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {5}, {tap}: Shuffle your library, then reveal the top card. Until end of turn, for as long as that card remains on top of your library, play with the top card of your library revealed and you may play that card without paying its mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TemporalApertureEffect(), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new TemporalApertureEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TemurBanner.java b/Mage.Sets/src/mage/cards/t/TemurBanner.java index 2ba92e8d333..0875be98c31 100644 --- a/Mage.Sets/src/mage/cards/t/TemurBanner.java +++ b/Mage.Sets/src/mage/cards/t/TemurBanner.java @@ -31,7 +31,7 @@ public final class TemurBanner extends CardImpl { this.addAbility(new RedManaAbility()); // {G}{U}{R}, {T}, Sacrifice Temur Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java index 7501dabf80d..8ecd953d200 100644 --- a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java +++ b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java @@ -35,7 +35,7 @@ public final class TemurSabertooth extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: You may return another creature you control to its owner's hand. If you do, Temur Sabertooth gains indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TemurSabertoothEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TemurSabertoothEffect(), new ManaCostsImpl<>("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TerminalMoraine.java b/Mage.Sets/src/mage/cards/t/TerminalMoraine.java index d03b0e8c786..36eda28a3ce 100644 --- a/Mage.Sets/src/mage/cards/t/TerminalMoraine.java +++ b/Mage.Sets/src/mage/cards/t/TerminalMoraine.java @@ -29,7 +29,7 @@ public final class TerminalMoraine extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}, Sacrifice Terminal Moraine: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java index b829a581764..9442bcb7522 100644 --- a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java @@ -49,7 +49,7 @@ public final class TetsuoUmezawa extends CardImpl { // Tetsuo Umezawa can't be the target of Aura spells. this.addAbility(new SimpleStaticAbility(new TetsuoUmezawaEffect())); // {U}{B}{B}{R}, {tap}: Destroy target tapped or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(creatureFilter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java b/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java index bc609f1db7a..5a7e9d5a4a5 100644 --- a/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java +++ b/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java @@ -27,7 +27,7 @@ public final class ThalakosDrifters extends CardImpl { this.toughness = new MageInt(3); // Discard a card: Thalakos Drifters gains shadow until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); } private ThalakosDrifters(final ThalakosDrifters card) { diff --git a/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java b/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java index f1391609d95..35681d86fd9 100644 --- a/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java +++ b/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java @@ -29,7 +29,7 @@ public final class ThalakosMistfolk extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {U}: Put Thalakos Mistfolk on top of its owner's library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); } private ThalakosMistfolk(final ThalakosMistfolk card) { diff --git a/Mage.Sets/src/mage/cards/t/ThalakosScout.java b/Mage.Sets/src/mage/cards/t/ThalakosScout.java index 9aeaf594739..9ec0672a307 100644 --- a/Mage.Sets/src/mage/cards/t/ThalakosScout.java +++ b/Mage.Sets/src/mage/cards/t/ThalakosScout.java @@ -31,7 +31,7 @@ public final class ThalakosScout extends CardImpl { this.addAbility(ShadowAbility.getInstance()); // Discard a card: Return Thalakos Scout to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(), new DiscardCardCost())); } private ThalakosScout(final ThalakosScout card) { diff --git a/Mage.Sets/src/mage/cards/t/Thallid.java b/Mage.Sets/src/mage/cards/t/Thallid.java index df0de583db2..b97f2812040 100644 --- a/Mage.Sets/src/mage/cards/t/Thallid.java +++ b/Mage.Sets/src/mage/cards/t/Thallid.java @@ -32,7 +32,7 @@ public final class Thallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid: 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)))); } private Thallid(final Thallid card) { diff --git a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java index 1fd22ee89e6..511c7281d1d 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java @@ -38,7 +38,7 @@ public final class ThallidDevourer extends CardImpl { new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Thallid Devourer gets +1/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/t/ThallidGerminator.java b/Mage.Sets/src/mage/cards/t/ThallidGerminator.java index 91717bbaa19..2cbce350896 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidGerminator.java +++ b/Mage.Sets/src/mage/cards/t/ThallidGerminator.java @@ -37,9 +37,9 @@ public final class ThallidGerminator extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Germinator. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid Germinator: 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: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java b/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java index e78af6483d6..5c5abbd526c 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java +++ b/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java @@ -40,7 +40,7 @@ public final class ThallidOmnivore extends CardImpl { // {1}, Sacrifice another creature: Thallid Omnivore gets +2/+2 until end of turn. If a saproling was sacrificed in this way you gain 2 life. Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); ability.addEffect(new ThallidOmnivoreEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java b/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java index 7a70799488b..b740bbb49e1 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java +++ b/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java @@ -35,7 +35,7 @@ public final class ThallidShellDweller extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Shell-Dweller. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid Shell-Dweller: 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)))); } diff --git a/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java b/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java index 7ff2cd5a366..deeeeed60c2 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java @@ -29,7 +29,7 @@ public final class ThallidSoothsayer extends CardImpl { this.toughness = new MageInt(3); // {2}, Sacrifice a creature: Draw a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThassasIre.java b/Mage.Sets/src/mage/cards/t/ThassasIre.java index fa55fde68cc..f464218acb1 100644 --- a/Mage.Sets/src/mage/cards/t/ThassasIre.java +++ b/Mage.Sets/src/mage/cards/t/ThassasIre.java @@ -23,7 +23,7 @@ public final class ThassasIre extends CardImpl { // {3}{U}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java index ee74d061c54..88a616a5cac 100644 --- a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java @@ -43,7 +43,7 @@ public final class ThatWhichWasTaken extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {4}, {T}: Put a divinity counter on target permanent other than That Which Was Taken. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheBigIdea.java b/Mage.Sets/src/mage/cards/t/TheBigIdea.java index b9f1108f14e..cdcf4333958 100644 --- a/Mage.Sets/src/mage/cards/t/TheBigIdea.java +++ b/Mage.Sets/src/mage/cards/t/TheBigIdea.java @@ -43,12 +43,12 @@ public final class TheBigIdea extends CardImpl { this.toughness = new MageInt(4); // {2}{B/R}{B/R}, {T}: Roll a six-sided dice. Create a number of 1/1 red Brainiac creature tokens equal to the result. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TheBigIdeaEffect(), new ManaCostsImpl<>("{2}{B/R}{B/R}")); + Ability ability = new SimpleActivatedAbility(new TheBigIdeaEffect(), new ManaCostsImpl<>("{2}{B/R}{B/R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // Tap three untapped Brainiacs you control: The next time you would roll a six-sided die, instead roll two six-sided dice and use the total of those results. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TheBigIdeaReplacementEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new TheBigIdeaReplacementEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true)))); } private TheBigIdea(final TheBigIdea card) { diff --git a/Mage.Sets/src/mage/cards/t/TheBrute.java b/Mage.Sets/src/mage/cards/t/TheBrute.java index 58e57434fb7..77ab08d36be 100644 --- a/Mage.Sets/src/mage/cards/t/TheBrute.java +++ b/Mage.Sets/src/mage/cards/t/TheBrute.java @@ -39,7 +39,7 @@ public final class TheBrute extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0))); // {R}{R}{R}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{R}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{R}{R}{R}"))); } private TheBrute(final TheBrute card) { diff --git a/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java b/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java index 61bb6999cdc..f901e56682b 100644 --- a/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java +++ b/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java @@ -56,7 +56,7 @@ public final class TheCinematicPhoenix extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {1}, {T}: Return target legendary creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheDeathStar.java b/Mage.Sets/src/mage/cards/t/TheDeathStar.java index 94ef47dee24..1c06d6016ed 100644 --- a/Mage.Sets/src/mage/cards/t/TheDeathStar.java +++ b/Mage.Sets/src/mage/cards/t/TheDeathStar.java @@ -35,12 +35,12 @@ public final class TheDeathStar extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2},{T}: Put a charge counter on The Death Star. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {T}, Remove three charge counters from The Death Star: Destroy target permanent. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); @@ -48,7 +48,7 @@ public final class TheDeathStar extends CardImpl { // {T}, Remove ten charge counters from The Death Star: Destroy target player. Effect effect = new LoseGameTargetPlayerEffect(); effect.setText("Destroy target player"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(10))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheHive.java b/Mage.Sets/src/mage/cards/t/TheHive.java index f1b1e0ae208..97427dc332d 100644 --- a/Mage.Sets/src/mage/cards/t/TheHive.java +++ b/Mage.Sets/src/mage/cards/t/TheHive.java @@ -23,7 +23,7 @@ public final class TheHive extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {5}, {T}: Create a 1/1 colorless Insect artifact creature token with flying named Wasp. (It can’t be blocked except by creatures with flying or reach.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WaspToken(), 1), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new WaspToken(), 1), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TheLocustGod.java b/Mage.Sets/src/mage/cards/t/TheLocustGod.java index e78dd25ed1e..f1d0f8526c1 100644 --- a/Mage.Sets/src/mage/cards/t/TheLocustGod.java +++ b/Mage.Sets/src/mage/cards/t/TheLocustGod.java @@ -48,7 +48,7 @@ public final class TheLocustGod extends CardImpl { this.addAbility(new DrawCardControllerTriggeredAbility(new CreateTokenEffect(new TheLocustGodInsectToken(), 1, false, false), false)); // {2}{U}{R}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}{R}")); this.addAbility(ability); // When The Locust God dies, return it to its owner's hand at the beginning of the next end step. diff --git a/Mage.Sets/src/mage/cards/t/TheScarabGod.java b/Mage.Sets/src/mage/cards/t/TheScarabGod.java index 014b5e2b01d..8e2ec515794 100644 --- a/Mage.Sets/src/mage/cards/t/TheScarabGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScarabGod.java @@ -54,7 +54,7 @@ public final class TheScarabGod extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TheScarabGodEffect(xValue)).addHint(hint)); // {2}{U}{B}: Exile target creature card from a graveyard. Create a token that's a copy of it, except it's a 4/4 black Zombie. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TheScarabGodEffect2(), new ManaCostsImpl<>("{2}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new TheScarabGodEffect2(), new ManaCostsImpl<>("{2}{U}{B}")); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java index 58d83b6ae41..632c9a2b0cb 100644 --- a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java @@ -49,7 +49,7 @@ public final class TheScorpionGod extends CardImpl { this.addAbility(new TheScorpionGodTriggeredAbility()); // {1}{B}{R}: Put a -1/-1 counter on another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{1}{B}{R}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{1}{B}{R}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java index a920c320c8c..530cc23cdbc 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java +++ b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java @@ -46,7 +46,7 @@ public final class ThelonOfHavenwood extends CardImpl { this.addAbility(new SimpleStaticAbility(new ThelonOfHavenwoodBoostEffect())); // {B}{G}, Exile a Fungus card from a graveyard: Put a spore counter on each Fungus on the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.SPORE.createInstance(), filterPermanent), new ManaCostsImpl<>("{B}{G}")); + Ability ability = new SimpleActivatedAbility(new AddCountersAllEffect(CounterType.SPORE.createInstance(), filterPermanent), new ManaCostsImpl<>("{B}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInASingleGraveyard(1, 1, filterCard), "exile a Fungus card from a graveyard")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TheloniteMonk.java b/Mage.Sets/src/mage/cards/t/TheloniteMonk.java index bd5cd2bb8ea..5d2a69785ce 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteMonk.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteMonk.java @@ -42,7 +42,7 @@ public final class TheloniteMonk extends CardImpl { this.toughness = new MageInt(2); // {tap}, Sacrifice a green creature: Target land becomes a Forest. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield, SubType.FOREST), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield, SubType.FOREST), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThermalDetonator.java b/Mage.Sets/src/mage/cards/t/ThermalDetonator.java index 090982519b2..fb259b601d0 100644 --- a/Mage.Sets/src/mage/cards/t/ThermalDetonator.java +++ b/Mage.Sets/src/mage/cards/t/ThermalDetonator.java @@ -34,7 +34,7 @@ public final class ThermalDetonator extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {2}, Sacrifice Thermal Detonator: Thermal Detonator deals 2 damage to target creature without spaceflight or target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThermalNavigator.java b/Mage.Sets/src/mage/cards/t/ThermalNavigator.java index 5bceb752496..d6572ebb373 100644 --- a/Mage.Sets/src/mage/cards/t/ThermalNavigator.java +++ b/Mage.Sets/src/mage/cards/t/ThermalNavigator.java @@ -31,7 +31,7 @@ public final class ThermalNavigator extends CardImpl { this.toughness = new MageInt(2); // Sacrifice an artifact: Thermal Navigator gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT))); } private ThermalNavigator(final ThermalNavigator card) { diff --git a/Mage.Sets/src/mage/cards/t/Thermopod.java b/Mage.Sets/src/mage/cards/t/Thermopod.java index 17495120422..b76fef80577 100644 --- a/Mage.Sets/src/mage/cards/t/Thermopod.java +++ b/Mage.Sets/src/mage/cards/t/Thermopod.java @@ -36,7 +36,7 @@ public final class Thermopod extends CardImpl { this.toughness = new MageInt(3); // {S}: Thermopod gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); // Sacrifice a creature: Add {R}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.RedMana(1), CreaturesYouControlCount.instance), diff --git a/Mage.Sets/src/mage/cards/t/ThespiansStage.java b/Mage.Sets/src/mage/cards/t/ThespiansStage.java index eebcf0ce6aa..8b81e62a8b2 100644 --- a/Mage.Sets/src/mage/cards/t/ThespiansStage.java +++ b/Mage.Sets/src/mage/cards/t/ThespiansStage.java @@ -31,7 +31,7 @@ public final class ThespiansStage extends CardImpl { this.addAbility(new ColorlessManaAbility()); // 2, {T}: Thespian's Stage becomes a copy of target land, except it has this ability. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ThespiansStageCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); @@ -70,7 +70,7 @@ class ThespiansStageCopyEffect extends OneShotEffect { Permanent copyFromPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (sourcePermanent != null && copyFromPermanent != null) { Permanent newPermanent = game.copyPermanent(copyFromPermanent, sourcePermanent.getId(), source, new EmptyCopyApplier()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ThespiansStageCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); newPermanent.addAbility(ability, source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java index faad63ac16a..ba04ba644db 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java +++ b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java @@ -34,7 +34,7 @@ public final class ThopterFoundry extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{W/B}{U}"); // {1}, Sacrifice a nontoken artifact: Create a 1/1 blue Thopter artifact creature token with flying. You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ThopterToken()), new GenericManaCost(1)); ability.addEffect(new GainLifeEffect(1)); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java b/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java index efb225e9090..6cc3e3d0916 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java +++ b/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java @@ -34,7 +34,7 @@ public final class ThornThrashViashino extends CardImpl { this.addAbility(new DevourAbility(2)); // {G}: Thorn-Thrash Viashino gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl<>("{G}"))); } private ThornThrashViashino(final ThornThrashViashino card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java index 2c93014a1d3..5c37dd7284d 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java @@ -36,7 +36,7 @@ public final class ThornbiteStaff extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{2}, {T}: This creature deals 1 damage to any target" and "Whenever a creature dies, untap this creature." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); + Ability gainedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(2)); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); diff --git a/Mage.Sets/src/mage/cards/t/Thornling.java b/Mage.Sets/src/mage/cards/t/Thornling.java index 94b65e2a2b0..197a6340e1a 100644 --- a/Mage.Sets/src/mage/cards/t/Thornling.java +++ b/Mage.Sets/src/mage/cards/t/Thornling.java @@ -32,11 +32,11 @@ public final class Thornling extends CardImpl { this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private Thornling(final Thornling card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java b/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java index 0d339ea3cbf..fe3b0479429 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java @@ -33,14 +33,14 @@ public final class ThornscapeMaster extends CardImpl { this.toughness = new MageInt(2); // {R}{R}, {T}: Thornscape Master deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {W}{W}, {T}: Target creature gains protection from the color of your choice until end of turn. Effect effect = new GainProtectionFromColorTargetEffect(Duration.EndOfTurn); effect.setText("Target creature gains protection from the color of your choice until end of turn."); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{W}")); + ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java index 46c4787ba0a..d58dc82fbb3 100644 --- a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java +++ b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java @@ -31,7 +31,7 @@ public final class ThornwindFaeries extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Thornwind Faeries 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/t/ThoughtCourier.java b/Mage.Sets/src/mage/cards/t/ThoughtCourier.java index ce9405cb62b..60be3a33476 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtCourier.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtCourier.java @@ -27,7 +27,7 @@ public final class ThoughtCourier extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); } private ThoughtCourier(final ThoughtCourier card) { diff --git a/Mage.Sets/src/mage/cards/t/ThoughtDissector.java b/Mage.Sets/src/mage/cards/t/ThoughtDissector.java index be534090e70..fab3867ec31 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtDissector.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtDissector.java @@ -31,7 +31,7 @@ public final class ThoughtDissector extends CardImpl { // {X}, {tap}: Target opponent reveals cards from the top of their library until an artifact card or X cards are revealed, whichever comes first. If an artifact card is revealed this way, put it onto the battlefield under your control and sacrifice Thought Dissector. Put the rest of the revealed cards into that player's graveyard. - SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThoughtDissectorEffect(), new VariableManaCost(VariableCostType.NORMAL)); + SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(new ThoughtDissectorEffect(), new VariableManaCost(VariableCostType.NORMAL)); abilitiy.addCost(new TapSourceCost()); abilitiy.addTarget(new TargetOpponent()); this.addAbility(abilitiy); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtLash.java b/Mage.Sets/src/mage/cards/t/ThoughtLash.java index 810cda64846..6b77d009303 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtLash.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtLash.java @@ -38,7 +38,7 @@ public final class ThoughtLash extends CardImpl { this.addAbility(new ThoughtLashTriggeredAbility()); // Exile the top card of your library: Prevent the next 1 damage that would be dealt to you this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new ExileFromTopOfLibraryCost(1))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new ExileFromTopOfLibraryCost(1))); } private ThoughtLash(final ThoughtLash card) { diff --git a/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java b/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java index 2cc35a22529..4e3f8ec2f6f 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java @@ -33,7 +33,7 @@ public final class ThoughtcutterAgent extends CardImpl { this.toughness = new MageInt(1); // {U}{B}, {tap}: Target player loses 1 life and reveals their hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); Effect revealEffect = new RevealHandTargetEffect(TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java b/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java index 22a1b132b78..8f5d89c63e2 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java @@ -41,7 +41,7 @@ public final class ThoughtpickerWitch extends CardImpl { this.toughness = new MageInt(1); // {1}, Sacrifice a creature: Look at the top two cards of target opponent's library, then exile one of them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThoughtpickerWitchEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ThoughtpickerWitchEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java index 7e6e3081339..d8ed2a26c9b 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java +++ b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java @@ -33,7 +33,7 @@ public final class ThousandYearElixir extends CardImpl { this.addAbility(new SimpleStaticAbility(new ThousandYearElixirEffect())); // {1}, {tap}: Untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java index 4c2ed207216..52acdd3f2a4 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java @@ -32,7 +32,7 @@ public final class ThrabenDoomsayer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Create a 1/1 white Human creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new HumanToken()), new TapSourceCost())); // Fateful hour - As long as you have 5 or less life, other creatures you control get +2/+2. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control get +2/+2"))); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java b/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java index d2861c441bc..58d9fdb799e 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java @@ -33,7 +33,7 @@ public final class ThrabenGargoyle extends CardImpl { // {6}: Transform Thraben Gargoyle. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new GenericManaCost(6))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new GenericManaCost(6))); } private ThrabenGargoyle(final ThrabenGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java b/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java index eb2fb56b274..ba7735e0545 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java @@ -31,7 +31,7 @@ public final class ThrabenHeretic extends CardImpl { this.toughness = new MageInt(2); // {tap}: Exile target creature card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java b/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java index a4e4c820460..b0915e152b8 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java @@ -30,7 +30,7 @@ public final class ThrabenStandardBearer extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {T}, Discard a card: Create a 1/1 white Human Soldier creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanSoldierToken()), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new HumanSoldierToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThranFoundry.java b/Mage.Sets/src/mage/cards/t/ThranFoundry.java index 5ca5f4cc0c6..2084f428558 100644 --- a/Mage.Sets/src/mage/cards/t/ThranFoundry.java +++ b/Mage.Sets/src/mage/cards/t/ThranFoundry.java @@ -28,7 +28,7 @@ public final class ThranFoundry extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, {tap}, Exile Thran Foundry: Target player shuffles their graveyard into their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThranFoundryEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ThranFoundryEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/t/ThranWeaponry.java b/Mage.Sets/src/mage/cards/t/ThranWeaponry.java index 43e17445d60..cafc735c331 100644 --- a/Mage.Sets/src/mage/cards/t/ThranWeaponry.java +++ b/Mage.Sets/src/mage/cards/t/ThranWeaponry.java @@ -32,7 +32,7 @@ public final class ThranWeaponry extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: All creatures get +2/+2 for as long as Thran Weaponry remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThranWeaponryEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new ThranWeaponryEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java b/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java index ab2e9984abc..c3485c9f453 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java @@ -29,7 +29,7 @@ public final class ThrashingBrontodon extends CardImpl { this.toughness = new MageInt(4); // {1}, Sacrifice Thrashing Brontodon: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); 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/t/ThrashingWumpus.java b/Mage.Sets/src/mage/cards/t/ThrashingWumpus.java index c55288ed663..d3e8605c4a4 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingWumpus.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingWumpus.java @@ -26,7 +26,7 @@ public final class ThrashingWumpus extends CardImpl { this.toughness = new MageInt(3); // {B}: Thrashing Wumpus deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}"))); } private ThrashingWumpus(final ThrashingWumpus card) { diff --git a/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java b/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java index b411f5be1c1..ec664312fde 100644 --- a/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java +++ b/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java @@ -32,7 +32,7 @@ public final class ThrissNantukoPrimus extends CardImpl { this.toughness = new MageInt(5); //G}, {T}: Target creature gets +5/+5 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(5, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(5, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java index 103cc7baa9d..714fde0f1da 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java @@ -26,7 +26,7 @@ public final class ThroneOfEmpires extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {1}, {tap}: Create a 1/1 white Soldier creature token. Create five of those tokens instead if you control artifacts named Crown of Empires and Scepter of Empires. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThroneOfEmpiresEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ThroneOfEmpiresEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java b/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java index 4d9e74d896b..1b937f44954 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java @@ -30,7 +30,7 @@ public final class ThroneOfGeth extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {T}, Sacrifice an artifact: Proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ProliferateEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java b/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java index 4e910500e6c..7d6d5422fdb 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java @@ -28,7 +28,7 @@ public final class ThroneOfTheHighCity extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}, {T}, Sacrifice Throne of the High City: You become the monarch. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesMonarchSourceEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new BecomesMonarchSourceEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addHint(MonarchHint.instance); diff --git a/Mage.Sets/src/mage/cards/t/ThrullParasite.java b/Mage.Sets/src/mage/cards/t/ThrullParasite.java index 75a8c6440a9..f2df82afe19 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullParasite.java +++ b/Mage.Sets/src/mage/cards/t/ThrullParasite.java @@ -33,7 +33,7 @@ public final class ThrullParasite extends CardImpl { this.addAbility(new ExtortAbility()); // {tap}, Pay 2 life: Remove a counter from target nonland permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RemoveCounterTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetNonlandPermanent()); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java index 871bad88ec6..45bc681a136 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java +++ b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java @@ -40,7 +40,7 @@ public final class ThrullRetainer extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice Thrull Retainer: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } private ThrullRetainer(final ThrullRetainer card) { diff --git a/Mage.Sets/src/mage/cards/t/ThrullWizard.java b/Mage.Sets/src/mage/cards/t/ThrullWizard.java index 3670181f233..499d2690adf 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullWizard.java +++ b/Mage.Sets/src/mage/cards/t/ThrullWizard.java @@ -41,7 +41,7 @@ public final class ThrullWizard extends CardImpl { // {1}{B}: Counter target black spell unless that spell's controller pays {B} or {3}. Cost cost = new OrCost("pay {B} or pay {3}", new ColoredManaCost(ColoredManaSymbol.B), new GenericManaCost(3)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(cost), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(cost), new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java b/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java index 9f2d42a9096..bbc0136b758 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java +++ b/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java @@ -33,7 +33,7 @@ public final class ThrunTheLastTroll extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new CantBeCounteredSourceEffect())); this.addAbility(HexproofAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private ThrunTheLastTroll(final ThrunTheLastTroll card) { diff --git a/Mage.Sets/src/mage/cards/t/ThunderWall.java b/Mage.Sets/src/mage/cards/t/ThunderWall.java index 70a03029913..1dee1d77e4f 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderWall.java +++ b/Mage.Sets/src/mage/cards/t/ThunderWall.java @@ -34,7 +34,7 @@ public final class ThunderWall extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: Thunder Wall gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private ThunderWall(final ThunderWall card) { diff --git a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java index f483a192bb8..2f78d312a8b 100644 --- a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java +++ b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java @@ -44,12 +44,12 @@ public final class ThundercloudElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{U}: Tap all creatures with toughness 2 or less. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(toughnessFilter), new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(new TapAllEffect(toughnessFilter), new ManaCostsImpl<>("{3}{U}"))); // {3}{U}: All other creatures lose flying until end of turn. Effect effect = new LoseAbilityAllEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, flyingFilter); effect.setText("All other creatures lose flying until end of turn"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java index caaf6938cb5..ce78a14e030 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java +++ b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java @@ -40,7 +40,7 @@ public final class ThunderingSpineback extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {5}{G}: Create a 3/3 green Dinosaur creature token with trample. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DinosaurToken()), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new DinosaurToken()), new ManaCostsImpl<>("{5}{G}"))); } private ThunderingSpineback(final ThunderingSpineback card) { diff --git a/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java b/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java index 7560846d9f4..619bedb7493 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java @@ -30,12 +30,12 @@ public final class ThunderscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}, {tap}: Target creature gets +1/+1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); + ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java b/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java index 0a4f7b762c5..8c83dfdbfae 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java +++ b/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java @@ -33,13 +33,13 @@ public final class ThunderscapeMaster extends CardImpl { this.toughness = new MageInt(2); // {B}{B}, {tap}: Target player loses 2 life and you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); ability.addEffect(new GainLifeEffect(2).setText("and you gain 2 life")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}{G}, {tap}: Creatures you control get +2/+2 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}")); + ability = new SimpleActivatedAbility(new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java b/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java index 952c68ece15..8ee969e90ea 100644 --- a/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java +++ b/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java @@ -29,7 +29,7 @@ public final class ThundersongTrumpeter extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature can't attack or block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantAttackBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/Thunderstaff.java b/Mage.Sets/src/mage/cards/t/Thunderstaff.java index cf9535a1f13..fd1d79ce090 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderstaff.java +++ b/Mage.Sets/src/mage/cards/t/Thunderstaff.java @@ -31,7 +31,7 @@ public final class Thunderstaff extends CardImpl { // As long as Thunderstaff is untapped, if a creature would deal combat damage to you, prevent 1 of that damage. this.addAbility(new SimpleStaticAbility(new ThunderstaffPreventionEffect())); // {2}, {tap}: Attacking creatures get +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,0,Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1,0,Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TickingGnomes.java b/Mage.Sets/src/mage/cards/t/TickingGnomes.java index e9cd153a227..cb682f0c0bf 100644 --- a/Mage.Sets/src/mage/cards/t/TickingGnomes.java +++ b/Mage.Sets/src/mage/cards/t/TickingGnomes.java @@ -31,7 +31,7 @@ public final class TickingGnomes extends CardImpl { // Echo {3} this.addAbility(new EchoAbility("{3}")); // Sacrifice Ticking Gnomes: Ticking Gnomes deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TidalControl.java b/Mage.Sets/src/mage/cards/t/TidalControl.java index 0ca2a356d47..088b7e406bf 100644 --- a/Mage.Sets/src/mage/cards/t/TidalControl.java +++ b/Mage.Sets/src/mage/cards/t/TidalControl.java @@ -37,7 +37,7 @@ public final class TidalControl extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // Pay 2 life or {2}: Counter target red or green spell. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new OrCost("pay 2 life or pay {2}", new PayLifeCost(2), new ManaCostsImpl<>("{2}"))); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CounterTargetEffect(), new OrCost("pay 2 life or pay {2}", new PayLifeCost(2), new ManaCostsImpl<>("{2}"))); ability.addTarget(new TargetSpell(filter)); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/t/TidalCourier.java b/Mage.Sets/src/mage/cards/t/TidalCourier.java index 70cf4cda5c4..74eec951d18 100644 --- a/Mage.Sets/src/mage/cards/t/TidalCourier.java +++ b/Mage.Sets/src/mage/cards/t/TidalCourier.java @@ -38,7 +38,7 @@ public final class TidalCourier extends CardImpl { // When Tidal Courier enters the battlefield, reveal the top four cards of your library. Put all Merfolk cards revealed this way into your hand and the rest on the bottom of your library in any order. this.addAbility(new EntersBattlefieldTriggeredAbility(new RevealLibraryPutIntoHandEffect(4, filter, Zone.LIBRARY))); // {3}{U}: Tidal Courier gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TidalFlats.java b/Mage.Sets/src/mage/cards/t/TidalFlats.java index 03d9bcb9c78..ab667efc71b 100644 --- a/Mage.Sets/src/mage/cards/t/TidalFlats.java +++ b/Mage.Sets/src/mage/cards/t/TidalFlats.java @@ -38,7 +38,7 @@ public final class TidalFlats extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}"); // {U}{U}: For each attacking creature without flying, its controller may pay {1}. If they don't, creatures you control blocking that creature gain first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TidalFlatsEffect(), new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new TidalFlatsEffect(), new ManaCostsImpl<>("{U}{U}"))); } private TidalFlats(final TidalFlats card) { diff --git a/Mage.Sets/src/mage/cards/t/TidalVisionary.java b/Mage.Sets/src/mage/cards/t/TidalVisionary.java index 230fd3d5669..5227aab5c95 100644 --- a/Mage.Sets/src/mage/cards/t/TidalVisionary.java +++ b/Mage.Sets/src/mage/cards/t/TidalVisionary.java @@ -29,7 +29,7 @@ public final class TidalVisionary extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature becomes the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TidalWarrior.java b/Mage.Sets/src/mage/cards/t/TidalWarrior.java index 3445fafd8a0..352e2179b0c 100644 --- a/Mage.Sets/src/mage/cards/t/TidalWarrior.java +++ b/Mage.Sets/src/mage/cards/t/TidalWarrior.java @@ -31,7 +31,7 @@ public final class TidalWarrior extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target land becomes an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TidewaterMinion.java b/Mage.Sets/src/mage/cards/t/TidewaterMinion.java index b341a95364a..955fe0079d7 100644 --- a/Mage.Sets/src/mage/cards/t/TidewaterMinion.java +++ b/Mage.Sets/src/mage/cards/t/TidewaterMinion.java @@ -41,7 +41,7 @@ public final class TidewaterMinion extends CardImpl { new ManaCostsImpl<>("{4}"))); // {tap}: Untap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TimeBomb.java b/Mage.Sets/src/mage/cards/t/TimeBomb.java index 426b656d5d8..02d109c748f 100644 --- a/Mage.Sets/src/mage/cards/t/TimeBomb.java +++ b/Mage.Sets/src/mage/cards/t/TimeBomb.java @@ -34,7 +34,7 @@ public final class TimeBomb extends CardImpl { // {1}, {tap}, Sacrifice Time Bomb: Time Bomb deals damage equal to the number of time counters on it to each creature and each player. Effect effect = new DamageEverythingEffect(new CountersSourceCount(CounterType.TIME), new FilterCreaturePermanent()); effect.setText("{this} deals damage equal to the number of time counters on it to each creature and each player"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TimeElemental.java b/Mage.Sets/src/mage/cards/t/TimeElemental.java index 46438c3ad6d..8c018f9ca8d 100644 --- a/Mage.Sets/src/mage/cards/t/TimeElemental.java +++ b/Mage.Sets/src/mage/cards/t/TimeElemental.java @@ -49,7 +49,7 @@ public final class TimeElemental extends CardImpl { this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(ability, true), false)); // {2}{U}{U}, {tap}: Return target permanent that isn't enchanted to its owner's hand. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{U}{U}")); + Ability ability2 = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetPermanent(filter)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/t/TimeSieve.java b/Mage.Sets/src/mage/cards/t/TimeSieve.java index 052c1f83154..22466a916bc 100644 --- a/Mage.Sets/src/mage/cards/t/TimeSieve.java +++ b/Mage.Sets/src/mage/cards/t/TimeSieve.java @@ -27,7 +27,7 @@ public final class TimeSieve extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{U}{B}"); // {tap}, Sacrifice five artifacts: Take an extra turn after this one. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddExtraTurnControllerEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(5, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TimeVault.java b/Mage.Sets/src/mage/cards/t/TimeVault.java index 5592240ed3b..9c30a86b26d 100644 --- a/Mage.Sets/src/mage/cards/t/TimeVault.java +++ b/Mage.Sets/src/mage/cards/t/TimeVault.java @@ -41,7 +41,7 @@ public final class TimeVault extends CardImpl { this.addAbility(new SimpleStaticAbility(new TimeVaultReplacementEffect())); // {tap}: Take an extra turn after this one. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddExtraTurnControllerEffect(), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java index 5e529458a10..a0d2dc2f4b8 100644 --- a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java +++ b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java @@ -38,7 +38,7 @@ public final class TinStreetMarket extends CardImpl { // Enchanted land has "{T}, Discard a card: Draw a card." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); gainAbility.addCost(new DiscardCardCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, null, "land"))); diff --git a/Mage.Sets/src/mage/cards/t/TinWingChimera.java b/Mage.Sets/src/mage/cards/t/TinWingChimera.java index 58354c79201..82860ddb9fc 100644 --- a/Mage.Sets/src/mage/cards/t/TinWingChimera.java +++ b/Mage.Sets/src/mage/cards/t/TinWingChimera.java @@ -42,7 +42,7 @@ public final class TinWingChimera extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Tin-Wing Chimera: Put a +2/+2 counter on target Chimera creature. It gains flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); ability.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield) .setText("It gains flying. (This effect lasts indefinitely.)")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/t/TirelessTribe.java b/Mage.Sets/src/mage/cards/t/TirelessTribe.java index 0acb7ff428d..39b3eb6f5f4 100644 --- a/Mage.Sets/src/mage/cards/t/TirelessTribe.java +++ b/Mage.Sets/src/mage/cards/t/TirelessTribe.java @@ -29,7 +29,7 @@ public final class TirelessTribe extends CardImpl { this.toughness = new MageInt(1); // Discard a card: Tireless Tribe gets +0/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 4, Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand()))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 4, Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand()))); } private TirelessTribe(final TirelessTribe card) { diff --git a/Mage.Sets/src/mage/cards/t/TitanForge.java b/Mage.Sets/src/mage/cards/t/TitanForge.java index dda3fb7e9bb..a318bc651eb 100644 --- a/Mage.Sets/src/mage/cards/t/TitanForge.java +++ b/Mage.Sets/src/mage/cards/t/TitanForge.java @@ -24,11 +24,11 @@ public final class TitanForge extends CardImpl { public TitanForge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TitanForgeGolemToken()), new TapSourceCost()); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new TitanForgeGolemToken()), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java index 397a30c2dba..0aaf8e17da6 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java @@ -34,7 +34,7 @@ public final class TitanOfEternalFire extends CardImpl { this.toughness = new MageInt(6); // Each Human creature you control has "{R}, {T}: This creature deals 1 damage to any target." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.HUMAN, "Each Human creature")); diff --git a/Mage.Sets/src/mage/cards/t/TitaniumGolem.java b/Mage.Sets/src/mage/cards/t/TitaniumGolem.java index 7e70a6c04fe..4d196b8548d 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniumGolem.java +++ b/Mage.Sets/src/mage/cards/t/TitaniumGolem.java @@ -25,7 +25,7 @@ public final class TitaniumGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(3); this.toughness = new MageInt(3); - 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}"))); } private TitaniumGolem(final TitaniumGolem card) { diff --git a/Mage.Sets/src/mage/cards/t/TolarianSentinel.java b/Mage.Sets/src/mage/cards/t/TolarianSentinel.java index 67fa95fb7f9..c80d37bd8dc 100644 --- a/Mage.Sets/src/mage/cards/t/TolarianSentinel.java +++ b/Mage.Sets/src/mage/cards/t/TolarianSentinel.java @@ -35,7 +35,7 @@ public final class TolarianSentinel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, {tap}, Discard a card: 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.addCost(new DiscardCardCost()); ability.addTarget(new TargetControlledPermanent()); diff --git a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java index b62c81e52f7..739b763f8b9 100644 --- a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java @@ -46,7 +46,7 @@ public final class TolsimirWolfblood extends CardImpl { // Other white creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); // {tap}: Create a legendary 2/2 green and white Wolf creature token named Voja. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VojaToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new VojaToken()), new TapSourceCost())); } private TolsimirWolfblood(final TolsimirWolfblood card) { diff --git a/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java b/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java index b32f6aa6755..35cffef463a 100644 --- a/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java +++ b/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java @@ -41,7 +41,7 @@ public final class TombOfTheDuskRose extends CardImpl { this.addAbility(new AnyColorManaAbility()); // {2}{W}{B}，{T} : Put a creature card exiled with this permanent onto the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TombOfTheDuskRoseEffect(), new ManaCostsImpl<>("{2}{W}{B}")); + Ability ability = new SimpleActivatedAbility(new TombOfTheDuskRoseEffect(), new ManaCostsImpl<>("{2}{W}{B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java b/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java index 06e4fff92a4..eb5a10285be 100644 --- a/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java @@ -34,7 +34,7 @@ public final class TombOfTheSpiritDragon extends CardImpl { // T: Add 1 this.addAbility(new ColorlessManaAbility()); // 2, T: You gain 1 life for each colorless creature you control - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)) + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)) .setText("you gain 1 life for each colorless creature you control"), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TombRobber.java b/Mage.Sets/src/mage/cards/t/TombRobber.java index 93827110050..94aa2cf0da7 100644 --- a/Mage.Sets/src/mage/cards/t/TombRobber.java +++ b/Mage.Sets/src/mage/cards/t/TombRobber.java @@ -35,7 +35,7 @@ public final class TombRobber extends CardImpl { // {1}, Discard a card: Tomb Robber explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) Effect effect = new ExploreSourceEffect(true, "{this}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(effect, new DiscardCardCost()); ability.addCost(new ManaCostsImpl<>("{1}")); this.addAbility(ability); } @@ -48,4 +48,4 @@ public final class TombRobber extends CardImpl { public TombRobber copy() { return new TombRobber(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TonicPeddler.java b/Mage.Sets/src/mage/cards/t/TonicPeddler.java index 922eee02a1e..885fe9cda3c 100644 --- a/Mage.Sets/src/mage/cards/t/TonicPeddler.java +++ b/Mage.Sets/src/mage/cards/t/TonicPeddler.java @@ -30,7 +30,7 @@ public final class TonicPeddler extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}, Discard a card: Target player gains 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(3), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeTargetEffect(3), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/t/ToothAndClaw.java b/Mage.Sets/src/mage/cards/t/ToothAndClaw.java index c441f0418b4..872ac3d4e86 100644 --- a/Mage.Sets/src/mage/cards/t/ToothAndClaw.java +++ b/Mage.Sets/src/mage/cards/t/ToothAndClaw.java @@ -23,7 +23,7 @@ public final class ToothAndClaw extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // Sacrifice two creatures: Create a 3/1 red Beast creature token named Carnivore. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CarnivoreToken(), 1), + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new CarnivoreToken(), 1), new SacrificeTargetCost(2, StaticFilters.FILTER_PERMANENT_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java b/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java index 9654e2b74ff..68b494da8b0 100644 --- a/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java +++ b/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java @@ -28,7 +28,7 @@ public final class ToothOfChissGoria extends CardImpl { // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TopanAscetic.java b/Mage.Sets/src/mage/cards/t/TopanAscetic.java index c7634e66880..6343817994c 100644 --- a/Mage.Sets/src/mage/cards/t/TopanAscetic.java +++ b/Mage.Sets/src/mage/cards/t/TopanAscetic.java @@ -37,7 +37,7 @@ public final class TopanAscetic extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped creature you control: Topan Ascetic gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); } private TopanAscetic(final TopanAscetic card) { diff --git a/Mage.Sets/src/mage/cards/t/TorWauki.java b/Mage.Sets/src/mage/cards/t/TorWauki.java index 3bc8d493568..fe42b5123ef 100644 --- a/Mage.Sets/src/mage/cards/t/TorWauki.java +++ b/Mage.Sets/src/mage/cards/t/TorWauki.java @@ -30,7 +30,7 @@ public final class TorWauki extends CardImpl { this.toughness = new MageInt(3); // {T}: Tor Wauki deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TorchDrake.java b/Mage.Sets/src/mage/cards/t/TorchDrake.java index 8a1d99502f8..4e9134c486a 100644 --- a/Mage.Sets/src/mage/cards/t/TorchDrake.java +++ b/Mage.Sets/src/mage/cards/t/TorchDrake.java @@ -29,7 +29,7 @@ public final class TorchDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private TorchDrake(final TorchDrake card) { diff --git a/Mage.Sets/src/mage/cards/t/TorchFiend.java b/Mage.Sets/src/mage/cards/t/TorchFiend.java index 7a38f1bd43c..190dc7c8e13 100644 --- a/Mage.Sets/src/mage/cards/t/TorchFiend.java +++ b/Mage.Sets/src/mage/cards/t/TorchFiend.java @@ -30,7 +30,7 @@ public final class TorchFiend extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Torch Fiend: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TormodsCrypt.java b/Mage.Sets/src/mage/cards/t/TormodsCrypt.java index 0fc386167f6..eb6860d66d0 100644 --- a/Mage.Sets/src/mage/cards/t/TormodsCrypt.java +++ b/Mage.Sets/src/mage/cards/t/TormodsCrypt.java @@ -22,7 +22,7 @@ public final class TormodsCrypt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); // {tap}, Sacrifice Tormod's Crypt: Exile all cards from target player's graveyard. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TorturedExistence.java b/Mage.Sets/src/mage/cards/t/TorturedExistence.java index 80df2b3606d..24e6510f26d 100644 --- a/Mage.Sets/src/mage/cards/t/TorturedExistence.java +++ b/Mage.Sets/src/mage/cards/t/TorturedExistence.java @@ -23,7 +23,7 @@ public final class TorturedExistence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}"); // {B}, Discard a creature card: Return target creature card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new DiscardCardCost(StaticFilters.FILTER_CARD_CREATURE_A)); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Touchstone.java b/Mage.Sets/src/mage/cards/t/Touchstone.java index fa2c4141269..2b2157e6116 100644 --- a/Mage.Sets/src/mage/cards/t/Touchstone.java +++ b/Mage.Sets/src/mage/cards/t/Touchstone.java @@ -30,7 +30,7 @@ public final class Touchstone extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}: Tap target artifact you don't control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TourachsGate.java b/Mage.Sets/src/mage/cards/t/TourachsGate.java index c2b32c1fefb..b59271eef10 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsGate.java +++ b/Mage.Sets/src/mage/cards/t/TourachsGate.java @@ -69,7 +69,7 @@ public final class TourachsGate extends CardImpl { this.addAbility(ability); // Sacrifice a Thrull: Put three time counters on Tourach's Gate. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.TIME.createInstance(3)), + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(3)), new SacrificeTargetCost(filterThrull))); // At the beginning of your upkeep, remove a time counter from Tourach's Gate. If there are no time counters on Tourach's Gate, sacrifice it. diff --git a/Mage.Sets/src/mage/cards/t/TowerDrake.java b/Mage.Sets/src/mage/cards/t/TowerDrake.java index 6a23163f950..0727b8ce493 100644 --- a/Mage.Sets/src/mage/cards/t/TowerDrake.java +++ b/Mage.Sets/src/mage/cards/t/TowerDrake.java @@ -32,7 +32,7 @@ public final class TowerDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}: Tower Drake gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private TowerDrake(final TowerDrake card) { diff --git a/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java b/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java index fa23b365a06..fb191ef5024 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java @@ -22,7 +22,7 @@ public final class TowerOfCalamities extends CardImpl { public TowerOfCalamities (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(12), new ManaCostsImpl<>("{8}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(12), new ManaCostsImpl<>("{8}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TowerOfChampions.java b/Mage.Sets/src/mage/cards/t/TowerOfChampions.java index fae0e9264b7..0c1fc2702e2 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfChampions.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfChampions.java @@ -23,7 +23,7 @@ public final class TowerOfChampions extends CardImpl { public TowerOfChampions (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(6, 6, Duration.EndOfTurn), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(6, 6, Duration.EndOfTurn), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java b/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java index ea5757c6c2c..4d7d816c78a 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java @@ -30,7 +30,7 @@ public final class TowerOfCoireall extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}: Target creature can't be blocked by Walls this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn).setText("Target creature can't be blocked by Walls this turn"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn).setText("Target creature can't be blocked by Walls this turn"), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TowerOfEons.java b/Mage.Sets/src/mage/cards/t/TowerOfEons.java index 7a85e854b68..ca89e080ab9 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfEons.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfEons.java @@ -21,7 +21,7 @@ public final class TowerOfEons extends CardImpl { public TowerOfEons (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(10), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(10), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java b/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java index d2719cd0d29..e0058549693 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java @@ -22,7 +22,7 @@ public final class TowerOfFortunes extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {8}, {T} : Draw four cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(4), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(4), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java b/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java index cfc2f1847e6..a8f246a883a 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java @@ -22,7 +22,7 @@ public final class TowerOfMurmurs extends CardImpl { public TowerOfMurmurs (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(8), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(8), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java b/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java index b73e7fce2c0..5631a386306 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java @@ -29,7 +29,7 @@ public final class TowerOfTheMagistrate extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Target creature gains protection from artifacts until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts")), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts")), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java b/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java index cbe54730708..55c179fb171 100644 --- a/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java +++ b/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java @@ -29,7 +29,7 @@ public final class ToweringThunderfist extends CardImpl { this.toughness = new MageInt(4); // {W}: Towering Thunderfist gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private ToweringThunderfist(final ToweringThunderfist card) { diff --git a/Mage.Sets/src/mage/cards/t/TownGossipmonger.java b/Mage.Sets/src/mage/cards/t/TownGossipmonger.java index 1d032506c25..50cbd67ab97 100644 --- a/Mage.Sets/src/mage/cards/t/TownGossipmonger.java +++ b/Mage.Sets/src/mage/cards/t/TownGossipmonger.java @@ -40,7 +40,7 @@ public final class TownGossipmonger extends CardImpl { // {T}, Tap an untapped creature you control: Transform Town Gossipmonger. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TransformSourceEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); } @@ -53,4 +53,4 @@ public final class TownGossipmonger extends CardImpl { public TownGossipmonger copy() { return new TownGossipmonger(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/ToxicNim.java b/Mage.Sets/src/mage/cards/t/ToxicNim.java index 5896fbbf3dd..3e9ada7a0ef 100644 --- a/Mage.Sets/src/mage/cards/t/ToxicNim.java +++ b/Mage.Sets/src/mage/cards/t/ToxicNim.java @@ -28,7 +28,7 @@ public final class ToxicNim extends CardImpl { this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private ToxicNim(final ToxicNim card) { diff --git a/Mage.Sets/src/mage/cards/t/Toymaker.java b/Mage.Sets/src/mage/cards/t/Toymaker.java index b4506555d34..2dd8bd47339 100644 --- a/Mage.Sets/src/mage/cards/t/Toymaker.java +++ b/Mage.Sets/src/mage/cards/t/Toymaker.java @@ -44,7 +44,7 @@ public final class Toymaker extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}, Discard a card: Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ToymakerEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new ToymakerEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/t/Tracker.java b/Mage.Sets/src/mage/cards/t/Tracker.java index 7bc575077bc..d65578ea2fa 100644 --- a/Mage.Sets/src/mage/cards/t/Tracker.java +++ b/Mage.Sets/src/mage/cards/t/Tracker.java @@ -28,7 +28,7 @@ public final class Tracker extends CardImpl { this.toughness = new MageInt(2); // {G}{G}, {tap}: Tracker deals damage equal to its power to target creature. That creature deals damage equal to its power to Tracker. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageEachOtherEffect(), new ManaCostsImpl<>("{G}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java index f9e5bf0f843..c56f95b48c7 100644 --- a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java +++ b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java @@ -43,7 +43,7 @@ public final class TradeFederationBattleship extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {T}: Create two 1/1 colorless Droid artifact token cretures. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DroidToken(), 2), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new DroidToken(), 2), new TapSourceCost())); } private TradeFederationBattleship(final TradeFederationBattleship card) { diff --git a/Mage.Sets/src/mage/cards/t/TradeRoutes.java b/Mage.Sets/src/mage/cards/t/TradeRoutes.java index 6b94d70b13d..acd0a079b18 100644 --- a/Mage.Sets/src/mage/cards/t/TradeRoutes.java +++ b/Mage.Sets/src/mage/cards/t/TradeRoutes.java @@ -32,12 +32,12 @@ public final class TradeRoutes extends CardImpl { // {1}: Return target land you control to its owner's hand. Effect returnToHand = new ReturnToHandTargetEffect(); Target targetLandYouControl = new TargetPermanent(new FilterControlledLandPermanent()); - Ability returnLandToHand = new SimpleActivatedAbility(Zone.BATTLEFIELD, returnToHand, new GenericManaCost(1)); + Ability returnLandToHand = new SimpleActivatedAbility(returnToHand, new GenericManaCost(1)); returnLandToHand.addTarget(targetLandYouControl); this.addAbility(returnLandToHand); // {1}, Discard a land card: Draw a card. - Ability drawACard = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability drawACard = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); drawACard.addCost(new DiscardTargetCost(new TargetCardInHand(new FilterLandCard("a land card")))); this.addAbility(drawACard); } diff --git a/Mage.Sets/src/mage/cards/t/TradewindRider.java b/Mage.Sets/src/mage/cards/t/TradewindRider.java index 889f601c219..f4263b54f89 100644 --- a/Mage.Sets/src/mage/cards/t/TradewindRider.java +++ b/Mage.Sets/src/mage/cards/t/TradewindRider.java @@ -37,7 +37,7 @@ public final class TradewindRider extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TradingPost.java b/Mage.Sets/src/mage/cards/t/TradingPost.java index cac1b9ae591..82006d364a3 100644 --- a/Mage.Sets/src/mage/cards/t/TradingPost.java +++ b/Mage.Sets/src/mage/cards/t/TradingPost.java @@ -33,26 +33,26 @@ public final class TradingPost extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {1}, {T}, Discard a card: You gain 4 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new GenericManaCost(1)); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(4), new GenericManaCost(1)); ability1.addCost(new TapSourceCost()); ability1.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability1); // {1}, {T}, Pay 1 life: Create a 0/1 white Goat creature token. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(new CreateTokenEffect(new GoatToken()), new GenericManaCost(1)); ability2.addCost(new TapSourceCost()); ability2.addCost(new PayLifeCost(1)); this.addAbility(ability2); // {1}, {T}, Sacrifice a creature: Return target artifact card from your graveyard to your hand. - Ability ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new GenericManaCost(1)); + Ability ability3 = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new GenericManaCost(1)); ability3.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD)); ability3.addCost(new TapSourceCost()); ability3.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability3); // {1}, {T}, Sacrifice an artifact: Draw a card. - Ability ability4 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability4 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability4.addCost(new TapSourceCost()); ability4.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN)); this.addAbility(ability4); diff --git a/Mage.Sets/src/mage/cards/t/TragicPoet.java b/Mage.Sets/src/mage/cards/t/TragicPoet.java index 5d660ec8a64..3ac6bf460ea 100644 --- a/Mage.Sets/src/mage/cards/t/TragicPoet.java +++ b/Mage.Sets/src/mage/cards/t/TragicPoet.java @@ -36,7 +36,7 @@ public final class TragicPoet extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Tragic Poet: Return target enchantment card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect() + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect() .setText("Return target enchantment card from your graveyard to your hand"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java b/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java index 49b687feadc..0db1d27755e 100644 --- a/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java +++ b/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java @@ -25,7 +25,7 @@ public final class TrainedPronghorn extends CardImpl { this.toughness = new MageInt(1); //Discard a card: Prevent all damage that would be dealt to Trained Pronghorn this turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageToSourceEffect(Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new PreventAllDamageToSourceEffect(Duration.EndOfTurn), new DiscardCardCost())); } @@ -38,5 +38,3 @@ public final class TrainedPronghorn extends CardImpl { return new TrainedPronghorn(this); } } - - diff --git a/Mage.Sets/src/mage/cards/t/TranquilGrove.java b/Mage.Sets/src/mage/cards/t/TranquilGrove.java index ef469aa2489..198596dec34 100644 --- a/Mage.Sets/src/mage/cards/t/TranquilGrove.java +++ b/Mage.Sets/src/mage/cards/t/TranquilGrove.java @@ -30,7 +30,7 @@ public final class TranquilGrove extends CardImpl { // {1}{G}{G}: Destroy all other enchantments. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new ManaCostsImpl<>("{1}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new DestroyAllEffect(filter), new ManaCostsImpl<>("{1}{G}{G}"))); } private TranquilGrove(final TranquilGrove card) { diff --git a/Mage.Sets/src/mage/cards/t/Transluminant.java b/Mage.Sets/src/mage/cards/t/Transluminant.java index ef9a6b2b2d8..40d61f10b9f 100644 --- a/Mage.Sets/src/mage/cards/t/Transluminant.java +++ b/Mage.Sets/src/mage/cards/t/Transluminant.java @@ -31,7 +31,7 @@ public final class Transluminant extends CardImpl { this.toughness = new MageInt(2); // {W}, Sacrifice Transluminant: Create a 1/1 white Spirit creature token with flying at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect( + Ability ability = new SimpleActivatedAbility(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TrapDigger.java b/Mage.Sets/src/mage/cards/t/TrapDigger.java index d9c909ce0b6..098bccd2010 100644 --- a/Mage.Sets/src/mage/cards/t/TrapDigger.java +++ b/Mage.Sets/src/mage/cards/t/TrapDigger.java @@ -46,12 +46,12 @@ public final class TrapDigger extends CardImpl { this.toughness = new MageInt(3); // {2}{W}, {tap}: Put a trap counter on target land you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.TRAP.createInstance()), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.TRAP.createInstance()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(new FilterControlledLandPermanent())); this.addAbility(ability); // Sacrifice a land with a trap counter on it: Trap Digger deals 3 damage to target attacking creature without flying. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new SacrificeTargetCost(filter1)); + ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new SacrificeTargetCost(filter1)); ability.addTarget(new TargetPermanent(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TravelersAmulet.java b/Mage.Sets/src/mage/cards/t/TravelersAmulet.java index 76be4cde936..2140b175b1a 100644 --- a/Mage.Sets/src/mage/cards/t/TravelersAmulet.java +++ b/Mage.Sets/src/mage/cards/t/TravelersAmulet.java @@ -26,7 +26,7 @@ public final class TravelersAmulet extends CardImpl { // {1}, Sacrifice Traveler's Amulet: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreasureCove.java b/Mage.Sets/src/mage/cards/t/TreasureCove.java index 1c0f5f6ff51..62aa078d389 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureCove.java +++ b/Mage.Sets/src/mage/cards/t/TreasureCove.java @@ -37,7 +37,7 @@ public final class TreasureCove extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {T}, Sacrifice a Treasure: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreasureMap.java b/Mage.Sets/src/mage/cards/t/TreasureMap.java index b674a8579a9..073470aaa2a 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureMap.java +++ b/Mage.Sets/src/mage/cards/t/TreasureMap.java @@ -33,7 +33,7 @@ public final class TreasureMap extends CardImpl { // {1}, {T}: Scry 1. Put a landmark counter on Treasure Map. Then if there are three or more landmark counters on it, remove those counters, transform Treasure Map, and create three colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color." this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TreasureMapEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new TreasureMapEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreasureTrove.java b/Mage.Sets/src/mage/cards/t/TreasureTrove.java index f6ce0b37f64..b7dcc259cda 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureTrove.java +++ b/Mage.Sets/src/mage/cards/t/TreasureTrove.java @@ -21,7 +21,7 @@ public final class TreasureTrove extends CardImpl { // {2}{U}{U}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}{U}"))); } private TreasureTrove(final TreasureTrove card) { diff --git a/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java b/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java index 86d4ecfc129..07de60bce02 100644 --- a/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java +++ b/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java @@ -33,7 +33,7 @@ public final class TreeOfPerdition extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {tap}: Exchange target opponent's life total with Tree of Perdition's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TreeOfPerditionEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TreeOfPerditionEffect(), new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java b/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java index 7da031b785e..25a6806d764 100644 --- a/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java +++ b/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java @@ -31,7 +31,7 @@ public final class TreeOfRedemption extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {T}: Exchange your life total with Tree of Redemption's toughness. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TreeOfRedemptionEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new TreeOfRedemptionEffect(), new TapSourceCost())); } private TreeOfRedemption(final TreeOfRedemption card) { diff --git a/Mage.Sets/src/mage/cards/t/TreetopVillage.java b/Mage.Sets/src/mage/cards/t/TreetopVillage.java index 8711f1ab229..ced8f02384d 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopVillage.java +++ b/Mage.Sets/src/mage/cards/t/TreetopVillage.java @@ -32,7 +32,7 @@ public final class TreetopVillage extends CardImpl { this.addAbility(new GreenManaAbility()); // {1}{G}: Treetop Village becomes a 3/3 green Ape creature with trample until end of turn. It’s still a land. (It can deal excess combat damage to the player or planeswalker it’s attacking.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ApeToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new ApeToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private TreetopVillage(final TreetopVillage card) { diff --git a/Mage.Sets/src/mage/cards/t/TrenchWurm.java b/Mage.Sets/src/mage/cards/t/TrenchWurm.java index 1078932b4f4..08439880d8e 100644 --- a/Mage.Sets/src/mage/cards/t/TrenchWurm.java +++ b/Mage.Sets/src/mage/cards/t/TrenchWurm.java @@ -28,7 +28,7 @@ public final class TrenchWurm extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, {tap}: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetNonBasicLandPermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java b/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java index cbe81bc624d..d9c92bdeea2 100644 --- a/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java +++ b/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java @@ -28,7 +28,7 @@ public final class TrespasserIlVec extends CardImpl { this.toughness = new MageInt(1); // Discard a card: Trespasser il-Vec gains shadow until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); } diff --git a/Mage.Sets/src/mage/cards/t/TrestleTroll.java b/Mage.Sets/src/mage/cards/t/TrestleTroll.java index b486ce50599..093ca4e2825 100644 --- a/Mage.Sets/src/mage/cards/t/TrestleTroll.java +++ b/Mage.Sets/src/mage/cards/t/TrestleTroll.java @@ -35,7 +35,7 @@ public final class TrestleTroll extends CardImpl { this.addAbility(ReachAbility.getInstance()); // {1}{B}{G}: Regenerate Trestle Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{G}"))); } private TrestleTroll(final TrestleTroll card) { @@ -46,4 +46,4 @@ public final class TrestleTroll extends CardImpl { public TrestleTroll copy() { return new TrestleTroll(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TriadOfFates.java b/Mage.Sets/src/mage/cards/t/TriadOfFates.java index f2b5f392f1c..7018bf840ce 100644 --- a/Mage.Sets/src/mage/cards/t/TriadOfFates.java +++ b/Mage.Sets/src/mage/cards/t/TriadOfFates.java @@ -41,21 +41,21 @@ public final class TriadOfFates extends CardImpl { this.toughness = new MageInt(3); // {1}, {T}: Put a fate counter on another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.FATE.createInstance()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); Target target = new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE); ability.addTarget(target); this.addAbility(ability); // {W}, {T}: Exile target creature that has a fate counter on it, then return it to the battlefield under its owner's control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileThenReturnTargetEffect(false, false), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new ExileThenReturnTargetEffect(false, false), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); target = new TargetCreaturePermanent(filterCounter); ability.addTarget(target); this.addAbility(ability); // {B}, {T}: Exile target creature that has a fate counter on it. Its controller draws two cards. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); target = new TargetCreaturePermanent(filterCounter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/t/TricksterMage.java b/Mage.Sets/src/mage/cards/t/TricksterMage.java index cf2d02464b0..ac8db101d8c 100644 --- a/Mage.Sets/src/mage/cards/t/TricksterMage.java +++ b/Mage.Sets/src/mage/cards/t/TricksterMage.java @@ -41,7 +41,7 @@ public final class TricksterMage extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}, Discard a card: You may tap or untap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java b/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java index 43b147b9a3a..89b4c0c5e9d 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java @@ -31,12 +31,12 @@ public final class TrigonOfCorruption extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {B}{B}, {T}: Put a charge counter on Trigon of Corruption. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{B}{B}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Corruption: Put a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java b/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java index 8770cc2bd52..36df7dac2c4 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java @@ -29,12 +29,12 @@ public final class TrigonOfInfestation extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {G}{G}, {T}: Put a charge counter on Trigon of Infestation. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{G}{G}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Infestation: Create a 1/1 green Phyrexian Insect creature token with infect. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new InsectInfectToken()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new InsectInfectToken()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfMending.java b/Mage.Sets/src/mage/cards/t/TrigonOfMending.java index 3faccb4894e..bbaca3b279a 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfMending.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfMending.java @@ -29,12 +29,12 @@ public final class TrigonOfMending extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {W}{W}, {T}: Put a charge counter on Trigon of Mending. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{W}{W}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Mending: Target player gains 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(3), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainLifeTargetEffect(3), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfRage.java b/Mage.Sets/src/mage/cards/t/TrigonOfRage.java index 3798144ca8d..2aabcd6c28e 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfRage.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfRage.java @@ -31,13 +31,13 @@ public final class TrigonOfRage extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {R}{R}, {T}: Put a charge counter on Trigon of Rage. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{R}{R}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Rage: Target creature gets +3/+0 until end of turn. Effect pumpEffect = new BoostTargetEffect(3, 0, Duration.EndOfTurn); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, pumpEffect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(pumpEffect, new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfThought.java b/Mage.Sets/src/mage/cards/t/TrigonOfThought.java index 8c946b4ce99..baad3600844 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfThought.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfThought.java @@ -28,12 +28,12 @@ public final class TrigonOfThought extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {U}{U}, {T}: Put a charge counter on Trigon of Thought. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{U}{U}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Thought: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TripNoose.java b/Mage.Sets/src/mage/cards/t/TripNoose.java index d1ccd29ca87..2d1b760cb6e 100644 --- a/Mage.Sets/src/mage/cards/t/TripNoose.java +++ b/Mage.Sets/src/mage/cards/t/TripNoose.java @@ -23,7 +23,7 @@ public final class TripNoose extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Triskelavus.java b/Mage.Sets/src/mage/cards/t/Triskelavus.java index 3e51d7d23ce..0ea2027facf 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelavus.java +++ b/Mage.Sets/src/mage/cards/t/Triskelavus.java @@ -38,7 +38,7 @@ public final class Triskelavus extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {1}, Remove a +1/+1 counter from Triskelavus: Create a 1/1 colorless Triskelavite artifact creature token with flying. It has "Sacrifice this creature: This creature deals 1 damage to any target." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TriskelaviteToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new TriskelaviteToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/Triskelion.java b/Mage.Sets/src/mage/cards/t/Triskelion.java index fa00b8f4df2..1ab500d52f4 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelion.java +++ b/Mage.Sets/src/mage/cards/t/Triskelion.java @@ -33,7 +33,7 @@ public final class Triskelion extends CardImpl { "with three +1/+1 counters on it")); // Remove a +1/+1 counter from Triskelion: Triskelion deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrollAscetic.java b/Mage.Sets/src/mage/cards/t/TrollAscetic.java index 97d14f3b3ce..3b72eaea491 100644 --- a/Mage.Sets/src/mage/cards/t/TrollAscetic.java +++ b/Mage.Sets/src/mage/cards/t/TrollAscetic.java @@ -27,7 +27,7 @@ public final class TrollAscetic extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(HexproofAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private TrollAscetic(final TrollAscetic card) { diff --git a/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java b/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java index 3e61e9534c7..157c8e61170 100644 --- a/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java +++ b/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java @@ -36,7 +36,7 @@ public final class TrollsOfTelJilad extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(6); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java index 87ac40013af..f37d608447e 100644 --- a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java +++ b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java @@ -43,7 +43,7 @@ public final class TrostaniSelesnyasVoice extends CardImpl { this.addAbility(new TrostaniSelesnyasVoiceTriggeredAbility()); // {1}{G}{W}, {T}: Populate. (Create a token that's a copy of a creature token you control.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PopulateEffect(), new ManaCostsImpl<>("{1}{G}{W}")); + Ability ability = new SimpleActivatedAbility(new PopulateEffect(), new ManaCostsImpl<>("{1}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TruefirePaladin.java b/Mage.Sets/src/mage/cards/t/TruefirePaladin.java index 5e14889874f..a0c0ff8b89c 100644 --- a/Mage.Sets/src/mage/cards/t/TruefirePaladin.java +++ b/Mage.Sets/src/mage/cards/t/TruefirePaladin.java @@ -34,10 +34,10 @@ public final class TruefirePaladin extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {R}{W}: Truefire Paladin gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); // {R}{W}: Truefire Paladin gets first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java b/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java index 8d5e6a325c3..9bc77933c32 100644 --- a/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java +++ b/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java @@ -27,7 +27,7 @@ public final class TrumpetingArmodon extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Target creature blocks Trumpeting Armodon this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java index de7057e60f0..3d86fcb903b 100644 --- a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java +++ b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java @@ -47,7 +47,7 @@ public final class TsaboTavoc extends CardImpl { // protection from legendary creatures this.addAbility(new ProtectionAbility(filter)); // {B}{B}, {tap}: Destroy target legendary creature. It can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new ManaCostsImpl<>("{B}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filterDestroy)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java b/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java index 203d725db52..ecfd315e275 100644 --- a/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java +++ b/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java @@ -35,7 +35,7 @@ public final class TuknirDeathlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}{G}, {tap}: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TundraKavu.java b/Mage.Sets/src/mage/cards/t/TundraKavu.java index 06882a814b4..77a5e3ec0f0 100644 --- a/Mage.Sets/src/mage/cards/t/TundraKavu.java +++ b/Mage.Sets/src/mage/cards/t/TundraKavu.java @@ -33,7 +33,7 @@ public final class TundraKavu extends CardImpl { this.toughness = new MageInt(2); // {T}: Target land becomes a Plains or an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TundraKavuEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TundraKavuEffect(), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TunnelerWurm.java b/Mage.Sets/src/mage/cards/t/TunnelerWurm.java index 8134edfb9c8..0bd44c8666d 100644 --- a/Mage.Sets/src/mage/cards/t/TunnelerWurm.java +++ b/Mage.Sets/src/mage/cards/t/TunnelerWurm.java @@ -25,7 +25,7 @@ public final class TunnelerWurm extends CardImpl { this.toughness = new MageInt(6); // Discard a card: Regenerate Tunneler Wurm. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new DiscardCardCost())); } private TunnelerWurm(final TunnelerWurm card) { diff --git a/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java b/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java index 723bf169264..654ebaa398f 100644 --- a/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java +++ b/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java @@ -31,7 +31,7 @@ public final class TurtleshellChangeling extends CardImpl { this.addAbility(new ChangelingAbility()); //{1}{U}: Switch {this}'s power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private TurtleshellChangeling(final TurtleshellChangeling card) { diff --git a/Mage.Sets/src/mage/cards/t/TwilightDrover.java b/Mage.Sets/src/mage/cards/t/TwilightDrover.java index 0c061dce05e..61509b86082 100644 --- a/Mage.Sets/src/mage/cards/t/TwilightDrover.java +++ b/Mage.Sets/src/mage/cards/t/TwilightDrover.java @@ -42,7 +42,7 @@ public final class TwilightDrover extends CardImpl { this.addAbility(new LeavesBattlefieldAllTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter)); // {2}{W}, Remove a +1/+1 counter from Twilight Drover: Create two 1/1 white Spirit creature tokens with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken(), 2), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SpiritWhiteToken(), 2), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TwistedAbomination.java b/Mage.Sets/src/mage/cards/t/TwistedAbomination.java index 2159dcba523..0669bc2fda4 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedAbomination.java +++ b/Mage.Sets/src/mage/cards/t/TwistedAbomination.java @@ -28,7 +28,7 @@ public final class TwistedAbomination extends CardImpl { this.toughness = new MageInt(3); // {B}: Regenerate Twisted Abomination. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // Swampcycling {2} this.addAbility(new SwampcyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java index 856ae820831..29180ec202a 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java @@ -34,7 +34,7 @@ public final class TwoHeadedDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Two-Headed Dragon gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,0, Duration.EndOfTurn),new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2,0, Duration.EndOfTurn),new ManaCostsImpl<>("{1}{R}"))); // Menace (This creature can't be blocked except by two or more creatures.) this.addAbility(new MenaceAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java b/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java index 8c10e07d68e..37b63879c41 100644 --- a/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java +++ b/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java @@ -36,7 +36,7 @@ public final class TymaretTheMurderKing extends CardImpl { this.toughness = new MageInt(2); // {1}{R}, Sacrifice another creature: Tymaret, the Murder King deals 2 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TyrantsMachine.java b/Mage.Sets/src/mage/cards/t/TyrantsMachine.java index 8c3643c250b..1b28b4eb43f 100644 --- a/Mage.Sets/src/mage/cards/t/TyrantsMachine.java +++ b/Mage.Sets/src/mage/cards/t/TyrantsMachine.java @@ -23,7 +23,7 @@ public final class TyrantsMachine extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {4}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Tyrranax.java b/Mage.Sets/src/mage/cards/t/Tyrranax.java index 0536257ab18..b61ac692392 100644 --- a/Mage.Sets/src/mage/cards/t/Tyrranax.java +++ b/Mage.Sets/src/mage/cards/t/Tyrranax.java @@ -28,7 +28,7 @@ public final class Tyrranax extends CardImpl { this.toughness = new MageInt(4); // {1}{G}: Tyrranax gets -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private Tyrranax(final Tyrranax card) { -- 2.47.2 From 374c2c65d10e3f763023a1dc34d66c945d0e0a55 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:30:50 -0500 Subject: [PATCH 44/50] refactor: SimpleActivatedAbility default zone (cards U V) --- Mage.Sets/src/mage/cards/u/UktabiKong.java | 2 +- Mage.Sets/src/mage/cards/u/UktabiWildcats.java | 2 +- Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java | 2 +- Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java | 2 +- Mage.Sets/src/mage/cards/u/UnbenderTine.java | 2 +- Mage.Sets/src/mage/cards/u/UnbridledGrowth.java | 2 +- Mage.Sets/src/mage/cards/u/UndeadLeotau.java | 2 +- Mage.Sets/src/mage/cards/u/UndeadSlayer.java | 2 +- Mage.Sets/src/mage/cards/u/UndercityInformer.java | 2 +- Mage.Sets/src/mage/cards/u/UndercityShade.java | 2 +- Mage.Sets/src/mage/cards/u/UndercityTroll.java | 2 +- Mage.Sets/src/mage/cards/u/UndergroundForum.java | 2 +- Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java | 2 +- Mage.Sets/src/mage/cards/u/UnderworldConnections.java | 2 +- Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java | 2 +- Mage.Sets/src/mage/cards/u/UnholyGrotto.java | 2 +- Mage.Sets/src/mage/cards/u/UniversalSolvent.java | 2 +- Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java | 2 +- Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java | 2 +- Mage.Sets/src/mage/cards/u/UnnaturalSelection.java | 2 +- Mage.Sets/src/mage/cards/u/UnravelingMummy.java | 4 ++-- Mage.Sets/src/mage/cards/u/UnrulySureshot.java | 2 +- Mage.Sets/src/mage/cards/u/UnseenWalker.java | 2 +- Mage.Sets/src/mage/cards/u/UnspeakableSymbol.java | 2 +- Mage.Sets/src/mage/cards/u/UnstableFrontier.java | 2 +- Mage.Sets/src/mage/cards/u/UnstableObelisk.java | 2 +- Mage.Sets/src/mage/cards/u/UnworthyDead.java | 2 +- Mage.Sets/src/mage/cards/u/UnyaroBees.java | 4 ++-- Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java | 2 +- Mage.Sets/src/mage/cards/u/Urborg.java | 2 +- Mage.Sets/src/mage/cards/u/UrborgPhantom.java | 2 +- Mage.Sets/src/mage/cards/u/UrborgSkeleton.java | 2 +- Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java | 2 +- Mage.Sets/src/mage/cards/u/Ursapine.java | 2 +- Mage.Sets/src/mage/cards/u/UrsineFylgja.java | 4 ++-- Mage.Sets/src/mage/cards/u/UrzasBauble.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasBlueprints.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasEngine.java | 4 ++-- Mage.Sets/src/mage/cards/u/UrzasFactory.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasHotTub.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasScienceFairProject.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasTome.java | 2 +- Mage.Sets/src/mage/cards/u/UthdenTroll.java | 2 +- Mage.Sets/src/mage/cards/u/UtopiaMycon.java | 2 +- Mage.Sets/src/mage/cards/u/UyoSilentProphet.java | 2 +- Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java | 6 +++--- Mage.Sets/src/mage/cards/v/ValakutInvoker.java | 2 +- Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java | 2 +- Mage.Sets/src/mage/cards/v/Valleymaker.java | 2 +- Mage.Sets/src/mage/cards/v/VampireWarlord.java | 2 +- Mage.Sets/src/mage/cards/v/VampiricDragon.java | 2 +- Mage.Sets/src/mage/cards/v/VampiricRites.java | 2 +- Mage.Sets/src/mage/cards/v/Vanishing.java | 2 +- Mage.Sets/src/mage/cards/v/VarchildsCrusader.java | 2 +- Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java | 2 +- Mage.Sets/src/mage/cards/v/VassalsDuty.java | 2 +- Mage.Sets/src/mage/cards/v/VastwoodAnimist.java | 2 +- Mage.Sets/src/mage/cards/v/VectisDominator.java | 2 +- Mage.Sets/src/mage/cards/v/VectisSilencers.java | 2 +- Mage.Sets/src/mage/cards/v/VectorAsp.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenMastermind.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenShackles.java | 2 +- Mage.Sets/src/mage/cards/v/VeinDrinker.java | 2 +- Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java | 2 +- Mage.Sets/src/mage/cards/v/VengefulArchon.java | 2 +- Mage.Sets/src/mage/cards/v/VengefulFirebrand.java | 2 +- Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java | 2 +- Mage.Sets/src/mage/cards/v/VentSentinel.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantAutomaton.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantField.java | 2 +- Mage.Sets/src/mage/cards/v/VesselOfEphemera.java | 2 +- Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java | 2 +- Mage.Sets/src/mage/cards/v/VeteranCathar.java | 2 +- Mage.Sets/src/mage/cards/v/VeteranWarleader.java | 2 +- Mage.Sets/src/mage/cards/v/VexingArcanix.java | 2 +- Mage.Sets/src/mage/cards/v/VexingBauble.java | 4 ++-- Mage.Sets/src/mage/cards/v/VexingShusher.java | 2 +- Mage.Sets/src/mage/cards/v/VhatiIlDal.java | 2 +- Mage.Sets/src/mage/cards/v/VialOfDragonfire.java | 2 +- Mage.Sets/src/mage/cards/v/VialOfPoison.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoFangtail.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoGrappler.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoHeretic.java | 4 ++-- Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSlasher.java | 2 +- Mage.Sets/src/mage/cards/v/ViashivanDragon.java | 4 ++-- Mage.Sets/src/mage/cards/v/VictualSliver.java | 2 +- Mage.Sets/src/mage/cards/v/VigeanGraftmage.java | 2 +- Mage.Sets/src/mage/cards/v/VigilantDrake.java | 2 +- Mage.Sets/src/mage/cards/v/VigilantMartyr.java | 4 ++-- Mage.Sets/src/mage/cards/v/VildinPackOutcast.java | 4 ++-- Mage.Sets/src/mage/cards/v/VileRequiem.java | 2 +- Mage.Sets/src/mage/cards/v/VillageElder.java | 2 +- Mage.Sets/src/mage/cards/v/VintaraElephant.java | 2 +- Mage.Sets/src/mage/cards/v/ViralDrake.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianLongbow.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianScout.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianZealot.java | 2 +- Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java | 2 +- Mage.Sets/src/mage/cards/v/VisceraSeer.java | 2 +- Mage.Sets/src/mage/cards/v/VisceridArmor.java | 2 +- Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java | 2 +- Mage.Sets/src/mage/cards/v/ViscidLemures.java | 2 +- Mage.Sets/src/mage/cards/v/VitalSplicer.java | 2 +- Mage.Sets/src/mage/cards/v/VithianStinger.java | 2 +- Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java | 6 +++--- Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java | 2 +- Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java | 2 +- Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/v/VodalianIllusionist.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianKnights.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianMage.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianMystic.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianWarMachine.java | 4 ++-- Mage.Sets/src/mage/cards/v/VoidAttendant.java | 2 +- Mage.Sets/src/mage/cards/v/VoidMaw.java | 2 +- Mage.Sets/src/mage/cards/v/VoidStalker.java | 2 +- Mage.Sets/src/mage/cards/v/VoidmageProdigy.java | 2 +- Mage.Sets/src/mage/cards/v/VolcanicRambler.java | 2 +- Mage.Sets/src/mage/cards/v/VolcanoImp.java | 2 +- Mage.Sets/src/mage/cards/v/VoldarenPariah.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsCurse.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsStronghold.java | 2 +- Mage.Sets/src/mage/cards/v/VoltaicConstruct.java | 2 +- Mage.Sets/src/mage/cards/v/VoltaicKey.java | 2 +- Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java | 2 +- Mage.Sets/src/mage/cards/v/VortexElemental.java | 4 ++-- Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java | 2 +- Mage.Sets/src/mage/cards/v/VoyagingSatyr.java | 2 +- Mage.Sets/src/mage/cards/v/VulshokReplica.java | 2 +- Mage.Sets/src/mage/cards/v/VulshokSorcerer.java | 2 +- 136 files changed, 152 insertions(+), 152 deletions(-) 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); } -- 2.47.2 From 299e785dd7c5757446dd871927401a91e3fcefc5 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:31:09 -0500 Subject: [PATCH 45/50] refactor: SimpleActivatedAbility default zone (cards W) --- Mage.Sets/src/mage/cards/w/WakeOfVultures.java | 2 +- Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java | 2 +- Mage.Sets/src/mage/cards/w/WalkingArchive.java | 2 +- Mage.Sets/src/mage/cards/w/WalkingBallista.java | 4 ++-- Mage.Sets/src/mage/cards/w/WalkingDead.java | 2 +- Mage.Sets/src/mage/cards/w/WalkingDesecration.java | 2 +- Mage.Sets/src/mage/cards/w/WalkingSponge.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfBlood.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfBone.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfBrambles.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfDeceit.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfFaith.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfFire.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfKelp.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfLava.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfLimbs.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfMulch.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfOpposition.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfVipers.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfWater.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfWonder.java | 2 +- Mage.Sets/src/mage/cards/w/WandOfDenial.java | 2 +- Mage.Sets/src/mage/cards/w/WandOfTheElements.java | 4 ++-- Mage.Sets/src/mage/cards/w/WanderingFumarole.java | 4 ++-- Mage.Sets/src/mage/cards/w/WarBarge.java | 2 +- Mage.Sets/src/mage/cards/w/WarCadence.java | 2 +- Mage.Sets/src/mage/cards/w/WarChariot.java | 2 +- Mage.Sets/src/mage/cards/w/WarSpikeChangeling.java | 2 +- Mage.Sets/src/mage/cards/w/WarTax.java | 2 +- Mage.Sets/src/mage/cards/w/WarTorchGoblin.java | 2 +- Mage.Sets/src/mage/cards/w/WardOfPiety.java | 2 +- Mage.Sets/src/mage/cards/w/Warmonger.java | 2 +- Mage.Sets/src/mage/cards/w/Wasteland.java | 2 +- Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java | 2 +- Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java | 2 +- Mage.Sets/src/mage/cards/w/WaterServant.java | 4 ++-- Mage.Sets/src/mage/cards/w/Watercourser.java | 2 +- Mage.Sets/src/mage/cards/w/WaterfrontBouncer.java | 2 +- Mage.Sets/src/mage/cards/w/WaywardSoul.java | 2 +- Mage.Sets/src/mage/cards/w/WeightOfConscience.java | 2 +- Mage.Sets/src/mage/cards/w/WeirdingShaman.java | 2 +- Mage.Sets/src/mage/cards/w/WelderAutomaton.java | 2 +- Mage.Sets/src/mage/cards/w/WeldingJar.java | 2 +- Mage.Sets/src/mage/cards/w/WellgabberApothecary.java | 2 +- Mage.Sets/src/mage/cards/w/Wellwisher.java | 2 +- Mage.Sets/src/mage/cards/w/WesternPaladin.java | 2 +- Mage.Sets/src/mage/cards/w/WestvaleAbbey.java | 4 ++-- Mage.Sets/src/mage/cards/w/Whetwheel.java | 2 +- Mage.Sets/src/mage/cards/w/WhipSilk.java | 2 +- Mage.Sets/src/mage/cards/w/Whipcorder.java | 2 +- Mage.Sets/src/mage/cards/w/Whipkeeper.java | 2 +- Mage.Sets/src/mage/cards/w/WhiptongueFrog.java | 2 +- Mage.Sets/src/mage/cards/w/WhirlerRogue.java | 2 +- Mage.Sets/src/mage/cards/w/WhirlerVirtuoso.java | 2 +- Mage.Sets/src/mage/cards/w/Whirlermaker.java | 2 +- Mage.Sets/src/mage/cards/w/WhirlingCatapult.java | 2 +- Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java | 2 +- Mage.Sets/src/mage/cards/w/WhisperBloodLiturgist.java | 2 +- Mage.Sets/src/mage/cards/w/WhisperingShade.java | 2 +- Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java | 4 ++-- Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java | 2 +- Mage.Sets/src/mage/cards/w/WickedAkuba.java | 2 +- Mage.Sets/src/mage/cards/w/WickerboughElder.java | 2 +- Mage.Sets/src/mage/cards/w/WildHolocron.java | 2 +- Mage.Sets/src/mage/cards/w/WildMongrel.java | 2 +- Mage.Sets/src/mage/cards/w/WildernessHypnotist.java | 2 +- Mage.Sets/src/mage/cards/w/WildfireEmissary.java | 4 ++-- Mage.Sets/src/mage/cards/w/WillOTheWisp.java | 2 +- Mage.Sets/src/mage/cards/w/WillingTestSubject.java | 2 +- Mage.Sets/src/mage/cards/w/WilyBandar.java | 2 +- Mage.Sets/src/mage/cards/w/WindDancer.java | 2 +- Mage.Sets/src/mage/cards/w/WindingCanyons.java | 2 +- Mage.Sets/src/mage/cards/w/Windreaver.java | 8 ++++---- Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java | 2 +- Mage.Sets/src/mage/cards/w/WintermoonMesa.java | 2 +- Mage.Sets/src/mage/cards/w/WirewoodLodge.java | 2 +- Mage.Sets/src/mage/cards/w/Wishmonger.java | 2 +- Mage.Sets/src/mage/cards/w/WitchEngine.java | 2 +- Mage.Sets/src/mage/cards/w/WitchHunter.java | 4 ++-- Mage.Sets/src/mage/cards/w/WitchesEye.java | 2 +- Mage.Sets/src/mage/cards/w/WitchingWell.java | 2 +- Mage.Sets/src/mage/cards/w/WitchsMist.java | 2 +- Mage.Sets/src/mage/cards/w/WitheredWretch.java | 2 +- Mage.Sets/src/mage/cards/w/WizardReplica.java | 2 +- Mage.Sets/src/mage/cards/w/Woeleecher.java | 2 +- Mage.Sets/src/mage/cards/w/WojekApothecary.java | 2 +- Mage.Sets/src/mage/cards/w/WojekEmbermage.java | 2 +- Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java | 4 ++-- Mage.Sets/src/mage/cards/w/WolfirAvenger.java | 2 +- Mage.Sets/src/mage/cards/w/WonderscapeSage.java | 2 +- Mage.Sets/src/mage/cards/w/Woodripper.java | 2 +- Mage.Sets/src/mage/cards/w/WoodweaversPuzzleknot.java | 2 +- Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java | 2 +- Mage.Sets/src/mage/cards/w/WoodwraithStrangler.java | 2 +- Mage.Sets/src/mage/cards/w/WordsOfWar.java | 2 +- Mage.Sets/src/mage/cards/w/WordsOfWaste.java | 2 +- Mage.Sets/src/mage/cards/w/WordsOfWilding.java | 2 +- Mage.Sets/src/mage/cards/w/WordsOfWind.java | 2 +- Mage.Sets/src/mage/cards/w/WordsOfWorship.java | 2 +- Mage.Sets/src/mage/cards/w/WorldBottlingKit.java | 2 +- Mage.Sets/src/mage/cards/w/WurmweaverCoil.java | 2 +- Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java | 2 +- Mage.Sets/src/mage/cards/w/WyluliWolf.java | 2 +- 104 files changed, 116 insertions(+), 116 deletions(-) diff --git a/Mage.Sets/src/mage/cards/w/WakeOfVultures.java b/Mage.Sets/src/mage/cards/w/WakeOfVultures.java index e981cbc5ac4..cfa4e2673f0 100644 --- a/Mage.Sets/src/mage/cards/w/WakeOfVultures.java +++ b/Mage.Sets/src/mage/cards/w/WakeOfVultures.java @@ -32,7 +32,7 @@ public final class WakeOfVultures extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{B}, Sacrifice a creature: Regenerate Wake of Vultures. - 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 SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java b/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java index f0e5ebc1585..697cc3361c8 100644 --- a/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java +++ b/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java @@ -40,7 +40,7 @@ public final class WakestoneGargoyle extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Creatures you control with defender can attack this turn as though they didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderAllEffect(Duration.EndOfTurn, filter), new ManaCostsImpl<>("{1}{W}") )); + this.addAbility(new SimpleActivatedAbility(new CanAttackAsThoughItDidntHaveDefenderAllEffect(Duration.EndOfTurn, filter), new ManaCostsImpl<>("{1}{W}") )); } private WakestoneGargoyle(final WakestoneGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/w/WalkingArchive.java b/Mage.Sets/src/mage/cards/w/WalkingArchive.java index 16211aa4475..32975f0e4b1 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingArchive.java +++ b/Mage.Sets/src/mage/cards/w/WalkingArchive.java @@ -42,7 +42,7 @@ public final class WalkingArchive extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.EACH_PLAYER, new DrawCardTargetEffect(new CountersSourceCount(CounterType.P1P1)), false)); // {2}{W}{U}: Put a +1/+1 counter on Walking Archive. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}{W}{U}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}{W}{U}"))); } private WalkingArchive(final WalkingArchive card) { diff --git a/Mage.Sets/src/mage/cards/w/WalkingBallista.java b/Mage.Sets/src/mage/cards/w/WalkingBallista.java index 1ffcbe7a4dd..2243cc40b37 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingBallista.java +++ b/Mage.Sets/src/mage/cards/w/WalkingBallista.java @@ -36,10 +36,10 @@ public final class WalkingBallista extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // {4}: Put a +1/+1 counter on Walking Ballista. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(4))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(4))); // Remove a +1/+1 counter from Walking Ballista: It deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WalkingDead.java b/Mage.Sets/src/mage/cards/w/WalkingDead.java index 6f66b086eaa..868d648429f 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingDead.java +++ b/Mage.Sets/src/mage/cards/w/WalkingDead.java @@ -25,7 +25,7 @@ public final class WalkingDead extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Walking Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private WalkingDead(final WalkingDead card) { diff --git a/Mage.Sets/src/mage/cards/w/WalkingDesecration.java b/Mage.Sets/src/mage/cards/w/WalkingDesecration.java index 12bfe34cb9b..14b82d8817c 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingDesecration.java +++ b/Mage.Sets/src/mage/cards/w/WalkingDesecration.java @@ -33,7 +33,7 @@ public final class WalkingDesecration extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Creatures of the creature type of your choice attack this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WalkingDesecrationEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new WalkingDesecrationEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WalkingSponge.java b/Mage.Sets/src/mage/cards/w/WalkingSponge.java index f59e76e2c64..f570ef74441 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingSponge.java +++ b/Mage.Sets/src/mage/cards/w/WalkingSponge.java @@ -40,7 +40,7 @@ public final class WalkingSponge extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature loses your choice of flying, first strike, or trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WalkingSpongeEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new WalkingSpongeEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfBlood.java b/Mage.Sets/src/mage/cards/w/WallOfBlood.java index f8fc74b6003..7dd02e05e46 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfBlood.java +++ b/Mage.Sets/src/mage/cards/w/WallOfBlood.java @@ -27,7 +27,7 @@ public final class WallOfBlood extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new PayLifeCost(1))); // Pay 1 life: Wall of Blood gets +1/+1 until end of turn. } diff --git a/Mage.Sets/src/mage/cards/w/WallOfBone.java b/Mage.Sets/src/mage/cards/w/WallOfBone.java index 65e003854e7..2751e6d2348 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfBone.java +++ b/Mage.Sets/src/mage/cards/w/WallOfBone.java @@ -28,7 +28,7 @@ public final class WallOfBone extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private WallOfBone(final WallOfBone card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfBrambles.java b/Mage.Sets/src/mage/cards/w/WallOfBrambles.java index dada270c6aa..faefcad51e8 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfBrambles.java +++ b/Mage.Sets/src/mage/cards/w/WallOfBrambles.java @@ -29,7 +29,7 @@ public final class WallOfBrambles extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {G}: Regenerate Wall of Brambles. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private WallOfBrambles(final WallOfBrambles card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java index a16bf63f541..1b6dddd9013 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java +++ b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java @@ -34,7 +34,7 @@ public final class WallOfDeceit extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {3}: Turn Wall of Deceit face down. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WallOfDeceitEffect(), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new WallOfDeceitEffect(), new ManaCostsImpl<>("{3}"))); // Morph {U} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); diff --git a/Mage.Sets/src/mage/cards/w/WallOfFaith.java b/Mage.Sets/src/mage/cards/w/WallOfFaith.java index a723071fa03..ba2b6d41576 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfFaith.java +++ b/Mage.Sets/src/mage/cards/w/WallOfFaith.java @@ -29,7 +29,7 @@ public final class WallOfFaith extends CardImpl { this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private WallOfFaith(final WallOfFaith card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfFire.java b/Mage.Sets/src/mage/cards/w/WallOfFire.java index 0fbbb51091b..3d3ae46e1ef 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfFire.java +++ b/Mage.Sets/src/mage/cards/w/WallOfFire.java @@ -24,7 +24,7 @@ public final class WallOfFire extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); - 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))); } private WallOfFire(final WallOfFire card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfKelp.java b/Mage.Sets/src/mage/cards/w/WallOfKelp.java index 5fdc0bf2d6c..f028e3d2ea5 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfKelp.java +++ b/Mage.Sets/src/mage/cards/w/WallOfKelp.java @@ -33,7 +33,7 @@ public final class WallOfKelp extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {U}{U}, {tap}: Create a 0/1 blue Plant Wall creature token with defender named Kelp. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KelpToken()), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new KelpToken()), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfLava.java b/Mage.Sets/src/mage/cards/w/WallOfLava.java index 3302bb4978d..db54127285f 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfLava.java +++ b/Mage.Sets/src/mage/cards/w/WallOfLava.java @@ -31,7 +31,7 @@ public final class WallOfLava extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {R}: Wall of Lava 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}"))); } private WallOfLava(final WallOfLava card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfLimbs.java b/Mage.Sets/src/mage/cards/w/WallOfLimbs.java index 3f520054980..b88bcd3540c 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfLimbs.java +++ b/Mage.Sets/src/mage/cards/w/WallOfLimbs.java @@ -46,7 +46,7 @@ public final class WallOfLimbs extends CardImpl { // {5}{B}{B}, Sacrifice Wall of Limbs: Target player loses X life, where X is Wall of Limbs's power. Effect effect = new LoseLifeTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE); effect.setText("Target player loses X life, where X is {this}'s power."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{5}{B}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{5}{B}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WallOfMulch.java b/Mage.Sets/src/mage/cards/w/WallOfMulch.java index ff985086f09..4ea1127ce78 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfMulch.java +++ b/Mage.Sets/src/mage/cards/w/WallOfMulch.java @@ -41,7 +41,7 @@ public final class WallOfMulch extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {G}, Sacrifice a Wall: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WallOfOpposition.java b/Mage.Sets/src/mage/cards/w/WallOfOpposition.java index 7d806b4b35b..a575af638c2 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfOpposition.java +++ b/Mage.Sets/src/mage/cards/w/WallOfOpposition.java @@ -31,7 +31,7 @@ public final class WallOfOpposition extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}: Wall of Opposition gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); } private WallOfOpposition(final WallOfOpposition card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java b/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java index d3755aefdea..3b0cd88d420 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java +++ b/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java @@ -30,7 +30,7 @@ public final class WallOfPineNeedles extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {G}: Regenerate Wall of Pine Needles. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfVipers.java b/Mage.Sets/src/mage/cards/w/WallOfVipers.java index 2c4b1ee7863..014401a77af 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfVipers.java +++ b/Mage.Sets/src/mage/cards/w/WallOfVipers.java @@ -39,7 +39,7 @@ public final class WallOfVipers extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {3}: Destroy Wall of Vipers and target creature it's blocking. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroySourceEffect(), new ManaCostsImpl<>("{3}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DestroySourceEffect(), new ManaCostsImpl<>("{3}")); ability.addEffect(new DestroyTargetEffect(" and target creature it's blocking")); ability.addTarget(new TargetCreaturePermanent(new WallOfVipersFilter())); ability.setMayActivate(TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/w/WallOfWater.java b/Mage.Sets/src/mage/cards/w/WallOfWater.java index e7940eed420..61bd68ce070 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfWater.java +++ b/Mage.Sets/src/mage/cards/w/WallOfWater.java @@ -31,7 +31,7 @@ public final class WallOfWater extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {U}: Wall of Water 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}"))); } private WallOfWater(final WallOfWater card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfWonder.java b/Mage.Sets/src/mage/cards/w/WallOfWonder.java index 9d36ef9f701..0c61b91f26d 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfWonder.java +++ b/Mage.Sets/src/mage/cards/w/WallOfWonder.java @@ -32,7 +32,7 @@ public final class WallOfWonder extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {2}{U}{U}: Wall of Wonder gets +4/-4 until end of turn and can attack this turn as though it didn't have defender. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, -4, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(4, -4, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}{U}")); ability.addEffect(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn, "and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WandOfDenial.java b/Mage.Sets/src/mage/cards/w/WandOfDenial.java index ef6552c79eb..d9e7a222db3 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfDenial.java +++ b/Mage.Sets/src/mage/cards/w/WandOfDenial.java @@ -28,7 +28,7 @@ public final class WandOfDenial extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}: Look at the top card of target player's library. If it's a nonland card, you may pay 2 life. If you do, put it into that player's graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WandOfDenialEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new WandOfDenialEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WandOfTheElements.java b/Mage.Sets/src/mage/cards/w/WandOfTheElements.java index 0a6f6564422..e99cada0b5f 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfTheElements.java +++ b/Mage.Sets/src/mage/cards/w/WandOfTheElements.java @@ -34,12 +34,12 @@ public final class WandOfTheElements extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {T}, Sacrifice an Island: Create a 2/2 blue Elemental creature token with flying. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WandOfTheElementsFirstToken()), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(new CreateTokenEffect(new WandOfTheElementsFirstToken()), new TapSourceCost()); firstAbility.addCost(new SacrificeTargetCost(islandFilter)); this.addAbility(firstAbility); // {T}, Sacrifice a Mountain: Create a 3/3 red Elemental creature token. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WandOfTheElementsSecondToken()), new TapSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(new CreateTokenEffect(new WandOfTheElementsSecondToken()), new TapSourceCost()); secondAbility.addCost(new SacrificeTargetCost(mountainFilter)); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java index 88793caf0d7..424a3705310 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java +++ b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java @@ -39,7 +39,7 @@ public final class WanderingFumarole extends CardImpl { // "0: Switch this creature's power and toughness until end of turn." It's still a land. Effect effect = new BecomesCreatureSourceEffect(new WanderingFumaroleToken(), CardType.LAND, Duration.EndOfTurn); effect.setText("{this} becomes a 1/4 blue and red Elemental creature with \"0: Switch this creature's power and toughness until end of turn.\" It's still a land"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{U}{R}"))); } private WanderingFumarole(final WanderingFumarole card) { @@ -62,7 +62,7 @@ class WanderingFumaroleToken extends TokenImpl { color.setBlue(true); power = new MageInt(1); toughness = new MageInt(4); - addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{0}"))); + addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{0}"))); } private WanderingFumaroleToken(final WanderingFumaroleToken token) { super(token); diff --git a/Mage.Sets/src/mage/cards/w/WarBarge.java b/Mage.Sets/src/mage/cards/w/WarBarge.java index 2597ab3c093..007cfdb25e2 100644 --- a/Mage.Sets/src/mage/cards/w/WarBarge.java +++ b/Mage.Sets/src/mage/cards/w/WarBarge.java @@ -32,7 +32,7 @@ public final class WarBarge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {3}: Target creature gains islandwalk until end of turn. When War Barge leaves the battlefield this turn, destroy that creature. A creature destroyed this way can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new IslandwalkAbility(false), Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new IslandwalkAbility(false), Duration.EndOfTurn), new GenericManaCost(3)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new WarBargeDelayedTriggeredAbility())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WarCadence.java b/Mage.Sets/src/mage/cards/w/WarCadence.java index 5385b0ab96b..cced20f43b3 100644 --- a/Mage.Sets/src/mage/cards/w/WarCadence.java +++ b/Mage.Sets/src/mage/cards/w/WarCadence.java @@ -28,7 +28,7 @@ public final class WarCadence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // {X}{R}: This turn, creatures can't block unless their controller pays {X} for each blocking creature they control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WarCadenceReplacementEffect(), new ManaCostsImpl<>("{X}{R}"))); + this.addAbility(new SimpleActivatedAbility(new WarCadenceReplacementEffect(), new ManaCostsImpl<>("{X}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WarChariot.java b/Mage.Sets/src/mage/cards/w/WarChariot.java index d0a071a9431..943daada404 100644 --- a/Mage.Sets/src/mage/cards/w/WarChariot.java +++ b/Mage.Sets/src/mage/cards/w/WarChariot.java @@ -25,7 +25,7 @@ public final class WarChariot extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, {tap}: Target creature gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WarSpikeChangeling.java b/Mage.Sets/src/mage/cards/w/WarSpikeChangeling.java index ba43f4e7015..ea26f869761 100644 --- a/Mage.Sets/src/mage/cards/w/WarSpikeChangeling.java +++ b/Mage.Sets/src/mage/cards/w/WarSpikeChangeling.java @@ -25,7 +25,7 @@ public final class WarSpikeChangeling extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new ChangelingAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private WarSpikeChangeling(final WarSpikeChangeling card) { diff --git a/Mage.Sets/src/mage/cards/w/WarTax.java b/Mage.Sets/src/mage/cards/w/WarTax.java index 471d0eb6941..8cc46fe1436 100644 --- a/Mage.Sets/src/mage/cards/w/WarTax.java +++ b/Mage.Sets/src/mage/cards/w/WarTax.java @@ -30,7 +30,7 @@ public final class WarTax extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // {X}{U}: This turn, creatures can't attack unless their controller pays {X} for each attacking creature they control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WarTaxCantAttackUnlessPaysEffect(), new ManaCostsImpl<>("{X}{U}"))); + this.addAbility(new SimpleActivatedAbility(new WarTaxCantAttackUnlessPaysEffect(), new ManaCostsImpl<>("{X}{U}"))); } private WarTax(final WarTax card) { diff --git a/Mage.Sets/src/mage/cards/w/WarTorchGoblin.java b/Mage.Sets/src/mage/cards/w/WarTorchGoblin.java index 0c139d308ef..f2563f0242d 100644 --- a/Mage.Sets/src/mage/cards/w/WarTorchGoblin.java +++ b/Mage.Sets/src/mage/cards/w/WarTorchGoblin.java @@ -32,7 +32,7 @@ public final class WarTorchGoblin extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice War-Torch Goblin: War-Torch Goblin deals 2 damage to target blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WardOfPiety.java b/Mage.Sets/src/mage/cards/w/WardOfPiety.java index fa425edff8b..a98b2448f99 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfPiety.java +++ b/Mage.Sets/src/mage/cards/w/WardOfPiety.java @@ -41,7 +41,7 @@ public final class WardOfPiety extends CardImpl { this.addAbility(ability); // {1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to any target instead. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WardOfPietyPreventDamageTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + ability = new SimpleActivatedAbility(new WardOfPietyPreventDamageTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/Warmonger.java b/Mage.Sets/src/mage/cards/w/Warmonger.java index 1cc97db7da9..2352978e6b5 100644 --- a/Mage.Sets/src/mage/cards/w/Warmonger.java +++ b/Mage.Sets/src/mage/cards/w/Warmonger.java @@ -37,7 +37,7 @@ public final class Warmonger extends CardImpl { this.toughness = new MageInt(3); // {2}: Warmonger deals 1 damage to each creature without flying and each player. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1, filter) , new GenericManaCost(2)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageEverythingEffect(1, filter) , new GenericManaCost(2)); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Wasteland.java b/Mage.Sets/src/mage/cards/w/Wasteland.java index ca2c8fc2598..579df2af929 100644 --- a/Mage.Sets/src/mage/cards/w/Wasteland.java +++ b/Mage.Sets/src/mage/cards/w/Wasteland.java @@ -26,7 +26,7 @@ public final class Wasteland extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {tap}, Sacrifice Wasteland: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java b/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java index 846fe83be09..68597151e61 100644 --- a/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java +++ b/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java @@ -33,7 +33,7 @@ public final class WatchersOfTheDead extends CardImpl { this.toughness = new MageInt(2); // Exile Watchers of the Dead: Each opponent chooses 2 cards in their graveyard and exiles the rest. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WatchersOfTheDeadEffect(), new ExileSourceCost())); + this.addAbility(new SimpleActivatedAbility(new WatchersOfTheDeadEffect(), new ExileSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java b/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java index 1cd4a541c7d..021d9bea9fa 100644 --- a/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java +++ b/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java @@ -26,7 +26,7 @@ public final class WatchfulAutomaton extends CardImpl { this.toughness = new MageInt(2); // {2}{U}: Scry 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1), new ManaCostsImpl<>("{2}{U}"))); } private WatchfulAutomaton(final WatchfulAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/w/WaterServant.java b/Mage.Sets/src/mage/cards/w/WaterServant.java index 1fd8cb12034..56bf19afd97 100644 --- a/Mage.Sets/src/mage/cards/w/WaterServant.java +++ b/Mage.Sets/src/mage/cards/w/WaterServant.java @@ -27,8 +27,8 @@ public final class WaterServant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private WaterServant(final WaterServant card) { diff --git a/Mage.Sets/src/mage/cards/w/Watercourser.java b/Mage.Sets/src/mage/cards/w/Watercourser.java index bde896d35cf..544bf33eba5 100644 --- a/Mage.Sets/src/mage/cards/w/Watercourser.java +++ b/Mage.Sets/src/mage/cards/w/Watercourser.java @@ -27,7 +27,7 @@ public final class Watercourser extends CardImpl { this.toughness = new MageInt(3); // {U}: Watercourser gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private Watercourser(final Watercourser card) { diff --git a/Mage.Sets/src/mage/cards/w/WaterfrontBouncer.java b/Mage.Sets/src/mage/cards/w/WaterfrontBouncer.java index b77a590daea..db660e7e1e2 100644 --- a/Mage.Sets/src/mage/cards/w/WaterfrontBouncer.java +++ b/Mage.Sets/src/mage/cards/w/WaterfrontBouncer.java @@ -33,7 +33,7 @@ public final class WaterfrontBouncer extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}, Discard a card: Return target creature 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.addCost(new DiscardTargetCost(new TargetCardInHand())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WaywardSoul.java b/Mage.Sets/src/mage/cards/w/WaywardSoul.java index 64a3cd74208..add7996c321 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardSoul.java +++ b/Mage.Sets/src/mage/cards/w/WaywardSoul.java @@ -29,7 +29,7 @@ public final class WaywardSoul extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: Put Wayward Soul on top of its owner's library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); } private WaywardSoul(final WaywardSoul card) { diff --git a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java index 3b850094825..b7218100ba9 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java @@ -46,7 +46,7 @@ public final class WeightOfConscience extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // Tap two untapped creatures you control that share a creature type: Exile enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAttachedEffect(), new TapTargetCost(new WeightOfConscienceTarget()))); + this.addAbility(new SimpleActivatedAbility(new ExileAttachedEffect(), new TapTargetCost(new WeightOfConscienceTarget()))); } private WeightOfConscience(final WeightOfConscience card) { diff --git a/Mage.Sets/src/mage/cards/w/WeirdingShaman.java b/Mage.Sets/src/mage/cards/w/WeirdingShaman.java index 3075ef11b4e..b748c8377e2 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdingShaman.java +++ b/Mage.Sets/src/mage/cards/w/WeirdingShaman.java @@ -36,7 +36,7 @@ public final class WeirdingShaman extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinRogueToken(), 2), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GoblinRogueToken(), 2), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WelderAutomaton.java b/Mage.Sets/src/mage/cards/w/WelderAutomaton.java index ac7fec39290..d5ee81af354 100644 --- a/Mage.Sets/src/mage/cards/w/WelderAutomaton.java +++ b/Mage.Sets/src/mage/cards/w/WelderAutomaton.java @@ -27,7 +27,7 @@ public final class WelderAutomaton extends CardImpl { this.toughness = new MageInt(1); // {3}{R}: Welder Automaton deals 1 damage to each opponent. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl<>("{3}{R}"))); + this.addAbility(new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl<>("{3}{R}"))); } private WelderAutomaton(final WelderAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/w/WeldingJar.java b/Mage.Sets/src/mage/cards/w/WeldingJar.java index 24afa2530f3..29128cd8f21 100644 --- a/Mage.Sets/src/mage/cards/w/WeldingJar.java +++ b/Mage.Sets/src/mage/cards/w/WeldingJar.java @@ -21,7 +21,7 @@ public final class WeldingJar extends CardImpl { public WeldingJar (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java index fb26f419553..82797bc6f4d 100644 --- a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java +++ b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java @@ -39,7 +39,7 @@ public final class WellgabberApothecary extends CardImpl { this.toughness = new MageInt(3); // {1}{W} : Prevent all damage that would be dealt to target tapped Merfolk or Kithkin creatuer this turn - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new ManaCostsImpl<>("{1}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Wellwisher.java b/Mage.Sets/src/mage/cards/w/Wellwisher.java index 01a1f7c4792..0f3246eed3f 100644 --- a/Mage.Sets/src/mage/cards/w/Wellwisher.java +++ b/Mage.Sets/src/mage/cards/w/Wellwisher.java @@ -35,7 +35,7 @@ public final class Wellwisher extends CardImpl { this.toughness = new MageInt(1); // {T}: You gain 1 life for each Elf on the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)) + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)) .setText("you gain 1 life for each Elf on the battlefield"), new TapSourceCost()) .addHint(new ValueHint("Elves on the battlefield", new PermanentsOnBattlefieldCount(filter)))); } diff --git a/Mage.Sets/src/mage/cards/w/WesternPaladin.java b/Mage.Sets/src/mage/cards/w/WesternPaladin.java index 95ddd81e1fa..1e814734d85 100644 --- a/Mage.Sets/src/mage/cards/w/WesternPaladin.java +++ b/Mage.Sets/src/mage/cards/w/WesternPaladin.java @@ -40,7 +40,7 @@ public final class WesternPaladin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java b/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java index de24c77c826..f618bb62b61 100644 --- a/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java +++ b/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java @@ -37,14 +37,14 @@ public final class WestvaleAbbey extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {5}, {T}, Pay 1 life: Create a 1/1 white and black Human Cleric creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanClericToken()), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new HumanClericToken()), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); // {5}, {T}, Sacrifice five creatures: Transform Westvale Abbey and untap it. this.addAbility(new TransformAbility()); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new GenericManaCost(5)); + ability = new SimpleActivatedAbility(new TransformSourceEffect(), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(5, StaticFilters.FILTER_PERMANENT_CREATURES)); ability.addEffect(new UntapSourceEffect().setText("untap it").concatBy(", then")); diff --git a/Mage.Sets/src/mage/cards/w/Whetwheel.java b/Mage.Sets/src/mage/cards/w/Whetwheel.java index 8888ddcabe7..946c76d4038 100644 --- a/Mage.Sets/src/mage/cards/w/Whetwheel.java +++ b/Mage.Sets/src/mage/cards/w/Whetwheel.java @@ -25,7 +25,7 @@ public final class Whetwheel extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {X}{X}, {tap}: Target player puts the top X cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect( + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect( GetXValue.instance), new ManaCostsImpl<>("{X}{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/w/WhipSilk.java b/Mage.Sets/src/mage/cards/w/WhipSilk.java index 1319d9c7ef2..b669c447401 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSilk.java +++ b/Mage.Sets/src/mage/cards/w/WhipSilk.java @@ -41,7 +41,7 @@ public final class WhipSilk extends CardImpl { // Enchanted creature has reach. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); // {G}: Return Whip Silk to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.G))); } private WhipSilk(final WhipSilk card) { diff --git a/Mage.Sets/src/mage/cards/w/Whipcorder.java b/Mage.Sets/src/mage/cards/w/Whipcorder.java index a6cac85c4dd..cfedc53a03d 100644 --- a/Mage.Sets/src/mage/cards/w/Whipcorder.java +++ b/Mage.Sets/src/mage/cards/w/Whipcorder.java @@ -32,7 +32,7 @@ public final class Whipcorder extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Whipkeeper.java b/Mage.Sets/src/mage/cards/w/Whipkeeper.java index c9c39050924..ceb7d78153b 100644 --- a/Mage.Sets/src/mage/cards/w/Whipkeeper.java +++ b/Mage.Sets/src/mage/cards/w/Whipkeeper.java @@ -31,7 +31,7 @@ public final class Whipkeeper extends CardImpl { this.toughness = new MageInt(1); // {T}: Whipkeeper deals damage to target creature equal to the damage already dealt to it this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhipkeeperEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new WhipkeeperEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java b/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java index 8d13b52a4c9..8d27181078c 100644 --- a/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java +++ b/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java @@ -27,7 +27,7 @@ public final class WhiptongueFrog extends CardImpl { this.toughness = new MageInt(3); // {U}: Whiptongue Frog 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 WhiptongueFrog(final WhiptongueFrog card) { diff --git a/Mage.Sets/src/mage/cards/w/WhirlerRogue.java b/Mage.Sets/src/mage/cards/w/WhirlerRogue.java index eb8f4c0bc21..0feddab58d6 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlerRogue.java +++ b/Mage.Sets/src/mage/cards/w/WhirlerRogue.java @@ -48,7 +48,7 @@ public final class WhirlerRogue extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // Tap two untapped artifacts you control: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhirlerVirtuoso.java b/Mage.Sets/src/mage/cards/w/WhirlerVirtuoso.java index 5fe3bc94290..ead2b15027f 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlerVirtuoso.java +++ b/Mage.Sets/src/mage/cards/w/WhirlerVirtuoso.java @@ -32,7 +32,7 @@ public final class WhirlerVirtuoso extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(3))); // Pay {E}{E}{E}: Create a 1/1 colorless Thopter artifact creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken()), new PayEnergyCost(3))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new ThopterColorlessToken()), new PayEnergyCost(3))); } private WhirlerVirtuoso(final WhirlerVirtuoso card) { diff --git a/Mage.Sets/src/mage/cards/w/Whirlermaker.java b/Mage.Sets/src/mage/cards/w/Whirlermaker.java index ae8d409cbb8..3be96c401bc 100644 --- a/Mage.Sets/src/mage/cards/w/Whirlermaker.java +++ b/Mage.Sets/src/mage/cards/w/Whirlermaker.java @@ -23,7 +23,7 @@ public final class Whirlermaker extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {4}, {T}: Create a 1/1 colorless Thopter artifact creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken()), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ThopterColorlessToken()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java b/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java index d03207c171c..902b9b8eb09 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java +++ b/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java @@ -30,7 +30,7 @@ public final class WhirlingCatapult extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, Exile the top two cards of your library: Whirling Catapult deals 1 damage to each creature with flying and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1, filter), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageEverythingEffect(1, filter), new ManaCostsImpl<>("{2}")); ability.addCost(new ExileFromTopOfLibraryCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java b/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java index 636e38a5f25..967b2524f47 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java +++ b/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java @@ -40,7 +40,7 @@ public final class WhirlpoolWarrior extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ShuffleHandIntoLibraryDrawThatManySourceEffect())); // {R}, Sacrifice Whirlpool Warrior: Each player shuffles the cards from their hand into their library, then draws that many cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhirlpoolWarriorActivatedEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new WhirlpoolWarriorActivatedEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhisperBloodLiturgist.java b/Mage.Sets/src/mage/cards/w/WhisperBloodLiturgist.java index 2555e0094d1..f30ee03f942 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperBloodLiturgist.java +++ b/Mage.Sets/src/mage/cards/w/WhisperBloodLiturgist.java @@ -35,7 +35,7 @@ public final class WhisperBloodLiturgist extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice two creatures: Return target creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect() + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect() .setText("Return target creature card from your graveyard to the battlefield"), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(2, StaticFilters.FILTER_PERMANENT_CREATURES)); diff --git a/Mage.Sets/src/mage/cards/w/WhisperingShade.java b/Mage.Sets/src/mage/cards/w/WhisperingShade.java index 686fc253d29..767166ca565 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperingShade.java +++ b/Mage.Sets/src/mage/cards/w/WhisperingShade.java @@ -30,7 +30,7 @@ public final class WhisperingShade extends CardImpl { // Swampwalk this.addAbility(new SwampwalkAbility()); // {B}: Whispering Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,1,Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,1,Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private WhisperingShade(final WhisperingShade card) { diff --git a/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java b/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java index 0cb69f5e32e..87177d364e8 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java +++ b/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java @@ -35,10 +35,10 @@ public final class WhiteShieldCrusader extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}: White Shield Crusader gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {W}{W}: White Shield Crusader gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private WhiteShieldCrusader(final WhiteShieldCrusader card) { diff --git a/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java b/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java index 1b53ebd8f85..8dba11f8e75 100644 --- a/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java +++ b/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java @@ -45,7 +45,7 @@ public final class WickTheWhorledMind extends CardImpl { )); // {U}{B}{R}, Sacrifice a Snail: Wick deals damage equal to the sacrificed creature's power to each opponent. Then draw cards equal to the sacrificed creature's power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(SacrificeCostCreaturesPower.instance, TargetController.OPPONENT) + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(SacrificeCostCreaturesPower.instance, TargetController.OPPONENT) .setText("{this} deals damage equal to the sacrificed creature's power to each opponent"), new ManaCostsImpl<>("{U}{B}{R}") ); ability.addEffect(new DrawCardSourceControllerEffect(SacrificeCostCreaturesPower.instance) diff --git a/Mage.Sets/src/mage/cards/w/WickedAkuba.java b/Mage.Sets/src/mage/cards/w/WickedAkuba.java index 3f601af77f1..32f48de14fa 100644 --- a/Mage.Sets/src/mage/cards/w/WickedAkuba.java +++ b/Mage.Sets/src/mage/cards/w/WickedAkuba.java @@ -41,7 +41,7 @@ public final class WickedAkuba extends CardImpl { this.toughness = new MageInt(2); // {B}: Target player dealt damage by Wicked Akuba this turn loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addTarget(new TargetPlayer(1, 1, false, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WickerboughElder.java b/Mage.Sets/src/mage/cards/w/WickerboughElder.java index a2853c19c1b..82d34aefab7 100644 --- a/Mage.Sets/src/mage/cards/w/WickerboughElder.java +++ b/Mage.Sets/src/mage/cards/w/WickerboughElder.java @@ -37,7 +37,7 @@ public final class WickerboughElder extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(1)), "with a -1/-1 counter on it")); // {G}, Remove a -1/-1 counter from Wickerbough Elder: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(1))); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WildHolocron.java b/Mage.Sets/src/mage/cards/w/WildHolocron.java index 23c07527869..0a6a00ce3fe 100644 --- a/Mage.Sets/src/mage/cards/w/WildHolocron.java +++ b/Mage.Sets/src/mage/cards/w/WildHolocron.java @@ -29,7 +29,7 @@ public final class WildHolocron extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {T}: Put a charge counter on Wild Holocron. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); // {T}, Remove a charge counter from Wild Holocron: Add {R}, {G} or {W}. Cost cost = new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)); diff --git a/Mage.Sets/src/mage/cards/w/WildMongrel.java b/Mage.Sets/src/mage/cards/w/WildMongrel.java index c4be3d76d6e..10a39157403 100644 --- a/Mage.Sets/src/mage/cards/w/WildMongrel.java +++ b/Mage.Sets/src/mage/cards/w/WildMongrel.java @@ -32,7 +32,7 @@ public final class WildMongrel extends CardImpl { // Discard a card: Wild Mongrel gets +1/+1 and becomes the color of your choice until end of turn. Effect effect = new BoostSourceEffect(1, 1, Duration.EndOfTurn); effect.setText("{this} gets +1/+1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new DiscardTargetCost(new TargetCardInHand())); + Ability ability = new SimpleActivatedAbility(effect, new DiscardTargetCost(new TargetCardInHand())); effect = new BecomesColorSourceEffect(Duration.EndOfTurn); effect.setText("and becomes the color of your choice until end of turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/w/WildernessHypnotist.java b/Mage.Sets/src/mage/cards/w/WildernessHypnotist.java index bc8fefc8d9c..795dd643a1c 100644 --- a/Mage.Sets/src/mage/cards/w/WildernessHypnotist.java +++ b/Mage.Sets/src/mage/cards/w/WildernessHypnotist.java @@ -39,7 +39,7 @@ public final class WildernessHypnotist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WildfireEmissary.java b/Mage.Sets/src/mage/cards/w/WildfireEmissary.java index e983ac17232..2cc18701c3d 100644 --- a/Mage.Sets/src/mage/cards/w/WildfireEmissary.java +++ b/Mage.Sets/src/mage/cards/w/WildfireEmissary.java @@ -31,7 +31,7 @@ public final class WildfireEmissary extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // {1}{R}: Wildfire Emissary gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private WildfireEmissary(final WildfireEmissary card) { @@ -42,4 +42,4 @@ public final class WildfireEmissary extends CardImpl { public WildfireEmissary copy() { return new WildfireEmissary(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WillOTheWisp.java b/Mage.Sets/src/mage/cards/w/WillOTheWisp.java index ba7fa53ded9..602d8918ef7 100644 --- a/Mage.Sets/src/mage/cards/w/WillOTheWisp.java +++ b/Mage.Sets/src/mage/cards/w/WillOTheWisp.java @@ -29,7 +29,7 @@ public final class WillOTheWisp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Regenerate Will-o'-the-Wisp. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private WillOTheWisp(final WillOTheWisp card) { diff --git a/Mage.Sets/src/mage/cards/w/WillingTestSubject.java b/Mage.Sets/src/mage/cards/w/WillingTestSubject.java index d6fccff2bf4..194197896d7 100644 --- a/Mage.Sets/src/mage/cards/w/WillingTestSubject.java +++ b/Mage.Sets/src/mage/cards/w/WillingTestSubject.java @@ -42,7 +42,7 @@ public final class WillingTestSubject extends CardImpl { this.addAbility(new WillingTestSubjectTriggeredAbility()); // 6: Roll a six-sided die. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new RollDiceEffect(6), new GenericManaCost(6)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WilyBandar.java b/Mage.Sets/src/mage/cards/w/WilyBandar.java index 8dc2a559ce7..44d1f686b51 100644 --- a/Mage.Sets/src/mage/cards/w/WilyBandar.java +++ b/Mage.Sets/src/mage/cards/w/WilyBandar.java @@ -28,7 +28,7 @@ public final class WilyBandar extends CardImpl { this.toughness = new MageInt(1); // {2}{G}: Wily Bandar gains indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); } private WilyBandar(final WilyBandar card) { diff --git a/Mage.Sets/src/mage/cards/w/WindDancer.java b/Mage.Sets/src/mage/cards/w/WindDancer.java index 6182d898d02..b11f4dc05b0 100644 --- a/Mage.Sets/src/mage/cards/w/WindDancer.java +++ b/Mage.Sets/src/mage/cards/w/WindDancer.java @@ -29,7 +29,7 @@ public final class WindDancer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WindingCanyons.java b/Mage.Sets/src/mage/cards/w/WindingCanyons.java index ee54a4e251d..d4a65520694 100644 --- a/Mage.Sets/src/mage/cards/w/WindingCanyons.java +++ b/Mage.Sets/src/mage/cards/w/WindingCanyons.java @@ -31,7 +31,7 @@ public final class WindingCanyons extends CardImpl { // {2}, {tap}: Until end of turn, you may cast creature spells as though they had flash. Effect effect = new AddContinuousEffectToGame(new CastAsThoughItHadFlashAllEffect(Duration.EndOfTurn, StaticFilters.FILTER_CARD_CREATURE)); effect.setText("you may cast creature spells this turn as though they had flash"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/Windreaver.java b/Mage.Sets/src/mage/cards/w/Windreaver.java index 69ad39b6a15..61052e75714 100644 --- a/Mage.Sets/src/mage/cards/w/Windreaver.java +++ b/Mage.Sets/src/mage/cards/w/Windreaver.java @@ -34,13 +34,13 @@ public final class Windreaver extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {W}: Windreaver gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {W}: Windreaver gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {U}: Switch Windreaver's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // {U}: Return Windreaver to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}"))); } private Windreaver(final Windreaver card) { diff --git a/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java b/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java index 4632a2078d3..8b286c53754 100644 --- a/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java +++ b/Mage.Sets/src/mage/cards/w/WingedTempleOfOrazca.java @@ -39,7 +39,7 @@ public final class WingedTempleOfOrazca extends CardImpl { this.addAbility(new AnyColorManaAbility()); // {1}{G}{U}, {T}: Target creature you control gains flying and gets +X/+X until end of turn, where X is its power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WingedTempleOfOrazcaEffect(), new ManaCostsImpl<>("{1}{G}{U}")); + Ability ability = new SimpleActivatedAbility(new WingedTempleOfOrazcaEffect(), new ManaCostsImpl<>("{1}{G}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WintermoonMesa.java b/Mage.Sets/src/mage/cards/w/WintermoonMesa.java index 636d5a3b524..3ebd516ad3c 100644 --- a/Mage.Sets/src/mage/cards/w/WintermoonMesa.java +++ b/Mage.Sets/src/mage/cards/w/WintermoonMesa.java @@ -30,7 +30,7 @@ public final class WintermoonMesa extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}, Sacrifice Wintermoon Mesa: Tap two target lands. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent(2)); diff --git a/Mage.Sets/src/mage/cards/w/WirewoodLodge.java b/Mage.Sets/src/mage/cards/w/WirewoodLodge.java index 5bd4487deb0..ff688112654 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodLodge.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodLodge.java @@ -35,7 +35,7 @@ public final class WirewoodLodge extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {G}, {T}: Untap target Elf. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Wishmonger.java b/Mage.Sets/src/mage/cards/w/Wishmonger.java index 4b053d5c896..f37b223a5a9 100644 --- a/Mage.Sets/src/mage/cards/w/Wishmonger.java +++ b/Mage.Sets/src/mage/cards/w/Wishmonger.java @@ -45,7 +45,7 @@ public final class Wishmonger extends CardImpl { this.toughness = new MageInt(3); // {2}: Target creature gains protection from the color of its controller's choice until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WishmongerEffect(), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new WishmongerEffect(), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/w/WitchEngine.java b/Mage.Sets/src/mage/cards/w/WitchEngine.java index b76eb01a4be..55e41f83afd 100644 --- a/Mage.Sets/src/mage/cards/w/WitchEngine.java +++ b/Mage.Sets/src/mage/cards/w/WitchEngine.java @@ -33,7 +33,7 @@ public final class WitchEngine extends CardImpl { this.addAbility(new SwampwalkAbility()); // {T}: Add {B}{B}{B}{B}. Target opponent gains control of Witch Engine. (Activate this ability only any time you could cast an instant.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana(4)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BasicManaEffect(Mana.BlackMana(4)), new TapSourceCost()); ability.addEffect(new TargetPlayerGainControlSourceEffect()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WitchHunter.java b/Mage.Sets/src/mage/cards/w/WitchHunter.java index cc9a0cb86f9..6bf1516ecf8 100644 --- a/Mage.Sets/src/mage/cards/w/WitchHunter.java +++ b/Mage.Sets/src/mage/cards/w/WitchHunter.java @@ -32,12 +32,12 @@ public final class WitchHunter extends CardImpl { this.toughness = new MageInt(1); // {tap}: Witch Hunter deals 1 damage to target player. - Ability damageAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability damageAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); damageAbility.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(damageAbility); // {1}{W}{W}, {tap}: Return target creature an opponent controls to its owner's hand. - Ability returnAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{W}{W}")); + Ability returnAbility = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{W}{W}")); returnAbility.addCost(new TapSourceCost()); TargetCreaturePermanent target = new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE); returnAbility.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/w/WitchesEye.java b/Mage.Sets/src/mage/cards/w/WitchesEye.java index 5f26cb3b863..1752e253bab 100644 --- a/Mage.Sets/src/mage/cards/w/WitchesEye.java +++ b/Mage.Sets/src/mage/cards/w/WitchesEye.java @@ -30,7 +30,7 @@ public final class WitchesEye extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{1}, {T}: Scry 1." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new GenericManaCost(1)); + Ability gainedAbility = new SimpleActivatedAbility(new ScryEffect(1, false), new GenericManaCost(1)); gainedAbility.addCost(new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/w/WitchingWell.java b/Mage.Sets/src/mage/cards/w/WitchingWell.java index 80d81f875d6..51cd7a5e5a7 100644 --- a/Mage.Sets/src/mage/cards/w/WitchingWell.java +++ b/Mage.Sets/src/mage/cards/w/WitchingWell.java @@ -28,7 +28,7 @@ public final class WitchingWell extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(2))); // {3}{U}, Sacrifice Witching Well: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WitchsMist.java b/Mage.Sets/src/mage/cards/w/WitchsMist.java index db115c6541f..38310c003ff 100644 --- a/Mage.Sets/src/mage/cards/w/WitchsMist.java +++ b/Mage.Sets/src/mage/cards/w/WitchsMist.java @@ -32,7 +32,7 @@ public final class WitchsMist extends CardImpl { // {2}{B}, {T}: Destroy target creature that was dealt damage this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(),new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WitheredWretch.java b/Mage.Sets/src/mage/cards/w/WitheredWretch.java index 9ed0abc99ed..23628f660fa 100644 --- a/Mage.Sets/src/mage/cards/w/WitheredWretch.java +++ b/Mage.Sets/src/mage/cards/w/WitheredWretch.java @@ -29,7 +29,7 @@ public final class WitheredWretch extends CardImpl { this.toughness = new MageInt(2); // {1}: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(1)); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WizardReplica.java b/Mage.Sets/src/mage/cards/w/WizardReplica.java index 0ad89cc697d..6272acab880 100644 --- a/Mage.Sets/src/mage/cards/w/WizardReplica.java +++ b/Mage.Sets/src/mage/cards/w/WizardReplica.java @@ -30,7 +30,7 @@ public final class WizardReplica extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(2)), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Woeleecher.java b/Mage.Sets/src/mage/cards/w/Woeleecher.java index b81da62781e..a1303346ce5 100644 --- a/Mage.Sets/src/mage/cards/w/Woeleecher.java +++ b/Mage.Sets/src/mage/cards/w/Woeleecher.java @@ -34,7 +34,7 @@ public final class Woeleecher extends CardImpl { this.toughness = new MageInt(5); // {W}, {tap}: Remove a -1/-1 counter from target creature. If you do, you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WoeleecherEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new WoeleecherEffect(), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WojekApothecary.java b/Mage.Sets/src/mage/cards/w/WojekApothecary.java index 51be0ec847d..4eb21bd55c3 100644 --- a/Mage.Sets/src/mage/cards/w/WojekApothecary.java +++ b/Mage.Sets/src/mage/cards/w/WojekApothecary.java @@ -40,7 +40,7 @@ public final class WojekApothecary extends CardImpl { this.toughness = new MageInt(1); // Radiance - {T}: Prevent the next 1 damage that would be dealt to target creature and each other creature that shares a color with it this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WojekApothecaryEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new WojekApothecaryEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.setAbilityWord(AbilityWord.RADIANCE); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WojekEmbermage.java b/Mage.Sets/src/mage/cards/w/WojekEmbermage.java index 25dda3e34ce..d7db1328dbc 100644 --- a/Mage.Sets/src/mage/cards/w/WojekEmbermage.java +++ b/Mage.Sets/src/mage/cards/w/WojekEmbermage.java @@ -33,7 +33,7 @@ public final class WojekEmbermage extends CardImpl { this.toughness = new MageInt(2); // Radiance - {tap}: Wojek Embermage deals 1 damage to target creature and each other creature that shares a color with it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WojekEmbermageEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new WojekEmbermageEffect(), new TapSourceCost()); ability.setAbilityWord(AbilityWord.RADIANCE); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java index 1f41fadcea3..192954a6937 100644 --- a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java @@ -34,14 +34,14 @@ public final class WolfhuntersQuiver extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{T}: This creature deals 1 damage to any target" - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability abilityToGain = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); abilityToGain.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{T}: This creature deals 1 damage to any target\""); SimpleStaticAbility ability = new SimpleStaticAbility(effect); // and "{T}: This creature deals 3 damage to target Werewolf creature." - abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + abilityToGain = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); abilityToGain.addTarget(new TargetCreaturePermanent(filter)); effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); effect.setText("and \"{T}: This creature deals 3 damage to target Werewolf creature.\""); diff --git a/Mage.Sets/src/mage/cards/w/WolfirAvenger.java b/Mage.Sets/src/mage/cards/w/WolfirAvenger.java index b24602327f2..f4e6a2581b5 100644 --- a/Mage.Sets/src/mage/cards/w/WolfirAvenger.java +++ b/Mage.Sets/src/mage/cards/w/WolfirAvenger.java @@ -29,7 +29,7 @@ public final class WolfirAvenger extends CardImpl { this.addAbility(FlashAbility.getInstance()); // {1}{G}: Regenerate Wolfir Avenger. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private WolfirAvenger(final WolfirAvenger card) { diff --git a/Mage.Sets/src/mage/cards/w/WonderscapeSage.java b/Mage.Sets/src/mage/cards/w/WonderscapeSage.java index d45845bd93c..18d379ba5d6 100644 --- a/Mage.Sets/src/mage/cards/w/WonderscapeSage.java +++ b/Mage.Sets/src/mage/cards/w/WonderscapeSage.java @@ -36,7 +36,7 @@ public final class WonderscapeSage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {T}, Return a land you control to its owner's hand: Draw a card. Then discard a card unless that land had a nonbasic land type. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WonderscapeSageEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new WonderscapeSageEffect(), new TapSourceCost()); ability.addCost(new WonderscapeSageReturnCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/Woodripper.java b/Mage.Sets/src/mage/cards/w/Woodripper.java index f2833ccf85a..a5ff652648a 100644 --- a/Mage.Sets/src/mage/cards/w/Woodripper.java +++ b/Mage.Sets/src/mage/cards/w/Woodripper.java @@ -32,7 +32,7 @@ public final class Woodripper extends CardImpl { // Fading 3 this.addAbility(new FadingAbility(3, this)); // {1}, Remove a fade counter from Woodripper: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.FADE.createInstance())); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WoodweaversPuzzleknot.java b/Mage.Sets/src/mage/cards/w/WoodweaversPuzzleknot.java index 2cedeb17e79..4a054e79fff 100644 --- a/Mage.Sets/src/mage/cards/w/WoodweaversPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/w/WoodweaversPuzzleknot.java @@ -32,7 +32,7 @@ public final class WoodweaversPuzzleknot extends CardImpl { this.addAbility(ability); // {2}{G}, Sacrifice Woodweaver's Puzzleknot: You gain 3 life and get {E}{E}{E}. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{2}{G}")); + ability = new SimpleActivatedAbility(new GainLifeEffect(3), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java b/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java index 88212c762c1..3642d9cce99 100644 --- a/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java +++ b/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java @@ -41,7 +41,7 @@ public final class WoodwraithCorrupter extends CardImpl { // {1}{B}{G}, {T}: Target Forest becomes a 4/4 black and green Elemental Horror creature. It's still a land. Effect effect = new BecomesCreatureTargetEffect(new WoodwraithCorrupterToken(), false, true, Duration.Custom); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}{G}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WoodwraithStrangler.java b/Mage.Sets/src/mage/cards/w/WoodwraithStrangler.java index 4a9b629bb96..6dac0b2a8e9 100644 --- a/Mage.Sets/src/mage/cards/w/WoodwraithStrangler.java +++ b/Mage.Sets/src/mage/cards/w/WoodwraithStrangler.java @@ -28,7 +28,7 @@ public final class WoodwraithStrangler extends CardImpl { this.toughness = new MageInt(2); // Exile a creature card from your graveyard: Regenerate Woodwraith Strangler. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard"))))); } diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWar.java b/Mage.Sets/src/mage/cards/w/WordsOfWar.java index 3b1841f72ec..f94ef7e7e36 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWar.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWar.java @@ -28,7 +28,7 @@ public final class WordsOfWar extends CardImpl { // {1}: The next time you would draw a card this turn, Words of War deals 2 damage to any target instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWarEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new WordsOfWarEffect(), new GenericManaCost(1)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWaste.java b/Mage.Sets/src/mage/cards/w/WordsOfWaste.java index ab0d1eea7b4..e8d3a74fc68 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWaste.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWaste.java @@ -28,7 +28,7 @@ public final class WordsOfWaste extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // {1}: The next time you would draw a card this turn, each opponent discards a card instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWasteEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new WordsOfWasteEffect(), new ManaCostsImpl<>("{1}"))); } private WordsOfWaste(final WordsOfWaste card) { diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWilding.java b/Mage.Sets/src/mage/cards/w/WordsOfWilding.java index 58795cea87b..f6b134fb23e 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWilding.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWilding.java @@ -28,7 +28,7 @@ public final class WordsOfWilding extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // {1}: The next time you would draw a card this turn, create a 2/2 green Bear creature token instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWildingEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new WordsOfWildingEffect(), new ManaCostsImpl<>("{1}"))); } private WordsOfWilding(final WordsOfWilding card) { diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWind.java b/Mage.Sets/src/mage/cards/w/WordsOfWind.java index 2adf2ed5c0d..b9dc02887b3 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWind.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWind.java @@ -30,7 +30,7 @@ public final class WordsOfWind extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // {1}: The next time you would draw a card this turn, each player returns a permanent they control to its owner's hand instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWindEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new WordsOfWindEffect(), new ManaCostsImpl<>("{1}"))); } private WordsOfWind(final WordsOfWind card) { diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWorship.java b/Mage.Sets/src/mage/cards/w/WordsOfWorship.java index 90ef4491ce7..b2deda7bcb6 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWorship.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWorship.java @@ -26,7 +26,7 @@ public final class WordsOfWorship extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); // {1}: The next time you would draw a card this turn, you gain 5 life instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWorshipEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new WordsOfWorshipEffect(), new GenericManaCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java b/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java index 5e381acc6ca..e6a6f649549 100644 --- a/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java +++ b/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java @@ -30,7 +30,7 @@ public final class WorldBottlingKit extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {5}, Sacrifice World-Bottling Kit: Choose a Magic set. Exile all permanents with that set’s expansion symbol except for basic lands. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WorldBottlingKitEffect(), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new WorldBottlingKitEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java index 712301dff85..0b005173f1c 100644 --- a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java @@ -47,7 +47,7 @@ public final class WurmweaverCoil extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); - Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WurmToken(), 1), new ManaCostsImpl<>("{G}{G}{G}")); + Ability activatedAbility = new SimpleActivatedAbility(new CreateTokenEffect(new WurmToken(), 1), new ManaCostsImpl<>("{G}{G}{G}")); activatedAbility.addCost(new SacrificeSourceCost()); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java b/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java index bde670a66dc..6bcd218a63a 100644 --- a/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java +++ b/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java @@ -36,7 +36,7 @@ public final class WydwenTheBitingGale extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}{B}, Pay 1 life: Return Wydwen, the Biting Gale to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WyluliWolf.java b/Mage.Sets/src/mage/cards/w/WyluliWolf.java index dd0c01d81ea..401fae31e6f 100644 --- a/Mage.Sets/src/mage/cards/w/WyluliWolf.java +++ b/Mage.Sets/src/mage/cards/w/WyluliWolf.java @@ -29,7 +29,7 @@ public final class WyluliWolf extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } -- 2.47.2 From 0e1fa94a11b31eca4a96089b152274f6b2bf435a Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:31:37 -0500 Subject: [PATCH 46/50] refactor: SimpleActivatedAbility default zone (cards X Y Z, emblems, tokens) --- Mage.Sets/src/mage/cards/x/XWing.java | 2 +- Mage.Sets/src/mage/cards/x/XanthicStatue.java | 2 +- Mage.Sets/src/mage/cards/x/XathridSlyblade.java | 2 +- Mage.Sets/src/mage/cards/x/XenicPoltergeist.java | 2 +- Mage.Sets/src/mage/cards/x/XiraArien.java | 2 +- Mage.Sets/src/mage/cards/y/YavimayaAncients.java | 2 +- Mage.Sets/src/mage/cards/y/YavimayaElder.java | 2 +- Mage.Sets/src/mage/cards/y/YavimayaGnats.java | 2 +- Mage.Sets/src/mage/cards/y/YavimayaHollow.java | 2 +- Mage.Sets/src/mage/cards/y/YawgmothsBargain.java | 2 +- Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java | 2 +- Mage.Sets/src/mage/cards/z/ZacamaPrimalCalamity.java | 6 +++--- Mage.Sets/src/mage/cards/z/ZarichiTiger.java | 2 +- Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java | 2 +- Mage.Sets/src/mage/cards/z/ZealousInquisitor.java | 2 +- Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java | 2 +- Mage.Sets/src/mage/cards/z/ZelyonSword.java | 2 +- Mage.Sets/src/mage/cards/z/ZephyrCharge.java | 2 +- Mage.Sets/src/mage/cards/z/ZephyrScribe.java | 2 +- Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java | 2 +- Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java | 2 +- Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java | 2 +- Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java | 2 +- Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java | 2 +- Mage.Sets/src/mage/cards/z/ZofShade.java | 2 +- Mage.Sets/src/mage/cards/z/ZombieAssassin.java | 2 +- Mage.Sets/src/mage/cards/z/ZombieMaster.java | 2 +- Mage.Sets/src/mage/cards/z/ZombieScavengers.java | 2 +- Mage.Sets/src/mage/cards/z/Zoologist.java | 2 +- Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java | 2 +- Mage.Sets/src/mage/cards/z/ZuranOrb.java | 2 +- Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java | 2 +- .../game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java | 2 +- .../mage/game/command/emblems/KothOfTheHammerEmblem.java | 2 +- .../java/mage/game/permanent/token/DeathpactAngelToken.java | 2 +- .../mage/game/permanent/token/DragonEggDragonToken.java | 2 +- .../mage/game/permanent/token/GoldmeadowHarrierToken.java | 2 +- .../main/java/mage/game/permanent/token/LandMineToken.java | 2 +- .../game/permanent/token/NighteyesTheDesecratorToken.java | 2 +- .../mage/game/permanent/token/SengirNosferatuBatToken.java | 2 +- .../mage/game/permanent/token/SkeletonRegenerateToken.java | 2 +- .../java/mage/game/permanent/token/TriskelaviteToken.java | 2 +- 42 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Mage.Sets/src/mage/cards/x/XWing.java b/Mage.Sets/src/mage/cards/x/XWing.java index 3d494e494fc..78f0a744a1a 100644 --- a/Mage.Sets/src/mage/cards/x/XWing.java +++ b/Mage.Sets/src/mage/cards/x/XWing.java @@ -32,7 +32,7 @@ public final class XWing extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // {W}: X-Wing gains viginlance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/x/XanthicStatue.java b/Mage.Sets/src/mage/cards/x/XanthicStatue.java index 3f435169fe5..bfde2c0c8e4 100644 --- a/Mage.Sets/src/mage/cards/x/XanthicStatue.java +++ b/Mage.Sets/src/mage/cards/x/XanthicStatue.java @@ -24,7 +24,7 @@ public final class XanthicStatue extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{8}"); // {5}: Until end of turn, Xanthic Statue becomes an 8/8 Golem artifact creature with trample. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new XanthicStatueCreature(), CardType.ARTIFACT, Duration.EndOfTurn) + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new XanthicStatueCreature(), CardType.ARTIFACT, Duration.EndOfTurn) .setText("until end of turn, {this} becomes an 8/8 Golem artifact creature with trample") , new ManaCostsImpl<>("{5}"))); } diff --git a/Mage.Sets/src/mage/cards/x/XathridSlyblade.java b/Mage.Sets/src/mage/cards/x/XathridSlyblade.java index 329549bccb7..e48e621352b 100644 --- a/Mage.Sets/src/mage/cards/x/XathridSlyblade.java +++ b/Mage.Sets/src/mage/cards/x/XathridSlyblade.java @@ -38,7 +38,7 @@ public final class XathridSlyblade extends CardImpl { // {3}{B}: Until end of turn, Xathrid Slyblade loses hexproof and gains first strike and deathtouch. Effect effect = new LoseAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn); effect.setText("Until end of turn, {this} loses hexproof"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{B}")); Effect effect2 = new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect2.setText("and gains first strike"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java index 9cd5b7d202c..20e9949ff7c 100644 --- a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java +++ b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java @@ -42,7 +42,7 @@ public final class XenicPoltergeist extends CardImpl { this.toughness = new MageInt(1); // {tap}: Until your next upkeep, target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new XenicPoltergeistEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new XenicPoltergeistEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/x/XiraArien.java b/Mage.Sets/src/mage/cards/x/XiraArien.java index 97e7213a50e..fcad00eb3d4 100644 --- a/Mage.Sets/src/mage/cards/x/XiraArien.java +++ b/Mage.Sets/src/mage/cards/x/XiraArien.java @@ -35,7 +35,7 @@ public final class XiraArien extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}{R}{G}, {tap}: Target player draws a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl<>("{B}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new DrawCardTargetEffect(1), new ManaCostsImpl<>("{B}{R}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/y/YavimayaAncients.java b/Mage.Sets/src/mage/cards/y/YavimayaAncients.java index 84c0cf5ae1f..7758bbe6353 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaAncients.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaAncients.java @@ -26,7 +26,7 @@ public final class YavimayaAncients extends CardImpl { this.toughness = new MageInt(7); // {G}: Yavimaya Ancients gets +1/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private YavimayaAncients(final YavimayaAncients card) { diff --git a/Mage.Sets/src/mage/cards/y/YavimayaElder.java b/Mage.Sets/src/mage/cards/y/YavimayaElder.java index 5a948f2a9bd..a75b5ef9b66 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaElder.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaElder.java @@ -36,7 +36,7 @@ public final class YavimayaElder extends CardImpl { // When Yavimaya Elder dies, you may search your library for up to two basic land cards, reveal them, and put them into your hand. If you do, shuffle your library. this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), true)); // {2}, Sacrifice Yavimaya Elder: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/y/YavimayaGnats.java b/Mage.Sets/src/mage/cards/y/YavimayaGnats.java index 2ab39811643..c630912d3a7 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaGnats.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaGnats.java @@ -28,7 +28,7 @@ public final class YavimayaGnats extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {G}: Regenerate Yavimaya Gnats. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private YavimayaGnats(final YavimayaGnats card) { diff --git a/Mage.Sets/src/mage/cards/y/YavimayaHollow.java b/Mage.Sets/src/mage/cards/y/YavimayaHollow.java index 56de4fa929a..6c0c97431bc 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaHollow.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaHollow.java @@ -29,7 +29,7 @@ public final class YavimayaHollow extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {G}, {tap}: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java b/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java index c88b6042cb6..e05e40826c4 100644 --- a/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java +++ b/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java @@ -26,7 +26,7 @@ public final class YawgmothsBargain extends CardImpl { this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Pay 1 life: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new PayLifeCost(1))); } private YawgmothsBargain(final YawgmothsBargain card) { diff --git a/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java b/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java index 2704873b346..81c4253687c 100644 --- a/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java +++ b/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java @@ -43,7 +43,7 @@ public final class YisanTheWandererBard extends CardImpl { this.toughness = new MageInt(3); // {2}{G}, {T}, Put a verse counter on Yisan, the Wanderer Bard: Search your library for a creature card with converted mana cost equal to the number of verse counters on Yisan, put it onto the battlefield, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new YisanTheWandererBardEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new YisanTheWandererBardEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new PutCountersSourceCost(CounterType.VERSE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/z/ZacamaPrimalCalamity.java b/Mage.Sets/src/mage/cards/z/ZacamaPrimalCalamity.java index cf448479cdb..c5ffe9fe2a6 100644 --- a/Mage.Sets/src/mage/cards/z/ZacamaPrimalCalamity.java +++ b/Mage.Sets/src/mage/cards/z/ZacamaPrimalCalamity.java @@ -57,17 +57,17 @@ public final class ZacamaPrimalCalamity extends CardImpl { "When {this} enters, if you cast it, untap all lands you control.")); // {2}{R}: Zacama deals 3 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}{G}: Destroy target artifact or enchantment. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{G}")); + ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); // {2}{W}: You gain 3 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(3), new ManaCostsImpl<>("{2}{W}"))); } private ZacamaPrimalCalamity(final ZacamaPrimalCalamity card) { diff --git a/Mage.Sets/src/mage/cards/z/ZarichiTiger.java b/Mage.Sets/src/mage/cards/z/ZarichiTiger.java index 29a5154be28..b8ae0f16b26 100644 --- a/Mage.Sets/src/mage/cards/z/ZarichiTiger.java +++ b/Mage.Sets/src/mage/cards/z/ZarichiTiger.java @@ -28,7 +28,7 @@ public final class ZarichiTiger extends CardImpl { this.toughness = new MageInt(3); // 1{W}, {T}: You gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java b/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java index 5edc0b1e7ce..6148403040e 100644 --- a/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/z/ZealotOfTheGodPharaoh.java @@ -28,7 +28,7 @@ public final class ZealotOfTheGodPharaoh extends CardImpl { this.toughness = new MageInt(3); // {4}{R}: Zealot of the God-Pharaoh deals 2 damage to target opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java b/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java index 4c82bbfa951..ff41ba72c69 100644 --- a/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java +++ b/Mage.Sets/src/mage/cards/z/ZealousInquisitor.java @@ -29,7 +29,7 @@ public final class ZealousInquisitor extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java b/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java index a23b545a576..a61dbd79441 100644 --- a/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java +++ b/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java @@ -41,7 +41,7 @@ public final class ZedruuTheGreathearted extends CardImpl { this.addAbility(ability); // {R}{W}{U}: Target opponent gains control of target permanent you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TargetPlayerGainControlTargetPermanentEffect(), new ManaCostsImpl<>("{U}{R}{W}")); + ability = new SimpleActivatedAbility(new TargetPlayerGainControlTargetPermanentEffect(), new ManaCostsImpl<>("{U}{R}{W}")); ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/z/ZelyonSword.java b/Mage.Sets/src/mage/cards/z/ZelyonSword.java index f1f6db43b60..43743b5d67d 100644 --- a/Mage.Sets/src/mage/cards/z/ZelyonSword.java +++ b/Mage.Sets/src/mage/cards/z/ZelyonSword.java @@ -29,7 +29,7 @@ public final class ZelyonSword extends CardImpl { // You may choose not to untap Zelyon Sword during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {3}, {tap}: Target creature gets +2/+0 for as long as Zelyon Sword remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 0, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +2/+0 for as long as {this} remains tapped"), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrCharge.java b/Mage.Sets/src/mage/cards/z/ZephyrCharge.java index 4826031f057..49e168dc164 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrCharge.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrCharge.java @@ -24,7 +24,7 @@ public final class ZephyrCharge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); // {1}{U}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZephyrScribe.java b/Mage.Sets/src/mage/cards/z/ZephyrScribe.java index 65e11bc79c9..90a094aeb41 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrScribe.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrScribe.java @@ -29,7 +29,7 @@ public final class ZephyrScribe extends CardImpl { this.toughness = new MageInt(1); // {U}, {T}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1,1), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(1,1), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java b/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java index a4e27058400..b621d25d703 100644 --- a/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java +++ b/Mage.Sets/src/mage/cards/z/ZerapaMinotaur.java @@ -27,7 +27,7 @@ public final class ZerapaMinotaur extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {2}: Zerapa Minotaur loses first strike until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( + SimpleActivatedAbility ability = new SimpleActivatedAbility(new LoseAbilitySourceEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java b/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java index 6c5daf87195..516b3c24a85 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java @@ -39,7 +39,7 @@ public final class ZhalfirinCommander extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {1}{W}{W}: Target Knight creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java index cc3078123a5..cee3d76a27c 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java @@ -33,7 +33,7 @@ public final class ZhalfirinCrusader extends CardImpl { this.addAbility(new FlankingAbility()); // {1}{W}: The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to any target instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java b/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java index 1b0be26f597..3fc44cd838a 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinKnight.java @@ -31,7 +31,7 @@ public final class ZhalfirinKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {W}{W}: Zhalfirin Knight gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private ZhalfirinKnight(final ZhalfirinKnight card) { diff --git a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java index 7fa61fc4ef9..aaefa4c9f1e 100644 --- a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java @@ -40,7 +40,7 @@ public final class ZirilanOfTheClaw extends CardImpl { // {1}{R}{R}, {tap}: Search your library for a Dragon permanent card and put that card onto the battlefield. Then shuffle your library. // That Dragon gains haste until end of turn. Exile it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZirilanOfTheClawEffect(), new ManaCostsImpl<>("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new ZirilanOfTheClawEffect(), new ManaCostsImpl<>("{1}{R}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZofShade.java b/Mage.Sets/src/mage/cards/z/ZofShade.java index 9b8bd82468b..ee3d6616f68 100644 --- a/Mage.Sets/src/mage/cards/z/ZofShade.java +++ b/Mage.Sets/src/mage/cards/z/ZofShade.java @@ -26,7 +26,7 @@ public final class ZofShade extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); } private ZofShade(final ZofShade card) { diff --git a/Mage.Sets/src/mage/cards/z/ZombieAssassin.java b/Mage.Sets/src/mage/cards/z/ZombieAssassin.java index 90b85873a7b..d5ef339caf1 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieAssassin.java +++ b/Mage.Sets/src/mage/cards/z/ZombieAssassin.java @@ -32,7 +32,7 @@ public final class ZombieAssassin extends CardImpl { this.toughness = new MageInt(2); // {tap}, Exile two cards from your graveyard and Zombie Assassin: Destroy target nonblack 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()); Target target = new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK); ability.addTarget(target); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2,2,StaticFilters.FILTER_CARDS_FROM_YOUR_GRAVEYARD))); diff --git a/Mage.Sets/src/mage/cards/z/ZombieMaster.java b/Mage.Sets/src/mage/cards/z/ZombieMaster.java index 9e8bc0deaf3..e85cc7f10ad 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieMaster.java +++ b/Mage.Sets/src/mage/cards/z/ZombieMaster.java @@ -43,7 +43,7 @@ public final class ZombieMaster extends CardImpl { effect.setText("Other Zombie creatures have swampwalk. (They can't be blocked as long as defending player controls a Swamp.)"); this.addAbility(new SimpleStaticAbility(effect)); // Other Zombies have "{B}: Regenerate this permanent." - effect = new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")), Duration.WhileOnBattlefield, filter, true); + effect = new GainAbilityAllEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")), Duration.WhileOnBattlefield, filter, true); effect.setText("Other Zombies have \"{B}: Regenerate this permanent.\""); this.addAbility(new SimpleStaticAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/z/ZombieScavengers.java b/Mage.Sets/src/mage/cards/z/ZombieScavengers.java index cf18682538e..70622498fce 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieScavengers.java +++ b/Mage.Sets/src/mage/cards/z/ZombieScavengers.java @@ -25,7 +25,7 @@ public final class ZombieScavengers extends CardImpl { this.toughness = new MageInt(1); // Exile the top creature card of your graveyard: Regenerate Zombie Scavengers. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ExileTopCreatureCardOfGraveyardCost(1))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ExileTopCreatureCardOfGraveyardCost(1))); } private ZombieScavengers(final ZombieScavengers card) { diff --git a/Mage.Sets/src/mage/cards/z/Zoologist.java b/Mage.Sets/src/mage/cards/z/Zoologist.java index 42519daa312..255678f8e58 100644 --- a/Mage.Sets/src/mage/cards/z/Zoologist.java +++ b/Mage.Sets/src/mage/cards/z/Zoologist.java @@ -34,7 +34,7 @@ public final class Zoologist extends CardImpl { this.toughness = new MageInt(2); // {3}{G}, {tap}: Reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, put it into your graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZoologistEffect(), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new ZoologistEffect(), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java index 19a532e09e0..7840ec91610 100644 --- a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java +++ b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java @@ -58,7 +58,7 @@ public final class ZurEternalSchemer extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, filter))); // {1}{W}: Target non-Aura enchantment you control becomes a creature in addition to its other types and has base power and toughness each equal to its mana value. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZurEternalSchemerEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new ZurEternalSchemerEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetPermanent(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZuranOrb.java b/Mage.Sets/src/mage/cards/z/ZuranOrb.java index a32f3b12b5d..989699b824d 100644 --- a/Mage.Sets/src/mage/cards/z/ZuranOrb.java +++ b/Mage.Sets/src/mage/cards/z/ZuranOrb.java @@ -22,7 +22,7 @@ public final class ZuranOrb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); // Sacrifice a land: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); } private ZuranOrb(final ZuranOrb card) { diff --git a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java index 17a48ee8741..31b5e8d7f2c 100644 --- a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java +++ b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java @@ -26,7 +26,7 @@ public final class ZuranSpellcaster extends CardImpl { this.toughness = new MageInt(1); // {T}: Zuran Spellcaster deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java index 038807501f8..d722d1e07ce 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java @@ -30,7 +30,7 @@ public final class ArlinnEmbracedByTheMoonEmblem extends Emblem { Ability ability = new SimpleStaticAbility(Zone.COMMAND, effect); Effect effect2 = new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE); effect2.setText("This creature deals damage equal to its power to any target"); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect2, new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(effect2, new TapSourceCost()); ability2.addTarget(new TargetAnyTarget()); effect = new GainAbilityControlledEffect(ability2, Duration.EndOfGame, filter); effect.setText("and '{T}: This creature deals damage equal to its power to any target"); diff --git a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java index b1195f84338..8d7ce7ba7eb 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -58,7 +58,7 @@ class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { case AbilityAddingRemovingEffects_6: if (sublayer == SubLayer.NA) { for (Permanent permanent : game.getBattlefield().getActivePermanents(mountains, source.getControllerId(), source, game)) { - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); permanent.addAbility(ability, source.getSourceId(), game); } diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java index 9ca2fc6db27..507f154601a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -37,7 +37,7 @@ public final class DeathpactAngelToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{3}{W}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{3}{W}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java index 573d48400f1..b82605fc24b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java @@ -24,7 +24,7 @@ public final class DragonEggDragonToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn) + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn) .setText("This creature gets +1/+0 until end of turn"), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java index 4da24e76039..a3f1887f17d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java @@ -27,7 +27,7 @@ public final class GoldmeadowHarrierToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java index 0ac1e70b674..7ca06d55e7c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java @@ -27,7 +27,7 @@ public final class LandMineToken extends TokenImpl { public LandMineToken() { super("Land Mine", "colorless artifact token named Land Mine with \"{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying.\""); cardType.add(CardType.ARTIFACT); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java index 73ba1ce7adb..dc11eaf6383 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java @@ -29,7 +29,7 @@ public final class NighteyesTheDesecratorToken extends TokenImpl { power = new MageInt(4); toughness = new MageInt(2); // {4}{B}: Put target creature card from a graveyard onto the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{B}")); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java index 6a2c86a11c2..10af65548e9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java @@ -38,7 +38,7 @@ public final class SengirNosferatuBatToken extends TokenImpl { // {1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner’s control. ReturnSengirNosferatuEffect effect = new ReturnSengirNosferatuEffect(); effect.setText("Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java index 6f1807e3d4d..f54be1f4a7a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java @@ -18,7 +18,7 @@ public final class SkeletonRegenerateToken extends TokenImpl { color.setBlack(true); power = new MageInt(1); toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } private SkeletonRegenerateToken(final SkeletonRegenerateToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java index 9ce58443694..74b6446abab 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java @@ -24,7 +24,7 @@ public final class TriskelaviteToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); -- 2.47.2 From 762edb2048f46c515d649afdb848c6c5006587b3 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:32:49 -0500 Subject: [PATCH 47/50] refactor: SimpleActivatedAbility default zone (before newline) --- Mage.Sets/src/mage/cards/a/AerieMystics.java | 2 +- Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java | 2 +- Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java | 2 +- Mage.Sets/src/mage/cards/a/AmrouScout.java | 2 +- Mage.Sets/src/mage/cards/a/AncestorsProphet.java | 2 +- Mage.Sets/src/mage/cards/a/AndraditeLeech.java | 2 +- Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java | 2 +- Mage.Sets/src/mage/cards/a/AquastrandSpider.java | 2 +- Mage.Sets/src/mage/cards/a/ArachnusSpinner.java | 2 +- Mage.Sets/src/mage/cards/a/ArcticAven.java | 2 +- Mage.Sets/src/mage/cards/a/ArmillarySphere.java | 2 +- Mage.Sets/src/mage/cards/a/ArmsDealer.java | 2 +- Mage.Sets/src/mage/cards/a/ArmyAnts.java | 2 +- Mage.Sets/src/mage/cards/a/AstromechDroid.java | 2 +- Mage.Sets/src/mage/cards/a/Atogatog.java | 2 +- Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java | 4 ++-- Mage.Sets/src/mage/cards/b/BattleRampart.java | 2 +- Mage.Sets/src/mage/cards/b/BeguilerOfWills.java | 2 +- Mage.Sets/src/mage/cards/b/BehindTheScenes.java | 2 +- Mage.Sets/src/mage/cards/b/BelbesPortal.java | 2 +- Mage.Sets/src/mage/cards/b/BighornerRancher.java | 2 +- Mage.Sets/src/mage/cards/b/BlackManaBattery.java | 2 +- Mage.Sets/src/mage/cards/b/Blessing.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedFen.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedGorge.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedSteppe.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedWoodland.java | 2 +- Mage.Sets/src/mage/cards/b/Blightspeaker.java | 2 +- Mage.Sets/src/mage/cards/b/BlockadeRunner.java | 2 +- Mage.Sets/src/mage/cards/b/BloodletterQuill.java | 2 +- Mage.Sets/src/mage/cards/b/BloodshotCyclops.java | 2 +- Mage.Sets/src/mage/cards/b/BloodthornTaunter.java | 2 +- Mage.Sets/src/mage/cards/b/BlueManaBattery.java | 2 +- Mage.Sets/src/mage/cards/b/BogbrewWitch.java | 2 +- Mage.Sets/src/mage/cards/b/Boompile.java | 2 +- Mage.Sets/src/mage/cards/b/Bramblesnap.java | 2 +- Mage.Sets/src/mage/cards/c/CacklingWitch.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionFeeder.java | 2 +- Mage.Sets/src/mage/cards/c/CatharticAdept.java | 2 +- Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java | 4 ++-- Mage.Sets/src/mage/cards/c/ClockOfOmens.java | 2 +- Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java | 6 +++--- Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java | 2 +- Mage.Sets/src/mage/cards/c/Cursecatcher.java | 2 +- Mage.Sets/src/mage/cards/d/DarkApostle.java | 2 +- Mage.Sets/src/mage/cards/d/DarkMaze.java | 2 +- Mage.Sets/src/mage/cards/d/DaruEncampment.java | 2 +- Mage.Sets/src/mage/cards/d/DawnglareInvoker.java | 2 +- Mage.Sets/src/mage/cards/d/DawntreaderElk.java | 2 +- Mage.Sets/src/mage/cards/d/DeathCultist.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeathlessAngel.java | 2 +- Mage.Sets/src/mage/cards/d/DeathsporeThallid.java | 2 +- Mage.Sets/src/mage/cards/d/DefiantFalcon.java | 2 +- Mage.Sets/src/mage/cards/d/DefiantVanguard.java | 2 +- Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java | 4 ++-- Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java | 2 +- Mage.Sets/src/mage/cards/d/DesolateLighthouse.java | 2 +- Mage.Sets/src/mage/cards/d/DiscordantDirge.java | 2 +- Mage.Sets/src/mage/cards/d/DragonHatchling.java | 2 +- Mage.Sets/src/mage/cards/d/DragonWhelp.java | 2 +- Mage.Sets/src/mage/cards/d/DragonWhisperer.java | 2 +- Mage.Sets/src/mage/cards/d/DreamstoneHedron.java | 2 +- Mage.Sets/src/mage/cards/d/DrossHopper.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishPiper.java | 2 +- Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java | 2 +- Mage.Sets/src/mage/cards/e/EnslavedScout.java | 2 +- Mage.Sets/src/mage/cards/e/EsperBattlemage.java | 4 ++-- Mage.Sets/src/mage/cards/e/EtherealUsher.java | 2 +- Mage.Sets/src/mage/cards/e/ExpeditionMap.java | 2 +- Mage.Sets/src/mage/cards/e/EyeOfUgin.java | 2 +- Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java | 2 +- Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java | 2 +- Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java | 2 +- Mage.Sets/src/mage/cards/f/FanaticalDevotion.java | 2 +- Mage.Sets/src/mage/cards/f/FaunaShaman.java | 2 +- Mage.Sets/src/mage/cards/f/FeralAnimist.java | 2 +- Mage.Sets/src/mage/cards/f/FireShrineKeeper.java | 2 +- Mage.Sets/src/mage/cards/f/FirebrandRanger.java | 2 +- Mage.Sets/src/mage/cards/f/FlamekinVillage.java | 2 +- Mage.Sets/src/mage/cards/f/FlinthoofBoar.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneMauler.java | 2 +- Mage.Sets/src/mage/cards/f/FreewindEquenaut.java | 2 +- Mage.Sets/src/mage/cards/f/FromBeyond.java | 2 +- Mage.Sets/src/mage/cards/f/FrontierGuide.java | 2 +- Mage.Sets/src/mage/cards/f/FungalBloom.java | 2 +- Mage.Sets/src/mage/cards/f/FungalPlots.java | 2 +- Mage.Sets/src/mage/cards/g/GearseekerSerpent.java | 2 +- Mage.Sets/src/mage/cards/g/GeneralHux.java | 2 +- Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java | 2 +- Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java | 2 +- Mage.Sets/src/mage/cards/g/GhituEncampment.java | 2 +- Mage.Sets/src/mage/cards/g/GnarledEffigy.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinDiplomats.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinKites.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWizard.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoreVassal.java | 2 +- Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java | 2 +- Mage.Sets/src/mage/cards/g/GreenManaBattery.java | 2 +- Mage.Sets/src/mage/cards/g/Greenseeker.java | 2 +- Mage.Sets/src/mage/cards/g/GrimoireThief.java | 2 +- Mage.Sets/src/mage/cards/g/Gristleback.java | 2 +- Mage.Sets/src/mage/cards/h/HairStrungKoto.java | 2 +- Mage.Sets/src/mage/cards/h/HarborBandit.java | 2 +- Mage.Sets/src/mage/cards/h/HavengulRunebinder.java | 2 +- Mage.Sets/src/mage/cards/h/HecklingFiends.java | 2 +- Mage.Sets/src/mage/cards/h/HelixPinnacle.java | 2 +- Mage.Sets/src/mage/cards/h/HellkiteIgniter.java | 2 +- Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java | 2 +- Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java | 2 +- Mage.Sets/src/mage/cards/i/IncendiaryOracle.java | 2 +- Mage.Sets/src/mage/cards/i/IsochronScepter.java | 2 +- Mage.Sets/src/mage/cards/i/IvyDancer.java | 2 +- Mage.Sets/src/mage/cards/i/IxallisKeeper.java | 2 +- Mage.Sets/src/mage/cards/j/JourneyersKite.java | 2 +- Mage.Sets/src/mage/cards/j/JudgesFamiliar.java | 4 ++-- Mage.Sets/src/mage/cards/j/JungleDelver.java | 2 +- Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java | 2 +- Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java | 4 ++-- Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java | 4 ++-- Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java | 2 +- Mage.Sets/src/mage/cards/k/KessigWolf.java | 2 +- Mage.Sets/src/mage/cards/k/KilnmouthDragon.java | 2 +- Mage.Sets/src/mage/cards/k/KithkinShielddare.java | 2 +- Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanWarchief.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanWayfarer.java | 2 +- Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java | 2 +- Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java | 6 +++--- Mage.Sets/src/mage/cards/l/LavafumeInvoker.java | 2 +- Mage.Sets/src/mage/cards/l/LegacyWeapon.java | 2 +- Mage.Sets/src/mage/cards/l/LifeMatrix.java | 2 +- Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java | 2 +- Mage.Sets/src/mage/cards/l/Lifespinner.java | 2 +- Mage.Sets/src/mage/cards/l/LightningBerserker.java | 2 +- Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java | 2 +- Mage.Sets/src/mage/cards/l/LlanowarDruid.java | 2 +- Mage.Sets/src/mage/cards/l/LlanowarScout.java | 2 +- Mage.Sets/src/mage/cards/l/LunarchMantle.java | 2 +- Mage.Sets/src/mage/cards/m/MagmaSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheWill.java | 2 +- Mage.Sets/src/mage/cards/m/MarneusCalgar.java | 2 +- Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java | 4 ++-- Mage.Sets/src/mage/cards/m/MirrorOfFate.java | 2 +- Mage.Sets/src/mage/cards/m/MirrorWall.java | 2 +- Mage.Sets/src/mage/cards/m/MoorlandHaunt.java | 2 +- Mage.Sets/src/mage/cards/m/Mortarpod.java | 2 +- Mage.Sets/src/mage/cards/m/Mosstodon.java | 2 +- Mage.Sets/src/mage/cards/m/MudTrooper.java | 2 +- Mage.Sets/src/mage/cards/m/Mutavault.java | 2 +- Mage.Sets/src/mage/cards/m/MyrGalvanizer.java | 2 +- Mage.Sets/src/mage/cards/m/MyrTurbine.java | 4 ++-- Mage.Sets/src/mage/cards/n/NakayaShade.java | 2 +- Mage.Sets/src/mage/cards/n/NalathniDragon.java | 2 +- Mage.Sets/src/mage/cards/n/NarnamCobra.java | 2 +- Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java | 4 ++-- Mage.Sets/src/mage/cards/n/NinThePainArtist.java | 2 +- Mage.Sets/src/mage/cards/n/NullCaller.java | 2 +- Mage.Sets/src/mage/cards/o/OashraCultivator.java | 2 +- Mage.Sets/src/mage/cards/o/ObsidianFireheart.java | 2 +- Mage.Sets/src/mage/cards/o/Occupation.java | 2 +- Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java | 2 +- Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java | 2 +- Mage.Sets/src/mage/cards/p/PerilousForays.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianColossus.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java | 4 ++-- Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java | 2 +- Mage.Sets/src/mage/cards/p/PrimordialMist.java | 2 +- Mage.Sets/src/mage/cards/p/PrismArray.java | 2 +- Mage.Sets/src/mage/cards/p/PsychotropeThallid.java | 4 ++-- Mage.Sets/src/mage/cards/q/Quicksand.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java | 2 +- Mage.Sets/src/mage/cards/r/RageNimbus.java | 2 +- Mage.Sets/src/mage/cards/r/Rakalite.java | 2 +- Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java | 2 +- Mage.Sets/src/mage/cards/r/RedManaBattery.java | 2 +- Mage.Sets/src/mage/cards/r/RhysticCircle.java | 2 +- Mage.Sets/src/mage/cards/r/RimescaleDragon.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideDirector.java | 2 +- Mage.Sets/src/mage/cards/r/RiverMerfolk.java | 2 +- Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java | 2 +- Mage.Sets/src/mage/cards/s/SalvageTrader.java | 2 +- Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java | 2 +- Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java | 2 +- Mage.Sets/src/mage/cards/s/ScarwoodBandits.java | 2 +- Mage.Sets/src/mage/cards/s/ScarwoodHag.java | 4 ++-- Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java | 2 +- Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java | 2 +- Mage.Sets/src/mage/cards/s/SearchlightGeist.java | 2 +- Mage.Sets/src/mage/cards/s/SerrasHymn.java | 2 +- Mage.Sets/src/mage/cards/s/SerratedArrows.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java | 2 +- Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java | 2 +- Mage.Sets/src/mage/cards/s/ShamanEnKor.java | 2 +- Mage.Sets/src/mage/cards/s/Shapesharer.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldmageElder.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShoreSnapper.java | 2 +- Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java | 2 +- Mage.Sets/src/mage/cards/s/SilklashSpider.java | 2 +- Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java | 2 +- Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java | 2 +- Mage.Sets/src/mage/cards/s/SloppityBilepiper.java | 2 +- Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java | 2 +- Mage.Sets/src/mage/cards/s/SootstokeKindler.java | 2 +- Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java | 2 +- Mage.Sets/src/mage/cards/s/SoulSnare.java | 2 +- Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java | 2 +- Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java | 2 +- Mage.Sets/src/mage/cards/s/Spincrusher.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritBonds.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritEnKor.java | 2 +- Mage.Sets/src/mage/cards/s/SpontaneousArtist.java | 2 +- Mage.Sets/src/mage/cards/s/SporeFlower.java | 2 +- Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java | 2 +- Mage.Sets/src/mage/cards/s/StoneGiant.java | 2 +- Mage.Sets/src/mage/cards/s/Sunforger.java | 2 +- Mage.Sets/src/mage/cards/t/TerrainGenerator.java | 2 +- Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidDevourer.java | 2 +- Mage.Sets/src/mage/cards/t/ThaumaticCompass.java | 2 +- Mage.Sets/src/mage/cards/t/ThawingGlaciers.java | 2 +- Mage.Sets/src/mage/cards/t/TheloniteDruid.java | 2 +- Mage.Sets/src/mage/cards/t/ThornThallid.java | 2 +- Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java | 2 +- Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java | 2 +- Mage.Sets/src/mage/cards/t/TriassicEgg.java | 2 +- Mage.Sets/src/mage/cards/u/UlrichsKindred.java | 2 +- Mage.Sets/src/mage/cards/u/UnyaroGriffin.java | 2 +- Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java | 2 +- Mage.Sets/src/mage/cards/v/VitasporeThallid.java | 4 ++-- Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java | 2 +- Mage.Sets/src/mage/cards/v/VoyagerStaff.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfTanglecord.java | 2 +- Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java | 2 +- Mage.Sets/src/mage/cards/w/WanderersTwig.java | 2 +- Mage.Sets/src/mage/cards/w/WanderingMage.java | 6 +++--- Mage.Sets/src/mage/cards/w/WarpedLandscape.java | 2 +- Mage.Sets/src/mage/cards/w/WarriorEnKor.java | 2 +- Mage.Sets/src/mage/cards/w/WayfarersBauble.java | 2 +- Mage.Sets/src/mage/cards/w/WeatherseedElf.java | 2 +- Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java | 2 +- Mage.Sets/src/mage/cards/w/WhiteManaBattery.java | 2 +- Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java | 2 +- Mage.Sets/src/mage/cards/w/WillowPriestess.java | 4 ++-- Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java | 2 +- Mage.Sets/src/mage/cards/w/WormwoodDryad.java | 4 ++-- Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java | 4 ++-- Mage.Sets/src/mage/cards/x/XathridGorgon.java | 2 +- Mage.Sets/src/mage/cards/y/YewSpirit.java | 2 +- Mage.Sets/src/mage/cards/z/ZombieInfestation.java | 2 +- Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java | 4 ++-- 252 files changed, 280 insertions(+), 280 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AerieMystics.java b/Mage.Sets/src/mage/cards/a/AerieMystics.java index 179e22e43e0..6476bb0ff03 100644 --- a/Mage.Sets/src/mage/cards/a/AerieMystics.java +++ b/Mage.Sets/src/mage/cards/a/AerieMystics.java @@ -30,7 +30,7 @@ public final class AerieMystics extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES), new ManaCostsImpl<>("{1}{G}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java b/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java index 1f12ece0718..81b1e7fc299 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java @@ -37,7 +37,7 @@ public final class AlchemistsRefuge extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {G}{U}, {tap}: You may cast spells this turn as though they had flash. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddContinuousEffectToGame(new CastAsThoughItHadFlashAllEffect(Duration.EndOfTurn, filter)), new CompositeCost(new ManaCostsImpl<>("{G}{U}"), new TapSourceCost(), "{G}{U}, {T}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java index 3a4151d07c5..803dec39d7c 100644 --- a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java +++ b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java @@ -47,7 +47,7 @@ public class AllosaurusShepherd extends CardImpl { //4GG: Until end of turn, each Elf creature you control has base power and toughness 5/5 // and becomes a Dinosaur in addition to its other creature types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SetBasePowerToughnessAllEffect(5, 5, Duration.EndOfTurn, elvesFilter) .setText("Until end of turn, each Elf creature you control has base power and toughness 5/5"), new ManaCostsImpl<>("{4}{G}{G}")); diff --git a/Mage.Sets/src/mage/cards/a/AmrouScout.java b/Mage.Sets/src/mage/cards/a/AmrouScout.java index 62259eecf7d..29ea136c3d4 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouScout.java +++ b/Mage.Sets/src/mage/cards/a/AmrouScout.java @@ -39,7 +39,7 @@ public final class AmrouScout extends CardImpl { this.toughness = new MageInt(1); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java index f26cf210874..a12a01c6ae2 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java @@ -36,7 +36,7 @@ public final class AncestorsProphet extends CardImpl { this.toughness = new MageInt(5); // Tap five untapped Clerics you control: You gain 10 life. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainLifeEffect(10), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java index 97129468d68..9f80775ff4c 100644 --- a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java +++ b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java @@ -36,7 +36,7 @@ public final class AndraditeLeech extends CardImpl { this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); // {B}: Andradite Leech gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java index dfce8cc3bb4..e5826d9ba72 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java @@ -29,7 +29,7 @@ public final class AnuridBrushhopper extends CardImpl { this.toughness = new MageInt(4); // Discard two cards: Exile Anurid Brushhopper. Return it to the battlefield under its owner's control at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(), new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS)))); } diff --git a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java index 9abc90a97c4..c7baca16d32 100644 --- a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java +++ b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java @@ -35,7 +35,7 @@ public final class AquastrandSpider extends CardImpl { this.addAbility(new GraftAbility(this, 2)); // {G}: Target creature with a +1/+1 counter on it gains reach until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); diff --git a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java index c3fd6f9972d..759968aa04a 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java @@ -46,7 +46,7 @@ public final class ArachnusSpinner extends CardImpl { // Reach (This creature can block creatures with flying.) this.addAbility(ReachAbility.getInstance()); // Tap an untapped Spider you control: Search your graveyard and/or library for a card named Arachnus Web and put it onto the battlefield attached to target creature. If you search your library this way, shuffle it. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ArachnusSpinnerEffect(), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false))); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/a/ArcticAven.java b/Mage.Sets/src/mage/cards/a/ArcticAven.java index def04d87a63..95340e011d2 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticAven.java +++ b/Mage.Sets/src/mage/cards/a/ArcticAven.java @@ -43,7 +43,7 @@ public final class ArcticAven extends CardImpl { // Arctic Aven gets +1/+1 as long as you control a Plains. this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {W}: Arctic Aven gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java index d33311cf118..ebb90624b90 100644 --- a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java +++ b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java @@ -26,7 +26,7 @@ public final class ArmillarySphere extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, {tap}, Sacrifice Armillary Sphere: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/ArmsDealer.java b/Mage.Sets/src/mage/cards/a/ArmsDealer.java index 0b7831a4c5b..c7763f64c5f 100644 --- a/Mage.Sets/src/mage/cards/a/ArmsDealer.java +++ b/Mage.Sets/src/mage/cards/a/ArmsDealer.java @@ -31,7 +31,7 @@ public final class ArmsDealer extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, Sacrifice a Goblin: Arms Dealer deals 4 damage to target creature. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(4), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/a/ArmyAnts.java b/Mage.Sets/src/mage/cards/a/ArmyAnts.java index 8909938bacd..9200cef4298 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyAnts.java +++ b/Mage.Sets/src/mage/cards/a/ArmyAnts.java @@ -30,7 +30,7 @@ public final class ArmyAnts extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a land: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); diff --git a/Mage.Sets/src/mage/cards/a/AstromechDroid.java b/Mage.Sets/src/mage/cards/a/AstromechDroid.java index badec8e2e4e..b856816dbb0 100644 --- a/Mage.Sets/src/mage/cards/a/AstromechDroid.java +++ b/Mage.Sets/src/mage/cards/a/AstromechDroid.java @@ -38,7 +38,7 @@ public final class AstromechDroid extends CardImpl { this.toughness = new MageInt(1); // {T}: Target starship creature you control gets +1/+1 and gains vigilance until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(1, 1, Duration.EndOfTurn) .setText("Target starship creature you control gets +1/+1"), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/Atogatog.java b/Mage.Sets/src/mage/cards/a/Atogatog.java index 2559213c5f4..ed047483694 100644 --- a/Mage.Sets/src/mage/cards/a/Atogatog.java +++ b/Mage.Sets/src/mage/cards/a/Atogatog.java @@ -33,7 +33,7 @@ public final class Atogatog extends CardImpl { DynamicValue xValue = SacrificeCostCreaturesPower.instance; // Sacrifice an Atog creature: Atogatog gets +X/+X until end of turn, where X is the sacrificed creature's power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(xValue, xValue, Duration.EndOfTurn), new SacrificeTargetCost(filter))); diff --git a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java index 0167ae870e7..9ab15663f99 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java @@ -41,14 +41,14 @@ public final class AvacynGuardianAngel extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {1}{W}: Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AvacynGuardianAngelPreventToCreatureEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE)); this.addAbility(ability); // {5}{W}{W}: Prevent all damage that would be dealt to target player this turn by sources of the color of your choice. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new AvacynGuardianAngelPreventToPlayerEffect(), new ManaCostsImpl<>("{5}{W}{W}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/b/BattleRampart.java b/Mage.Sets/src/mage/cards/b/BattleRampart.java index 7eec86aa2fa..b34ab7fdbf1 100644 --- a/Mage.Sets/src/mage/cards/b/BattleRampart.java +++ b/Mage.Sets/src/mage/cards/b/BattleRampart.java @@ -33,7 +33,7 @@ public final class BattleRampart extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {T}: Target creature gains haste until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java b/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java index 80067b4e754..eb43b1be046 100644 --- a/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java +++ b/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java @@ -32,7 +32,7 @@ public final class BeguilerOfWills extends CardImpl { this.toughness = new MageInt(1); // {tap}: Gain control of target creature with power less than or equal to the number of creatures you control. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainControlTargetEffect(Duration.Custom), new TapSourceCost()); ability.addTarget(new BeguilerOfWillsTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java index 4a679512fc1..346f7f0302a 100644 --- a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java +++ b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java @@ -29,7 +29,7 @@ public final class BehindTheScenes extends CardImpl { new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {4}{W}: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES), new ManaCostsImpl<>("{4}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BelbesPortal.java b/Mage.Sets/src/mage/cards/b/BelbesPortal.java index 970af302266..09abe5bf68c 100644 --- a/Mage.Sets/src/mage/cards/b/BelbesPortal.java +++ b/Mage.Sets/src/mage/cards/b/BelbesPortal.java @@ -31,7 +31,7 @@ public final class BelbesPortal extends CardImpl { // {3}, {tap}: You may put a creature card of the chosen type from your hand onto the battlefield. FilterCreatureCard filter = new FilterCreatureCard("a creature card of the chosen type"); filter.add(ChosenSubtypePredicate.TRUE); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BighornerRancher.java b/Mage.Sets/src/mage/cards/b/BighornerRancher.java index 270ebcb43d8..c0197498421 100644 --- a/Mage.Sets/src/mage/cards/b/BighornerRancher.java +++ b/Mage.Sets/src/mage/cards/b/BighornerRancher.java @@ -41,7 +41,7 @@ public final class BighornerRancher extends CardImpl { )); // Sacrifice Bighorner Rancher: You gain life equal to the greatest toughness among other creatures you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainLifeEffect(GreatestToughnessAmongControlledCreaturesValue.instance).setText("You gain life equal to the greatest toughness among other creatures you control."), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/b/BlackManaBattery.java b/Mage.Sets/src/mage/cards/b/BlackManaBattery.java index b96e9100c3b..8e5b3a8b741 100644 --- a/Mage.Sets/src/mage/cards/b/BlackManaBattery.java +++ b/Mage.Sets/src/mage/cards/b/BlackManaBattery.java @@ -28,7 +28,7 @@ public final class BlackManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Black Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/Blessing.java b/Mage.Sets/src/mage/cards/b/Blessing.java index 22fe5b90a20..e7140c5c070 100644 --- a/Mage.Sets/src/mage/cards/b/Blessing.java +++ b/Mage.Sets/src/mage/cards/b/Blessing.java @@ -32,7 +32,7 @@ public final class Blessing extends CardImpl { // {W}: Enchanted creature gets +1/+1 until end of turn. Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostEnchantedEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } diff --git a/Mage.Sets/src/mage/cards/b/BlightedFen.java b/Mage.Sets/src/mage/cards/b/BlightedFen.java index 742b4f6d32f..5266397f227 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedFen.java +++ b/Mage.Sets/src/mage/cards/b/BlightedFen.java @@ -29,7 +29,7 @@ public final class BlightedFen extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}{B}, {T}, Sacrifice Blighted Fen: Target opponent sacrifices a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "Target opponent"), new ManaCostsImpl<>("{4}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlightedGorge.java b/Mage.Sets/src/mage/cards/b/BlightedGorge.java index 59cd161df34..b696b2144f0 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedGorge.java +++ b/Mage.Sets/src/mage/cards/b/BlightedGorge.java @@ -28,7 +28,7 @@ public final class BlightedGorge extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}{R}, {T}, Sacrifice Blighted Gorge: Blighted Gorge deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{4}{R}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlightedSteppe.java b/Mage.Sets/src/mage/cards/b/BlightedSteppe.java index 1ce2c55c587..084eaccc573 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedSteppe.java +++ b/Mage.Sets/src/mage/cards/b/BlightedSteppe.java @@ -29,7 +29,7 @@ public final class BlightedSteppe extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}{W}, {T}, Sacrifice Blighted Steppe: You gain 2 life for each creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainLifeEffect(new PermanentsOnBattlefieldCount(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED, 2)), new ManaCostsImpl<>("{3}{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java index 2f21abb3582..144a89d8d90 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java +++ b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java @@ -30,7 +30,7 @@ public final class BlightedWoodland extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for up to two basic land cards and put them onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/Blightspeaker.java b/Mage.Sets/src/mage/cards/b/Blightspeaker.java index 95582632e7e..9dc21ebc537 100644 --- a/Mage.Sets/src/mage/cards/b/Blightspeaker.java +++ b/Mage.Sets/src/mage/cards/b/Blightspeaker.java @@ -46,7 +46,7 @@ public final class Blightspeaker extends CardImpl { this.addAbility(ability); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{4}")); ability2.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlockadeRunner.java b/Mage.Sets/src/mage/cards/b/BlockadeRunner.java index 687f5975025..c678944b2d7 100644 --- a/Mage.Sets/src/mage/cards/b/BlockadeRunner.java +++ b/Mage.Sets/src/mage/cards/b/BlockadeRunner.java @@ -26,7 +26,7 @@ public final class BlockadeRunner extends CardImpl { this.toughness = new MageInt(2); // {U}: Blockade Runner is unblockable this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BloodletterQuill.java b/Mage.Sets/src/mage/cards/b/BloodletterQuill.java index 15fef9dcf32..ffc4ce4094d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodletterQuill.java +++ b/Mage.Sets/src/mage/cards/b/BloodletterQuill.java @@ -35,7 +35,7 @@ public final class BloodletterQuill extends CardImpl { ability.addCost(new PutCountersSourceCost(CounterType.BLOOD.createInstance())); this.addAbility(ability); // {U}{B}: Remove a blood counter from Bloodletter Quill. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new RemoveCounterSourceEffect(CounterType.BLOOD.createInstance()), new ManaCostsImpl<>("{U}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java index e7895ef1e14..e962aecab7a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java @@ -32,7 +32,7 @@ public final class BloodshotCyclops extends CardImpl { // {T}, Sacrifice a creature: Bloodshot Cyclops deals damage equal to the sacrificed // creature's power to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(SacrificeCostCreaturesPower.instance).setText("{this} deals damage equal to the sacrificed creature's power to any target"), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java b/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java index 861eb98d5fd..72f4f37bf0f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java +++ b/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java @@ -34,7 +34,7 @@ public final class BloodthornTaunter extends CardImpl { this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/b/BlueManaBattery.java b/Mage.Sets/src/mage/cards/b/BlueManaBattery.java index f3c55611adb..63f522e186b 100644 --- a/Mage.Sets/src/mage/cards/b/BlueManaBattery.java +++ b/Mage.Sets/src/mage/cards/b/BlueManaBattery.java @@ -28,7 +28,7 @@ public final class BlueManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Blue Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java index 86851a11d9e..24c6da76871 100644 --- a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java +++ b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java @@ -39,7 +39,7 @@ public final class BogbrewWitch extends CardImpl { // {2}, {T}: Search your library for a card named Festering Newt or Bubbling Cauldron, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/Boompile.java b/Mage.Sets/src/mage/cards/b/Boompile.java index 30bcf8abcbe..9b6586b98c4 100644 --- a/Mage.Sets/src/mage/cards/b/Boompile.java +++ b/Mage.Sets/src/mage/cards/b/Boompile.java @@ -22,7 +22,7 @@ public final class Boompile extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {T}: Flip a coin. If you win the flip, destroy all nonland permanents. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new FlipCoinEffect(new DestroyAllEffect(new FilterNonlandPermanent("nonland permanents"))), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/b/Bramblesnap.java b/Mage.Sets/src/mage/cards/b/Bramblesnap.java index a9a4a40b2b4..02d5d0a31c1 100644 --- a/Mage.Sets/src/mage/cards/b/Bramblesnap.java +++ b/Mage.Sets/src/mage/cards/b/Bramblesnap.java @@ -38,7 +38,7 @@ public final class Bramblesnap extends CardImpl { this.toughness = new MageInt(1); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); } diff --git a/Mage.Sets/src/mage/cards/c/CacklingWitch.java b/Mage.Sets/src/mage/cards/c/CacklingWitch.java index 635c8d5455d..7f50ab19de3 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingWitch.java +++ b/Mage.Sets/src/mage/cards/c/CacklingWitch.java @@ -34,7 +34,7 @@ public final class CacklingWitch extends CardImpl { // {X}{B}, {tap}, Discard a card: Target creature gets +X/+0 until end of turn. GetXValue manaX = GetXValue.instance; - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(manaX, StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl<>("{X}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CarrionFeeder.java b/Mage.Sets/src/mage/cards/c/CarrionFeeder.java index f8f3a8672c1..4cd49ed528d 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionFeeder.java +++ b/Mage.Sets/src/mage/cards/c/CarrionFeeder.java @@ -32,7 +32,7 @@ public final class CarrionFeeder extends CardImpl { // Carrion Feeder can't block. this.addAbility(new CantBlockAbility()); // Sacrifice a creature: Put a +1/+1 counter on Carrion Feeder. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/c/CatharticAdept.java b/Mage.Sets/src/mage/cards/c/CatharticAdept.java index 2fcf54407d8..f7000e9a8de 100644 --- a/Mage.Sets/src/mage/cards/c/CatharticAdept.java +++ b/Mage.Sets/src/mage/cards/c/CatharticAdept.java @@ -27,7 +27,7 @@ public final class CatharticAdept extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new MillCardsTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java b/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java index 131a13f1aae..f0fe906e2ba 100644 --- a/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java +++ b/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java @@ -57,7 +57,7 @@ public final class CattiBrieOfMithralHall extends CardImpl { new AddCountersSourceEffect(CounterType.P1P1.createInstance(), amount, false).setText("put a +1/+1 counter on it for each Equipment attached to it"))); // {1}, Remove all +1/+1 counters from Catti-brie: It deals X damage to target attacking or blocking creature an opponent controls, where X is the number of counters removed this way. - Ability damageAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability damageAbility = new SimpleActivatedAbility( new DamageTargetEffect(CattiBrieRemovedCounterValue.instance).setText("it deals X damage to target attacking or blocking creature an opponent controls, where X is the number of counters removed this way"), new ManaCostsImpl<>("{1}")); damageAbility.addTarget(new TargetCreaturePermanent(filter)); damageAbility.addCost(new RemoveAllCountersSourceCost(CounterType.P1P1)); @@ -98,4 +98,4 @@ enum CattiBrieRemovedCounterValue implements DynamicValue { public String getMessage() { return ""; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java index 02b1f77f739..608ec64e602 100644 --- a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java +++ b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java @@ -31,7 +31,7 @@ public final class ClockOfOmens extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Tap two untapped artifacts you control: Untap target artifact. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new UntapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java b/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java index bbca31d498d..aa342858ef5 100644 --- a/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java +++ b/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java @@ -30,21 +30,21 @@ public final class ConquerorsFoothold extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}: Draw a card, then discard a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}, {T}: Draw a card. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{4}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); // {6}, {T}: Return target card from your graveyard to your hand. - SimpleActivatedAbility ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability3 = new SimpleActivatedAbility( new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{6}")); ability3.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java b/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java index f20457cf399..c578435ea36 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java @@ -27,7 +27,7 @@ public final class ConsulateSurveillance extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(4))); // Pay {E}{E}: Prevent all damage that would be dealt to you this turn by a source of your choice. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PreventAllDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, new FilterObject("source"), false), new PayEnergyCost(2))); diff --git a/Mage.Sets/src/mage/cards/c/Cursecatcher.java b/Mage.Sets/src/mage/cards/c/Cursecatcher.java index c0d694a12c6..12607e5f692 100644 --- a/Mage.Sets/src/mage/cards/c/Cursecatcher.java +++ b/Mage.Sets/src/mage/cards/c/Cursecatcher.java @@ -30,7 +30,7 @@ public final class Cursecatcher extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Cursecatcher: Counter target instant or sorcery spell unless its controller pays {1}. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); diff --git a/Mage.Sets/src/mage/cards/d/DarkApostle.java b/Mage.Sets/src/mage/cards/d/DarkApostle.java index 6c9c26185da..58348bdc425 100644 --- a/Mage.Sets/src/mage/cards/d/DarkApostle.java +++ b/Mage.Sets/src/mage/cards/d/DarkApostle.java @@ -30,7 +30,7 @@ public final class DarkApostle extends CardImpl { this.toughness = new MageInt(3); // Gift of Chaos -- {3}, {T}: The next noncreature spell you cast this turn has cascade. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new NextSpellCastHasAbilityEffect(new CascadeAbility(), StaticFilters.FILTER_CARD_NON_CREATURE), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DarkMaze.java b/Mage.Sets/src/mage/cards/d/DarkMaze.java index 48e50e22fa2..5049770bbde 100644 --- a/Mage.Sets/src/mage/cards/d/DarkMaze.java +++ b/Mage.Sets/src/mage/cards/d/DarkMaze.java @@ -34,7 +34,7 @@ public final class DarkMaze extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {0}: Dark Maze can attack this turn as though it didn't have defender. Exile it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new GenericManaCost(0)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect( diff --git a/Mage.Sets/src/mage/cards/d/DaruEncampment.java b/Mage.Sets/src/mage/cards/d/DaruEncampment.java index 1c795b3ebc9..b5d8a77173c 100644 --- a/Mage.Sets/src/mage/cards/d/DaruEncampment.java +++ b/Mage.Sets/src/mage/cards/d/DaruEncampment.java @@ -33,7 +33,7 @@ public final class DaruEncampment extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {W}, {tap}: Target Soldier creature gets +1/+1 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java b/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java index 69308dc999a..09f652ca560 100644 --- a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java +++ b/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java @@ -30,7 +30,7 @@ public final class DawnglareInvoker extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new TapAllTargetPlayerControlsEffect(StaticFilters.FILTER_PERMANENT_CREATURES), new ManaCostsImpl<>("{8}")); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/d/DawntreaderElk.java b/Mage.Sets/src/mage/cards/d/DawntreaderElk.java index a27b988a3cd..764232847c3 100644 --- a/Mage.Sets/src/mage/cards/d/DawntreaderElk.java +++ b/Mage.Sets/src/mage/cards/d/DawntreaderElk.java @@ -31,7 +31,7 @@ public final class DawntreaderElk extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice Dawntreader Elk: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DeathCultist.java b/Mage.Sets/src/mage/cards/d/DeathCultist.java index e0ff79c3dd6..677dd46bd2e 100644 --- a/Mage.Sets/src/mage/cards/d/DeathCultist.java +++ b/Mage.Sets/src/mage/cards/d/DeathCultist.java @@ -28,7 +28,7 @@ public final class DeathCultist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new LoseLifeTargetEffect(1), new SacrificeSourceCost()); ability.addEffect(new GainLifeEffect(1).concatBy("and")); @@ -44,4 +44,4 @@ public final class DeathCultist extends CardImpl { public DeathCultist copy() { return new DeathCultist(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java b/Mage.Sets/src/mage/cards/d/DeathlessAngel.java index ac426435387..7baf1d7a5db 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessAngel.java @@ -36,7 +36,7 @@ public final class DeathlessAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}{W}: Target creature is indestructible this turn. Effect effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{W}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java index 65bf6423d0b..8059832f05c 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java @@ -36,7 +36,7 @@ public final class DeathsporeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Deathspore Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Deathspore Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Target creature gets -1/-1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java index 5e429047a2a..48c3659d56d 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java +++ b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java @@ -42,7 +42,7 @@ public final class DefiantFalcon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java index c6c991bc857..fa476e12d76 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java +++ b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java @@ -56,7 +56,7 @@ public final class DefiantVanguard extends CardImpl { this.addAbility(new DefiantVanguardTriggeredAbility(effect)); // {5}, {tap}: Search your library for a Rebel permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{5}")); ability2.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java b/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java index 1273ea92438..175c2087856 100644 --- a/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java +++ b/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java @@ -38,7 +38,7 @@ public final class DenethorStoneSeer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(2))); // {3}{R}, {T}, Sacrifice Denethor: Target player becomes the monarch. Denethor deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DenethorStoneSeerEffect(), new ManaCostsImpl<>("{3}{R}") ); @@ -89,4 +89,4 @@ class DenethorStoneSeerEffect extends OneShotEffect { ); return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java index 94524962e60..41a9c725d78 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java @@ -30,7 +30,7 @@ public final class DescendantOfSoramaro extends CardImpl { // {1}{U}: Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order. Effect effect = new LookLibraryControllerEffect(CardsInControllerHandCount.instance); effect.setText("Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java index e56a4cdea90..58a69d2aba7 100644 --- a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java +++ b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java @@ -24,7 +24,7 @@ public final class DesolateLighthouse extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}{U}{R}, {tap}: Draw a card, then discard a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}{R}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DiscordantDirge.java b/Mage.Sets/src/mage/cards/d/DiscordantDirge.java index 3006b979edf..1706b620ada 100644 --- a/Mage.Sets/src/mage/cards/d/DiscordantDirge.java +++ b/Mage.Sets/src/mage/cards/d/DiscordantDirge.java @@ -33,7 +33,7 @@ public final class DiscordantDirge extends CardImpl { new AddCountersSourceEffect(CounterType.VERSE.createInstance(), true), true)); // {B}, Sacrifice Discordant Dirge: Look at target opponent's hand and choose up to X cards from it, where X is the number of verse counters on Discordant Dirge. That player discards those cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DiscordantDirgeEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DragonHatchling.java b/Mage.Sets/src/mage/cards/d/DragonHatchling.java index cf8422a6ff1..8418c99b647 100644 --- a/Mage.Sets/src/mage/cards/d/DragonHatchling.java +++ b/Mage.Sets/src/mage/cards/d/DragonHatchling.java @@ -30,7 +30,7 @@ public final class DragonHatchling extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}: Dragon Hatchling gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonWhelp.java b/Mage.Sets/src/mage/cards/d/DragonWhelp.java index aaf755cf27f..3d721f6e9c9 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhelp.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhelp.java @@ -39,7 +39,7 @@ public final class DragonWhelp extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Dragon Whelp gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Dragon Whelp at the beginning of the next end step. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new DragonWhelpEffect()); diff --git a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java index dd463346042..a747b2246f4 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java @@ -40,7 +40,7 @@ public final class DragonWhisperer extends CardImpl { Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {1}{R}: Dragon Whisperer get +1/+0 until end of turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); diff --git a/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java b/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java index de4ff8d9eb7..324ab6946c2 100644 --- a/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java +++ b/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java @@ -24,7 +24,7 @@ public final class DreamstoneHedron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(3), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DrossHopper.java b/Mage.Sets/src/mage/cards/d/DrossHopper.java index 03dbdf8d8f4..ceaafec2bd2 100644 --- a/Mage.Sets/src/mage/cards/d/DrossHopper.java +++ b/Mage.Sets/src/mage/cards/d/DrossHopper.java @@ -30,7 +30,7 @@ public final class DrossHopper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishPiper.java b/Mage.Sets/src/mage/cards/e/ElvishPiper.java index 230961e4947..552d3d408cf 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPiper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPiper.java @@ -29,7 +29,7 @@ public final class ElvishPiper extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: You may put a creature card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java index 195c0cfca16..00e5c48868a 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java @@ -31,7 +31,7 @@ public final class EmbodimentOfSpring extends CardImpl { this.toughness = new MageInt(3); // {1}{G}, {T}, Sacrifice Embodiment of Spring: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EnslavedScout.java b/Mage.Sets/src/mage/cards/e/EnslavedScout.java index 33dd2a4c365..523ee5f149e 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedScout.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedScout.java @@ -28,7 +28,7 @@ public final class EnslavedScout extends CardImpl { this.toughness = new MageInt(2); // {2}: Enslaved Scout gains mountainwalk until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(new MountainwalkAbility(false), Duration.EndOfTurn), new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/e/EsperBattlemage.java b/Mage.Sets/src/mage/cards/e/EsperBattlemage.java index fd434290c43..535763767e5 100644 --- a/Mage.Sets/src/mage/cards/e/EsperBattlemage.java +++ b/Mage.Sets/src/mage/cards/e/EsperBattlemage.java @@ -31,13 +31,13 @@ public final class EsperBattlemage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // {W}, {tap}: Prevent the next 2 damage that would be dealt to you this turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PreventDamageToControllerEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {B}, {tap}: Target creature gets -1/-1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EtherealUsher.java b/Mage.Sets/src/mage/cards/e/EtherealUsher.java index 41b2ac0645a..163742f7a9d 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealUsher.java +++ b/Mage.Sets/src/mage/cards/e/EtherealUsher.java @@ -30,7 +30,7 @@ public final class EtherealUsher extends CardImpl { this.toughness = new MageInt(3); // {U}, {tap}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionMap.java b/Mage.Sets/src/mage/cards/e/ExpeditionMap.java index da74c07cb76..dc7a64ba4e8 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionMap.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionMap.java @@ -25,7 +25,7 @@ public final class ExpeditionMap extends CardImpl { // {2}, {tap}, Sacrifice Expedition Map: Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(new FilterLandCard()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index f6382c38d5f..9468b3c1f26 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -42,7 +42,7 @@ public final class EyeOfUgin extends CardImpl { this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterSpells, 2))); // {7}, {tap}: Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library. - Ability searchAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability searchAbility = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new TapSourceCost()); searchAbility.addCost(new ManaCostsImpl<>("{7}")); diff --git a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java index 402b2d287de..c46368491ac 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java @@ -47,7 +47,7 @@ public final class EzuriRenegadeLeader extends CardImpl { this.addAbility(ezuriRegen); // {2}{G}{G}{G}: Elf creatures you control get +3/+3 and gain trample until end of turn. - Ability ezuriBoost = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ezuriBoost = new SimpleActivatedAbility( new BoostControlledEffect(3, 3, Duration.EndOfTurn, elfFilter, false) .setText("Elf creatures you control get +3/+3"), new ManaCostsImpl<>("{2}{G}{G}{G}")); diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java b/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java index 2df24ef2dec..432f23b1ea2 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java @@ -38,7 +38,7 @@ public final class FalkenrathAristocrat extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Sacrifice a creature: Falkenrath Aristocrat is indestructible this turn. // If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Aristocrat. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addEffect(new FalkenrathAristocratEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java b/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java index d5377d291eb..1febd114273 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java @@ -34,7 +34,7 @@ public final class FalkenrathTorturer extends CardImpl { // Sacrifice a creature: Falkenrath Torturer gains flying until end of turn. // If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Torturer. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addEffect(new FalkenrathAristocratEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java b/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java index 80e49acba2a..cbdd7e50322 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java @@ -24,7 +24,7 @@ public final class FanaticalDevotion extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Sacrifice a creature: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FaunaShaman.java b/Mage.Sets/src/mage/cards/f/FaunaShaman.java index 1e8df9a747f..3031318fa38 100644 --- a/Mage.Sets/src/mage/cards/f/FaunaShaman.java +++ b/Mage.Sets/src/mage/cards/f/FaunaShaman.java @@ -33,7 +33,7 @@ public final class FaunaShaman extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}, Discard a creature card: Search your library for a creature card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE_A), true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FeralAnimist.java b/Mage.Sets/src/mage/cards/f/FeralAnimist.java index bca5b3aae15..d8a8c6c6284 100644 --- a/Mage.Sets/src/mage/cards/f/FeralAnimist.java +++ b/Mage.Sets/src/mage/cards/f/FeralAnimist.java @@ -30,7 +30,7 @@ public final class FeralAnimist extends CardImpl { this.toughness = new MageInt(1); // {3}: Feral Animist gets +X/+0 until end of turn, where X is its power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(SourcePermanentPowerValue.NOT_NEGATIVE, StaticValue.get(0), Duration.EndOfTurn), new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java b/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java index f94593d22e3..e40fc0b2002 100644 --- a/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java +++ b/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java @@ -34,7 +34,7 @@ public final class FireShrineKeeper extends CardImpl { this.addAbility(new MenaceAbility(false)); // {7}{R}, {T}, Sacrifice Fire Shrine Keeper: It deals 3 damage to each of up to two target creatures. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(3).setText("It deals 3 damage to each of up to two target creatures"), new ManaCostsImpl<>("{7}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java index e9047aa9d3d..7aec90d1e23 100644 --- a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java +++ b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java @@ -30,7 +30,7 @@ public final class FirebrandRanger extends CardImpl { this.toughness = new MageInt(1); // {G}, {T}: You may put a basic land card from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_BASIC_LAND_A), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java index b0e97ca7a55..b59196673bf 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java @@ -43,7 +43,7 @@ public final class FlamekinVillage extends CardImpl { this.addAbility(new RedManaAbility()); // {R}, {tap}: Target creature gains haste until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java index 4dc0d23dbaa..b0827324c4c 100644 --- a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java @@ -40,7 +40,7 @@ public final class FlinthoofBoar extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {R}: Flinthoof Boar gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java index 653adb57c35..9710f794a82 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java @@ -30,7 +30,7 @@ public final class FlowstoneMauler extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {R}: Flowstone Mauler gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java index f07d673d300..a656674ee8e 100644 --- a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java +++ b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java @@ -35,7 +35,7 @@ public final class FreewindEquenaut extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); diff --git a/Mage.Sets/src/mage/cards/f/FromBeyond.java b/Mage.Sets/src/mage/cards/f/FromBeyond.java index 0aba27c0fc2..6f595efa3d6 100644 --- a/Mage.Sets/src/mage/cards/f/FromBeyond.java +++ b/Mage.Sets/src/mage/cards/f/FromBeyond.java @@ -42,7 +42,7 @@ public final class FromBeyond extends CardImpl { new EldraziScionToken()).withTextOptions(true))); // {1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FrontierGuide.java b/Mage.Sets/src/mage/cards/f/FrontierGuide.java index af52ba1e875..6a51996c5ae 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierGuide.java +++ b/Mage.Sets/src/mage/cards/f/FrontierGuide.java @@ -30,7 +30,7 @@ public final class FrontierGuide extends CardImpl { this.toughness = new MageInt(1); //{3}{G}, {T}: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FungalBloom.java b/Mage.Sets/src/mage/cards/f/FungalBloom.java index def6c4fb7cd..e58a24784ae 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBloom.java +++ b/Mage.Sets/src/mage/cards/f/FungalBloom.java @@ -31,7 +31,7 @@ public final class FungalBloom extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}{G}"); // {G}{G}: Put a spore counter on target Fungus. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.SPORE.createInstance()), new ManaCostsImpl<>("{G}{G}")); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/f/FungalPlots.java b/Mage.Sets/src/mage/cards/f/FungalPlots.java index be19aff9cfa..0b0c463bba4 100644 --- a/Mage.Sets/src/mage/cards/f/FungalPlots.java +++ b/Mage.Sets/src/mage/cards/f/FungalPlots.java @@ -37,7 +37,7 @@ public final class FungalPlots extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); // {1}{G}, Exile a creature card from your graveyard: Create a 1/1 green Saproling creature token. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); diff --git a/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java b/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java index cd7af91104f..fdb8c1f1746 100644 --- a/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java +++ b/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java @@ -34,7 +34,7 @@ public final class GearseekerSerpent extends CardImpl { ).addHint(ArtifactYouControlHint.instance)); // 5U: Gearseeker Serpent can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{5}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GeneralHux.java b/Mage.Sets/src/mage/cards/g/GeneralHux.java index 7ecbc558194..9d757ca2774 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralHux.java +++ b/Mage.Sets/src/mage/cards/g/GeneralHux.java @@ -38,7 +38,7 @@ public final class GeneralHux extends CardImpl { this.toughness = new MageInt(3); // Whenever General Hux or another nontoken creature you control enters, until end of turn, target creature gains "{B}: This creature gets +1/+1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("This creature gets +1/+1 until end of turn"), new ManaCostsImpl<>("{B}")); diff --git a/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java b/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java index 930acdf5fed..f5e479c7888 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java @@ -20,7 +20,7 @@ public final class GerrardsBattleCry extends CardImpl { public GerrardsBattleCry(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java index 72b144e16bb..30f455885ff 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java @@ -31,7 +31,7 @@ public final class GhirapurAetherGrid extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // Tap two untaped artifacts you control: Ghirapur Aether Grid deals 1 damage to any target - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); ability.addTarget(new TargetAnyTarget().withChooseHint("deals 1 damage to")); diff --git a/Mage.Sets/src/mage/cards/g/GhituEncampment.java b/Mage.Sets/src/mage/cards/g/GhituEncampment.java index 5d90baff570..9ef92350721 100644 --- a/Mage.Sets/src/mage/cards/g/GhituEncampment.java +++ b/Mage.Sets/src/mage/cards/g/GhituEncampment.java @@ -28,7 +28,7 @@ public final class GhituEncampment extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new RedManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BecomesCreatureSourceEffect(new GhituEncampmentToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GnarledEffigy.java b/Mage.Sets/src/mage/cards/g/GnarledEffigy.java index f4c12c554ed..c630534e14f 100644 --- a/Mage.Sets/src/mage/cards/g/GnarledEffigy.java +++ b/Mage.Sets/src/mage/cards/g/GnarledEffigy.java @@ -23,7 +23,7 @@ public final class GnarledEffigy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {4}, {tap}: Put a -1/-1 counter on target creature. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java index 6e31d024bc9..06b637c8f01 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java @@ -33,7 +33,7 @@ public final class GoblinChirurgeon extends CardImpl { this.toughness = new MageInt(2); // Sacrifice a Goblin: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java b/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java index 767bb70d7a3..ae62e6889dd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java @@ -28,7 +28,7 @@ public final class GoblinDiplomats extends CardImpl { this.toughness = new MageInt(1); // {T}: Each creature attacks this turn if able. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES, Duration.EndOfTurn) .setText("Each creature attacks this turn if able"), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/g/GoblinKites.java b/Mage.Sets/src/mage/cards/g/GoblinKites.java index 689cd4e24c1..d97bf0b1b57 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKites.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKites.java @@ -39,7 +39,7 @@ public final class GoblinKites extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); // {R}: Target creature you control with toughness 2 or less gains flying until end of turn. Flip a coin at the beginning of the next end step. If you lose the flip, sacrifice that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWizard.java b/Mage.Sets/src/mage/cards/g/GoblinWizard.java index 9517b2d5dbc..e3af000fcca 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWizard.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWizard.java @@ -42,12 +42,12 @@ public final class GoblinWizard extends CardImpl { this.toughness = new MageInt(1); // {tap}: You may put a Goblin permanent card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filterCard), new TapSourceCost())); // {R}: Target Goblin gains protection from white until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); Target target = new TargetPermanent(filter2); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/g/GoreVassal.java b/Mage.Sets/src/mage/cards/g/GoreVassal.java index 83d42417e7d..ce06f6ffddf 100644 --- a/Mage.Sets/src/mage/cards/g/GoreVassal.java +++ b/Mage.Sets/src/mage/cards/g/GoreVassal.java @@ -33,7 +33,7 @@ public final class GoreVassal extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Gore Vassal: Put a -1/-1 counter on target creature. Then if that creature's toughness is 1 or greater, regenerate it. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java index dc73967e12c..e193a529440 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java +++ b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java @@ -46,7 +46,7 @@ public final class GreaterStoneSpirit extends CardImpl { this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); // {2}{R}: Until end of turn, target creature gets +0/+2 and gains "{R}: This creature gets +1/+0 until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability gainedAbility = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}") ); diff --git a/Mage.Sets/src/mage/cards/g/GreenManaBattery.java b/Mage.Sets/src/mage/cards/g/GreenManaBattery.java index 4981a108587..80de5aad2e6 100644 --- a/Mage.Sets/src/mage/cards/g/GreenManaBattery.java +++ b/Mage.Sets/src/mage/cards/g/GreenManaBattery.java @@ -28,7 +28,7 @@ public final class GreenManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Green Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/Greenseeker.java b/Mage.Sets/src/mage/cards/g/Greenseeker.java index 587d891de60..bcd65efe6dd 100644 --- a/Mage.Sets/src/mage/cards/g/Greenseeker.java +++ b/Mage.Sets/src/mage/cards/g/Greenseeker.java @@ -32,7 +32,7 @@ public final class Greenseeker extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Discard a card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GrimoireThief.java b/Mage.Sets/src/mage/cards/g/GrimoireThief.java index 8f9da4e6f2a..e521250b5e0 100644 --- a/Mage.Sets/src/mage/cards/g/GrimoireThief.java +++ b/Mage.Sets/src/mage/cards/g/GrimoireThief.java @@ -51,7 +51,7 @@ public final class GrimoireThief extends CardImpl { // {U}, Sacrifice Grimoire Thief: Turn all cards exiled with //Grimoire Thief face up. Counter all spells with those names. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new GrimoireThiefCounterspellEffect(), new ManaCostsImpl<>("{U}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/g/Gristleback.java b/Mage.Sets/src/mage/cards/g/Gristleback.java index ad91569035f..27d99e4867f 100644 --- a/Mage.Sets/src/mage/cards/g/Gristleback.java +++ b/Mage.Sets/src/mage/cards/g/Gristleback.java @@ -31,7 +31,7 @@ public final class Gristleback extends CardImpl { this.addAbility(new BloodthirstAbility(1)); // Sacrifice Gristleback: You gain life equal to Gristleback's power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainLifeEffect(SourcePermanentPowerValue.NOT_NEGATIVE).setText("You gain life equal to {this}'s power"), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java index 9fb5eab813a..9c339dd0103 100644 --- a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java +++ b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java @@ -31,7 +31,7 @@ public final class HairStrungKoto extends CardImpl { /* Tap an untapped creature you control: Target player puts the top * card of their library into their graveyard. */ - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/h/HarborBandit.java b/Mage.Sets/src/mage/cards/h/HarborBandit.java index f25c30cd42b..827bf6921b3 100644 --- a/Mage.Sets/src/mage/cards/h/HarborBandit.java +++ b/Mage.Sets/src/mage/cards/h/HarborBandit.java @@ -45,7 +45,7 @@ public final class HarborBandit extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {1}{U}: Harbor Bandit can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java index 036d7afbb7e..84a50239217 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java +++ b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java @@ -43,7 +43,7 @@ public final class HavengulRunebinder extends CardImpl { // {2}{U}, {tap}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token, // then put a +1/+1 counter on each Zombie creature you control. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HecklingFiends.java b/Mage.Sets/src/mage/cards/h/HecklingFiends.java index 5aa5e9eeeff..daf908df67a 100644 --- a/Mage.Sets/src/mage/cards/h/HecklingFiends.java +++ b/Mage.Sets/src/mage/cards/h/HecklingFiends.java @@ -28,7 +28,7 @@ public final class HecklingFiends extends CardImpl { this.toughness = new MageInt(2); // {2}{R}: Target creature attacks this turn if able. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/h/HelixPinnacle.java b/Mage.Sets/src/mage/cards/h/HelixPinnacle.java index 53417ecad9d..23dc34ade0b 100644 --- a/Mage.Sets/src/mage/cards/h/HelixPinnacle.java +++ b/Mage.Sets/src/mage/cards/h/HelixPinnacle.java @@ -32,7 +32,7 @@ public final class HelixPinnacle extends CardImpl { this.addAbility(ShroudAbility.getInstance()); // {X}: Put X tower counters on Helix Pinnacle. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.TOWER.createInstance(), GetXValue.instance, true), new ManaCostsImpl<>("{X}"))); diff --git a/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java b/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java index 4e807bfb029..1fc12401c37 100644 --- a/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java +++ b/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java @@ -42,7 +42,7 @@ public final class HellkiteIgniter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); // {1}{R}: Hellkite Igniter gets +X/+0 until end of turn, where X is the number of artifacts you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect( new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), diff --git a/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java b/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java index 158965ea83c..63f4f6d624a 100644 --- a/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java +++ b/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java @@ -28,7 +28,7 @@ public final class HorizonSpellbomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {2}, {tap}, Sacrifice Horizon Spellbomb: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java b/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java index ca17fd4be2c..e6fd1511449 100644 --- a/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java +++ b/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java @@ -34,7 +34,7 @@ public final class ImmaculateMagistrate extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put a +1/+1 counter on target creature for each Elf you control. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ImmaculateMagistrateEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java index 8279a536d1e..a05ce3183ef 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java @@ -30,7 +30,7 @@ public final class IncendiaryOracle extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Incendiary Oracle gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); // If a creature dealt damage by Incendiary Oracle this turn would die, exile it instead. diff --git a/Mage.Sets/src/mage/cards/i/IsochronScepter.java b/Mage.Sets/src/mage/cards/i/IsochronScepter.java index a18c8fc6831..9b04b5623c6 100644 --- a/Mage.Sets/src/mage/cards/i/IsochronScepter.java +++ b/Mage.Sets/src/mage/cards/i/IsochronScepter.java @@ -37,7 +37,7 @@ public final class IsochronScepter extends CardImpl { ); // {2}, {T}: You may copy the exiled card. If you do, you may cast the copy without paying its mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new IsochronScepterCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IvyDancer.java b/Mage.Sets/src/mage/cards/i/IvyDancer.java index 1bdf7f020e3..709c9d2a193 100644 --- a/Mage.Sets/src/mage/cards/i/IvyDancer.java +++ b/Mage.Sets/src/mage/cards/i/IvyDancer.java @@ -31,7 +31,7 @@ public final class IvyDancer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/i/IxallisKeeper.java b/Mage.Sets/src/mage/cards/i/IxallisKeeper.java index ace1de130da..1fee2a1c8d7 100644 --- a/Mage.Sets/src/mage/cards/i/IxallisKeeper.java +++ b/Mage.Sets/src/mage/cards/i/IxallisKeeper.java @@ -33,7 +33,7 @@ public final class IxallisKeeper extends CardImpl { this.toughness = new MageInt(2); // {7}{G}, {T}, Sacrifice Ixalli's Keeper: Target creature gets +5/+5 and gains trample until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(5, 5, Duration.EndOfTurn) .setText("Target creature gets +5/+5"), new ManaCostsImpl<>("{7}{G}")); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/j/JourneyersKite.java b/Mage.Sets/src/mage/cards/j/JourneyersKite.java index d6ea31d7280..b9932ab3f85 100644 --- a/Mage.Sets/src/mage/cards/j/JourneyersKite.java +++ b/Mage.Sets/src/mage/cards/j/JourneyersKite.java @@ -27,7 +27,7 @@ public final class JourneyersKite extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java b/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java index 6437e81e688..4eeffdb1485 100644 --- a/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java +++ b/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java @@ -34,7 +34,7 @@ public final class JudgesFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Judge's Familiar: Counter target instant or sorcery spell unless its controller pays {1}. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); @@ -49,4 +49,4 @@ public final class JudgesFamiliar extends CardImpl { public JudgesFamiliar copy() { return new JudgesFamiliar(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JungleDelver.java b/Mage.Sets/src/mage/cards/j/JungleDelver.java index baa4373b82f..9faefde8611 100644 --- a/Mage.Sets/src/mage/cards/j/JungleDelver.java +++ b/Mage.Sets/src/mage/cards/j/JungleDelver.java @@ -28,7 +28,7 @@ public final class JungleDelver extends CardImpl { this.toughness = new MageInt(1); // {3}{G}: Put a +1/+1 counter on Jungle Delver. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java index bf6d37604de..1a1df2ee408 100644 --- a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java +++ b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java @@ -43,7 +43,7 @@ public final class KahoMinamoHistorian extends CardImpl { // {X}, {tap}: You may cast a card with converted mana cost X exiled with // Kaho without paying its mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new KahoMinamoHistorianCastEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java index cb8890b33cf..aea3dce1064 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java @@ -37,14 +37,14 @@ public final class KamahlFistOfKrosa extends CardImpl { this.toughness = new MageInt(3); // {G}: Target land becomes a 1/1 creature until end of turn. It's still a land. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BecomesCreatureTargetEffect(new CreatureToken(1, 1), false, true, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); // {2}{G}{G}{G}: Creatures you control get +3/+3 and gain trample until end of turn. - SimpleActivatedAbility boostAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility boostAbility = new SimpleActivatedAbility( new BoostControlledEffect(3, 3, Duration.EndOfTurn).setText("Creatures you control get +3/+3"), new ManaCostsImpl<>("{2}{G}{G}{G}")); boostAbility.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES).setText("and gain trample until end of turn")); diff --git a/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java b/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java index 9281a06e463..7560d71239d 100644 --- a/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java +++ b/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java @@ -36,12 +36,12 @@ public final class KazanduTuskcaller extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}{G}"))); Abilities abilities1 = new AbilitiesImpl<>(); - abilities1.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, + abilities1.add(new SimpleActivatedAbility( new CreateTokenEffect(new ElephantToken()), new TapSourceCost())); Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, + abilities2.add(new SimpleActivatedAbility( new CreateTokenEffect(new ElephantToken(), 2), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java index d6b68d1c17c..6e24e7d16b2 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java @@ -36,7 +36,7 @@ public final class KeeperOfTheLight extends CardImpl { this.toughness = new MageInt(2); // {W}, {T}: Choose target opponent who had more life than you did as you activated this ability. You gain 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainLifeEffect(3).setText("Choose target opponent who had more life than you did as you activated this ability. You gain 3 life."), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KessigWolf.java b/Mage.Sets/src/mage/cards/k/KessigWolf.java index e9f169879ec..59578605c24 100644 --- a/Mage.Sets/src/mage/cards/k/KessigWolf.java +++ b/Mage.Sets/src/mage/cards/k/KessigWolf.java @@ -28,7 +28,7 @@ public final class KessigWolf extends CardImpl { this.toughness = new MageInt(1); // {1}{R}: Kessig Wolf gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java index bb993078529..167e024c985 100644 --- a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java +++ b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java @@ -38,7 +38,7 @@ public final class KilnmouthDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {T}: Kilnmouth Dragon deals damage equal to the number of +1/+1 counters on it to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)) .setText("{this} deals damage equal to the number of +1/+1 counters on it to any target"), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KithkinShielddare.java b/Mage.Sets/src/mage/cards/k/KithkinShielddare.java index 12b044c4480..2632b782776 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinShielddare.java +++ b/Mage.Sets/src/mage/cards/k/KithkinShielddare.java @@ -34,7 +34,7 @@ public final class KithkinShielddare extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Target blocking creature gets +2/+2 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java b/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java index 3a190ba15ab..1b2efa8d7e1 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java @@ -36,7 +36,7 @@ public final class KjeldoranJavelineer extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // {T}: Kjeldoran Javelineer deals damage equal to the number of age counters on it to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(new CountersSourceCount(CounterType.AGE)) .setText("{this} deals damage equal to the number of age counters on it to target attacking or blocking creature."), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java index e5a256d19c2..cc836a57493 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java @@ -42,7 +42,7 @@ public final class KrosanWarchief extends CardImpl { // Beast spells you cast cost {1} less to cast. this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // {1}{G}: Regenerate target Beast. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); Target target = new TargetCreaturePermanent(filterTarget); diff --git a/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java b/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java index 33e3befb710..058440af8a1 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java @@ -26,7 +26,7 @@ public final class KrosanWayfarer extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Krosan Wayfarer: You may put a land card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java b/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java index 692a94c24ad..42d66093563 100644 --- a/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java +++ b/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java @@ -34,7 +34,7 @@ public final class KuldothaForgemaster extends CardImpl { this.toughness = new MageInt(5); // {T}, Sacrifice three artifacts: Search your library for an artifact card and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterArtifactCard())), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(3, filter)); diff --git a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java index 26dbfe02a08..e8551c94933 100644 --- a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java +++ b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java @@ -52,17 +52,17 @@ public final class KumenaTyrantOfOrazca extends CardImpl { this.toughness = new MageInt(4); // Tap another untapped Merfolk you control: Kumena, Tyrant of Orzca can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(1, 1, filterAnotherNotTapped, true)))); // Tap three untapped Merfolk you control: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(3, 3, filterNotTapped, true)))); // Tap five untapped Merfolk you control: Put a +1/+1 counter on each Merfolk you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersAllEffect(CounterType.P1P1.createInstance(), filterAll), new TapTargetCost(new TargetControlledPermanent(5, 5, filterNotTapped, true)))); diff --git a/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java b/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java index dceda4ad9c2..763ab77600f 100644 --- a/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java +++ b/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java @@ -27,7 +27,7 @@ public final class LavafumeInvoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostControlledEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{8}"))); } diff --git a/Mage.Sets/src/mage/cards/l/LegacyWeapon.java b/Mage.Sets/src/mage/cards/l/LegacyWeapon.java index 162172e34a8..51f2b826399 100644 --- a/Mage.Sets/src/mage/cards/l/LegacyWeapon.java +++ b/Mage.Sets/src/mage/cards/l/LegacyWeapon.java @@ -25,7 +25,7 @@ public final class LegacyWeapon extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {W}{U}{B}{R}{G}: Exile target permanent. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ExileTargetEffect(), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/l/LifeMatrix.java b/Mage.Sets/src/mage/cards/l/LifeMatrix.java index 52aa1806074..803cc8a4f74 100644 --- a/Mage.Sets/src/mage/cards/l/LifeMatrix.java +++ b/Mage.Sets/src/mage/cards/l/LifeMatrix.java @@ -39,7 +39,7 @@ public final class LifeMatrix extends CardImpl { new IsStepCondition(PhaseStep.UPKEEP), "{4}, {T}: Put a matrix counter on target creature and " + "that creature gains \"Remove a matrix counter from this creature: " + "Regenerate this creature.\" Activate only during your upkeep."); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.MATRIX.createInstance())); ability.addEffect(new GainAbilityTargetEffect(ability2, Duration.Custom)); diff --git a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java index fb4f30293dc..32ade1149fd 100644 --- a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java +++ b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java @@ -28,7 +28,7 @@ public final class LifesparkSpellbomb extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {G}, Sacrifice Lifespark Spellbomb: Until end of turn, target land becomes a 3/3 creature that's still a land. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability firstAbility = new SimpleActivatedAbility( new BecomesCreatureTargetEffect( new CreatureToken(3, 3), false, true, Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/l/Lifespinner.java b/Mage.Sets/src/mage/cards/l/Lifespinner.java index db49ac4e601..fe5daf10cf4 100644 --- a/Mage.Sets/src/mage/cards/l/Lifespinner.java +++ b/Mage.Sets/src/mage/cards/l/Lifespinner.java @@ -41,7 +41,7 @@ public final class Lifespinner extends CardImpl { this.toughness = new MageInt(3); // {t}, Sacrifice three Spirits: Search your library for a legendary Spirit permanent card and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(3, filterSac)); diff --git a/Mage.Sets/src/mage/cards/l/LightningBerserker.java b/Mage.Sets/src/mage/cards/l/LightningBerserker.java index 65f5612f9dc..cd6b0903309 100644 --- a/Mage.Sets/src/mage/cards/l/LightningBerserker.java +++ b/Mage.Sets/src/mage/cards/l/LightningBerserker.java @@ -28,7 +28,7 @@ public final class LightningBerserker extends CardImpl { this.toughness = new MageInt(1); // {R}: Lightning Berserker gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index ac0136a5f0a..f0f5ed8b873 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -48,7 +48,7 @@ public final class LinSivviDefiantHero extends CardImpl { this.toughness = new MageInt(3); // {X}, {tap}: Search your library for a Rebel permanent card with converted mana cost X or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new LinSivviDefiantHeroEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/l/LlanowarDruid.java b/Mage.Sets/src/mage/cards/l/LlanowarDruid.java index e3578069386..e861095ddc4 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarDruid.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarDruid.java @@ -34,7 +34,7 @@ public final class LlanowarDruid extends CardImpl { this.toughness = new MageInt(2); // {tap}, Sacrifice Llanowar Druid: Untap all Forests. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new LlanowarDruidEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/l/LlanowarScout.java b/Mage.Sets/src/mage/cards/l/LlanowarScout.java index ed6a763920c..fee1515e6b2 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarScout.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarScout.java @@ -28,7 +28,7 @@ public final class LlanowarScout extends CardImpl { this.toughness = new MageInt(3); // {T}: You may put a land card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/l/LunarchMantle.java b/Mage.Sets/src/mage/cards/l/LunarchMantle.java index d699d39d9bd..b5b65ff632f 100644 --- a/Mage.Sets/src/mage/cards/l/LunarchMantle.java +++ b/Mage.Sets/src/mage/cards/l/LunarchMantle.java @@ -47,7 +47,7 @@ public final class LunarchMantle extends CardImpl { // Enchanted creature gets +2/+2 and has "{1}, Sacrifice a permanent: This creature gains flying until end of turn." SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability abilityToGain = new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); abilityToGain.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT)); ability2.addEffect(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); diff --git a/Mage.Sets/src/mage/cards/m/MagmaSliver.java b/Mage.Sets/src/mage/cards/m/MagmaSliver.java index a66838798d0..d5d4217f715 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaSliver.java +++ b/Mage.Sets/src/mage/cards/m/MagmaSliver.java @@ -37,7 +37,7 @@ public final class MagmaSliver extends CardImpl { // All Slivers have "{tap}: Target Sliver creature gets +X/+0 until end of turn, // where X is the number of Slivers on the battlefield." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(new PermanentsOnBattlefieldCount( StaticFilters.FILTER_PERMANENT_ALL_SLIVERS), StaticValue.get(0), Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java b/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java index 782e10e775d..b3c036ca226 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java @@ -33,7 +33,7 @@ public final class MagusOfTheWill extends CardImpl { // {2}{B}, {T}, Exile Magus of the Will: Until end of turn, you may play lands and cast spells from your graveyard. // If a card would be put into your graveyard from anywhere else this turn, exile that card instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( PlayFromGraveyardControllerEffect.playLandsAndCastSpells(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addEffect(new GraveyardFromAnywhereExileReplacementEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/m/MarneusCalgar.java b/Mage.Sets/src/mage/cards/m/MarneusCalgar.java index 84fff581ef2..9bcb49673e3 100644 --- a/Mage.Sets/src/mage/cards/m/MarneusCalgar.java +++ b/Mage.Sets/src/mage/cards/m/MarneusCalgar.java @@ -45,7 +45,7 @@ public final class MarneusCalgar extends CardImpl { ).withFlavorWord("Master Tactician")); // Chapter Master — {6}: Create two 2/2 white Astartes Warrior creature tokens with vigilance. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new WhiteAstartesWarriorToken(), 2), new ManaCostsImpl<>("{6}") ).withFlavorWord("Chapter Master")); diff --git a/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java b/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java index b096810cde9..62f0bddf325 100644 --- a/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java +++ b/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java @@ -40,7 +40,7 @@ public final class MatsuTribeBirdstalker extends CardImpl { this.addAbility(ability); // {G}: Matsu-Tribe Birdstalker gains reach until end of turn. (It can block creatures with flying.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } @@ -53,4 +53,4 @@ public final class MatsuTribeBirdstalker extends CardImpl { public MatsuTribeBirdstalker copy() { return new MatsuTribeBirdstalker(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MirrorOfFate.java b/Mage.Sets/src/mage/cards/m/MirrorOfFate.java index ce6913b2154..93b35e1a10f 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorOfFate.java +++ b/Mage.Sets/src/mage/cards/m/MirrorOfFate.java @@ -31,7 +31,7 @@ public final class MirrorOfFate extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {tap}, Sacrifice Mirror of Fate: Choose up to seven face-up exiled cards you own. Exile all the cards from your library, then put the chosen cards on top of your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new MirrorOfFateEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MirrorWall.java b/Mage.Sets/src/mage/cards/m/MirrorWall.java index 80d634852bc..2ab21a234d4 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorWall.java +++ b/Mage.Sets/src/mage/cards/m/MirrorWall.java @@ -30,7 +30,7 @@ public final class MirrorWall extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {W}: Mirror Wall can attack this turn as though it didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java b/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java index f6fcff3f60b..af0157f57f7 100644 --- a/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java +++ b/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java @@ -30,7 +30,7 @@ public final class MoorlandHaunt extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {W}{U}, {tap}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{W}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/Mortarpod.java b/Mage.Sets/src/mage/cards/m/Mortarpod.java index 2344a3902e7..fe9aae780d7 100644 --- a/Mage.Sets/src/mage/cards/m/Mortarpod.java +++ b/Mage.Sets/src/mage/cards/m/Mortarpod.java @@ -37,7 +37,7 @@ public final class Mortarpod extends CardImpl { // Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to any target." Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(0, 1)); - SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility( new DamageTargetEffect(1), new SacrificeSourceCost()); abilityToGain.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/Mosstodon.java b/Mage.Sets/src/mage/cards/m/Mosstodon.java index d4f27ba0b30..96b104ab4e8 100644 --- a/Mage.Sets/src/mage/cards/m/Mosstodon.java +++ b/Mage.Sets/src/mage/cards/m/Mosstodon.java @@ -38,7 +38,7 @@ public final class Mosstodon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(3); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/m/MudTrooper.java b/Mage.Sets/src/mage/cards/m/MudTrooper.java index 6ba5f9c4b6c..162d242446b 100644 --- a/Mage.Sets/src/mage/cards/m/MudTrooper.java +++ b/Mage.Sets/src/mage/cards/m/MudTrooper.java @@ -37,7 +37,7 @@ public final class MudTrooper extends CardImpl { this.toughness = new MageInt(1); // Trooper creatures you control have "2: This creature gets +1/+1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("This creature gets +1/+1 until end of turn"), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/cards/m/Mutavault.java b/Mage.Sets/src/mage/cards/m/Mutavault.java index 48ca16c7c0b..62ab683908b 100644 --- a/Mage.Sets/src/mage/cards/m/Mutavault.java +++ b/Mage.Sets/src/mage/cards/m/Mutavault.java @@ -26,7 +26,7 @@ public final class Mutavault extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}: Mutavault becomes a 2/2 creature with all creature types until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BecomesCreatureSourceEffect(new MutavaultToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java index b2a2e929471..ccb8dd48355 100644 --- a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java +++ b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java @@ -39,7 +39,7 @@ public final class MyrGalvanizer extends CardImpl { new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {1}, {T}: Untap each other Myr you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new MyrGalvanizerEffect(), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MyrTurbine.java b/Mage.Sets/src/mage/cards/m/MyrTurbine.java index 9b3fc4eed1c..0dc41b4738c 100644 --- a/Mage.Sets/src/mage/cards/m/MyrTurbine.java +++ b/Mage.Sets/src/mage/cards/m/MyrTurbine.java @@ -37,10 +37,10 @@ public final class MyrTurbine extends CardImpl { public MyrTurbine(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new MyrToken()), new TapSourceCost())); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterCard)), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(5, 5, filterMyr, true))); diff --git a/Mage.Sets/src/mage/cards/n/NakayaShade.java b/Mage.Sets/src/mage/cards/n/NakayaShade.java index 58ab824fa1d..aa626492a9b 100644 --- a/Mage.Sets/src/mage/cards/n/NakayaShade.java +++ b/Mage.Sets/src/mage/cards/n/NakayaShade.java @@ -29,7 +29,7 @@ public final class NakayaShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Nakaya Shade gets +1/+1 until end of turn unless any player pays {2}. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DoUnlessAnyPlayerPaysEffect(new BoostSourceEffect(1,1, Duration.EndOfTurn),new GenericManaCost(2)), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/n/NalathniDragon.java b/Mage.Sets/src/mage/cards/n/NalathniDragon.java index 958b908e2df..1ef194771d7 100644 --- a/Mage.Sets/src/mage/cards/n/NalathniDragon.java +++ b/Mage.Sets/src/mage/cards/n/NalathniDragon.java @@ -43,7 +43,7 @@ public final class NalathniDragon extends CardImpl { this.addAbility(BandingAbility.getInstance()); // {R}: Nalathni Dragon gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Nalathni Dragon at the beginning of the next end step. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new NalathniDragonEffect()); diff --git a/Mage.Sets/src/mage/cards/n/NarnamCobra.java b/Mage.Sets/src/mage/cards/n/NarnamCobra.java index 93ec9a9c261..9b528f2f536 100644 --- a/Mage.Sets/src/mage/cards/n/NarnamCobra.java +++ b/Mage.Sets/src/mage/cards/n/NarnamCobra.java @@ -28,7 +28,7 @@ public final class NarnamCobra extends CardImpl { this.toughness = new MageInt(1); // {G}: Narnam Cobra gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G))); } diff --git a/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java b/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java index bf09226f059..d4d2ce73d92 100644 --- a/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java +++ b/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java @@ -52,14 +52,14 @@ public final class NemataPrimevalWarden extends CardImpl { this.addAbility(new SimpleStaticAbility(new NemataPrimevalWardenEffect())); // {G}, Sacrifice a Saproling: Nemata, Primeval Warden gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); // {1}{B}, Sacrifice 2 Saprolings: Draw a card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{B}")); ability2.addCost(new SacrificeTargetCost(2, filter2)); diff --git a/Mage.Sets/src/mage/cards/n/NinThePainArtist.java b/Mage.Sets/src/mage/cards/n/NinThePainArtist.java index eb960a8fce7..65a29f6310b 100644 --- a/Mage.Sets/src/mage/cards/n/NinThePainArtist.java +++ b/Mage.Sets/src/mage/cards/n/NinThePainArtist.java @@ -34,7 +34,7 @@ public final class NinThePainArtist extends CardImpl { this.toughness = new MageInt(1); // {X}{U}{R}, {tap}: Nin, the Pain Artist deals X damage to target creature. That creature's controller draws X cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{U}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/n/NullCaller.java b/Mage.Sets/src/mage/cards/n/NullCaller.java index d6988315492..2de4cbad90f 100644 --- a/Mage.Sets/src/mage/cards/n/NullCaller.java +++ b/Mage.Sets/src/mage/cards/n/NullCaller.java @@ -31,7 +31,7 @@ public final class NullCaller extends CardImpl { this.toughness = new MageInt(4); // {3}{B}, Exile a creature card from your graveyard: Create a tapped 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CreateTokenEffect(new ZombieToken(), 1, true, false), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD))); diff --git a/Mage.Sets/src/mage/cards/o/OashraCultivator.java b/Mage.Sets/src/mage/cards/o/OashraCultivator.java index 5fcb273bdc6..96a15940259 100644 --- a/Mage.Sets/src/mage/cards/o/OashraCultivator.java +++ b/Mage.Sets/src/mage/cards/o/OashraCultivator.java @@ -33,7 +33,7 @@ public final class OashraCultivator extends CardImpl { this.toughness = new MageInt(3); // {2}{G}, {T}, Sacrifice Oashra Cultivator: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java index 8e0b87090d6..9575ce891a9 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java @@ -53,7 +53,7 @@ public final class ObsidianFireheart extends CardImpl { // For as long as that land has a blaze counter on it, it has "At the beginning // of your upkeep, this land deals 1 damage to you." (The land continues to burn // after Obsidian Fireheart has left the battlefield.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.BLAZE.createInstance()), new ManaCostsImpl<>("{1}{R}{R}")); ability.addTarget(new TargetLandPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/o/Occupation.java b/Mage.Sets/src/mage/cards/o/Occupation.java index bd4c7e121be..a034fb20f8b 100644 --- a/Mage.Sets/src/mage/cards/o/Occupation.java +++ b/Mage.Sets/src/mage/cards/o/Occupation.java @@ -32,7 +32,7 @@ public final class Occupation extends CardImpl { this.addAbility(new SimpleStaticAbility(new OccupationTapEffect())); // {W}{B}: Target creature can't attack or block this turn, and its activated abilities can't be activated until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new OccupationOneShotEffect("Target creature can't attack or block this turn, and its activated abilities can't be activated until end of turn"), new ManaCostsImpl<>("{W}{B}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java b/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java index ee21828e365..f3015183048 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java @@ -37,7 +37,7 @@ public final class OrderOfTheSacredTorch extends CardImpl { this.toughness = new MageInt(2); // {tap}, Pay 1 life: Counter target black spell. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new mage.abilities.effects.common.CounterTargetEffect(), new TapSourceCost()); ability.addCost(new PayLifeCost(1)); diff --git a/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java b/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java index 3c1da4ffeb9..39e63cd711b 100644 --- a/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java +++ b/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java @@ -36,7 +36,7 @@ public final class OxiddaDaredevil extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/p/PerilousForays.java b/Mage.Sets/src/mage/cards/p/PerilousForays.java index e5221d32969..894d4b675ef 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousForays.java +++ b/Mage.Sets/src/mage/cards/p/PerilousForays.java @@ -39,7 +39,7 @@ public final class PerilousForays extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // {1}, Sacrifice a creature: Search your library for a land card with a basic land type and put it onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java index 25ceb423688..a52db027ac1 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java @@ -31,7 +31,7 @@ public final class PhyrexianColossus extends CardImpl { // {this} doesn't untap during your untap step. this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Pay 8 life: Untap {this}. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new UntapSourceEffect(), new PayLifeCost(8))); // {this} can't be blocked except by three or more creatures. this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java index dabb20edc9a..28ebf2422bf 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java @@ -34,14 +34,14 @@ public final class PhyrexianPlaguelord extends CardImpl { this.toughness = new MageInt(4); // {tap}, Sacrifice Phyrexian Plaguelord: Target creature gets -4/-4 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Sacrifice a creature: Target creature gets -1/-1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java b/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java index fd24fdd968b..63c3aaed7ba 100644 --- a/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java +++ b/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java @@ -28,7 +28,7 @@ public final class PrakhataPillarBug extends CardImpl { this.toughness = new MageInt(3); // {B}: Prakhata Pillar-Bug gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } diff --git a/Mage.Sets/src/mage/cards/p/PrimordialMist.java b/Mage.Sets/src/mage/cards/p/PrimordialMist.java index dc323142e78..8960f2f2ef2 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialMist.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialMist.java @@ -41,7 +41,7 @@ public final class PrimordialMist extends CardImpl { // Exile a face-down permanent you control face-up: You may play that card this turn TargetPermanent target = new TargetPermanent(filter); target.withNotTarget(true); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PrimordialMistCastFromExileEffect(), new PrimordialMistCost(target)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrismArray.java b/Mage.Sets/src/mage/cards/p/PrismArray.java index 45ba34d6606..6e6bbf82592 100644 --- a/Mage.Sets/src/mage/cards/p/PrismArray.java +++ b/Mage.Sets/src/mage/cards/p/PrismArray.java @@ -33,7 +33,7 @@ public final class PrismArray extends CardImpl { null, "Converge — {this} enters with a +1/+1 counter on it for each color of mana spent to cast it.", null)); // Remove a crystal counter from Prism Array: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new TapTargetEffect(), new RemoveCountersSourceCost(CounterType.CRYSTAL.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java index 62935979b8b..5912683f428 100644 --- a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java +++ b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java @@ -37,11 +37,11 @@ public final class PsychotropeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Psychotrope Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Psychotrope Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // {1}, Sacrifice a Saproling: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new SacrificeTargetCost(filter)); ability.addCost(new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/q/Quicksand.java b/Mage.Sets/src/mage/cards/q/Quicksand.java index 32920903217..9229168c64e 100644 --- a/Mage.Sets/src/mage/cards/q/Quicksand.java +++ b/Mage.Sets/src/mage/cards/q/Quicksand.java @@ -34,7 +34,7 @@ public final class Quicksand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(-1, -2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java b/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java index 98bca82d4b0..fb23549fa53 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java @@ -22,7 +22,7 @@ public final class QuicksilverAmulet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {4}, {tap}: You may put a creature card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RageNimbus.java b/Mage.Sets/src/mage/cards/r/RageNimbus.java index 0943c7ccfcd..fb4549e79c3 100644 --- a/Mage.Sets/src/mage/cards/r/RageNimbus.java +++ b/Mage.Sets/src/mage/cards/r/RageNimbus.java @@ -31,7 +31,7 @@ public final class RageNimbus extends CardImpl { this.addAbility(DefenderAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/r/Rakalite.java b/Mage.Sets/src/mage/cards/r/Rakalite.java index a3930213e1c..273195f5ce9 100644 --- a/Mage.Sets/src/mage/cards/r/Rakalite.java +++ b/Mage.Sets/src/mage/cards/r/Rakalite.java @@ -26,7 +26,7 @@ public final class Rakalite extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {2}: Prevent the next 1 damage that would be dealt to any target this turn. Return Rakalite to its owner's hand at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 1, false), new GenericManaCost(2)); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)))); diff --git a/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java b/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java index ed13a419cf2..2d6361b7812 100644 --- a/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java +++ b/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java @@ -37,7 +37,7 @@ public final class RakeclawGargantuan extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(3); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/r/RedManaBattery.java b/Mage.Sets/src/mage/cards/r/RedManaBattery.java index e29bbad4065..3af1f439d64 100644 --- a/Mage.Sets/src/mage/cards/r/RedManaBattery.java +++ b/Mage.Sets/src/mage/cards/r/RedManaBattery.java @@ -28,7 +28,7 @@ public final class RedManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Red Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RhysticCircle.java b/Mage.Sets/src/mage/cards/r/RhysticCircle.java index 469ae0d6424..3be16bf322d 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticCircle.java +++ b/Mage.Sets/src/mage/cards/r/RhysticCircle.java @@ -24,7 +24,7 @@ public final class RhysticCircle extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); // {1}: Any player may pay {1}. If no one does, the next time a source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DoUnlessAnyPlayerPaysEffect(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn),new GenericManaCost(1)), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java index 2f8d1a27f7c..ebfd7ba63f1 100644 --- a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java +++ b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java @@ -43,7 +43,7 @@ public final class RimescaleDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}{snow}: Tap target creature and put an ice counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new TapTargetEffect("tap target creature"), new ManaCostsImpl<>("{2}{S}") ); diff --git a/Mage.Sets/src/mage/cards/r/RiptideDirector.java b/Mage.Sets/src/mage/cards/r/RiptideDirector.java index d382e00e5c0..6879a59665e 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideDirector.java +++ b/Mage.Sets/src/mage/cards/r/RiptideDirector.java @@ -32,7 +32,7 @@ public final class RiptideDirector extends CardImpl { this.toughness = new MageInt(3); // {2}{U}{U}, {tap}: Draw a card for each Wizard you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RiverMerfolk.java b/Mage.Sets/src/mage/cards/r/RiverMerfolk.java index 9f93ae284f7..ee2afb80499 100644 --- a/Mage.Sets/src/mage/cards/r/RiverMerfolk.java +++ b/Mage.Sets/src/mage/cards/r/RiverMerfolk.java @@ -27,7 +27,7 @@ public final class RiverMerfolk extends CardImpl { this.toughness = new MageInt(1); // {U}: River Merfolk gains mountainwalk until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(new MountainwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java b/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java index dce3f9ff16a..e27e53e61dd 100644 --- a/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java +++ b/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java @@ -59,7 +59,7 @@ class SakashimaTheImpostorCopyApplier extends CopyApplier { blueprint.addSuperType(SuperType.LEGENDARY); blueprint.setName("Sakashima the Impostor"); // {2}{U}{U}: Return Sakashima the Impostor to its owner's hand at the beginning of the next end step - blueprint.getAbilities().add(new SimpleActivatedAbility(Zone.BATTLEFIELD, + blueprint.getAbilities().add(new SimpleActivatedAbility( new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)), false), new ManaCostsImpl<>("{2}{U}{U}") )); diff --git a/Mage.Sets/src/mage/cards/s/SalvageTrader.java b/Mage.Sets/src/mage/cards/s/SalvageTrader.java index eb31a44a3e7..10e7253c9cf 100644 --- a/Mage.Sets/src/mage/cards/s/SalvageTrader.java +++ b/Mage.Sets/src/mage/cards/s/SalvageTrader.java @@ -32,7 +32,7 @@ public final class SalvageTrader extends CardImpl { this.toughness = new MageInt(3); // {T}: Exchange control of target artifact you control and target artifact an opponent controls with the same converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ExchangeControlTargetEffect(Duration.EndOfGame, "Exchange control of target artifact you control and target artifact an opponent controls with the same mana value", false, true), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java index 9d81a216afe..81f52b530be 100644 --- a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java +++ b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java @@ -45,7 +45,7 @@ public final class SanctifierOfSouls extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter)); // {2}{W}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); diff --git a/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java b/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java index aaf0331ad29..153081d59eb 100644 --- a/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java +++ b/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java @@ -37,7 +37,7 @@ public final class ScarredVinebreeder extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, Exile an Elf card from your graveyard: Scarred Vinebreeder gets +3/+3 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); diff --git a/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java b/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java index 92b01a83543..7a5c36a5071 100644 --- a/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java +++ b/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java @@ -43,7 +43,7 @@ public final class ScarwoodBandits extends CardImpl { this.addAbility(new ForestwalkAbility()); // {2}{G}, {tap}: Unless an opponent pays {2}, gain control of target artifact for as long as Scarwood Bandits remains on the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DoUnlessAnyOpponentPaysEffect( new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom, true), diff --git a/Mage.Sets/src/mage/cards/s/ScarwoodHag.java b/Mage.Sets/src/mage/cards/s/ScarwoodHag.java index ebfafbc0968..b95f88ce970 100644 --- a/Mage.Sets/src/mage/cards/s/ScarwoodHag.java +++ b/Mage.Sets/src/mage/cards/s/ScarwoodHag.java @@ -32,7 +32,7 @@ public final class ScarwoodHag extends CardImpl { this.toughness = new MageInt(1); // {G}{G}{G}{G}, {tap}: Target creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}{G}{G}")); ability.addCost(new TapSourceCost()); @@ -42,7 +42,7 @@ public final class ScarwoodHag extends CardImpl { // {tap}: Target creature loses forestwalk until end of turn. Effect effect = new LoseAbilityTargetEffect(new ForestwalkAbility(true), Duration.EndOfTurn); effect.setText("Target creature loses forestwalk until end of turn"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java index bd3a6710f6e..c941e3688a1 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java @@ -36,7 +36,7 @@ public final class ScionOfTheUrDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}: Search your library for a Dragon permanent card and put it into your graveyard. If you do, Scion of the Ur-Dragon becomes a copy of that card until end of turn. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ScionOfTheUrDragonEffect(), new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java b/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java index da1c02460cd..49a258eef95 100644 --- a/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java +++ b/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java @@ -31,7 +31,7 @@ public final class SeaGateLoremaster extends CardImpl { this.toughness = new MageInt(3); // {T}: Draw a card for each Ally you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SearchlightGeist.java b/Mage.Sets/src/mage/cards/s/SearchlightGeist.java index ecdf58ea8ff..56bb34b5a71 100644 --- a/Mage.Sets/src/mage/cards/s/SearchlightGeist.java +++ b/Mage.Sets/src/mage/cards/s/SearchlightGeist.java @@ -30,7 +30,7 @@ public final class SearchlightGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{B}: Searchlight Geist gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SerrasHymn.java b/Mage.Sets/src/mage/cards/s/SerrasHymn.java index 2d26a7a8cdc..fc97f30a71b 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasHymn.java +++ b/Mage.Sets/src/mage/cards/s/SerrasHymn.java @@ -32,7 +32,7 @@ public final class SerrasHymn extends CardImpl { new AddCountersSourceEffect(CounterType.VERSE.createInstance(), true), true)); // Sacrifice Serra's Hymn: Prevent the next X damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose, where X is the number of verse counters on Serra's Hymn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetMultiAmountEffect( Duration.EndOfTurn, 1, false, true, // the integer 1 is ignored due to the dynamic number being set diff --git a/Mage.Sets/src/mage/cards/s/SerratedArrows.java b/Mage.Sets/src/mage/cards/s/SerratedArrows.java index bbc965e9288..e65cf0ba033 100644 --- a/Mage.Sets/src/mage/cards/s/SerratedArrows.java +++ b/Mage.Sets/src/mage/cards/s/SerratedArrows.java @@ -43,7 +43,7 @@ public final class SerratedArrows extends CardImpl { )); // {T}, Remove an arrowhead counter from Serrated Arrows: Put a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.ARROWHEAD.createInstance())); diff --git a/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java b/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java index e82b8de40b3..4a15281aec9 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java +++ b/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java @@ -28,7 +28,7 @@ public final class ShadowcloakVampire extends CardImpl { this.toughness = new MageInt(3); // Pay 2 life: Shadowcloak Vampire gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),new PayLifeCost(2))); } diff --git a/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java b/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java index df3142c642e..7a55323f6ba 100644 --- a/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java +++ b/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java @@ -60,7 +60,7 @@ public final class ShalaiVoiceOfPlenty extends CardImpl { this.addAbility(ability); // {4}{G}{G}: Put a +1/+1 counter on each creature you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersAllEffect( CounterType.P1P1.createInstance(), StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED diff --git a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java index 7b56565fa1f..5ec6cfaf26b 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java +++ b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java @@ -45,7 +45,7 @@ public final class ShamanEnKor extends CardImpl { this.toughness = new MageInt(2); // {0}: The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Shapesharer.java b/Mage.Sets/src/mage/cards/s/Shapesharer.java index d34e99bdec8..73b8be52f34 100644 --- a/Mage.Sets/src/mage/cards/s/Shapesharer.java +++ b/Mage.Sets/src/mage/cards/s/Shapesharer.java @@ -38,7 +38,7 @@ public final class Shapesharer extends CardImpl { this.addAbility(new ChangelingAbility()); // {2}{U}: Target Shapeshifter becomes a copy of target creature until your next turn. - Ability copyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability copyAbility = new SimpleActivatedAbility( new ShapesharerEffect(), new ManaCostsImpl<>("{2}{U}")); copyAbility.addTarget(new TargetPermanent(filterShapeshifter)); diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java index d885fdc1c20..51f62e05332 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java @@ -47,14 +47,14 @@ public final class ShieldmageElder extends CardImpl { this.toughness = new MageInt(3); // Tap two untapped Clerics you control: Prevent all damage target creature would deal this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageByTargetEffect(Duration.EndOfTurn, false).withTextOptions(false, true), new TapTargetCost(new TargetControlledPermanent(2, 2, filter1, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Tap two untapped Wizards you control: Prevent all damage target spell would deal this turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new PreventDamageByTargetEffect(Duration.EndOfTurn, false).withTextOptions(false, true), new TapTargetCost(new TargetControlledPermanent(2, 2, filter2, false))); ability2.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/s/ShoreSnapper.java b/Mage.Sets/src/mage/cards/s/ShoreSnapper.java index c2d9e2c5a26..61244b0b401 100644 --- a/Mage.Sets/src/mage/cards/s/ShoreSnapper.java +++ b/Mage.Sets/src/mage/cards/s/ShoreSnapper.java @@ -27,7 +27,7 @@ public final class ShoreSnapper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(new IslandwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java b/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java index eec8735c7c7..89ef885b478 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java @@ -43,7 +43,7 @@ public final class ShrineOfLoyalLegions extends CardImpl { new SpellCastControllerTriggeredAbility(null, filter, false))); //{3}, {T}, Sacrifice Shrine of Loyal Legions: Create a 1/1 colorless Myr artifact creature token for each charge counter on Shrine of Loyal Legions. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CreateTokenEffect(new PhyrexianMyrToken(), new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SilklashSpider.java b/Mage.Sets/src/mage/cards/s/SilklashSpider.java index 6e7e7698e3a..b660e93cc82 100644 --- a/Mage.Sets/src/mage/cards/s/SilklashSpider.java +++ b/Mage.Sets/src/mage/cards/s/SilklashSpider.java @@ -39,7 +39,7 @@ public final class SilklashSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {X}{G}{G}: Silklash Spider deals X damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DamageAllEffect(GetXValue.instance, filter), new ManaCostsImpl<>("{X}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java index ccaf09a9c6d..4103ec60f67 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java +++ b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java @@ -41,7 +41,7 @@ public final class SkirkFireMarshal extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // Tap five untapped Goblins you control: Skirk Fire Marshal deals 10 damage to each creature and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageEverythingEffect(10), new TapTargetCost(new TargetControlledPermanent(5,5, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java b/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java index e264580a126..6b566578642 100644 --- a/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java +++ b/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java @@ -29,7 +29,7 @@ public final class SkitteringHeartstopper extends CardImpl { this.toughness = new MageInt(2); // {B}: Skittering Heartstopper gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } diff --git a/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java b/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java index 83879ecd45b..6feac1432d5 100644 --- a/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java +++ b/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java @@ -30,7 +30,7 @@ public final class SloppityBilepiper extends CardImpl { this.toughness = new MageInt(3); // Jolly Gutpipes -- {2}, {T}, Sacrifice a creature: The next creature spell you cast this turn has cascade. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new NextSpellCastHasAbilityEffect(new CascadeAbility(), StaticFilters.FILTER_CARD_CREATURE), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java b/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java index 9475e607521..768031cdac3 100644 --- a/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java +++ b/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java @@ -37,7 +37,7 @@ public final class SokenzanSpellblade extends CardImpl { // {1}{R}: Sokenzan Spellblade gets +X/+0 until end of turn, where X is the number of cards in your hand. Effect effect = new BoostSourceEffect(CardsInControllerHandCount.instance, StaticValue.get(0), Duration.EndOfTurn); effect.setText("{this} gets +X/+0 until end of turn, where X is the number of cards in your hand"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{1}{R}") )); } diff --git a/Mage.Sets/src/mage/cards/s/SootstokeKindler.java b/Mage.Sets/src/mage/cards/s/SootstokeKindler.java index 04ffea435d4..c6cf8cf842a 100644 --- a/Mage.Sets/src/mage/cards/s/SootstokeKindler.java +++ b/Mage.Sets/src/mage/cards/s/SootstokeKindler.java @@ -43,7 +43,7 @@ public final class SootstokeKindler extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}: Target black or red creature gains haste until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java b/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java index cba18faf8f8..97af2c85091 100644 --- a/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java +++ b/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java @@ -42,7 +42,7 @@ public final class SoramaroFirstToDream extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(xValue))); // {4}, Return a land you control to its owner's hand: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new GenericManaCost(4)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulSnare.java b/Mage.Sets/src/mage/cards/s/SoulSnare.java index 49543e304cf..caa87d4258c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSnare.java +++ b/Mage.Sets/src/mage/cards/s/SoulSnare.java @@ -25,7 +25,7 @@ public final class SoulSnare extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}"); // {W}, Sacrifice Soul Snare: Exile target creature that's attacking you or a planeswalker you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ExileTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterCreatureAttackingYou(true))); diff --git a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java index 469f7a4b5fb..95fd505281f 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java @@ -44,7 +44,7 @@ public final class SpawnsireOfUlamog extends CardImpl { this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new EldraziSpawnToken(), 2).withTextOptions(true), new GenericManaCost(4))); // {20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CastCardFromOutsideTheGameEffect(filter, ruleText), new GenericManaCost(20) ).addHint(OpenSideboardHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java b/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java index 26c736d1d5a..6c1c66b5f8d 100644 --- a/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java +++ b/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java @@ -40,7 +40,7 @@ public final class SpearbreakerBehemoth extends CardImpl { // Spearbreaker Behemoth is indestructible. this.addAbility(IndestructibleAbility.getInstance()); // {1}: Target creature with power 5 or greater is indestructible this turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/Spincrusher.java b/Mage.Sets/src/mage/cards/s/Spincrusher.java index 83fb53d1d73..f93febd3cb1 100644 --- a/Mage.Sets/src/mage/cards/s/Spincrusher.java +++ b/Mage.Sets/src/mage/cards/s/Spincrusher.java @@ -31,7 +31,7 @@ public final class Spincrusher extends CardImpl { // Whenever Spincrusher blocks, put a +1/+1 counter on it. this.addAbility(new BlocksSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // Remove a +1/+1 counter from Spincrusher: Spincrusher can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)))); } diff --git a/Mage.Sets/src/mage/cards/s/SpiritBonds.java b/Mage.Sets/src/mage/cards/s/SpiritBonds.java index c4ac9a3cb41..d421a43a230 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritBonds.java +++ b/Mage.Sets/src/mage/cards/s/SpiritBonds.java @@ -46,7 +46,7 @@ public final class SpiritBonds extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DoIfCostPaid(new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{W}")), StaticFilters.FILTER_CREATURE_NON_TOKEN, false)); // {1}{W}, Sacrifice a Spirit: Target non-Spirit creature gains indestructible until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeTargetCost(filterSpirit)); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SpiritEnKor.java b/Mage.Sets/src/mage/cards/s/SpiritEnKor.java index ab525deabd9..b5930b49cd5 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritEnKor.java +++ b/Mage.Sets/src/mage/cards/s/SpiritEnKor.java @@ -34,7 +34,7 @@ public final class SpiritEnKor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {0}: The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java b/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java index 7016b604825..38a95247b06 100644 --- a/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java +++ b/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java @@ -35,7 +35,7 @@ public final class SpontaneousArtist extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(1))); // Pay {E}: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SporeFlower.java b/Mage.Sets/src/mage/cards/s/SporeFlower.java index 5c401d58bdb..1d17c97adc2 100644 --- a/Mage.Sets/src/mage/cards/s/SporeFlower.java +++ b/Mage.Sets/src/mage/cards/s/SporeFlower.java @@ -32,7 +32,7 @@ public final class SporeFlower extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Spore Flower: Prevent all combat damage that would be dealt this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java b/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java index 24508e26c39..f0435ff54ff 100644 --- a/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java @@ -40,7 +40,7 @@ public final class SteelshaperApprentice extends CardImpl { this.toughness = new MageInt(3); // {W}, {tap}, Return Steelshaper Apprentice to its owner's hand: Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, filter), true, true), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/StoneGiant.java b/Mage.Sets/src/mage/cards/s/StoneGiant.java index 2862c8b5d52..5a781fa56be 100644 --- a/Mage.Sets/src/mage/cards/s/StoneGiant.java +++ b/Mage.Sets/src/mage/cards/s/StoneGiant.java @@ -33,7 +33,7 @@ public final class StoneGiant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); // {tap}: Target creature you control with toughness less than Stone Giant's power gains flying until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new StoneGiantTarget()); diff --git a/Mage.Sets/src/mage/cards/s/Sunforger.java b/Mage.Sets/src/mage/cards/s/Sunforger.java index 02d07480951..44d9e4d2c21 100644 --- a/Mage.Sets/src/mage/cards/s/Sunforger.java +++ b/Mage.Sets/src/mage/cards/s/Sunforger.java @@ -50,7 +50,7 @@ public final class Sunforger extends CardImpl { // {R}{W}, Unattach Sunforger: Search your library for a red or white // instant card with converted mana cost 4 or less and cast that card // without paying its mana cost. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SunforgerEffect(), new ManaCostsImpl<>("{R}{W}")); ability.addCost(new SunforgerUnattachCost(this.getName())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TerrainGenerator.java b/Mage.Sets/src/mage/cards/t/TerrainGenerator.java index ec84d323467..0db5925b71a 100644 --- a/Mage.Sets/src/mage/cards/t/TerrainGenerator.java +++ b/Mage.Sets/src/mage/cards/t/TerrainGenerator.java @@ -27,7 +27,7 @@ public final class TerrainGenerator extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}: You may put a basic land card from your hand onto the battlefield tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_BASIC_LAND_A, false, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java b/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java index ec73595e863..717db0e52ff 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java @@ -39,7 +39,7 @@ public final class TezzeretsSimulacrum extends CardImpl { // {T}: Target opponent loses 1 life. If you control a Tezzeret planeswalker, that player loses 3 life instead. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ConditionalOneShotEffect(new LoseLifeTargetEffect(3), new LoseLifeTargetEffect(1), condition, "Target opponent loses 1 life. If you control a Tezzeret planeswalker, that player loses 3 life instead"), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java index 511c7281d1d..cde9f6a2d38 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java @@ -34,7 +34,7 @@ public final class ThallidDevourer extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Devourer. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid Devourer: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Thallid Devourer gets +1/+2 until end of turn. diff --git a/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java b/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java index e10d1583d1f..9775d9890cd 100644 --- a/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java +++ b/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java @@ -33,7 +33,7 @@ public final class ThaumaticCompass extends CardImpl { this.secondSideCardClazz = mage.cards.s.SpiresOfOrazca.class; // {3}, {T}: Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java b/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java index a613283b562..82bd3518a0f 100644 --- a/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java +++ b/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java @@ -31,7 +31,7 @@ public final class ThawingGlaciers extends CardImpl { // Thawing Glaciers enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {1}, {tap}: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library. Return Thawing Glaciers to its owner's hand at the beginning of the next cleanup step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextCleanupDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)))); diff --git a/Mage.Sets/src/mage/cards/t/TheloniteDruid.java b/Mage.Sets/src/mage/cards/t/TheloniteDruid.java index 82c86fee5f1..b333a16cd27 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteDruid.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteDruid.java @@ -42,7 +42,7 @@ public final class TheloniteDruid extends CardImpl { new CreatureToken(2, 3), "Forests", filter, Duration.EndOfTurn, false); effect.getDependencyTypes().add(DependencyType.BecomeForest); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/ThornThallid.java b/Mage.Sets/src/mage/cards/t/ThornThallid.java index 578b61c2c9a..f49426b3695 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThallid.java +++ b/Mage.Sets/src/mage/cards/t/ThornThallid.java @@ -32,7 +32,7 @@ public final class ThornThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thorn Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thorn Thallid: Thorn Thallid deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(1, "it"), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java b/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java index 18768412e59..0d31d9181c7 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java @@ -31,7 +31,7 @@ public final class ThornscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {R}, {tap}: Target creature gains first strike until end of turn. - SimpleActivatedAbility ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability1 = new SimpleActivatedAbility( new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability1.addCost(new TapSourceCost()); @@ -39,7 +39,7 @@ public final class ThornscapeApprentice extends CardImpl { this.addAbility(ability1); // {W}, {tap}: Tap target creature. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java b/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java index c4972ede471..f91a7aa0107 100644 --- a/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java +++ b/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java @@ -32,7 +32,7 @@ public final class ThranTemporalGateway extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {4}, {t}: You may put a historic permanent card from your hand onto the battlefield. (Artifacts, legendaries, and Sagas are historic.) - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filter) .setText("You may put a historic permanent card from your hand onto the battlefield. " + "(Artifacts, legendaries, and Sagas are historic.)"), diff --git a/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java b/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java index 152f0e6657d..81430c10809 100644 --- a/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java +++ b/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java @@ -33,7 +33,7 @@ public final class TimmyPowerGamer extends CardImpl { this.toughness = new MageInt(1); // {4}: You may put a creature card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), new ManaCostsImpl<>("{4}")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TriassicEgg.java b/Mage.Sets/src/mage/cards/t/TriassicEgg.java index cc46fecb016..fac59e4d996 100644 --- a/Mage.Sets/src/mage/cards/t/TriassicEgg.java +++ b/Mage.Sets/src/mage/cards/t/TriassicEgg.java @@ -32,7 +32,7 @@ public final class TriassicEgg extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {tap}: Put a hatchling counter on Triassic Egg. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.HATCHLING.createInstance(), true), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/u/UlrichsKindred.java b/Mage.Sets/src/mage/cards/u/UlrichsKindred.java index 8c55c72914f..0f25d20d9e2 100644 --- a/Mage.Sets/src/mage/cards/u/UlrichsKindred.java +++ b/Mage.Sets/src/mage/cards/u/UlrichsKindred.java @@ -41,7 +41,7 @@ public final class UlrichsKindred extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {3}{G}: Target attacking Wolf or Werewolf gains indestructible until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java b/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java index e7f3ec870a7..ae4eaac6458 100644 --- a/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java +++ b/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java @@ -44,7 +44,7 @@ public final class UnyaroGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Unyaro Griffin: Counter target red instant or sorcery spell. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CounterTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java b/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java index df1ba5d44c7..86f874ec94f 100644 --- a/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java +++ b/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java @@ -35,7 +35,7 @@ public final class VagrantPlowbeasts extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/v/VitasporeThallid.java b/Mage.Sets/src/mage/cards/v/VitasporeThallid.java index 268c6a30448..2dfe408302e 100644 --- a/Mage.Sets/src/mage/cards/v/VitasporeThallid.java +++ b/Mage.Sets/src/mage/cards/v/VitasporeThallid.java @@ -37,11 +37,11 @@ public final class VitasporeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Vitaspore Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Vitaspore Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java index 5eaab92ca64..2c8d42f6ea0 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java @@ -38,7 +38,7 @@ public final class VoiceOfTheWoods extends CardImpl { this.toughness = new MageInt(2); // Tap five untapped Elves you control: Create a 7/7 green Elemental creature token with trample. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CreateTokenEffect(new VoiceOfTheWoodsElementalToken()), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoyagerStaff.java b/Mage.Sets/src/mage/cards/v/VoyagerStaff.java index 73425c0f89b..081c8f95a95 100644 --- a/Mage.Sets/src/mage/cards/v/VoyagerStaff.java +++ b/Mage.Sets/src/mage/cards/v/VoyagerStaff.java @@ -22,7 +22,7 @@ public final class VoyagerStaff extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {2}, Sacrifice Voyager Staff: Exile target creature. Return the exiled card to the battlefield under its owner's control at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ExileReturnBattlefieldNextEndStepTargetEffect().returnExiledOnly(true), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java b/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java index a4deca6ed15..1d58210e7bd 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java +++ b/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java @@ -28,7 +28,7 @@ public final class WallOfTanglecord extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(6); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java b/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java index eb547b5a742..a118c768791 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java +++ b/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java @@ -28,7 +28,7 @@ public final class WandOfTheWorldsoul extends CardImpl { this.addAbility(new WhiteManaAbility()); // {T}: The next spell you cast this turn has convoke. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new NextSpellCastHasAbilityEffect(new ConvokeAbility()), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/w/WanderersTwig.java b/Mage.Sets/src/mage/cards/w/WanderersTwig.java index 05e9c096648..6647ad82c68 100644 --- a/Mage.Sets/src/mage/cards/w/WanderersTwig.java +++ b/Mage.Sets/src/mage/cards/w/WanderersTwig.java @@ -25,7 +25,7 @@ public final class WanderersTwig extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Wanderer's Twig: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WanderingMage.java b/Mage.Sets/src/mage/cards/w/WanderingMage.java index 928412fc2d1..ff860723176 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingMage.java +++ b/Mage.Sets/src/mage/cards/w/WanderingMage.java @@ -49,20 +49,20 @@ public final class WanderingMage extends CardImpl { this.toughness = new MageInt(3); // {W}, Pay 1 life: Prevent the next 2 damage that would be dealt to target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl<>("{W}")); ability.addCost(new PayLifeCost(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}: Prevent the next 1 damage that would be dealt to target Cleric or Wizard creature this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {B}, Put a -1/-1 counter on a creature you control: Prevent the next 2 damage that would be dealt to target player this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl<>("{B}")); ability.addCost(new WanderingMageCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/w/WarpedLandscape.java b/Mage.Sets/src/mage/cards/w/WarpedLandscape.java index 9d3dbc7f19a..2ab2a21c69e 100644 --- a/Mage.Sets/src/mage/cards/w/WarpedLandscape.java +++ b/Mage.Sets/src/mage/cards/w/WarpedLandscape.java @@ -30,7 +30,7 @@ public final class WarpedLandscape extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}, Sacrifice Warped Landscape: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WarriorEnKor.java b/Mage.Sets/src/mage/cards/w/WarriorEnKor.java index 36946cc7a29..0fbda191d69 100644 --- a/Mage.Sets/src/mage/cards/w/WarriorEnKor.java +++ b/Mage.Sets/src/mage/cards/w/WarriorEnKor.java @@ -31,7 +31,7 @@ public final class WarriorEnKor extends CardImpl { this.toughness = new MageInt(2); // {0}: The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java index 4cc05760573..5086773e02f 100644 --- a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java +++ b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java @@ -26,7 +26,7 @@ public final class WayfarersBauble extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {2}, {tap}, Sacrifice Wayfarer's Bauble: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND),true, true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WeatherseedElf.java b/Mage.Sets/src/mage/cards/w/WeatherseedElf.java index 1c6631c4ece..98220327ad5 100644 --- a/Mage.Sets/src/mage/cards/w/WeatherseedElf.java +++ b/Mage.Sets/src/mage/cards/w/WeatherseedElf.java @@ -30,7 +30,7 @@ public final class WeatherseedElf extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java index 817f6a72d39..7e4b66136cc 100644 --- a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java +++ b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java @@ -38,7 +38,7 @@ public final class WhipgrassEntangler extends CardImpl { // {1}{W}: Until end of turn, target creature gains "This creature can't attack or block unless its controller pays {1} for each Cleric on the battlefield." Ability gainedAbility = new LinkedEffectIdStaticAbility(new WhipgrassEntanglerCantAttackUnlessYouPayEffect()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn).setText("Until end of turn, target creature gains \"This creature can't attack or block unless its controller pays {1} for each Cleric on the battlefield.\""), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java b/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java index 74641cc3b6e..77874bea52e 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java +++ b/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java @@ -28,7 +28,7 @@ public final class WhiteManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on White Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java b/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java index ee0741eb37a..5af9b329e08 100644 --- a/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java +++ b/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java @@ -33,7 +33,7 @@ public final class WildFieldScarecrow extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {2}, Sacrifice Wild-Field Scarecrow: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WillowPriestess.java b/Mage.Sets/src/mage/cards/w/WillowPriestess.java index 40e46cf8c53..6ac2a8f8c77 100644 --- a/Mage.Sets/src/mage/cards/w/WillowPriestess.java +++ b/Mage.Sets/src/mage/cards/w/WillowPriestess.java @@ -44,12 +44,12 @@ public final class WillowPriestess extends CardImpl { this.toughness = new MageInt(2); // {T}: You may put a Faerie permanent card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filter), new TapSourceCost())); // {2}{G}: Target green creature gains protection from black until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); Target target = new TargetPermanent(greenCreature); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java b/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java index ee16bde85ce..5f27500387f 100644 --- a/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java +++ b/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java @@ -28,7 +28,7 @@ public final class WineOfBloodAndIron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {4}: Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice Wine of Blood and Iron at the beginning of the next end step. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(TargetPermanentPowerCount.instance, StaticValue.get(0), Duration.EndOfTurn), new GenericManaCost(4)); Effect effect = new CreateDelayedTriggeredAbilityEffect( diff --git a/Mage.Sets/src/mage/cards/w/WormwoodDryad.java b/Mage.Sets/src/mage/cards/w/WormwoodDryad.java index 106dc523acd..eef4d248eb5 100644 --- a/Mage.Sets/src/mage/cards/w/WormwoodDryad.java +++ b/Mage.Sets/src/mage/cards/w/WormwoodDryad.java @@ -30,13 +30,13 @@ public final class WormwoodDryad extends CardImpl { this.toughness = new MageInt(1); // {G}: Wormwood Dryad gains forestwalk until end of turn and deals 1 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you")); this.addAbility(ability); // {B}: Wormwood Dryad gains swampwalk until end of turn and deals 1 damage to you. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java b/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java index 47855f98673..bfa72806aae 100644 --- a/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java +++ b/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java @@ -30,13 +30,13 @@ public final class WormwoodTreefolk extends CardImpl { this.toughness = new MageInt(4); // {G}{G}: Wormwood Treefolk gains forestwalk until end of turn and deals 2 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}")); ability.addEffect(new DamageControllerEffect(2).setText("and deals 2 damage to you")); this.addAbility(ability); // {B}{B}: Wormwood Treefolk gains swampwalk until end of turn and deals 2 damage to you. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}")); ability.addEffect(new DamageControllerEffect(2).setText("and deals 2 damage to you")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/x/XathridGorgon.java b/Mage.Sets/src/mage/cards/x/XathridGorgon.java index 297ab23082f..e16f34b4702 100644 --- a/Mage.Sets/src/mage/cards/x/XathridGorgon.java +++ b/Mage.Sets/src/mage/cards/x/XathridGorgon.java @@ -42,7 +42,7 @@ public final class XathridGorgon extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // {2}{B}, {tap}: Put a petrification counter on target creature. It gains defender and becomes a colorless artifact in addition to its other types. Its activated abilities can't be activated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.PETRIFICATION.createInstance()), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/y/YewSpirit.java b/Mage.Sets/src/mage/cards/y/YewSpirit.java index 31efe976e55..0694c1f44ce 100644 --- a/Mage.Sets/src/mage/cards/y/YewSpirit.java +++ b/Mage.Sets/src/mage/cards/y/YewSpirit.java @@ -29,7 +29,7 @@ public final class YewSpirit extends CardImpl { this.toughness = new MageInt(3); // {2}{G}{G}: Yew Spirit gets +X/+X until end of turn, where X is its power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(SourcePermanentPowerValue.NOT_NEGATIVE, SourcePermanentPowerValue.NOT_NEGATIVE, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/z/ZombieInfestation.java b/Mage.Sets/src/mage/cards/z/ZombieInfestation.java index c9a010ebbe1..e6547fe1120 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieInfestation.java +++ b/Mage.Sets/src/mage/cards/z/ZombieInfestation.java @@ -24,7 +24,7 @@ public final class ZombieInfestation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); // Discard two cards: Create a 2/2 black Zombie creature token. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new ZombieToken()), new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java index db99684fcc7..230e98824a3 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java +++ b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java @@ -42,13 +42,13 @@ public final class ZombieTrailblazer extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped Zombie you control: Target land becomes a Swamp until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.SWAMP), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); // Tap an untapped Zombie you control: Target creature gains swampwalk until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); -- 2.47.2 From 140361223d35207c6fa12281d805c2bb6658aa89 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:33:45 -0500 Subject: [PATCH 48/50] refactor: SimpleActivatedAbility default zone (separate line) --- Mage.Sets/src/mage/cards/f/FlaringFlameKin.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneShambler.java | 2 +- Mage.Sets/src/mage/cards/f/FoulPresence.java | 2 +- Mage.Sets/src/mage/cards/g/GhostTactician.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinDynamo.java | 2 +- Mage.Sets/src/mage/cards/l/LlanowarVanguard.java | 2 +- Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java | 2 +- Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverWall.java | 2 +- Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java | 2 +- Mage.Sets/src/mage/cards/s/SkywingAven.java | 2 +- Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java | 2 +- Mage.Sets/src/mage/cards/t/TeardropKami.java | 4 +--- Mage.Sets/src/mage/cards/t/TriangleOfWar.java | 2 +- Mage.Sets/src/mage/cards/t/Trollhide.java | 2 +- Mage.Sets/src/mage/cards/t/TsabosAssassin.java | 2 +- Mage.Sets/src/mage/cards/w/WhipSergeant.java | 2 +- 18 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java index b0fc9e5477b..345a66545fc 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java @@ -41,7 +41,7 @@ public final class FlaringFlameKin extends CardImpl { ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance()), enchanted, ", has trample")); - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability grantedAbility = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(grantedAbility), enchanted, ", and has \"{R}: {this} gets +1/+0 until end of turn.\"")); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java index 8779224c6df..da9c2668d74 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java @@ -26,7 +26,7 @@ public final class FlowstoneCrusher extends CardImpl { this.toughness = new MageInt(4); // {R}: Flowstone Crusher gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java index bf15e5e82a9..9f28d069ade 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java @@ -26,7 +26,7 @@ public final class FlowstoneShambler extends CardImpl { this.toughness = new MageInt(2); // {R}: Flowstone Shambler gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FoulPresence.java b/Mage.Sets/src/mage/cards/f/FoulPresence.java index 80c8a539480..2afd026c49f 100644 --- a/Mage.Sets/src/mage/cards/f/FoulPresence.java +++ b/Mage.Sets/src/mage/cards/f/FoulPresence.java @@ -36,7 +36,7 @@ public final class FoulPresence extends CardImpl { this.addAbility(ability); // Enchanted creature gets -1/-1 and has "{T}: Target creature gets -1/-1 until end of turn." ability = new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability gainedAbility = new SimpleActivatedAbility( new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/g/GhostTactician.java b/Mage.Sets/src/mage/cards/g/GhostTactician.java index 073463479c5..b08967257e3 100644 --- a/Mage.Sets/src/mage/cards/g/GhostTactician.java +++ b/Mage.Sets/src/mage/cards/g/GhostTactician.java @@ -30,7 +30,7 @@ public final class GhostTactician extends CardImpl { this.toughness = new MageInt(5); // {W}, {T}, Discard a card: Creatures you control get +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java index 2d1eb884456..7689183f103 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java @@ -36,7 +36,7 @@ public final class GoblinDynamo extends CardImpl { this.addAbility(ability); //{X}{R}, {T}, Sacrifice Goblin Dynamo: Goblin Dynamo deals X damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java b/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java index e2e0d2cf31b..6ce84bafab1 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java @@ -26,7 +26,7 @@ public final class LlanowarVanguard extends CardImpl { this.toughness = new MageInt(1); // {T}: Llanowar Vanguard gets +0/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(0, 4, Duration.EndOfTurn), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java b/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java index 4bc8022e52b..49d3fd2eab8 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java @@ -33,7 +33,7 @@ public final class ObsidianAcolyte extends CardImpl { // Protection from black this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}: Target creature gains protection from black until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java b/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java index de63b8f4d58..2d99eb67e97 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java @@ -33,7 +33,7 @@ public final class ParallaxInhibitor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Parallax Inhibitor: Put a fade counter on each permanent with fading you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersAllEffect(CounterType.FADE.createInstance(), filter), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverWall.java b/Mage.Sets/src/mage/cards/q/QuicksilverWall.java index 071d4d58249..cc206aa25a1 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverWall.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverWall.java @@ -30,7 +30,7 @@ public final class QuicksilverWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {4}: Return Quicksilver Wall to its owner's hand. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{4}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java b/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java index f776ac2fb5e..0830764a3d7 100644 --- a/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java +++ b/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java @@ -32,7 +32,7 @@ public final class SilvergladePathfinder extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {tap}, Discard a card: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SkywingAven.java b/Mage.Sets/src/mage/cards/s/SkywingAven.java index d657a83b6c0..53c9d58ed4e 100644 --- a/Mage.Sets/src/mage/cards/s/SkywingAven.java +++ b/Mage.Sets/src/mage/cards/s/SkywingAven.java @@ -30,7 +30,7 @@ public final class SkywingAven extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Discard a card: Return Skywing Aven to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ReturnToHandSourceEffect(), new DiscardCardCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java b/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java index 5d05386b39d..384c60a1f7b 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java @@ -38,7 +38,7 @@ public final class SoratamiMindsweeper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Target player puts the top two cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new MillCardsTargetEffect(2), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(2), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetPlayer()); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TeardropKami.java b/Mage.Sets/src/mage/cards/t/TeardropKami.java index 7815032ac45..d5f1df60ad0 100644 --- a/Mage.Sets/src/mage/cards/t/TeardropKami.java +++ b/Mage.Sets/src/mage/cards/t/TeardropKami.java @@ -28,7 +28,7 @@ public final class TeardropKami extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Teardrop Kami: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new MayTapOrUntapTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -42,5 +42,3 @@ public final class TeardropKami extends CardImpl { return new TeardropKami(this); } } - - diff --git a/Mage.Sets/src/mage/cards/t/TriangleOfWar.java b/Mage.Sets/src/mage/cards/t/TriangleOfWar.java index f4a8cef656b..00161dbaaf4 100644 --- a/Mage.Sets/src/mage/cards/t/TriangleOfWar.java +++ b/Mage.Sets/src/mage/cards/t/TriangleOfWar.java @@ -25,7 +25,7 @@ public final class TriangleOfWar extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {2}, Sacrifice Triangle of War: Target creature you control fights target creature an opponent controls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new FightTargetsEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/Trollhide.java b/Mage.Sets/src/mage/cards/t/Trollhide.java index b3a6dfa440d..379124574f6 100644 --- a/Mage.Sets/src/mage/cards/t/Trollhide.java +++ b/Mage.Sets/src/mage/cards/t/Trollhide.java @@ -43,7 +43,7 @@ public final class Trollhide extends CardImpl { // Enchanted creature gets +2/+2 and has "{1}{G}: Regenerate this creature." ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); - Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, + Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility( new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}")), AttachmentType.AURA); effect.setText("and has \"{1}{G}: Regenerate this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TsabosAssassin.java b/Mage.Sets/src/mage/cards/t/TsabosAssassin.java index 413b19b432e..0fc778da3d2 100644 --- a/Mage.Sets/src/mage/cards/t/TsabosAssassin.java +++ b/Mage.Sets/src/mage/cards/t/TsabosAssassin.java @@ -38,7 +38,7 @@ public final class TsabosAssassin extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target creature if it shares a color with the most common color among all permanents or a color tied for most common. A creature destroyed this way can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new TsabosAssasinEffect(),new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TsabosAssasinEffect(),new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhipSergeant.java b/Mage.Sets/src/mage/cards/w/WhipSergeant.java index 222fe72e3b7..d76b0fe688d 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSergeant.java +++ b/Mage.Sets/src/mage/cards/w/WhipSergeant.java @@ -30,7 +30,7 @@ public final class WhipSergeant extends CardImpl { this.toughness = new MageInt(1); // {R}: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); -- 2.47.2 From b9678c65e31d18addedfee0de57690e926940fbb Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:35:11 -0500 Subject: [PATCH 49/50] refactor: SimpleActivatedAbility default zone (separate lines) --- Mage.Sets/src/mage/cards/a/AdantoVanguard.java | 1 - Mage.Sets/src/mage/cards/a/ArcaneEncyclopedia.java | 1 - Mage.Sets/src/mage/cards/b/BloodBairn.java | 1 - Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java | 1 - Mage.Sets/src/mage/cards/b/BomatCourier.java | 1 - Mage.Sets/src/mage/cards/b/BorosChallenger.java | 1 - Mage.Sets/src/mage/cards/b/BountyAgent.java | 1 - Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java | 1 - Mage.Sets/src/mage/cards/b/Brightling.java | 4 ---- Mage.Sets/src/mage/cards/b/BudokaPupil.java | 1 - Mage.Sets/src/mage/cards/b/BurnishedHart.java | 1 - Mage.Sets/src/mage/cards/c/CallowJushi.java | 1 - Mage.Sets/src/mage/cards/c/CarnifexDemon.java | 1 - Mage.Sets/src/mage/cards/c/CharnelTroll.java | 1 - Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java | 1 - Mage.Sets/src/mage/cards/c/CopperGnomes.java | 1 - Mage.Sets/src/mage/cards/c/CorpseBlockade.java | 1 - Mage.Sets/src/mage/cards/c/CunningBandit.java | 1 - Mage.Sets/src/mage/cards/d/DailyRegimen.java | 1 - Mage.Sets/src/mage/cards/d/DawnOfHope.java | 1 - Mage.Sets/src/mage/cards/d/DevkarinDissident.java | 1 - Mage.Sets/src/mage/cards/d/DismissivePyromancer.java | 2 -- Mage.Sets/src/mage/cards/d/DraconicDisciple.java | 1 - Mage.Sets/src/mage/cards/d/DreamscapeArtist.java | 1 - Mage.Sets/src/mage/cards/d/DropkickBomber.java | 1 - Mage.Sets/src/mage/cards/e/ElvishClancaller.java | 1 - Mage.Sets/src/mage/cards/e/EpitaphGolem.java | 1 - Mage.Sets/src/mage/cards/e/EvolvingWilds.java | 1 - Mage.Sets/src/mage/cards/f/FaithfulSquire.java | 1 - Mage.Sets/src/mage/cards/f/FiresOfMountDoom.java | 1 - Mage.Sets/src/mage/cards/f/FreneticEfreet.java | 1 - Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java | 1 - Mage.Sets/src/mage/cards/f/FungalPlots.java | 1 - Mage.Sets/src/mage/cards/g/GargoyleCastle.java | 3 +-- Mage.Sets/src/mage/cards/g/GeneralTazri.java | 1 - Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java | 1 - Mage.Sets/src/mage/cards/g/Gnathosaur.java | 1 - Mage.Sets/src/mage/cards/g/GoblinBanneret.java | 1 - Mage.Sets/src/mage/cards/g/GoblinBomb.java | 1 - Mage.Sets/src/mage/cards/g/GoblinMotivator.java | 1 - Mage.Sets/src/mage/cards/g/GontisMachinations.java | 1 - Mage.Sets/src/mage/cards/g/GrapplingSundew.java | 1 - Mage.Sets/src/mage/cards/g/Gravewaker.java | 1 - Mage.Sets/src/mage/cards/g/GraveyardMarshal.java | 1 - Mage.Sets/src/mage/cards/h/Hackrobat.java | 2 -- Mage.Sets/src/mage/cards/h/Helldozer.java | 1 - Mage.Sets/src/mage/cards/h/HiredMuscle.java | 1 - Mage.Sets/src/mage/cards/h/HonorWornShaku.java | 1 - Mage.Sets/src/mage/cards/h/HorrorOfTheDim.java | 1 - Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java | 1 - Mage.Sets/src/mage/cards/i/ImmolationShaman.java | 1 - Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java | 1 - Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java | 1 - Mage.Sets/src/mage/cards/k/KelsinkoRanger.java | 1 - Mage.Sets/src/mage/cards/k/KikuNightsFlower.java | 2 -- Mage.Sets/src/mage/cards/k/KithkinArmor.java | 1 - Mage.Sets/src/mage/cards/k/KnowledgeVault.java | 1 - Mage.Sets/src/mage/cards/k/KyrenArchive.java | 1 - Mage.Sets/src/mage/cards/k/KyrenNegotiations.java | 1 - Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java | 1 - Mage.Sets/src/mage/cards/l/LedevChampion.java | 1 - Mage.Sets/src/mage/cards/l/LightningMare.java | 1 - Mage.Sets/src/mage/cards/l/Lithatog.java | 2 -- Mage.Sets/src/mage/cards/m/MidnightSnack.java | 1 - Mage.Sets/src/mage/cards/m/MoggAssassin.java | 1 - Mage.Sets/src/mage/cards/m/Musician.java | 1 - Mage.Sets/src/mage/cards/m/MysticArchaeologist.java | 1 - Mage.Sets/src/mage/cards/n/NobleSteeds.java | 1 - Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java | 1 - Mage.Sets/src/mage/cards/p/PasswallAdept.java | 1 - Mage.Sets/src/mage/cards/p/PerilousVault.java | 1 - Mage.Sets/src/mage/cards/p/Phantatog.java | 2 -- Mage.Sets/src/mage/cards/p/PlanarBridge.java | 1 - Mage.Sets/src/mage/cards/p/PsionicSliver.java | 1 - Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java | 2 -- Mage.Sets/src/mage/cards/r/RavenousHarpy.java | 1 - Mage.Sets/src/mage/cards/r/RenegadeMap.java | 1 - Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java | 1 - Mage.Sets/src/mage/cards/r/RimefeatherOwl.java | 1 - Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java | 1 - Mage.Sets/src/mage/cards/r/RukarumelBiologist.java | 1 - Mage.Sets/src/mage/cards/r/RuthlessKnave.java | 1 - Mage.Sets/src/mage/cards/s/SaiMasterThopterist.java | 1 - Mage.Sets/src/mage/cards/s/SakuraTribeScout.java | 1 - Mage.Sets/src/mage/cards/s/Sarcatog.java | 2 -- Mage.Sets/src/mage/cards/s/ScarlandThrinax.java | 1 - Mage.Sets/src/mage/cards/s/ScavengerGrounds.java | 1 - Mage.Sets/src/mage/cards/s/ScrabblingClaws.java | 2 -- Mage.Sets/src/mage/cards/s/ScreechingPhoenix.java | 1 - Mage.Sets/src/mage/cards/s/SeraphOfTheScales.java | 2 -- Mage.Sets/src/mage/cards/s/SiegebreakerGiant.java | 1 - Mage.Sets/src/mage/cards/s/SilentDart.java | 1 - Mage.Sets/src/mage/cards/s/SkyshroudVampire.java | 1 - Mage.Sets/src/mage/cards/s/SoulRansom.java | 1 - Mage.Sets/src/mage/cards/s/SoulstoneSanctuary.java | 1 - Mage.Sets/src/mage/cards/s/SteelHellkite.java | 1 - Mage.Sets/src/mage/cards/s/StonehewerGiant.java | 1 - Mage.Sets/src/mage/cards/s/SunCollaredRaptor.java | 3 +-- Mage.Sets/src/mage/cards/s/SurgeMare.java | 1 - Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java | 1 - Mage.Sets/src/mage/cards/t/TerramorphicExpanse.java | 1 - Mage.Sets/src/mage/cards/t/Thaumatog.java | 2 -- Mage.Sets/src/mage/cards/t/ThranForge.java | 1 - Mage.Sets/src/mage/cards/t/TideforceElemental.java | 1 - Mage.Sets/src/mage/cards/t/TorchSong.java | 1 - Mage.Sets/src/mage/cards/t/Torture.java | 1 - Mage.Sets/src/mage/cards/t/TreefolkHealer.java | 1 - Mage.Sets/src/mage/cards/u/UmezawasJitte.java | 1 - Mage.Sets/src/mage/cards/v/VampireAristocrat.java | 1 - Mage.Sets/src/mage/cards/v/VampireHounds.java | 1 - Mage.Sets/src/mage/cards/v/VarinaLichQueen.java | 1 - Mage.Sets/src/mage/cards/v/VeiledShade.java | 1 - Mage.Sets/src/mage/cards/v/VolrathTheFallen.java | 1 - Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java | 1 - Mage.Sets/src/mage/cards/w/WalkingAtlas.java | 1 - Mage.Sets/src/mage/cards/w/WanderingTreefolk.java | 3 +-- Mage.Sets/src/mage/cards/w/WarDance.java | 1 - Mage.Sets/src/mage/cards/w/WeldfastMonitor.java | 1 - 118 files changed, 3 insertions(+), 134 deletions(-) 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))); -- 2.47.2 From 9e9b863b600d863e205de5963ed24fe002af75cf Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:36:34 -0500 Subject: [PATCH 50/50] refactor: SimpleActivatedAbility default zone (separate lines cont.) --- Mage.Sets/src/mage/cards/a/AuraFracture.java | 1 - Mage.Sets/src/mage/cards/s/SanctumSpirit.java | 1 - Mage.Sets/src/mage/cards/t/ThunderTotem.java | 1 - Mage.Sets/src/mage/cards/t/TidewaterMinion.java | 1 - Mage.Sets/src/mage/cards/t/TorpidMoloch.java | 1 - Mage.Sets/src/mage/cards/t/TrenchingSteed.java | 1 - Mage.Sets/src/mage/cards/t/TroubledHealer.java | 1 - Mage.Sets/src/mage/cards/t/TumbleMagnet.java | 1 - 8 files changed, 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AuraFracture.java b/Mage.Sets/src/mage/cards/a/AuraFracture.java index 15cf0c13b8b..7cd3fe16ee0 100644 --- a/Mage.Sets/src/mage/cards/a/AuraFracture.java +++ b/Mage.Sets/src/mage/cards/a/AuraFracture.java @@ -26,7 +26,6 @@ public final class AuraFracture extends CardImpl { // Sacrifice a land: Destroy target enchantment. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SanctumSpirit.java b/Mage.Sets/src/mage/cards/s/SanctumSpirit.java index 901bf9c5fde..cfc17b42039 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SanctumSpirit.java @@ -35,7 +35,6 @@ public final class SanctumSpirit extends CardImpl { // Discard a historic card: Sanctum Spirit gains indestructible until end of turn. this.addAbility( new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost(new FilterHistoricCard()) ) diff --git a/Mage.Sets/src/mage/cards/t/ThunderTotem.java b/Mage.Sets/src/mage/cards/t/ThunderTotem.java index a82446eb74c..b5289d01e57 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderTotem.java +++ b/Mage.Sets/src/mage/cards/t/ThunderTotem.java @@ -31,7 +31,6 @@ public final class ThunderTotem extends CardImpl { // {1}{W}{W}: Thunder Totem becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ThunderTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TidewaterMinion.java b/Mage.Sets/src/mage/cards/t/TidewaterMinion.java index 955fe0079d7..7d52cb739ff 100644 --- a/Mage.Sets/src/mage/cards/t/TidewaterMinion.java +++ b/Mage.Sets/src/mage/cards/t/TidewaterMinion.java @@ -36,7 +36,6 @@ public final class TidewaterMinion extends CardImpl { // {4}: Tidewater Minion loses defender until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{4}"))); diff --git a/Mage.Sets/src/mage/cards/t/TorpidMoloch.java b/Mage.Sets/src/mage/cards/t/TorpidMoloch.java index 731be19aea9..c1559f68ddd 100644 --- a/Mage.Sets/src/mage/cards/t/TorpidMoloch.java +++ b/Mage.Sets/src/mage/cards/t/TorpidMoloch.java @@ -34,7 +34,6 @@ public final class TorpidMoloch extends CardImpl { // Sacrifice three lands: Torpid Moloch loses defender until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(3, StaticFilters.FILTER_LANDS))); } diff --git a/Mage.Sets/src/mage/cards/t/TrenchingSteed.java b/Mage.Sets/src/mage/cards/t/TrenchingSteed.java index e657f9c3162..8a960dae1cd 100644 --- a/Mage.Sets/src/mage/cards/t/TrenchingSteed.java +++ b/Mage.Sets/src/mage/cards/t/TrenchingSteed.java @@ -31,7 +31,6 @@ public final class TrenchingSteed extends CardImpl { // Sacrifice a land: Trenching Steed gets +0/+3 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(0, 3, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); } diff --git a/Mage.Sets/src/mage/cards/t/TroubledHealer.java b/Mage.Sets/src/mage/cards/t/TroubledHealer.java index c33be544bed..8fa0b06ae50 100644 --- a/Mage.Sets/src/mage/cards/t/TroubledHealer.java +++ b/Mage.Sets/src/mage/cards/t/TroubledHealer.java @@ -33,7 +33,6 @@ public final class TroubledHealer extends CardImpl { // Sacrifice a land: 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 SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/TumbleMagnet.java b/Mage.Sets/src/mage/cards/t/TumbleMagnet.java index 4f9522e567d..d0960ac1c9c 100644 --- a/Mage.Sets/src/mage/cards/t/TumbleMagnet.java +++ b/Mage.Sets/src/mage/cards/t/TumbleMagnet.java @@ -31,7 +31,6 @@ public final class TumbleMagnet extends CardImpl { )); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost() ); -- 2.47.2