Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Added Commander and Dragon's Maze set objects to MAGE.

Browse source
This commit is contained in:
LevelX2 2013-04-10 16:55:31 +02:00
parent 2e34bf356e
commit 2fc53fa71e
10 changed files with 138 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
View file

@ -17,12 +17,13 @@ import mage.cards.repository.CardRepository;
public class ConstructedFormats {
private static final String[] constructedFormats = {"- All Sets", "- Standard", "- Extended", "- Modern",
"* Return to Ravnica Block", "Gatecrash","Return to Ravnica", "Magic 2013",
"* Innistrad Block", "Avacyn Restored", "Dark Ascension", "Innistrad", "Magic 2012",
"Planechase 2012",
"* Return to Ravnica Block", "Dragon's Maze", "Gatecrash","Return to Ravnica",
"Magic 2013", "Planechase 2012",
"* Innistrad Block", "Avacyn Restored", "Dark Ascension", "Innistrad",
"Magic 2012", "Commander",
"* Scars of Mirrodin Block", "New Phyrexia", "Mirrodin Besieged", "Scars of Mirrodin", "Magic 2011",
"* Zendikar Block", "Rise of the Eldrazi", "Worldwake", "Zendikar", "Magic 2010",
"Planechase",
"* 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",
@ -286,7 +287,7 @@ public class ConstructedFormats {
return Arrays.asList("AVR");
}
if (format.equals("* Return to Ravnica Block")) {
return Arrays.asList("RTR", "GTC");
return Arrays.asList("RTR", "GTC", "DGM");
}
if (format.equals("Return to Ravnica")) {
return Arrays.asList("RTR");
@ -294,6 +295,9 @@ public class ConstructedFormats {
if (format.equals("Gatecrash")) {
return Arrays.asList("GTC");
}
if (format.equals("Dragon's Maze")) {
return Arrays.asList("DGM");
}
if (format.equals("Limited Edition Alpha")) {
return Arrays.asList("LEA");
}
@ -344,6 +348,9 @@ public class ConstructedFormats {
if (format.equals("Planechase")) {
return Arrays.asList("HOP");
}
if (format.equals("Commander")) {
return Arrays.asList("CMD");
}
if (format.equals("Planechase 2012")) {
return Arrays.asList("PC2");
}

5
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
View file

@ -36,9 +36,10 @@ public class GathererSets implements Iterable<DownloadJob> {
"DDF",
"ALA", "CON", "ARB",
"ZEN", "WWK", "ROE",
"SOM", "MBS", "NPH",
"SOM", "MBS", "NPH",
"CMD",
"ISD", "DKA", "AVR",
"RTR", "GTC"};
"RTR", "GTC", "DGM"};
private static final HashMap<String, String> symbolsReplacements = new HashMap<String, String>();
static {

2
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
View file

@ -15,6 +15,7 @@ public class MagicCardsImageSource implements CardImageSource {
private static final Map<String, String> setNameReplacement = new HashMap<String, String>() {
{
put("DGM", "dragons-maze");
put("GTC", "gatecrash");
put("RTR", "return-to-ravnica");
put("M13", "magic-2013");
@ -33,6 +34,7 @@ public class MagicCardsImageSource implements CardImageSource {
put("WWK", "worldwake");
put("ZEN", "zendikar");
put("HOP", "planechase");
put("CMD", "commander");
put("PC2", "planechase-2012-edition");
put("M10", "magic-2010");
put("GVL", "duel-decks-garruk-vs-liliana");

1
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
View file

@ -28,6 +28,7 @@ public class WizardCardsImageSource implements CardImageSource {
public WizardCardsImageSource() {
sets = new HashMap();
setsAliases = new HashMap();
setsAliases.put("DGM", "dragonsmaze/cig");
setsAliases.put("GTC", "gatecrash/cig");
setsAliases.put("RTR", "returntoravnica/cig");
setsAliases.put("M13", "magic2013/cig");

3
Mage.Client/src/main/resources/image.url.properties
View file

@ -59,6 +59,7 @@ drk=dk
ptk=p3k
gur=guru
mpr=mprp
ignore.urls=TOK,EMBLEM
# Remove DGM as sson as the images can be downloaded
ignore.urls=TOK,EMBLEM,DGM
# sets ordered by release time (newest goes first)
token.lookup.order=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

53
Mage.Sets/src/mage/sets/Commander.java Normal file
View file

@ -0,0 +1,53 @@
/*
* 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 Commander extends ExpansionSet {
private static final Commander fINSTANCE = new Commander();
public static Commander getInstance() {
return fINSTANCE;
}
private Commander() {
super("Magic: The Gathering-Commander", "CMD", "", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT);
}
}

61
Mage.Sets/src/mage/sets/DragonsMaze.java Normal file
View file

@ -0,0 +1,61 @@
/*
* 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.Constants;
import mage.cards.ExpansionSet;
/**
*
* @author LevelX2
*/
public class DragonsMaze extends ExpansionSet {
private static final DragonsMaze fINSTANCE = new DragonsMaze();
public static DragonsMaze getInstance() {
return fINSTANCE;
}
private DragonsMaze() {
super("Dragon's Maze", "DGM", "seticon_mtggtc", "mage.sets.dragonsmaze", new GregorianCalendar(2013, 5, 03).getTime(), Constants.SetType.EXPANSION);
this.blockName = "Return to Ravnica";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 8;
this.parentSet = ReturnToRavnica.getInstance();
this.hasBasicLands = false;
}
}

2
Mage.Sets/src/mage/sets/Gatecrash.java
View file

@ -45,7 +45,7 @@ public class Gatecrash extends ExpansionSet {
private Gatecrash() {
super("Gatecrash", "GTC", "seticon_mtggtc", "mage.sets.gatecrash", new GregorianCalendar(2013, 2, 01).getTime(), SetType.EXPANSION);
this.blockName = "Gatecrash";
this.blockName = "Return to Ravnica";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;

2
Utils/known-sets.txt
View file

@ -77,4 +77,4 @@ Innistrad|innistrad|
Dark Ascension|darkascension|
Avacyn Restored|avacynrestored|
Gatecrash|gatecrash|
Commander|commander|
Magic: The Gathering-Commander|commander|

1
Utils/mtg-sets-data.txt
View file

@ -26,6 +26,7 @@ Dark Ascension|DKA|
Darksteel|DST|
Dissension|DIS|
Deckmasters|DKM|
Dragon's Maze|DGM|
The Dark|DRK|
Duel Decks: Divine vs. Demonic|DVD|
Duel Decks: Elspeth vs. Tezzeret|DDF|