github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 11:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix set code clash with the old PrereleaseEvents set and the new Pro Tour Collector set (PTC).

Browse source 
Set the PrereleaseEvents code to PPRE, as listed on Scryfall.
This commit is contained in:
Thomas Hess 2020-02-03 12:08:33 +01:00
parent bced163e1e
commit d628303f3a
No known key found for this signature in database
GPG key ID: 98602F47D161B13C
13 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/release/sample-decks/Decks to Beat/Abzan Midrange TDtB ST Dec 2014.mwDeck.dck
View file

@ -31,7 +31,7 @@
2 [CMD:159] Hornet Queen 2 [CMD:159] Hornet Queen
2 [M15:244] Llanowar Wastes 2 [M15:244] Llanowar Wastes
SB: 1 [M15:194] Reclamation Sage SB: 1 [M15:194] Reclamation Sage
SB: 1 [PTC:80] Doomwake Giant SB: 1 [PPRE:80] Doomwake Giant
SB: 2 [LRW:145] Thoughtseize SB: 2 [LRW:145] Thoughtseize
SB: 1 [KTK:174] Duneblast SB: 1 [KTK:174] Duneblast
SB: 1 [M15:187] Nissa, Worldwaker SB: 1 [M15:187] Nissa, Worldwaker

2
Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck
View file

@ -8,7 +8,7 @@
1 [POR:216] Plains 1 [POR:216] Plains
1 [M10:233] Plains 1 [M10:233] Plains
1 [M13:225] Glacial Fortress 1 [M13:225] Glacial Fortress
4 [PTC:47] Hero of Bladehold 4 [PPRE:47] Hero of Bladehold
3 [ISD:11] Doomed Traveler 3 [ISD:11] Doomed Traveler
1 [DDK:2] Doomed Traveler 1 [DDK:2] Doomed Traveler
1 [DDN:81] Plains 1 [DDN:81] Plains

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

@ -1549,7 +1549,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
pimpedSets.put("MBP", 1); pimpedSets.put("MBP", 1);
pimpedSets.put("MLP", 1); pimpedSets.put("MLP", 1);
pimpedSets.put("PLS", 1); pimpedSets.put("PLS", 1);
pimpedSets.put("PTC", 1); pimpedSets.put("PPRE", 1);
pimpedSets.put("SUS", 1); pimpedSets.put("SUS", 1);
String[] sets = pimpedSets.keySet().toArray(new String[pimpedSets.keySet().size()]); String[] sets = pimpedSets.keySet().toArray(new String[pimpedSets.keySet().size()]);

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

