From b707d11aa48095a5862d99907b485b3846f20faf Mon Sep 17 00:00:00 2001 From: magenoxx Date: Sat, 16 Jul 2011 01:24:19 +0400 Subject: [PATCH 1/2] Decks by inok.goo --- .../Ala-M10-Zen/ALA Block Constructed.dck | 23 +++++++++ .../release/sample-decks/Ala-M10-Zen/Jund.dck | 28 +++++++++++ .../Ala-M10-Zen/NayaLightsaber.dck | 28 +++++++++++ .../sample-decks/Ala-M10-Zen/Pro Walker.dck | 26 ++++++++++ .../sample-decks/Ala-M10-Zen/RB Aggro.dck | 21 ++++++++ .../Ala-M10-Zen/SanDiegoLuisScott-Vargas.dck | 34 +++++++++++++ .../Ala-M10-Zen/SanDiegoVidugiris.dck | 26 ++++++++++ .../Ala-M10-Zen/SanJuanMatignon.dck | 28 +++++++++++ .../Ala-M10-Zen/SanJuanSwartz.dck | 21 ++++++++ .../sample-decks/Ala-M10-Zen/UW Control.dck | 31 ++++++++++++ .../sample-decks/Ala-M10-Zen/UWR Walker.dck | 30 ++++++++++++ .../sample-decks/Ala-M10-Zen/WhiteTokens.dck | 26 ++++++++++ .../WorldChampionships-Calafell.dck | 24 +++++++++ .../Magic 2011/Blades of Victory.dck | 37 ++++++++++++++ .../Magic 2011/Breath of Fire.dck | 36 ++++++++++++++ .../Magic 2011/Power of Prophecy.dck | 37 ++++++++++++++ .../Magic 2011/Reign of Vampirism.dck | 49 +++++++++++++++++++ .../Magic 2011/Stampede of Beasts.dck | 30 ++++++++++++ .../Infect and Defile.dck | 28 +++++++++++ .../War of Attrition.dck | 29 +++++++++++ .../Scars of Mirrodin/Deadspread.dck | 35 +++++++++++++ .../Scars of Mirrodin/Myr of Mirrodin.dck | 27 ++++++++++ .../Scars of Mirrodin/Relic Breaker.dck | 35 +++++++++++++ .../Zen_M11_SoM/Architect Ramp.dck | 21 ++++++++ .../Zen_M11_SoM/Black Blue M11.dck | 28 +++++++++++ .../sample-decks/Zen_M11_SoM/Boros.dck | 26 ++++++++++ .../Zen_M11_SoM/RUG Control[Zen_M11_SoM].dck | 27 ++++++++++ .../Zen_M11_SoM/Vampires[Zen_M11_SoM].dck | 26 ++++++++++ 28 files changed, 817 insertions(+) create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/ALA Block Constructed.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/Jund.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/NayaLightsaber.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/Pro Walker.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/RB Aggro.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoLuisScott-Vargas.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoVidugiris.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanMatignon.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanSwartz.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/UW Control.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/UWR Walker.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/WhiteTokens.dck create mode 100644 Mage.Client/release/sample-decks/Ala-M10-Zen/WorldChampionships-Calafell.dck create mode 100644 Mage.Client/release/sample-decks/Magic 2011/Blades of Victory.dck create mode 100644 Mage.Client/release/sample-decks/Magic 2011/Breath of Fire.dck create mode 100644 Mage.Client/release/sample-decks/Magic 2011/Power of Prophecy.dck create mode 100644 Mage.Client/release/sample-decks/Magic 2011/Reign of Vampirism.dck create mode 100644 Mage.Client/release/sample-decks/Magic 2011/Stampede of Beasts.dck create mode 100644 Mage.Client/release/sample-decks/Mirrodin Besieged Event Decks/Infect and Defile.dck create mode 100644 Mage.Client/release/sample-decks/New Phyrexia Event Decks/War of Attrition.dck create mode 100644 Mage.Client/release/sample-decks/Scars of Mirrodin/Deadspread.dck create mode 100644 Mage.Client/release/sample-decks/Scars of Mirrodin/Myr of Mirrodin.dck create mode 100644 Mage.Client/release/sample-decks/Scars of Mirrodin/Relic Breaker.dck create mode 100644 Mage.Client/release/sample-decks/Zen_M11_SoM/Architect Ramp.dck create mode 100644 Mage.Client/release/sample-decks/Zen_M11_SoM/Black Blue M11.dck create mode 100644 Mage.Client/release/sample-decks/Zen_M11_SoM/Boros.dck create mode 100644 Mage.Client/release/sample-decks/Zen_M11_SoM/RUG Control[Zen_M11_SoM].dck create mode 100644 Mage.Client/release/sample-decks/Zen_M11_SoM/Vampires[Zen_M11_SoM].dck diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/ALA Block Constructed.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/ALA Block Constructed.dck new file mode 100644 index 0000000000..00858c4300 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/ALA Block Constructed.dck @@ -0,0 +1,23 @@ +//Created with Mage - www.magefree.com +NAME:ALA Block Constructed +AUTHOR:UNKNOWN + +# Creatures +4 [ARB:50] Bloodbraid Elf +4 [ALA:160] Broodmate Dragon +4 [ARB:95] Putrid Leech +2 [ARB:60] Spellbreaker Behemoth +2 [ALA:197] Sprouting Thrinax +# Spells +3 [ARB:34] Bituminous Blast +4 [ALA:156] Blightning +4 [ARB:92] Maelstrom Pulse +4 [ARB:46] Terminate +2 [ARB:62] Vengeful Rebirth +# Lands +4 [ALA:222] Crumbling Necropolis +5 [ALA:246] Forest +4 [ALA:225] Jund Panorama +4 [ALA:242] Mountain +4 [ALA:228] Savage Lands +4 [ALA:238] Swamp diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/Jund.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/Jund.dck new file mode 100644 index 0000000000..3234425964 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/Jund.dck @@ -0,0 +1,28 @@ +//Created with Mage - www.magefree.com +NAME:Jund + +4 [ALA:197] Sprouting Thrinax +4 [ALA:156] Blightning +4 [ARB:95] Putrid Leech +4 [M10:146] Lightning Bolt +2 [ARB:46] Terminate +2 [M10:191] Master of the Wild Hunt +2 [ZEN:221] Oran-Rief, the Vastwood +1 [M10:242] Mountain +4 [ZEN:229] Verdant Catacombs +3 [ARB:92] Maelstrom Pulse +4 [M10:227] Rootbound Crag +4 [ALA:228] Savage Lands +1 [M10:240] Swamp +1 [M10:241] Swamp +4 [ARB:50] Bloodbraid Elf +1 [M10:239] Swamp +1 [M10:244] Mountain +2 [ALA:160] Broodmate Dragon +1 [M10:245] Mountain +1 [ZEN:119] Burst Lightning +1 [M10:249] Forest +3 [M10:223] Dragonskull Summit +1 [M10:247] Forest +2 [M10:183] Garruk Wildspeaker +3 [ARB:34] Bituminous Blast diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/NayaLightsaber.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/NayaLightsaber.dck new file mode 100644 index 0000000000..682cbe3d74 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/NayaLightsaber.dck @@ -0,0 +1,28 @@ +//Created with Mage - www.magefree.com +NAME:Naya Lightsaber + +1 [ZEN:182] Scute Mob +4 [M10:146] Lightning Bolt +4 [CON:15] Path to Exile +4 [ALA:209] Woolly Thoctar +4 [M10:228] Sunpetal Grove +1 [ZEN:221] Oran-Rief, the Vastwood +4 [M10:4] Baneslayer Angel +4 [CON:87] Noble Hierarch +4 [M10:227] Rootbound Crag +1 [ZEN:245] Mountain +1 [ZEN:246] Forest +1 [ZEN:243] Mountain +1 [ZEN:242] Mountain +1 [ZEN:249] Forest +1 [ZEN:247] Forest +1 [ZEN:248] Forest +4 [ARB:50] Bloodbraid Elf +1 [ZEN:233] Plains +1 [ZEN:232] Plains +1 [ZEN:231] Plains +1 [ZEN:230] Plains +4 [ALA:21] Ranger of Eos +4 [ZEN:211] Arid Mesa +3 [ALA:154] Ajani Vengeant +4 [ALA:152] Wild Nacatl diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/Pro Walker.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/Pro Walker.dck new file mode 100644 index 0000000000..94c1c4577a --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/Pro Walker.dck @@ -0,0 +1,26 @@ +//Created with Mage - www.magefree.com +NAME:Pro Walker + +1 [ZEN:245] Mountain +4 [M11:62] Mana Leak +1 [ZEN:244] Mountain +2 [ZEN:223] Scalding Tarn +1 [ZEN:236] Island +4 [CON:15] Path to Exile +1 [ZEN:237] Island +4 [ROE:53] Wall of Omens +4 [M11:7] Baneslayer Angel +2 [ROE:228] Evolving Wilds +2 [ZEN:224] Sejiri Refuge +1 [ZEN:232] Plains +1 [ZEN:231] Plains +3 [ALA:20] Oblivion Ring +4 [ZEN:70] Spreading Seas +4 [M11:225] Glacial Fortress +4 [WWK:145] Tectonic Edge +2 [ALA:9] Elspeth, Knight-Errant +3 [WWK:31] Jace, the Mind Sculptor +4 [WWK:133] Celestial Colonnade +2 [ZEN:211] Arid Mesa +3 [ALA:154] Ajani Vengeant +3 [M11:12] Day of Judgment diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/RB Aggro.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/RB Aggro.dck new file mode 100644 index 0000000000..7c4c63feb7 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/RB Aggro.dck @@ -0,0 +1,21 @@ +//Created with Mage - www.magefree.com +NAME:RB Aggro + +4 [ALA:156] Blightning +2 [ZEN:245] Mountain +2 [ZEN:244] Mountain +2 [ZEN:243] Mountain +2 [ZEN:242] Mountain +4 [ZEN:223] Scalding Tarn +4 [M10:146] Lightning Bolt +4 [WWK:139] Lavaclaw Reaches +3 [M10:134] Earthquake +4 [ZEN:126] Goblin Guide +4 [CON:65] Hellspark Elemental +4 [M10:125] Ball Lightning +4 [ALA:103] Hell's Thunder +2 [CON:70] Quenchable Fire +3 [ZEN:119] Burst Lightning +4 [ZEN:211] Arid Mesa +4 [M10:223] Dragonskull Summit +4 [WWK:90] Searing Blaze diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoLuisScott-Vargas.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoLuisScott-Vargas.dck new file mode 100644 index 0000000000..39b600cef4 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoLuisScott-Vargas.dck @@ -0,0 +1,34 @@ +//Created with Mage - www.magefree.com +NAME:SanDiegoLuisScott-Vargas + +1 [ZEN:182] Scute Mob +1 [WWK:122] Basilisk Collar +3 [M10:146] Lightning Bolt +1 [CON:15] Path to Exile +4 [CON:87] Noble Hierarch +1 [WWK:141] Raging Ravine +1 [M10:227] Rootbound Crag +1 [ALA:247] Forest +2 [M10:229] Terramorphic Expanse +1 [ALA:246] Forest +4 [CON:113] Knight of the Reliquary +2 [ALA:248] Forest +2 [WWK:20] Stoneforge Mystic +1 [ALA:249] Forest +1 [ALA:243] Mountain +1 [ALA:242] Mountain +4 [ARB:50] Bloodbraid Elf +2 [ALA:20] Oblivion Ring +1 [ALA:231] Plains +1 [WWK:145] Tectonic Edge +1 [ARB:65] Behemoth Sledge +1 [ALA:9] Elspeth, Knight-Errant +1 [ALA:232] Plains +4 [ALA:21] Ranger of Eos +3 [ZEN:220] Misty Rainforest +2 [WWK:144] Stirring Wildwood +4 [ZEN:211] Arid Mesa +2 [ALA:154] Ajani Vengeant +4 [ALA:152] Wild Nacatl +1 [WWK:142] Sejiri Steppe +2 [M10:168] Birds of Paradise diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoVidugiris.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoVidugiris.dck new file mode 100644 index 0000000000..6500218002 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanDiegoVidugiris.dck @@ -0,0 +1,26 @@ +//Created with Mage - www.magefree.com +NAME:PT SanDiego Vidurgiris + +4 [CON:113] Knight of the Reliquary +1 [ZEN:246] Forest +2 [ZEN:249] Forest +1 [ZEN:235] Island +1 [ZEN:247] Forest +2 [ZEN:248] Forest +1 [ZEN:237] Island +2 [M10:228] Sunpetal Grove +2 [ZEN:178] Rampaging Baloths +1 [ZEN:233] Plains +4 [CON:87] Noble Hierarch +4 [M10:4] Baneslayer Angel +4 [ZEN:229] Verdant Catacombs +3 [ARB:126] Finest Hour +1 [CON:95] Thornling +4 [ZEN:220] Misty Rainforest +4 [ZEN:168] Lotus Cobra +3 [ALA:185] Rafiq of the Many +3 [WWK:144] Stirring Wildwood +4 [WWK:133] Celestial Colonnade +4 [ALA:188] Rhox War Monk +1 [WWK:142] Sejiri Steppe +4 [M10:168] Birds of Paradise diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanMatignon.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanMatignon.dck new file mode 100644 index 0000000000..e8a4fc974d --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanMatignon.dck @@ -0,0 +1,28 @@ +//Created with Mage - www.magefree.com +NAME:San Juan Matignon + +4 [ROE:193] Kozilek's Predator +1 [ROE:236] Island +2 [ZEN:199] Eldrazi Monument +1 [ROE:235] Island +4 [WWK:138] Khalni Garden +1 [ROE:233] Island +4 [ROE:201] Nest Invader +1 [WWK:97] Bestial Menace +4 [WWK:141] Raging Ravine +3 [WWK:31] Jace, the Mind Sculptor +1 [ROE:242] Mountain +4 [ROE:176] Awakening Zone +3 [ROE:145] Flame Slash +1 [ROE:246] Forest +1 [ROE:247] Forest +1 [ROE:248] Forest +4 [ZEN:223] Scalding Tarn +1 [ROE:142] Emrakul's Hatcher +2 [ROE:85] Sea Gate Oracle +2 [ZEN:159] Beastmaster Ascension +1 [ROE:228] Evolving Wilds +3 [ROE:92] Unified Will +3 [ROE:86] See Beyond +4 [ZEN:220] Misty Rainforest +4 [ZEN:119] Burst Lightning diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanSwartz.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanSwartz.dck new file mode 100644 index 0000000000..968e8fae14 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/SanJuanSwartz.dck @@ -0,0 +1,21 @@ +//Created with Mage - www.magefree.com +NAME:Swartz San Juan + +3 [ZEN:246] Forest +4 [ROE:193] Kozilek's Predator +4 [ZEN:199] Eldrazi Monument +4 [ZEN:249] Forest +4 [WWK:138] Khalni Garden +3 [ZEN:247] Forest +4 [ROE:201] Nest Invader +3 [ZEN:248] Forest +3 [ZEN:159] Beastmaster Ascension +4 [WWK:118] Wolfbriar Elemental +4 [ROE:190] Joraga Treespeaker +4 [WWK:95] Arbor Elf +2 [ZEN:229] Verdant Catacombs +4 [ROE:212] Vengevine +1 [ZEN:180] River Boa +4 [ZEN:220] Misty Rainforest +4 [ZEN:168] Lotus Cobra +1 [WWK:135] Dread Statuary diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/UW Control.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/UW Control.dck new file mode 100644 index 0000000000..e88f087339 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/UW Control.dck @@ -0,0 +1,31 @@ +//Created with Mage - www.magefree.com +NAME:UW Control + +2 [ROE:236] Island +1 [ROE:235] Island +1 [ROE:234] Island +2 [ROE:233] Island +2 [CON:15] Path to Exile +3 [ROE:21] Gideon Jura +1 [CON:11] Martial Coup +2 [ZEN:9] Day of Judgment +1 [ZEN:216] Kabira Crossroads +4 [WWK:31] Jace, the Mind Sculptor +3 [M10:64] Mind Spring +3 [WWK:123] Everflowing Chalice +1 [ROE:232] Plains +4 [ROE:53] Wall of Omens +1 [ROE:229] Plains +1 [ROE:230] Plains +1 [ROE:231] Plains +3 [ALA:20] Oblivion Ring +4 [ZEN:70] Spreading Seas +4 [WWK:145] Tectonic Edge +1 [ALA:9] Elspeth, Knight-Errant +2 [ROE:59] Deprive +1 [ZEN:220] Misty Rainforest +4 [WWK:133] Celestial Colonnade +1 [ZEN:211] Arid Mesa +4 [M10:226] Glacial Fortress +1 [WWK:142] Sejiri Steppe +2 [M10:65] Negate diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/UWR Walker.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/UWR Walker.dck new file mode 100644 index 0000000000..437fa271ad --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/UWR Walker.dck @@ -0,0 +1,30 @@ +//Created with Mage - www.magefree.com +NAME:UWR Walker + +3 [CON:15] Path to Exile +3 [M11:149] Lightning Bolt +1 [ROE:21] Gideon Jura +2 [M11:35] Sun Titan +3 [WWK:31] Jace, the Mind Sculptor +2 [M11:12] Day of Judgment +1 [ZEN:244] Mountain +1 [ZEN:234] Island +4 [M11:62] Mana Leak +1 [ZEN:243] Mountain +1 [ZEN:236] Island +3 [ZEN:223] Scalding Tarn +2 [M11:70] Preordain +1 [ZEN:237] Island +3 [ROE:53] Wall of Omens +2 [M11:58] Jace Beleren +3 [ROE:85] Sea Gate Oracle +1 [ZEN:233] Plains +1 [ZEN:232] Plains +1 [ALA:20] Oblivion Ring +1 [ZEN:231] Plains +4 [M11:225] Glacial Fortress +3 [WWK:145] Tectonic Edge +2 [ALA:9] Elspeth, Knight-Errant +4 [ZEN:211] Arid Mesa +3 [ALA:154] Ajani Vengeant +4 [WWK:133] Celestial Colonnade diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/WhiteTokens.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/WhiteTokens.dck new file mode 100644 index 0000000000..fc22289de7 --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/WhiteTokens.dck @@ -0,0 +1,26 @@ +//Created with Mage - www.magefree.com +NAME:Mono-white Tokens + +4 [CON:15] Path to Exile +2 [M10:41] White Knight +2 [M10:225] Gargoyle Castle +2 [ZEN:11] Emeria Angel +2 [ZEN:4] Brave the Elements +2 [ZEN:233] Plains +4 [ZEN:219] Marsh Flats +2 [ZEN:232] Plains +3 [ALA:20] Oblivion Ring +2 [ZEN:231] Plains +1 [ALA:230] Plains +4 [ZEN:36] Steppe Lynx +2 [ZEN:230] Plains +1 [ALA:231] Plains +1 [CON:11] Martial Coup +2 [ALA:232] Plains +4 [ALA:21] Ranger of Eos +2 [ALA:233] Plains +4 [M10:16] Honor of the Pure +4 [ZEN:211] Arid Mesa +2 [M10:34] Soul Warden +4 [ZEN:8] Conqueror's Pledge +4 [ALA:16] Knight of the White Orchid diff --git a/Mage.Client/release/sample-decks/Ala-M10-Zen/WorldChampionships-Calafell.dck b/Mage.Client/release/sample-decks/Ala-M10-Zen/WorldChampionships-Calafell.dck new file mode 100644 index 0000000000..1c8fd5af2b --- /dev/null +++ b/Mage.Client/release/sample-decks/Ala-M10-Zen/WorldChampionships-Calafell.dck @@ -0,0 +1,24 @@ +//Created with Mage - www.magefree.com +NAME:World Championships Calafell + +4 [M10:75] Time Warp +3 [M10:234] Island +1 [CON:15] Path to Exile +1 [M10:233] Plains +2 [M10:237] Island +4 [M10:212] Howling Mine +3 [M10:236] Island +1 [M10:231] Plains +2 [M10:235] Island +2 [M10:232] Plains +4 [M10:58] Jace Beleren +2 [M10:230] Plains +4 [CON:136] Font of Mythos +2 [ZEN:37] Sunspring Expedition +2 [ZEN:41] Archive Trap +3 [ZEN:9] Day of Judgment +4 [ZEN:216] Kabira Crossroads +4 [M10:53] Flashfreeze +4 [M10:226] Glacial Fortress +4 [ALA:4] Angelsong +4 [M10:28] Safe Passage diff --git a/Mage.Client/release/sample-decks/Magic 2011/Blades of Victory.dck b/Mage.Client/release/sample-decks/Magic 2011/Blades of Victory.dck new file mode 100644 index 0000000000..fde1c138aa --- /dev/null +++ b/Mage.Client/release/sample-decks/Magic 2011/Blades of Victory.dck @@ -0,0 +1,37 @@ +//Created with Mage - www.magefree.com +NAME:Blades of Victory +AUTHOR:WotC + +1 [M11:81] Assassinate +1 [M11:4] Angelic Arbiter +1 [M11:26] Safe Passage +1 [M11:2] Ajani's Mantra +1 [M11:11] Condemn +1 [M11:118] Stabbing Pain +2 [M11:10] Cloud Crusader +2 [M10:23] Palace Guard +1 [M11:220] Warlord's Axe +1 [M11:95] Doom Blade +1 [M11:31] Silvercoat Lion +2 [M11:19] Inspired Charge +2 [M10:29] Serra Angel +1 [M11:39] White Knight +1 [M11:105] Mind Rot +2 [M11:3] Ajani's Pridemate +2 [M11:18] Infantry Veteran +2 [M11:5] Armored Ascension +1 [M11:96] Duress +3 [M11:240] Swamp +1 [M11:239] Swamp +1 [M11:38] War Priest of Thune +1 [M11:238] Swamp +2 [M11:29] Siege Mastodon +2 [M11:23] Pacifism +4 [M11:241] Swamp +4 [M11:232] Plains +4 [M11:233] Plains +4 [M11:230] Plains +4 [M11:231] Plains +1 [M11:22] Mighty Leap +1 [M11:37] Vengeful Archon +2 [M11:13] Elite Vanguard diff --git a/Mage.Client/release/sample-decks/Magic 2011/Breath of Fire.dck b/Mage.Client/release/sample-decks/Magic 2011/Breath of Fire.dck new file mode 100644 index 0000000000..799c01231e --- /dev/null +++ b/Mage.Client/release/sample-decks/Magic 2011/Breath of Fire.dck @@ -0,0 +1,36 @@ +//Created with Mage - www.magefree.com +NAME:Breath of Fire +AUTHOR:WotC + +1 [M11:126] Canyon Minotaur +2 [M11:129] Chandra's Spitfire +2 [M11:124] Berserkers of Blood Ridge +2 [M11:147] Lava Axe +1 [M11:156] Shiv's Embrace +2 [M11:152] Prodigal Pyromancer +1 [M11:68] Negate +3 [M11:149] Lightning Bolt +1 [M11:137] Fire Servant +2 [M11:135] Ember Hauler +3 [M11:128] Chandra's Outrage +2 [M11:136] Fiery Hellhound +1 [M11:122] Ancient Hellkite +2 [M11:143] Goblin Tunneler +1 [M11:138] Fireball +1 [M11:70] Preordain +1 [M11:131] Cyclops Gladiator +1 [M11:134] Earth Servant +1 [M11:215] Stone Golem +1 [M11:78] Unsummon +4 [M11:243] Mountain +4 [M11:242] Mountain +4 [M11:245] Mountain +4 [M11:244] Mountain +1 [M11:142] Goblin Piker +1 [M11:45] Augury Owl +2 [M11:234] Island +2 [M11:235] Island +1 [M11:54] Foresee +3 [M11:236] Island +1 [M11:47] Call to Mind +2 [M11:237] Island diff --git a/Mage.Client/release/sample-decks/Magic 2011/Power of Prophecy.dck b/Mage.Client/release/sample-decks/Magic 2011/Power of Prophecy.dck new file mode 100644 index 0000000000..30cd2b6029 --- /dev/null +++ b/Mage.Client/release/sample-decks/Magic 2011/Power of Prophecy.dck @@ -0,0 +1,37 @@ +//Created with Mage - www.magefree.com +NAME:Power of Prophecy +AUTHOR:WotC + +1 [M11:67] Mind Control +1 [M11:26] Safe Passage +1 [M11:11] Condemn +2 [M11:68] Negate +1 [M11:72] Scroll Thief +1 [M11:79] Wall of Frost +1 [M11:51] Conundrum Sphinx +2 [M11:60] Jace's Ingenuity +1 [M11:203] Crystal Ball +1 [M11:56] Harbor Serpent +2 [M11:50] Cloud Elemental +1 [M11:74] Stormtide Leviathan +1 [M11:44] Armored Cancrix +2 [M11:42] Air Servant +1 [M11:32] Solemn Offering +1 [M11:23] Pacifism +1 [M11:46] Azure Drake +2 [M11:232] Plains +3 [M11:233] Plains +2 [M11:230] Plains +2 [M11:231] Plains +1 [M11:22] Mighty Leap +1 [M11:8] Blinding Mage +2 [M11:41] AEther Adept +2 [M11:45] Augury Owl +2 [M11:63] Maritime Guard +2 [M11:80] Water Servant +4 [M11:234] Island +4 [M11:235] Island +2 [M11:54] Foresee +4 [M11:236] Island +4 [M11:237] Island +2 [M11:73] Sleep diff --git a/Mage.Client/release/sample-decks/Magic 2011/Reign of Vampirism.dck b/Mage.Client/release/sample-decks/Magic 2011/Reign of Vampirism.dck new file mode 100644 index 0000000000..9ecc9af9ab --- /dev/null +++ b/Mage.Client/release/sample-decks/Magic 2011/Reign of Vampirism.dck @@ -0,0 +1,49 @@ +//Created with Mage - www.magefree.com +NAME:Reign of Vampirism +AUTHOR:WotC + +1 [M11:259] Swamp +1 [M11:258] Swamp +1 [M11:240] Swamp +1 [M11:87] Captivating Vampire +2 [M11:112] Reassembling Skeleton +2 [M11:89] Corrupt +2 [M11:114] Rise from the GM11e +1 [M11:296] Swamp +3 [M11:120] Viscera Seer +1 [M11:295] Swamp +1 [M11:297] Swamp +2 [M11:95] Doom Blade +2 [M11:111] Quag Sickness +1 [M11:260] Swamp +1 [M11:116] Royal Assassin +1 [M11:178] Giant Growth +1 [M11:168] Cultivate +1 [M11:179] Giant Spider +3 [M11:82] Barony Vampire +1 [M11:246] Forest +1 [M11:240] Swamp +3 [M11:88] Child of Night +1 [M11:239] Swamp +1 [M11:241] Swamp +1 [M11:246] Forest +1 [M11:381] Forest +1 [M11:240] Swamp +1 [M11:303] Forest +1 [M11:187] Nature's Spiral +1 [M11:238] Swamp +3 [M11:85] Bloodthrone Vampire +1 [M11:239] Swamp +1 [M11:237] Swamp +1 [M11:383] Forest +1 [M11:186] Naturalize +1 [M11:246] Forest +1 [M11:197] Spined Wurm +1 [M11:93] Diabolic Tutor +1 [M11:296] Swamp +3 [M11:100] Howling Banshee +1 [M11:372] Swamp +1 [M11:247] Forest +1 [M11:305] Forest +1 [M11:213] Sorcerer's Strongbox +1 [M11:303] Forest diff --git a/Mage.Client/release/sample-decks/Magic 2011/Stampede of Beasts.dck b/Mage.Client/release/sample-decks/Magic 2011/Stampede of Beasts.dck new file mode 100644 index 0000000000..34a2bf8281 --- /dev/null +++ b/Mage.Client/release/sample-decks/Magic 2011/Stampede of Beasts.dck @@ -0,0 +1,30 @@ +//Created with Mage - www.magefree.com +NAME:Stampede of Beasts +AUTHOR:WotC + +1 [M11:190] Plummet +1 [M11:147] Lava Axe +1 [M11:194] Protean Hydra +2 [M11:163] Awakener Druid +1 [M11:149] Lightning Bolt +2 [M11:200] Yavimaya Wurm +2 [M11:195] Runeclaw Bear +1 [M11:128] Chandra's Outrage +2 [M11:178] Giant Growth +1 [M11:138] Fireball +1 [M11:189] Overwhelming Stampede +1 [M11:168] Cultivate +1 [M11:121] Act of Treason +2 [M11:179] Giant Spider +2 [M11:198] Sylvan Ranger +1 [M11:196] Sacred Wolf +2 [M11:170] Duskdale Wurm +1 [M11:187] Nature's Spiral +2 [M11:184] Llanowar Elves +1 [M11:139] Fling +1 [M11:221] Whispersilk Cloak +1 [M11:197] Spined Wurm +1 [M11:164] Back to Nature +1 [M11:180] Greater Basilisk +2 [M11:177] Garruk's Packleader +2 [M11:193] Prized Unicorn diff --git a/Mage.Client/release/sample-decks/Mirrodin Besieged Event Decks/Infect and Defile.dck b/Mage.Client/release/sample-decks/Mirrodin Besieged Event Decks/Infect and Defile.dck new file mode 100644 index 0000000000..5b9bfec964 --- /dev/null +++ b/Mage.Client/release/sample-decks/Mirrodin Besieged Event Decks/Infect and Defile.dck @@ -0,0 +1,28 @@ +//Created with Mage - www.magefree.com +NAME:Infect and Defile +AUTHOR:WotC + +2 [M11:62] Mana Leak +4 [SOM:147] Corpse Cur +3 [M11:70] Preordain +4 [MBS:22] Corrupted Conscience +2 [ROE:101] Consuming Vapors +1 [SOM:66] Hand of the Praetors +2 [SOM:144] Contagion Clasp +10 [SOM:234] Island +2 [MBS:52] Phyrexian Vatmother +4 [SOM:185] Necropede +2 [ROE:59] Deprive +1 [M11:95] Doom Blade +2 [WWK:68] Smother +4 [ZEN:215] Jwar Isle Refuge +2 [M11:224] Drowned Catacomb +4 [M11:54] Foresee +7 [SOM:238] Swamp +4 [MBS:125] Plague Myr +SB: 2 [MBS:43] Go for the Throat +SB: 3 [M11:53] Flashfreeze +SB: 2 [WWK:68] Smother +SB: 1 [M11:95] Doom Blade +SB: 3 [M11:91] Deathmark +SB: 4 [M11:68] Negate diff --git a/Mage.Client/release/sample-decks/New Phyrexia Event Decks/War of Attrition.dck b/Mage.Client/release/sample-decks/New Phyrexia Event Decks/War of Attrition.dck new file mode 100644 index 0000000000..7e0a5785fb --- /dev/null +++ b/Mage.Client/release/sample-decks/New Phyrexia Event Decks/War of Attrition.dck @@ -0,0 +1,29 @@ +//Created with Mage - www.magefree.com +NAME:War of Attrition +AUTHOR:WotC + +2 [WWK:20] Stoneforge Mystic +4 [MBS:107] Flayer Husk +1 [SOM:149] Darksteel Axe +1 [MBS:14] Mirran Crusader +1 [NPH:20] Puresteel Paladin +4 [ZEN:14] Journey to Nowhere +1 [SOM:12] Kemba, Kha Regent +1 [MBS:133] Skinwing +1 [M11:216] Sword of Vengeance +21 [NPH:166] Plains +1 [NPH:2] Apostle's Blessing +1 [NPH:157] Sickleslicer +4 [MBS:10] Leonin Relic-Warder +4 [MBS:11] Leonin Skyhunter +1 [MBS:100] Bonehoard +4 [M11:13] Elite Vanguard +2 [ZEN:19] Kor Duelist +4 [NPH:19] Porcelain Legionnaire +2 [WWK:135] Dread Statuary +SB: 4 [SOM:18] Revoke Existence +SB: 4 [WWK:11] Kor Firewalker +SB: 3 [M11:9] Celestial Purge +SB: 2 [SOM:2] Arrest +SB: 1 [ZEN:19] Kor Duelist +SB: 1 [NPH:2] Apostle's Blessing diff --git a/Mage.Client/release/sample-decks/Scars of Mirrodin/Deadspread.dck b/Mage.Client/release/sample-decks/Scars of Mirrodin/Deadspread.dck new file mode 100644 index 0000000000..cbb7aa2441 --- /dev/null +++ b/Mage.Client/release/sample-decks/Scars of Mirrodin/Deadspread.dck @@ -0,0 +1,35 @@ +//Created with Mage - www.magefree.com +NAME:Deadspread +AUTHOR:WotC + +1 [SOM:148] Culling Dais +2 [SOM:70] Moriok Reaver +1 [SOM:217] Trigon of Thought +2 [SOM:170] Leaden Myr +1 [M11:95] Doom Blade +4 [SOM:238] Swamp +3 [SOM:239] Swamp +3 [SOM:240] Swamp +3 [SOM:241] Swamp +1 [M11:56] Harbor Serpent +2 [SOM:202] Silver Myr +1 [SOM:211] Throne of Geth +1 [SOM:78] Skinrender +1 [SOM:50] Twisted Image +1 [SOM:57] Carnifex Demon +2 [SOM:44] Sky-Eel School +2 [SOM:144] Contagion Clasp +2 [SOM:47] Thrummingbird +4 [SOM:234] Island +3 [SOM:235] Island +3 [SOM:236] Island +3 [SOM:237] Island +2 [SOM:63] Fume Spitter +1 [SOM:30] Darkslick Drake +1 [SOM:213] Trigon of Corruption +2 [M11:63] Maritime Guard +2 [SOM:45] Steady Progress +2 [SOM:184] Necrogen Censer +1 [SOM:145] Contagion Engine +2 [SOM:68] Instill Infection +1 [M11:213] Sorcerer's Strongbox diff --git a/Mage.Client/release/sample-decks/Scars of Mirrodin/Myr of Mirrodin.dck b/Mage.Client/release/sample-decks/Scars of Mirrodin/Myr of Mirrodin.dck new file mode 100644 index 0000000000..2373c139d7 --- /dev/null +++ b/Mage.Client/release/sample-decks/Scars of Mirrodin/Myr of Mirrodin.dck @@ -0,0 +1,27 @@ +//Created with Mage - www.magefree.com +NAME:Myr of Mirrodin +AUTHOR:WotC + +2 [SOM:8] Ghalma's Warden +3 [SOM:18] Revoke Existence +1 [SOM:180] Myr Battlesphere +2 [SOM:190] Palladium Myr +3 [SOM:189] Origin Spellbomb +2 [SOM:181] Myr Galvanizer +2 [SOM:20] Seize the Initiative +1 [SOM:3] Auriok Edgewright +1 [SOM:5] Dispense Justice +2 [SOM:151] Darksteel Myr +3 [SOM:157] Gold Myr +1 [SOM:17] Razor Hippogriff +2 [SOM:192] Perilous Myr +2 [SOM:16] Myrsmith +1 [SOM:152] Darksteel Sentinel +1 [SOM:22] Sunblast Angel +6 [SOM:230] Plains +6 [SOM:231] Plains +6 [SOM:232] Plains +6 [SOM:233] Plains +2 [M11:19] Inspired Charge +3 [SOM:2] Arrest +2 [SOM:13] Kemba's Skyguard diff --git a/Mage.Client/release/sample-decks/Scars of Mirrodin/Relic Breaker.dck b/Mage.Client/release/sample-decks/Scars of Mirrodin/Relic Breaker.dck new file mode 100644 index 0000000000..ed6b36fe9c --- /dev/null +++ b/Mage.Client/release/sample-decks/Scars of Mirrodin/Relic Breaker.dck @@ -0,0 +1,35 @@ +//Created with Mage - www.magefree.com +NAME:Relic Breaker +AUTHOR:WotC + +1 [M11:167] Cudgel Troll +2 [SOM:103] Shatter +1 [M11:152] Prodigal Pyromancer +2 [SOM:101] Oxidda Scrapmelter +1 [SOM:93] Hoard-Smelter Dragon +2 [SOM:107] Vulshok Heartstoker +2 [SOM:131] Untamed Might +1 [SOM:110] Asceticism +1 [SOM:191] Panic Spellbomb +1 [M11:138] Fireball +2 [SOM:168] Iron Myr +2 [SOM:146] Copper Myr +1 [SOM:132] Viridian Revel +1 [SOM:108] Acid Web Spider +3 [SOM:242] Mountain +3 [SOM:243] Mountain +3 [SOM:244] Mountain +3 [SOM:245] Mountain +2 [SOM:81] Arc Trail +1 [SOM:139] Barbed Battlegear +2 [SOM:89] Flameborn Hellion +2 [SOM:125] Molder Beast +1 [SOM:106] Turn to Slag +3 [SOM:221] Vulshok Replica +2 [SOM:83] Barrage Ogre +2 [SOM:210] Sylvok Replica +3 [SOM:246] Forest +3 [SOM:247] Forest +3 [SOM:248] Forest +3 [SOM:249] Forest +1 [SOM:165] Horizon Spellbomb diff --git a/Mage.Client/release/sample-decks/Zen_M11_SoM/Architect Ramp.dck b/Mage.Client/release/sample-decks/Zen_M11_SoM/Architect Ramp.dck new file mode 100644 index 0000000000..7010cfd646 --- /dev/null +++ b/Mage.Client/release/sample-decks/Zen_M11_SoM/Architect Ramp.dck @@ -0,0 +1,21 @@ +//Created with Mage - www.magefree.com +NAME:Architect Ramp + +2 [SOM:180] Myr Battlesphere +3 [ZEN:234] Island +3 [ZEN:236] Island +2 [ZEN:223] Scalding Tarn +3 [M11:70] Preordain +3 [ZEN:235] Island +3 [ZEN:237] Island +4 [ROE:66] Enclave Cryptologist +4 [ROE:85] Sea Gate Oracle +3 [WWK:137] Halimar Depths +4 [ZEN:50] Kraken Hatchling +4 [SOM:33] Grand Architect +3 [SOM:177] Molten-Tail Masticore +4 [ROE:75] Lighthouse Chronologist +4 [WWK:145] Tectonic Edge +4 [ZEN:220] Misty Rainforest +3 [WWK:31] Jace, the Mind Sculptor +4 [SOM:223] Wurmcoil Engine diff --git a/Mage.Client/release/sample-decks/Zen_M11_SoM/Black Blue M11.dck b/Mage.Client/release/sample-decks/Zen_M11_SoM/Black Blue M11.dck new file mode 100644 index 0000000000..09d5d0e115 --- /dev/null +++ b/Mage.Client/release/sample-decks/Zen_M11_SoM/Black Blue M11.dck @@ -0,0 +1,28 @@ +//Created with Mage - www.magefree.com +NAME:Black Blue M11 + +2 [M11:206] Elixir of Immortality +2 [M11:97] Grave Titan +4 [M11:112] Reassembling Skeleton +4 [M11:95] Doom Blade +4 [M11:105] Mind Rot +2 [M11:102] Liliana Vess +2 [M11:99] Haunting Echoes +4 [M11:62] Mana Leak +2 [M11:103] Liliana's Caress +2 [M11:240] Swamp +3 [M11:239] Swamp +2 [M11:238] Swamp +2 [M11:58] Jace Beleren +2 [M11:77] Traumatize +2 [M11:241] Swamp +2 [M11:55] Frost Titan +1 [M11:92] Demon of Death's Gate +2 [M11:49] Clone +2 [M11:234] Island +4 [M11:224] Drowned Catacomb +1 [M11:75] Time Reversal +2 [M11:235] Island +2 [M11:236] Island +3 [M11:237] Island +4 [M11:73] Sleep diff --git a/Mage.Client/release/sample-decks/Zen_M11_SoM/Boros.dck b/Mage.Client/release/sample-decks/Zen_M11_SoM/Boros.dck new file mode 100644 index 0000000000..9ec9aee49c --- /dev/null +++ b/Mage.Client/release/sample-decks/Zen_M11_SoM/Boros.dck @@ -0,0 +1,26 @@ +//Created with Mage - www.magefree.com +NAME:Boros + +3 [WWK:20] Stoneforge Mystic +3 [ZEN:195] Adventuring Gear +2 [SOM:94] Koth of the Hammer +4 [ZEN:223] Scalding Tarn +3 [ZEN:14] Journey to Nowhere +4 [ZEN:126] Goblin Guide +1 [M11:232] Plains +2 [M11:233] Plains +4 [M11:149] Lightning Bolt +1 [M11:230] Plains +4 [ZEN:219] Marsh Flats +1 [M11:231] Plains +1 [M11:243] Mountain +2 [M11:242] Mountain +4 [ZEN:36] Steppe Lynx +2 [M11:245] Mountain +1 [M11:244] Mountain +3 [SOM:104] Spikeshot Elder +4 [ZEN:211] Arid Mesa +4 [M11:33] Squadron Hawk +1 [SOM:208] Sword of Body and Mind +2 [M11:229] Terramorphic Expanse +4 [ZEN:141] Plated Geopede diff --git a/Mage.Client/release/sample-decks/Zen_M11_SoM/RUG Control[Zen_M11_SoM].dck b/Mage.Client/release/sample-decks/Zen_M11_SoM/RUG Control[Zen_M11_SoM].dck new file mode 100644 index 0000000000..e24eb08bbc --- /dev/null +++ b/Mage.Client/release/sample-decks/Zen_M11_SoM/RUG Control[Zen_M11_SoM].dck @@ -0,0 +1,27 @@ +//Created with Mage - www.magefree.com +NAME:RUG Control +4 [M12:147] Inferno Titan +3 [SOM:225] Copperline Gorge +4 [ZEN:223] Scalding Tarn +4 [M11:70] Preordain +3 [NPH:103] Beast Within +4 [M12:63] Mana Leak +2 [WWK:137] Halimar Depths +4 [WWK:99] Explore +2 [M11:149] Lightning Bolt +4 [M11:246] Forest +2 [M11:242] Mountain +2 [MBS:21] Consecrated Sphinx +1 [ZEN:172] Oracle of Mul Daya +4 [WWK:141] Raging Ravine +1 [NPH:57] Dismember +4 [ZEN:220] Misty Rainforest +4 [ZEN:168] Lotus Cobra +4 [WWK:31] Jace, the Mind Sculptor +4 [M11:234] Island +SB: 4 [M11:154] Pyroclasm +SB: 4 [M11:188] Obstinate Baloth +SB: 1 [NPH:57] Dismember +SB: 2 [WWK:108] Nature's Claim +SB: 2 [M12:52] Flashfreeze +SB: 2 [SOM:218] Tumble Magnet diff --git a/Mage.Client/release/sample-decks/Zen_M11_SoM/Vampires[Zen_M11_SoM].dck b/Mage.Client/release/sample-decks/Zen_M11_SoM/Vampires[Zen_M11_SoM].dck new file mode 100644 index 0000000000..87caa9e4dd --- /dev/null +++ b/Mage.Client/release/sample-decks/Zen_M11_SoM/Vampires[Zen_M11_SoM].dck @@ -0,0 +1,26 @@ +//Created with Mage - www.magefree.com +NAME:Vampires +AUTHOR:Brandon Montoya + +4 [ZEN:89] Gatekeeper of Malakir +4 [MBS:43] Go for the Throat +4 [WWK:139] Lavaclaw Reaches +4 [WWK:59] Kalastria Highborn +6 [M11:238] Swamp +4 [WWK:62] Pulse Tracker +4 [ZEN:83] Bloodghast +3 [M11:151] Manic Vandal +4 [M11:149] Lightning Bolt +4 [SOM:224] Blackcleave Cliffs +1 [ZEN:219] Marsh Flats +4 [ZEN:229] Verdant Catacombs +3 [M11:120] Viscera Seer +3 [NPH:57] Dismember +4 [ZEN:115] Vampire Lacerator +4 [M11:223] Dragonskull Summit +SB: 4 [SOM:81] Arc Trail +SB: 2 [SOM:78] Skinrender +SB: 1 [M11:95] Doom Blade +SB: 3 [M11:90] Dark Tutelage +SB: 3 [ZEN:137] Mark of Mutiny +SB: 2 [MBS:61] Crush From 01b43b0d87b6ba1ca573c842adfa724d1ad73632 Mon Sep 17 00:00:00 2001 From: Loki Date: Sat, 16 Jul 2011 00:32:06 +0300 Subject: [PATCH 2/2] now use manaability child for adding mana of any color, some refactoring and switch to use new ability for that --- .../championsofkamigawa/AkkiRockspeaker.java | 4 +- .../championsofkamigawa/HonorWornShaku.java | 4 +- .../championsofkamigawa/OrochiLeafcaller.java | 3 +- .../SachiDaughterOfSeshiro.java | 4 +- .../src/mage/sets/conflux/KnotvineMystic.java | 4 +- .../src/mage/sets/conflux/ManaCylix.java | 11 ++--- .../src/mage/sets/conflux/RuptureSpire.java | 10 +---- .../mage/sets/darksteel/DarksteelIngot.java | 10 +---- .../mage/sets/darksteel/KrarkClanStoker.java | 4 +- .../mage/sets/darksteel/MirrodinsCore.java | 5 +-- .../mage/sets/darksteel/MyrMoonvessel.java | 4 +- .../src/mage/sets/darksteel/UrGolemsEye.java | 6 +-- .../mage/sets/darksteel/ViridianAcolyte.java | 11 +---- .../src/mage/sets/eventide/CascadeBluffs.java | 8 ++-- .../src/mage/sets/eventide/FetidHeath.java | 8 ++-- .../src/mage/sets/eventide/FloodedGrove.java | 8 ++-- .../src/mage/sets/eventide/RuggedPrairie.java | 8 ++-- .../src/mage/sets/eventide/TwilightMire.java | 8 ++-- .../mage/sets/magic2011/PyreticRitual.java | 4 +- .../src/mage/sets/magic2012/Manalith.java | 10 +---- .../mirrodinbesieged/SphereOfTheSuns.java | 11 ++--- .../src/mage/sets/newphyrexia/AlloyMyr.java | 12 ++---- .../sets/newphyrexia/PriestOfUrabrask.java | 4 +- .../src/mage/sets/ravnika/BorosSignet.java | 4 +- .../src/mage/sets/ravnika/DimirSignet.java | 4 +- .../src/mage/sets/ravnika/GolgariSignet.java | 4 +- .../src/mage/sets/ravnika/SelesnyaSignet.java | 4 +- .../riseoftheeldrazi/DreamstoneHedron.java | 4 +- .../sets/riseoftheeldrazi/EldraziTemple.java | 4 +- .../riseoftheeldrazi/JoragaTreespeaker.java | 6 +-- .../sets/scarsofmirrodin/GrandArchitect.java | 4 +- .../mage/sets/scarsofmirrodin/MoxOpal.java | 12 ++---- .../sets/scarsofmirrodin/PalladiumMyr.java | 4 +- .../src/mage/sets/tenth/BirdsOfParadise.java | 12 ++---- .../mage/sets/zendikar/GreenweaverDruid.java | 4 +- .../src/mage/sets/zendikar/KhalniGem.java | 12 +++--- .../common/AddManaOfAnyColorEffect.java | 4 +- .../effects/common/BasicManaEffect.java | 41 +++++++++++++++++++ .../effects/common/DynamicManaEffect.java | 2 +- .../abilities/effects/common/ManaEffect.java | 27 +----------- .../abilities/mana/AnyColorManaAbility.java | 27 ++++++++++++ .../mage/abilities/mana/BlackManaAbility.java | 4 +- .../mage/abilities/mana/BlueManaAbility.java | 4 +- .../abilities/mana/ColorlessManaAbility.java | 3 +- .../mage/abilities/mana/GreenManaAbility.java | 4 +- .../mage/abilities/mana/RedManaAbility.java | 4 +- .../mage/abilities/mana/WhiteManaAbility.java | 4 +- .../permanent/token/EldraziSpawnToken.java | 4 +- 48 files changed, 181 insertions(+), 186 deletions(-) create mode 100644 Mage/src/mage/abilities/effects/common/BasicManaEffect.java create mode 100644 Mage/src/mage/abilities/mana/AnyColorManaAbility.java diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java index 8b304575bc..78cee07856 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiRockspeaker.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; /** @@ -53,7 +53,7 @@ public class AkkiRockspeaker extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new EntersBattlefieldTriggeredAbility(new ManaEffect(new Mana(Constants.ColoredManaSymbol.R)))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(Constants.ColoredManaSymbol.R)))); } public AkkiRockspeaker(final AkkiRockspeaker card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java index 699550196d..a772b7f453 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java @@ -38,7 +38,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapTargetCost; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.filter.Filter; @@ -62,7 +62,7 @@ public class HonorWornShaku extends CardImpl { public HonorWornShaku(UUID ownerId) { super(ownerId, 254, "Honor-Worn Shaku", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "CHK"; - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0)), new TapSourceCost())); Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java index ab4747a888..947cec8461 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiLeafcaller.java @@ -37,6 +37,7 @@ import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; /** @@ -53,7 +54,7 @@ public class OrochiLeafcaller extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new ColoredManaCost(Constants.ColoredManaSymbol.G))); + this.addAbility(new AnyColorManaAbility(new ColoredManaCost(Constants.ColoredManaSymbol.G))); } public OrochiLeafcaller (final OrochiLeafcaller card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java index 7e434e052d..39b66cf712 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java @@ -38,7 +38,7 @@ import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class SachiDaughterOfSeshiro extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Constants.Duration.WhileOnBattlefield, snakeFilter, true))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0)), new TapSourceCost()), Constants.Duration.WhileOnBattlefield, shamanFilter, false))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0)), new TapSourceCost()), Constants.Duration.WhileOnBattlefield, shamanFilter, false))); } public SachiDaughterOfSeshiro(final SachiDaughterOfSeshiro card) { diff --git a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java index 39d834b618..2a79623b75 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java +++ b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; @@ -74,7 +74,7 @@ public class KnotvineMystic extends CardImpl{ class KnotvineMysticManaAbility extends BasicManaAbility { public KnotvineMysticManaAbility() { - super(new ManaEffect(new Mana(1, 1, 0, 1, 0, 0, 0))); + super(new BasicManaEffect(new Mana(1, 1, 0, 1, 0, 0, 0))); this.netMana.setGreen(1); this.netMana.setRed(1); this.netMana.setWhite(1); diff --git a/Mage.Sets/src/mage/sets/conflux/ManaCylix.java b/Mage.Sets/src/mage/sets/conflux/ManaCylix.java index 6de9e55063..6b39729796 100644 --- a/Mage.Sets/src/mage/sets/conflux/ManaCylix.java +++ b/Mage.Sets/src/mage/sets/conflux/ManaCylix.java @@ -30,17 +30,15 @@ package mage.sets.conflux; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.Zone; -import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; /** * - * @author North + * @author North, Loki */ public class ManaCylix extends CardImpl { @@ -48,8 +46,7 @@ public class ManaCylix extends CardImpl { super(ownerId, 138, "Mana Cylix", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "CON"; - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new GenericManaCost(1)); - ability.addChoice(new ChoiceColor()); + Ability ability = new AnyColorManaAbility(new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java b/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java index 976e449cd0..24775a1da5 100644 --- a/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java +++ b/Mage.Sets/src/mage/sets/conflux/RuptureSpire.java @@ -31,16 +31,12 @@ package mage.sets.conflux; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; /** * @@ -54,9 +50,7 @@ public class RuptureSpire extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{1}")), false)); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); - ability.addChoice(new ChoiceColor()); - this.addAbility(ability); + this.addAbility(new AnyColorManaAbility()); } public RuptureSpire (final RuptureSpire card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java index 1a850075d8..5c0489ee4f 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelIngot.java @@ -29,13 +29,9 @@ package mage.sets.darksteel; import mage.Constants; -import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.keyword.IndestructibleAbility; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; import java.util.UUID; @@ -49,9 +45,7 @@ public class DarksteelIngot extends CardImpl { super(ownerId, 112, "Darksteel Ingot", Constants.Rarity.COMMON, new Constants.CardType[]{Constants.CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "DST"; this.addAbility(IndestructibleAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); - ability.addChoice(new ChoiceColor()); - this.addAbility(ability); + this.addAbility(new AnyColorManaAbility()); } public DarksteelIngot(final DarksteelIngot card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java index dd35f520b5..4f46219008 100644 --- a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java +++ b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java @@ -38,7 +38,7 @@ import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; import mage.filter.Filter; @@ -84,7 +84,7 @@ public class KrarkClanStoker extends CardImpl { class KrarkClanStokerAbility extends BasicManaAbility { public KrarkClanStokerAbility() { - super(new ManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0))); this.netMana.setRed(2); } diff --git a/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java b/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java index 5521192a2d..7df4f76865 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java +++ b/Mage.Sets/src/mage/sets/darksteel/MirrodinsCore.java @@ -37,12 +37,11 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.counters.CounterType; -import mage.counters.common.ChargeCounter; /** * @@ -55,7 +54,7 @@ public class MirrodinsCore extends CardImpl { this.expansionSetCode = "DST"; this.addAbility(new ColorlessManaAbility()); this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); + Ability ability = new AnyColorManaAbility(); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java b/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java index f77f6ffff6..630a471f48 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java +++ b/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; /** @@ -49,7 +49,7 @@ public class MyrMoonvessel extends CardImpl { this.subtype.add("Myr"); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0)))); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0)))); } public MyrMoonvessel(final MyrMoonvessel card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java b/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java index 4c62d41a23..29d6dddb99 100644 --- a/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java +++ b/Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java @@ -33,9 +33,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; -import mage.abilities.Ability; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; @@ -65,7 +63,7 @@ public class UrGolemsEye extends CardImpl { class UrGolemsEyeAbility extends BasicManaAbility { public UrGolemsEyeAbility() { - super(new ManaEffect(new Mana(0, 0, 0, 0, 0, 2, 0))); + super(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 2, 0))); this.netMana.setColorless(2); } diff --git a/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java b/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java index adf08ebff6..7d71b8786f 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java +++ b/Mage.Sets/src/mage/sets/darksteel/ViridianAcolyte.java @@ -30,20 +30,14 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.Mana; import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; -import mage.abilities.effects.common.ManaEffect; -import mage.abilities.mana.BasicManaAbility; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; /** * @author Loki @@ -58,9 +52,8 @@ public class ViridianAcolyte extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new GenericManaCost(1)); + Ability ability = new AnyColorManaAbility(new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addChoice(new ChoiceColor()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java b/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java index 133925cfe1..f22c16cb00 100644 --- a/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java +++ b/Mage.Sets/src/mage/sets/eventide/CascadeBluffs.java @@ -34,7 +34,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class CascadeBluffs extends CardImpl { class CascadeBluffsFirstManaAbility extends BasicManaAbility { public CascadeBluffsFirstManaAbility() { - super(new ManaEffect(new Mana(0, 0, 2, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 2, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{U/R}")); this.netMana.setBlue(2); } @@ -84,7 +84,7 @@ class CascadeBluffsFirstManaAbility extends BasicManaAbility { public CascadeBluffsSecondManaAbility() { - super(new ManaEffect(new Mana(1, 0, 1, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(1, 0, 1, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{U/R}")); this.netMana.setBlue(1); this.netMana.setRed(1); @@ -103,7 +103,7 @@ class CascadeBluffsSecondManaAbility extends BasicManaAbility { public CascadeBluffsThirdManaAbility() { - super(new ManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{U/R}")); this.netMana.setRed(2); } diff --git a/Mage.Sets/src/mage/sets/eventide/FetidHeath.java b/Mage.Sets/src/mage/sets/eventide/FetidHeath.java index 2c6701114a..0ffff5a41f 100644 --- a/Mage.Sets/src/mage/sets/eventide/FetidHeath.java +++ b/Mage.Sets/src/mage/sets/eventide/FetidHeath.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -67,7 +67,7 @@ public class FetidHeath extends CardImpl { class FetidHeathFirstManaAbility extends BasicManaAbility { public FetidHeathFirstManaAbility() { - super(new ManaEffect(new Mana(0, 0, 0, 2, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 0, 2, 0, 0, 0))); this.addCost(new ManaCostsImpl("{W/B}")); this.netMana.setWhite(2); } @@ -85,7 +85,7 @@ class FetidHeathFirstManaAbility extends BasicManaAbility { public FetidHeathSecondManaAbility() { - super(new ManaEffect(new Mana(0, 0, 0, 1, 1, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 0, 1, 1, 0, 0))); this.addCost(new ManaCostsImpl("{W/B}")); this.netMana.setBlack(1); this.netMana.setWhite(1); @@ -104,7 +104,7 @@ class FetidHeathSecondManaAbility extends BasicManaAbility { public FetidHeathThirdManaAbility() { - super(new ManaEffect(new Mana(0, 0, 0, 0, 2, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 0, 0, 2, 0, 0))); this.addCost(new ManaCostsImpl("{W/B}")); this.netMana.setBlack(2); } diff --git a/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java b/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java index de4c368998..27ff4786eb 100644 --- a/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java +++ b/Mage.Sets/src/mage/sets/eventide/FloodedGrove.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -67,7 +67,7 @@ public class FloodedGrove extends CardImpl { class FloodedGroveFirstManaAbility extends BasicManaAbility { public FloodedGroveFirstManaAbility() { - super(new ManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{G/U}")); this.netMana.setGreen(2); } @@ -85,7 +85,7 @@ class FloodedGroveFirstManaAbility extends BasicManaAbility { public FloodedGroveSecondManaAbility() { - super(new ManaEffect(new Mana(0, 1, 1, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 1, 1, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{G/U}")); this.netMana.setGreen(1); this.netMana.setBlue(1); @@ -104,7 +104,7 @@ class FloodedGroveSecondManaAbility extends BasicManaAbility { public FloodedGroveThirdManaAbility() { - super(new ManaEffect(new Mana(0, 0, 2, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 2, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{G/U}")); this.netMana.setBlue(2); } diff --git a/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java b/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java index 183cdc3ed3..35fae218da 100644 --- a/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java +++ b/Mage.Sets/src/mage/sets/eventide/RuggedPrairie.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class RuggedPrairie extends CardImpl { class RuggedPrairieFirstManaAbility extends BasicManaAbility { public RuggedPrairieFirstManaAbility() { - super(new ManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{R/W}")); this.netMana.setRed(2); } @@ -84,7 +84,7 @@ class RuggedPrairieFirstManaAbility extends BasicManaAbility { public RuggedPrairieSecondManaAbility() { - super(new ManaEffect(new Mana(1, 0, 0, 1, 0, 0, 0))); + super(new BasicManaEffect(new Mana(1, 0, 0, 1, 0, 0, 0))); this.addCost(new ManaCostsImpl("{R/W}")); this.netMana.setRed(1); this.netMana.setWhite(1); @@ -103,7 +103,7 @@ class RuggedPrairieSecondManaAbility extends BasicManaAbility { public RuggedPrairieThirdManaAbility() { - super(new ManaEffect(new Mana(0, 0, 0, 2, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 0, 2, 0, 0, 0))); this.addCost(new ManaCostsImpl("{R/W}")); this.netMana.setWhite(2); } diff --git a/Mage.Sets/src/mage/sets/eventide/TwilightMire.java b/Mage.Sets/src/mage/sets/eventide/TwilightMire.java index 97259c19a5..ca137632d1 100644 --- a/Mage.Sets/src/mage/sets/eventide/TwilightMire.java +++ b/Mage.Sets/src/mage/sets/eventide/TwilightMire.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -67,7 +67,7 @@ public class TwilightMire extends CardImpl { class TwilightMireFirstManaAbility extends BasicManaAbility { public TwilightMireFirstManaAbility() { - super(new ManaEffect(new Mana(0, 0, 0, 0, 2, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 0, 0, 2, 0, 0))); this.addCost(new ManaCostsImpl("{B/G}")); this.netMana.setBlack(2); } @@ -85,7 +85,7 @@ class TwilightMireFirstManaAbility extends BasicManaAbility { public TwilightMireSecondManaAbility() { - super(new ManaEffect(new Mana(0, 1, 0, 0, 1, 0, 0))); + super(new BasicManaEffect(new Mana(0, 1, 0, 0, 1, 0, 0))); this.addCost(new ManaCostsImpl("{B/G}")); this.netMana.setBlack(1); this.netMana.setGreen(1); @@ -104,7 +104,7 @@ class TwilightMireSecondManaAbility extends BasicManaAbility { public TwilightMireThirdManaAbility() { - super(new ManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0))); this.addCost(new ManaCostsImpl("{B/G}")); this.netMana.setGreen(2); } diff --git a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java index f602828a71..e4ed43bef0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java +++ b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; /** @@ -45,7 +45,7 @@ public class PyreticRitual extends CardImpl { super(ownerId, 153, "Pyretic Ritual", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); - this.getSpellAbility().addEffect(new ManaEffect(Mana.RedMana(3))); + this.getSpellAbility().addEffect(new BasicManaEffect(Mana.RedMana(3))); } public PyreticRitual(final PyreticRitual card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/Manalith.java b/Mage.Sets/src/mage/sets/magic2012/Manalith.java index a4d350b004..27bcba10b1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Manalith.java +++ b/Mage.Sets/src/mage/sets/magic2012/Manalith.java @@ -30,14 +30,10 @@ package mage.sets.magic2012; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; /** * @@ -48,9 +44,7 @@ public class Manalith extends CardImpl { public Manalith (UUID ownerId) { super(ownerId, 212, "Manalith", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "M12"; - SimpleActivatedAbility ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); - ability.addChoice(new ChoiceColor()); - this.addAbility(ability); + this.addAbility(new AnyColorManaAbility()); } public Manalith (final Manalith card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java index c38218809f..c8a891cbc8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SphereOfTheSuns.java @@ -30,22 +30,18 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; import mage.counters.CounterType; /** * - * @author North + * @author North, Loki */ public class SphereOfTheSuns extends CardImpl { @@ -59,8 +55,7 @@ public class SphereOfTheSuns extends CardImpl { this.addAbility(ability); RemoveCountersSourceCost removeCounterCost = new RemoveCountersSourceCost(CounterType.CHARGE.getName(), 1); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); - ability.addChoice(new ChoiceColor()); + ability = new AnyColorManaAbility(); ability.addCost(removeCounterCost); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java b/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java index 8583d6f8c4..d79f12b309 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/AlloyMyr.java @@ -30,17 +30,13 @@ package mage.sets.newphyrexia; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; /** * - * @author North + * @author North, Loki */ public class AlloyMyr extends CardImpl { @@ -52,9 +48,7 @@ public class AlloyMyr extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); - ability.addChoice(new ChoiceColor()); - this.addAbility(ability); + this.addAbility(new AnyColorManaAbility()); } public AlloyMyr(final AlloyMyr card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java b/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java index 75baeb656f..b6b5804397 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PriestOfUrabrask.java @@ -33,7 +33,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; /** @@ -52,7 +52,7 @@ public class PriestOfUrabrask extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new EntersBattlefieldTriggeredAbility(new ManaEffect(Mana.RedMana(3)))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new BasicManaEffect(Mana.RedMana(3)))); } public PriestOfUrabrask(final PriestOfUrabrask card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java b/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java index 9eae8a6321..e9e9142bdb 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/BorosSignet.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; @@ -64,7 +64,7 @@ public class BorosSignet extends CardImpl { class BorosSignetAbility extends BasicManaAbility { public BorosSignetAbility() { - super(new ManaEffect(new Mana(1, 0, 0, 1, 0, 0, 0))); + super(new BasicManaEffect(new Mana(1, 0, 0, 1, 0, 0, 0))); this.addCost(new GenericManaCost(1)); this.netMana.setRed(1); this.netMana.setWhite(1); diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java b/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java index 4258aff8ad..e8e1b210c7 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirSignet.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.ManaAbility; import mage.cards.CardImpl; @@ -67,7 +67,7 @@ public class DimirSignet extends CardImpl { class DimirSignetAbility extends BasicManaAbility { public DimirSignetAbility() { - super(new ManaEffect(new Mana(0, 0, 1, 0, 1, 0, 0))); + super(new BasicManaEffect(new Mana(0, 0, 1, 0, 1, 0, 0))); this.netMana.setBlue(1); this.netMana.setBlack(1); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java b/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java index 8e4187f5eb..7636928d58 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariSignet.java @@ -34,7 +34,7 @@ import mage.Constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; @@ -65,7 +65,7 @@ public class GolgariSignet extends CardImpl { class GolgariSignetAbility extends BasicManaAbility { public GolgariSignetAbility() { - super(new ManaEffect(new Mana(0, 1, 0, 0, 1, 0, 0))); + super(new BasicManaEffect(new Mana(0, 1, 0, 0, 1, 0, 0))); this.netMana.setGreen(1); this.netMana.setBlack(1); } diff --git a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java index d0ff999f73..312ee291f2 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java +++ b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSignet.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class SelesnyaSignet extends CardImpl { class SelesnyaSignetAbility extends BasicManaAbility { public SelesnyaSignetAbility() { - super(new ManaEffect(new Mana(0, 1, 0, 1, 0, 0, 0))); + super(new BasicManaEffect(new Mana(0, 1, 0, 1, 0, 0, 0))); this.netMana.setGreen(1); this.netMana.setWhite(1); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java index 306b3dd25e..bda54b6018 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java @@ -37,7 +37,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardControllerEffect; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; /** @@ -50,7 +50,7 @@ public class DreamstoneHedron extends CardImpl { super(ownerId, 216, "Dreamstone Hedron", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{6}"); this.expansionSetCode = "ROE"; - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ManaEffect(Mana.ColorlessMana(3)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.ColorlessMana(3)), new TapSourceCost())); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(3), new GenericManaCost(3)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java index c61d43d242..ff83f8b69e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java @@ -32,7 +32,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageObject; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -71,7 +71,7 @@ class EldraziTempleManaAbility extends BasicManaAbility(Mage Tip: This ability can only be activated when an Eldrazi spell or ability is on the stack.)"; EldraziTempleManaAbility ( ) { - super(new ManaEffect(Mana.ColorlessMana(2))); + super(new BasicManaEffect(Mana.ColorlessMana(2))); this.netMana.setColorless(2); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java index b742fe6690..a409ba6356 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java @@ -43,7 +43,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.keyword.LevelAbility; import mage.abilities.keyword.LevelUpAbility; import mage.abilities.mana.SimpleManaAbility; @@ -75,13 +75,13 @@ public class JoragaTreespeaker extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}{G}"))); Abilities abilities1 = new AbilitiesImpl(); - abilities1.add(new SimpleManaAbility(Zone.BATTLEFIELD, new ManaEffect(Mana.GreenMana(2)), new TapSourceCost())); + abilities1.add(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.GreenMana(2)), new TapSourceCost())); this.getLevels().add(new LevelAbility(1, 4, abilities1, 1, 2)); Abilities abilities2 = new AbilitiesImpl(); abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new ManaEffect(Mana.GreenMana(2)), + new BasicManaEffect(Mana.GreenMana(2)), new TapSourceCost()), Duration.WhileOnBattlefield, filter))); this.getLevels().add(new LevelAbility(5, -1, abilities2, 1, 4)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java index c0ca6f098c..291e9ef470 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java @@ -46,7 +46,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.mana.ManaAbility; import mage.cards.CardImpl; @@ -152,7 +152,7 @@ class GrandArchitectManaAbility extends ManaAbility { } GrandArchitectManaAbility ( ) { - super(Zone.BATTLEFIELD, new ManaEffect(Mana.ColorlessMana(2)), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); + super(Zone.BATTLEFIELD, new BasicManaEffect(Mana.ColorlessMana(2)), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.netMana.setColorless(2); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java index 3d20db33e7..50908475a8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoxOpal.java @@ -30,19 +30,16 @@ package mage.sets.scarsofmirrodin; import mage.Constants.CardType; import mage.Constants.Rarity; +import mage.abilities.Ability; import mage.abilities.costs.common.MetalcraftCost; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import java.util.UUID; -import mage.Constants.Zone; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; -import mage.choices.ChoiceColor; /** * - * @author BetaSteward_at_googlemail.com + * @author BetaSteward_at_googlemail.com, Loki */ public class MoxOpal extends CardImpl { @@ -51,8 +48,7 @@ public class MoxOpal extends CardImpl { this.supertype.add("Legendary"); this.expansionSetCode = "SOM"; - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); - ability.addChoice(new ChoiceColor()); + Ability ability = new AnyColorManaAbility(); ability.addCost(new MetalcraftCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java index 5d39a1d746..32700c2dad 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java @@ -32,7 +32,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.BasicManaAbility; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class PalladiumMyr extends CardImpl { class PalladiumMyrAbility extends BasicManaAbility { public PalladiumMyrAbility() { - super(new ManaEffect(Mana.ColorlessMana(2))); + super(new BasicManaEffect(Mana.ColorlessMana(2))); this.netMana.setColorless(2); } diff --git a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java index 8ac5f80e0e..a985e2b039 100644 --- a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java @@ -31,18 +31,14 @@ package mage.sets.tenth; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.keyword.FlyingAbility; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; -import mage.choices.ChoiceColor; /** * - * @author BetaSteward_at_googlemail.com + * @author BetaSteward_at_googlemail.com, Loki */ public class BirdsOfParadise extends CardImpl { @@ -56,9 +52,7 @@ public class BirdsOfParadise extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new TapSourceCost()); - ability.addChoice(new ChoiceColor()); - this.addAbility(ability); + this.addAbility(new AnyColorManaAbility()); } public BirdsOfParadise(final BirdsOfParadise card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java b/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java index 9e31bbd110..9454edc27f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java +++ b/Mage.Sets/src/mage/sets/zendikar/GreenweaverDruid.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; /** @@ -54,7 +54,7 @@ public class GreenweaverDruid extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ManaEffect(Mana.GreenMana(2)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.GreenMana(2)), new TapSourceCost())); } public GreenweaverDruid(final GreenweaverDruid card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java b/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java index 3b545554af..b01a15bd52 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java +++ b/Mage.Sets/src/mage/sets/zendikar/KhalniGem.java @@ -38,7 +38,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; @@ -68,11 +68,11 @@ public class KhalniGem extends CardImpl { Target target = new TargetControlledPermanent(2, 2, filter, false); etbAbility.addTarget(target); this.addAbility(etbAbility); - this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0)), new TapSourceCost())); - this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0)), new TapSourceCost())); - this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 0, 2, 0, 0, 0, 0)), new TapSourceCost())); - this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 0, 0, 2, 0, 0, 0)), new TapSourceCost())); - this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 0, 0, 0, 2, 0, 0)), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(new Mana(2, 0, 0, 0, 0, 0, 0)), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0)), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 0, 2, 0, 0, 0, 0)), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 0, 0, 2, 0, 0, 0)), new TapSourceCost())); + this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(new Mana(0, 0, 0, 0, 2, 0, 0)), new TapSourceCost())); } public KhalniGem (final KhalniGem card) { diff --git a/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java b/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java index f6d42f50bc..092a7f06df 100644 --- a/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java +++ b/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java @@ -40,10 +40,10 @@ import mage.players.Player; * * @author BetaSteward_at_googlemail.com */ -public class AddManaOfAnyColorEffect extends OneShotEffect { +public class AddManaOfAnyColorEffect extends ManaEffect { public AddManaOfAnyColorEffect() { - super(Outcome.PutManaInPool); + super(); } public AddManaOfAnyColorEffect(final AddManaOfAnyColorEffect effect) { diff --git a/Mage/src/mage/abilities/effects/common/BasicManaEffect.java b/Mage/src/mage/abilities/effects/common/BasicManaEffect.java new file mode 100644 index 0000000000..c83d0bd906 --- /dev/null +++ b/Mage/src/mage/abilities/effects/common/BasicManaEffect.java @@ -0,0 +1,41 @@ +package mage.abilities.effects.common; + +import mage.Constants; +import mage.Mana; +import mage.abilities.Ability; +import mage.game.Game; + +public class BasicManaEffect extends ManaEffect { + protected Mana mana; + + public BasicManaEffect(Mana mana) { + super(); + this.mana = mana; + } + + public BasicManaEffect(final BasicManaEffect effect) { + super(effect); + this.mana = effect.mana.copy(); + } + + @Override + public BasicManaEffect copy() { + return new BasicManaEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + game.getPlayer(source.getControllerId()).getManaPool().changeMana(mana); + return true; + } + + + @Override + public String getText(Ability source) { + return "Add " + mana.toString() + " to your mana pool"; + } + + public Mana getMana() { + return mana; + } +} diff --git a/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java b/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java index c887c399db..0d20c33903 100644 --- a/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java +++ b/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java @@ -37,7 +37,7 @@ import mage.game.Game; * * @author North */ -public class DynamicManaEffect extends ManaEffect { +public class DynamicManaEffect extends BasicManaEffect { private Mana computedMana; private DynamicValue amount; diff --git a/Mage/src/mage/abilities/effects/common/ManaEffect.java b/Mage/src/mage/abilities/effects/common/ManaEffect.java index a555a0b745..48f7c92b35 100644 --- a/Mage/src/mage/abilities/effects/common/ManaEffect.java +++ b/Mage/src/mage/abilities/effects/common/ManaEffect.java @@ -38,37 +38,14 @@ import mage.game.Game; * * @author BetaSteward_at_googlemail.com */ -public class ManaEffect extends OneShotEffect { +public abstract class ManaEffect> extends OneShotEffect { - protected Mana mana; - - public ManaEffect(Mana mana) { + public ManaEffect() { super(Outcome.PutManaInPool); - this.mana = mana; } public ManaEffect(final ManaEffect effect) { super(effect); - this.mana = effect.mana.copy(); } - @Override - public ManaEffect copy() { - return new ManaEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - game.getPlayer(source.getControllerId()).getManaPool().changeMana(mana); - return true; - } - - @Override - public String getText(Ability source) { - return "Add " + mana.toString() + " to your mana pool"; - } - - public Mana getMana() { - return mana; - } } diff --git a/Mage/src/mage/abilities/mana/AnyColorManaAbility.java b/Mage/src/mage/abilities/mana/AnyColorManaAbility.java new file mode 100644 index 0000000000..cf5695952d --- /dev/null +++ b/Mage/src/mage/abilities/mana/AnyColorManaAbility.java @@ -0,0 +1,27 @@ +package mage.abilities.mana; + +import mage.Constants; +import mage.abilities.costs.Cost; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.AddManaOfAnyColorEffect; +import mage.choices.ChoiceColor; + +public class AnyColorManaAbility extends ManaAbility { + public AnyColorManaAbility() { + this(new TapSourceCost()); + } + + public AnyColorManaAbility(Cost cost) { + super(Constants.Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), cost); + this.addChoice(new ChoiceColor()); + } + + public AnyColorManaAbility(final AnyColorManaAbility ability) { + super(ability); + } + + @Override + public AnyColorManaAbility copy() { + return new AnyColorManaAbility(this); + } +} diff --git a/Mage/src/mage/abilities/mana/BlackManaAbility.java b/Mage/src/mage/abilities/mana/BlackManaAbility.java index efae430815..954ded3934 100644 --- a/Mage/src/mage/abilities/mana/BlackManaAbility.java +++ b/Mage/src/mage/abilities/mana/BlackManaAbility.java @@ -29,7 +29,7 @@ package mage.abilities.mana; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; /** * @@ -38,7 +38,7 @@ import mage.abilities.effects.common.ManaEffect; public class BlackManaAbility extends BasicManaAbility { public BlackManaAbility() { - super(new ManaEffect(Mana.BlackMana)); + super(new BasicManaEffect(Mana.BlackMana)); this.netMana.setBlack(1); } diff --git a/Mage/src/mage/abilities/mana/BlueManaAbility.java b/Mage/src/mage/abilities/mana/BlueManaAbility.java index 0ceeddf667..e4ca770bc4 100644 --- a/Mage/src/mage/abilities/mana/BlueManaAbility.java +++ b/Mage/src/mage/abilities/mana/BlueManaAbility.java @@ -29,7 +29,7 @@ package mage.abilities.mana; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; /** * @@ -38,7 +38,7 @@ import mage.abilities.effects.common.ManaEffect; public class BlueManaAbility extends BasicManaAbility { public BlueManaAbility() { - super(new ManaEffect(Mana.BlueMana)); + super(new BasicManaEffect(Mana.BlueMana)); this.netMana.setBlue(1); } diff --git a/Mage/src/mage/abilities/mana/ColorlessManaAbility.java b/Mage/src/mage/abilities/mana/ColorlessManaAbility.java index c7f54f3b72..7485a99502 100644 --- a/Mage/src/mage/abilities/mana/ColorlessManaAbility.java +++ b/Mage/src/mage/abilities/mana/ColorlessManaAbility.java @@ -29,6 +29,7 @@ package mage.abilities.mana; import mage.Mana; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.ManaEffect; /** @@ -38,7 +39,7 @@ import mage.abilities.effects.common.ManaEffect; public class ColorlessManaAbility extends BasicManaAbility { public ColorlessManaAbility() { - super(new ManaEffect(Mana.ColorlessMana)); + super(new BasicManaEffect(Mana.ColorlessMana)); this.netMana.setColorless(1); } diff --git a/Mage/src/mage/abilities/mana/GreenManaAbility.java b/Mage/src/mage/abilities/mana/GreenManaAbility.java index 703f7b6f56..561a89518f 100644 --- a/Mage/src/mage/abilities/mana/GreenManaAbility.java +++ b/Mage/src/mage/abilities/mana/GreenManaAbility.java @@ -29,7 +29,7 @@ package mage.abilities.mana; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; /** * @@ -38,7 +38,7 @@ import mage.abilities.effects.common.ManaEffect; public class GreenManaAbility extends BasicManaAbility { public GreenManaAbility() { - super(new ManaEffect(Mana.GreenMana)); + super(new BasicManaEffect(Mana.GreenMana)); this.netMana.setGreen(1); } diff --git a/Mage/src/mage/abilities/mana/RedManaAbility.java b/Mage/src/mage/abilities/mana/RedManaAbility.java index 74483249e0..f85f5c464b 100644 --- a/Mage/src/mage/abilities/mana/RedManaAbility.java +++ b/Mage/src/mage/abilities/mana/RedManaAbility.java @@ -29,7 +29,7 @@ package mage.abilities.mana; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; /** * @@ -38,7 +38,7 @@ import mage.abilities.effects.common.ManaEffect; public class RedManaAbility extends BasicManaAbility { public RedManaAbility() { - super(new ManaEffect(Mana.RedMana)); + super(new BasicManaEffect(Mana.RedMana)); this.netMana.setRed(1); } diff --git a/Mage/src/mage/abilities/mana/WhiteManaAbility.java b/Mage/src/mage/abilities/mana/WhiteManaAbility.java index 3c3c6d84b9..2d981d722b 100644 --- a/Mage/src/mage/abilities/mana/WhiteManaAbility.java +++ b/Mage/src/mage/abilities/mana/WhiteManaAbility.java @@ -29,7 +29,7 @@ package mage.abilities.mana; import mage.Mana; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; /** * @@ -38,7 +38,7 @@ import mage.abilities.effects.common.ManaEffect; public class WhiteManaAbility extends BasicManaAbility { public WhiteManaAbility() { - super(new ManaEffect(Mana.WhiteMana)); + super(new BasicManaEffect(Mana.WhiteMana)); this.netMana.setWhite(1); } diff --git a/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java index 2bec8bca1b..c23544b6c3 100644 --- a/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java @@ -33,7 +33,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.mana.SimpleManaAbility; /** @@ -49,7 +49,7 @@ public class EldraziSpawnToken extends Token { subtype.add("Spawn"); power = new MageInt(0); toughness = new MageInt(1); - addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new ManaEffect(Mana.ColorlessMana), new SacrificeSourceCost())); + addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.ColorlessMana), new SacrificeSourceCost())); } }