From 71bdc431dbe398284a77da45f152e248a390178f Mon Sep 17 00:00:00 2001 From: Thomas Hess Date: Mon, 9 Mar 2020 12:25:42 +0100 Subject: [PATCH] Aligned Grand Prix Promos set code with Scryfall. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (GPX → PGPX) --- .../Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck | 2 +- ...) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck | 2 +- Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java | 2 +- .../java/org/mage/plugins/card/dl/sources/GathererSets.java | 2 +- .../plugins/card/dl/sources/ScryfallImageSupportCards.java | 3 +-- .../mage/plugins/card/dl/sources/WizardCardsImageSource.java | 2 +- Mage.Client/src/main/resources/card-pictures-tok.txt | 4 ++-- Mage.Sets/src/mage/sets/GrandPrixPromos.java | 2 +- Mage.Verify/src/main/java/mage/verify/MtgJson.java | 1 - Utils/mtg-sets-data.txt | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck index a3db2606fd..729cfcb3cb 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck @@ -18,7 +18,7 @@ 1 [LEA:283] Mountain 1 [MMQ:345] Mountain 1 [RAV:300] Mountain -2 [GPX:6] Goblin Guide +2 [PGPX:6] Goblin Guide 4 [M11:135] Ember Hauler 2 [JGP:1] Lightning Bolt 1 [M10:146] Lightning Bolt diff --git a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(2) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(2) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck index 431d4219fa..b30601649d 100644 --- a/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(2) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck +++ b/Mage.Client/release/sample-decks/Top8 PT and Worlds decks (Standard)/Affinity(2) 58 World Championship 2004 (San Francisco) ST 9-5-04.dck @@ -12,7 +12,7 @@ 2 [7ED:327] City of Brass 1 [MRD:172] Frogmite 2 [INV:299] Chromatic Sphere -2 [GPX:3] Chrome Mox +2 [PGPX:3] Chrome Mox 1 [MRD:151] Chromatic Sphere 1 [MRD:152] Chrome Mox 1 [5DN:113] Cranial Plating diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 7d9798b0f1..27e901d2ce 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -1588,7 +1588,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg pimpedSets.put("MGDC", 1); pimpedSets.put("EXP", 1); - pimpedSets.put("GPX", 1); + pimpedSets.put("PGPX", 1); pimpedSets.put("GRC", 1); pimpedSets.put("MBP", 1); pimpedSets.put("MLP", 1); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 93686c142e..2688771943 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -63,7 +63,7 @@ public class GathererSets implements Iterable { "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", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "PPRE", "SUS", "SWS", "WMCQ", // need to fix + // "CLASH", "CP", "DPA", "PELP", "PGPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "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 // current testing }; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java index 2e350bd87b..44832225b9 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java @@ -20,7 +20,6 @@ public class ScryfallImageSupportCards { put("MPS-AKH", "mp2"). put("MBP", "pmei"). put("WMCQ", "pwcq"). - put("GPX", "pgpx"). put("MED", "me1"). put("MEDM", "med"). build(); @@ -298,7 +297,7 @@ public class ScryfallImageSupportCards { // add("PALP"); add("PELP"); - add("GPX"); + add("PGPX"); add("ATH"); add("GRC"); add("ANA"); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index b34fc27330..dd1b9055b7 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -338,7 +338,7 @@ public enum WizardCardsImageSource implements CardImageSource { setsAliases.put("FRF", "Fate Reforged"); setsAliases.put("FUT", "Future Sight"); setsAliases.put("GPT", "Guildpact"); - setsAliases.put("GPX", "Grand Prix"); + setsAliases.put("PGPX", "Grand Prix"); setsAliases.put("GRC", "WPN Gateway"); setsAliases.put("GTC", "Gatecrash"); setsAliases.put("H09", "Premium Deck Series: Slivers"); diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index c56043696f..1ef4df299c 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -12,8 +12,8 @@ #|Generate|TOK:CHK|Dragon Spirit|| #|Generate|TOK:FNMP|Centaur|| #|Generate|TOK:FNMP|Wurm|| -#|Generate|TOK:GPX|Elephant|| -#|Generate|TOK:GPX|Germ|| +#|Generate|TOK:PGPX|Elephant|| +#|Generate|TOK:PGPX|Germ|| #|Generate|TOK:GRC|Bird|| #|Generate|TOK:GRC|Golem|| #|Generate|TOK:GRC|Human|| diff --git a/Mage.Sets/src/mage/sets/GrandPrixPromos.java b/Mage.Sets/src/mage/sets/GrandPrixPromos.java index b3362b716f..5bd3865dd5 100644 --- a/Mage.Sets/src/mage/sets/GrandPrixPromos.java +++ b/Mage.Sets/src/mage/sets/GrandPrixPromos.java @@ -17,7 +17,7 @@ public final class GrandPrixPromos extends ExpansionSet { } private GrandPrixPromos() { - super("Grand Prix Promos", "GPX", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); + super("Grand Prix Promos", "PGPX", ExpansionSet.buildDate(2011, 6, 17), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = true; diff --git a/Mage.Verify/src/main/java/mage/verify/MtgJson.java b/Mage.Verify/src/main/java/mage/verify/MtgJson.java index 05af9030a5..dd12823d15 100644 --- a/Mage.Verify/src/main/java/mage/verify/MtgJson.java +++ b/Mage.Verify/src/main/java/mage/verify/MtgJson.java @@ -36,7 +36,6 @@ public final class MtgJson { mtgJsonToXMageCodes.put("pGTW", "GRC"); // pGTW - Gateway = GRC (WPN + Gateway in one inner set) mtgJsonToXMageCodes.put("pWPN", "GRC"); // pWPN - Wizards Play Network = GRC (WPN + Gateway in one inner set) mtgJsonToXMageCodes.put("pGRU", "GUR"); - mtgJsonToXMageCodes.put("pGPX", "GPX"); mtgJsonToXMageCodes.put("pFNM", "FNMP"); mtgJsonToXMageCodes.put("pELP", "PELP"); mtgJsonToXMageCodes.put("pARL", "PARL"); // TODO: What about the other Arena League sets (1999-2006)? diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index 902970036b..dcf78d3f08 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -98,7 +98,7 @@ Future Sight|FUT| Global Series: Jiang Yanggu & Mu Yanling|GS1| Guildpact|GPT| Guilds of Ravnica|GRN| -Grand Prix|GPX| +Grand Prix|PGPX| WPN Gateway|GRC| Gatecrash|GTC| Guru|GUR|