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 83421c9c3a..959db40a84 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 @@ -1,12 +1,11 @@ package org.mage.plugins.card.dl.sources; -import org.mage.plugins.card.dl.DownloadJob; - import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import org.mage.plugins.card.dl.DownloadJob; import static org.mage.plugins.card.dl.DownloadJob.fromURL; import static org.mage.plugins.card.dl.DownloadJob.toFile; @@ -16,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", "ULG", "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", "JUD", "ONS", "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(); @@ -26,9 +25,11 @@ public class GathererSets implements Iterable { symbolsReplacements.put("TMP", "TE"); symbolsReplacements.put("INV", "IN"); symbolsReplacements.put("PLS", "PS"); - symbolsReplacements.put("USG", "UZ"); symbolsReplacements.put("WTH", "WL"); symbolsReplacements.put("ULG", "GU"); + symbolsReplacements.put("USG", "UZ"); + symbolsReplacements.put("UDS", "UD"); + symbolsReplacements.put("JUD", "JU"); } public GathererSets(String path) { diff --git a/Mage.Sets/src/mage/sets/Sets.java b/Mage.Sets/src/mage/sets/Sets.java index 2cb354cd14..74080df0a7 100644 --- a/Mage.Sets/src/mage/sets/Sets.java +++ b/Mage.Sets/src/mage/sets/Sets.java @@ -118,6 +118,7 @@ public class Sets extends HashMap { this.addSet(TimeSpiralTimeshifted.getInstance()); this.addSet(UrzasSaga.getInstance()); this.addSet(UrzasLegacy.getInstance()); + this.addSet(UrzasDestiny.getInstance()); this.addSet(Weatherlight.getInstance()); this.addSet(Worldwake.getInstance()); this.addSet(Zendikar.getInstance()); diff --git a/Mage.Sets/src/mage/sets/UrzasDestiny.java b/Mage.Sets/src/mage/sets/UrzasDestiny.java new file mode 100644 index 0000000000..fa84a27172 --- /dev/null +++ b/Mage.Sets/src/mage/sets/UrzasDestiny.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.SetType; +import mage.cards.ExpansionSet; + +/** + * + * @author Backfir3 + */ +public class UrzasDestiny extends ExpansionSet { + + private static final UrzasDestiny fINSTANCE = new UrzasDestiny(); + + public static UrzasDestiny getInstance() { + return fINSTANCE; + } + + private UrzasDestiny() { + super("Urza's Destiny", "UDS", "exp_symbol_mtguds", "mage.sets.urzasdestiny", new GregorianCalendar(1999, 6, 23).getTime(), SetType.EXPANSION); + this.blockName = "Urza"; + 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/UrzasLegacy.java b/Mage.Sets/src/mage/sets/UrzasLegacy.java index 1ad7f2c336..67f5212b5f 100644 --- a/Mage.Sets/src/mage/sets/UrzasLegacy.java +++ b/Mage.Sets/src/mage/sets/UrzasLegacy.java @@ -39,7 +39,7 @@ import java.util.GregorianCalendar; */ public class UrzasLegacy extends ExpansionSet { - private static final UrzasLegacy fINSTANCE = new UrzasLegacy(); + private static final UrzasLegacy fINSTANCE = new UrzasLegacy(); public static UrzasLegacy getInstance() { return fINSTANCE; @@ -47,6 +47,7 @@ public class UrzasLegacy extends ExpansionSet { private UrzasLegacy() { super("Urza's Legacy", "ULG", "exp_symbol_mtgulg", "mage.sets.urzaslegacy", new GregorianCalendar(1999, 2, 6).getTime(), SetType.EXPANSION); + this.blockName = "Urza"; this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; @@ -54,5 +55,4 @@ public class UrzasLegacy extends ExpansionSet { this.numBoosterRare = 1; this.ratioBoosterMythic = 0; } - } diff --git a/Mage.Sets/src/mage/sets/UrzasSaga.java b/Mage.Sets/src/mage/sets/UrzasSaga.java index b55a15a1ee..5d5a33e336 100644 --- a/Mage.Sets/src/mage/sets/UrzasSaga.java +++ b/Mage.Sets/src/mage/sets/UrzasSaga.java @@ -38,7 +38,7 @@ import mage.cards.ExpansionSet; */ public class UrzasSaga extends ExpansionSet { - private static final UrzasSaga fINSTANCE = new UrzasSaga(); + private static final UrzasSaga fINSTANCE = new UrzasSaga(); public static UrzasSaga getInstance() { return fINSTANCE; @@ -46,6 +46,7 @@ public class UrzasSaga extends ExpansionSet { private UrzasSaga() { super("Urza's Saga", "USG", "exp_symbol_mtgusg", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION); + this.blockName = "Urza"; this.hasBoosters = true; this.numBoosterLands = 1; this.numBoosterCommon = 10; @@ -53,5 +54,4 @@ public class UrzasSaga extends ExpansionSet { this.numBoosterRare = 1; this.ratioBoosterMythic = 0; } - } diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt index 59bea50941..3afda2eee1 100644 --- a/Utils/known-sets.txt +++ b/Utils/known-sets.txt @@ -11,9 +11,11 @@ Duel Decks: Elspeth vs. Tezzeret|elspethvstezzeret| Tempest|tempest| Urza's Saga|urzassaga| Urza's Legacy|urzaslegacy| +Urza's Destiny|urzasdestiny| Invasion|invasion| Planeshift|planeshift| Apocalypse|apocalypse| +Judgment|judgment| Onslaught|onslaught| Mirrodin|mirrodin| Darksteel|darksteel| diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index 2a1876e16f..81da406ad0 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -92,12 +92,12 @@ Starter 1999|S99| Stronghold|STH| Tempest|TMP| Torment|TOR| -Time Spiral "Timeshifted"|TSB| Time Spiral|TSP| -Urza's Destiny|UDS| +Time Spiral "Timeshifted"|TSB| Unglued|UGL| -Urza's Legacy|ULG| Unhinged|UNH| +Urza's Destiny|UDS| +Urza's Legacy|ULG| Urza's Saga|USG| Vanguard Set 1|VG1| Vanguard Set 2|VG2|