From 21f23950898cc7e41b2db8e4702bfd82d6665dc4 Mon Sep 17 00:00:00 2001 From: friarsol Date: Sun, 7 Mar 2021 22:29:17 -0500 Subject: [PATCH] Improve editions for tracking scripts --- forge-gui/res/editions/Kaladesh Promos.txt | 2 +- .../editions/Mystery Booster Playtest Cards.txt | 1 + .../res/editions/Promo set for Gatherer.txt | 2 +- forge-gui/res/editions/XLN Treasure Chest.txt | 16 ++++++++-------- forge-gui/tools/EditionTracking.py | 8 ++++++-- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/forge-gui/res/editions/Kaladesh Promos.txt b/forge-gui/res/editions/Kaladesh Promos.txt index cbe0030cd79..5d577cb27d4 100644 --- a/forge-gui/res/editions/Kaladesh Promos.txt +++ b/forge-gui/res/editions/Kaladesh Promos.txt @@ -8,5 +8,5 @@ Type=Reprint 62 R Saheeli's Artistry 80 U Essence Extraction 130 R Skyship Stalker -151 Cultivator of Blades +151 R Cultivator of Blades 200 U Chief of the Foundry diff --git a/forge-gui/res/editions/Mystery Booster Playtest Cards.txt b/forge-gui/res/editions/Mystery Booster Playtest Cards.txt index caca0c39c89..93d00a4ce31 100644 --- a/forge-gui/res/editions/Mystery Booster Playtest Cards.txt +++ b/forge-gui/res/editions/Mystery Booster Playtest Cards.txt @@ -2,6 +2,7 @@ Code=CMB1 Date=2019-11-07 Name=Mystery Booster Playtest Cards +Border=Silver Code2=CMB1 MciCode=cmb1 Type=Other diff --git a/forge-gui/res/editions/Promo set for Gatherer.txt b/forge-gui/res/editions/Promo set for Gatherer.txt index 058f2ec3f6e..52227864c1e 100644 --- a/forge-gui/res/editions/Promo set for Gatherer.txt +++ b/forge-gui/res/editions/Promo set for Gatherer.txt @@ -30,7 +30,7 @@ R Rathi Assassin R Revenant R Ryusei, the Falling Star 2 S Sewers of Estark - Shield of Kaldra +R Shield of Kaldra R Silent Specter R Soul Collector R Sword of Kaldra diff --git a/forge-gui/res/editions/XLN Treasure Chest.txt b/forge-gui/res/editions/XLN Treasure Chest.txt index b7168dff1e0..cd99c146b1c 100644 --- a/forge-gui/res/editions/XLN Treasure Chest.txt +++ b/forge-gui/res/editions/XLN Treasure Chest.txt @@ -6,12 +6,12 @@ Type=Reprint [cards] 22 R Legion's Landing -74 Search for Azcanta +74 R Search for Azcanta 90 R Arguel's Blood Fast -173 Vance's Blasting Cannons -191 Growing Rites of Itlimoc -234 Conqueror's Galleon -235 Dowsing Dagger -243 Primal Amulet -249 Thaumatic Compass -250 Treasure Map +173 R Vance's Blasting Cannons +191 R Growing Rites of Itlimoc +234 R Conqueror's Galleon +235 R Dowsing Dagger +243 R Primal Amulet +249 R Thaumatic Compass +250 R Treasure Map diff --git a/forge-gui/tools/EditionTracking.py b/forge-gui/tools/EditionTracking.py index 145424b9e6a..93972fe1f91 100644 --- a/forge-gui/tools/EditionTracking.py +++ b/forge-gui/tools/EditionTracking.py @@ -14,6 +14,7 @@ allJsonUrl = 'http://mtgjson.com/json/AllCards.json' def initializeEditions(): ignoredTypes = [ "From_the_Vault", "Duel_Decks", "Online", "Premium_Deck_Series" ] + ignoredBorders = [ "Silver" ] editionSections = [ "[cards]", "[precon product]", "[borderless]", "[showcase]", "[extended art]", "[buy a box]", "[promo]" ] print("Parsing Editions folder") @@ -24,7 +25,7 @@ def initializeEditions(): with open(os.path.join(root, fileName)) as currentEdition: # Check all names for this card metadata = True - setcode = setname = settype = None + setcode = setname = settype = border = None for line in currentEdition.readlines(): line = line.strip() if metadata: @@ -33,7 +34,7 @@ def initializeEditions(): if setcode and setcode not in setCodes: setCodes.append(setcode) setCodeToName[setcode] = setname - if settype in ignoredTypes: + if settype in ignoredTypes or border in ignoredBorders: ignoredSet.append(setcode) elif line.startswith("Code="): @@ -45,6 +46,9 @@ def initializeEditions(): elif line.startswith("Type="): settype = line.split("=")[1].rstrip() + elif line.startswith("Border="): + border = line.split("=")[1].rstrip() + else: if not line: continue