diff --git a/Mage.Sets/src/mage/sets/Commander2013.java b/Mage.Sets/src/mage/sets/Commander2013Edition.java similarity index 99% rename from Mage.Sets/src/mage/sets/Commander2013.java rename to Mage.Sets/src/mage/sets/Commander2013Edition.java index 7c9484a17a2..61f9d767304 100644 --- a/Mage.Sets/src/mage/sets/Commander2013.java +++ b/Mage.Sets/src/mage/sets/Commander2013Edition.java @@ -10,15 +10,15 @@ import mage.constants.SetType; * * @author LevelX2 */ -public final class Commander2013 extends ExpansionSet { +public final class Commander2013Edition extends ExpansionSet { - private static final Commander2013 instance = new Commander2013(); + private static final Commander2013Edition instance = new Commander2013Edition(); - public static Commander2013 getInstance() { + public static Commander2013Edition getInstance() { return instance; } - private Commander2013() { + private Commander2013Edition() { super("Commander 2013 Edition", "C13", ExpansionSet.buildDate(2013, 11, 01), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Acidic Slime", 134, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2014.java b/Mage.Sets/src/mage/sets/Commander2014Edition.java similarity index 99% rename from Mage.Sets/src/mage/sets/Commander2014.java rename to Mage.Sets/src/mage/sets/Commander2014Edition.java index c46d84f5e40..e3422ee3ea1 100644 --- a/Mage.Sets/src/mage/sets/Commander2014.java +++ b/Mage.Sets/src/mage/sets/Commander2014Edition.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author LevelX2 */ -public final class Commander2014 extends ExpansionSet { +public final class Commander2014Edition extends ExpansionSet { - private static final Commander2014 instance = new Commander2014(); + private static final Commander2014Edition instance = new Commander2014Edition(); - public static Commander2014 getInstance() { + public static Commander2014Edition getInstance() { return instance; } - private Commander2014() { + private Commander2014Edition() { super("Commander 2014 Edition", "C14", ExpansionSet.buildDate(2014, 11, 07), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Abyssal Persecutor", 132, Rarity.MYTHIC, mage.cards.a.AbyssalPersecutor.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2015.java b/Mage.Sets/src/mage/sets/Commander2015Edition.java similarity index 99% rename from Mage.Sets/src/mage/sets/Commander2015.java rename to Mage.Sets/src/mage/sets/Commander2015Edition.java index 419958c4c66..912003f5df1 100644 --- a/Mage.Sets/src/mage/sets/Commander2015.java +++ b/Mage.Sets/src/mage/sets/Commander2015Edition.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author fireshoes */ -public final class Commander2015 extends ExpansionSet { +public final class Commander2015Edition extends ExpansionSet { - private static final Commander2015 instance = new Commander2015(); + private static final Commander2015Edition instance = new Commander2015Edition(); - public static Commander2015 getInstance() { + public static Commander2015Edition getInstance() { return instance; } - private Commander2015() { + private Commander2015Edition() { super("Commander 2015 Edition", "C15", ExpansionSet.buildDate(2015, 11, 13), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Acidic Slime", 173, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2016.java b/Mage.Sets/src/mage/sets/Commander2016Edition.java similarity index 99% rename from Mage.Sets/src/mage/sets/Commander2016.java rename to Mage.Sets/src/mage/sets/Commander2016Edition.java index 33f69b2b7f3..5ea0f337792 100644 --- a/Mage.Sets/src/mage/sets/Commander2016.java +++ b/Mage.Sets/src/mage/sets/Commander2016Edition.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author fireshoeS */ -public final class Commander2016 extends ExpansionSet { +public final class Commander2016Edition extends ExpansionSet { - private static final Commander2016 instance = new Commander2016(); + private static final Commander2016Edition instance = new Commander2016Edition(); - public static Commander2016 getInstance() { + public static Commander2016Edition getInstance() { return instance; } - private Commander2016() { + private Commander2016Edition() { super("Commander 2016 Edition", "C16", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; cards.add(new SetCardInfo("Abzan Charm", 177, Rarity.UNCOMMON, mage.cards.a.AbzanCharm.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2017.java b/Mage.Sets/src/mage/sets/Commander2017Edition.java similarity index 99% rename from Mage.Sets/src/mage/sets/Commander2017.java rename to Mage.Sets/src/mage/sets/Commander2017Edition.java index c9ee763771f..067b25ee9c1 100644 --- a/Mage.Sets/src/mage/sets/Commander2017.java +++ b/Mage.Sets/src/mage/sets/Commander2017Edition.java @@ -5,18 +5,17 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class Commander2017 extends ExpansionSet { +public final class Commander2017Edition extends ExpansionSet { - private static final Commander2017 instance = new Commander2017(); + private static final Commander2017Edition instance = new Commander2017Edition(); - public static Commander2017 getInstance() { + public static Commander2017Edition getInstance() { return instance; } - private Commander2017() { + private Commander2017Edition() { super("Commander 2017 Edition", "C17", ExpansionSet.buildDate(2017, 8, 25), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; diff --git a/Mage.Sets/src/mage/sets/Commander2018.java b/Mage.Sets/src/mage/sets/Commander2018Edition.java similarity index 99% rename from Mage.Sets/src/mage/sets/Commander2018.java rename to Mage.Sets/src/mage/sets/Commander2018Edition.java index 1ba0c10bd1a..ac3896c8017 100644 --- a/Mage.Sets/src/mage/sets/Commander2018.java +++ b/Mage.Sets/src/mage/sets/Commander2018Edition.java @@ -5,18 +5,17 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author TheElk801 */ -public final class Commander2018 extends ExpansionSet { +public final class Commander2018Edition extends ExpansionSet { - private static final Commander2018 instance = new Commander2018(); + private static final Commander2018Edition instance = new Commander2018Edition(); - public static Commander2018 getInstance() { + public static Commander2018Edition getInstance() { return instance; } - private Commander2018() { + private Commander2018Edition() { super("Commander 2018 Edition", "C18", ExpansionSet.buildDate(2018, 8, 10), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; diff --git a/Mage.Sets/src/mage/sets/CommanderAnthology.java b/Mage.Sets/src/mage/sets/CommanderAnthology.java index 56158dae06a..d76f9b20827 100644 --- a/Mage.Sets/src/mage/sets/CommanderAnthology.java +++ b/Mage.Sets/src/mage/sets/CommanderAnthology.java @@ -5,7 +5,6 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ public final class CommanderAnthology extends ExpansionSet { @@ -18,8 +17,9 @@ public final class CommanderAnthology extends ExpansionSet { private CommanderAnthology() { super("Commander Anthology", "CMA", ExpansionSet.buildDate(2017, 6, 9), SetType.SUPPLEMENTAL); - this.blockName = "Commander Anthology"; + this.blockName = "Command Zone"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Acidic Slime", 90, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Aerie Mystics", 1, Rarity.UNCOMMON, mage.cards.a.AerieMystics.class)); cards.add(new SetCardInfo("Aethermage's Touch", 172, Rarity.RARE, mage.cards.a.AethermagesTouch.class)); diff --git a/Mage.Sets/src/mage/sets/CommanderAnthologyVolumeII.java b/Mage.Sets/src/mage/sets/CommanderAnthologyVolumeII.java index 4290da2a3d1..748f04f533d 100644 --- a/Mage.Sets/src/mage/sets/CommanderAnthologyVolumeII.java +++ b/Mage.Sets/src/mage/sets/CommanderAnthologyVolumeII.java @@ -5,7 +5,6 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author rystan */ public class CommanderAnthologyVolumeII extends ExpansionSet { @@ -17,8 +16,8 @@ public class CommanderAnthologyVolumeII extends ExpansionSet { } private CommanderAnthologyVolumeII() { - super("Commander Anthology 2018", "CM2", ExpansionSet.buildDate(2018, 6, 8), SetType.SUPPLEMENTAL); - this.blockName = "Commander Anthology 2018"; + super("Commander Anthology Volume II", "CM2", ExpansionSet.buildDate(2018, 6, 8), SetType.SUPPLEMENTAL); + this.blockName = "Command Zone"; this.hasBasicLands = false; cards.add(new SetCardInfo("Abzan Falconer", 15, Rarity.UNCOMMON, mage.cards.a.AbzanFalconer.class)); diff --git a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java b/Mage.Sets/src/mage/sets/DuelDecksAjaniVsNicolBolas.java similarity index 97% rename from Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java rename to Mage.Sets/src/mage/sets/DuelDecksAjaniVsNicolBolas.java index bfb02daf0c4..d45057ed6fe 100644 --- a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java +++ b/Mage.Sets/src/mage/sets/DuelDecksAjaniVsNicolBolas.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author LevelX2 */ -public final class AjaniVsNicolBolas extends ExpansionSet { +public final class DuelDecksAjaniVsNicolBolas extends ExpansionSet { - private static final AjaniVsNicolBolas instance = new AjaniVsNicolBolas(); + private static final DuelDecksAjaniVsNicolBolas instance = new DuelDecksAjaniVsNicolBolas(); - public static AjaniVsNicolBolas getInstance() { + public static DuelDecksAjaniVsNicolBolas getInstance() { return instance; } - private AjaniVsNicolBolas() { + private DuelDecksAjaniVsNicolBolas() { super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", ExpansionSet.buildDate(2011, 9, 2), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java b/Mage.Sets/src/mage/sets/DuelDecksAnthologyDivineVsDemonic.java similarity index 95% rename from Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java rename to Mage.Sets/src/mage/sets/DuelDecksAnthologyDivineVsDemonic.java index 37817858834..f42dd7ce484 100644 --- a/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/DuelDecksAnthologyDivineVsDemonic.java @@ -1,4 +1,3 @@ - package mage.sets; import mage.cards.ExpansionSet; @@ -6,22 +5,22 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class AnthologyDivineVsDemonic extends ExpansionSet { +public final class DuelDecksAnthologyDivineVsDemonic extends ExpansionSet { - private static final AnthologyDivineVsDemonic instance = new AnthologyDivineVsDemonic(); + private static final DuelDecksAnthologyDivineVsDemonic instance = new DuelDecksAnthologyDivineVsDemonic(); - public static AnthologyDivineVsDemonic getInstance() { + public static DuelDecksAnthologyDivineVsDemonic getInstance() { return instance; } - private AnthologyDivineVsDemonic() { + private DuelDecksAnthologyDivineVsDemonic() { super("Duel Decks: Anthology, Divine vs. Demonic", "DD3DVD", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Abyssal Gatekeeper", 31, Rarity.COMMON, mage.cards.a.AbyssalGatekeeper.class)); cards.add(new SetCardInfo("Abyssal Specter", 40, Rarity.UNCOMMON, mage.cards.a.AbyssalSpecter.class)); cards.add(new SetCardInfo("Akroma, Angel of Wrath", 1, Rarity.MYTHIC, mage.cards.a.AkromaAngelOfWrath.class)); diff --git a/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java b/Mage.Sets/src/mage/sets/DuelDecksAnthologyElvesVsGoblins.java similarity index 96% rename from Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java rename to Mage.Sets/src/mage/sets/DuelDecksAnthologyElvesVsGoblins.java index cdb194a0c22..6da2029429e 100644 --- a/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/DuelDecksAnthologyElvesVsGoblins.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author fireshoes */ -public final class AnthologyElvesVsGoblins extends ExpansionSet { +public final class DuelDecksAnthologyElvesVsGoblins extends ExpansionSet { - private static final AnthologyElvesVsGoblins instance = new AnthologyElvesVsGoblins(); + private static final DuelDecksAnthologyElvesVsGoblins instance = new DuelDecksAnthologyElvesVsGoblins(); - public static AnthologyElvesVsGoblins getInstance() { + public static DuelDecksAnthologyElvesVsGoblins getInstance() { return instance; } - private AnthologyElvesVsGoblins() { + private DuelDecksAnthologyElvesVsGoblins() { super("Duel Decks: Anthology, Elves vs. Goblins", "DD3EVG", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; diff --git a/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java b/Mage.Sets/src/mage/sets/DuelDecksAnthologyGarrukVsLiliana.java similarity index 95% rename from Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java rename to Mage.Sets/src/mage/sets/DuelDecksAnthologyGarrukVsLiliana.java index 754a0008d65..2671bec599c 100644 --- a/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/DuelDecksAnthologyGarrukVsLiliana.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author fireshoes */ -public final class AnthologyGarrukVsLiliana extends ExpansionSet { +public final class DuelDecksAnthologyGarrukVsLiliana extends ExpansionSet { - private static final AnthologyGarrukVsLiliana instance = new AnthologyGarrukVsLiliana(); + private static final DuelDecksAnthologyGarrukVsLiliana instance = new DuelDecksAnthologyGarrukVsLiliana(); - public static AnthologyGarrukVsLiliana getInstance() { + public static DuelDecksAnthologyGarrukVsLiliana getInstance() { return instance; } - private AnthologyGarrukVsLiliana() { + private DuelDecksAnthologyGarrukVsLiliana() { super("Duel Decks: Anthology, Garruk vs. Liliana", "DD3GVL", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; diff --git a/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java b/Mage.Sets/src/mage/sets/DuelDecksAnthologyJaceVsChandra.java similarity index 95% rename from Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java rename to Mage.Sets/src/mage/sets/DuelDecksAnthologyJaceVsChandra.java index 92222d6eb94..dd1454bfe0b 100644 --- a/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/DuelDecksAnthologyJaceVsChandra.java @@ -6,22 +6,22 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class AnthologyJaceVsChandra extends ExpansionSet { +public final class DuelDecksAnthologyJaceVsChandra extends ExpansionSet { - private static final AnthologyJaceVsChandra instance = new AnthologyJaceVsChandra(); + private static final DuelDecksAnthologyJaceVsChandra instance = new DuelDecksAnthologyJaceVsChandra(); - public static AnthologyJaceVsChandra getInstance() { + public static DuelDecksAnthologyJaceVsChandra getInstance() { return instance; } - private AnthologyJaceVsChandra() { + private DuelDecksAnthologyJaceVsChandra() { super("Duel Decks: Anthology, Jace vs. Chandra", "DD3JVC", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Aethersnipe", 17, Rarity.COMMON, mage.cards.a.Aethersnipe.class)); cards.add(new SetCardInfo("Air Elemental", 13, Rarity.UNCOMMON, mage.cards.a.AirElemental.class)); cards.add(new SetCardInfo("Ancestral Vision", 21, Rarity.RARE, mage.cards.a.AncestralVision.class)); diff --git a/Mage.Sets/src/mage/sets/BlessedVsCursed.java b/Mage.Sets/src/mage/sets/DuelDecksBlessedVsCursed.java similarity index 97% rename from Mage.Sets/src/mage/sets/BlessedVsCursed.java rename to Mage.Sets/src/mage/sets/DuelDecksBlessedVsCursed.java index 82d2cfd6972..3ecad9f7b83 100644 --- a/Mage.Sets/src/mage/sets/BlessedVsCursed.java +++ b/Mage.Sets/src/mage/sets/DuelDecksBlessedVsCursed.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author fireshoes */ -public final class BlessedVsCursed extends ExpansionSet { +public final class DuelDecksBlessedVsCursed extends ExpansionSet { - private static final BlessedVsCursed instance = new BlessedVsCursed(); + private static final DuelDecksBlessedVsCursed instance = new DuelDecksBlessedVsCursed(); - public static BlessedVsCursed getInstance() { + public static DuelDecksBlessedVsCursed getInstance() { return instance; } - private BlessedVsCursed() { + private DuelDecksBlessedVsCursed() { super("Duel Decks: Blessed vs. Cursed", "DDQ", ExpansionSet.buildDate(2016, 2, 26), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/DivineVsDemonic.java b/Mage.Sets/src/mage/sets/DuelDecksDivineVsDemonic.java similarity index 96% rename from Mage.Sets/src/mage/sets/DivineVsDemonic.java rename to Mage.Sets/src/mage/sets/DuelDecksDivineVsDemonic.java index 6e942f99ece..16f37617aae 100644 --- a/Mage.Sets/src/mage/sets/DivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/DuelDecksDivineVsDemonic.java @@ -1,4 +1,3 @@ - package mage.sets; import mage.cards.ExpansionSet; @@ -6,21 +5,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class DivineVsDemonic extends ExpansionSet { +public final class DuelDecksDivineVsDemonic extends ExpansionSet { - private static final DivineVsDemonic instance = new DivineVsDemonic(); + private static final DuelDecksDivineVsDemonic instance = new DuelDecksDivineVsDemonic(); - public static DivineVsDemonic getInstance() { + public static DuelDecksDivineVsDemonic getInstance() { return instance; } - private DivineVsDemonic() { + private DuelDecksDivineVsDemonic() { super("Duel Decks: Divine vs. Demonic", "DDC", ExpansionSet.buildDate(2009, 04, 10), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Abyssal Gatekeeper", 31, Rarity.COMMON, mage.cards.a.AbyssalGatekeeper.class)); cards.add(new SetCardInfo("Abyssal Specter", 40, Rarity.UNCOMMON, mage.cards.a.AbyssalSpecter.class)); cards.add(new SetCardInfo("Akroma, Angel of Wrath", 1, Rarity.MYTHIC, mage.cards.a.AkromaAngelOfWrath.class)); diff --git a/Mage.Sets/src/mage/sets/ElspethVsKiora.java b/Mage.Sets/src/mage/sets/DuelDecksElspethVsKiora.java similarity index 96% rename from Mage.Sets/src/mage/sets/ElspethVsKiora.java rename to Mage.Sets/src/mage/sets/DuelDecksElspethVsKiora.java index 48ea7fd9357..28e7c01358c 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsKiora.java +++ b/Mage.Sets/src/mage/sets/DuelDecksElspethVsKiora.java @@ -7,21 +7,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class ElspethVsKiora extends ExpansionSet { +public final class DuelDecksElspethVsKiora extends ExpansionSet { - private static final ElspethVsKiora instance = new ElspethVsKiora(); + private static final DuelDecksElspethVsKiora instance = new DuelDecksElspethVsKiora(); - public static ElspethVsKiora getInstance() { + public static DuelDecksElspethVsKiora getInstance() { return instance; } - private ElspethVsKiora() { + private DuelDecksElspethVsKiora() { super("Duel Decks: Elspeth vs. Kiora", "DDO", ExpansionSet.buildDate(2015, 2, 27), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Accumulated Knowledge", 35, Rarity.COMMON, mage.cards.a.AccumulatedKnowledge.class)); cards.add(new SetCardInfo("Aetherize", 36, Rarity.UNCOMMON, mage.cards.a.Aetherize.class)); cards.add(new SetCardInfo("Banisher Priest", 2, Rarity.UNCOMMON, mage.cards.b.BanisherPriest.class)); diff --git a/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java b/Mage.Sets/src/mage/sets/DuelDecksElspethVsTezzeret.java similarity index 97% rename from Mage.Sets/src/mage/sets/ElspethVsTezzeret.java rename to Mage.Sets/src/mage/sets/DuelDecksElspethVsTezzeret.java index 14916286f21..427978c1dbd 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java +++ b/Mage.Sets/src/mage/sets/DuelDecksElspethVsTezzeret.java @@ -4,18 +4,19 @@ import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; -public final class ElspethVsTezzeret extends ExpansionSet { +public final class DuelDecksElspethVsTezzeret extends ExpansionSet { - private static final ElspethVsTezzeret instance = new ElspethVsTezzeret(); + private static final DuelDecksElspethVsTezzeret instance = new DuelDecksElspethVsTezzeret(); - public static ElspethVsTezzeret getInstance() { + public static DuelDecksElspethVsTezzeret getInstance() { return instance; } - private ElspethVsTezzeret() { + private DuelDecksElspethVsTezzeret() { super("Duel Decks: Elspeth vs. Tezzeret", "DDF", ExpansionSet.buildDate(2010, 8, 3), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Abolish", 29, Rarity.UNCOMMON, mage.cards.a.Abolish.class)); cards.add(new SetCardInfo("Aether Spellbomb", 61, Rarity.COMMON, mage.cards.a.AetherSpellbomb.class)); cards.add(new SetCardInfo("Angel of Salvation", 20, Rarity.RARE, mage.cards.a.AngelOfSalvation.class)); diff --git a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java b/Mage.Sets/src/mage/sets/DuelDecksElvesVsGoblins.java similarity index 96% rename from Mage.Sets/src/mage/sets/ElvesVsGoblins.java rename to Mage.Sets/src/mage/sets/DuelDecksElvesVsGoblins.java index 3d26f6113bc..086c78f6956 100644 --- a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/DuelDecksElvesVsGoblins.java @@ -5,21 +5,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class ElvesVsGoblins extends ExpansionSet { +public final class DuelDecksElvesVsGoblins extends ExpansionSet { - private static final ElvesVsGoblins instance = new ElvesVsGoblins(); + private static final DuelDecksElvesVsGoblins instance = new DuelDecksElvesVsGoblins(); - public static ElvesVsGoblins getInstance() { + public static DuelDecksElvesVsGoblins getInstance() { return instance; } - private ElvesVsGoblins() { + private DuelDecksElvesVsGoblins() { super("Duel Decks: Elves vs. Goblins", "EVG", ExpansionSet.buildDate(2007, 11, 16), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Akki Coalflinger", 33, Rarity.UNCOMMON, mage.cards.a.AkkiCoalflinger.class)); cards.add(new SetCardInfo("Allosaurus Rider", 2, Rarity.RARE, mage.cards.a.AllosaurusRider.class)); cards.add(new SetCardInfo("Ambush Commander", 1, Rarity.RARE, mage.cards.a.AmbushCommander.class)); diff --git a/Mage.Sets/src/mage/sets/ElvesVsInventors.java b/Mage.Sets/src/mage/sets/DuelDecksElvesVsInventors.java similarity index 97% rename from Mage.Sets/src/mage/sets/ElvesVsInventors.java rename to Mage.Sets/src/mage/sets/DuelDecksElvesVsInventors.java index 7bfcee63392..1624a92d500 100644 --- a/Mage.Sets/src/mage/sets/ElvesVsInventors.java +++ b/Mage.Sets/src/mage/sets/DuelDecksElvesVsInventors.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author TheElk801 */ -public final class ElvesVsInventors extends ExpansionSet { +public final class DuelDecksElvesVsInventors extends ExpansionSet { - private static final ElvesVsInventors instance = new ElvesVsInventors(); + private static final DuelDecksElvesVsInventors instance = new DuelDecksElvesVsInventors(); - public static ElvesVsInventors getInstance() { + public static DuelDecksElvesVsInventors getInstance() { return instance; } - private ElvesVsInventors() { + private DuelDecksElvesVsInventors() { super("Duel Decks: Elves vs. Inventors", "DDU", ExpansionSet.buildDate(2018, 4, 6), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; + cards.add(new SetCardInfo("Artificer's Epiphany", 36, Rarity.COMMON, mage.cards.a.ArtificersEpiphany.class)); cards.add(new SetCardInfo("Barrage Ogre", 44, Rarity.UNCOMMON, mage.cards.b.BarrageOgre.class)); cards.add(new SetCardInfo("Darksteel Citadel", 65, Rarity.UNCOMMON, mage.cards.d.DarksteelCitadel.class)); diff --git a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java b/Mage.Sets/src/mage/sets/DuelDecksGarrukVsLiliana.java similarity index 96% rename from Mage.Sets/src/mage/sets/GarrukVsLiliana.java rename to Mage.Sets/src/mage/sets/DuelDecksGarrukVsLiliana.java index f1d2fe5342d..784b1a1b27d 100644 --- a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/DuelDecksGarrukVsLiliana.java @@ -10,21 +10,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class GarrukVsLiliana extends ExpansionSet { +public final class DuelDecksGarrukVsLiliana extends ExpansionSet { - private static final GarrukVsLiliana instance = new GarrukVsLiliana(); + private static final DuelDecksGarrukVsLiliana instance = new DuelDecksGarrukVsLiliana(); - public static GarrukVsLiliana getInstance() { + public static DuelDecksGarrukVsLiliana getInstance() { return instance; } - private GarrukVsLiliana() { + private DuelDecksGarrukVsLiliana() { super("Duel Decks: Garruk vs. Liliana", "DDD", ExpansionSet.buildDate(2009, 10, 30), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Albino Troll", 3, Rarity.UNCOMMON, mage.cards.a.AlbinoTroll.class)); cards.add(new SetCardInfo("Bad Moon", 48, Rarity.RARE, mage.cards.b.BadMoon.class)); cards.add(new SetCardInfo("Basking Rootwalla", 2, Rarity.COMMON, mage.cards.b.BaskingRootwalla.class)); diff --git a/Mage.Sets/src/mage/sets/HeroesVsMonsters.java b/Mage.Sets/src/mage/sets/DuelDecksHeroesVsMonsters.java similarity index 97% rename from Mage.Sets/src/mage/sets/HeroesVsMonsters.java rename to Mage.Sets/src/mage/sets/DuelDecksHeroesVsMonsters.java index 57b9a99bf7f..d629798273f 100644 --- a/Mage.Sets/src/mage/sets/HeroesVsMonsters.java +++ b/Mage.Sets/src/mage/sets/DuelDecksHeroesVsMonsters.java @@ -6,21 +6,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class HeroesVsMonsters extends ExpansionSet { +public final class DuelDecksHeroesVsMonsters extends ExpansionSet { - private static final HeroesVsMonsters instance = new HeroesVsMonsters(); + private static final DuelDecksHeroesVsMonsters instance = new DuelDecksHeroesVsMonsters(); - public static HeroesVsMonsters getInstance() { + public static DuelDecksHeroesVsMonsters getInstance() { return instance; } - private HeroesVsMonsters() { + private DuelDecksHeroesVsMonsters() { super("Duel Decks: Heroes vs. Monsters", "DDL", ExpansionSet.buildDate(2013, 9, 6), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Anax and Cymede", 11, Rarity.RARE, mage.cards.a.AnaxAndCymede.class)); cards.add(new SetCardInfo("Armory Guard", 12, Rarity.COMMON, mage.cards.a.ArmoryGuard.class)); cards.add(new SetCardInfo("Auramancer", 9, Rarity.COMMON, mage.cards.a.Auramancer.class)); diff --git a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java b/Mage.Sets/src/mage/sets/DuelDecksIzzetVsGolgari.java similarity index 97% rename from Mage.Sets/src/mage/sets/IzzetVsGolgari.java rename to Mage.Sets/src/mage/sets/DuelDecksIzzetVsGolgari.java index 7c6b49e11cd..be47d4f9945 100644 --- a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java +++ b/Mage.Sets/src/mage/sets/DuelDecksIzzetVsGolgari.java @@ -6,21 +6,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class IzzetVsGolgari extends ExpansionSet { +public final class DuelDecksIzzetVsGolgari extends ExpansionSet { - private static final IzzetVsGolgari instance = new IzzetVsGolgari(); + private static final DuelDecksIzzetVsGolgari instance = new DuelDecksIzzetVsGolgari(); - public static IzzetVsGolgari getInstance() { + public static DuelDecksIzzetVsGolgari getInstance() { return instance; } - private IzzetVsGolgari() { + private DuelDecksIzzetVsGolgari() { super("Duel Decks: Izzet vs. Golgari", "DDJ", ExpansionSet.buildDate(2012, 9, 7), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Barren Moor", 78, Rarity.COMMON, mage.cards.b.BarrenMoor.class)); cards.add(new SetCardInfo("Boneyard Wurm", 51, Rarity.UNCOMMON, mage.cards.b.BoneyardWurm.class)); cards.add(new SetCardInfo("Brainstorm", 13, Rarity.COMMON, mage.cards.b.Brainstorm.class)); diff --git a/Mage.Sets/src/mage/sets/JaceVsChandra.java b/Mage.Sets/src/mage/sets/DuelDecksJaceVsChandra.java similarity index 96% rename from Mage.Sets/src/mage/sets/JaceVsChandra.java rename to Mage.Sets/src/mage/sets/DuelDecksJaceVsChandra.java index ad36e26b9a5..4e1e9fde865 100644 --- a/Mage.Sets/src/mage/sets/JaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/DuelDecksJaceVsChandra.java @@ -10,21 +10,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class JaceVsChandra extends ExpansionSet { +public final class DuelDecksJaceVsChandra extends ExpansionSet { - private static final JaceVsChandra instance = new JaceVsChandra(); + private static final DuelDecksJaceVsChandra instance = new DuelDecksJaceVsChandra(); - public static JaceVsChandra getInstance() { + public static DuelDecksJaceVsChandra getInstance() { return instance; } - private JaceVsChandra() { + private DuelDecksJaceVsChandra() { super("Duel Decks: Jace vs. Chandra", "DD2", ExpansionSet.buildDate(2008, 11, 07), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Aethersnipe", 17, Rarity.COMMON, mage.cards.a.Aethersnipe.class)); cards.add(new SetCardInfo("Air Elemental", 13, Rarity.UNCOMMON, mage.cards.a.AirElemental.class)); cards.add(new SetCardInfo("Ancestral Vision", 21, Rarity.RARE, mage.cards.a.AncestralVision.class)); diff --git a/Mage.Sets/src/mage/sets/JaceVsVraska.java b/Mage.Sets/src/mage/sets/DuelDecksJaceVsVraska.java similarity index 97% rename from Mage.Sets/src/mage/sets/JaceVsVraska.java rename to Mage.Sets/src/mage/sets/DuelDecksJaceVsVraska.java index 097572aa148..ace1a7b25e2 100644 --- a/Mage.Sets/src/mage/sets/JaceVsVraska.java +++ b/Mage.Sets/src/mage/sets/DuelDecksJaceVsVraska.java @@ -6,21 +6,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class JaceVsVraska extends ExpansionSet { +public final class DuelDecksJaceVsVraska extends ExpansionSet { - private static final JaceVsVraska instance = new JaceVsVraska(); + private static final DuelDecksJaceVsVraska instance = new DuelDecksJaceVsVraska(); - public static JaceVsVraska getInstance() { + public static DuelDecksJaceVsVraska getInstance() { return instance; } - private JaceVsVraska() { + private DuelDecksJaceVsVraska() { super("Duel Decks: Jace vs. Vraska", "DDM", ExpansionSet.buildDate(2014, 3, 14), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Acidic Slime", 64, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Aeon Chronicler", 17, Rarity.RARE, mage.cards.a.AeonChronicler.class)); cards.add(new SetCardInfo("Aether Adept", 12, Rarity.COMMON, mage.cards.a.AetherAdept.class)); diff --git a/Mage.Sets/src/mage/sets/KnightsVsDragons.java b/Mage.Sets/src/mage/sets/DuelDecksKnightsVsDragons.java similarity index 97% rename from Mage.Sets/src/mage/sets/KnightsVsDragons.java rename to Mage.Sets/src/mage/sets/DuelDecksKnightsVsDragons.java index 4e0eb601379..560412869e3 100644 --- a/Mage.Sets/src/mage/sets/KnightsVsDragons.java +++ b/Mage.Sets/src/mage/sets/DuelDecksKnightsVsDragons.java @@ -6,21 +6,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class KnightsVsDragons extends ExpansionSet { +public final class DuelDecksKnightsVsDragons extends ExpansionSet { - private static final KnightsVsDragons instance = new KnightsVsDragons(); + private static final DuelDecksKnightsVsDragons instance = new DuelDecksKnightsVsDragons(); - public static KnightsVsDragons getInstance() { + public static DuelDecksKnightsVsDragons getInstance() { return instance; } - private KnightsVsDragons() { + private DuelDecksKnightsVsDragons() { super("Duel Decks: Knights vs. Dragons", "DDG", ExpansionSet.buildDate(2011, 4, 1), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Alaborn Cavalier", 18, Rarity.UNCOMMON, mage.cards.a.AlabornCavalier.class)); cards.add(new SetCardInfo("Armillary Sphere", 62, Rarity.COMMON, mage.cards.a.ArmillarySphere.class)); cards.add(new SetCardInfo("Benalish Lancer", 12, Rarity.COMMON, mage.cards.b.BenalishLancer.class)); diff --git a/Mage.Sets/src/mage/sets/MerfolkVsGoblins.java b/Mage.Sets/src/mage/sets/DuelDecksMerfolkVsGoblins.java similarity index 96% rename from Mage.Sets/src/mage/sets/MerfolkVsGoblins.java rename to Mage.Sets/src/mage/sets/DuelDecksMerfolkVsGoblins.java index 3fc8fd2ed83..564fabb3d12 100644 --- a/Mage.Sets/src/mage/sets/MerfolkVsGoblins.java +++ b/Mage.Sets/src/mage/sets/DuelDecksMerfolkVsGoblins.java @@ -6,18 +6,17 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class MerfolkVsGoblins extends ExpansionSet { +public final class DuelDecksMerfolkVsGoblins extends ExpansionSet { - private static final MerfolkVsGoblins instance = new MerfolkVsGoblins(); + private static final DuelDecksMerfolkVsGoblins instance = new DuelDecksMerfolkVsGoblins(); - public static MerfolkVsGoblins getInstance() { + public static DuelDecksMerfolkVsGoblins getInstance() { return instance; } - private MerfolkVsGoblins() { + private DuelDecksMerfolkVsGoblins() { super("Duel Decks: Merfolk vs. Goblins", "DDT", ExpansionSet.buildDate(2017, 11, 10), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/MindVsMight.java b/Mage.Sets/src/mage/sets/DuelDecksMindVsMight.java similarity index 96% rename from Mage.Sets/src/mage/sets/MindVsMight.java rename to Mage.Sets/src/mage/sets/DuelDecksMindVsMight.java index 00306408254..4745ee10b41 100644 --- a/Mage.Sets/src/mage/sets/MindVsMight.java +++ b/Mage.Sets/src/mage/sets/DuelDecksMindVsMight.java @@ -8,18 +8,19 @@ import mage.constants.SetType; * * @author fireshoes */ -public final class MindVsMight extends ExpansionSet { +public final class DuelDecksMindVsMight extends ExpansionSet { - private static final MindVsMight instance = new MindVsMight(); + private static final DuelDecksMindVsMight instance = new DuelDecksMindVsMight(); - public static MindVsMight getInstance() { + public static DuelDecksMindVsMight getInstance() { return instance; } - private MindVsMight() { + private DuelDecksMindVsMight() { super("Duel Decks: Mind vs. Might", "DDS", ExpansionSet.buildDate(2017, 3, 31), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Ambassador Oak", 42, Rarity.COMMON, mage.cards.a.AmbassadorOak.class)); cards.add(new SetCardInfo("Beacon of Destruction", 35, Rarity.RARE, mage.cards.b.BeaconOfDestruction.class)); cards.add(new SetCardInfo("Beacon of Tomorrows", 2, Rarity.RARE, mage.cards.b.BeaconOfTomorrows.class)); diff --git a/Mage.Sets/src/mage/sets/NissaVsObNixilis.java b/Mage.Sets/src/mage/sets/DuelDecksNissaVsObNixilis.java similarity index 96% rename from Mage.Sets/src/mage/sets/NissaVsObNixilis.java rename to Mage.Sets/src/mage/sets/DuelDecksNissaVsObNixilis.java index 30216d2d599..f05caa644c0 100644 --- a/Mage.Sets/src/mage/sets/NissaVsObNixilis.java +++ b/Mage.Sets/src/mage/sets/DuelDecksNissaVsObNixilis.java @@ -5,18 +5,17 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class NissaVsObNixilis extends ExpansionSet { +public final class DuelDecksNissaVsObNixilis extends ExpansionSet { - private static final NissaVsObNixilis instance = new NissaVsObNixilis(); + private static final DuelDecksNissaVsObNixilis instance = new DuelDecksNissaVsObNixilis(); - public static NissaVsObNixilis getInstance() { + public static DuelDecksNissaVsObNixilis getInstance() { return instance; } - private NissaVsObNixilis() { + private DuelDecksNissaVsObNixilis() { super("Duel Decks: Nissa vs. Ob Nixilis", "DDR", ExpansionSet.buildDate(2016, 9, 2), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java b/Mage.Sets/src/mage/sets/DuelDecksPhyrexiaVsTheCoalition.java similarity index 96% rename from Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java rename to Mage.Sets/src/mage/sets/DuelDecksPhyrexiaVsTheCoalition.java index e32379cc811..9ceb369deb4 100644 --- a/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java +++ b/Mage.Sets/src/mage/sets/DuelDecksPhyrexiaVsTheCoalition.java @@ -6,22 +6,22 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class PhyrexiaVsTheCoalition extends ExpansionSet { +public final class DuelDecksPhyrexiaVsTheCoalition extends ExpansionSet { - private static final PhyrexiaVsTheCoalition instance = new PhyrexiaVsTheCoalition(); + private static final DuelDecksPhyrexiaVsTheCoalition instance = new DuelDecksPhyrexiaVsTheCoalition(); - public static PhyrexiaVsTheCoalition getInstance() { + public static DuelDecksPhyrexiaVsTheCoalition getInstance() { return instance; } - private PhyrexiaVsTheCoalition() { + private DuelDecksPhyrexiaVsTheCoalition() { super("Duel Decks: Phyrexia vs. the Coalition", "DDE", ExpansionSet.buildDate(2010, 3, 19), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Allied Strategies", 63, Rarity.UNCOMMON, mage.cards.a.AlliedStrategies.class)); cards.add(new SetCardInfo("Armadillo Cloak", 58, Rarity.COMMON, mage.cards.a.ArmadilloCloak.class)); cards.add(new SetCardInfo("Bone Shredder", 5, Rarity.UNCOMMON, mage.cards.b.BoneShredder.class)); diff --git a/Mage.Sets/src/mage/sets/SorinVsTibalt.java b/Mage.Sets/src/mage/sets/DuelDecksSorinVsTibalt.java similarity index 97% rename from Mage.Sets/src/mage/sets/SorinVsTibalt.java rename to Mage.Sets/src/mage/sets/DuelDecksSorinVsTibalt.java index a4167a3b4a1..8267b5151eb 100644 --- a/Mage.Sets/src/mage/sets/SorinVsTibalt.java +++ b/Mage.Sets/src/mage/sets/DuelDecksSorinVsTibalt.java @@ -6,21 +6,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class SorinVsTibalt extends ExpansionSet { +public final class DuelDecksSorinVsTibalt extends ExpansionSet { - private static final SorinVsTibalt instance = new SorinVsTibalt(); + private static final DuelDecksSorinVsTibalt instance = new DuelDecksSorinVsTibalt(); - public static SorinVsTibalt getInstance() { + public static DuelDecksSorinVsTibalt getInstance() { return instance; } - private SorinVsTibalt() { + private DuelDecksSorinVsTibalt() { super("Duel Decks: Sorin vs. Tibalt", "DDK", ExpansionSet.buildDate(2013, 3, 15), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Absorb Vis", 31, Rarity.COMMON, mage.cards.a.AbsorbVis.class)); cards.add(new SetCardInfo("Akoum Refuge", 73, Rarity.UNCOMMON, mage.cards.a.AkoumRefuge.class)); cards.add(new SetCardInfo("Ancient Craving", 28, Rarity.RARE, mage.cards.a.AncientCraving.class)); diff --git a/Mage.Sets/src/mage/sets/SpeedVsCunning.java b/Mage.Sets/src/mage/sets/DuelDecksSpeedVsCunning.java similarity index 97% rename from Mage.Sets/src/mage/sets/SpeedVsCunning.java rename to Mage.Sets/src/mage/sets/DuelDecksSpeedVsCunning.java index 792095ff06b..7f41ae09735 100644 --- a/Mage.Sets/src/mage/sets/SpeedVsCunning.java +++ b/Mage.Sets/src/mage/sets/DuelDecksSpeedVsCunning.java @@ -6,21 +6,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class SpeedVsCunning extends ExpansionSet { +public final class DuelDecksSpeedVsCunning extends ExpansionSet { - private static final SpeedVsCunning instance = new SpeedVsCunning(); + private static final DuelDecksSpeedVsCunning instance = new DuelDecksSpeedVsCunning(); - public static SpeedVsCunning getInstance() { + public static DuelDecksSpeedVsCunning getInstance() { return instance; } - private SpeedVsCunning() { + private DuelDecksSpeedVsCunning() { super("Duel Decks: Speed vs. Cunning", "DDN", ExpansionSet.buildDate(2014, 9, 5), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Act of Treason", 26, Rarity.COMMON, mage.cards.a.ActOfTreason.class)); cards.add(new SetCardInfo("Aquamorph Entity", 54, Rarity.COMMON, mage.cards.a.AquamorphEntity.class)); cards.add(new SetCardInfo("Arcanis the Omnipotent", 42, Rarity.MYTHIC, mage.cards.a.ArcanisTheOmnipotent.class)); diff --git a/Mage.Sets/src/mage/sets/VenserVsKoth.java b/Mage.Sets/src/mage/sets/DuelDecksVenserVsKoth.java similarity index 97% rename from Mage.Sets/src/mage/sets/VenserVsKoth.java rename to Mage.Sets/src/mage/sets/DuelDecksVenserVsKoth.java index 14424bff5dc..cfab4d1272f 100644 --- a/Mage.Sets/src/mage/sets/VenserVsKoth.java +++ b/Mage.Sets/src/mage/sets/DuelDecksVenserVsKoth.java @@ -5,21 +5,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class VenserVsKoth extends ExpansionSet { +public final class DuelDecksVenserVsKoth extends ExpansionSet { - private static final VenserVsKoth instance = new VenserVsKoth(); + private static final DuelDecksVenserVsKoth instance = new DuelDecksVenserVsKoth(); - public static VenserVsKoth getInstance() { + public static DuelDecksVenserVsKoth getInstance() { return instance; } - private VenserVsKoth() { + private DuelDecksVenserVsKoth() { super("Duel Decks: Venser vs. Koth", "DDI", ExpansionSet.buildDate(2012, 3, 30), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Aether Membrane", 48, Rarity.UNCOMMON, mage.cards.a.AetherMembrane.class)); cards.add(new SetCardInfo("Angelic Shield", 27, Rarity.UNCOMMON, mage.cards.a.AngelicShield.class)); cards.add(new SetCardInfo("Anger", 51, Rarity.UNCOMMON, mage.cards.a.Anger.class)); diff --git a/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java b/Mage.Sets/src/mage/sets/DuelDecksZendikarVsEldrazi.java similarity index 96% rename from Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java rename to Mage.Sets/src/mage/sets/DuelDecksZendikarVsEldrazi.java index 63256e15608..ca327a07f07 100644 --- a/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java +++ b/Mage.Sets/src/mage/sets/DuelDecksZendikarVsEldrazi.java @@ -5,21 +5,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class ZendikarVsEldrazi extends ExpansionSet { +public final class DuelDecksZendikarVsEldrazi extends ExpansionSet { - private static final ZendikarVsEldrazi instance = new ZendikarVsEldrazi(); + private static final DuelDecksZendikarVsEldrazi instance = new DuelDecksZendikarVsEldrazi(); - public static ZendikarVsEldrazi getInstance() { + public static DuelDecksZendikarVsEldrazi getInstance() { return instance; } - private ZendikarVsEldrazi() { + private DuelDecksZendikarVsEldrazi() { super("Duel Decks: Zendikar vs. Eldrazi", "DDP", ExpansionSet.buildDate(2015, 8, 28), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks"; this.hasBasicLands = false; + cards.add(new SetCardInfo("Affa Guard Hound", 2, Rarity.UNCOMMON, mage.cards.a.AffaGuardHound.class)); cards.add(new SetCardInfo("Akoum Refuge", 67, Rarity.UNCOMMON, mage.cards.a.AkoumRefuge.class)); cards.add(new SetCardInfo("Artisan of Kozilek", 42, Rarity.UNCOMMON, mage.cards.a.ArtisanOfKozilek.class)); diff --git a/Mage.Sets/src/mage/sets/FTVAngels.java b/Mage.Sets/src/mage/sets/FromTheVaultAngels.java similarity index 89% rename from Mage.Sets/src/mage/sets/FTVAngels.java rename to Mage.Sets/src/mage/sets/FromTheVaultAngels.java index cffedcb0387..ae89485479f 100644 --- a/Mage.Sets/src/mage/sets/FTVAngels.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultAngels.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVAngels extends ExpansionSet { +public final class FromTheVaultAngels extends ExpansionSet { - private static final FTVAngels instance = new FTVAngels(); + private static final FromTheVaultAngels instance = new FromTheVaultAngels(); - public static FTVAngels getInstance() { + public static FromTheVaultAngels getInstance() { return instance; } - private FTVAngels() { + private FromTheVaultAngels() { super("From the Vault: Angels", "V15", ExpansionSet.buildDate(2015, 8, 21), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Akroma, Angel of Fury", 1, Rarity.MYTHIC, mage.cards.a.AkromaAngelOfFury.class)); cards.add(new SetCardInfo("Akroma, Angel of Wrath", 2, Rarity.MYTHIC, mage.cards.a.AkromaAngelOfWrath.class)); cards.add(new SetCardInfo("Archangel of Strife", 3, Rarity.MYTHIC, mage.cards.a.ArchangelOfStrife.class)); diff --git a/Mage.Sets/src/mage/sets/FTVAnnihilation.java b/Mage.Sets/src/mage/sets/FromTheVaultAnnihilation.java similarity index 87% rename from Mage.Sets/src/mage/sets/FTVAnnihilation.java rename to Mage.Sets/src/mage/sets/FromTheVaultAnnihilation.java index 590ecd4d04b..62289513849 100644 --- a/Mage.Sets/src/mage/sets/FTVAnnihilation.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultAnnihilation.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVAnnihilation extends ExpansionSet { +public final class FromTheVaultAnnihilation extends ExpansionSet { - private static final FTVAnnihilation instance = new FTVAnnihilation(); + private static final FromTheVaultAnnihilation instance = new FromTheVaultAnnihilation(); - public static FTVAnnihilation getInstance() { + public static FromTheVaultAnnihilation getInstance() { return instance; } - private FTVAnnihilation() { + private FromTheVaultAnnihilation() { super("From the Vault: Annihilation", "V14", ExpansionSet.buildDate(2014, 8, 22), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Armageddon", 1, Rarity.MYTHIC, mage.cards.a.Armageddon.class)); cards.add(new SetCardInfo("Burning of Xinye", 2, Rarity.MYTHIC, mage.cards.b.BurningOfXinye.class)); cards.add(new SetCardInfo("Cataclysm", 3, Rarity.MYTHIC, mage.cards.c.Cataclysm.class)); diff --git a/Mage.Sets/src/mage/sets/FTVDragons.java b/Mage.Sets/src/mage/sets/FromTheVaultDragons.java similarity index 89% rename from Mage.Sets/src/mage/sets/FTVDragons.java rename to Mage.Sets/src/mage/sets/FromTheVaultDragons.java index 7352718537c..30f2dbec178 100644 --- a/Mage.Sets/src/mage/sets/FTVDragons.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultDragons.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author fireshoes */ -public final class FTVDragons extends ExpansionSet { +public final class FromTheVaultDragons extends ExpansionSet { - private static final FTVDragons instance = new FTVDragons(); + private static final FromTheVaultDragons instance = new FromTheVaultDragons(); - public static FTVDragons getInstance() { + public static FromTheVaultDragons getInstance() { return instance; } - private FTVDragons() { + private FromTheVaultDragons() { super("From the Vault: Dragons", "DRB", ExpansionSet.buildDate(2008, 8, 29), SetType.SUPPLEMENTAL); this.hasBasicLands = false; cards.add(new SetCardInfo("Bladewing the Risen", 1, Rarity.RARE, mage.cards.b.BladewingTheRisen.class)); diff --git a/Mage.Sets/src/mage/sets/FTVExiled.java b/Mage.Sets/src/mage/sets/FromTheVaultExiled.java similarity index 88% rename from Mage.Sets/src/mage/sets/FTVExiled.java rename to Mage.Sets/src/mage/sets/FromTheVaultExiled.java index ff5db9f89d1..e6ec0fefb8f 100644 --- a/Mage.Sets/src/mage/sets/FTVExiled.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultExiled.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVExiled extends ExpansionSet { +public final class FromTheVaultExiled extends ExpansionSet { - private static final FTVExiled instance = new FTVExiled(); + private static final FromTheVaultExiled instance = new FromTheVaultExiled(); - public static FTVExiled getInstance() { + public static FromTheVaultExiled getInstance() { return instance; } - private FTVExiled() { + private FromTheVaultExiled() { super("From the Vault: Exiled", "V09", ExpansionSet.buildDate(2009, 8, 28), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Balance", 1, Rarity.MYTHIC, mage.cards.b.Balance.class)); cards.add(new SetCardInfo("Berserk", 2, Rarity.MYTHIC, mage.cards.b.Berserk.class)); cards.add(new SetCardInfo("Channel", 3, Rarity.MYTHIC, mage.cards.c.Channel.class)); diff --git a/Mage.Sets/src/mage/sets/FTVLegends.java b/Mage.Sets/src/mage/sets/FromTheVaultLegends.java similarity index 89% rename from Mage.Sets/src/mage/sets/FTVLegends.java rename to Mage.Sets/src/mage/sets/FromTheVaultLegends.java index 11dae6d3588..364affb4310 100644 --- a/Mage.Sets/src/mage/sets/FTVLegends.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultLegends.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVLegends extends ExpansionSet { +public final class FromTheVaultLegends extends ExpansionSet { - private static final FTVLegends instance = new FTVLegends(); + private static final FromTheVaultLegends instance = new FromTheVaultLegends(); - public static FTVLegends getInstance() { + public static FromTheVaultLegends getInstance() { return instance; } - private FTVLegends() { + private FromTheVaultLegends() { super("From the Vault: Legends", "V11", ExpansionSet.buildDate(2011, 8, 26), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Cao Cao, Lord of Wei", 1, Rarity.MYTHIC, mage.cards.c.CaoCaoLordOfWei.class)); cards.add(new SetCardInfo("Captain Sisay", 2, Rarity.MYTHIC, mage.cards.c.CaptainSisay.class)); cards.add(new SetCardInfo("Doran, the Siege Tower", 3, Rarity.MYTHIC, mage.cards.d.DoranTheSiegeTower.class)); diff --git a/Mage.Sets/src/mage/sets/FTVLore.java b/Mage.Sets/src/mage/sets/FromTheVaultLore.java similarity index 89% rename from Mage.Sets/src/mage/sets/FTVLore.java rename to Mage.Sets/src/mage/sets/FromTheVaultLore.java index 3fbfb9ba820..29f37a596a2 100644 --- a/Mage.Sets/src/mage/sets/FTVLore.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultLore.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVLore extends ExpansionSet { +public final class FromTheVaultLore extends ExpansionSet { - private static final FTVLore instance = new FTVLore(); + private static final FromTheVaultLore instance = new FromTheVaultLore(); - public static FTVLore getInstance() { + public static FromTheVaultLore getInstance() { return instance; } - private FTVLore() { + private FromTheVaultLore() { super("From the Vault: Lore", "V16", ExpansionSet.buildDate(2016, 8, 19), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Beseech the Queen", 1, Rarity.MYTHIC, mage.cards.b.BeseechTheQueen.class)); cards.add(new SetCardInfo("Cabal Ritual", 2, Rarity.MYTHIC, mage.cards.c.CabalRitual.class)); cards.add(new SetCardInfo("Conflux", 3, Rarity.MYTHIC, mage.cards.c.Conflux.class)); diff --git a/Mage.Sets/src/mage/sets/FTVRealms.java b/Mage.Sets/src/mage/sets/FromTheVaultRealms.java similarity index 89% rename from Mage.Sets/src/mage/sets/FTVRealms.java rename to Mage.Sets/src/mage/sets/FromTheVaultRealms.java index 3b41922476f..da6693e6b95 100644 --- a/Mage.Sets/src/mage/sets/FTVRealms.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultRealms.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVRealms extends ExpansionSet { +public final class FromTheVaultRealms extends ExpansionSet { - private static final FTVRealms instance = new FTVRealms(); + private static final FromTheVaultRealms instance = new FromTheVaultRealms(); - public static FTVRealms getInstance() { + public static FromTheVaultRealms getInstance() { return instance; } - private FTVRealms() { + private FromTheVaultRealms() { super("From the Vault: Realms", "V12", ExpansionSet.buildDate(2012, 8, 31), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Ancient Tomb", 1, Rarity.MYTHIC, mage.cards.a.AncientTomb.class)); cards.add(new SetCardInfo("Boseiju, Who Shelters All", 2, Rarity.MYTHIC, mage.cards.b.BoseijuWhoSheltersAll.class)); cards.add(new SetCardInfo("Cephalid Coliseum", 3, Rarity.MYTHIC, mage.cards.c.CephalidColiseum.class)); diff --git a/Mage.Sets/src/mage/sets/FTVRelics.java b/Mage.Sets/src/mage/sets/FromTheVaultRelics.java similarity index 89% rename from Mage.Sets/src/mage/sets/FTVRelics.java rename to Mage.Sets/src/mage/sets/FromTheVaultRelics.java index 8781c002c8a..ba2a81ed2af 100644 --- a/Mage.Sets/src/mage/sets/FTVRelics.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultRelics.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVRelics extends ExpansionSet { +public final class FromTheVaultRelics extends ExpansionSet { - private static final FTVRelics instance = new FTVRelics(); + private static final FromTheVaultRelics instance = new FromTheVaultRelics(); - public static FTVRelics getInstance() { + public static FromTheVaultRelics getInstance() { return instance; } - private FTVRelics() { + private FromTheVaultRelics() { super("From the Vault: Relics", "V10", ExpansionSet.buildDate(2010, 8, 27), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Aether Vial", 1, Rarity.MYTHIC, mage.cards.a.AetherVial.class)); cards.add(new SetCardInfo("Black Vise", 2, Rarity.MYTHIC, mage.cards.b.BlackVise.class)); cards.add(new SetCardInfo("Isochron Scepter", 3, Rarity.MYTHIC, mage.cards.i.IsochronScepter.class)); diff --git a/Mage.Sets/src/mage/sets/FTVTransform.java b/Mage.Sets/src/mage/sets/FromTheVaultTransform.java similarity index 94% rename from Mage.Sets/src/mage/sets/FTVTransform.java rename to Mage.Sets/src/mage/sets/FromTheVaultTransform.java index bf4dcd75b1a..ac08d9ce7ab 100644 --- a/Mage.Sets/src/mage/sets/FTVTransform.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultTransform.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVTransform extends ExpansionSet { +public final class FromTheVaultTransform extends ExpansionSet { - private static final FTVTransform instance = new FTVTransform(); + private static final FromTheVaultTransform instance = new FromTheVaultTransform(); - public static FTVTransform getInstance() { + public static FromTheVaultTransform getInstance() { return instance; } - private FTVTransform() { + private FromTheVaultTransform() { super("From the Vault: Transform", "V17", ExpansionSet.buildDate(2017, 11, 24), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Archangel Avacyn", 1, Rarity.MYTHIC, mage.cards.a.ArchangelAvacyn.class)); cards.add(new SetCardInfo("Avacyn, the Purifier", 1001, Rarity.MYTHIC, mage.cards.a.AvacynThePurifier.class)); cards.add(new SetCardInfo("Arguel's Blood Fast", 2, Rarity.MYTHIC, mage.cards.a.ArguelsBloodFast.class)); diff --git a/Mage.Sets/src/mage/sets/FTVTwenty.java b/Mage.Sets/src/mage/sets/FromTheVaultTwenty.java similarity index 91% rename from Mage.Sets/src/mage/sets/FTVTwenty.java rename to Mage.Sets/src/mage/sets/FromTheVaultTwenty.java index f41f6626a80..0e4878217b7 100644 --- a/Mage.Sets/src/mage/sets/FTVTwenty.java +++ b/Mage.Sets/src/mage/sets/FromTheVaultTwenty.java @@ -5,20 +5,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class FTVTwenty extends ExpansionSet { +public final class FromTheVaultTwenty extends ExpansionSet { - private static final FTVTwenty instance = new FTVTwenty(); + private static final FromTheVaultTwenty instance = new FromTheVaultTwenty(); - public static FTVTwenty getInstance() { + public static FromTheVaultTwenty getInstance() { return instance; } - private FTVTwenty() { + private FromTheVaultTwenty() { super("From the Vault: Twenty", "V13", ExpansionSet.buildDate(2013, 8, 23), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Akroma's Vengeance", 11, Rarity.MYTHIC, mage.cards.a.AkromasVengeance.class)); cards.add(new SetCardInfo("Chainer's Edict", 10, Rarity.MYTHIC, mage.cards.c.ChainersEdict.class)); cards.add(new SetCardInfo("Chameleon Colossus", 16, Rarity.MYTHIC, mage.cards.c.ChameleonColossus.class)); diff --git a/Mage.Sets/src/mage/sets/JiangYangguMuYanling.java b/Mage.Sets/src/mage/sets/GlobalSeriesJiangYangguAndMuYanling.java similarity index 93% rename from Mage.Sets/src/mage/sets/JiangYangguMuYanling.java rename to Mage.Sets/src/mage/sets/GlobalSeriesJiangYangguAndMuYanling.java index 1121e75f8c1..c63ec1e93f0 100644 --- a/Mage.Sets/src/mage/sets/JiangYangguMuYanling.java +++ b/Mage.Sets/src/mage/sets/GlobalSeriesJiangYangguAndMuYanling.java @@ -5,21 +5,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author TheElk801 */ -public final class JiangYangguMuYanling extends ExpansionSet { +public final class GlobalSeriesJiangYangguAndMuYanling extends ExpansionSet { - private static final JiangYangguMuYanling instance = new JiangYangguMuYanling(); + private static final GlobalSeriesJiangYangguAndMuYanling instance = new GlobalSeriesJiangYangguAndMuYanling(); - public static JiangYangguMuYanling getInstance() { + public static GlobalSeriesJiangYangguAndMuYanling getInstance() { return instance; } - private JiangYangguMuYanling() { + private GlobalSeriesJiangYangguAndMuYanling() { super("Global Series: Jiang Yanggu & Mu Yanling", "GS1", ExpansionSet.buildDate(2018, 6, 22), SetType.SUPPLEMENTAL_STANDARD_LEGAL); this.blockName = "Global Series"; this.hasBasicLands = true; + cards.add(new SetCardInfo("Aggressive Instinct", 34, Rarity.COMMON, mage.cards.a.AggressiveInstinct.class)); cards.add(new SetCardInfo("Ancestor Dragon", 12, Rarity.RARE, mage.cards.a.AncestorDragon.class)); cards.add(new SetCardInfo("Armored Whirl Turtle", 7, Rarity.COMMON, mage.cards.a.ArmoredWhirlTurtle.class)); diff --git a/Mage.Sets/src/mage/sets/GrandPrix.java b/Mage.Sets/src/mage/sets/GrandPrixPromos.java similarity index 92% rename from Mage.Sets/src/mage/sets/GrandPrix.java rename to Mage.Sets/src/mage/sets/GrandPrixPromos.java index f92b14e39e4..3ac13430933 100644 --- a/Mage.Sets/src/mage/sets/GrandPrix.java +++ b/Mage.Sets/src/mage/sets/GrandPrixPromos.java @@ -6,18 +6,17 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class GrandPrix extends ExpansionSet { +public final class GrandPrixPromos extends ExpansionSet { - private static final GrandPrix instance = new GrandPrix(); + private static final GrandPrixPromos instance = new GrandPrixPromos(); - public static GrandPrix getInstance() { + public static GrandPrixPromos getInstance() { return instance; } - private GrandPrix() { + private GrandPrixPromos() { super("Grand Prix Promos", "GPX", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/HasconPromo2017.java b/Mage.Sets/src/mage/sets/HasconPromo2017.java index d31b579ef81..33f69373159 100644 --- a/Mage.Sets/src/mage/sets/HasconPromo2017.java +++ b/Mage.Sets/src/mage/sets/HasconPromo2017.java @@ -9,15 +9,15 @@ import mage.constants.SetType; * * @author Saga */ -public final class HasconPromo2017 extends ExpansionSet { +public final class HASCONPromo2017 extends ExpansionSet { - private static final HasconPromo2017 instance = new HasconPromo2017(); + private static final HASCONPromo2017 instance = new HASCONPromo2017(); - public static HasconPromo2017 getInstance() { + public static HASCONPromo2017 getInstance() { return instance; } - private HasconPromo2017() { + private HASCONPromo2017() { super("HASCON Promo 2017", "H17", ExpansionSet.buildDate(2017, 9, 8), SetType.JOKESET); cards.add(new ExpansionSet.SetCardInfo("Grimlock, Dinobot Leader", "1a", Rarity.MYTHIC, mage.cards.g.GrimlockDinobotLeader.class)); cards.add(new ExpansionSet.SetCardInfo("Grimlock, Ferocious King", "1b", Rarity.MYTHIC, mage.cards.g.GrimlockFerociousKing.class)); diff --git a/Mage.Sets/src/mage/sets/Planechase2012.java b/Mage.Sets/src/mage/sets/Planechase2012Edition.java similarity index 98% rename from Mage.Sets/src/mage/sets/Planechase2012.java rename to Mage.Sets/src/mage/sets/Planechase2012Edition.java index 70ea2b24fab..3b456a8d7f7 100644 --- a/Mage.Sets/src/mage/sets/Planechase2012.java +++ b/Mage.Sets/src/mage/sets/Planechase2012Edition.java @@ -5,20 +5,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author LevelX2 */ -public final class Planechase2012 extends ExpansionSet { +public final class Planechase2012Edition extends ExpansionSet { - private static final Planechase2012 instance = new Planechase2012(); + private static final Planechase2012Edition instance = new Planechase2012Edition(); - public static Planechase2012 getInstance() { + public static Planechase2012Edition getInstance() { return instance; } - private Planechase2012() { + private Planechase2012Edition() { super("Planechase 2012 Edition", "PC2", ExpansionSet.buildDate(2012, 6, 1), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; + cards.add(new SetCardInfo("Arc Trail", 39, Rarity.UNCOMMON, mage.cards.a.ArcTrail.class)); cards.add(new SetCardInfo("Armillary Sphere", 108, Rarity.COMMON, mage.cards.a.ArmillarySphere.class)); cards.add(new SetCardInfo("Armored Griffin", 1, Rarity.UNCOMMON, mage.cards.a.ArmoredGriffin.class)); diff --git a/Mage.Sets/src/mage/sets/PDSFireAndLightning.java b/Mage.Sets/src/mage/sets/PremiumDeckSeriesFireAndLightning.java similarity index 93% rename from Mage.Sets/src/mage/sets/PDSFireAndLightning.java rename to Mage.Sets/src/mage/sets/PremiumDeckSeriesFireAndLightning.java index bd31a6d69fc..59ae252c744 100644 --- a/Mage.Sets/src/mage/sets/PDSFireAndLightning.java +++ b/Mage.Sets/src/mage/sets/PremiumDeckSeriesFireAndLightning.java @@ -6,21 +6,21 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class PDSFireAndLightning extends ExpansionSet { +public final class PremiumDeckSeriesFireAndLightning extends ExpansionSet { - private static final PDSFireAndLightning instance = new PDSFireAndLightning(); + private static final PremiumDeckSeriesFireAndLightning instance = new PremiumDeckSeriesFireAndLightning(); - public static PDSFireAndLightning getInstance() { + public static PremiumDeckSeriesFireAndLightning getInstance() { return instance; } - private PDSFireAndLightning() { + private PremiumDeckSeriesFireAndLightning() { super("Premium Deck Series: Fire and Lightning", "PD2", ExpansionSet.buildDate(2010, 11, 1), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Ball Lightning", 12, Rarity.RARE, mage.cards.b.BallLightning.class)); cards.add(new SetCardInfo("Barbarian Ring", 28, Rarity.UNCOMMON, mage.cards.b.BarbarianRing.class)); cards.add(new SetCardInfo("Boggart Ram-Gang", 13, Rarity.UNCOMMON, mage.cards.b.BoggartRamGang.class)); diff --git a/Mage.Sets/src/mage/sets/PDSGraveborn.java b/Mage.Sets/src/mage/sets/PremiumDeckSeriesGraveborn.java similarity index 92% rename from Mage.Sets/src/mage/sets/PDSGraveborn.java rename to Mage.Sets/src/mage/sets/PremiumDeckSeriesGraveborn.java index d3295c88978..0cd7b2d1d92 100644 --- a/Mage.Sets/src/mage/sets/PDSGraveborn.java +++ b/Mage.Sets/src/mage/sets/PremiumDeckSeriesGraveborn.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class PDSGraveborn extends ExpansionSet { +public final class PremiumDeckSeriesGraveborn extends ExpansionSet { - private static final PDSGraveborn instance = new PDSGraveborn(); + private static final PremiumDeckSeriesGraveborn instance = new PremiumDeckSeriesGraveborn(); - public static PDSGraveborn getInstance() { + public static PremiumDeckSeriesGraveborn getInstance() { return instance; } - private PDSGraveborn() { + private PremiumDeckSeriesGraveborn() { super("Premium Deck Series: Graveborn", "PD3", ExpansionSet.buildDate(2011, 11, 1), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Animate Dead", 16, Rarity.UNCOMMON, mage.cards.a.AnimateDead.class)); cards.add(new SetCardInfo("Avatar of Woe", 6, Rarity.RARE, mage.cards.a.AvatarOfWoe.class)); cards.add(new SetCardInfo("Blazing Archon", 11, Rarity.RARE, mage.cards.b.BlazingArchon.class)); diff --git a/Mage.Sets/src/mage/sets/PDSSlivers.java b/Mage.Sets/src/mage/sets/PremiumDeckSeriesSlivers.java similarity index 94% rename from Mage.Sets/src/mage/sets/PDSSlivers.java rename to Mage.Sets/src/mage/sets/PremiumDeckSeriesSlivers.java index 62f6d53f18d..9a0b0aa8ac1 100644 --- a/Mage.Sets/src/mage/sets/PDSSlivers.java +++ b/Mage.Sets/src/mage/sets/PremiumDeckSeriesSlivers.java @@ -6,20 +6,20 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * * @author fireshoes */ -public final class PDSSlivers extends ExpansionSet { +public final class PremiumDeckSeriesSlivers extends ExpansionSet { - private static final PDSSlivers instance = new PDSSlivers(); + private static final PremiumDeckSeriesSlivers instance = new PremiumDeckSeriesSlivers(); - public static PDSSlivers getInstance() { + public static PremiumDeckSeriesSlivers getInstance() { return instance; } - private PDSSlivers() { + private PremiumDeckSeriesSlivers() { super("Premium Deck Series: Slivers", "H09", ExpansionSet.buildDate(2009, 11, 1), SetType.SUPPLEMENTAL); this.hasBasicLands = false; + cards.add(new SetCardInfo("Acidic Sliver", 13, Rarity.UNCOMMON, mage.cards.a.AcidicSliver.class)); cards.add(new SetCardInfo("Amoeboid Changeling", 3, Rarity.COMMON, mage.cards.a.AmoeboidChangeling.class)); cards.add(new SetCardInfo("Ancient Ziggurat", 31, Rarity.UNCOMMON, mage.cards.a.AncientZiggurat.class));