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 db337be4f45..378a33f8ef0 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 @@ -6,11 +6,11 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; import mage.cards.ExpansionSet; -import mage.cards.repository.CardRepository; import mage.cards.Sets; +import mage.cards.repository.CardRepository; /** - * Utility class for constructed formats. + * Utility class for constructed formats (expansions and other editions). * * @author nantuko */ @@ -19,8 +19,10 @@ public class ConstructedFormats { private static final String[] constructedFormats = {"- All Sets", "- Standard", "- Extended", "- Modern", "* Return to Ravnica Block", "Return to Ravnica", "Magic 2013", "* Innistrad Block", "Avacyn Restored", "Dark Ascension", "Innistrad", "Magic 2012", + "Planechase 2012", "* Scars of Mirrodin Block", "New Phyrexia", "Mirrodin Besieged", "Scars of Mirrodin", "Magic 2011", "* Zendikar Block", "Rise of the Eldrazi", "Worldwake", "Zendikar", "Magic 2010", + "Planechase", "* Shards of Alara Block", "Alara Reborn", "Conflux", "Shards of Alara", "* Shadowmoor Block", "Shadowmoor", "Eventide", "* Lorwyn Block", "Lorwyn", "Morningtide", @@ -324,6 +326,13 @@ public class ConstructedFormats { if (format.equals("Magic 2013")) { return Arrays.asList("M13"); } + if (format.equals("Planechase")) { + return Arrays.asList("HOP"); + } + if (format.equals("Planechase 2012")) { + return Arrays.asList("PC2"); + } + if (format.equals("Guru")) { return Arrays.asList("GUR"); } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 5a1fa83f870..dfb4cad5d97 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -15,7 +15,7 @@ public class GathererSets implements Iterable { private static File outDir = DEFAULT_OUT_DIR; private static final String[] symbols = {"10E", "9ED", "8ED", "7ED", "6ED", "5ED", "4ED", - "HOP", + "HOP","PC2", "ARN", "ATQ", "LEG", "DRK", "FEM", "HML", "ICE", "ALL", "CSP", "MIR", "VIS", "WTH", diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java index 54246ef0fcb..3bdb7dd4aa9 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java @@ -32,6 +32,7 @@ public class MagicCardsImageSource implements CardImageSource { put("WWK", "worldwake"); put("ZEN", "zendikar"); put("HOP", "planechase"); + put("PC2", "planechase-2012-edition"); put("M10", "magic-2010"); put("GVL", "duel-decks-garruk-vs-liliana"); put("ARB", "alara-reborn"); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index a0a18d95b57..7a11b2b18e1 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -45,6 +45,8 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("ARB", "alarareborn/spoiler"); setsAliases.put("CON", "conflux/spoiler"); setsAliases.put("ALA", "shardsofalara/spoiler"); + setsAliases.put("HOP", "planechase/cig"); + setsAliases.put("PC2", "planechase2012edition/cig"); } private Map getSetLinks(String cardSet) { diff --git a/Mage.Sets/src/mage/sets/Planechase2012.java b/Mage.Sets/src/mage/sets/Planechase2012.java new file mode 100644 index 00000000000..a505169ceca --- /dev/null +++ b/Mage.Sets/src/mage/sets/Planechase2012.java @@ -0,0 +1,51 @@ +/* +* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without modification, are +* permitted provided that the following conditions are met: +* +* 1. Redistributions of source code must retain the above copyright notice, this list of +* conditions and the following disclaimer. +* +* 2. Redistributions in binary form must reproduce the above copyright notice, this list +* of conditions and the following disclaimer in the documentation and/or other materials +* provided with the distribution. +* +* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR +* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* The views and conclusions contained in the software and documentation are those of the +* authors and should not be interpreted as representing official policies, either expressed +* or implied, of BetaSteward_at_googlemail.com. +*/ + +package mage.sets; + +import java.util.GregorianCalendar; +import mage.Constants.SetType; +import mage.cards.ExpansionSet; + +/** + * + * @author LevelX2 + */ +public class Planechase2012 extends ExpansionSet { + + private static final Planechase2012 fINSTANCE = new Planechase2012(); + + public static Planechase2012 getInstance() { + return fINSTANCE; + } + + private Planechase2012() { + super("Planechase (2012 Edition)", "PC2", "", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.REPRINT); + } + +} \ No newline at end of file diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt index fd8f42cac65..6c713bbcbd6 100644 --- a/Utils/known-sets.txt +++ b/Utils/known-sets.txt @@ -10,6 +10,7 @@ Magic 2011|magic2011| Magic 2012|magic2012| Magic 2013|magic2013| Planechase|planechase| +Planechase 2012 Edition|planechase2012| Duel Decks: Elspeth vs. Tezzeret|elspethvstezzeret| Arabian Nights|arabiannights| Antiquities|antiquities| diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index 860d48e8389..03d139e215d 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -43,6 +43,7 @@ From the Vault: Relics|FVR| Guildpact|GPT| Homelands|HML| Planechase|HOP| +Planechase 2012 Edition|PC2| Ice Age|ICE| Innistrad|ISD| Invasion|INV|