@ -145,7 +145,7 @@ public class CopyPasteImageSourceDialog extends JDialog {
txtDeckList.setMinimumSize(new Dimension(250, 400)); txtDeckList.setMinimumSize(new Dimension(250, 400));
txtDeckList.setPreferredSize(new Dimension(550, 400)); txtDeckList.setPreferredSize(new Dimension(550, 400));
txtDeckList.setText("// Example follows. \nNB: **DELETE ALL TEXT AND GO SELECT THIS SOURCE AGAIN TO SEE THE NAMES CARDS YOU'RE MISSING IMAGES FOR!!!***\n\"SWS/Might of the Wild\", \"http://i.imgur.com/eNXOdxp.jpg\"\n\"PTC/Wolf of Devil's Breach\", \"https://img.scryfall.com/cards/large/en/psoi/192s.jpg\"\n\nExpected columns: Name of Card (Set Trigraph\\Name), URL of image\n\n\n"); txtDeckList.setText("// Example follows. \nNB: **DELETE ALL TEXT AND GO SELECT THIS SOURCE AGAIN TO SEE THE NAMES CARDS YOU'RE MISSING IMAGES FOR!!!***\n\"SWS/Might of the Wild\", \"http://i.imgur.com/eNXOdxp.jpg\"\n\"PPRE/Wolf of Devil's Breach\", \"https://img.scryfall.com/cards/large/en/psoi/192s.jpg\"\n\nExpected columns: Name of Card (Set Trigraph\\Name), URL of image\n\n\n");
JScrollPane txtScrollableDeckList = new JScrollPane(txtDeckList); JScrollPane txtScrollableDeckList = new JScrollPane(txtDeckList);
panel3.add(txtScrollableDeckList, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0, panel3.add(txtScrollableDeckList, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0,

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

@ -63,7 +63,7 @@ public class GathererSets implements Iterable<DownloadJob> {
"W16", "W17", "W16", "W17",
// "PALP" -- Gatherer does not have the set Asia Pacific Land Program // "PALP" -- Gatherer does not have the set Asia Pacific Land Program
// "ATH" -- has cards from many sets, symbol does not exist on gatherer // "ATH" -- has cards from many sets, symbol does not exist on gatherer
// "CLASH", "CP", "DPA", "PELP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "PTC", "SUS", "SWS", "WMCQ", // need to fix // "CLASH", "CP", "DPA", "PELP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "PPRE", "SUS", "SWS", "WMCQ", // need to fix
"H09", "PD2", "PD3", "UNH", "CM1", "V11", "A25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "8EB", "9EB", "CHR", "G18", "DD3GVL", "S00", "S99", "UGL" // ok "H09", "PD2", "PD3", "UNH", "CM1", "V11", "A25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "8EB", "9EB", "CHR", "G18", "DD3GVL", "S00", "S99", "UGL" // ok
// current testing // current testing
}; };

20
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java
View file

@ -18,7 +18,7 @@ public enum GrabbagImageSource implements CardImageSource {
private static final Set<String> supportedSets = new LinkedHashSet<String>() { private static final Set<String> supportedSets = new LinkedHashSet<String>() {
{ {
add("PTC"); add("PPRE");
add("SWS"); add("SWS");
} }
}; };
@ -76,15 +76,15 @@ public enum GrabbagImageSource implements CardImageSource {
return; return;
} }
singleLinks = new HashMap<>(); singleLinks = new HashMap<>();
singleLinks.put("PTC/Arbiter of the Ideal", "MTG/BNG/en/promo/ArbiterOfTheIdeal.jpg"); singleLinks.put("PPRE/Arbiter of the Ideal", "MTG/BNG/en/promo/ArbiterOfTheIdeal.jpg");
singleLinks.put("PTC/Courser of Kruphix", "MTG/BNG/en/promo/CourserOfKruphix.jpg"); singleLinks.put("PPRE/Courser of Kruphix", "MTG/BNG/en/promo/CourserOfKruphix.jpg");
singleLinks.put("PTC/Eater of Hope", "MTG/BNG/en/promo/EaterOfHope.jpg"); singleLinks.put("PPRE/Eater of Hope", "MTG/BNG/en/promo/EaterOfHope.jpg");
singleLinks.put("PTC/Fated Return", "MTG/BNG/en/promo/FatedReturn.jpg"); singleLinks.put("PPRE/Fated Return", "MTG/BNG/en/promo/FatedReturn.jpg");
singleLinks.put("PTC/Forgestoker Dragon", "MTG/BNG/en/promo/ForgestokerDragon.jpg"); singleLinks.put("PPRE/Forgestoker Dragon", "MTG/BNG/en/promo/ForgestokerDragon.jpg");
singleLinks.put("PTC/Nessian Wilds Ravager", "MTG/BNG/en/promo/NessianWildsRavager.jpg"); singleLinks.put("PPRE/Nessian Wilds Ravager", "MTG/BNG/en/promo/NessianWildsRavager.jpg");
singleLinks.put("PTC/Pain Seer", "MTG/BNG/en/promo/PainSeer.jpg"); singleLinks.put("PPRE/Pain Seer", "MTG/BNG/en/promo/PainSeer.jpg");
singleLinks.put("PTC/Silent Sentinel", "MTG/BNG/en/promo/SilentSentinel.jpg"); singleLinks.put("PPRE/Silent Sentinel", "MTG/BNG/en/promo/SilentSentinel.jpg");
singleLinks.put("PTC/Tromokratis", "MTG/BNG/en/promo/Tromokratis.jpg"); singleLinks.put("PPRE/Tromokratis", "MTG/BNG/en/promo/Tromokratis.jpg");
singleLinks.put("SWS/AAT-1", "CqmDY8V.jpg"); singleLinks.put("SWS/AAT-1", "CqmDY8V.jpg");
singleLinks.put("SWS/Acklay of the Arena", "ESVRm6F.jpg"); singleLinks.put("SWS/Acklay of the Arena", "ESVRm6F.jpg");

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

@ -16,7 +16,7 @@ public enum MagidexImageSource implements CardImageSource {
MagidexImageSource() { MagidexImageSource() {
supportedSets = new LinkedHashSet<>(); supportedSets = new LinkedHashSet<>();
// supportedSets.add("PTC"); // Prerelease Events // supportedSets.add("PPRE"); // Prerelease Events
supportedSets.add("JR"); supportedSets.add("JR");
supportedSets.add("LEA"); supportedSets.add("LEA");
supportedSets.add("LEB"); supportedSets.add("LEB");

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

@ -28,7 +28,7 @@ public class ScryfallImageSupportCards {
private static final Set<String> supportedSets = new ArraySet<String>() { private static final Set<String> supportedSets = new ArraySet<String>() {
{ {
// xmage set codes // xmage set codes
add("PTC"); add("PPRE");
add("LEA"); add("LEA");
add("LEB"); add("LEB");
add("2ED"); add("2ED");

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

@ -55,7 +55,7 @@ public enum WizardCardsImageSource implements CardImageSource {
languageAliases.put(CardLanguage.CHINES_TRADITION, "Chinese Traditional "); languageAliases.put(CardLanguage.CHINES_TRADITION, "Chinese Traditional ");
supportedSets = new LinkedHashSet<>(); supportedSets = new LinkedHashSet<>();
// supportedSets.add("PTC"); // Prerelease Events // supportedSets.add("PPRE"); // Prerelease Events
supportedSets.add("LEA"); supportedSets.add("LEA");
supportedSets.add("LEB"); supportedSets.add("LEB");
supportedSets.add("2ED"); supportedSets.add("2ED");
@ -395,7 +395,7 @@ public enum WizardCardsImageSource implements CardImageSource {
setsAliases.put("PLS", "Planeshift"); setsAliases.put("PLS", "Planeshift");
setsAliases.put("PO2", "Portal Second Age"); setsAliases.put("PO2", "Portal Second Age");
setsAliases.put("POR", "Portal"); setsAliases.put("POR", "Portal");
setsAliases.put("PTC", "Prerelease Events"); setsAliases.put("PPRE", "Prerelease Events");
setsAliases.put("PTK", "Portal Three Kingdoms"); setsAliases.put("PTK", "Portal Three Kingdoms");
setsAliases.put("RAV", "Ravnica: City of Guilds"); setsAliases.put("RAV", "Ravnica: City of Guilds");
setsAliases.put("ROE", "Rise of the Eldrazi"); setsAliases.put("ROE", "Rise of the Eldrazi");

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

@ -34,16 +34,16 @@
#|Generate|TOK:MGDC|Rhino|| #|Generate|TOK:MGDC|Rhino||
#|Generate|TOK:MGDC|Sliver|| #|Generate|TOK:MGDC|Sliver||
#|Generate|TOK:MLP|Thopter|| #|Generate|TOK:MLP|Thopter||
#|Generate|TOK:PTC|Angel|| #|Generate|TOK:PPRE|Angel||
#|Generate|TOK:PTC|Avatar|| #|Generate|TOK:PPRE|Avatar||
#|Generate|TOK:PTC|Beast|| #|Generate|TOK:PPRE|Beast||
#|Generate|TOK:PTC|Dragon|| #|Generate|TOK:PPRE|Dragon||
#|Generate|TOK:PTC|Elemental|| #|Generate|TOK:PPRE|Elemental||
#|Generate|TOK:PTC|Harpy|| #|Generate|TOK:PPRE|Harpy||
#|Generate|TOK:PTC|Hippo|| #|Generate|TOK:PPRE|Hippo||
#|Generate|TOK:PTC|Soldier|| #|Generate|TOK:PPRE|Soldier||
#|Generate|TOK:PTC|Wolf|| #|Generate|TOK:PPRE|Wolf||
#|Generate|TOK:PTC|Wurm|| #|Generate|TOK:PPRE|Wurm||
#|Generate|TOK:WMCQ|Angel|| #|Generate|TOK:WMCQ|Angel||
|Generate|EMBLEM!:BFZ|Emblem Gideon|||GideonAllyOfZendikarEmblem| |Generate|EMBLEM!:BFZ|Emblem Gideon|||GideonAllyOfZendikarEmblem|
|Generate|EMBLEM!:BFZ|Emblem Kiora|||KioraMasterOfTheDepthsEmblem| |Generate|EMBLEM!:BFZ|Emblem Kiora|||KioraMasterOfTheDepthsEmblem|

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

@ -13,7 +13,7 @@ public final class PrereleaseEvents extends ExpansionSet {
} }
private PrereleaseEvents() { private PrereleaseEvents() {
super("Prerelease Events", "PTC", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); super("Prerelease Events", "PPRE", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL);
this.hasBoosters = false; this.hasBoosters = false;
this.hasBasicLands = true; this.hasBasicLands = true;

4
Mage.Verify/src/main/java/mage/verify/MtgJson.java
View file

@ -25,10 +25,12 @@ public final class MtgJson {
public static final boolean MTGJSON_IGNORE_NEW_PROPERTIES = true; // set it to false for full mtgjson checks and research (new fields finds or mtgjson updates) public static final boolean MTGJSON_IGNORE_NEW_PROPERTIES = true; // set it to false for full mtgjson checks and research (new fields finds or mtgjson updates)
// TODO: MtgJson now seems to use upper case set codes only.
// Review the ones beginning with a lower case "p" and remove the redundant entries.
static { static {
mtgJsonToXMageCodes.put("pWCQ", "WMCQ"); mtgJsonToXMageCodes.put("pWCQ", "WMCQ");
mtgJsonToXMageCodes.put("pSUS", "SUS"); mtgJsonToXMageCodes.put("pSUS", "SUS");
mtgJsonToXMageCodes.put("pPRE", "PTC"); mtgJsonToXMageCodes.put("pPRE", "PPRE");
mtgJsonToXMageCodes.put("pMPR", "MPRP"); mtgJsonToXMageCodes.put("pMPR", "MPRP");
mtgJsonToXMageCodes.put("pMEI", "MBP"); mtgJsonToXMageCodes.put("pMEI", "MBP");
mtgJsonToXMageCodes.put("pGTW", "GRC"); // pGTW - Gateway = GRC (WPN + Gateway in one inner set) mtgJsonToXMageCodes.put("pGTW", "GRC"); // pGTW - Gateway = GRC (WPN + Gateway in one inner set)

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

@ -168,7 +168,7 @@ Premium Deck Series: Graveborn|PD3|
Planar Chaos|PLC| Planar Chaos|PLC|
Planeshift|PLS| Planeshift|PLS|
Portal|POR| Portal|POR|
Prerelease Events|PTC| Prerelease Events|PPRE|
Portal Three Kingdoms|PTK| Portal Three Kingdoms|PTK|
Ravnica Allegiance|RNA| Ravnica Allegiance|RNA|
Ravnica: City of Guilds|RAV| Ravnica: City of Guilds|RAV|