From a9b95595dced511acc95fff44109b2506174b501 Mon Sep 17 00:00:00 2001 From: North Date: Sat, 21 Jul 2012 13:15:48 +0300 Subject: [PATCH] Added Odyssey and Torment sets --- .../plugins/card/dl/sources/GathererSets.java | 3 +- Mage.Sets/src/mage/sets/Odyssey.java | 55 ++++++++++++++++++ Mage.Sets/src/mage/sets/Sets.java | 2 + Mage.Sets/src/mage/sets/Torment.java | 56 +++++++++++++++++++ Utils/known-sets.txt | 2 + 5 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/sets/Odyssey.java create mode 100644 Mage.Sets/src/mage/sets/Torment.java 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 88e9446502..5cc81f3bb3 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 final static File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + SETS_PATH); private static File outDir = DEFAULT_OUT_DIR; - private static final String[] symbols = {"10E", "HOP", "TMP", "INV", "PLS", "APC", "MRD", "DST", "5DN", "CHK", "BOK", "SOK", "RAV", "GPT", "DIS", "TSP", "TSB", "PLC", "FUT", "LRW", "MOR", "SHM", "EVE", "USG", "9ED", "8ED", "JUD", "ONS", "LGN", "SCG", "ULG", "USD", "WTH"}; + private static final String[] symbols = {"10E", "HOP", "TMP", "INV", "PLS", "APC", "MRD", "DST", "5DN", "CHK", "BOK", "SOK", "RAV", "GPT", "DIS", "TSP", "TSB", "PLC", "FUT", "LRW", "MOR", "SHM", "EVE", "USG", "9ED", "8ED", "ODY", "TOR", "JUD", "ONS", "LGN", "SCG", "ULG", "USD", "WTH"}; private static final String[] withMythics = {"M10", "M11", "M12", "M13", "DDF", "ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "MBS", "NPH", "ISD", "DKA", "AVR"}; private static final HashMap symbolsReplacements = new HashMap(); @@ -30,6 +30,7 @@ public class GathererSets implements Iterable { symbolsReplacements.put("USG", "UZ"); symbolsReplacements.put("UDS", "UD"); symbolsReplacements.put("JUD", "JU"); + symbolsReplacements.put("ODY", "OD"); } public GathererSets(String path) { diff --git a/Mage.Sets/src/mage/sets/Odyssey.java b/Mage.Sets/src/mage/sets/Odyssey.java new file mode 100644 index 0000000000..a544dced2f --- /dev/null +++ b/Mage.Sets/src/mage/sets/Odyssey.java @@ -0,0 +1,55 @@ +/* + * 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; +import mage.cards.ExpansionSet; + +/** + * + * @author North + */ +public class Odyssey extends ExpansionSet { + private static final Odyssey fINSTANCE = new Odyssey(); + + public static Odyssey getInstance() { + return fINSTANCE; + } + + private Odyssey() { + super("Odyssey", "ODY", "", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), Constants.SetType.EXPANSION); + this.blockName = "Odyssey"; + this.hasBoosters = true; + this.numBoosterLands = 1; + this.numBoosterCommon = 10; + this.numBoosterUncommon = 3; + this.numBoosterRare = 1; + this.ratioBoosterMythic = 0; + } +} diff --git a/Mage.Sets/src/mage/sets/Sets.java b/Mage.Sets/src/mage/sets/Sets.java index ff420069d1..70016ee230 100644 --- a/Mage.Sets/src/mage/sets/Sets.java +++ b/Mage.Sets/src/mage/sets/Sets.java @@ -103,6 +103,7 @@ public class Sets extends HashMap { this.addSet(Morningtide.getInstance()); this.addSet(NewPhyrexia.getInstance()); this.addSet(NinthEdition.getInstance()); + this.addSet(Odyssey.getInstance()); this.addSet(Onslaught.getInstance()); this.addSet(PlanarChaos.getInstance()); this.addSet(Planechase.getInstance()); @@ -118,6 +119,7 @@ public class Sets extends HashMap { this.addSet(Tempest.getInstance()); this.addSet(TimeSpiral.getInstance()); this.addSet(TimeSpiralTimeshifted.getInstance()); + this.addSet(Torment.getInstance()); this.addSet(UrzasSaga.getInstance()); this.addSet(UrzasLegacy.getInstance()); this.addSet(UrzasDestiny.getInstance()); diff --git a/Mage.Sets/src/mage/sets/Torment.java b/Mage.Sets/src/mage/sets/Torment.java new file mode 100644 index 0000000000..2119c8f424 --- /dev/null +++ b/Mage.Sets/src/mage/sets/Torment.java @@ -0,0 +1,56 @@ +/* + * 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; +import mage.cards.ExpansionSet; + +/** + * + * @author North + */ +public class Torment extends ExpansionSet { + + private static final Torment fINSTANCE = new Torment(); + + public static Torment getInstance() { + return fINSTANCE; + } + + private Torment() { + super("Torment", "TOR", "", "mage.sets.torment", new GregorianCalendar(2002, 0, 26).getTime(), Constants.SetType.EXPANSION); + this.blockName = "Odyssey"; + this.hasBoosters = true; + this.numBoosterLands = 0; + this.numBoosterCommon = 11; + this.numBoosterUncommon = 3; + this.numBoosterRare = 1; + this.ratioBoosterMythic = 8; + } +} diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt index 6972905bfe..4924ea9ff4 100644 --- a/Utils/known-sets.txt +++ b/Utils/known-sets.txt @@ -16,6 +16,8 @@ Urza's Destiny|urzasdestiny| Invasion|invasion| Planeshift|planeshift| Apocalypse|apocalypse| +Odyssey|odyssey| +Torment|torment| Judgment|judgment| Onslaught|onslaught| Legions|legions|