External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Conspiracy - Added Conspiracy set to XMage. Changed order of sets in deck editor set selector.

Browse source
This commit is contained in:
LevelX2 2014-06-23 15:58:07 +02:00
parent a9d08ef724
commit fc95ef68f1
12 changed files with 317 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,37 +20,47 @@ public class ConstructedFormats {
private static final String[] constructedFormats = {
ALL, STANDARD, EXTENDED, MODERN,
"Commander 2013 Edition",
"* Theros Block", "Journey into Nyx", "Born of the Gods", "Theros",
"Magic 2014",
"Modern Masters",
"* 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",
"* Scars of Mirrodin Block", "New Phyrexia", "Mirrodin Besieged", "Scars of Mirrodin",
"* 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",
"* Time Spiral Block", "Future Sight", "Planar Chaos", "Time Spiral", "Tenth Edition",
"* Time Spiral Block", "Future Sight", "Planar Chaos", "Time Spiral",
"* Ravnica Block", "Dissension", "Guildpact", "Ravnica: City of Guilds",
"* Kamigawa Block", "Saviors of Kamigawa", "Betrayers of Kamigawa", "Champions of Kamigawa", "Ninth Edition",
"* Kamigawa Block", "Saviors of Kamigawa", "Betrayers of Kamigawa", "Champions of Kamigawa",
"* Mirrodin Block", "Fifth Dawn", "Darksteel", "Mirrodin",
"* Onslaught Block", "Scourge", "Legions", "Onslaught", "Eighth Edition",
"* Onslaught Block", "Scourge", "Legions", "Onslaught",
"* Odyssey Block", "Judgment", "Torment", "Odyssey",
"* Invasion Block", "Apocalypse", "Planeshift", "Invasion", "Seventh Edition",
"* Invasion Block", "Apocalypse", "Planeshift", "Invasion",
"* Masquerade Block", "Prophecy", "Nemesis", "Mercadian Masques",
"* Urza Block", "Urza's Destiny", "Urza's Legacy", "Urza's Saga", "Sixth Edition",
"* Urza Block", "Urza's Destiny", "Urza's Legacy", "Urza's Saga",
"* Tempest Block", "Exodus", "Stronghold", "Tempest",
"* Mirage Block", "Weatherlight", "Visions", "Mirage", "Fifth Edition",
"* Ice Age Block", "Coldsnap", "Alliances", "Ice Age", "Fourth Edition",
"Homelands", "Fallen Empires", "The Dark", "Legends", "Antiquities", "Arabian Nights",
"* Mirage Block", "Weatherlight", "Visions", "Mirage",
"* Ice Age Block", "Coldsnap", "Alliances", "Ice Age",
"Homelands", "Fallen Empires", "The Dark", "Legends", "Antiquities", "Arabian Nights",
"Magic 2014",
"Magic 2013",
"Magic 2012",
"Magic 2011",
"Magic 2010",
"Tenth Edition",
"Ninth Edition",
"Eighth Edition",
"Seventh Edition",
"Sixth Edition",
"Fifth Edition",
"Fourth Edition",
"Revised Edition", "Unlimited Edition", "Limited Edition Beta", "Limited Edition Alpha",
"Conspiracy",
"Modern Masters",
"Commander 2013 Edition",
"Commander",
"Planechase 2012",
"Planechase",
"Portal", "Portal Second Age", "Portal Three Kingdoms",
"Guru",
"Unhinged",
"Duel Decks: Elves vs. Goblins",
"Duel Decks: Jace vs. Chandra",
"Duel Decks: Divine vs. Demonic",
@ -60,7 +70,9 @@ public class ConstructedFormats {
"Duel Decks: Ajani vs. Nicol Bolas",
"Duel Decks: Venser vs. Koth",
"Duel Decks: Heroes vs. Monsters",
"Duel Decks: Jace vs. Vraska"
"Duel Decks: Jace vs. Vraska",
"Guru",
"Unhinged",
};
private ConstructedFormats() {
@ -393,6 +405,9 @@ public class ConstructedFormats {
if (format.equals("Modern Masters")) {
return Arrays.asList("MMA");
}
if (format.equals("Conspiracy")) {
return Arrays.asList("CNS");
}
if (format.equals("Guru")) {
return Arrays.asList("GUR");
}

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

@ -42,7 +42,9 @@ public class GathererSets implements Iterable<DownloadJob> {
"ISD", "DKA", "AVR",
"RTR", "GTC", "DGM",
"MMA",
"THS", "BNG", "JOU"};
"THS", "BNG", "JOU",
"CNS"
};
private static final HashMap<String, String> symbolsReplacements = new HashMap<>();
static {

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

@ -16,6 +16,7 @@ public class MagicCardsImageSource implements CardImageSource {
private static final Map<String, String> setNameReplacement = new HashMap<String, String>() {
{
put("CNS", "conspiracy");
put("JOU", "journey-into-nyx");
put("BNG", "born-of-the-gods");
put("C13", "commander-2013-edition");

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

@ -29,6 +29,7 @@ public class WizardCardsImageSource implements CardImageSource {
public WizardCardsImageSource() {
sets = new HashMap<>();
setsAliases = new HashMap<>();
setsAliases.put("CNS", "conspiracy/cig");
setsAliases.put("JOU", "journeyintonyx/cig");
setsAliases.put("BNG", "bornofthegods/cig");
setsAliases.put("C13", "commander2013/cig");