External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-30 07:22:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[DTK] Updated mtg-cards-data.txt. Added Epic Confrontation. [ORI] Added set Magic Origins. [MMB] Added set Modern Masters 2015 and Karn/Emrakul/Goyf reprints.

Browse source
This commit is contained in:
fireshoes 2015-03-06 17:18:39 -06:00
parent 72f517d420
commit 392631953d
15 changed files with 401 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@ public class ConstructedFormats {
"* Mirage Block", "Weatherlight", "Visions", "Mirage",
"* Ice Age Block", "Coldsnap", "Alliances", "Ice Age",
"Homelands", "Fallen Empires", "The Dark", "Legends", "Antiquities", "Arabian Nights",
"Magic Origina",
"Magic 2015",
"Magic 2014",
"Magic 2013",
@ -66,6 +67,7 @@ public class ConstructedFormats {
"Vintage Masters",
"Conspiracy",
"Modern Masters",
"Modern Masters 2015",
"Archenemy",
"Commander 2014 Edition",
"Commander 2013 Edition",
@ -430,6 +432,9 @@ public class ConstructedFormats {
if (format.equals("Magic 2015")) {
return Arrays.asList("M15");
}
if (format.equals("Magic Origins")) {
return Arrays.asList("ORI");
}
if (format.equals("Archenemy")) {
return Arrays.asList("ARC");
}
@ -451,6 +456,9 @@ public class ConstructedFormats {
if (format.equals("Modern Masters")) {
return Arrays.asList("MMA");
}
if (format.equals("Modern Masters 2015")) {
return Arrays.asList("MMB");
}
if (format.equals("Conspiracy")) {
return Arrays.asList("CNS");
}

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

@ -33,7 +33,7 @@ public class GathererSets implements Iterable<DownloadJob> {
"SHM", "EVE",
"POR", "PO2", "PTK"};
private static final String[] withMythics = {"M10", "M11", "M12", "M13", "M14", "M15",
private static final String[] withMythics = {"M10", "M11", "M12", "M13", "M14", "M15", "ORI",
"DDF", "DDG", "DDH", "DDI", "DDJ", "DDK", "DDL", "DDM", "DDN",
"ALA", "CON", "ARB",
"ZEN", "WWK", "ROE",

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

@ -16,6 +16,8 @@ public class MagicCardsImageSource implements CardImageSource {
private static final Map<String, String> setNameTokenReplacement = new HashMap<String, String>() {
{
put("ORI", "magic-origins");
put("MMB", "modern-masters-2015");
put("PTC", "prerelease-events");
put("DTK", "dragons-of-tarkir");
put("GRC","wpngateway");

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

@ -29,7 +29,8 @@ public class WizardCardsImageSource implements CardImageSource {
public WizardCardsImageSource() {
sets = new HashMap<>();
setsAliases = new HashMap<>();
setsAliases.put("DTK", "dragonsoftarkir/cig");
setsAliases.put("DTK", "magicorigins/cig");
setsAliases.put("DTK", "modernmasters2015/cig");
setsAliases.put("FRF", "fatereforged/cig");
setsAliases.put("C14", "commander2014/cig");
setsAliases.put("KTK", "khansoftarkir/cig");

22
Mage.Client/src/main/resources/card-pictures-tok.txt
View file

@ -1,13 +1,15 @@
#|Generate|TOK:PTC||Angel|
#|Generate|TOK:PTC||Avatar|
#|Generate|TOK:PTC||Beast|
#|Generate|TOK:PTC||Dragon|
#|Generate|TOK:PTC||Elemental|
#|Generate|TOK:PTC||Harpy|
#|Generate|TOK:PTC||Hippo|
#|Generate|TOK:PTC||Soldier|
#|Generate|TOK:PTC||Wolf|
#|Generate|TOK:PTC||Wurm|
#|Generate|TOK:ORI|Zombie|
#|Generate|TOK:PTC|Angel|
#|Generate|TOK:PTC|Avatar|
#|Generate|TOK:PTC|Beast|
#|Generate|TOK:PTC|Dragon|
#|Generate|TOK:PTC|Elemental|
#|Generate|TOK:PTC|Harpy|
#|Generate|TOK:PTC|Hippo|
#|Generate|TOK:PTC|Soldier|
#|Generate|TOK:PTC|Wolf|
#|Generate|TOK:PTC|Wurm|
$|Generate|TOK:DTK|Djinn Monk|
$|Generate|TOK:DTK|Goblin|

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

@ -65,6 +65,6 @@ ddd=gvl
unh=uh
dde=pvc
# Remove setname as soon as the images can be downloaded
ignore.urls=TOK,DTK
ignore.urls=TOK,DTK,MMB,ORI
# sets ordered by release time (newest goes first)
token.lookup.order=PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC
token.lookup.order=ORI,MMB,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC