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 4b7f279187c..281c04e0812 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 @@ -17,6 +17,7 @@ public class ConstructedFormats { private static final String[] constructedFormats = { "- All Sets", "- Standard", "- Extended", "- Modern", + "* Theros Block", "Theros", "Magic 2014", "Modern Masters", "* Return to Ravnica Block", "Dragon's Maze", "Gatecrash", "Return to Ravnica", @@ -59,7 +60,13 @@ public class ConstructedFormats { } public static List getSetsByFormat(String format) { - + + if (format.equals("* Theros Block")) { + return Arrays.asList("THS"); + } + if (format.equals("Theros")) { + return Arrays.asList("THS"); + } if (format.equals("Arabian Nights")) { return Arrays.asList("ARN"); } 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 6cdb92be12c..7f61c5b8b61 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 @@ -40,7 +40,8 @@ public class GathererSets implements Iterable { "CMD", "PC2", "ISD", "DKA", "AVR", "RTR", "GTC", "DGM", - "MMA" }; + "MMA", + "THS"}; private static final HashMap symbolsReplacements = new HashMap(); static { 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 21ae5f317c1..fe211751493 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 @@ -16,6 +16,7 @@ public class MagicCardsImageSource implements CardImageSource { private static final Map setNameReplacement = new HashMap() { { + put("THS", "theros"); put("M14", "magic-2014"); put("MMA", "modern-masters"); put("DGM", "dragons-maze"); 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 c52b57ebc71..eeb53f2b668 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 @@ -29,6 +29,7 @@ public class WizardCardsImageSource implements CardImageSource { public WizardCardsImageSource() { sets = new HashMap>(); setsAliases = new HashMap(); + setsAliases.put("THS", "theros/cig"); setsAliases.put("M14", "magic2014coreset/cig"); setsAliases.put("MMA", "modernmasters/cig"); setsAliases.put("DGM", "dragonsmaze/cig"); diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index 7e919c18d47..98e40850c30 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -60,6 +60,6 @@ ptk=p3k gur=guru mpr=mprp # Remove DGM as sson as the images can be downloaded -ignore.urls=TOK,EMBLEM +ignore.urls=TOK,EMBLEM,THS # sets ordered by release time (newest goes first) -token.lookup.order=M14, MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,PVC,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK \ No newline at end of file +token.lookup.order=THS,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,PVC,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Theros.java b/Mage.Sets/src/mage/sets/Theros.java new file mode 100644 index 00000000000..ce0ec33c2e7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/Theros.java @@ -0,0 +1,56 @@ +/* + * Copyright 2011 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.cards.ExpansionSet; +import mage.constants.SetType; + +/** + * + * @author LevelX2 + */ +public class Theros extends ExpansionSet { + + private static final Theros fINSTANCE = new Theros(); + + public static Theros getInstance() { + return fINSTANCE; + } + + private Theros() { + super("Theros", "THS", "mage.sets.theros", new GregorianCalendar(2013, 9, 27).getTime(), SetType.EXPANSION); + this.blockName = "Theros"; + this.hasBoosters = true; + this.numBoosterLands = 1; + this.numBoosterCommon = 10; + this.numBoosterUncommon = 3; + this.numBoosterRare = 1; + this.ratioBoosterMythic = 8; + } +} diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt index dbd8ed79250..aac8e0387a6 100644 --- a/Utils/known-sets.txt +++ b/Utils/known-sets.txt @@ -81,3 +81,4 @@ Gatecrash|gatecrash| Magic: The Gathering-Commander|commander| Dragon's Maze|dragonsmaze| Modern Masters|modernmasters| +Theros|theros| diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index dabe32f3866..dac17ac83e3 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -97,6 +97,7 @@ Starter 2000|S00| Starter 1999|S99| Stronghold|STH| Tempest|TMP| +Theros|THS| Torment|TOR| Time Spiral|TSP| Time Spiral "Timeshifted"|TSB|