From ab7e86cb2762d59188929df0782a1e7bf826e4f6 Mon Sep 17 00:00:00 2001 From: Fenhl Date: Sat, 17 Sep 2016 16:59:24 +0000 Subject: [PATCH] Change AE to Ae --- .../Event Decks/[M12] Illusionary Might.dck | 2 +- .../Starter Decks/[M11] Power of Prophecy.dck | 2 +- .../Starter Decks/[M12] Mystical Might.dck | 2 +- .../2012/Starter Decks/[DKA] Grave Power.dck | 2 +- .../Gabriel Joglar's Merfolk 2nd Place.dck | 2 +- .../DailyMTG/Elias Rudin's RUG Vial.dck | 2 +- .../Nathan Kalsch's The God Complex.dck | 2 +- .../Gildor Inglorion's Esper Control.dck | 2 +- .../John Sawatzky's Chandra's Flames.dck | 2 +- .../Roy Keck's AEtheRenFerno.dck | 2 +- ...leman Jackson's Advent of the Arcanist.dck | 2 +- .../Michael Steidl's Planeswalker Control.dck | 2 +- .../DailyMTG/Robert Seder's Esper Control.dck | 2 +- .../Andy Sipka's Esper Control.dck | 2 +- .../Louis Fata's Death and Taxes.dck | 2 +- .../Dawn's GW Hatebears.dck | 2 +- .../AJ Owenss's Bant Control.dck | 2 +- ...ly Planeswalker-Pertaining Pandemonium.dck | 2 +- .../Matteo Cirigliano - G_B Enchantress.dck | 2 +- .../Commander 2013/Evasive Maneuvers.dck | 2 +- .../Commander 2014/Peer Through Time.dck | 2 +- .../Commander 2014/Sworn to Darkness.dck | 2 +- .../Commander 2015/Seize Control (UR).dck | 4 +- .../sample-decks/Commander/Tasigur BGU.dck | 2 +- ...votion to Blue TDtB ST Aug 2014.mwDeck.dck | 2 +- ...votion to Blue TDtB ST Dec 2013.mwDeck.dck | 2 +- ...votion to Blue TDtB ST Feb 2014.mwDeck.dck | 2 +- ...votion to Blue TDtB ST Jul 2014.mwDeck.dck | 2 +- ...votion to Blue TDtB ST Jun 2014.mwDeck.dck | 2 +- ...votion to Blue TDtB ST Mar 2014.mwDeck.dck | 2 +- ...votion to Blue TDtB ST May 2014.mwDeck.dck | 2 +- ...votion to Blue TDtB ST Oct 2013.mwDeck.dck | 2 +- .../Esper Control TDtB ST Apr 2014.mwDeck.dck | 2 +- .../Esper Control TDtB ST Dec 2013.mwDeck.dck | 2 +- .../Esper Control TDtB ST Mar 2014.mwDeck.dck | 2 +- .../Esper Control TDtB ST May 2014.mwDeck.dck | 2 +- .../Esper Control TDtB ST Nov 2013.mwDeck.dck | 2 +- .../Esper Control TDtB ST Oct 2013.mwDeck.dck | 4 +- ...e Speaker Bant TDtB ST May 2013.mwDeck.dck | 2 +- .../Temur Aggro TDtB ST Dec 2014.mwDeck.dck | 2 +- .../UW Control TDtB ST Feb 2014.mwDeck.dck | 2 +- .../UW Control TDtB ST May 2014.mwDeck.dck | 2 +- .../UW Flash TDtB ST Jul 2013.mwDeck.dck | 2 +- .../Elspeth vs. Tezzeret/Tezzeret.dck | 2 +- .../Duel Decks/Jace vs. Chandra/Jace.dck | 2 +- .../Duel Decks/Jace vs. Vraska/Jace.dck | 4 +- .../Duel Decks/Kiora vs. Elspeth/Kiora.dck | 2 +- .../Duel Decks/Venser vs. Koth/Koth.dck | 2 +- ...Khans of Tarkir (Honolulu) ST 10-12-14.dck | 2 +- ...ionship 2004 (San Francisco) ST 9-5-04.dck | 2 +- ... Blue 1 PT Theros (Dublin) ST 10-13-13.dck | 2 +- ...Blue 34 PT Theros (Dublin) ST 10-13-13.dck | 2 +- ...trol 58 PT Theros (Dublin) ST 10-13-13.dck | 4 +- ...ragons of Tarkir (Brussels) ST 4-12-15.dck | 4 +- .../cubes/AdamStyborskisPauperCube.java | 4 +- .../src/mage/tournament/cubes/BensCube.java | 8 ++-- .../tournament/cubes/CubeTutor360Pauper.java | 4 +- .../mage/tournament/cubes/CubeTutor720.java | 6 +-- .../mage/tournament/cubes/JimDavisCube.java | 2 +- .../src/mage/tournament/cubes/LegacyCube.java | 2 +- .../tournament/cubes/LegacyCubeMarch2015.java | 2 +- .../cubes/LegacyCubeSeptember2015.java | 2 +- .../src/mage/tournament/cubes/MTGCube.java | 2 +- .../tournament/cubes/MTGOMarchCube2014.java | 4 +- .../mage/tournament/cubes/MonoBlueCube.java | 8 ++-- .../tournament/cubes/PeasantsToolboxCube.java | 8 ++-- .../tournament/cubes/VintageCube2013.java | 2 +- .../tournament/cubes/VintageCube2014.java | 2 +- .../{AEthersnipe.java => Aethersnipe.java} | 10 ++--- ...EtherMutation.java => AetherMutation.java} | 12 +++--- ...herSpellbomb.java => AetherSpellbomb.java} | 10 ++--- .../bornofthegods/BrimazKingOfOreskos.java | 2 +- ...elTheAEther.java => UnravelTheAether.java} | 12 +++--- .../{AEtherFlash.java => AetherFlash.java} | 10 ++--- ...{SurgingAEther.java => SurgingAether.java} | 12 +++--- .../{AEthersnipe.java => Aethersnipe.java} | 14 +++---- ...rmagesTouch.java => AethermagesTouch.java} | 26 ++++++------- .../{AEtherGale.java => AetherGale.java} | 12 +++--- .../{AEtherSnap.java => AetherSnap.java} | 24 ++++++------ .../{AEtherize.java => Aetherize.java} | 10 ++--- .../{AEthersnatch.java => Aethersnatch.java} | 24 ++++++------ ...EtherLich.java => ScornfulAetherLich.java} | 14 +++---- ...rTradewinds.java => AetherTradewinds.java} | 10 ++--- .../{AEtherSnap.java => AetherSnap.java} | 10 ++--- .../{AEtherVial.java => AetherVial.java} | 28 ++++++------- ...rmagesTouch.java => AethermagesTouch.java} | 10 ++--- .../{AEtherling.java => Aetherling.java} | 20 +++++----- ...curingAEther.java => ObscuringAether.java} | 16 ++++---- .../{AEtherize.java => Aetherize.java} | 10 ++--- ...herSpellbomb.java => AetherSpellbomb.java} | 16 ++++---- ...oldIntoAEther.java => FoldIntoAether.java} | 24 ++++++------ .../{AEtherVial.java => AetherVial.java} | 10 ++--- ...Ethermage.java => VedalkenAethermage.java} | 14 +++---- .../{AEtherize.java => Aetherize.java} | 12 +++--- .../{AEtherRift.java => AetherRift.java} | 24 ++++++------ .../{AEthersnipe.java => Aethersnipe.java} | 10 ++--- .../{AEtherAdept.java => AetherAdept.java} | 10 ++--- ...{AEtherFigment.java => AetherFigment.java} | 10 ++--- ...rTradewinds.java => AetherTradewinds.java} | 10 ++--- ...hiBerserker.java => AerathiBerserker.java} | 12 +++--- .../{AEthersnipe.java => Aethersnipe.java} | 10 ++--- .../src/mage/sets/magic2011/AetherAdept.java | 4 +- .../{AEtherAdept.java => AetherAdept.java} | 10 ++--- .../{AEtherspouts.java => Aetherspouts.java} | 24 ++++++------ ...oTheAEther.java => AnchorToTheAether.java} | 12 +++--- ...EtherGrid.java => GhirapurAetherGrid.java} | 16 ++++---- .../{AEtherVial.java => AetherVial.java} | 10 ++--- ...herSpellbomb.java => AetherSpellbomb.java} | 10 ++--- ...eToTheAEther.java => GateToTheAether.java} | 26 ++++++------- ...herSpellbomb.java => AetherSpellbomb.java} | 10 ++--- .../{AEtherVial.java => AetherVial.java} | 10 ++--- .../{AEthersnipe.java => Aethersnipe.java} | 10 ++--- .../{AEthersnipe.java => Aethersnipe.java} | 10 ++--- ...{AEtherBarrier.java => AetherBarrier.java} | 36 ++++++++--------- ...{ArmWithAEther.java => ArmWithAether.java} | 24 ++++++------ .../{AEtherBurst.java => AetherBurst.java} | 20 +++++----- .../{AEtherCharge.java => AetherCharge.java} | 39 +++++++++---------- ...EtherMembrane.java => AetherMembrane.java} | 10 ++--- .../{FrozenAEther.java => FrozenAether.java} | 24 ++++++------ ...herShockwave.java => AetherShockwave.java} | 12 +++--- .../{AEtherFlash.java => AetherFlash.java} | 28 ++++++------- ...{TaintedAEther.java => TaintedAether.java} | 10 ++--- .../{AEthertow.java => Aethertow.java} | 24 ++++++------ .../mage/sets/urzasdestiny/AetherSting.java | 4 +- ...{TaintedAEther.java => TaintedAether.java} | 12 +++--- ...EtherMembrane.java => AetherMembrane.java} | 14 +++---- ...EtherMutation.java => AetherMutation.java} | 10 ++--- .../{AEtherFlash.java => AetherFlash.java} | 10 ++--- ...rTradewinds.java => AetherTradewinds.java} | 29 +++++++------- .../src/mage/sets/zendikar/AetherFigment.java | 6 +-- Mage.Tests/CommanderDuel.dck | 2 +- ...igmentTest.java => AetherFigmentTest.java} | 16 ++++---- .../abilities/flicker/CloudshiftTest.java | 2 +- .../cards/abilities/keywords/KickerTest.java | 26 ++++++------- .../canttarget/CanopyCoverTest.java | 8 ++-- .../cards/decks/importer/TxtDeckImporter.java | 2 +- 136 files changed, 575 insertions(+), 577 deletions(-) rename Mage.Sets/src/mage/sets/anthologyjacevschandra/{AEthersnipe.java => Aethersnipe.java} (89%) rename Mage.Sets/src/mage/sets/apocalypse/{AEtherMutation.java => AetherMutation.java} (90%) rename Mage.Sets/src/mage/sets/archenemy/{AEtherSpellbomb.java => AetherSpellbomb.java} (87%) rename Mage.Sets/src/mage/sets/bornofthegods/{UnravelTheAEther.java => UnravelTheAether.java} (90%) rename Mage.Sets/src/mage/sets/classicsixthedition/{AEtherFlash.java => AetherFlash.java} (89%) rename Mage.Sets/src/mage/sets/coldsnap/{SurgingAEther.java => SurgingAether.java} (89%) rename Mage.Sets/src/mage/sets/commander/{AEthersnipe.java => Aethersnipe.java} (89%) rename Mage.Sets/src/mage/sets/commander2013/{AEthermagesTouch.java => AethermagesTouch.java} (89%) rename Mage.Sets/src/mage/sets/commander2014/{AEtherGale.java => AetherGale.java} (90%) rename Mage.Sets/src/mage/sets/commander2014/{AEtherSnap.java => AetherSnap.java} (86%) rename Mage.Sets/src/mage/sets/commander2015/{AEtherize.java => Aetherize.java} (89%) rename Mage.Sets/src/mage/sets/commander2015/{AEthersnatch.java => Aethersnatch.java} (84%) rename Mage.Sets/src/mage/sets/conflux/{ScornfulAEtherLich.java => ScornfulAetherLich.java} (88%) rename Mage.Sets/src/mage/sets/conspiracy/{AEtherTradewinds.java => AetherTradewinds.java} (88%) rename Mage.Sets/src/mage/sets/darksteel/{AEtherSnap.java => AetherSnap.java} (89%) rename Mage.Sets/src/mage/sets/darksteel/{AEtherVial.java => AetherVial.java} (88%) rename Mage.Sets/src/mage/sets/dissension/{AEthermagesTouch.java => AethermagesTouch.java} (88%) rename Mage.Sets/src/mage/sets/dragonsmaze/{AEtherling.java => Aetherling.java} (86%) rename Mage.Sets/src/mage/sets/dragonsoftarkir/{ObscuringAEther.java => ObscuringAether.java} (88%) rename Mage.Sets/src/mage/sets/elspethvskiora/{AEtherize.java => Aetherize.java} (89%) rename Mage.Sets/src/mage/sets/elspethvstezzeret/{AEtherSpellbomb.java => AetherSpellbomb.java} (87%) rename Mage.Sets/src/mage/sets/fifthdawn/{FoldIntoAEther.java => FoldIntoAether.java} (87%) rename Mage.Sets/src/mage/sets/ftvrelics/{AEtherVial.java => AetherVial.java} (90%) rename Mage.Sets/src/mage/sets/futuresight/{VedalkenAEthermage.java => VedalkenAethermage.java} (89%) rename Mage.Sets/src/mage/sets/gatecrash/{AEtherize.java => Aetherize.java} (90%) rename Mage.Sets/src/mage/sets/invasion/{AEtherRift.java => AetherRift.java} (87%) rename Mage.Sets/src/mage/sets/jacevschandra/{AEthersnipe.java => Aethersnipe.java} (89%) rename Mage.Sets/src/mage/sets/jacevsvraska/{AEtherAdept.java => AetherAdept.java} (89%) rename Mage.Sets/src/mage/sets/jacevsvraska/{AEtherFigment.java => AetherFigment.java} (89%) rename Mage.Sets/src/mage/sets/kaladesh/{AEtherTradewinds.java => AetherTradewinds.java} (88%) rename Mage.Sets/src/mage/sets/legends/{AErathiBerserker.java => AerathiBerserker.java} (88%) rename Mage.Sets/src/mage/sets/lorwyn/{AEthersnipe.java => Aethersnipe.java} (89%) rename Mage.Sets/src/mage/sets/magic2012/{AEtherAdept.java => AetherAdept.java} (90%) rename Mage.Sets/src/mage/sets/magic2015/{AEtherspouts.java => Aetherspouts.java} (94%) rename Mage.Sets/src/mage/sets/magicorigins/{AnchorToTheAEther.java => AnchorToTheAether.java} (88%) rename Mage.Sets/src/mage/sets/magicorigins/{GhirapurAEtherGrid.java => GhirapurAetherGrid.java} (90%) rename Mage.Sets/src/mage/sets/masterpieceseries/{AEtherVial.java => AetherVial.java} (90%) rename Mage.Sets/src/mage/sets/mirrodin/{AEtherSpellbomb.java => AetherSpellbomb.java} (87%) rename Mage.Sets/src/mage/sets/mirrodin/{GateToTheAEther.java => GateToTheAether.java} (85%) rename Mage.Sets/src/mage/sets/modernmasters/{AEtherSpellbomb.java => AetherSpellbomb.java} (87%) rename Mage.Sets/src/mage/sets/modernmasters/{AEtherVial.java => AetherVial.java} (90%) rename Mage.Sets/src/mage/sets/modernmasters/{AEthersnipe.java => Aethersnipe.java} (89%) rename Mage.Sets/src/mage/sets/modernmasters2015/{AEthersnipe.java => Aethersnipe.java} (89%) rename Mage.Sets/src/mage/sets/nemesis/{AEtherBarrier.java => AetherBarrier.java} (85%) rename Mage.Sets/src/mage/sets/newphyrexia/{ArmWithAEther.java => ArmWithAether.java} (86%) rename Mage.Sets/src/mage/sets/odyssey/{AEtherBurst.java => AetherBurst.java} (89%) rename Mage.Sets/src/mage/sets/onslaught/{AEtherCharge.java => AetherCharge.java} (83%) rename Mage.Sets/src/mage/sets/planarchaos/{AEtherMembrane.java => AetherMembrane.java} (88%) rename Mage.Sets/src/mage/sets/planarchaos/{FrozenAEther.java => FrozenAether.java} (87%) rename Mage.Sets/src/mage/sets/saviorsofkamigawa/{AEtherShockwave.java => AetherShockwave.java} (90%) rename Mage.Sets/src/mage/sets/seventhedition/{AEtherFlash.java => AetherFlash.java} (82%) rename Mage.Sets/src/mage/sets/seventhedition/{TaintedAEther.java => TaintedAether.java} (89%) rename Mage.Sets/src/mage/sets/shadowmoor/{AEthertow.java => Aethertow.java} (86%) rename Mage.Sets/src/mage/sets/urzassaga/{TaintedAEther.java => TaintedAether.java} (91%) rename Mage.Sets/src/mage/sets/venservskoth/{AEtherMembrane.java => AetherMembrane.java} (89%) rename Mage.Sets/src/mage/sets/vintagemasters/{AEtherMutation.java => AetherMutation.java} (88%) rename Mage.Sets/src/mage/sets/weatherlight/{AEtherFlash.java => AetherFlash.java} (89%) rename Mage.Sets/src/mage/sets/worldwake/{AEtherTradewinds.java => AetherTradewinds.java} (84%) rename Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/{AEtherFigmentTest.java => AetherFigmentTest.java} (59%) diff --git a/Mage.Client/release/sample-decks/2011/Event Decks/[M12] Illusionary Might.dck b/Mage.Client/release/sample-decks/2011/Event Decks/[M12] Illusionary Might.dck index bf4e5e12ab..b0bb2c80c4 100644 --- a/Mage.Client/release/sample-decks/2011/Event Decks/[M12] Illusionary Might.dck +++ b/Mage.Client/release/sample-decks/2011/Event Decks/[M12] Illusionary Might.dck @@ -9,7 +9,7 @@ AUTHOR:WotC 1 [SOM:194] Precursor Golem 1 [SOM:205] Steel Hellkite 3 [M12:71] Phantasmal Dragon -4 [M12:41] AEther Adept +4 [M12:41] Aether Adept 1 [M12:72] Phantasmal Image 4 [M12:70] Phantasmal Bear 4 [NPH:19] Porcelain Legionnaire diff --git a/Mage.Client/release/sample-decks/2011/Starter Decks/[M11] Power of Prophecy.dck b/Mage.Client/release/sample-decks/2011/Starter Decks/[M11] Power of Prophecy.dck index f9b2627722..7bf152bdfe 100644 --- a/Mage.Client/release/sample-decks/2011/Starter Decks/[M11] Power of Prophecy.dck +++ b/Mage.Client/release/sample-decks/2011/Starter Decks/[M11] Power of Prophecy.dck @@ -4,7 +4,7 @@ AUTHOR:WotC # Creature 1 [M11:8] Blinding Mage -2 [M11:41] AEther Adept +2 [M11:41] Aether Adept 2 [M11:42] Air Servant 1 [M11:44] Armored Cancrix 2 [M11:45] Augury Owl diff --git a/Mage.Client/release/sample-decks/2011/Starter Decks/[M12] Mystical Might.dck b/Mage.Client/release/sample-decks/2011/Starter Decks/[M12] Mystical Might.dck index cb9a80e1b7..8ad1f98548 100644 --- a/Mage.Client/release/sample-decks/2011/Starter Decks/[M12] Mystical Might.dck +++ b/Mage.Client/release/sample-decks/2011/Starter Decks/[M12] Mystical Might.dck @@ -8,7 +8,7 @@ AUTHOR:WotC 1 [M12:33] Serra Angel 1 [M12:34] Siege Mastodon 2 [M12:38] Stormfront Pegasus -1 [M12:41] AEther Adept +1 [M12:41] Aether Adept 2 [M12:44] Aven Fleetwing 2 [M12:47] Cancel 3 [M12:49] Coral Merfolk diff --git a/Mage.Client/release/sample-decks/2012/Starter Decks/[DKA] Grave Power.dck b/Mage.Client/release/sample-decks/2012/Starter Decks/[DKA] Grave Power.dck index 6d5d9a6e19..59a3f9de0c 100644 --- a/Mage.Client/release/sample-decks/2012/Starter Decks/[DKA] Grave Power.dck +++ b/Mage.Client/release/sample-decks/2012/Starter Decks/[DKA] Grave Power.dck @@ -18,7 +18,7 @@ NAME:[DKA] Grave Power 2 [ISD:211] Wreath of Geists 1 [M12:42] Alluring Siren 2 [DKA:53] Tower Geist -1 [M12:41] AEther Adept +1 [M12:41] Aether Adept 2 [DKA:117] Grim Flowering 4 [ISD:253] Island 2 [DKA:118] Hollowhenge Beast diff --git a/Mage.Client/release/sample-decks/2013/Modern/Bronze TCQ - Huntsville, TX (March 3)/Gabriel Joglar's Merfolk 2nd Place.dck b/Mage.Client/release/sample-decks/2013/Modern/Bronze TCQ - Huntsville, TX (March 3)/Gabriel Joglar's Merfolk 2nd Place.dck index 8007cdeac3..0ee9195309 100644 --- a/Mage.Client/release/sample-decks/2013/Modern/Bronze TCQ - Huntsville, TX (March 3)/Gabriel Joglar's Merfolk 2nd Place.dck +++ b/Mage.Client/release/sample-decks/2013/Modern/Bronze TCQ - Huntsville, TX (March 3)/Gabriel Joglar's Merfolk 2nd Place.dck @@ -9,7 +9,7 @@ NAME:Gabriel Joglar's Merfolk 2nd Place 4 [SHM:34] Cursecatcher 4 [ZEN:70] Spreading Seas 4 [LRW:74] Merrow Reejerey -2 [DST:91] AEther Vial +2 [DST:91] Aether Vial 17 [RTR:255] Island 2 [ROE:57] Coralhelm Commander 4 [LRW:86] Silvergill Adept diff --git a/Mage.Client/release/sample-decks/2013/Modern/DailyMTG/Elias Rudin's RUG Vial.dck b/Mage.Client/release/sample-decks/2013/Modern/DailyMTG/Elias Rudin's RUG Vial.dck index 54ed5861f5..790279ef29 100644 --- a/Mage.Client/release/sample-decks/2013/Modern/DailyMTG/Elias Rudin's RUG Vial.dck +++ b/Mage.Client/release/sample-decks/2013/Modern/DailyMTG/Elias Rudin's RUG Vial.dck @@ -15,7 +15,7 @@ NAME:Elias Rudin's RUG Vial 3 [RAV:63] Remand 3 [DKA:140] Huntmaster of the Fells 1 [MMA:190] Kitchen Finks -4 [MMA:197] AEther Vial +4 [MMA:197] Aether Vial 1 [RTR:247] Steam Vents 3 [ZEN:220] Misty Rainforest 4 [RTR:255] Island diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed Crazy Chimera Combo/Nathan Kalsch's The God Complex.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed Crazy Chimera Combo/Nathan Kalsch's The God Complex.dck index 6ce71c87c7..cca75ae330 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed Crazy Chimera Combo/Nathan Kalsch's The God Complex.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed Crazy Chimera Combo/Nathan Kalsch's The God Complex.dck @@ -1,5 +1,5 @@ NAME:Nathan Kalsch's The God Complex -2 [DGM:11] AEtherling +2 [DGM:11] Aetherling 4 [THS:56] Nimbus Naiad 4 [RTR:215] Frostburn Weird 2 [RTR:35] Cyclonic Rift diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Gildor Inglorion's Esper Control.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Gildor Inglorion's Esper Control.dck index dd52409b9d..fdf88d27e1 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Gildor Inglorion's Esper Control.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Gildor Inglorion's Esper Control.dck @@ -1,5 +1,5 @@ NAME:Gildor Inglorion's Esper Control -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 4 [ISD:245] Nephalia Drownyard 4 [RTR:145] Azorius Charm 2 [DGM:5] Renounce the Guilds diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/John Sawatzky's Chandra's Flames.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/John Sawatzky's Chandra's Flames.dck index 3fb5b650cd..6459b2796d 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/John Sawatzky's Chandra's Flames.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/John Sawatzky's Chandra's Flames.dck @@ -1,6 +1,6 @@ NAME:Jonathan Gutierrez's Sphinx-Ghoul Revelation 1 [RTR:208] Vraska the Unseen -2 [DGM:11] AEtherling +2 [DGM:11] Aetherling 4 [RTR:243] Overgrown Tomb 4 [M13:114] Veilborn Ghoul 4 [M13:170] Farseek diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Roy Keck's AEtheRenFerno.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Roy Keck's AEtheRenFerno.dck index 48a7a4dac8..8e1bec7e04 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Roy Keck's AEtheRenFerno.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG ReConstructed/Roy Keck's AEtheRenFerno.dck @@ -1,5 +1,5 @@ NAME:Roy Keck's AEtheRenFerno -2 [DGM:11] AEtherling +2 [DGM:11] Aetherling 1 [ISD:115] Sever the Bloodline 1 [ISD:78] Snapcaster Mage 4 [RTR:238] Blood Crypt diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Coleman Jackson's Advent of the Arcanist.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Coleman Jackson's Advent of the Arcanist.dck index e193ccf51c..9c4c5db732 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Coleman Jackson's Advent of the Arcanist.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Coleman Jackson's Advent of the Arcanist.dck @@ -14,4 +14,4 @@ NAME:Coleman Jackson's Advent of the Arcanist 3 [DIS:174] Hallowed Fountain 3 [DGM:51] Advent of the Wurm 4 [RTR:123] Druid's Deliverance -3 [GTC:29] AEtherize +3 [GTC:29] Aetherize diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Michael Steidl's Planeswalker Control.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Michael Steidl's Planeswalker Control.dck index 0e5e95bc60..48e87875ec 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Michael Steidl's Planeswalker Control.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG with M14/Michael Steidl's Planeswalker Control.dck @@ -1,7 +1,7 @@ NAME:Michael Steidl's Planeswalker Control 2 [RTR:208] Vraska the Unseen 3 [M13:160] Arbor Elf -2 [DGM:11] AEtherling +2 [DGM:11] Aetherling 1 [CON:120] Nicol Bolas, Planeswalker 2 [RTR:44] Jace, Architect of Thought 2 [RTR:82] Ultimate Price diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG/Robert Seder's Esper Control.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG/Robert Seder's Esper Control.dck index a5e7c1ed67..50c0e5f1d1 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG/Robert Seder's Esper Control.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG/Robert Seder's Esper Control.dck @@ -1,6 +1,6 @@ NAME:Robert Seder's Esper Control 1 [DKA:142] Sorin, Lord of Innistrad -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 4 [M13:225] Glacial Fortress 3 [ISD:83] Think Twice 3 [RTR:145] Azorius Charm diff --git a/Mage.Client/release/sample-decks/2013/Standard/Star City Games/Andy Sipka's Esper Control.dck b/Mage.Client/release/sample-decks/2013/Standard/Star City Games/Andy Sipka's Esper Control.dck index ed57a028e5..a10cace5b3 100644 --- a/Mage.Client/release/sample-decks/2013/Standard/Star City Games/Andy Sipka's Esper Control.dck +++ b/Mage.Client/release/sample-decks/2013/Standard/Star City Games/Andy Sipka's Esper Control.dck @@ -1,7 +1,7 @@ NAME:Andy Sipka's Esper Control 2 [DKA:142] Sorin, Lord of Innistrad 1 [RTR:250] Plains -2 [DGM:11] AEtherling +2 [DGM:11] Aetherling 4 [M13:225] Glacial Fortress 4 [RTR:145] Azorius Charm 1 [DKA:158] Vault of the Archangel diff --git a/Mage.Client/release/sample-decks/2014/Legacy/Championship Philadelpia/Louis Fata's Death and Taxes.dck b/Mage.Client/release/sample-decks/2014/Legacy/Championship Philadelpia/Louis Fata's Death and Taxes.dck index 71be74a111..570258125f 100644 --- a/Mage.Client/release/sample-decks/2014/Legacy/Championship Philadelpia/Louis Fata's Death and Taxes.dck +++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship Philadelpia/Louis Fata's Death and Taxes.dck @@ -8,7 +8,7 @@ NAME:Louis Fata's Death and Taxes 1 [BOK:163] Umezawa's Jitte 2 [FUT:177] Horizon Canopy 4 [CMD:21] Mother of Runes -4 [MMA:197] AEther Vial +4 [MMA:197] Aether Vial 3 [M15:225] Phyrexian Revoker 10 [KTK:250] Plains 3 [LEG:248] Karakas diff --git a/Mage.Client/release/sample-decks/2014/Modern/MTGO Reconstructed/Casting Emrakul on Turn Three/Dawn's GW Hatebears.dck b/Mage.Client/release/sample-decks/2014/Modern/MTGO Reconstructed/Casting Emrakul on Turn Three/Dawn's GW Hatebears.dck index 8b9518bfec..ce6c1c5353 100644 --- a/Mage.Client/release/sample-decks/2014/Modern/MTGO Reconstructed/Casting Emrakul on Turn Three/Dawn's GW Hatebears.dck +++ b/Mage.Client/release/sample-decks/2014/Modern/MTGO Reconstructed/Casting Emrakul on Turn Three/Dawn's GW Hatebears.dck @@ -8,7 +8,7 @@ NAME:Dawn's GW Hatebears 3 [DKA:24] Thalia, Guardian of Thraben 4 [ISD:240] Ghost Quarter 2 [FUT:18] Aven Mindcensor -4 [MMA:197] AEther Vial +4 [MMA:197] Aether Vial 3 [M14:195] Scavenging Ooze 2 [DDM:84] Forest 2 [FUT:177] Horizon Canopy diff --git a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/AJ Owenss's Bant Control.dck b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/AJ Owenss's Bant Control.dck index 0c7e4959a2..a055321d49 100644 --- a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/AJ Owenss's Bant Control.dck +++ b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/AJ Owenss's Bant Control.dck @@ -1,5 +1,5 @@ NAME:AJ Owenss's Bant Control -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 1 [C13:341] Island 4 [RTR:145] Azorius Charm 2 [BNG:149] Kiora, the Crashing Wave diff --git a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/Hayden's Pyxis of Possibly Planeswalker-Pertaining Pandemonium.dck b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/Hayden's Pyxis of Possibly Planeswalker-Pertaining Pandemonium.dck index 37f2a51f0e..cd14786cb2 100644 --- a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/Hayden's Pyxis of Possibly Planeswalker-Pertaining Pandemonium.dck +++ b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG Reconstructed/The Ephara Side/Hayden's Pyxis of Possibly Planeswalker-Pertaining Pandemonium.dck @@ -1,6 +1,6 @@ NAME:Hayden's Pyxis of Possibly Planeswalker-Pertaining Pandemonium 8 [C13:353] Forest -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 8 [C13:341] Island 3 [BNG:149] Kiora, the Crashing Wave 3 [THS:209] Xenagos, the Reveler diff --git a/Mage.Client/release/sample-decks/2014/Standard/GP Stockholm 2014-11/Matteo Cirigliano - G_B Enchantress.dck b/Mage.Client/release/sample-decks/2014/Standard/GP Stockholm 2014-11/Matteo Cirigliano - G_B Enchantress.dck index fbd2f69ced..41cda64bdc 100644 --- a/Mage.Client/release/sample-decks/2014/Standard/GP Stockholm 2014-11/Matteo Cirigliano - G_B Enchantress.dck +++ b/Mage.Client/release/sample-decks/2014/Standard/GP Stockholm 2014-11/Matteo Cirigliano - G_B Enchantress.dck @@ -23,4 +23,4 @@ SB: 4 [THS:107] Thoughtseize SB: 1 [THS:110] Whip of Erebos SB: 2 [JOU:154] Pharika, God of Affliction SB: 1 [KTK:81] Murderous Cut -SB: 3 [BNG:143] Unravel the AEther +SB: 3 [BNG:143] Unravel the Aether diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2013/Evasive Maneuvers.dck b/Mage.Client/release/sample-decks/Commander/Commander 2013/Evasive Maneuvers.dck index 5da54ba6df..88254ef2b1 100644 --- a/Mage.Client/release/sample-decks/Commander/Commander 2013/Evasive Maneuvers.dck +++ b/Mage.Client/release/sample-decks/Commander/Commander 2013/Evasive Maneuvers.dck @@ -30,7 +30,7 @@ NAME:Evasive Maneuvers 1 [C13:263] Swiftfoot Boots 1 [C13:316] Saltcrusted Steppe 1 [C13:262] Surveyor's Scope -1 [C13:176] AEthermage's Touch +1 [C13:176] Aethermage's Touch 1 [C13:137] Bane of Progress 1 [C13:319] Secluded Steppe 1 [C13:267] Thunderstaff diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2014/Peer Through Time.dck b/Mage.Client/release/sample-decks/Commander/Commander 2014/Peer Through Time.dck index 9f4819a972..0e823e4724 100644 --- a/Mage.Client/release/sample-decks/Commander/Commander 2014/Peer Through Time.dck +++ b/Mage.Client/release/sample-decks/Commander/Commander 2014/Peer Through Time.dck @@ -2,7 +2,7 @@ NAME:Peer Through Time 1 [C14:12] Breaching Leviathan 1 [C14:99] Brine Elemental 1 [C14:55] Crown of Doom -1 [C14:11] AEther Gale +1 [C14:11] Aether Gale 1 [C14:98] Azure Mage 1 [C14:54] Commander's Sphere 1 [C14:53] Assault Suit diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2014/Sworn to Darkness.dck b/Mage.Client/release/sample-decks/Commander/Commander 2014/Sworn to Darkness.dck index 2999d2ef2b..1780c5e49c 100644 --- a/Mage.Client/release/sample-decks/Commander/Commander 2014/Sworn to Darkness.dck +++ b/Mage.Client/release/sample-decks/Commander/Commander 2014/Sworn to Darkness.dck @@ -64,7 +64,7 @@ NAME:Sworn to Darkness 1 [C14:136] Black Sun's Zenith 1 [C14:135] Bad Moon 1 [C14:134] Annihilate -1 [C14:133] AEther Snap +1 [C14:133] Aether Snap 1 [C14:298] Ghost Quarter 1 [C14:132] Abyssal Persecutor 1 [C14:250] Mind Stone diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2015/Seize Control (UR).dck b/Mage.Client/release/sample-decks/Commander/Commander 2015/Seize Control (UR).dck index ee3dfe19a3..e53a653000 100644 --- a/Mage.Client/release/sample-decks/Commander/Commander 2015/Seize Control (UR).dck +++ b/Mage.Client/release/sample-decks/Commander/Commander 2015/Seize Control (UR).dck @@ -10,7 +10,7 @@ 1 [C15:88] Blue Sun's Zenith 1 [C15:87] Blatant Thievery 1 [C15:42] Arjun, the Shifting Flame -1 [C15:85] AEtherize +1 [C15:85] Aetherize 1 [C15:151] Dragon Mage 1 [C15:153] Faithless Looting 1 [C15:275] Worn Powerstone @@ -65,7 +65,7 @@ 1 [C15:29] Mizzix's Mastery 1 [C15:28] Meteor Blast 1 [C15:256] Izzet Signet -1 [C15:9] AEthersnatch +1 [C15:9] Aethersnatch 1 [C15:24] Awaken the Sky Tyrant 1 [C15:214] Counterflux 13 [C15:335] Mountain diff --git a/Mage.Client/release/sample-decks/Commander/Tasigur BGU.dck b/Mage.Client/release/sample-decks/Commander/Tasigur BGU.dck index 5c185ee126..6ccbf8fa47 100644 --- a/Mage.Client/release/sample-decks/Commander/Tasigur BGU.dck +++ b/Mage.Client/release/sample-decks/Commander/Tasigur BGU.dck @@ -33,7 +33,7 @@ 1 [5ED:191] Sylvan Library 1 [CMD:269] Command Tower 1 [EXO:35] Forbid -1 [DDO:36] AEtherize +1 [DDO:36] Aetherize 1 [KTK:36] Dig Through Time 1 [RTR:141] Abrupt Decay 1 [SHM:280] Sunken Ruins diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Aug 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Aug 2014.mwDeck.dck index 5c4037a895..8a8498649b 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Aug 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Aug 2014.mwDeck.dck @@ -15,7 +15,7 @@ SB: 1 [C14:104] Cyclonic Rift SB: 2 [THS:47] Dissolve SB: 3 [THS:49] Gainsay -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 1 [RTR:36] Dispel SB: 2 [M14:53] Domestication SB: 2 [RTR:44] Jace, Architect of Thought diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Dec 2013.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Dec 2013.mwDeck.dck index 3a8e3daf93..5ec9632754 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Dec 2013.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Dec 2013.mwDeck.dck @@ -15,7 +15,7 @@ SB: 1 [C14:104] Cyclonic Rift SB: 1 [THS:46] Curse of the Swine SB: 4 [THS:49] Gainsay -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 2 [GTC:44] Rapid Hybridization SB: 1 [RTR:44] Jace, Architect of Thought SB: 3 [M14:53] Domestication diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Feb 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Feb 2014.mwDeck.dck index ebc2ac9a9e..9eef4d835a 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Feb 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Feb 2014.mwDeck.dck @@ -15,7 +15,7 @@ SB: 2 [C14:104] Cyclonic Rift SB: 1 [THS:47] Dissolve SB: 3 [THS:49] Gainsay -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 1 [GTC:44] Rapid Hybridization SB: 1 [RTR:36] Dispel SB: 2 [M14:53] Domestication diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jul 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jul 2014.mwDeck.dck index 33d00defc0..9bcabefa81 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jul 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jul 2014.mwDeck.dck @@ -15,7 +15,7 @@ SB: 2 [THS:47] Dissolve SB: 1 [THS:38] Annul SB: 4 [THS:49] Gainsay -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 1 [GTC:44] Rapid Hybridization SB: 1 [RTR:36] Dispel SB: 1 [M14:53] Domestication diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jun 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jun 2014.mwDeck.dck index 3bb0b6321d..8af96e7b03 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jun 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Jun 2014.mwDeck.dck @@ -16,7 +16,7 @@ SB: 2 [C14:104] Cyclonic Rift SB: 1 [THS:223] Nykthos, Shrine to Nyx SB: 1 [THS:47] Dissolve SB: 2 [THS:49] Gainsay -SB: 2 [DGM:11] AEtherling +SB: 2 [DGM:11] Aetherling SB: 1 [RTR:36] Dispel SB: 1 [GTC:44] Rapid Hybridization SB: 1 [M14:53] Domestication diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Mar 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Mar 2014.mwDeck.dck index 87b9f501c3..8de268b121 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Mar 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Mar 2014.mwDeck.dck @@ -13,7 +13,7 @@ 4 [THS:66] Thassa, God of the Sea SB: 3 [THS:47] Dissolve SB: 3 [THS:49] Gainsay -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 2 [M14:46] Claustrophobia SB: 3 [M14:53] Domestication SB: 2 [RTR:44] Jace, Architect of Thought diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST May 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST May 2014.mwDeck.dck index ae1cbf3049..9d142cda96 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST May 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST May 2014.mwDeck.dck @@ -18,7 +18,7 @@ SB: 1 [C14:104] Cyclonic Rift SB: 1 [THS:47] Dissolve SB: 1 [RTR:231] Pithing Needle SB: 2 [THS:49] Gainsay -SB: 2 [DGM:11] AEtherling +SB: 2 [DGM:11] Aetherling SB: 2 [GTC:44] Rapid Hybridization SB: 2 [RTR:36] Dispel SB: 2 [M14:53] Domestication diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Oct 2013.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Oct 2013.mwDeck.dck index 3bf028754a..d698ec250e 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Oct 2013.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Devotion to Blue TDtB ST Oct 2013.mwDeck.dck @@ -13,7 +13,7 @@ 21 [UNH:137] Island 4 [THS:66] Thassa, God of the Sea SB: 1 [RTR:231] Pithing Needle -SB: 2 [DGM:11] AEtherling +SB: 2 [DGM:11] Aetherling SB: 2 [M14:215] Ratchet Bomb SB: 1 [M14:228] Mutavault SB: 1 [THS:71] Triton Tactics diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Apr 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Apr 2014.mwDeck.dck index 4af6e626cb..d44310ae30 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Apr 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Apr 2014.mwDeck.dck @@ -7,7 +7,7 @@ 4 [RTR:201] Supreme Verdict 4 [RTR:200] Sphinx's Revelation 4 [RTR:155] Detention Sphere -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 2 [M14:228] Mutavault 1 [BNG:25] Revoke Existence 2 [M14:96] Doom Blade diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Dec 2013.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Dec 2013.mwDeck.dck index 1e16ccf56b..eb59d7c287 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Dec 2013.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Dec 2013.mwDeck.dck @@ -10,7 +10,7 @@ 3 [RTR:145] Azorius Charm 4 [RTR:200] Sphinx's Revelation 4 [RTR:155] Detention Sphere -2 [DGM:11] AEtherling +2 [DGM:11] Aetherling 2 [THS:90] Hero's Downfall 1 [M14:96] Doom Blade 1 [DGM:127] Far // Away diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Mar 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Mar 2014.mwDeck.dck index d109f21d9c..90117d5b91 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Mar 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Mar 2014.mwDeck.dck @@ -7,7 +7,7 @@ 4 [RTR:201] Supreme Verdict 4 [RTR:200] Sphinx's Revelation 4 [RTR:155] Detention Sphere -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 2 [M14:228] Mutavault 1 [BNG:25] Revoke Existence 2 [M14:96] Doom Blade diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST May 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST May 2014.mwDeck.dck index 286545eace..02e46cea9d 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST May 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST May 2014.mwDeck.dck @@ -11,7 +11,7 @@ 1 [RTR:145] Azorius Charm 4 [RTR:200] Sphinx's Revelation 3 [RTR:155] Detention Sphere -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 3 [THS:90] Hero's Downfall 1 [M14:228] Mutavault 4 [RTR:44] Jace, Architect of Thought diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Nov 2013.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Nov 2013.mwDeck.dck index 32518090e1..37052de2f5 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Nov 2013.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Nov 2013.mwDeck.dck @@ -9,7 +9,7 @@ 4 [RTR:200] Sphinx's Revelation 4 [RTR:155] Detention Sphere 2 [DGM:57] Blood Baron of Vizkopa -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 2 [THS:90] Hero's Downfall 4 [RTR:44] Jace, Architect of Thought 2 [M15:52] Divination diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Oct 2013.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Oct 2013.mwDeck.dck index ca6badb6c3..aaa838647f 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Oct 2013.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Esper Control TDtB ST Oct 2013.mwDeck.dck @@ -8,7 +8,7 @@ 3 [RTR:200] Sphinx's Revelation 4 [RTR:145] Azorius Charm 1 [RTR:155] Detention Sphere -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 4 [THS:90] Hero's Downfall 4 [M14:96] Doom Blade 4 [RTR:44] Jace, Architect of Thought @@ -20,7 +20,7 @@ SB: 2 [RTR:155] Detention Sphere SB: 2 [DGM:57] Blood Baron of Vizkopa SB: 1 [THS:49] Gainsay -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 1 [THS:107] Thoughtseize SB: 2 [M15:71] Negate SB: 2 [DGM:103] Sin Collector diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Prime Speaker Bant TDtB ST May 2013.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Prime Speaker Bant TDtB ST May 2013.mwDeck.dck index 5deeb90149..d0a73a5c07 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Prime Speaker Bant TDtB ST May 2013.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Prime Speaker Bant TDtB ST May 2013.mwDeck.dck @@ -23,7 +23,7 @@ SB: 1 [RTR:201] Supreme Verdict SB: 1 [C13:211] Selesnya Charm SB: 2 [M13:29] Rhox Faithmender -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 2 [RTR:148] Centaur Healer SB: 2 [M15:51] Dissipate SB: 1 [M13:22] Oblivion Ring diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Temur Aggro TDtB ST Dec 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Temur Aggro TDtB ST Dec 2014.mwDeck.dck index 6fb5b07ee9..cbbb3f4b4b 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Temur Aggro TDtB ST Dec 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Temur Aggro TDtB ST Dec 2014.mwDeck.dck @@ -24,7 +24,7 @@ SB: 1 [M15:169] Back to Nature SB: 1 [KTK:208] Temur Charm SB: 2 [THS:112] Anger of the Gods SB: 1 [KTK:42] Icy Blast -SB: 1 [BNG:143] Unravel the AEther +SB: 1 [BNG:143] Unravel the Aether SB: 1 [JOU:140] Setessan Tactics SB: 2 [M15:75] Polymorphist's Jest SB: 2 [KTK:37] Disdainful Stroke diff --git a/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST Feb 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST Feb 2014.mwDeck.dck index d8adbe4c36..18eb6fd746 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST Feb 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST Feb 2014.mwDeck.dck @@ -8,7 +8,7 @@ 4 [RTR:200] Sphinx's Revelation 4 [RTR:155] Detention Sphere 4 [C13:275] Azorius Guildgate -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 3 [M14:228] Mutavault 4 [RTR:44] Jace, Architect of Thought 5 [UNH:136] Plains diff --git a/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST May 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST May 2014.mwDeck.dck index aa98f81bf1..9368c34cea 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST May 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/UW Control TDtB ST May 2014.mwDeck.dck @@ -8,7 +8,7 @@ 3 [RTR:145] Azorius Charm 4 [RTR:200] Sphinx's Revelation 4 [C13:275] Azorius Guildgate -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 4 [M14:228] Mutavault 3 [RTR:44] Jace, Architect of Thought 4 [M15:52] Divination diff --git a/Mage.Client/release/sample-decks/Decks to Beat/UW Flash TDtB ST Jul 2013.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/UW Flash TDtB ST Jul 2013.mwDeck.dck index 960af27ae5..0f8b5322d3 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/UW Flash TDtB ST Jul 2013.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/UW Flash TDtB ST Jul 2013.mwDeck.dck @@ -21,7 +21,7 @@ SB: 1 [RTR:201] Supreme Verdict SB: 2 [AVR:34] Righteous Blow SB: 2 [ISD:27] Purify the Grave SB: 1 [DGM:5] Renounce the Guilds -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 2 [RTR:36] Dispel SB: 1 [RTR:44] Jace, Architect of Thought SB: 1 [M13:22] Oblivion Ring diff --git a/Mage.Client/release/sample-decks/Duel Decks/Elspeth vs. Tezzeret/Tezzeret.dck b/Mage.Client/release/sample-decks/Duel Decks/Elspeth vs. Tezzeret/Tezzeret.dck index 1090c105df..db0b51e96d 100644 --- a/Mage.Client/release/sample-decks/Duel Decks/Elspeth vs. Tezzeret/Tezzeret.dck +++ b/Mage.Client/release/sample-decks/Duel Decks/Elspeth vs. Tezzeret/Tezzeret.dck @@ -2,7 +2,7 @@ NAME:Tezzeret 1 [DDF:62] Elixir of Immortality 1 [DDF:63] Contagion Clasp 2 [DDF:60] Everflowing Chalice -1 [DDF:61] AEther Spellbomb +1 [DDF:61] Aether Spellbomb 1 [DDF:66] Echoing Truth 1 [DDF:67] Moonglove Extract 1 [DDF:64] Energy Chamber diff --git a/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Chandra/Jace.dck b/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Chandra/Jace.dck index 8ed346dc51..30d4d82b64 100644 --- a/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Chandra/Jace.dck +++ b/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Chandra/Jace.dck @@ -15,7 +15,7 @@ 1 [DD2:15] Riftwing Cloudskate 1 [DD2:7] Bottle Gnomes 1 [DD2:18] Brine Elemental -1 [DD2:17] AEthersnipe +1 [DD2:17] Aethersnipe 1 [DD2:19] Quicksilver Dragon 6 [DD2:31] Island 6 [DD2:32] Island diff --git a/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Vraska/Jace.dck b/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Vraska/Jace.dck index 6bf1d494e8..9be6ab6318 100644 --- a/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Vraska/Jace.dck +++ b/Mage.Client/release/sample-decks/Duel Decks/Jace vs. Vraska/Jace.dck @@ -14,7 +14,7 @@ NAME:Jace (Jace vs. Vraska) 1 [DDM:7] Dream Stalker 1 [DDM:20] Errant Ephemeron 1 [DDM:6] Crosstown Courier -1 [DDM:5] AEther Figment +1 [DDM:5] Aether Figment 4 [DDM:40] Island 1 [DDM:4] Phantasmal Bear 1 [DDM:3] Jace's Phantasm @@ -30,7 +30,7 @@ NAME:Jace (Jace vs. Vraska) 1 [DDM:14] Phantasmal Dragon 1 [DDM:15] Body Double 4 [DDM:37] Island -1 [DDM:12] AEther Adept +1 [DDM:12] Aether Adept 1 [DDM:34] Spelltwine 1 [DDM:35] Dread Statuary 1 [DDM:13] Archaeomancer diff --git a/Mage.Client/release/sample-decks/Duel Decks/Kiora vs. Elspeth/Kiora.dck b/Mage.Client/release/sample-decks/Duel Decks/Kiora vs. Elspeth/Kiora.dck index 441a6f46ef..0c44834121 100644 --- a/Mage.Client/release/sample-decks/Duel Decks/Kiora vs. Elspeth/Kiora.dck +++ b/Mage.Client/release/sample-decks/Duel Decks/Kiora vs. Elspeth/Kiora.dck @@ -3,7 +3,7 @@ 4 [DDO:35] Accumulated Knowledge 1 [DDO:34] Kiora, the Crashing Wave 1 [DDO:37] Inkwell Leviathan -1 [DDO:36] AEtherize +1 [DDO:36] Aetherize 1 [DDO:56] Simic Sky Swallower 1 [DDO:57] Urban Evolution 2 [DDO:58] Evolving Wilds diff --git a/Mage.Client/release/sample-decks/Duel Decks/Venser vs. Koth/Koth.dck b/Mage.Client/release/sample-decks/Duel Decks/Venser vs. Koth/Koth.dck index 8b57ee2ea6..e6404e0808 100644 --- a/Mage.Client/release/sample-decks/Duel Decks/Venser vs. Koth/Koth.dck +++ b/Mage.Client/release/sample-decks/Duel Decks/Venser vs. Koth/Koth.dck @@ -19,7 +19,7 @@ 2 [DDI:49] Fiery Hellhound 1 [DDI:67] Searing Blaze 1 [DDI:66] Vulshok Morningstar -1 [DDI:48] AEther Membrane +1 [DDI:48] Aether Membrane 1 [DDI:65] Journeyer's Kite 2 [DDI:47] Pilgrim's Eye 1 [DDI:46] Pygmy Pyrosaur diff --git a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Abzan Midrange 1 PT Khans of Tarkir (Honolulu) ST 10-12-14.dck b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Abzan Midrange 1 PT Khans of Tarkir (Honolulu) ST 10-12-14.dck index 5eb461c2df..009eb6b911 100644 --- a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Abzan Midrange 1 PT Khans of Tarkir (Honolulu) ST 10-12-14.dck +++ b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Abzan Midrange 1 PT Khans of Tarkir (Honolulu) ST 10-12-14.dck @@ -25,7 +25,7 @@ SB: 1 [KTK:174] Duneblast SB: 1 [M15:103] Liliana Vess SB: 2 [KTK:81] Murderous Cut SB: 1 [KTK:8] End Hostilities -SB: 1 [BNG:143] Unravel the AEther +SB: 1 [BNG:143] Unravel the Aether SB: 3 [BNG:65] Drown in Sorrow SB: 1 [M15:18] Mass Calcify SB: 2 [M15:187] Nissa, Worldwaker diff --git a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(1) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(1) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck index 914a8d00c1..ea56b923cd 100644 --- a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(1) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck +++ b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(1) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck @@ -3,7 +3,7 @@ 3 [MMA:198] Arcbound Ravager 1 [HOP:136] Seat of the Synod 4 [MRD:62] Disciple of the Vault -4 [DST:91] AEther Vial +4 [DST:91] Aether Vial 2 [MRD:286] Vault of Whispers 1 [FNMP:105] Myr Enforcer 1 [DDF:40] Arcbound Worker diff --git a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 1 PT Theros (Dublin) ST 10-13-13.dck b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 1 PT Theros (Dublin) ST 10-13-13.dck index 99901edebb..0770483798 100644 --- a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 1 PT Theros (Dublin) ST 10-13-13.dck +++ b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 1 PT Theros (Dublin) ST 10-13-13.dck @@ -13,7 +13,7 @@ 21 [UNH:137] Island 4 [THS:66] Thassa, God of the Sea SB: 1 [RTR:231] Pithing Needle -SB: 2 [DGM:11] AEtherling +SB: 2 [DGM:11] Aetherling SB: 2 [M14:215] Ratchet Bomb SB: 1 [THS:71] Triton Tactics SB: 3 [M15:83] Wall of Frost diff --git a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 34 PT Theros (Dublin) ST 10-13-13.dck b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 34 PT Theros (Dublin) ST 10-13-13.dck index d9c3c4c10c..64dc0623b7 100644 --- a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 34 PT Theros (Dublin) ST 10-13-13.dck +++ b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Devotion to Blue 34 PT Theros (Dublin) ST 10-13-13.dck @@ -15,7 +15,7 @@ SB: 1 [THS:57] Omenspeaker SB: 1 [THS:47] Dissolve SB: 3 [THS:49] Gainsay -SB: 2 [DGM:11] AEtherling +SB: 2 [DGM:11] Aetherling SB: 3 [GTC:44] Rapid Hybridization SB: 3 [RTR:44] Jace, Architect of Thought SB: 2 [M15:71] Negate diff --git a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Esper Control 58 PT Theros (Dublin) ST 10-13-13.dck b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Esper Control 58 PT Theros (Dublin) ST 10-13-13.dck index ca6badb6c3..aaa838647f 100644 --- a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Esper Control 58 PT Theros (Dublin) ST 10-13-13.dck +++ b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Esper Control 58 PT Theros (Dublin) ST 10-13-13.dck @@ -8,7 +8,7 @@ 3 [RTR:200] Sphinx's Revelation 4 [RTR:145] Azorius Charm 1 [RTR:155] Detention Sphere -1 [DGM:11] AEtherling +1 [DGM:11] Aetherling 4 [THS:90] Hero's Downfall 4 [M14:96] Doom Blade 4 [RTR:44] Jace, Architect of Thought @@ -20,7 +20,7 @@ SB: 2 [RTR:155] Detention Sphere SB: 2 [DGM:57] Blood Baron of Vizkopa SB: 1 [THS:49] Gainsay -SB: 1 [DGM:11] AEtherling +SB: 1 [DGM:11] Aetherling SB: 1 [THS:107] Thoughtseize SB: 2 [M15:71] Negate SB: 2 [DGM:103] Sin Collector diff --git a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/UB Control Dragonless 34 PT Dragons of Tarkir (Brussels) ST 4-12-15.dck b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/UB Control Dragonless 34 PT Dragons of Tarkir (Brussels) ST 4-12-15.dck index 265c316d9c..e459f7643e 100644 --- a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/UB Control Dragonless 34 PT Dragons of Tarkir (Brussels) ST 4-12-15.dck +++ b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/UB Control Dragonless 34 PT Dragons of Tarkir (Brussels) ST 4-12-15.dck @@ -16,7 +16,7 @@ 2 [THS:188] Ashiok, Nightmare Weaver 1 [BNG:163] Temple of Enlightenment 1 [BNG:65] Drown in Sorrow -1 [M15:44] AEtherspouts +1 [M15:44] Aetherspouts 1 [DTK:124] Ultimate Price 3 [M15:224] Perilous Vault 4 [FRF:168] Dismal Backwater @@ -25,7 +25,7 @@ 2 [JOU:82] Silence the Believers 3 [M15:245] Radiant Fountain SB: 1 [JOU:43] Interpret the Signs -SB: 1 [M15:44] AEtherspouts +SB: 1 [M15:44] Aetherspouts SB: 1 [KTK:49] Pearl Lake Ancient SB: 1 [FRF:87] Tasigur, the Golden Fang SB: 1 [KTK:218] Cranial Archive diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/AdamStyborskisPauperCube.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/AdamStyborskisPauperCube.java index f3b1c50b28..6d7a61caf1 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/AdamStyborskisPauperCube.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/AdamStyborskisPauperCube.java @@ -41,8 +41,8 @@ public AdamStyborskisPauperCube() { cubeCards.add(new CardIdentity("Act of Treason", "")); cubeCards.add(new CardIdentity("Adventuring Gear", "")); cubeCards.add(new CardIdentity("Aerie Ouphes", "")); - cubeCards.add(new CardIdentity("AEther Adept", "")); - cubeCards.add(new CardIdentity("AEthersnipe", "")); + cubeCards.add(new CardIdentity("Aether Adept", "")); + cubeCards.add(new CardIdentity("Aethersnipe", "")); cubeCards.add(new CardIdentity("Agony Warp", "")); cubeCards.add(new CardIdentity("Aim High", "")); cubeCards.add(new CardIdentity("Ambush Viper", "")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/BensCube.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/BensCube.java index 8843faed7b..52129f21a9 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/BensCube.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/BensCube.java @@ -37,16 +37,16 @@ public class BensCube extends DraftCube { public BensCube() { super("Ben's Cube (720 cards)"); // http://cubetutor.com/viewcube/1 - + cubeCards.add(new CardIdentity("Abrupt Decay", "")); cubeCards.add(new CardIdentity("Abyssal Persecutor", "")); cubeCards.add(new CardIdentity("Academy Rector", "")); cubeCards.add(new CardIdentity("Academy Ruins", "")); cubeCards.add(new CardIdentity("Accorder Paladin", "")); cubeCards.add(new CardIdentity("Acidic Slime", "")); - cubeCards.add(new CardIdentity("AEther Adept", "")); - cubeCards.add(new CardIdentity("AEther Vial", "")); - cubeCards.add(new CardIdentity("AEtherling", "")); + cubeCards.add(new CardIdentity("Aether Adept", "")); + cubeCards.add(new CardIdentity("Aether Vial", "")); + cubeCards.add(new CardIdentity("Aetherling", "")); cubeCards.add(new CardIdentity("Agony Warp", "")); cubeCards.add(new CardIdentity("Ajani Goldmane", "")); cubeCards.add(new CardIdentity("Ajani Steadfast", "")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor360Pauper.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor360Pauper.java index a0c748fcfb..306af892d6 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor360Pauper.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor360Pauper.java @@ -100,7 +100,7 @@ public class CubeTutor360Pauper extends DraftCube { cubeCards.add(new CardIdentity("Merfolk Looter","")); cubeCards.add(new CardIdentity("Thought Courier","")); cubeCards.add(new CardIdentity("Waterfront Bouncer","")); - cubeCards.add(new CardIdentity("AEther Adept","")); + cubeCards.add(new CardIdentity("Aether Adept","")); cubeCards.add(new CardIdentity("Calcite Snapper","")); cubeCards.add(new CardIdentity("Man-o'-War","")); cubeCards.add(new CardIdentity("Pestermite","")); @@ -117,7 +117,7 @@ public class CubeTutor360Pauper extends DraftCube { cubeCards.add(new CardIdentity("Gryff Vanguard","")); cubeCards.add(new CardIdentity("Mnemonic Wall","")); cubeCards.add(new CardIdentity("Mulldrifter","")); - cubeCards.add(new CardIdentity("AEthersnipe","")); + cubeCards.add(new CardIdentity("Aethersnipe","")); cubeCards.add(new CardIdentity("Errant Ephemeron","")); cubeCards.add(new CardIdentity("Spined Thopter","")); cubeCards.add(new CardIdentity("Brainstorm","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor720.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor720.java index 48c6cddb15..d4e0a52508 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor720.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeTutor720.java @@ -141,7 +141,7 @@ public class CubeTutor720 extends DraftCube { cubeCards.add(new CardIdentity("Snapcaster Mage","")); cubeCards.add(new CardIdentity("Waterfront Bouncer","")); cubeCards.add(new CardIdentity("Willbender","")); - cubeCards.add(new CardIdentity("AEther Adept","")); + cubeCards.add(new CardIdentity("Aether Adept","")); cubeCards.add(new CardIdentity("Kira, Great Glass-Spinner","")); cubeCards.add(new CardIdentity("Man-o'-War","")); cubeCards.add(new CardIdentity("Pestermite","")); @@ -160,7 +160,7 @@ public class CubeTutor720 extends DraftCube { cubeCards.add(new CardIdentity("Mulldrifter","")); cubeCards.add(new CardIdentity("Riftwing Cloudskate","")); cubeCards.add(new CardIdentity("Teferi, Mage of Zhalfir","")); - cubeCards.add(new CardIdentity("AEtherling","")); + cubeCards.add(new CardIdentity("Aetherling","")); cubeCards.add(new CardIdentity("Consecrated Sphinx","")); cubeCards.add(new CardIdentity("Frost Titan","")); cubeCards.add(new CardIdentity("Keiga, the Tide Star","")); @@ -599,7 +599,7 @@ public class CubeTutor720 extends DraftCube { cubeCards.add(new CardIdentity("Mox Pearl","")); cubeCards.add(new CardIdentity("Mox Ruby","")); cubeCards.add(new CardIdentity("Mox Sapphire","")); - cubeCards.add(new CardIdentity("AEther Vial","")); + cubeCards.add(new CardIdentity("Aether Vial","")); cubeCards.add(new CardIdentity("Basilisk Collar","")); cubeCards.add(new CardIdentity("Black Vise","")); cubeCards.add(new CardIdentity("Bonesplitter","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/JimDavisCube.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/JimDavisCube.java index e68e291245..bba8b1008f 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/JimDavisCube.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/JimDavisCube.java @@ -44,7 +44,7 @@ public class JimDavisCube extends DraftCube { cubeCards.add(new CardIdentity("Academy Ruins", "")); cubeCards.add(new CardIdentity("Accorder Paladin", "")); cubeCards.add(new CardIdentity("Advantageous Proclamation", "")); - cubeCards.add(new CardIdentity("AEther Vial", "")); + cubeCards.add(new CardIdentity("Aether Vial", "")); cubeCards.add(new CardIdentity("Agent of Acquisitions", "")); cubeCards.add(new CardIdentity("Ajani Vengeant", "")); cubeCards.add(new CardIdentity("Ancient Den", "")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCube.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCube.java index 5b64916b80..b5ae09b44d 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCube.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCube.java @@ -43,7 +43,7 @@ public class LegacyCube extends DraftCube { cubeCards.add(new CardIdentity("Acidic Slime","")); cubeCards.add(new CardIdentity("Act of Aggression","")); cubeCards.add(new CardIdentity("Adarkar Wastes","")); - cubeCards.add(new CardIdentity("AEther Vial","")); + cubeCards.add(new CardIdentity("Aether Vial","")); cubeCards.add(new CardIdentity("Ajani Goldmane","")); cubeCards.add(new CardIdentity("Ajani Steadfast","")); cubeCards.add(new CardIdentity("Ajani Vengeant","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeMarch2015.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeMarch2015.java index 402f1fee5b..7802266068 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeMarch2015.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeMarch2015.java @@ -43,7 +43,7 @@ public class LegacyCubeMarch2015 extends DraftCube { cubeCards.add(new DraftCube.CardIdentity("Acidic Slime","")); cubeCards.add(new DraftCube.CardIdentity("Act of Aggression","")); cubeCards.add(new DraftCube.CardIdentity("Adarkar Wastes","")); - cubeCards.add(new DraftCube.CardIdentity("AEther Vial","")); + cubeCards.add(new DraftCube.CardIdentity("Aether Vial","")); cubeCards.add(new DraftCube.CardIdentity("Ajani Goldmane","")); cubeCards.add(new DraftCube.CardIdentity("Ajani Vengeant","")); cubeCards.add(new DraftCube.CardIdentity("Ajani, Caller of the Pride","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeSeptember2015.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeSeptember2015.java index b9abc2cf4d..6eeb093cb6 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeSeptember2015.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/LegacyCubeSeptember2015.java @@ -46,7 +46,7 @@ public class LegacyCubeSeptember2015 extends DraftCube { cubeCards.add(new DraftCube.CardIdentity("Acidic Slime","")); cubeCards.add(new DraftCube.CardIdentity("Act of Aggression","")); cubeCards.add(new DraftCube.CardIdentity("Adarkar Wastes","")); - cubeCards.add(new DraftCube.CardIdentity("AEther Vial","")); + cubeCards.add(new DraftCube.CardIdentity("Aether Vial","")); cubeCards.add(new DraftCube.CardIdentity("Ainok Survivalist","")); cubeCards.add(new DraftCube.CardIdentity("Ajani Goldmane","")); cubeCards.add(new DraftCube.CardIdentity("Ajani Vengeant","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGCube.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGCube.java index 7595fbc7f9..c8fba82a90 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGCube.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGCube.java @@ -42,7 +42,7 @@ public class MTGCube extends DraftCube { cubeCards.add(new CardIdentity("Academy Ruins", "")); cubeCards.add(new CardIdentity("Accorder Paladin", "")); cubeCards.add(new CardIdentity("Acidic Slime", "")); - cubeCards.add(new CardIdentity("AEtherling", "")); + cubeCards.add(new CardIdentity("Aetherling", "")); cubeCards.add(new CardIdentity("Ajani Goldmane", "")); cubeCards.add(new CardIdentity("Ajani Vengeant", "")); cubeCards.add(new CardIdentity("Ancestral Recall", "")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGOMarchCube2014.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGOMarchCube2014.java index d2499ae6bd..216e962f31 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGOMarchCube2014.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MTGOMarchCube2014.java @@ -42,8 +42,8 @@ public class MTGOMarchCube2014 extends DraftCube { cubeCards.add(new CardIdentity("Academy Ruins","")); cubeCards.add(new CardIdentity("Acidic Slime","")); cubeCards.add(new CardIdentity("Adarkar Wastes","")); - cubeCards.add(new CardIdentity("AEther Vial","")); - cubeCards.add(new CardIdentity("AEtherling","")); + cubeCards.add(new CardIdentity("Aether Vial","")); + cubeCards.add(new CardIdentity("Aetherling","")); cubeCards.add(new CardIdentity("Ajani Goldmane","")); cubeCards.add(new CardIdentity("Ajani Vengeant","")); cubeCards.add(new CardIdentity("Ajani, Caller of the Pride","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MonoBlueCube.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MonoBlueCube.java index 483a3f1ab5..92a0947ce1 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MonoBlueCube.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/MonoBlueCube.java @@ -44,9 +44,9 @@ public class MonoBlueCube extends DraftCube { cubeCards.add(new CardIdentity("Adaptive Automaton","")); cubeCards.add(new CardIdentity("Aeolipile","")); cubeCards.add(new CardIdentity("Aeon Chronicler","")); - cubeCards.add(new CardIdentity("AEther Spellbomb","")); - cubeCards.add(new CardIdentity("AEther Vial","")); - cubeCards.add(new CardIdentity("AEtherling","")); + cubeCards.add(new CardIdentity("Aether Spellbomb","")); + cubeCards.add(new CardIdentity("Aether Vial","")); + cubeCards.add(new CardIdentity("Aetherling","")); cubeCards.add(new CardIdentity("All Is Dust","")); cubeCards.add(new CardIdentity("Ambassador Laquatus","")); cubeCards.add(new CardIdentity("Amnesia","")); @@ -377,7 +377,7 @@ public class MonoBlueCube extends DraftCube { cubeCards.add(new CardIdentity("Upheaval","")); cubeCards.add(new CardIdentity("Vapor Snag","")); cubeCards.add(new CardIdentity("Vaporkin","")); - cubeCards.add(new CardIdentity("Vedalken AEthermage","")); + cubeCards.add(new CardIdentity("Vedalken Aethermage","")); cubeCards.add(new CardIdentity("Vedalken Shackles","")); cubeCards.add(new CardIdentity("Veiled Serpent","")); cubeCards.add(new CardIdentity("Vendilion Clique","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/PeasantsToolboxCube.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/PeasantsToolboxCube.java index 8345632439..8dae9fa753 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/PeasantsToolboxCube.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/PeasantsToolboxCube.java @@ -43,10 +43,10 @@ public class PeasantsToolboxCube extends DraftCube { cubeCards.add(new CardIdentity("Acidic Slime", "")); cubeCards.add(new CardIdentity("Act of Aggression", "")); cubeCards.add(new CardIdentity("Aerie Worshippers", "")); - cubeCards.add(new CardIdentity("AEther Figment", "")); - cubeCards.add(new CardIdentity("AEther Vial", "")); - cubeCards.add(new CardIdentity("AEtherize", "")); - cubeCards.add(new CardIdentity("AEthersnipe", "")); + cubeCards.add(new CardIdentity("Aether Figment", "")); + cubeCards.add(new CardIdentity("Aether Vial", "")); + cubeCards.add(new CardIdentity("Aetherize", "")); + cubeCards.add(new CardIdentity("Aethersnipe", "")); cubeCards.add(new CardIdentity("Affa Guard Hound", "")); cubeCards.add(new CardIdentity("Agent of Acquisitions", "")); cubeCards.add(new CardIdentity("Agent of Horizons", "")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2013.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2013.java index e4956d476f..51636ea643 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2013.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2013.java @@ -158,7 +158,7 @@ public class VintageCube2013 extends DraftCube { cubeCards.add(new CardIdentity("Tamiyo, the Moon Sage","")); cubeCards.add(new CardIdentity("Timetwister","")); cubeCards.add(new CardIdentity("Show and Tell","")); - cubeCards.add(new CardIdentity("AEtherling","")); + cubeCards.add(new CardIdentity("Aetherling","")); cubeCards.add(new CardIdentity("Memory Lapse","")); cubeCards.add(new CardIdentity("Dream Halls","")); cubeCards.add(new CardIdentity("Opposition","")); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2014.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2014.java index 704326298e..aa4e44d8f8 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2014.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/VintageCube2014.java @@ -43,7 +43,7 @@ public class VintageCube2014 extends DraftCube { cubeCards.add(new CardIdentity("Accorder Paladin", "")); cubeCards.add(new CardIdentity("Acidic Slime", "")); cubeCards.add(new CardIdentity("Adarkar Wastes", "")); - cubeCards.add(new CardIdentity("AEther Vial", "")); + cubeCards.add(new CardIdentity("Aether Vial", "")); cubeCards.add(new CardIdentity("Ajani Goldmane", "")); cubeCards.add(new CardIdentity("Ajani Vengeant", "")); cubeCards.add(new CardIdentity("Ajani, Caller of the Pride", "")); diff --git a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AEthersnipe.java b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Aethersnipe.java similarity index 89% rename from Mage.Sets/src/mage/sets/anthologyjacevschandra/AEthersnipe.java rename to Mage.Sets/src/mage/sets/anthologyjacevschandra/Aethersnipe.java index 2a7694c040..878134539d 100644 --- a/Mage.Sets/src/mage/sets/anthologyjacevschandra/AEthersnipe.java +++ b/Mage.Sets/src/mage/sets/anthologyjacevschandra/Aethersnipe.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author fireshoes */ -public class AEthersnipe extends mage.sets.commander.AEthersnipe { +public class Aethersnipe extends mage.sets.commander.Aethersnipe { - public AEthersnipe(UUID ownerId) { + public Aethersnipe(UUID ownerId) { super(ownerId); this.cardNumber = "17"; this.expansionSetCode = "DD3JVC"; } - public AEthersnipe(final AEthersnipe card) { + public Aethersnipe(final Aethersnipe card) { super(card); } @Override - public AEthersnipe copy() { - return new AEthersnipe(this); + public Aethersnipe copy() { + return new Aethersnipe(this); } } diff --git a/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java b/Mage.Sets/src/mage/sets/apocalypse/AetherMutation.java similarity index 90% rename from Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java rename to Mage.Sets/src/mage/sets/apocalypse/AetherMutation.java index 16dcf15e57..1229a095f7 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AetherMutation.java @@ -41,10 +41,10 @@ import mage.target.common.TargetCreaturePermanent; * * @author North */ -public class AEtherMutation extends CardImpl { +public class AetherMutation extends CardImpl { - public AEtherMutation(UUID ownerId) { - super(ownerId, 91, "AEther Mutation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{U}"); + public AetherMutation(UUID ownerId) { + super(ownerId, 91, "Aether Mutation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{U}"); this.expansionSetCode = "APC"; @@ -55,12 +55,12 @@ public class AEtherMutation extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } - public AEtherMutation(final AEtherMutation card) { + public AetherMutation(final AetherMutation card) { super(card); } @Override - public AEtherMutation copy() { - return new AEtherMutation(this); + public AetherMutation copy() { + return new AetherMutation(this); } } diff --git a/Mage.Sets/src/mage/sets/archenemy/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/archenemy/AetherSpellbomb.java similarity index 87% rename from Mage.Sets/src/mage/sets/archenemy/AEtherSpellbomb.java rename to Mage.Sets/src/mage/sets/archenemy/AetherSpellbomb.java index 27745f1906..c090668a9b 100644 --- a/Mage.Sets/src/mage/sets/archenemy/AEtherSpellbomb.java +++ b/Mage.Sets/src/mage/sets/archenemy/AetherSpellbomb.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEtherSpellbomb extends mage.sets.elspethvstezzeret.AEtherSpellbomb { +public class AetherSpellbomb extends mage.sets.elspethvstezzeret.AetherSpellbomb { - public AEtherSpellbomb(UUID ownerId) { + public AetherSpellbomb(UUID ownerId) { super(ownerId); this.cardNumber = "102"; this.expansionSetCode = "ARC"; } - public AEtherSpellbomb(final AEtherSpellbomb card) { + public AetherSpellbomb(final AetherSpellbomb card) { super(card); } @Override - public AEtherSpellbomb copy() { - return new AEtherSpellbomb(this); + public AetherSpellbomb copy() { + return new AetherSpellbomb(this); } } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java b/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java index 55a4a3e1fe..9942531b9d 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java @@ -107,7 +107,7 @@ class BrimazKingOfOreskosEffect extends OneShotEffect { token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); Permanent attackingCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (attackingCreature != null && game.getState().getCombat() != null) { - // Possible ruling (see Ætherplasm) + // Possible ruling (see Aetherplasm) // The token you put onto the battlefield is blocking the attacking creature, // even if the block couldn't legally be declared (for example, if that creature // enters the battlefield tapped, or it can't block, or the attacking creature diff --git a/Mage.Sets/src/mage/sets/bornofthegods/UnravelTheAEther.java b/Mage.Sets/src/mage/sets/bornofthegods/UnravelTheAether.java similarity index 90% rename from Mage.Sets/src/mage/sets/bornofthegods/UnravelTheAEther.java rename to Mage.Sets/src/mage/sets/bornofthegods/UnravelTheAether.java index a46729f424..4087e4fed5 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/UnravelTheAEther.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/UnravelTheAether.java @@ -41,7 +41,7 @@ import mage.target.TargetPermanent; * * @author LevelX2 */ -public class UnravelTheAEther extends CardImpl { +public class UnravelTheAether extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); @@ -49,8 +49,8 @@ public class UnravelTheAEther extends CardImpl { filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.ENCHANTMENT))); } - public UnravelTheAEther(UUID ownerId) { - super(ownerId, 143, "Unravel the AEther", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); + public UnravelTheAether(UUID ownerId) { + super(ownerId, 143, "Unravel the Aether", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "BNG"; // Choose target artifact or enchantment. Its owner shuffles it into his or her library. @@ -58,12 +58,12 @@ public class UnravelTheAEther extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(1, 1, filter, true)); } - public UnravelTheAEther(final UnravelTheAEther card) { + public UnravelTheAether(final UnravelTheAether card) { super(card); } @Override - public UnravelTheAEther copy() { - return new UnravelTheAEther(this); + public UnravelTheAether copy() { + return new UnravelTheAether(this); } } diff --git a/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java b/Mage.Sets/src/mage/sets/classicsixthedition/AetherFlash.java similarity index 89% rename from Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java rename to Mage.Sets/src/mage/sets/classicsixthedition/AetherFlash.java index 428a34b9dc..c29d6d8a3d 100644 --- a/Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java +++ b/Mage.Sets/src/mage/sets/classicsixthedition/AetherFlash.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author Quercitron */ -public class AEtherFlash extends mage.sets.seventhedition.AEtherFlash { +public class AetherFlash extends mage.sets.seventhedition.AetherFlash { - public AEtherFlash(UUID ownerId) { + public AetherFlash(UUID ownerId) { super(ownerId); this.cardNumber = "163"; this.expansionSetCode = "6ED"; } - public AEtherFlash(final AEtherFlash card) { + public AetherFlash(final AetherFlash card) { super(card); } @Override - public AEtherFlash copy() { - return new AEtherFlash(this); + public AetherFlash copy() { + return new AetherFlash(this); } } diff --git a/Mage.Sets/src/mage/sets/coldsnap/SurgingAEther.java b/Mage.Sets/src/mage/sets/coldsnap/SurgingAether.java similarity index 89% rename from Mage.Sets/src/mage/sets/coldsnap/SurgingAEther.java rename to Mage.Sets/src/mage/sets/coldsnap/SurgingAether.java index 49a2b4d079..aaf5166965 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/SurgingAEther.java +++ b/Mage.Sets/src/mage/sets/coldsnap/SurgingAether.java @@ -39,10 +39,10 @@ import mage.target.TargetPermanent; * * @author LoneFox */ -public class SurgingAEther extends CardImpl { +public class SurgingAether extends CardImpl { - public SurgingAEther(UUID ownerId) { - super(ownerId, 47, "Surging AEther", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); + public SurgingAether(UUID ownerId) { + super(ownerId, 47, "Surging Aether", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "CSP"; // Ripple 4 @@ -52,12 +52,12 @@ public class SurgingAEther extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent()); } - public SurgingAEther(final SurgingAEther card) { + public SurgingAether(final SurgingAether card) { super(card); } @Override - public SurgingAEther copy() { - return new SurgingAEther(this); + public SurgingAether copy() { + return new SurgingAether(this); } } diff --git a/Mage.Sets/src/mage/sets/commander/AEthersnipe.java b/Mage.Sets/src/mage/sets/commander/Aethersnipe.java similarity index 89% rename from Mage.Sets/src/mage/sets/commander/AEthersnipe.java rename to Mage.Sets/src/mage/sets/commander/Aethersnipe.java index 667ea3081e..7f1acc9888 100644 --- a/Mage.Sets/src/mage/sets/commander/AEthersnipe.java +++ b/Mage.Sets/src/mage/sets/commander/Aethersnipe.java @@ -43,17 +43,17 @@ import mage.target.common.TargetNonlandPermanent; * * @author LevelX2 */ -public class AEthersnipe extends CardImpl { +public class Aethersnipe extends CardImpl { - public AEthersnipe(UUID ownerId) { - super(ownerId, 39, "AEthersnipe", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{U}"); + public Aethersnipe(UUID ownerId) { + super(ownerId, 39, "Aethersnipe", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{U}"); this.expansionSetCode = "CMD"; this.subtype.add("Elemental"); this.power = new MageInt(4); this.toughness = new MageInt(4); - // When AEthersnipe enters the battlefield, return target nonland permanent to its owner's hand. + // When Aethersnipe enters the battlefield, return target nonland permanent to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); Target target = new TargetNonlandPermanent(); ability.addTarget(target); @@ -63,12 +63,12 @@ public class AEthersnipe extends CardImpl { this.addAbility(new EvokeAbility(this, "{1}{U}{U}")); } - public AEthersnipe(final AEthersnipe card) { + public Aethersnipe(final Aethersnipe card) { super(card); } @Override - public AEthersnipe copy() { - return new AEthersnipe(this); + public Aethersnipe copy() { + return new Aethersnipe(this); } } diff --git a/Mage.Sets/src/mage/sets/commander2013/AEthermagesTouch.java b/Mage.Sets/src/mage/sets/commander2013/AethermagesTouch.java similarity index 89% rename from Mage.Sets/src/mage/sets/commander2013/AEthermagesTouch.java rename to Mage.Sets/src/mage/sets/commander2013/AethermagesTouch.java index 7114647145..d2ee6ee316 100644 --- a/Mage.Sets/src/mage/sets/commander2013/AEthermagesTouch.java +++ b/Mage.Sets/src/mage/sets/commander2013/AethermagesTouch.java @@ -54,42 +54,42 @@ import mage.target.targetpointer.FixedTarget; * * @author LevelX2 */ -public class AEthermagesTouch extends CardImpl { +public class AethermagesTouch extends CardImpl { - public AEthermagesTouch(UUID ownerId) { - super(ownerId, 176, "AEthermage's Touch", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{W}{U}"); + public AethermagesTouch(UUID ownerId) { + super(ownerId, 176, "Aethermage's Touch", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{W}{U}"); this.expansionSetCode = "C13"; // Reveal the top four cards of your library. You may put a creature card from among them onto the battlefield. It gains "At the beginning of your end step, return this creature to its owner's hand." Then put the rest of the cards revealed this way on the bottom of your library in any order. - this.getSpellAbility().addEffect(new AEthermagesTouchEffect()); + this.getSpellAbility().addEffect(new AethermagesTouchEffect()); } - public AEthermagesTouch(final AEthermagesTouch card) { + public AethermagesTouch(final AethermagesTouch card) { super(card); } @Override - public AEthermagesTouch copy() { - return new AEthermagesTouch(this); + public AethermagesTouch copy() { + return new AethermagesTouch(this); } } -class AEthermagesTouchEffect extends OneShotEffect { +class AethermagesTouchEffect extends OneShotEffect { private static final FilterCreatureCard filterPutOntoBattlefield = new FilterCreatureCard("a creature card to put onto the battlefield"); - public AEthermagesTouchEffect() { + public AethermagesTouchEffect() { super(Outcome.DrawCard); this.staticText = "Reveal the top four cards of your library. You may put a creature card from among them onto the battlefield. It gains \"At the beginning of your end step, return this creature to its owner's hand.\" Then put the rest of the cards revealed this way on the bottom of your library in any order"; } - public AEthermagesTouchEffect(final AEthermagesTouchEffect effect) { + public AethermagesTouchEffect(final AethermagesTouchEffect effect) { super(effect); } @Override - public AEthermagesTouchEffect copy() { - return new AEthermagesTouchEffect(this); + public AethermagesTouchEffect copy() { + return new AethermagesTouchEffect(this); } @Override @@ -111,7 +111,7 @@ class AEthermagesTouchEffect extends OneShotEffect { } if (!cards.isEmpty()) { - player.revealCards("AEthermage's Touch", cards, game); + player.revealCards("Aethermage's Touch", cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, filterPutOntoBattlefield); if (properCardFound && player.choose(Outcome.PutCreatureInPlay, cards, target, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/commander2014/AEtherGale.java b/Mage.Sets/src/mage/sets/commander2014/AetherGale.java similarity index 90% rename from Mage.Sets/src/mage/sets/commander2014/AEtherGale.java rename to Mage.Sets/src/mage/sets/commander2014/AetherGale.java index 21b37652b0..6448222b13 100644 --- a/Mage.Sets/src/mage/sets/commander2014/AEtherGale.java +++ b/Mage.Sets/src/mage/sets/commander2014/AetherGale.java @@ -39,10 +39,10 @@ import mage.target.common.TargetNonlandPermanent; * * @author LevelX2 */ -public class AEtherGale extends CardImpl { +public class AetherGale extends CardImpl { - public AEtherGale(UUID ownerId) { - super(ownerId, 11, "AEther Gale", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); + public AetherGale(UUID ownerId) { + super(ownerId, 11, "Aether Gale", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "C14"; @@ -51,12 +51,12 @@ public class AEtherGale extends CardImpl { this.getSpellAbility().addTarget(new TargetNonlandPermanent(6,6, new FilterNonlandPermanent(), false)); } - public AEtherGale(final AEtherGale card) { + public AetherGale(final AetherGale card) { super(card); } @Override - public AEtherGale copy() { - return new AEtherGale(this); + public AetherGale copy() { + return new AetherGale(this); } } diff --git a/Mage.Sets/src/mage/sets/commander2014/AEtherSnap.java b/Mage.Sets/src/mage/sets/commander2014/AetherSnap.java similarity index 86% rename from Mage.Sets/src/mage/sets/commander2014/AEtherSnap.java rename to Mage.Sets/src/mage/sets/commander2014/AetherSnap.java index 7cae9c21f5..c87b700b0d 100644 --- a/Mage.Sets/src/mage/sets/commander2014/AEtherSnap.java +++ b/Mage.Sets/src/mage/sets/commander2014/AetherSnap.java @@ -47,40 +47,40 @@ import mage.players.Player; * * @author LevelX2 */ -public class AEtherSnap extends CardImpl { +public class AetherSnap extends CardImpl { - public AEtherSnap(UUID ownerId) { - super(ownerId, 133, "AEther Snap", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); + public AetherSnap(UUID ownerId) { + super(ownerId, 133, "Aether Snap", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "C14"; // Remove all counters from all permanents and exile all tokens. - this.getSpellAbility().addEffect(new AEtherSnapEffect()); + this.getSpellAbility().addEffect(new AetherSnapEffect()); } - public AEtherSnap(final AEtherSnap card) { + public AetherSnap(final AetherSnap card) { super(card); } @Override - public AEtherSnap copy() { - return new AEtherSnap(this); + public AetherSnap copy() { + return new AetherSnap(this); } } -class AEtherSnapEffect extends OneShotEffect { +class AetherSnapEffect extends OneShotEffect { - public AEtherSnapEffect() { + public AetherSnapEffect() { super(Outcome.Benefit); this.staticText = "Remove all counters from all permanents and exile all tokens"; } - public AEtherSnapEffect(final AEtherSnapEffect effect) { + public AetherSnapEffect(final AetherSnapEffect effect) { super(effect); } @Override - public AEtherSnapEffect copy() { - return new AEtherSnapEffect(this); + public AetherSnapEffect copy() { + return new AetherSnapEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/commander2015/AEtherize.java b/Mage.Sets/src/mage/sets/commander2015/Aetherize.java similarity index 89% rename from Mage.Sets/src/mage/sets/commander2015/AEtherize.java rename to Mage.Sets/src/mage/sets/commander2015/Aetherize.java index 1cdecf9a0a..0b76ff467a 100644 --- a/Mage.Sets/src/mage/sets/commander2015/AEtherize.java +++ b/Mage.Sets/src/mage/sets/commander2015/Aetherize.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author fireshoes */ -public class AEtherize extends mage.sets.gatecrash.AEtherize { +public class Aetherize extends mage.sets.gatecrash.Aetherize { - public AEtherize(UUID ownerId) { + public Aetherize(UUID ownerId) { super(ownerId); this.cardNumber = "85"; this.expansionSetCode = "C15"; } - public AEtherize(final AEtherize card) { + public Aetherize(final Aetherize card) { super(card); } @Override - public AEtherize copy() { - return new AEtherize(this); + public Aetherize copy() { + return new Aetherize(this); } } diff --git a/Mage.Sets/src/mage/sets/commander2015/AEthersnatch.java b/Mage.Sets/src/mage/sets/commander2015/Aethersnatch.java similarity index 84% rename from Mage.Sets/src/mage/sets/commander2015/AEthersnatch.java rename to Mage.Sets/src/mage/sets/commander2015/Aethersnatch.java index 5ec26767bb..f80b633423 100644 --- a/Mage.Sets/src/mage/sets/commander2015/AEthersnatch.java +++ b/Mage.Sets/src/mage/sets/commander2015/Aethersnatch.java @@ -43,41 +43,41 @@ import mage.target.TargetSpell; * * @author emerald000 */ -public class AEthersnatch extends CardImpl { +public class Aethersnatch extends CardImpl { - public AEthersnatch(UUID ownerId) { - super(ownerId, 9, "AEthersnatch", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{4}{U}{U}"); + public Aethersnatch(UUID ownerId) { + super(ownerId, 9, "Aethersnatch", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{4}{U}{U}"); this.expansionSetCode = "C15"; // Gain control of target spell. You may choose new targets for it. - this.getSpellAbility().addEffect(new AEthersnatchEffect()); + this.getSpellAbility().addEffect(new AethersnatchEffect()); this.getSpellAbility().addTarget(new TargetSpell()); } - public AEthersnatch(final AEthersnatch card) { + public Aethersnatch(final Aethersnatch card) { super(card); } @Override - public AEthersnatch copy() { - return new AEthersnatch(this); + public Aethersnatch copy() { + return new Aethersnatch(this); } } -class AEthersnatchEffect extends OneShotEffect { +class AethersnatchEffect extends OneShotEffect { - AEthersnatchEffect() { + AethersnatchEffect() { super(Outcome.GainControl); this.staticText = "Gain control of target spell. You may choose new targets for it"; } - AEthersnatchEffect(final AEthersnatchEffect effect) { + AethersnatchEffect(final AethersnatchEffect effect) { super(effect); } @Override - public AEthersnatchEffect copy() { - return new AEthersnatchEffect(this); + public AethersnatchEffect copy() { + return new AethersnatchEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/conflux/ScornfulAEtherLich.java b/Mage.Sets/src/mage/sets/conflux/ScornfulAetherLich.java similarity index 88% rename from Mage.Sets/src/mage/sets/conflux/ScornfulAEtherLich.java rename to Mage.Sets/src/mage/sets/conflux/ScornfulAetherLich.java index 01550f0433..668cf35ca7 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScornfulAEtherLich.java +++ b/Mage.Sets/src/mage/sets/conflux/ScornfulAetherLich.java @@ -46,10 +46,10 @@ import mage.constants.Zone; * * @author Loki */ -public class ScornfulAEtherLich extends CardImpl { +public class ScornfulAetherLich extends CardImpl { - public ScornfulAEtherLich(UUID ownerId) { - super(ownerId, 34, "Scornful AEther-Lich", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{U}"); + public ScornfulAetherLich(UUID ownerId) { + super(ownerId, 34, "Scornful Aether-Lich", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "CON"; this.subtype.add("Zombie"); this.subtype.add("Wizard"); @@ -57,18 +57,18 @@ public class ScornfulAEtherLich extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - // {W}{B}: Scornful AEther-Lich gains fear and vigilance until end of turn. + // {W}{B}: Scornful Aether-Lich gains fear and vigilance until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}{B}")); ability.addEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); } - public ScornfulAEtherLich(final ScornfulAEtherLich card) { + public ScornfulAetherLich(final ScornfulAetherLich card) { super(card); } @Override - public ScornfulAEtherLich copy() { - return new ScornfulAEtherLich(this); + public ScornfulAetherLich copy() { + return new ScornfulAetherLich(this); } } diff --git a/Mage.Sets/src/mage/sets/conspiracy/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/conspiracy/AetherTradewinds.java similarity index 88% rename from Mage.Sets/src/mage/sets/conspiracy/AEtherTradewinds.java rename to Mage.Sets/src/mage/sets/conspiracy/AetherTradewinds.java index 4d87581e8b..be52f4cf7c 100644 --- a/Mage.Sets/src/mage/sets/conspiracy/AEtherTradewinds.java +++ b/Mage.Sets/src/mage/sets/conspiracy/AetherTradewinds.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEtherTradewinds extends mage.sets.worldwake.AEtherTradewinds { +public class AetherTradewinds extends mage.sets.worldwake.AetherTradewinds { - public AEtherTradewinds(UUID ownerId) { + public AetherTradewinds(UUID ownerId) { super(ownerId); this.cardNumber = "89"; this.expansionSetCode = "CNS"; } - public AEtherTradewinds(final AEtherTradewinds card) { + public AetherTradewinds(final AetherTradewinds card) { super(card); } @Override - public AEtherTradewinds copy() { - return new AEtherTradewinds(this); + public AetherTradewinds copy() { + return new AetherTradewinds(this); } } diff --git a/Mage.Sets/src/mage/sets/darksteel/AEtherSnap.java b/Mage.Sets/src/mage/sets/darksteel/AetherSnap.java similarity index 89% rename from Mage.Sets/src/mage/sets/darksteel/AEtherSnap.java rename to Mage.Sets/src/mage/sets/darksteel/AetherSnap.java index 3f095f1414..0d96edc69e 100644 --- a/Mage.Sets/src/mage/sets/darksteel/AEtherSnap.java +++ b/Mage.Sets/src/mage/sets/darksteel/AetherSnap.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEtherSnap extends mage.sets.commander2014.AEtherSnap { +public class AetherSnap extends mage.sets.commander2014.AetherSnap { - public AEtherSnap(UUID ownerId) { + public AetherSnap(UUID ownerId) { super(ownerId); this.cardNumber = "37"; this.expansionSetCode = "DST"; } - public AEtherSnap(final AEtherSnap card) { + public AetherSnap(final AetherSnap card) { super(card); } @Override - public AEtherSnap copy() { - return new AEtherSnap(this); + public AetherSnap copy() { + return new AetherSnap(this); } } diff --git a/Mage.Sets/src/mage/sets/darksteel/AEtherVial.java b/Mage.Sets/src/mage/sets/darksteel/AetherVial.java similarity index 88% rename from Mage.Sets/src/mage/sets/darksteel/AEtherVial.java rename to Mage.Sets/src/mage/sets/darksteel/AetherVial.java index d396249c52..ee3e47d380 100644 --- a/Mage.Sets/src/mage/sets/darksteel/AEtherVial.java +++ b/Mage.Sets/src/mage/sets/darksteel/AetherVial.java @@ -54,42 +54,42 @@ import mage.target.common.TargetCardInHand; * * @author North */ -public class AEtherVial extends CardImpl { +public class AetherVial extends CardImpl { - public AEtherVial(UUID ownerId) { - super(ownerId, 91, "AEther Vial", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); + public AetherVial(UUID ownerId) { + super(ownerId, 91, "Aether Vial", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "DST"; - // At the beginning of your upkeep, you may put a charge counter on AEther Vial. + // 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), TargetController.YOU, 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())); + // {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())); } - public AEtherVial(final AEtherVial card) { + public AetherVial(final AetherVial card) { super(card); } @Override - public AEtherVial copy() { - return new AEtherVial(this); + public AetherVial copy() { + return new AetherVial(this); } } -class AEtherVialEffect extends OneShotEffect { +class AetherVialEffect extends OneShotEffect { - public AEtherVialEffect() { + public AetherVialEffect() { super(Outcome.PutCreatureInPlay); this.staticText = "You may put a creature card with converted mana cost equal to the number of charge counters on {this} from your hand onto the battlefield"; } - public AEtherVialEffect(final AEtherVialEffect effect) { + public AetherVialEffect(final AetherVialEffect effect) { super(effect); } @Override - public AEtherVialEffect copy() { - return new AEtherVialEffect(this); + public AetherVialEffect copy() { + return new AetherVialEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/dissension/AEthermagesTouch.java b/Mage.Sets/src/mage/sets/dissension/AethermagesTouch.java similarity index 88% rename from Mage.Sets/src/mage/sets/dissension/AEthermagesTouch.java rename to Mage.Sets/src/mage/sets/dissension/AethermagesTouch.java index 79f6dd8e79..1cfc09a54a 100644 --- a/Mage.Sets/src/mage/sets/dissension/AEthermagesTouch.java +++ b/Mage.Sets/src/mage/sets/dissension/AethermagesTouch.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEthermagesTouch extends mage.sets.commander2013.AEthermagesTouch { +public class AethermagesTouch extends mage.sets.commander2013.AethermagesTouch { - public AEthermagesTouch(UUID ownerId) { + public AethermagesTouch(UUID ownerId) { super(ownerId); this.cardNumber = "101"; this.expansionSetCode = "DIS"; } - public AEthermagesTouch(final AEthermagesTouch card) { + public AethermagesTouch(final AethermagesTouch card) { super(card); } @Override - public AEthermagesTouch copy() { - return new AEthermagesTouch(this); + public AethermagesTouch copy() { + return new AethermagesTouch(this); } } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java b/Mage.Sets/src/mage/sets/dragonsmaze/Aetherling.java similarity index 86% rename from Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java rename to Mage.Sets/src/mage/sets/dragonsmaze/Aetherling.java index dabcd618ce..95256a0de5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AEtherling.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Aetherling.java @@ -44,33 +44,33 @@ import mage.constants.Zone; * * @author LevelX2 */ -public class AEtherling extends CardImpl { +public class Aetherling extends CardImpl { - public AEtherling(UUID ownerId) { - super(ownerId, 11, "AEtherling", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); + public Aetherling(UUID ownerId) { + super(ownerId, 11, "Aetherling", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "DGM"; this.subtype.add("Shapeshifter"); this.power = new MageInt(4); 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. + // {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(true), new ManaCostsImpl("{U}"))); - // {U}: AEtherling can't be blocked this turn + // {U}: Aetherling can't be blocked this turn this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{U}"))); - // {1}: AEtherling gets +1/-1 until end of turn. + // {1}: Aetherling gets +1/-1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{1}"))); - // {1}: AEtherling gets -1/+1 until end of turn + // {1}: Aetherling gets -1/+1 until end of turn this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}"))); } - public AEtherling(final AEtherling card) { + public Aetherling(final Aetherling card) { super(card); } @Override - public AEtherling copy() { - return new AEtherling(this); + public Aetherling copy() { + return new Aetherling(this); } } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/ObscuringAEther.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/ObscuringAether.java similarity index 88% rename from Mage.Sets/src/mage/sets/dragonsoftarkir/ObscuringAEther.java rename to Mage.Sets/src/mage/sets/dragonsoftarkir/ObscuringAether.java index da22b6248f..513ca018a1 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/ObscuringAEther.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/ObscuringAether.java @@ -46,7 +46,7 @@ import mage.filter.predicate.other.FaceDownPredicate; * * @author LevelX2 */ -public class ObscuringAEther extends CardImpl { +public class ObscuringAether extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Face-down creature spells"); @@ -54,26 +54,26 @@ public class ObscuringAEther extends CardImpl { filter.add(new FaceDownPredicate()); } - public ObscuringAEther(UUID ownerId) { - super(ownerId, 194, "Obscuring AEther", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); + public ObscuringAether(UUID ownerId) { + super(ownerId, 194, "Obscuring Aether", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "DTK"; // Face-down creature spells you cast cost {1} less to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); - // {1}{G}: Turn Obscuring AEther face down. + // {1}{G}: Turn Obscuring Aether face down. Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL); - effect.setText("Turn Obscuring AEther face down. (It becomes a 2/2 creature.)"); + effect.setText("Turn Obscuring Aether face down. (It becomes a 2/2 creature.)"); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{G}"))); } - public ObscuringAEther(final ObscuringAEther card) { + public ObscuringAether(final ObscuringAether card) { super(card); } @Override - public ObscuringAEther copy() { - return new ObscuringAEther(this); + public ObscuringAether copy() { + return new ObscuringAether(this); } } diff --git a/Mage.Sets/src/mage/sets/elspethvskiora/AEtherize.java b/Mage.Sets/src/mage/sets/elspethvskiora/Aetherize.java similarity index 89% rename from Mage.Sets/src/mage/sets/elspethvskiora/AEtherize.java rename to Mage.Sets/src/mage/sets/elspethvskiora/Aetherize.java index 709c5c3ea9..bd487ed34b 100644 --- a/Mage.Sets/src/mage/sets/elspethvskiora/AEtherize.java +++ b/Mage.Sets/src/mage/sets/elspethvskiora/Aetherize.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author fireshoes */ -public class AEtherize extends mage.sets.gatecrash.AEtherize { +public class Aetherize extends mage.sets.gatecrash.Aetherize { - public AEtherize(UUID ownerId) { + public Aetherize(UUID ownerId) { super(ownerId); this.cardNumber = "36"; this.expansionSetCode = "DDO"; } - public AEtherize(final AEtherize card) { + public Aetherize(final Aetherize card) { super(card); } @Override - public AEtherize copy() { - return new AEtherize(this); + public Aetherize copy() { + return new Aetherize(this); } } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/AetherSpellbomb.java similarity index 87% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/AetherSpellbomb.java index c6a77fa536..13949e2b45 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/AetherSpellbomb.java @@ -44,31 +44,31 @@ import mage.target.common.TargetCreaturePermanent; * * @author Backfir3 */ -public class AEtherSpellbomb extends CardImpl { +public class AetherSpellbomb extends CardImpl { - public AEtherSpellbomb(UUID ownerId) { - super(ownerId, 61, "AEther Spellbomb", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); + public AetherSpellbomb(UUID ownerId) { + super(ownerId, 61, "Aether Spellbomb", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "DDF"; - //{U}, Sacrifice Æther Spellbomb: Return target creature to its owner's hand. + //{U}, Sacrifice Aether Spellbomb: Return target creature to its owner's hand. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - //{1}, Sacrifice Æther Spellbomb: Draw a card. + //{1}, Sacrifice Aether Spellbomb: Draw a card. SimpleActivatedAbility drawCardAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); drawCardAbility.addCost(new SacrificeSourceCost()); this.addAbility(drawCardAbility); } - public AEtherSpellbomb(final AEtherSpellbomb card) { + public AetherSpellbomb(final AetherSpellbomb card) { super(card); } @Override - public AEtherSpellbomb copy() { - return new AEtherSpellbomb(this); + public AetherSpellbomb copy() { + return new AetherSpellbomb(this); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java b/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAether.java similarity index 87% rename from Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java rename to Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAether.java index b8ab7fa740..b9d9e8acff 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAEther.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FoldIntoAether.java @@ -47,41 +47,41 @@ import mage.target.common.TargetCardInHand; * * @author North */ -public class FoldIntoAEther extends CardImpl { +public class FoldIntoAether extends CardImpl { - public FoldIntoAEther(UUID ownerId) { - super(ownerId, 31, "Fold into AEther", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); + public FoldIntoAether(UUID ownerId) { + super(ownerId, 31, "Fold into Aether", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "5DN"; // Counter target spell. If that spell is countered this way, its controller may put a creature card from his or her hand onto the battlefield. - this.getSpellAbility().addEffect(new FoldIntoAEtherEffect()); + this.getSpellAbility().addEffect(new FoldIntoAetherEffect()); this.getSpellAbility().addTarget(new TargetSpell()); } - public FoldIntoAEther(final FoldIntoAEther card) { + public FoldIntoAether(final FoldIntoAether card) { super(card); } @Override - public FoldIntoAEther copy() { - return new FoldIntoAEther(this); + public FoldIntoAether copy() { + return new FoldIntoAether(this); } } -class FoldIntoAEtherEffect extends OneShotEffect { +class FoldIntoAetherEffect extends OneShotEffect { - public FoldIntoAEtherEffect() { + public FoldIntoAetherEffect() { super(Outcome.Detriment); this.staticText = "Counter target spell. If that spell is countered this way, its controller may put a creature card from his or her hand onto the battlefield"; } - public FoldIntoAEtherEffect(final FoldIntoAEtherEffect effect) { + public FoldIntoAetherEffect(final FoldIntoAetherEffect effect) { super(effect); } @Override - public FoldIntoAEtherEffect copy() { - return new FoldIntoAEtherEffect(this); + public FoldIntoAetherEffect copy() { + return new FoldIntoAetherEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/ftvrelics/AEtherVial.java b/Mage.Sets/src/mage/sets/ftvrelics/AetherVial.java similarity index 90% rename from Mage.Sets/src/mage/sets/ftvrelics/AEtherVial.java rename to Mage.Sets/src/mage/sets/ftvrelics/AetherVial.java index 8bb4af5e0c..d596e9ece6 100644 --- a/Mage.Sets/src/mage/sets/ftvrelics/AEtherVial.java +++ b/Mage.Sets/src/mage/sets/ftvrelics/AetherVial.java @@ -34,21 +34,21 @@ import mage.constants.Rarity; * * @author fireshoes */ -public class AEtherVial extends mage.sets.darksteel.AEtherVial { +public class AetherVial extends mage.sets.darksteel.AetherVial { - public AEtherVial(UUID ownerId) { + public AetherVial(UUID ownerId) { super(ownerId); this.cardNumber = "1"; this.expansionSetCode = "V10"; this.rarity = Rarity.MYTHIC; } - public AEtherVial(final AEtherVial card) { + public AetherVial(final AetherVial card) { super(card); } @Override - public AEtherVial copy() { - return new AEtherVial(this); + public AetherVial copy() { + return new AetherVial(this); } } diff --git a/Mage.Sets/src/mage/sets/futuresight/VedalkenAEthermage.java b/Mage.Sets/src/mage/sets/futuresight/VedalkenAethermage.java similarity index 89% rename from Mage.Sets/src/mage/sets/futuresight/VedalkenAEthermage.java rename to Mage.Sets/src/mage/sets/futuresight/VedalkenAethermage.java index 534aaabd60..992c06c01a 100644 --- a/Mage.Sets/src/mage/sets/futuresight/VedalkenAEthermage.java +++ b/Mage.Sets/src/mage/sets/futuresight/VedalkenAethermage.java @@ -47,7 +47,7 @@ import mage.target.TargetPermanent; * * @author anonymous */ -public class VedalkenAEthermage extends CardImpl { +public class VedalkenAethermage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Sliver"); private static final FilterCard filter2 = new FilterCard("Wizard"); @@ -57,8 +57,8 @@ public class VedalkenAEthermage extends CardImpl { filter2.add(new SubtypePredicate("Wizard")); } - public VedalkenAEthermage(UUID ownerId) { - super(ownerId, 61, "Vedalken AEthermage", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + public VedalkenAethermage(UUID ownerId) { + super(ownerId, 61, "Vedalken Aethermage", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "FUT"; this.subtype.add("Vedalken"); this.subtype.add("Wizard"); @@ -67,7 +67,7 @@ public class VedalkenAEthermage extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); - // When Vedalken Æthermage enters the battlefield, return target Sliver to its owner's hand. + // When Vedalken &Aelig;thermage enters the battlefield, return target Sliver to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); @@ -76,12 +76,12 @@ public class VedalkenAEthermage extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}"), filter2, "Wizardcycling")); } - public VedalkenAEthermage(final VedalkenAEthermage card) { + public VedalkenAethermage(final VedalkenAethermage card) { super(card); } @Override - public VedalkenAEthermage copy() { - return new VedalkenAEthermage(this); + public VedalkenAethermage copy() { + return new VedalkenAethermage(this); } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java b/Mage.Sets/src/mage/sets/gatecrash/Aetherize.java similarity index 90% rename from Mage.Sets/src/mage/sets/gatecrash/AEtherize.java rename to Mage.Sets/src/mage/sets/gatecrash/Aetherize.java index da077c85d3..9b9d65643d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AEtherize.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Aetherize.java @@ -38,10 +38,10 @@ import mage.filter.common.FilterAttackingCreature; * * @author LevelX2 */ -public class AEtherize extends CardImpl { +public class Aetherize extends CardImpl { - public AEtherize(UUID ownerId) { - super(ownerId, 29, "AEtherize", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); + public Aetherize(UUID ownerId) { + super(ownerId, 29, "Aetherize", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "GTC"; @@ -49,12 +49,12 @@ public class AEtherize extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandFromBattlefieldAllEffect(new FilterAttackingCreature("attacking creatures"))); } - public AEtherize(final AEtherize card) { + public Aetherize(final Aetherize card) { super(card); } @Override - public AEtherize copy() { - return new AEtherize(this); + public Aetherize copy() { + return new Aetherize(this); } } diff --git a/Mage.Sets/src/mage/sets/invasion/AEtherRift.java b/Mage.Sets/src/mage/sets/invasion/AetherRift.java similarity index 87% rename from Mage.Sets/src/mage/sets/invasion/AEtherRift.java rename to Mage.Sets/src/mage/sets/invasion/AetherRift.java index 1e7646c080..846b3e7c11 100644 --- a/Mage.Sets/src/mage/sets/invasion/AEtherRift.java +++ b/Mage.Sets/src/mage/sets/invasion/AetherRift.java @@ -49,42 +49,42 @@ import mage.target.targetpointer.FixedTarget; * * @author LevelX2 */ -public class AEtherRift extends CardImpl { +public class AetherRift extends CardImpl { - public AEtherRift(UUID ownerId) { - super(ownerId, 227, "AEther Rift", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{G}"); + public AetherRift(UUID ownerId) { + super(ownerId, 227, "Aether Rift", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{G}"); this.expansionSetCode = "INV"; // At the beginning of your upkeep, discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AEtherRiftEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AetherRiftEffect(), TargetController.YOU, false)); } - public AEtherRift(final AEtherRift card) { + public AetherRift(final AetherRift card) { super(card); } @Override - public AEtherRift copy() { - return new AEtherRift(this); + public AetherRift copy() { + return new AetherRift(this); } } -class AEtherRiftEffect extends OneShotEffect { +class AetherRiftEffect extends OneShotEffect { - public AEtherRiftEffect() { + public AetherRiftEffect() { super(Outcome.Benefit); this.staticText = "discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life"; } - public AEtherRiftEffect(final AEtherRiftEffect effect) { + public AetherRiftEffect(final AetherRiftEffect effect) { super(effect); } @Override - public AEtherRiftEffect copy() { - return new AEtherRiftEffect(this); + public AetherRiftEffect copy() { + return new AetherRiftEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/jacevschandra/AEthersnipe.java b/Mage.Sets/src/mage/sets/jacevschandra/Aethersnipe.java similarity index 89% rename from Mage.Sets/src/mage/sets/jacevschandra/AEthersnipe.java rename to Mage.Sets/src/mage/sets/jacevschandra/Aethersnipe.java index bdba615bdd..d93504a13d 100644 --- a/Mage.Sets/src/mage/sets/jacevschandra/AEthersnipe.java +++ b/Mage.Sets/src/mage/sets/jacevschandra/Aethersnipe.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEthersnipe extends mage.sets.commander.AEthersnipe { +public class Aethersnipe extends mage.sets.commander.Aethersnipe { - public AEthersnipe(UUID ownerId) { + public Aethersnipe(UUID ownerId) { super(ownerId); this.cardNumber = "17"; this.expansionSetCode = "DD2"; } - public AEthersnipe(final AEthersnipe card) { + public Aethersnipe(final Aethersnipe card) { super(card); } @Override - public AEthersnipe copy() { - return new AEthersnipe(this); + public Aethersnipe copy() { + return new Aethersnipe(this); } } diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherAdept.java b/Mage.Sets/src/mage/sets/jacevsvraska/AetherAdept.java similarity index 89% rename from Mage.Sets/src/mage/sets/jacevsvraska/AEtherAdept.java rename to Mage.Sets/src/mage/sets/jacevsvraska/AetherAdept.java index 4c12662ebd..a4d1236ddd 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherAdept.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/AetherAdept.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEtherAdept extends mage.sets.magic2011.AetherAdept { +public class AetherAdept extends mage.sets.magic2011.AetherAdept { - public AEtherAdept(UUID ownerId) { + public AetherAdept(UUID ownerId) { super(ownerId); this.cardNumber = "12"; this.expansionSetCode = "DDM"; } - public AEtherAdept(final AEtherAdept card) { + public AetherAdept(final AetherAdept card) { super(card); } @Override - public AEtherAdept copy() { - return new AEtherAdept(this); + public AetherAdept copy() { + return new AetherAdept(this); } } diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherFigment.java b/Mage.Sets/src/mage/sets/jacevsvraska/AetherFigment.java similarity index 89% rename from Mage.Sets/src/mage/sets/jacevsvraska/AEtherFigment.java rename to Mage.Sets/src/mage/sets/jacevsvraska/AetherFigment.java index 461f6534e6..384901992a 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/AEtherFigment.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/AetherFigment.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEtherFigment extends mage.sets.zendikar.AetherFigment { +public class AetherFigment extends mage.sets.zendikar.AetherFigment { - public AEtherFigment(UUID ownerId) { + public AetherFigment(UUID ownerId) { super(ownerId); this.cardNumber = "5"; this.expansionSetCode = "DDM"; } - public AEtherFigment(final AEtherFigment card) { + public AetherFigment(final AetherFigment card) { super(card); } @Override - public AEtherFigment copy() { - return new AEtherFigment(this); + public AetherFigment copy() { + return new AetherFigment(this); } } diff --git a/Mage.Sets/src/mage/sets/kaladesh/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/kaladesh/AetherTradewinds.java similarity index 88% rename from Mage.Sets/src/mage/sets/kaladesh/AEtherTradewinds.java rename to Mage.Sets/src/mage/sets/kaladesh/AetherTradewinds.java index 56f34e2858..0ad20bd0f0 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/AEtherTradewinds.java +++ b/Mage.Sets/src/mage/sets/kaladesh/AetherTradewinds.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author fireshoes */ -public class AEtherTradewinds extends mage.sets.worldwake.AEtherTradewinds { +public class AetherTradewinds extends mage.sets.worldwake.AetherTradewinds { - public AEtherTradewinds(UUID ownerId) { + public AetherTradewinds(UUID ownerId) { super(ownerId); this.cardNumber = "38"; this.expansionSetCode = "KLD"; } - public AEtherTradewinds(final AEtherTradewinds card) { + public AetherTradewinds(final AetherTradewinds card) { super(card); } @Override - public AEtherTradewinds copy() { - return new AEtherTradewinds(this); + public AetherTradewinds copy() { + return new AetherTradewinds(this); } } diff --git a/Mage.Sets/src/mage/sets/legends/AErathiBerserker.java b/Mage.Sets/src/mage/sets/legends/AerathiBerserker.java similarity index 88% rename from Mage.Sets/src/mage/sets/legends/AErathiBerserker.java rename to Mage.Sets/src/mage/sets/legends/AerathiBerserker.java index 92fd344f64..5d1309e670 100644 --- a/Mage.Sets/src/mage/sets/legends/AErathiBerserker.java +++ b/Mage.Sets/src/mage/sets/legends/AerathiBerserker.java @@ -38,10 +38,10 @@ import mage.constants.Rarity; * * @author LoneFox */ -public class AErathiBerserker extends CardImpl { +public class AerathiBerserker extends CardImpl { - public AErathiBerserker(UUID ownerId) { - super(ownerId, 131, "AErathi Berserker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}"); + public AerathiBerserker(UUID ownerId) { + super(ownerId, 131, "Aerathi Berserker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}"); this.expansionSetCode = "LEG"; this.subtype.add("Human"); this.subtype.add("Berserker"); @@ -52,12 +52,12 @@ public class AErathiBerserker extends CardImpl { this.addAbility(new RampageAbility(3)); } - public AErathiBerserker(final AErathiBerserker card) { + public AerathiBerserker(final AerathiBerserker card) { super(card); } @Override - public AErathiBerserker copy() { - return new AErathiBerserker(this); + public AerathiBerserker copy() { + return new AerathiBerserker(this); } } diff --git a/Mage.Sets/src/mage/sets/lorwyn/AEthersnipe.java b/Mage.Sets/src/mage/sets/lorwyn/Aethersnipe.java similarity index 89% rename from Mage.Sets/src/mage/sets/lorwyn/AEthersnipe.java rename to Mage.Sets/src/mage/sets/lorwyn/Aethersnipe.java index 2d924b65a1..1ebe64d76b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/AEthersnipe.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Aethersnipe.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEthersnipe extends mage.sets.commander.AEthersnipe { +public class Aethersnipe extends mage.sets.commander.Aethersnipe { - public AEthersnipe(UUID ownerId) { + public Aethersnipe(UUID ownerId) { super(ownerId); this.cardNumber = "50"; this.expansionSetCode = "LRW"; } - public AEthersnipe(final AEthersnipe card) { + public Aethersnipe(final Aethersnipe card) { super(card); } @Override - public AEthersnipe copy() { - return new AEthersnipe(this); + public Aethersnipe copy() { + return new Aethersnipe(this); } } diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java index 7c9e206f81..76ac2b0ed8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java +++ b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; public class AetherAdept extends CardImpl { public AetherAdept(UUID ownerId) { - super(ownerId, 41, "AEther Adept", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); + super(ownerId, 41, "Aether Adept", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Wizard"); @@ -52,7 +52,7 @@ public class AetherAdept extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When AEther Adept enters the battlefield, return target creature to its owner's hand. + // When Aether Adept enters the battlefield, return target creature to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2012/AEtherAdept.java b/Mage.Sets/src/mage/sets/magic2012/AetherAdept.java similarity index 90% rename from Mage.Sets/src/mage/sets/magic2012/AEtherAdept.java rename to Mage.Sets/src/mage/sets/magic2012/AetherAdept.java index af381e4aff..0cd09c9622 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AEtherAdept.java +++ b/Mage.Sets/src/mage/sets/magic2012/AetherAdept.java @@ -35,20 +35,20 @@ import java.util.UUID; * * @author nantuko */ -public class AEtherAdept extends AetherAdept { +public class AetherAdept extends AetherAdept { - public AEtherAdept(UUID ownerId) { + public AetherAdept(UUID ownerId) { super(ownerId); this.cardNumber = "41"; this.expansionSetCode = "M12"; } - public AEtherAdept(final AEtherAdept card) { + public AetherAdept(final AetherAdept card) { super(card); } @Override - public AEtherAdept copy() { - return new AEtherAdept(this); + public AetherAdept copy() { + return new AetherAdept(this); } } diff --git a/Mage.Sets/src/mage/sets/magic2015/AEtherspouts.java b/Mage.Sets/src/mage/sets/magic2015/Aetherspouts.java similarity index 94% rename from Mage.Sets/src/mage/sets/magic2015/AEtherspouts.java rename to Mage.Sets/src/mage/sets/magic2015/Aetherspouts.java index 63cb2551b7..fa8efddeca 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AEtherspouts.java +++ b/Mage.Sets/src/mage/sets/magic2015/Aetherspouts.java @@ -52,24 +52,24 @@ import mage.target.TargetCard; * * @author LevelX2 */ -public class AEtherspouts extends CardImpl { +public class Aetherspouts extends CardImpl { - public AEtherspouts(UUID ownerId) { - super(ownerId, 44, "AEtherspouts", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); + public Aetherspouts(UUID ownerId) { + super(ownerId, 44, "Aetherspouts", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "M15"; // For each attacking creature, its owner puts it on the top or bottom of his or her library. - this.getSpellAbility().addEffect(new AEtherspoutsEffect()); + this.getSpellAbility().addEffect(new AetherspoutsEffect()); } - public AEtherspouts(final AEtherspouts card) { + public Aetherspouts(final Aetherspouts card) { super(card); } @Override - public AEtherspouts copy() { - return new AEtherspouts(this); + public Aetherspouts copy() { + return new Aetherspouts(this); } } @@ -81,20 +81,20 @@ public class AEtherspouts extends CardImpl { the owner of those cards may arrange them in any order. That library’s owner doesn’t reveal the order in which the cards go into his or her library. */ -class AEtherspoutsEffect extends OneShotEffect { +class AetherspoutsEffect extends OneShotEffect { - public AEtherspoutsEffect() { + public AetherspoutsEffect() { super(Outcome.Benefit); this.staticText = "For each attacking creature, its owner puts it on the top or bottom of his or her library"; } - public AEtherspoutsEffect(final AEtherspoutsEffect effect) { + public AetherspoutsEffect(final AetherspoutsEffect effect) { super(effect); } @Override - public AEtherspoutsEffect copy() { - return new AEtherspoutsEffect(this); + public AetherspoutsEffect copy() { + return new AetherspoutsEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/magicorigins/AnchorToTheAEther.java b/Mage.Sets/src/mage/sets/magicorigins/AnchorToTheAether.java similarity index 88% rename from Mage.Sets/src/mage/sets/magicorigins/AnchorToTheAEther.java rename to Mage.Sets/src/mage/sets/magicorigins/AnchorToTheAether.java index 5c40af1319..126decbc67 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/AnchorToTheAEther.java +++ b/Mage.Sets/src/mage/sets/magicorigins/AnchorToTheAether.java @@ -39,10 +39,10 @@ import mage.target.common.TargetCreaturePermanent; * * @author LevelX2 */ -public class AnchorToTheAEther extends CardImpl { +public class AnchorToTheAether extends CardImpl { - public AnchorToTheAEther(UUID ownerId) { - super(ownerId, 44, "Anchor to the AEther", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); + public AnchorToTheAether(UUID ownerId) { + super(ownerId, 44, "Anchor to the Aether", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "ORI"; // Put target creature on top of its owner's library. Scry 1. @@ -52,12 +52,12 @@ public class AnchorToTheAEther extends CardImpl { } - public AnchorToTheAEther(final AnchorToTheAEther card) { + public AnchorToTheAether(final AnchorToTheAether card) { super(card); } @Override - public AnchorToTheAEther copy() { - return new AnchorToTheAEther(this); + public AnchorToTheAether copy() { + return new AnchorToTheAether(this); } } diff --git a/Mage.Sets/src/mage/sets/magicorigins/GhirapurAEtherGrid.java b/Mage.Sets/src/mage/sets/magicorigins/GhirapurAetherGrid.java similarity index 90% rename from Mage.Sets/src/mage/sets/magicorigins/GhirapurAEtherGrid.java rename to Mage.Sets/src/mage/sets/magicorigins/GhirapurAetherGrid.java index 95138ec2cc..aa13238321 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/GhirapurAEtherGrid.java +++ b/Mage.Sets/src/mage/sets/magicorigins/GhirapurAetherGrid.java @@ -46,17 +46,17 @@ import mage.target.common.TargetControlledPermanent; * * @author Wehk */ -public class GhirapurAEtherGrid extends CardImpl { +public class GhirapurAetherGrid extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped artifacts you control"); - + static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); filter.add(Predicates.not(new TappedPredicate())); } - - public GhirapurAEtherGrid(UUID ownerId) { - super(ownerId, 148, "Ghirapur AEther Grid", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); + + public GhirapurAetherGrid(UUID ownerId) { + super(ownerId, 148, "Ghirapur Aether Grid", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "ORI"; // Tap two untaped artifacts you control: Ghirapur Aether Grid deals 1 damage to target creature or player @@ -67,12 +67,12 @@ public class GhirapurAEtherGrid extends CardImpl { this.addAbility(ability); } - public GhirapurAEtherGrid(final GhirapurAEtherGrid card) { + public GhirapurAetherGrid(final GhirapurAetherGrid card) { super(card); } @Override - public GhirapurAEtherGrid copy() { - return new GhirapurAEtherGrid(this); + public GhirapurAetherGrid copy() { + return new GhirapurAetherGrid(this); } } diff --git a/Mage.Sets/src/mage/sets/masterpieceseries/AEtherVial.java b/Mage.Sets/src/mage/sets/masterpieceseries/AetherVial.java similarity index 90% rename from Mage.Sets/src/mage/sets/masterpieceseries/AEtherVial.java rename to Mage.Sets/src/mage/sets/masterpieceseries/AetherVial.java index 01865a539e..a7a7e79ec0 100644 --- a/Mage.Sets/src/mage/sets/masterpieceseries/AEtherVial.java +++ b/Mage.Sets/src/mage/sets/masterpieceseries/AetherVial.java @@ -36,9 +36,9 @@ import mage.constants.Rarity; * * @author fireshoes */ -public class AEtherVial extends mage.sets.darksteel.AEtherVial { +public class AetherVial extends mage.sets.darksteel.AetherVial { - public AEtherVial(UUID ownerId) { + public AetherVial(UUID ownerId) { super(ownerId); this.cardNumber = "6"; this.expansionSetCode = "MPS"; @@ -46,12 +46,12 @@ public class AEtherVial extends mage.sets.darksteel.AEtherVial { this.frameStyle = FrameStyle.KLD_INVENTION; } - public AEtherVial(final AEtherVial card) { + public AetherVial(final AetherVial card) { super(card); } @Override - public AEtherVial copy() { - return new AEtherVial(this); + public AetherVial copy() { + return new AetherVial(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/AetherSpellbomb.java similarity index 87% rename from Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java rename to Mage.Sets/src/mage/sets/mirrodin/AetherSpellbomb.java index c9c6aa7767..d43851be14 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AetherSpellbomb.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author Backfir3 */ -public class AEtherSpellbomb extends mage.sets.elspethvstezzeret.AEtherSpellbomb { +public class AetherSpellbomb extends mage.sets.elspethvstezzeret.AetherSpellbomb { - public AEtherSpellbomb(UUID ownerId) { + public AetherSpellbomb(UUID ownerId) { super(ownerId); this.cardNumber = "141"; this.expansionSetCode = "MRD"; } - public AEtherSpellbomb(final AEtherSpellbomb card) { + public AetherSpellbomb(final AetherSpellbomb card) { super(card); } @java.lang.Override - public AEtherSpellbomb copy() { - return new AEtherSpellbomb(this); + public AetherSpellbomb copy() { + return new AetherSpellbomb(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/GateToTheAEther.java b/Mage.Sets/src/mage/sets/mirrodin/GateToTheAether.java similarity index 85% rename from Mage.Sets/src/mage/sets/mirrodin/GateToTheAEther.java rename to Mage.Sets/src/mage/sets/mirrodin/GateToTheAether.java index 2ddfbd8c07..cc757993d7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GateToTheAEther.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GateToTheAether.java @@ -46,40 +46,40 @@ import mage.players.Player; * * @author emerald000 */ -public class GateToTheAEther extends CardImpl { +public class GateToTheAether extends CardImpl { - public GateToTheAEther(UUID ownerId) { - super(ownerId, 174, "Gate to the AEther", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{6}"); + public GateToTheAether(UUID ownerId) { + super(ownerId, 174, "Gate to the Aether", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{6}"); this.expansionSetCode = "MRD"; // At the beginning of each player's upkeep, that player reveals the top card of his or her library. If it's an artifact, creature, enchantment, or land card, the player may put it onto the battlefield. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new GateToTheAEtherEffect(), TargetController.ANY, false, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new GateToTheAetherEffect(), TargetController.ANY, false, true)); } - public GateToTheAEther(final GateToTheAEther card) { + public GateToTheAether(final GateToTheAether card) { super(card); } @java.lang.Override - public GateToTheAEther copy() { - return new GateToTheAEther(this); + public GateToTheAether copy() { + return new GateToTheAether(this); } } -class GateToTheAEtherEffect extends OneShotEffect { +class GateToTheAetherEffect extends OneShotEffect { - GateToTheAEtherEffect() { + GateToTheAetherEffect() { super(Outcome.PutCardInPlay); this.staticText = "that player reveals the top card of his or her library. If it's an artifact, creature, enchantment, or land card, the player may put it onto the battlefield"; } - GateToTheAEtherEffect(final GateToTheAEtherEffect effect) { + GateToTheAetherEffect(final GateToTheAetherEffect effect) { super(effect); } @java.lang.Override - public GateToTheAEtherEffect copy() { - return new GateToTheAEtherEffect(this); + public GateToTheAetherEffect copy() { + return new GateToTheAetherEffect(this); } @java.lang.Override @@ -88,7 +88,7 @@ class GateToTheAEtherEffect extends OneShotEffect { if (activePlayer != null) { Card card = activePlayer.getLibrary().getFromTop(game); if (card != null) { - activePlayer.revealCards("Gate to the AEther", new CardsImpl(card), game); + activePlayer.revealCards("Gate to the Aether", new CardsImpl(card), game); if (card.getCardType().contains(CardType.ARTIFACT) || card.getCardType().contains(CardType.CREATURE) || card.getCardType().contains(CardType.ENCHANTMENT) diff --git a/Mage.Sets/src/mage/sets/modernmasters/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/modernmasters/AetherSpellbomb.java similarity index 87% rename from Mage.Sets/src/mage/sets/modernmasters/AEtherSpellbomb.java rename to Mage.Sets/src/mage/sets/modernmasters/AetherSpellbomb.java index a66c20822e..51d7cb5393 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/AEtherSpellbomb.java +++ b/Mage.Sets/src/mage/sets/modernmasters/AetherSpellbomb.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEtherSpellbomb extends mage.sets.elspethvstezzeret.AEtherSpellbomb { +public class AetherSpellbomb extends mage.sets.elspethvstezzeret.AetherSpellbomb { - public AEtherSpellbomb(UUID ownerId) { + public AetherSpellbomb(UUID ownerId) { super(ownerId); this.cardNumber = "196"; this.expansionSetCode = "MMA"; } - public AEtherSpellbomb(final AEtherSpellbomb card) { + public AetherSpellbomb(final AetherSpellbomb card) { super(card); } @Override - public AEtherSpellbomb copy() { - return new AEtherSpellbomb(this); + public AetherSpellbomb copy() { + return new AetherSpellbomb(this); } } diff --git a/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java b/Mage.Sets/src/mage/sets/modernmasters/AetherVial.java similarity index 90% rename from Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java rename to Mage.Sets/src/mage/sets/modernmasters/AetherVial.java index 86fcb9e0e1..9bb1419de3 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/AEtherVial.java +++ b/Mage.Sets/src/mage/sets/modernmasters/AetherVial.java @@ -34,21 +34,21 @@ import mage.constants.Rarity; * * @author LevelX2 */ -public class AEtherVial extends mage.sets.darksteel.AEtherVial { +public class AetherVial extends mage.sets.darksteel.AetherVial { - public AEtherVial(UUID ownerId) { + public AetherVial(UUID ownerId) { super(ownerId); this.cardNumber = "197"; this.expansionSetCode = "MMA"; this.rarity = Rarity.RARE; } - public AEtherVial(final AEtherVial card) { + public AetherVial(final AetherVial card) { super(card); } @Override - public AEtherVial copy() { - return new AEtherVial(this); + public AetherVial copy() { + return new AetherVial(this); } } diff --git a/Mage.Sets/src/mage/sets/modernmasters/AEthersnipe.java b/Mage.Sets/src/mage/sets/modernmasters/Aethersnipe.java similarity index 89% rename from Mage.Sets/src/mage/sets/modernmasters/AEthersnipe.java rename to Mage.Sets/src/mage/sets/modernmasters/Aethersnipe.java index ffadc8c982..2a9ed42dfb 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/AEthersnipe.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Aethersnipe.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEthersnipe extends mage.sets.commander.AEthersnipe { +public class Aethersnipe extends mage.sets.commander.Aethersnipe { - public AEthersnipe(UUID ownerId) { + public Aethersnipe(UUID ownerId) { super(ownerId); this.cardNumber = "36"; this.expansionSetCode = "MMA"; } - public AEthersnipe(final AEthersnipe card) { + public Aethersnipe(final Aethersnipe card) { super(card); } @Override - public AEthersnipe copy() { - return new AEthersnipe(this); + public Aethersnipe copy() { + return new Aethersnipe(this); } } diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/AEthersnipe.java b/Mage.Sets/src/mage/sets/modernmasters2015/Aethersnipe.java similarity index 89% rename from Mage.Sets/src/mage/sets/modernmasters2015/AEthersnipe.java rename to Mage.Sets/src/mage/sets/modernmasters2015/Aethersnipe.java index 781d43888c..282b5fb9c1 100644 --- a/Mage.Sets/src/mage/sets/modernmasters2015/AEthersnipe.java +++ b/Mage.Sets/src/mage/sets/modernmasters2015/Aethersnipe.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author fireshoes */ -public class AEthersnipe extends mage.sets.commander.AEthersnipe { +public class Aethersnipe extends mage.sets.commander.Aethersnipe { - public AEthersnipe(UUID ownerId) { + public Aethersnipe(UUID ownerId) { super(ownerId); this.cardNumber = "39"; this.expansionSetCode = "MM2"; } - public AEthersnipe(final AEthersnipe card) { + public Aethersnipe(final Aethersnipe card) { super(card); } @Override - public AEthersnipe copy() { - return new AEthersnipe(this); + public Aethersnipe copy() { + return new Aethersnipe(this); } } diff --git a/Mage.Sets/src/mage/sets/nemesis/AEtherBarrier.java b/Mage.Sets/src/mage/sets/nemesis/AetherBarrier.java similarity index 85% rename from Mage.Sets/src/mage/sets/nemesis/AEtherBarrier.java rename to Mage.Sets/src/mage/sets/nemesis/AetherBarrier.java index 6c0e540a9a..dad79c101b 100644 --- a/Mage.Sets/src/mage/sets/nemesis/AEtherBarrier.java +++ b/Mage.Sets/src/mage/sets/nemesis/AetherBarrier.java @@ -47,53 +47,53 @@ import mage.players.Player; * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ -public class AEtherBarrier extends CardImpl { - +public class AetherBarrier extends CardImpl { + private static final FilterSpell filter = new FilterSpell("a creature spell"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); } - public AEtherBarrier(UUID ownerId) { - super(ownerId, 27, "AEther Barrier", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); + public AetherBarrier(UUID ownerId) { + super(ownerId, 27, "Aether Barrier", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); this.expansionSetCode = "NEM"; // Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays {1}. this.addAbility(new SpellCastAllTriggeredAbility( Zone.BATTLEFIELD, - new AEtherBarrierEffect(), + new AetherBarrierEffect(), filter, - false, + false, SetTargetPointer.PLAYER )); } - public AEtherBarrier(final AEtherBarrier card) { + public AetherBarrier(final AetherBarrier card) { super(card); } @Override - public AEtherBarrier copy() { - return new AEtherBarrier(this); + public AetherBarrier copy() { + return new AetherBarrier(this); } } -class AEtherBarrierEffect extends SacrificeEffect { - - AEtherBarrierEffect() { +class AetherBarrierEffect extends SacrificeEffect { + + AetherBarrierEffect() { super(new FilterPermanent("permanent to sacrifice"), 1, "that player"); this.staticText = "that player sacrifices a permanent unless he or she pays {1}"; } - - AEtherBarrierEffect(final AEtherBarrierEffect effect) { + + AetherBarrierEffect(final AetherBarrierEffect effect) { super(effect); } - + @Override - public AEtherBarrierEffect copy() { - return new AEtherBarrierEffect(this); + public AetherBarrierEffect copy() { + return new AetherBarrierEffect(this); } - + @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAether.java similarity index 86% rename from Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java rename to Mage.Sets/src/mage/sets/newphyrexia/ArmWithAether.java index 3b54cbf840..617e6214f7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAether.java @@ -49,42 +49,42 @@ import mage.target.common.TargetCreaturePermanent; * * @author North */ -public class ArmWithAEther extends CardImpl { +public class ArmWithAether extends CardImpl { - public ArmWithAEther(UUID ownerId) { - super(ownerId, 28, "Arm with AEther", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); + public ArmWithAether(UUID ownerId) { + super(ownerId, 28, "Arm with Aether", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "NPH"; // Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." - Effect effect = new GainAbilityControlledEffect(new ArmWithAEtherTriggeredAbility(), Duration.EndOfTurn, new FilterCreaturePermanent()); + Effect effect = new GainAbilityControlledEffect(new ArmWithAetherTriggeredAbility(), Duration.EndOfTurn, new FilterCreaturePermanent()); effect.setText("Until end of turn, creatures you control gain \"Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand.\""); this.getSpellAbility().addEffect(effect); } - public ArmWithAEther(final ArmWithAEther card) { + public ArmWithAether(final ArmWithAether card) { super(card); } @Override - public ArmWithAEther copy() { - return new ArmWithAEther(this); + public ArmWithAether copy() { + return new ArmWithAether(this); } } -class ArmWithAEtherTriggeredAbility extends TriggeredAbilityImpl { +class ArmWithAetherTriggeredAbility extends TriggeredAbilityImpl { - public ArmWithAEtherTriggeredAbility() { + public ArmWithAetherTriggeredAbility() { super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), true); } - public ArmWithAEtherTriggeredAbility(final ArmWithAEtherTriggeredAbility ability) { + public ArmWithAetherTriggeredAbility(final ArmWithAetherTriggeredAbility ability) { super(ability); } @Override - public ArmWithAEtherTriggeredAbility copy() { - return new ArmWithAEtherTriggeredAbility(this); + public ArmWithAetherTriggeredAbility copy() { + return new ArmWithAetherTriggeredAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java b/Mage.Sets/src/mage/sets/odyssey/AetherBurst.java similarity index 89% rename from Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java rename to Mage.Sets/src/mage/sets/odyssey/AetherBurst.java index 6452f273f9..dd49b07f45 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java +++ b/Mage.Sets/src/mage/sets/odyssey/AetherBurst.java @@ -47,20 +47,20 @@ import java.util.UUID; * * @author magenoxx_at_gmail.com */ -public class AEtherBurst extends CardImpl { +public class AetherBurst extends CardImpl { - private static final FilterCard filter = new FilterCard("cards named AEther Burst"); + private static final FilterCard filter = new FilterCard("cards named Aether Burst"); static { - filter.add(new NamePredicate("AEther Burst")); + filter.add(new NamePredicate("Aether Burst")); } - public AEtherBurst(UUID ownerId) { - super(ownerId, 60, "AEther Burst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); + public AetherBurst(UUID ownerId) { + super(ownerId, 60, "Aether Burst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ODY"; - // Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst. + // Return up to X target creatures to their owners' hands, where X is one plus the number of cards named Aether Burst in all graveyards as you cast Aether Burst. this.getSpellAbility().addEffect(new DynamicReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new DynamicTargetCreaturePermanent()); } @@ -83,13 +83,13 @@ public class AEtherBurst extends CardImpl { } } - public AEtherBurst(final AEtherBurst card) { + public AetherBurst(final AetherBurst card) { super(card); } @Override - public AEtherBurst copy() { - return new AEtherBurst(this); + public AetherBurst copy() { + return new AetherBurst(this); } } @@ -136,7 +136,7 @@ class DynamicReturnToHandTargetEffect extends ReturnToHandTargetEffect { @Override public String getText(Mode mode) { - return "Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst"; + return "Return up to X target creatures to their owners' hands, where X is one plus the number of cards named Aether Burst in all graveyards as you cast Aether Burst"; } } diff --git a/Mage.Sets/src/mage/sets/onslaught/AEtherCharge.java b/Mage.Sets/src/mage/sets/onslaught/AetherCharge.java similarity index 83% rename from Mage.Sets/src/mage/sets/onslaught/AEtherCharge.java rename to Mage.Sets/src/mage/sets/onslaught/AetherCharge.java index 22c324da72..d4091ef10b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AEtherCharge.java +++ b/Mage.Sets/src/mage/sets/onslaught/AetherCharge.java @@ -50,42 +50,41 @@ import mage.target.common.TargetOpponent; * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ -public class AEtherCharge extends CardImpl { - +public class AetherCharge extends CardImpl { + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Beast you control"); static { filter.add(new SubtypePredicate("Beast")); } - public AEtherCharge(UUID ownerId) { - super(ownerId, 184, "AEther Charge", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); + public AetherCharge(UUID ownerId) { + super(ownerId, 184, "Aether Charge", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "ONS"; // Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent. - Ability ability = new AEtherChargeTriggeredAbility(); + Ability ability = new AetherChargeTriggeredAbility(); ability.addTarget(new TargetOpponent()); this.addAbility(ability); - } - public AEtherCharge(final AEtherCharge card) { + public AetherCharge(final AetherCharge card) { super(card); } @Override - public AEtherCharge copy() { - return new AEtherCharge(this); + public AetherCharge copy() { + return new AetherCharge(this); } } -class AEtherChargeTriggeredAbility extends TriggeredAbilityImpl { +class AetherChargeTriggeredAbility extends TriggeredAbilityImpl { - public AEtherChargeTriggeredAbility() { - super(Zone.BATTLEFIELD, new AEtherChargeEffect(), true); // is optional + public AetherChargeTriggeredAbility() { + super(Zone.BATTLEFIELD, new AetherChargeEffect(), true); // is optional } - public AEtherChargeTriggeredAbility(AEtherChargeTriggeredAbility ability) { + public AetherChargeTriggeredAbility(AetherChargeTriggeredAbility ability) { super(ability); } @@ -112,25 +111,25 @@ class AEtherChargeTriggeredAbility extends TriggeredAbilityImpl { } @Override - public AEtherChargeTriggeredAbility copy() { - return new AEtherChargeTriggeredAbility(this); + public AetherChargeTriggeredAbility copy() { + return new AetherChargeTriggeredAbility(this); } } -class AEtherChargeEffect extends OneShotEffect { +class AetherChargeEffect extends OneShotEffect { - public AEtherChargeEffect() { + public AetherChargeEffect() { super(Outcome.Damage); staticText = "you may have it deal 4 damage to target opponent"; } - public AEtherChargeEffect(final AEtherChargeEffect effect) { + public AetherChargeEffect(final AetherChargeEffect effect) { super(effect); } @Override - public AEtherChargeEffect copy() { - return new AEtherChargeEffect(this); + public AetherChargeEffect copy() { + return new AetherChargeEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/planarchaos/AEtherMembrane.java b/Mage.Sets/src/mage/sets/planarchaos/AetherMembrane.java similarity index 88% rename from Mage.Sets/src/mage/sets/planarchaos/AEtherMembrane.java rename to Mage.Sets/src/mage/sets/planarchaos/AetherMembrane.java index 9a7126c936..8740590fb2 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/AEtherMembrane.java +++ b/Mage.Sets/src/mage/sets/planarchaos/AetherMembrane.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author klayhamn */ -public class AEtherMembrane extends mage.sets.venservskoth.AEtherMembrane { +public class AetherMembrane extends mage.sets.venservskoth.AetherMembrane { - public AEtherMembrane(UUID ownerId) { + public AetherMembrane(UUID ownerId) { super(ownerId); this.cardNumber = "93"; this.expansionSetCode = "PLC"; } - public AEtherMembrane(final AEtherMembrane card) { + public AetherMembrane(final AetherMembrane card) { super(card); } @Override - public AEtherMembrane copy() { - return new AEtherMembrane(this); + public AetherMembrane copy() { + return new AetherMembrane(this); } } diff --git a/Mage.Sets/src/mage/sets/planarchaos/FrozenAEther.java b/Mage.Sets/src/mage/sets/planarchaos/FrozenAether.java similarity index 87% rename from Mage.Sets/src/mage/sets/planarchaos/FrozenAEther.java rename to Mage.Sets/src/mage/sets/planarchaos/FrozenAether.java index 6397bed756..d520a713b8 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FrozenAEther.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FrozenAether.java @@ -47,34 +47,34 @@ import mage.game.permanent.Permanent; * * @author fireshoes */ -public class FrozenAEther extends CardImpl { +public class FrozenAether extends CardImpl { - public FrozenAEther(UUID ownerId) { - super(ownerId, 54, "Frozen AEther", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); + public FrozenAether(UUID ownerId) { + super(ownerId, 54, "Frozen Aether", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "PLC"; // Artifacts, creatures, and lands your opponents control enter the battlefield tapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FrozenAEtherTapEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FrozenAetherTapEffect())); } - public FrozenAEther(final FrozenAEther card) { + public FrozenAether(final FrozenAether card) { super(card); } @Override - public FrozenAEther copy() { - return new FrozenAEther(this); + public FrozenAether copy() { + return new FrozenAether(this); } } -class FrozenAEtherTapEffect extends ReplacementEffectImpl { +class FrozenAetherTapEffect extends ReplacementEffectImpl { - FrozenAEtherTapEffect() { + FrozenAetherTapEffect() { super(Duration.WhileOnBattlefield, Outcome.Tap); staticText = "Artifacts, creatures, and lands your opponents control enter the battlefield tapped"; } - FrozenAEtherTapEffect(final FrozenAEtherTapEffect effect) { + FrozenAetherTapEffect(final FrozenAetherTapEffect effect) { super(effect); } @@ -107,7 +107,7 @@ class FrozenAEtherTapEffect extends ReplacementEffectImpl { } @Override - public FrozenAEtherTapEffect copy() { - return new FrozenAEtherTapEffect(this); + public FrozenAetherTapEffect copy() { + return new FrozenAetherTapEffect(this); } } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AEtherShockwave.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AetherShockwave.java similarity index 90% rename from Mage.Sets/src/mage/sets/saviorsofkamigawa/AEtherShockwave.java rename to Mage.Sets/src/mage/sets/saviorsofkamigawa/AetherShockwave.java index 130558c212..45f3edb402 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AEtherShockwave.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AetherShockwave.java @@ -41,7 +41,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; * * @author LevelX2 */ -public class AEtherShockwave extends CardImpl { +public class AetherShockwave extends CardImpl { private static final FilterCreaturePermanent filterSpirit = new FilterCreaturePermanent("Spirits"); private static final FilterCreaturePermanent filterNonSpirit = new FilterCreaturePermanent("non-Spirit creatures"); @@ -50,8 +50,8 @@ public class AEtherShockwave extends CardImpl { filterNonSpirit.add(Predicates.not(new SubtypePredicate("Spirit"))); } - public AEtherShockwave(UUID ownerId) { - super(ownerId, 1, "AEther Shockwave", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); + public AetherShockwave(UUID ownerId) { + super(ownerId, 1, "Aether Shockwave", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "SOK"; @@ -63,12 +63,12 @@ public class AEtherShockwave extends CardImpl { this.getSpellAbility().addMode(mode); } - public AEtherShockwave(final AEtherShockwave card) { + public AetherShockwave(final AetherShockwave card) { super(card); } @Override - public AEtherShockwave copy() { - return new AEtherShockwave(this); + public AetherShockwave copy() { + return new AetherShockwave(this); } } diff --git a/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java b/Mage.Sets/src/mage/sets/seventhedition/AetherFlash.java similarity index 82% rename from Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java rename to Mage.Sets/src/mage/sets/seventhedition/AetherFlash.java index 1e40e6aab3..57194570a8 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java +++ b/Mage.Sets/src/mage/sets/seventhedition/AetherFlash.java @@ -46,36 +46,36 @@ import mage.target.targetpointer.FixedTarget; * * @author Quercitron */ -public class AEtherFlash extends CardImpl { +public class AetherFlash extends CardImpl { - public AEtherFlash(UUID ownerId) { - super(ownerId, 172, "AEther Flash", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); + public AetherFlash(UUID ownerId) { + super(ownerId, 172, "Aether Flash", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); this.expansionSetCode = "7ED"; - // Whenever a creature enters the battlefield, AEther Flash deals 2 damage to it. - this.addAbility(new AEtherFlashTriggeredAbility()); + // Whenever a creature enters the battlefield, Aether Flash deals 2 damage to it. + this.addAbility(new AetherFlashTriggeredAbility()); } - public AEtherFlash(final AEtherFlash card) { + public AetherFlash(final AetherFlash card) { super(card); } @Override - public AEtherFlash copy() { - return new AEtherFlash(this); + public AetherFlash copy() { + return new AetherFlash(this); } } -class AEtherFlashTriggeredAbility extends TriggeredAbilityImpl { +class AetherFlashTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); - public AEtherFlashTriggeredAbility() { + public AetherFlashTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false); } - public AEtherFlashTriggeredAbility(AEtherFlashTriggeredAbility ability) { + public AetherFlashTriggeredAbility(AetherFlashTriggeredAbility ability) { super(ability); } @@ -101,12 +101,12 @@ class AEtherFlashTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature enters the battlefield, AEther Flash deals 2 damage to it"; + return "Whenever a creature enters the battlefield, Aether Flash deals 2 damage to it"; } @Override - public AEtherFlashTriggeredAbility copy() { - return new AEtherFlashTriggeredAbility(this); + public AetherFlashTriggeredAbility copy() { + return new AetherFlashTriggeredAbility(this); } } diff --git a/Mage.Sets/src/mage/sets/seventhedition/TaintedAEther.java b/Mage.Sets/src/mage/sets/seventhedition/TaintedAether.java similarity index 89% rename from Mage.Sets/src/mage/sets/seventhedition/TaintedAEther.java rename to Mage.Sets/src/mage/sets/seventhedition/TaintedAether.java index ffb0f582f1..0b0422bfb1 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/TaintedAEther.java +++ b/Mage.Sets/src/mage/sets/seventhedition/TaintedAether.java @@ -34,20 +34,20 @@ import java.util.UUID; * @author LoneFox */ -public class TaintedAEther extends mage.sets.urzassaga.TaintedAEther { +public class TaintedAether extends mage.sets.urzassaga.TaintedAether { - public TaintedAEther(UUID ownerId) { + public TaintedAether(UUID ownerId) { super(ownerId); this.cardNumber = "167"; this.expansionSetCode = "7ED"; } - public TaintedAEther(final TaintedAEther card) { + public TaintedAether(final TaintedAether card) { super(card); } @Override - public TaintedAEther copy() { - return new TaintedAEther(this); + public TaintedAether copy() { + return new TaintedAether(this); } } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AEthertow.java b/Mage.Sets/src/mage/sets/shadowmoor/Aethertow.java similarity index 86% rename from Mage.Sets/src/mage/sets/shadowmoor/AEthertow.java rename to Mage.Sets/src/mage/sets/shadowmoor/Aethertow.java index 14ea5359e3..256acb9cbc 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AEthertow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Aethertow.java @@ -45,40 +45,40 @@ import mage.target.common.TargetCreaturePermanent; * * @author jeffwadsworth */ -public class AEthertow extends CardImpl { +public class Aethertow extends CardImpl { private static final FilterAttackingOrBlockingCreature filter = new FilterAttackingOrBlockingCreature(); - public AEthertow(UUID ownerId) { - super(ownerId, 136, "AEthertow", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W/U}"); + public Aethertow(UUID ownerId) { + super(ownerId, 136, "Aethertow", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W/U}"); this.expansionSetCode = "SHM"; // Put target attacking or blocking creature on top of its owner's library. - this.getSpellAbility().addEffect(new AEthertowEffect()); + this.getSpellAbility().addEffect(new AethertowEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Conspire this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE)); } - public AEthertow(final AEthertow card) { + public Aethertow(final Aethertow card) { super(card); } @Override - public AEthertow copy() { - return new AEthertow(this); + public Aethertow copy() { + return new Aethertow(this); } } -class AEthertowEffect extends OneShotEffect { +class AethertowEffect extends OneShotEffect { - AEthertowEffect() { + AethertowEffect() { super(Outcome.Removal); staticText = "Put target attacking or blocking creature on top of its owner's library"; } - AEthertowEffect(final AEthertowEffect effect) { + AethertowEffect(final AethertowEffect effect) { super(effect); } @@ -93,7 +93,7 @@ class AEthertowEffect extends OneShotEffect { } @Override - public AEthertowEffect copy() { - return new AEthertowEffect(this); + public AethertowEffect copy() { + return new AethertowEffect(this); } } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java index 98b093c721..da8c9c7aa9 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java @@ -47,11 +47,11 @@ import mage.target.targetpointer.FixedTarget; public class AetherSting extends CardImpl { public AetherSting(UUID ownerId) { - super(ownerId, 76, "AEther Sting", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); + super(ownerId, 76, "Aether Sting", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); this.expansionSetCode = "UDS"; - // Whenever an opponent casts a creature spell, AEther Sting deals 1 damage to that player. + // Whenever an opponent casts a creature spell, Aether Sting deals 1 damage to that player. this.addAbility(new AetherStingTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/TaintedAEther.java b/Mage.Sets/src/mage/sets/urzassaga/TaintedAether.java similarity index 91% rename from Mage.Sets/src/mage/sets/urzassaga/TaintedAEther.java rename to Mage.Sets/src/mage/sets/urzassaga/TaintedAether.java index 24a7e00144..66e71120b2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TaintedAEther.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TaintedAether.java @@ -45,7 +45,7 @@ import mage.constants.SetTargetPointer; * @author LoneFox */ -public class TaintedAEther extends CardImpl { +public class TaintedAether extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a creature or a land"); @@ -53,8 +53,8 @@ public class TaintedAEther extends CardImpl { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND))); } - public TaintedAEther(UUID ownerId) { - super(ownerId, 161, "Tainted AEther", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); + public TaintedAether(UUID ownerId) { + super(ownerId, 161, "Tainted Aether", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "USG"; // Whenever a creature enters the battlefield, its controller sacrifices a creature or land. @@ -63,12 +63,12 @@ public class TaintedAEther extends CardImpl { "Whenever a creature enters the battlefield, its controller sacrifices a creature or land")); } - public TaintedAEther(final TaintedAEther card) { + public TaintedAether(final TaintedAether card) { super(card); } @Override - public TaintedAEther copy() { - return new TaintedAEther(this); + public TaintedAether copy() { + return new TaintedAether(this); } } diff --git a/Mage.Sets/src/mage/sets/venservskoth/AEtherMembrane.java b/Mage.Sets/src/mage/sets/venservskoth/AetherMembrane.java similarity index 89% rename from Mage.Sets/src/mage/sets/venservskoth/AEtherMembrane.java rename to Mage.Sets/src/mage/sets/venservskoth/AetherMembrane.java index b199791fa0..00b8134927 100644 --- a/Mage.Sets/src/mage/sets/venservskoth/AEtherMembrane.java +++ b/Mage.Sets/src/mage/sets/venservskoth/AetherMembrane.java @@ -44,10 +44,10 @@ import mage.constants.Rarity; * * @author klayhamn */ -public class AEtherMembrane extends CardImpl { +public class AetherMembrane extends CardImpl { - public AEtherMembrane(UUID ownerId) { - super(ownerId, 48, "AEther Membrane", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); + public AetherMembrane(UUID ownerId) { + super(ownerId, 48, "Aether Membrane", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "DDI"; this.subtype.add("Wall"); this.power = new MageInt(0); @@ -57,19 +57,19 @@ public class AEtherMembrane extends CardImpl { this.addAbility(ReachAbility.getInstance()); this.addAbility(DefenderAbility.getInstance()); - // Whenever AEther Membrane blocks a creature, return that creature to its owner's hand at end of combat. + // Whenever Aether Membrane blocks a creature, return that creature to its owner's hand at end of combat. Effect effect = new ReturnToHandTargetEffect(); effect.setText("return that creature to its owner's hand at end of combat"); this.addAbility(new BlocksCreatureTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true)); } - public AEtherMembrane(final AEtherMembrane card) { + public AetherMembrane(final AetherMembrane card) { super(card); } @Override - public AEtherMembrane copy() { - return new AEtherMembrane(this); + public AetherMembrane copy() { + return new AetherMembrane(this); } } diff --git a/Mage.Sets/src/mage/sets/vintagemasters/AEtherMutation.java b/Mage.Sets/src/mage/sets/vintagemasters/AetherMutation.java similarity index 88% rename from Mage.Sets/src/mage/sets/vintagemasters/AEtherMutation.java rename to Mage.Sets/src/mage/sets/vintagemasters/AetherMutation.java index 408e781624..fe5e4c6a36 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/AEtherMutation.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/AetherMutation.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class AEtherMutation extends mage.sets.apocalypse.AEtherMutation { +public class AetherMutation extends mage.sets.apocalypse.AetherMutation { - public AEtherMutation(UUID ownerId) { + public AetherMutation(UUID ownerId) { super(ownerId); this.cardNumber = "241"; this.expansionSetCode = "VMA"; } - public AEtherMutation(final AEtherMutation card) { + public AetherMutation(final AetherMutation card) { super(card); } @Override - public AEtherMutation copy() { - return new AEtherMutation(this); + public AetherMutation copy() { + return new AetherMutation(this); } } diff --git a/Mage.Sets/src/mage/sets/weatherlight/AEtherFlash.java b/Mage.Sets/src/mage/sets/weatherlight/AetherFlash.java similarity index 89% rename from Mage.Sets/src/mage/sets/weatherlight/AEtherFlash.java rename to Mage.Sets/src/mage/sets/weatherlight/AetherFlash.java index 6905d9b373..56a02c6b2c 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/AEtherFlash.java +++ b/Mage.Sets/src/mage/sets/weatherlight/AetherFlash.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author Quercitron */ -public class AEtherFlash extends mage.sets.seventhedition.AEtherFlash { +public class AetherFlash extends mage.sets.seventhedition.AetherFlash { - public AEtherFlash(UUID ownerId) { + public AetherFlash(UUID ownerId) { super(ownerId); this.cardNumber = "88"; this.expansionSetCode = "WTH"; } - public AEtherFlash(final AEtherFlash card) { + public AetherFlash(final AetherFlash card) { super(card); } @Override - public AEtherFlash copy() { - return new AEtherFlash(this); + public AetherFlash copy() { + return new AetherFlash(this); } } diff --git a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/worldwake/AetherTradewinds.java similarity index 84% rename from Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java rename to Mage.Sets/src/mage/sets/worldwake/AetherTradewinds.java index d05fa3742b..4a2c2e5402 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java +++ b/Mage.Sets/src/mage/sets/worldwake/AetherTradewinds.java @@ -44,50 +44,49 @@ import mage.target.common.TargetControlledPermanent; * * @author jeffwadsworth */ -public class AEtherTradewinds extends CardImpl { - +public class AetherTradewinds extends CardImpl { + private static final FilterPermanent filter = new FilterPermanent("permanent you don't control"); - + static { filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } - public AEtherTradewinds(UUID ownerId) { - super(ownerId, 24, "AEther Tradewinds", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); + public AetherTradewinds(UUID ownerId) { + super(ownerId, 24, "Aether Tradewinds", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); this.expansionSetCode = "WWK"; // Return target permanent you control and target permanent you don't control to their owners' hands. this.getSpellAbility().addTarget(new TargetControlledPermanent()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); - this.getSpellAbility().addEffect(new AEtherTradewindsEffect()); - + this.getSpellAbility().addEffect(new AetherTradewindsEffect()); } - public AEtherTradewinds(final AEtherTradewinds card) { + public AetherTradewinds(final AetherTradewinds card) { super(card); } @Override - public AEtherTradewinds copy() { - return new AEtherTradewinds(this); + public AetherTradewinds copy() { + return new AetherTradewinds(this); } } -class AEtherTradewindsEffect extends OneShotEffect { +class AetherTradewindsEffect extends OneShotEffect { - public AEtherTradewindsEffect() { + public AetherTradewindsEffect() { super(Outcome.ReturnToHand); this.staticText = "Return target permanent you control and target permanent you don't control to their owners' hands"; } - public AEtherTradewindsEffect(final AEtherTradewindsEffect effect) { + public AetherTradewindsEffect(final AetherTradewindsEffect effect) { super(effect); } @Override - public AEtherTradewindsEffect copy() { - return new AEtherTradewindsEffect(this); + public AetherTradewindsEffect copy() { + return new AetherTradewindsEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index d5b4caaa4a..957ec23a8a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -46,20 +46,20 @@ import mage.counters.CounterType; public class AetherFigment extends CardImpl { public AetherFigment(UUID ownerId) { - super(ownerId, 40, "AEther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + super(ownerId, 40, "Aether Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "ZEN"; this.subtype.add("Illusion"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // AEther Figment can't be blocked. + // Aether Figment can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); // Kicker {3} this.addAbility(new KickerAbility("{3}")); - // If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it + // If Aether Figment was kicked, it enters the battlefield with two +1/+1 counters on it Ability ability = new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), KickedCondition.getInstance(), diff --git a/Mage.Tests/CommanderDuel.dck b/Mage.Tests/CommanderDuel.dck index 2999d2ef2b..1780c5e49c 100644 --- a/Mage.Tests/CommanderDuel.dck +++ b/Mage.Tests/CommanderDuel.dck @@ -64,7 +64,7 @@ NAME:Sworn to Darkness 1 [C14:136] Black Sun's Zenith 1 [C14:135] Bad Moon 1 [C14:134] Annihilate -1 [C14:133] AEther Snap +1 [C14:133] Aether Snap 1 [C14:298] Ghost Quarter 1 [C14:132] Abyssal Persecutor 1 [C14:250] Mind Stone diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java similarity index 59% rename from Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java index cebf7db41d..234dafcd70 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java @@ -9,29 +9,29 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author noxx */ -public class AEtherFigmentTest extends CardTestPlayerBase { +public class AetherFigmentTest extends CardTestPlayerBase { /* - AEther Figment {1}{U} + Aether Figment {1}{U} Creature - Illusion 1/1 Kicker {3} (You may pay an additional as you cast this spell.) - AEther Figment can't be blocked. - If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it. + Aether Figment can't be blocked. + If Aether Figment was kicked, it enters the battlefield with two +1/+1 counters on it. */ @Test public void testEnteringWithCounters() { addCard(Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Zone.HAND, playerA, "AEther Figment"); + addCard(Zone.HAND, playerA, "Aether Figment"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "AEther Figment"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "AEther Figment", 1); - assertPowerToughness(playerA, "AEther Figment", 3, 3); + assertPermanentCount(playerA, "Aether Figment", 1); + assertPowerToughness(playerA, "Aether Figment", 3, 3); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java index 66f91668a8..7eb8817b02 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java @@ -156,7 +156,7 @@ public class CloudshiftTest extends CardTestPlayerBase { /* I had a Stoneforge Mystic equipped with a Umesawa's Jitte. I activated Jitte 4 times to make - Stoneforge Mystic 9/10. My opponent put into play a Flickerwisp with his AEther Vial and + Stoneforge Mystic 9/10. My opponent put into play a Flickerwisp with his Aether Vial and targeted my Stoneforge Mystic. At the end of my turn, Stoneforge Mystic came back as a 9/10, before going down to 1/2 normally once my turn ended. */ diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java index 3020a79464..0c5107783f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java @@ -70,43 +70,43 @@ public class KickerTest extends CardTestPlayerBase { * */ /** - * AEther Figment Creature — Illusion 1/1, 1U (2) Kicker {3} (You may pay an - * additional {3} as you cast this spell.) AEther Figment can't be blocked. - * If AEther Figment was kicked, it enters the battlefield with two +1/+1 + * Aether Figment Creature — Illusion 1/1, 1U (2) Kicker {3} (You may pay an + * additional {3} as you cast this spell.) Aether Figment can't be blocked. + * If Aether Figment was kicked, it enters the battlefield with two +1/+1 * counters on it. * */ @Test public void testUseKicker() { addCard(Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Zone.HAND, playerA, "AEther Figment"); + addCard(Zone.HAND, playerA, "Aether Figment"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "AEther Figment"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); setChoice(playerA, "Yes"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "AEther Figment", 1); - assertCounterCount("AEther Figment", CounterType.P1P1, 2); - assertPowerToughness(playerA, "AEther Figment", 3, 3); + assertPermanentCount(playerA, "Aether Figment", 1); + assertCounterCount("Aether Figment", CounterType.P1P1, 2); + assertPowerToughness(playerA, "Aether Figment", 3, 3); } @Test public void testDontUseKicker() { addCard(Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Zone.HAND, playerA, "AEther Figment"); + addCard(Zone.HAND, playerA, "Aether Figment"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "AEther Figment"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aether Figment"); setChoice(playerA, "No"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "AEther Figment", 1); - assertCounterCount("AEther Figment", CounterType.P1P1, 0); - assertPowerToughness(playerA, "AEther Figment", 1, 1); + assertPermanentCount(playerA, "Aether Figment", 1); + assertCounterCount("Aether Figment", CounterType.P1P1, 0); + assertPowerToughness(playerA, "Aether Figment", 1, 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/canttarget/CanopyCoverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/canttarget/CanopyCoverTest.java index 54e0f1371a..8ed30539e3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/canttarget/CanopyCoverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/canttarget/CanopyCoverTest.java @@ -67,8 +67,8 @@ public class CanopyCoverTest extends CardTestPlayerBase { @Test public void testCantBeTargetedWithAbilities() { - // {U},Sacrifice AEther Spellbomb: Return target creature to its owner's hand. - addCard(Zone.BATTLEFIELD, playerB, "AEther Spellbomb"); + // {U},Sacrifice Aether Spellbomb: Return target creature to its owner's hand. + addCard(Zone.BATTLEFIELD, playerB, "Aether Spellbomb"); addCard(Zone.BATTLEFIELD, playerB, "Island", 1); addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); // 2/2 Creature - Lion @@ -87,7 +87,7 @@ public class CanopyCoverTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Canopy Cover", 1); assertPermanentCount(playerA, "Silvercoat Lion", 1); - assertGraveyardCount(playerB, "AEther Spellbomb", 0); - assertPermanentCount(playerB, "AEther Spellbomb", 1); + assertGraveyardCount(playerB, "Aether Spellbomb", 0); + assertPermanentCount(playerB, "Aether Spellbomb", 1); } } diff --git a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java index 77f1d7aac5..420553f0a9 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java @@ -75,7 +75,7 @@ public class TxtDeckImporter extends DeckImporter { } String lineNum = line.substring(0, delim).trim(); String lineName = line.substring(delim).replace("’", "\'").trim(); - lineName = lineName.replace("&", "//").replace("Æ", "AE").replace("ö", "ö").replace("û", "u").replace("\"", "'"); + lineName = lineName.replace("&", "//").replace("Æ", "Ae").replace("ö", "ö").replace("û", "u").replace("\"", "'"); if (lineName.contains("//") && !lineName.contains(" // ")) { lineName = lineName.replace("//", " // "); }