From 41c6c47092cccd0afcda54273b06a9a868926b45 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 4 Feb 2015 00:34:18 +0100 Subject: [PATCH] * Added promotional, Duel Deck and Non-standard-legal sets to SetType. Changed sets and set selection accordingly. --- .../main/java/mage/client/util/sets/ConstructedFormats.java | 2 +- .../Mage.Deck.Constructed/src/mage/deck/Extended.java | 4 ++-- .../Mage.Deck.Constructed/src/mage/deck/Modern.java | 4 ++-- .../Mage.Deck.Constructed/src/mage/deck/Standard.java | 4 ++-- Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java | 2 +- Mage.Sets/src/mage/sets/Archenemy.java | 2 +- Mage.Sets/src/mage/sets/Commander.java | 2 +- Mage.Sets/src/mage/sets/Commander2013.java | 2 +- Mage.Sets/src/mage/sets/Commander2014.java | 2 +- Mage.Sets/src/mage/sets/Conspiracy.java | 2 +- Mage.Sets/src/mage/sets/DivineVsDemonic.java | 2 +- Mage.Sets/src/mage/sets/ElspethvsTezzeret.java | 2 +- Mage.Sets/src/mage/sets/ElvesVsGoblins.java | 2 +- Mage.Sets/src/mage/sets/FridayNightMagic.java | 2 +- Mage.Sets/src/mage/sets/GameDay.java | 2 +- Mage.Sets/src/mage/sets/GarrukVsLiliana.java | 2 +- Mage.Sets/src/mage/sets/GrandPrix.java | 2 +- Mage.Sets/src/mage/sets/Guru.java | 2 +- Mage.Sets/src/mage/sets/Heroesvsmonsters.java | 2 +- Mage.Sets/src/mage/sets/IzzetVsGolgari.java | 2 +- Mage.Sets/src/mage/sets/JaceVsChandra.java | 2 +- Mage.Sets/src/mage/sets/JaceVsVraska.java | 2 +- Mage.Sets/src/mage/sets/JudgePromo.java | 2 +- Mage.Sets/src/mage/sets/KnightsVsDragons.java | 2 +- Mage.Sets/src/mage/sets/LaunchParty.java | 2 +- Mage.Sets/src/mage/sets/MagicPlayerRewards.java | 2 +- Mage.Sets/src/mage/sets/MediaInserts.java | 5 ++--- Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java | 2 +- Mage.Sets/src/mage/sets/Planechase.java | 2 +- Mage.Sets/src/mage/sets/Planechase2012.java | 2 +- Mage.Sets/src/mage/sets/SorinVsTibalt.java | 2 +- Mage.Sets/src/mage/sets/SpeedVsCunning.java | 2 +- Mage.Sets/src/mage/sets/VenserVsKoth.java | 2 +- Mage.Sets/src/mage/sets/WPNGateway.java | 2 +- Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java | 2 +- Mage/src/mage/constants/SetType.java | 5 ++++- 36 files changed, 43 insertions(+), 41 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java index f04969a2ac3..c8a147d96fb 100644 --- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java +++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java @@ -564,7 +564,7 @@ public class ConstructedFormats { } for (ExpansionInfo set : ExpansionRepository.instance.getAll()) { - if (!set.getType().equals(SetType.REPRINT) && !set.getType().equals(SetType.JOKESET)) { + if (set.getType().equals(SetType.CORE) || set.getType().equals(SetType.EXPANSION)) { if (set.getReleaseDate().after(cutoff.getTime())) { standard.add(set.getCode()); } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java index ecfe093cd5e..04ec52b268c 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java @@ -53,8 +53,8 @@ public class Extended extends Constructed { cutoff = new GregorianCalendar(current.get(Calendar.YEAR) - 4, Calendar.SEPTEMBER, 1); } for (ExpansionSet set: Sets.getInstance().values()) { - if (set.getReleaseDate().after(cutoff.getTime()) && set.getSetType() != SetType.REPRINT - && set.getSetType() != SetType.JOKESET) { + if (set.getReleaseDate().after(cutoff.getTime()) && + (set.getSetType() == SetType.CORE || set.getSetType() == SetType.EXPANSION)) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java index 3f04b329770..5004b04cfb2 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Modern.java @@ -48,8 +48,8 @@ public class Modern extends Constructed { Date cutoff = new GregorianCalendar(2003, 7, 28).getTime(); // Eight edition release date for (ExpansionSet set: Sets.getInstance().values()) { - if ((set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff)) && set.getSetType() != SetType.REPRINT - && set.getSetType() != SetType.JOKESET) { + if ((set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff)) && + (set.getSetType() == SetType.CORE || set.getSetType() == SetType.EXPANSION)) { setCodes.add(set.getCode()); } } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java index 2f89e0b4f69..a16f5911702 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java @@ -54,8 +54,8 @@ public class Standard extends Constructed { cutoff = new GregorianCalendar(current.get(Calendar.YEAR) - 2, Calendar.SEPTEMBER, 1); } for (ExpansionSet set: Sets.getInstance().values()) { - if (set.getReleaseDate().after(cutoff.getTime()) && set.getSetType() != SetType.REPRINT - && set.getSetType() != SetType.JOKESET) { + if (set.getReleaseDate().after(cutoff.getTime()) && + (set.getSetType() == SetType.CORE || set.getSetType() == SetType.EXPANSION)){ setCodes.add(set.getCode()); } } diff --git a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java index 544528b3d5a..deb92113d2e 100644 --- a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java +++ b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java @@ -44,7 +44,7 @@ public class AjaniVsNicolBolas extends ExpansionSet { } private AjaniVsNicolBolas() { - super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", "mage.sets.ajanivsnicolbolas", new GregorianCalendar(2011, 9, 2).getTime(), SetType.REPRINT); + super("Duel Decks: Ajani vs. Nicol Bolas", "DDH", "mage.sets.ajanivsnicolbolas", new GregorianCalendar(2011, 9, 2).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Archenemy.java b/Mage.Sets/src/mage/sets/Archenemy.java index ce9479698f4..0501dfc436b 100644 --- a/Mage.Sets/src/mage/sets/Archenemy.java +++ b/Mage.Sets/src/mage/sets/Archenemy.java @@ -45,7 +45,7 @@ public class Archenemy extends ExpansionSet { } private Archenemy() { - super("Archenemy", "ARC", "mage.sets.archenemy", new GregorianCalendar(2010, 6, 18).getTime(), SetType.REPRINT); + super("Archenemy", "ARC", "mage.sets.archenemy", new GregorianCalendar(2010, 6, 18).getTime(), SetType.NON_STANDARD_LEGAL_SETS); } } diff --git a/Mage.Sets/src/mage/sets/Commander.java b/Mage.Sets/src/mage/sets/Commander.java index 94e0bc9fbc7..5863ef66c26 100644 --- a/Mage.Sets/src/mage/sets/Commander.java +++ b/Mage.Sets/src/mage/sets/Commander.java @@ -47,7 +47,7 @@ public class Commander extends ExpansionSet { } private Commander() { - super("Magic: The Gathering-Commander", "CMD", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("Magic: The Gathering-Commander", "CMD", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.NON_STANDARD_LEGAL_SETS); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Commander2013.java b/Mage.Sets/src/mage/sets/Commander2013.java index 4d34d25402d..889193a2328 100644 --- a/Mage.Sets/src/mage/sets/Commander2013.java +++ b/Mage.Sets/src/mage/sets/Commander2013.java @@ -47,7 +47,7 @@ public class Commander2013 extends ExpansionSet { } private Commander2013() { - super("Commander 2013 Edition", "C13", "mage.sets.commander2013", new GregorianCalendar(2013, 11, 01).getTime(), SetType.REPRINT); + super("Commander 2013 Edition", "C13", "mage.sets.commander2013", new GregorianCalendar(2013, 11, 01).getTime(), SetType.NON_STANDARD_LEGAL_SETS); } } diff --git a/Mage.Sets/src/mage/sets/Commander2014.java b/Mage.Sets/src/mage/sets/Commander2014.java index c14fd6672f1..106ec7edf48 100644 --- a/Mage.Sets/src/mage/sets/Commander2014.java +++ b/Mage.Sets/src/mage/sets/Commander2014.java @@ -45,7 +45,7 @@ public class Commander2014 extends ExpansionSet { } private Commander2014() { - super("Commander 2014 Edition", "C14", "mage.sets.commander2014", new GregorianCalendar(2014, 11, 07).getTime(), SetType.REPRINT); + super("Commander 2014 Edition", "C14", "mage.sets.commander2014", new GregorianCalendar(2014, 11, 07).getTime(), SetType.NON_STANDARD_LEGAL_SETS); } } diff --git a/Mage.Sets/src/mage/sets/Conspiracy.java b/Mage.Sets/src/mage/sets/Conspiracy.java index e0dab736c11..561ef754989 100644 --- a/Mage.Sets/src/mage/sets/Conspiracy.java +++ b/Mage.Sets/src/mage/sets/Conspiracy.java @@ -47,7 +47,7 @@ import mage.constants.SetType; } private Conspiracy() { - super("Magic: The Gathering-Conspiracy", "CNS", "mage.sets.conspiracy", new GregorianCalendar(2014, 6, 6).getTime(), SetType.REPRINT); + super("Magic: The Gathering-Conspiracy", "CNS", "mage.sets.conspiracy", new GregorianCalendar(2014, 6, 6).getTime(), SetType.NON_STANDARD_LEGAL_SETS); this.hasBasicLands = false; this.hasBoosters = true; this.numBoosterLands = 0; diff --git a/Mage.Sets/src/mage/sets/DivineVsDemonic.java b/Mage.Sets/src/mage/sets/DivineVsDemonic.java index 174f9addc24..4d131e492b7 100644 --- a/Mage.Sets/src/mage/sets/DivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/DivineVsDemonic.java @@ -45,7 +45,7 @@ public class DivineVsDemonic extends ExpansionSet { } private DivineVsDemonic() { - super("Duel Decks: Divine vs. Demonic", "DDC", "mage.sets.divinevsdemonic", new GregorianCalendar(2009, 04, 10).getTime(), SetType.REPRINT); + super("Duel Decks: Divine vs. Demonic", "DDC", "mage.sets.divinevsdemonic", new GregorianCalendar(2009, 04, 10).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java index fd3a5e2782c..d043b5b5013 100644 --- a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java +++ b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java @@ -13,7 +13,7 @@ public class ElspethvsTezzeret extends ExpansionSet { } private ElspethvsTezzeret() { - super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), SetType.REPRINT); + super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java index 547cd2457d3..76ebfb9f35e 100644 --- a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java @@ -23,7 +23,7 @@ public class ElvesVsGoblins extends ExpansionSet { } private ElvesVsGoblins() { - super("Duel Decks: Elves vs. Goblins", "EVG", "mage.sets.elvesvsgoblins", new GregorianCalendar(2007, 11, 16).getTime(), SetType.REPRINT); + super("Duel Decks: Elves vs. Goblins", "EVG", "mage.sets.elvesvsgoblins", new GregorianCalendar(2007, 11, 16).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/FridayNightMagic.java b/Mage.Sets/src/mage/sets/FridayNightMagic.java index 935868a8613..b3010d3aa24 100644 --- a/Mage.Sets/src/mage/sets/FridayNightMagic.java +++ b/Mage.Sets/src/mage/sets/FridayNightMagic.java @@ -45,7 +45,7 @@ public class FridayNightMagic extends ExpansionSet { } private FridayNightMagic() { - super("Friday Night Magic", "FNMP", "mage.sets.fridaynightmagic", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("Friday Night Magic", "FNMP", "mage.sets.fridaynightmagic", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/GameDay.java b/Mage.Sets/src/mage/sets/GameDay.java index 98b1c0dd999..9d786bdcd68 100644 --- a/Mage.Sets/src/mage/sets/GameDay.java +++ b/Mage.Sets/src/mage/sets/GameDay.java @@ -45,7 +45,7 @@ public class GameDay extends ExpansionSet { } private GameDay() { - super("Game Day", "MGDC", "mage.sets.gameday", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("Game Day", "MGDC", "mage.sets.gameday", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java index 11ada418176..e61f55243f2 100644 --- a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java @@ -23,7 +23,7 @@ public class GarrukVsLiliana extends ExpansionSet { } private GarrukVsLiliana() { - super("Duel Decks: Garruk vs. Liliana", "DDD", "mage.sets.garrukvsliliana", new GregorianCalendar(2009, 10, 30).getTime(), SetType.REPRINT); + super("Duel Decks: Garruk vs. Liliana", "DDD", "mage.sets.garrukvsliliana", new GregorianCalendar(2009, 10, 30).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/GrandPrix.java b/Mage.Sets/src/mage/sets/GrandPrix.java index f99cb37397d..1c652da1e78 100644 --- a/Mage.Sets/src/mage/sets/GrandPrix.java +++ b/Mage.Sets/src/mage/sets/GrandPrix.java @@ -45,7 +45,7 @@ public class GrandPrix extends ExpansionSet { } private GrandPrix() { - super("Grand Prix", "GPX", "mage.sets.grandprix", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("Grand Prix", "GPX", "mage.sets.grandprix", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/Guru.java b/Mage.Sets/src/mage/sets/Guru.java index 54d9b1f09b2..c45199df480 100644 --- a/Mage.Sets/src/mage/sets/Guru.java +++ b/Mage.Sets/src/mage/sets/Guru.java @@ -14,6 +14,6 @@ public class Guru extends ExpansionSet { private Guru() { //TODO find correct release date, wiki don't known anything about this expansion - super("Guru", "GUR", "mage.sets.guru", new GregorianCalendar(1990, 1, 2).getTime(), SetType.REPRINT); + super("Guru", "GUR", "mage.sets.guru", new GregorianCalendar(1990, 1, 2).getTime(), SetType.PROMOTIONAL); } } diff --git a/Mage.Sets/src/mage/sets/Heroesvsmonsters.java b/Mage.Sets/src/mage/sets/Heroesvsmonsters.java index 06831c93243..01c18a3a055 100644 --- a/Mage.Sets/src/mage/sets/Heroesvsmonsters.java +++ b/Mage.Sets/src/mage/sets/Heroesvsmonsters.java @@ -44,7 +44,7 @@ public class Heroesvsmonsters extends ExpansionSet { } private Heroesvsmonsters() { - super("Duel Decks: Heroes vs. Monsters", "DDL", "mage.sets.heroesvsmonsters", new GregorianCalendar(2013, 9, 6).getTime(), SetType.REPRINT); + super("Duel Decks: Heroes vs. Monsters", "DDL", "mage.sets.heroesvsmonsters", new GregorianCalendar(2013, 9, 6).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java b/Mage.Sets/src/mage/sets/IzzetVsGolgari.java index 7eec4f67084..922fb79bdc5 100644 --- a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java +++ b/Mage.Sets/src/mage/sets/IzzetVsGolgari.java @@ -44,7 +44,7 @@ public class IzzetVsGolgari extends ExpansionSet { } private IzzetVsGolgari() { - super("Duel Decks: Izzet vs. Golgari", "DDJ", "mage.sets.izzetvsgolgari", new GregorianCalendar(2012, 9, 7).getTime(), SetType.REPRINT); + super("Duel Decks: Izzet vs. Golgari", "DDJ", "mage.sets.izzetvsgolgari", new GregorianCalendar(2012, 9, 7).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/JaceVsChandra.java b/Mage.Sets/src/mage/sets/JaceVsChandra.java index a40fd93890b..f3dfc422b62 100644 --- a/Mage.Sets/src/mage/sets/JaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/JaceVsChandra.java @@ -23,7 +23,7 @@ public class JaceVsChandra extends ExpansionSet { } private JaceVsChandra() { - super("Duel Decks: Jace vs. Chandra", "DD2", "mage.sets.jacevschandra", new GregorianCalendar(2008, 11, 07).getTime(), SetType.REPRINT); + super("Duel Decks: Jace vs. Chandra", "DD2", "mage.sets.jacevschandra", new GregorianCalendar(2008, 11, 07).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/JaceVsVraska.java b/Mage.Sets/src/mage/sets/JaceVsVraska.java index 6bbf84acd37..f454ec804ce 100644 --- a/Mage.Sets/src/mage/sets/JaceVsVraska.java +++ b/Mage.Sets/src/mage/sets/JaceVsVraska.java @@ -45,7 +45,7 @@ public class JaceVsVraska extends ExpansionSet { } private JaceVsVraska() { - super("Duel Decks: Jace vs. Vraska", "DDM", "mage.sets.jacevsvraska", new GregorianCalendar(2014, 3, 14).getTime(), SetType.REPRINT); + super("Duel Decks: Jace vs. Vraska", "DDM", "mage.sets.jacevsvraska", new GregorianCalendar(2014, 3, 14).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/JudgePromo.java b/Mage.Sets/src/mage/sets/JudgePromo.java index b7be866d7b4..bb99523d33a 100644 --- a/Mage.Sets/src/mage/sets/JudgePromo.java +++ b/Mage.Sets/src/mage/sets/JudgePromo.java @@ -45,7 +45,7 @@ public class JudgePromo extends ExpansionSet { } private JudgePromo() { - super("Judge Promo", "JR", "mage.sets.judgepromo", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("Judge Promo", "JR", "mage.sets.judgepromo", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; } diff --git a/Mage.Sets/src/mage/sets/KnightsVsDragons.java b/Mage.Sets/src/mage/sets/KnightsVsDragons.java index e1f78166696..e15ab13a934 100644 --- a/Mage.Sets/src/mage/sets/KnightsVsDragons.java +++ b/Mage.Sets/src/mage/sets/KnightsVsDragons.java @@ -45,7 +45,7 @@ public class KnightsVsDragons extends ExpansionSet { } private KnightsVsDragons() { - super("Duel Decks: Knights vs. Dragons", "DDG", "mage.sets.knightsvsdragons", new GregorianCalendar(2011, 4, 1).getTime(), SetType.REPRINT); + super("Duel Decks: Knights vs. Dragons", "DDG", "mage.sets.knightsvsdragons", new GregorianCalendar(2011, 4, 1).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/LaunchParty.java b/Mage.Sets/src/mage/sets/LaunchParty.java index 71ad7256684..822b9a2a3a7 100644 --- a/Mage.Sets/src/mage/sets/LaunchParty.java +++ b/Mage.Sets/src/mage/sets/LaunchParty.java @@ -45,7 +45,7 @@ public class LaunchParty extends ExpansionSet { } private LaunchParty() { - super("Launch Party", "MLP", "mage.sets.launchparty", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("Launch Party", "MLP", "mage.sets.launchparty", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java index e196e25f07b..d89a08ca641 100644 --- a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java +++ b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java @@ -13,7 +13,7 @@ public class MagicPlayerRewards extends ExpansionSet { } private MagicPlayerRewards() { - super("Magic Player Rewards", "MPR", "mage.sets.playerrewards", new GregorianCalendar(1990, 1, 1).getTime(), SetType.EXPANSION); + super("Magic Player Rewards", "MPR", "mage.sets.playerrewards", new GregorianCalendar(1990, 1, 1).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/MediaInserts.java b/Mage.Sets/src/mage/sets/MediaInserts.java index b1f01505275..135442f2bba 100644 --- a/Mage.Sets/src/mage/sets/MediaInserts.java +++ b/Mage.Sets/src/mage/sets/MediaInserts.java @@ -27,11 +27,10 @@ */ package mage.sets; +import java.util.GregorianCalendar; import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.GregorianCalendar; - public class MediaInserts extends ExpansionSet { private static final MediaInserts fINSTANCE = new MediaInserts(); @@ -40,7 +39,7 @@ public class MediaInserts extends ExpansionSet { } private MediaInserts() { - super("Media Inserts", "MBP", "mage.sets.mediainserts", new GregorianCalendar(1990, 1, 1).getTime(), SetType.EXPANSION); + super("Media Inserts", "MBP", "mage.sets.mediainserts", new GregorianCalendar(1990, 1, 1).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java b/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java index 3f0fe0f3164..42be2f93ba9 100644 --- a/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java +++ b/Mage.Sets/src/mage/sets/PhyrexiaVsTheCoalition.java @@ -44,7 +44,7 @@ public class PhyrexiaVsTheCoalition extends ExpansionSet { } private PhyrexiaVsTheCoalition() { - super("Duel Decks: Phyrexia vs. the Coalition", "DDE", "mage.sets.phyrexiavsthecoalition", new GregorianCalendar(2010, 3, 19).getTime(), SetType.REPRINT); + super("Duel Decks: Phyrexia vs. the Coalition", "DDE", "mage.sets.phyrexiavsthecoalition", new GregorianCalendar(2010, 3, 19).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/Planechase.java b/Mage.Sets/src/mage/sets/Planechase.java index 39056b4966c..d25acafebcf 100644 --- a/Mage.Sets/src/mage/sets/Planechase.java +++ b/Mage.Sets/src/mage/sets/Planechase.java @@ -45,7 +45,7 @@ public class Planechase extends ExpansionSet { } private Planechase() { - super("Planechase", "HOP", "mage.sets.planechase", new GregorianCalendar(2009, 8, 4).getTime(), SetType.REPRINT); + super("Planechase", "HOP", "mage.sets.planechase", new GregorianCalendar(2009, 8, 4).getTime(), SetType.NON_STANDARD_LEGAL_SETS); } } diff --git a/Mage.Sets/src/mage/sets/Planechase2012.java b/Mage.Sets/src/mage/sets/Planechase2012.java index 97efc27091c..135ec7f264a 100644 --- a/Mage.Sets/src/mage/sets/Planechase2012.java +++ b/Mage.Sets/src/mage/sets/Planechase2012.java @@ -45,7 +45,7 @@ public class Planechase2012 extends ExpansionSet { } private Planechase2012() { - super("Planechase (2012 Edition)", "PC2", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.REPRINT); + super("Planechase (2012 Edition)", "PC2", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.NON_STANDARD_LEGAL_SETS); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/SorinVsTibalt.java b/Mage.Sets/src/mage/sets/SorinVsTibalt.java index aae9fce417d..ddc79457cff 100644 --- a/Mage.Sets/src/mage/sets/SorinVsTibalt.java +++ b/Mage.Sets/src/mage/sets/SorinVsTibalt.java @@ -44,7 +44,7 @@ public class SorinVsTibalt extends ExpansionSet { } private SorinVsTibalt() { - super("Duel Decks: Sorin vs. Tibalt", "DDK", "mage.sets.sorinvstibalt", new GregorianCalendar(2013, 3, 15).getTime(), SetType.REPRINT); + super("Duel Decks: Sorin vs. Tibalt", "DDK", "mage.sets.sorinvstibalt", new GregorianCalendar(2013, 3, 15).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/SpeedVsCunning.java b/Mage.Sets/src/mage/sets/SpeedVsCunning.java index 35b5bbb2e98..bef9fd419cc 100644 --- a/Mage.Sets/src/mage/sets/SpeedVsCunning.java +++ b/Mage.Sets/src/mage/sets/SpeedVsCunning.java @@ -44,7 +44,7 @@ public class SpeedVsCunning extends ExpansionSet { } private SpeedVsCunning() { - super("Duel Decks: Speed vs. Cunning", "DDN", "mage.sets.speedvscunning", new GregorianCalendar(2014, 9, 5).getTime(), SetType.REPRINT); + super("Duel Decks: Speed vs. Cunning", "DDN", "mage.sets.speedvscunning", new GregorianCalendar(2014, 9, 5).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/VenserVsKoth.java b/Mage.Sets/src/mage/sets/VenserVsKoth.java index 29567814e56..57c4a4af482 100644 --- a/Mage.Sets/src/mage/sets/VenserVsKoth.java +++ b/Mage.Sets/src/mage/sets/VenserVsKoth.java @@ -45,7 +45,7 @@ public class VenserVsKoth extends ExpansionSet { } private VenserVsKoth() { - super("Duel Decks: Venser vs. Koth", "DDI", "mage.sets.venservskoth", new GregorianCalendar(2012, 3, 30).getTime(), SetType.REPRINT); + super("Duel Decks: Venser vs. Koth", "DDI", "mage.sets.venservskoth", new GregorianCalendar(2012, 3, 30).getTime(), SetType.DUEL_DECK); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/WPNGateway.java b/Mage.Sets/src/mage/sets/WPNGateway.java index 7ea7155d1ec..7756b615b75 100644 --- a/Mage.Sets/src/mage/sets/WPNGateway.java +++ b/Mage.Sets/src/mage/sets/WPNGateway.java @@ -22,7 +22,7 @@ public class WPNGateway extends ExpansionSet { } private WPNGateway() { - super("WPN Gateway", "GRC", "mage.sets.wpngateway", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("WPN Gateway", "GRC", "mage.sets.wpngateway", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java b/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java index 19eaadfd484..0e4a2c0cad3 100644 --- a/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java +++ b/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java @@ -45,7 +45,7 @@ public class WorldMagicCupQualifier extends ExpansionSet { } private WorldMagicCupQualifier() { - super("World Magic Cup Qualifier", "WMCQ", "mage.sets.worldmagiccupqualifier", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT); + super("World Magic Cup Qualifier", "WMCQ", "mage.sets.worldmagiccupqualifier", new GregorianCalendar(2011, 6, 17).getTime(), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; } diff --git a/Mage/src/mage/constants/SetType.java b/Mage/src/mage/constants/SetType.java index e6f54b57084..eb19d7d8ec5 100644 --- a/Mage/src/mage/constants/SetType.java +++ b/Mage/src/mage/constants/SetType.java @@ -6,11 +6,14 @@ package mage.constants; */ public enum SetType { CORE("Core"), + DUEL_DECK("Duel Deck"), EXPANSION("Expansion"), + NON_STANDARD_LEGAL_SETS("Non-standard-legal sets"), REPRINT("Reprint"), + PROMOTIONAL("Promotional"), JOKESET("Joke Set"); - private String text; + private final String text; SetType(String text) { this.text = text;