From da98ac82ed0b6734bffb27bbb25c5db75b78f199 Mon Sep 17 00:00:00 2001 From: Thomas Hess Date: Wed, 18 Mar 2020 16:44:38 +0100 Subject: [PATCH] =?UTF-8?q?Aligned=20Guru=20Set=20code=20with=20Scryfall?= =?UTF-8?q?=20(GUR=20=E2=86=92=20PGRU).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tobias Graefensteiner's Pyromancer Ascension.dck | 2 +- .../sample-decks/2012/ISD-DKA-AVR/Turbo Poison.dck | 2 +- .../org/mage/plugins/card/dl/sources/GathererSets.java | 2 +- Mage.Sets/src/mage/sets/Guru.java | 8 +++++++- Mage.Tests/RB Aggro.dck | 4 ++-- Mage.Verify/src/main/java/mage/verify/MtgJson.java | 2 +- Utils/mtg-sets-data.txt | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tobias Graefensteiner's Pyromancer Ascension.dck b/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tobias Graefensteiner's Pyromancer Ascension.dck index 877242c508..780c3c2078 100644 --- a/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tobias Graefensteiner's Pyromancer Ascension.dck +++ b/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tobias Graefensteiner's Pyromancer Ascension.dck @@ -3,7 +3,7 @@ 3 [WWK:138] Khalni Garden 4 [M11:70] Preordain 4 [M12:63] Mana Leak -10 [GUR:2] Island +10 [PGRU:2] Island 2 [ZEN:48] Into the Roil 4 [ROE:86] See Beyond 4 [M12:73] Ponder diff --git a/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Turbo Poison.dck b/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Turbo Poison.dck index 6385c46c94..627583151c 100644 --- a/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Turbo Poison.dck +++ b/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Turbo Poison.dck @@ -2,7 +2,7 @@ 1 [ISD:262] Forest 4 [MBS:145] Inkmoth Nexus 2 [DKA:27] Artful Dodge -1 [GUR:1] Forest +1 [PGRU:1] Forest 4 [SOM:166] Ichorclaw Myr 3 [NPH:2] Apostle's Blessing 1 [INV:335] Island 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 f18151e681..11aee196d4 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", "PGPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "PPRE", "SUS", "SWS", "WMCQ", // need to fix + // "CLASH", "CP", "DPA", "PELP", "PGPX", "GRC", "PGRU", "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", "GVL", "S00", "S99", "UGL" // ok // current testing }; diff --git a/Mage.Sets/src/mage/sets/Guru.java b/Mage.Sets/src/mage/sets/Guru.java index f3739fd241..111f977007 100644 --- a/Mage.Sets/src/mage/sets/Guru.java +++ b/Mage.Sets/src/mage/sets/Guru.java @@ -4,6 +4,9 @@ import mage.cards.ExpansionSet; import mage.constants.Rarity; import mage.constants.SetType; +/** + * https://scryfall.com/sets/pgru + */ public final class Guru extends ExpansionSet { private static final Guru instance = new Guru(); @@ -13,7 +16,10 @@ public final class Guru extends ExpansionSet { } private Guru() { - super("Guru", "GUR", ExpansionSet.buildDate(1990, 1, 2), SetType.PROMOTIONAL); + super("Guru", "PGRU", ExpansionSet.buildDate(1990, 1, 2), SetType.PROMOTIONAL); + this.hasBasicLands = true; + this.hasBoosters = false; + cards.add(new SetCardInfo("Forest", 1, Rarity.LAND, mage.cards.basiclands.Forest.class)); cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class)); cards.add(new SetCardInfo("Mountain", 3, Rarity.LAND, mage.cards.basiclands.Mountain.class)); diff --git a/Mage.Tests/RB Aggro.dck b/Mage.Tests/RB Aggro.dck index 649d436fe1..ab9cb014d8 100644 --- a/Mage.Tests/RB Aggro.dck +++ b/Mage.Tests/RB Aggro.dck @@ -19,7 +19,7 @@ NAME:RB Aggro 1 [M10:245] Mountain 1 [M10:242] Mountain 1 [M10:243] Mountain -1 [GUR:3] Mountain +1 [PGRU:3] Mountain 1 [MRD:299] Mountain 1 [SOM:245] Mountain 1 [SOM:244] Mountain @@ -67,5 +67,5 @@ NAME:RB Aggro 1 [TSP:295] Mountain 1 [TSP:294] Mountain 1 [ISD:259] Mountain -LAYOUT MAIN:(2,1)(CMC,true,5)|()([GUR:3],[SHM:296],[AVR:240],[SHM:295],[SHM:294],[TSP:295],[TSP:294],[10E:379],[SOM:245],[ZEN:262],[ZEN:245],[10E:378],[SOM:244],[SOM:243],[ZEN:244],[SOM:242],[ZEN:243],[ZEN:242],[ALA:243],[ALA:242],[M12:245],[CHK:299],[M12:243],[M12:244],[CHK:300],[CHK:301],[M12:242],[CHK:302],[10E:376],[M11:243],[M11:242],[M11:245],[M11:244],[MBS:152],[ALA:244],[ALA:245],[ZEN:263],[ZEN:264],[RAV:301],[RAV:300],[RAV:299],[USG:345],[USG:346],[M10:242],[RAV:302],[USG:343],[USG:344],[ISD:259],[ROE:244],[ISD:261],[ISD:260],[ROE:241],[ROE:242],[ROE:243],[MRD:301],[MRD:300],[MRD:299],[M10:244],[M10:243],[M10:245],[LRW:294],[TMP:343],[LRW:295],[LRW:296],[LRW:297],[TMP:343],[MRD:302],[TMP:343],[TMP:343],[INV:345],[INV:344]) +LAYOUT MAIN:(2,1)(CMC,true,5)|()([PGRU:3],[SHM:296],[AVR:240],[SHM:295],[SHM:294],[TSP:295],[TSP:294],[10E:379],[SOM:245],[ZEN:262],[ZEN:245],[10E:378],[SOM:244],[SOM:243],[ZEN:244],[SOM:242],[ZEN:243],[ZEN:242],[ALA:243],[ALA:242],[M12:245],[CHK:299],[M12:243],[M12:244],[CHK:300],[CHK:301],[M12:242],[CHK:302],[10E:376],[M11:243],[M11:242],[M11:245],[M11:244],[MBS:152],[ALA:244],[ALA:245],[ZEN:263],[ZEN:264],[RAV:301],[RAV:300],[RAV:299],[USG:345],[USG:346],[M10:242],[RAV:302],[USG:343],[USG:344],[ISD:259],[ROE:244],[ISD:261],[ISD:260],[ROE:241],[ROE:242],[ROE:243],[MRD:301],[MRD:300],[MRD:299],[M10:244],[M10:243],[M10:245],[LRW:294],[TMP:343],[LRW:295],[LRW:296],[LRW:297],[TMP:343],[MRD:302],[TMP:343],[TMP:343],[INV:345],[INV:344]) LAYOUT SIDEBOARD:(0,0)(COLOR_IDENTITY,true,5)| diff --git a/Mage.Verify/src/main/java/mage/verify/MtgJson.java b/Mage.Verify/src/main/java/mage/verify/MtgJson.java index bf42cd50e1..364d754201 100644 --- a/Mage.Verify/src/main/java/mage/verify/MtgJson.java +++ b/Mage.Verify/src/main/java/mage/verify/MtgJson.java @@ -34,7 +34,7 @@ public final class MtgJson { mtgJsonToXMageCodes.put("pMEI", "MBP"); 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("pGRU", "PGRU"); 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 cebde6a01d..a6dd8bb0fa 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -101,7 +101,7 @@ Guilds of Ravnica|GRN| Grand Prix|PGPX| WPN Gateway|GRC| Gatecrash|GTC| -Guru|GUR| +Guru|PGRU| Premium Deck Series: Slivers|H09| Homelands|HML| Heroes of the Realm|HOTR|