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

Removed duplicated sets that was split into multiple (Champs, Game Day, Launch Party, Media Inserts, Super Series)

Browse source
This commit is contained in:
Oleg Agafonov 2020-08-08 11:00:07 +04:00
parent f746d4d8d2
commit 7599acf1c8
17 changed files with 71 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java
View file

@ -1507,7 +1507,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
// TODO: Why are these a HashMap? It can be a HashSet<String> instead, as the value is never used in the code.
Map<String, Integer> pimpedSets = new HashMap<>();
Map<CardView, Integer> pimpedCards = new HashMap<>();
pimpedSets.put("CP", 1);
pimpedSets.put("PCMP", 1);
pimpedSets.put("MPS", 1);
pimpedSets.put("CP1", 1);
pimpedSets.put("CP2", 1);
@ -1593,15 +1593,12 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
pimpedSets.put("PGTW", 1); // Gateway 2006
pimpedSets.put("PJAS", 1); // Junior APAC Series
pimpedSets.put("MGDC", 1);
pimpedSets.put("EXP", 1);
pimpedSets.put("PGPX", 1);
pimpedSets.put("GRC", 1);
pimpedSets.put("MBP", 1);
pimpedSets.put("MLP", 1);
pimpedSets.put("PMEI", 1);
pimpedSets.put("PREL", 1);
pimpedSets.put("PLS", 1);
pimpedSets.put("PPRE", 1);
pimpedSets.put("SUS", 1);
String[] sets = pimpedSets.keySet().toArray(new String[pimpedSets.keySet().size()]);
Boolean didModify = false;

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

@ -1,8 +1,5 @@
package org.mage.plugins.card.dl.sources;
import java.io.File;
import java.util.*;
import mage.cards.ExpansionSet;
import mage.cards.Sets;
import mage.client.constants.Constants;
@ -10,6 +7,9 @@ import mage.constants.Rarity;
import org.apache.log4j.Logger;
import org.mage.plugins.card.dl.DownloadJob;
import java.io.File;
import java.util.*;
import static org.mage.plugins.card.dl.DownloadJob.fromURL;
import static org.mage.plugins.card.dl.DownloadJob.toFile;
import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
@ -63,7 +63,7 @@ public class GathererSets implements Iterable<DownloadJob> {
"W16", "W17",
// "PALP" -- Gatherer does not have the set Asia Pacific Land Program
// "ATH" -- has cards from many sets, symbol does not exist on gatherer
// "CLASH", "CP", "DPA", "PELP", "PGPX", "GRC", "PGRU", "H17", "JR", "MBP", "MGDC", "MLP", "PPRE", "SUS", "SWS", "WMCQ", // need to fix
// "CP", "DPA", "PELP", "PGPX", "PGRU", "H17", "JR", "PPRE", "SWS", "WMCQ", // need to fix
"H09", "PD2", "PD3", "UNH", "CM1", "V11", "A25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "8EB", "9EB", "CHR", "G18", "GVL", "S00", "S99", "UGL" // ok
// current testing
};

15
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java
View file

@ -3,7 +3,10 @@ package org.mage.plugins.card.dl.sources;
import com.google.common.collect.ImmutableMap;
import org.tritonus.share.ArraySet;
import java.util.*;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
/**
@ -12,8 +15,8 @@ import java.util.*;
public class ScryfallImageSupportCards {
private static final Map<String, String> xmageSetsToScryfall = ImmutableMap.<String, String>builder().
put("MBP", "pmei").
build();
//put("xmage", "scryfall").
build();
private static final Set<String> supportedSets = new ArraySet<String>() {
@ -156,6 +159,7 @@ public class ScryfallImageSupportCards {
add("PG07"); // Gateway 2007
//add("PMPS07"); // Magic Premiere Shop 2007
add("P07"); // Magic Player Rewards 2007
add("HHO"); // Happy Holidays
add("G07"); // Judge Gift Cards 2007
add("F07"); // Friday Night Magic 2007
add("PLC"); // Planar Chaos
@ -466,10 +470,10 @@ public class ScryfallImageSupportCards {
add("PMEI"); // Magazine Inserts
add("SLU"); // Secret Lair: Ultimate Edition
//add("SS3"); // Signature Spellbook: Chandra
add("HA3"); // Historic Anthology 3
// TODO: DuelsOfThePlaneswalkersPromos
add("DPAP");
add("GRC");
//
// add("TD0"); // Commander Theme Decks
// add("TD2"); // Duel Decks: Mirrodin Pure vs. New Phyrexia
@ -482,8 +486,6 @@ public class ScryfallImageSupportCards {
add("IKO");
add("C20");
//
add("EURO");
add("GPX");
add("MPS-AKH");
add("M21");
add("JMP");
@ -563,7 +565,6 @@ public class ScryfallImageSupportCards {
put("9EB/Goblin Raider", "https://api.scryfall.com/cards/9ed/S8");
put("9EB/Enormous Baloth", "https://api.scryfall.com/cards/9ed/S9");
put("9EB/Spined Wurm", "https://api.scryfall.com/cards/9ed/S10");
}
};

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

@ -339,7 +339,6 @@ public enum WizardCardsImageSource implements CardImageSource {
setsAliases.put("FUT", "Future Sight");
setsAliases.put("GPT", "Guildpact");
setsAliases.put("PGPX", "Grand Prix");
setsAliases.put("GRC", "WPN Gateway");
setsAliases.put("GTC", "Gatecrash");
setsAliases.put("H09", "Premium Deck Series: Slivers");
setsAliases.put("HML", "Homelands");
@ -365,15 +364,13 @@ public enum WizardCardsImageSource implements CardImageSource {
setsAliases.put("M13", "Magic 2013");
setsAliases.put("M14", "Magic 2014");
setsAliases.put("M15", "Magic 2015");
setsAliases.put("MBP", "Media Inserts");
setsAliases.put("PMEI", "Media Inserts");
setsAliases.put("MBS", "Mirrodin Besieged");
setsAliases.put("ME2", "Masters Edition II");
setsAliases.put("ME3", "Masters Edition III");
setsAliases.put("ME4", "Masters Edition IV");
setsAliases.put("MED", "Masters Edition");
// setsAliases.put("MGDC", "Game Day");
setsAliases.put("MIR", "Mirage");
setsAliases.put("MLP", "Launch Party");
setsAliases.put("MMA", "Modern Masters");
setsAliases.put("MM2", "Modern Masters 2015");
setsAliases.put("MM3", "Modern Masters 2017");