diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Abzan Midrange TDtB ST Dec 2014.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Abzan Midrange TDtB ST Dec 2014.mwDeck.dck index 6cbba4ffd9..d0f096cf24 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Abzan Midrange TDtB ST Dec 2014.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Abzan Midrange TDtB ST Dec 2014.mwDeck.dck @@ -31,7 +31,7 @@ 2 [CMD:159] Hornet Queen 2 [M15:244] Llanowar Wastes SB: 1 [M15:194] Reclamation Sage -SB: 1 [PTC:80] Doomwake Giant +SB: 1 [PPRE:80] Doomwake Giant SB: 2 [LRW:145] Thoughtseize SB: 1 [KTK:174] Duneblast SB: 1 [M15:187] Nissa, Worldwaker diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck index 81d1b5e28e..362faa98cb 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck @@ -8,7 +8,7 @@ 1 [POR:216] Plains 1 [M10:233] Plains 1 [M13:225] Glacial Fortress -4 [PTC:47] Hero of Bladehold +4 [PPRE:47] Hero of Bladehold 3 [ISD:11] Doomed Traveler 1 [DDK:2] Doomed Traveler 1 [DDN:81] Plains 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 c2f6e81b02..6f3954fb72 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -1549,7 +1549,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg pimpedSets.put("MBP", 1); pimpedSets.put("MLP", 1); pimpedSets.put("PLS", 1); - pimpedSets.put("PTC", 1); + pimpedSets.put("PPRE", 1); pimpedSets.put("SUS", 1); String[] sets = pimpedSets.keySet().toArray(new String[pimpedSets.keySet().size()]); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSourceDialog.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSourceDialog.java index b64d7cc810..91db9311eb 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSourceDialog.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSourceDialog.java @@ -145,7 +145,7 @@ public class CopyPasteImageSourceDialog extends JDialog { txtDeckList.setMinimumSize(new Dimension(250, 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); panel3.add(txtScrollableDeckList, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0, 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 fb8170e937..f8d71bf615 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", "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 // current testing }; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java index 7cd59d0a21..7fb30821af 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java @@ -18,7 +18,7 @@ public enum GrabbagImageSource implements CardImageSource { private static final Set supportedSets = new LinkedHashSet() { { - add("PTC"); + add("PPRE"); add("SWS"); } }; @@ -76,15 +76,15 @@ public enum GrabbagImageSource implements CardImageSource { return; } singleLinks = new HashMap<>(); - singleLinks.put("PTC/Arbiter of the Ideal", "MTG/BNG/en/promo/ArbiterOfTheIdeal.jpg"); - singleLinks.put("PTC/Courser of Kruphix", "MTG/BNG/en/promo/CourserOfKruphix.jpg"); - singleLinks.put("PTC/Eater of Hope", "MTG/BNG/en/promo/EaterOfHope.jpg"); - singleLinks.put("PTC/Fated Return", "MTG/BNG/en/promo/FatedReturn.jpg"); - singleLinks.put("PTC/Forgestoker Dragon", "MTG/BNG/en/promo/ForgestokerDragon.jpg"); - singleLinks.put("PTC/Nessian Wilds Ravager", "MTG/BNG/en/promo/NessianWildsRavager.jpg"); - singleLinks.put("PTC/Pain Seer", "MTG/BNG/en/promo/PainSeer.jpg"); - singleLinks.put("PTC/Silent Sentinel", "MTG/BNG/en/promo/SilentSentinel.jpg"); - singleLinks.put("PTC/Tromokratis", "MTG/BNG/en/promo/Tromokratis.jpg"); + singleLinks.put("PPRE/Arbiter of the Ideal", "MTG/BNG/en/promo/ArbiterOfTheIdeal.jpg"); + singleLinks.put("PPRE/Courser of Kruphix", "MTG/BNG/en/promo/CourserOfKruphix.jpg"); + singleLinks.put("PPRE/Eater of Hope", "MTG/BNG/en/promo/EaterOfHope.jpg"); + singleLinks.put("PPRE/Fated Return", "MTG/BNG/en/promo/FatedReturn.jpg"); + singleLinks.put("PPRE/Forgestoker Dragon", "MTG/BNG/en/promo/ForgestokerDragon.jpg"); + singleLinks.put("PPRE/Nessian Wilds Ravager", "MTG/BNG/en/promo/NessianWildsRavager.jpg"); + singleLinks.put("PPRE/Pain Seer", "MTG/BNG/en/promo/PainSeer.jpg"); + singleLinks.put("PPRE/Silent Sentinel", "MTG/BNG/en/promo/SilentSentinel.jpg"); + singleLinks.put("PPRE/Tromokratis", "MTG/BNG/en/promo/Tromokratis.jpg"); singleLinks.put("SWS/AAT-1", "CqmDY8V.jpg"); singleLinks.put("SWS/Acklay of the Arena", "ESVRm6F.jpg"); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java index d2c1eec6fa..c4d80a4f75 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java @@ -16,7 +16,7 @@ public enum MagidexImageSource implements CardImageSource { MagidexImageSource() { supportedSets = new LinkedHashSet<>(); - // supportedSets.add("PTC"); // Prerelease Events + // supportedSets.add("PPRE"); // Prerelease Events supportedSets.add("JR"); supportedSets.add("LEA"); supportedSets.add("LEB"); 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 64d36ac979..a684a645a1 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 @@ -28,7 +28,7 @@ public class ScryfallImageSupportCards { private static final Set supportedSets = new ArraySet() { { // xmage set codes - add("PTC"); + add("PPRE"); add("LEA"); add("LEB"); add("2ED"); 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 abe3e4c31d..56a94ab307 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 @@ -55,7 +55,7 @@ public enum WizardCardsImageSource implements CardImageSource { languageAliases.put(CardLanguage.CHINES_TRADITION, "Chinese Traditional "); supportedSets = new LinkedHashSet<>(); - // supportedSets.add("PTC"); // Prerelease Events + // supportedSets.add("PPRE"); // Prerelease Events supportedSets.add("LEA"); supportedSets.add("LEB"); supportedSets.add("2ED"); @@ -395,7 +395,7 @@ public enum WizardCardsImageSource implements CardImageSource { setsAliases.put("PLS", "Planeshift"); setsAliases.put("PO2", "Portal Second Age"); setsAliases.put("POR", "Portal"); - setsAliases.put("PTC", "Prerelease Events"); + setsAliases.put("PPRE", "Prerelease Events"); setsAliases.put("PTK", "Portal Three Kingdoms"); setsAliases.put("RAV", "Ravnica: City of Guilds"); setsAliases.put("ROE", "Rise of the Eldrazi"); diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 3cf4c97178..c56043696f 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -34,16 +34,16 @@ #|Generate|TOK:MGDC|Rhino|| #|Generate|TOK:MGDC|Sliver|| #|Generate|TOK:MLP|Thopter|| -#|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:PPRE|Angel|| +#|Generate|TOK:PPRE|Avatar|| +#|Generate|TOK:PPRE|Beast|| +#|Generate|TOK:PPRE|Dragon|| +#|Generate|TOK:PPRE|Elemental|| +#|Generate|TOK:PPRE|Harpy|| +#|Generate|TOK:PPRE|Hippo|| +#|Generate|TOK:PPRE|Soldier|| +#|Generate|TOK:PPRE|Wolf|| +#|Generate|TOK:PPRE|Wurm|| #|Generate|TOK:WMCQ|Angel|| |Generate|EMBLEM!:BFZ|Emblem Gideon|||GideonAllyOfZendikarEmblem| |Generate|EMBLEM!:BFZ|Emblem Kiora|||KioraMasterOfTheDepthsEmblem| diff --git a/Mage.Sets/src/mage/sets/PrereleaseEvents.java b/Mage.Sets/src/mage/sets/PrereleaseEvents.java index 7cd1605e9a..9478b87075 100644 --- a/Mage.Sets/src/mage/sets/PrereleaseEvents.java +++ b/Mage.Sets/src/mage/sets/PrereleaseEvents.java @@ -13,7 +13,7 @@ public final class PrereleaseEvents extends ExpansionSet { } 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.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 0b10985754..2d186590b4 100644 --- a/Mage.Verify/src/main/java/mage/verify/MtgJson.java +++ b/Mage.Verify/src/main/java/mage/verify/MtgJson.java @@ -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) + // 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 { mtgJsonToXMageCodes.put("pWCQ", "WMCQ"); mtgJsonToXMageCodes.put("pSUS", "SUS"); - mtgJsonToXMageCodes.put("pPRE", "PTC"); + mtgJsonToXMageCodes.put("pPRE", "PPRE"); mtgJsonToXMageCodes.put("pMPR", "MPRP"); mtgJsonToXMageCodes.put("pMEI", "MBP"); mtgJsonToXMageCodes.put("pGTW", "GRC"); // pGTW - Gateway = GRC (WPN + Gateway in one inner set) diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index da2361c833..902970036b 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -168,7 +168,7 @@ Premium Deck Series: Graveborn|PD3| Planar Chaos|PLC| Planeshift|PLS| Portal|POR| -Prerelease Events|PTC| +Prerelease Events|PPRE| Portal Three Kingdoms|PTK| Ravnica Allegiance|RNA| Ravnica: City of Guilds|RAV|