From 677b20a7bafac6e79b0a233c6f5ddb46e60169cb Mon Sep 17 00:00:00 2001 From: marsteralex Date: Thu, 8 Sep 2022 20:23:31 -0700 Subject: [PATCH] fix brawl commanders for digital (#862) * fix https * add beasts * Remove extra file * Prettier-ify code * Prettier-ify * add basic land guesser also added fetcher to filter all cards instead of only unique art * default to original makes basic better * added set symbol to basics added set symbol to the basics game mode. Changed name to "How Basic" * cleanup * changed some pixels * only load set data if needed * hacked fix for removing image from name * removed check from original * remove check from original * sort names by set instead of by set symbol * include battlebond * update cards for categories update for dominaria united * added commander category commander category * update basic land art * can use double feature * removing racist cards upstream this way we don't have to store the cards in the json * remove generated cards from digital commanders * fix counterspell setting default Co-authored-by: Austin Chen --- web/public/mtg/importCards.py | 2 +- web/public/mtg/index.html | 7 ++----- web/public/mtg/jsons/commander.json | 2 +- web/public/mtg/jsons/set.json | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/web/public/mtg/importCards.py b/web/public/mtg/importCards.py index 17a5e2c2..6d45bd7a 100644 --- a/web/public/mtg/importCards.py +++ b/web/public/mtg/importCards.py @@ -24,7 +24,7 @@ def generate_initial_query(category): '.*player%28%5C.%7C+or+planeswalker%29%7C.*opponent%28%5C.%7C+or+planeswalker%29%29%2F%29' \ '+%28type%3Ainstant+or+type%3Asorcery%29+not%3Aadventure' elif category == 'commander': - string_query += '-banned%3Acommander+is%3Acommander' + string_query += 'is%3Acommander+%28not%3Adigital+-banned%3Acommander+or+is%3Adigital+legal%3Ahistoricbrawl+or+legal%3Acommander+or+legal%3Abrawl%29' # add category string query here string_query += '+-%28set%3Asld+%28%28cn>%3D231+cn<%3D233%29+or+%28cn>%3D321+cn<%3D324%29+or+%28cn>%3D185+cn' \ '<%3D189%29+or+%28cn>%3D138+cn<%3D142%29+or+%28cn>%3D364+cn<%3D368%29+or+cn%3A669+or+cn%3A670%29' \ diff --git a/web/public/mtg/index.html b/web/public/mtg/index.html index bfb324c1..15599eee 100644 --- a/web/public/mtg/index.html +++ b/web/public/mtg/index.html @@ -138,13 +138,10 @@ id="counterspell" name="whichguesser" value="counterspell" + onchange="updateSettingDefault(true, true, false)" checked /> -