From 563f46c30c05f6df22762b4974ddc5e0e99003c7 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 1 Mar 2024 20:01:56 -0600 Subject: [PATCH] Update human legal-check --- app/db_engine.py | 21 ++++++++++++++------- app/routers_v2/cards.py | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/db_engine.py b/app/db_engine.py index ee3fe59..8f4f029 100644 --- a/app/db_engine.py +++ b/app/db_engine.py @@ -26,28 +26,35 @@ logging.basicConfig( level=log_level ) +ranked_cardsets = [9, 10, 13, 14] CARDSETS = { 'ranked': { - 'primary': [9, 10, 13, 14] # 2023, 23 Promos, 2018 + 'primary': ranked_cardsets, # 2023, 23 Promos, 2018 + 'human': ranked_cardsets }, 'minor-league': { 'primary': [13, 8], # 2018, Mario - 'secondary': [9, 3] # 2023, 2022 + 'secondary': [9, 3], # 2023, 2022 + 'human': [x for x in range(1, 17)] }, 'major-league': { - 'primary': [13, 9, 8, 6, 12], # 2018, 2023, Mario, 2013, 2008 - 'secondary': [3, 5] # 2022, 2019 + 'primary': [13, 9, 8, 6, 12, 14], # 2018, 2023, Mario, 2013, 2008 + 'secondary': [3, 5], # 2022, 2019 + 'human': ranked_cardsets }, 'hall-of-fame': { - 'primary': [1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] + 'primary': [1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], + 'human': ranked_cardsets }, 'flashback': { 'primary': [11, 7, 6, 12], # 2016, 2012, 2013, 2008, Mario - 'secondary': [13, 5] # 2018, 2019 + 'secondary': [13, 5], # 2018, 2019 + 'human': [12, 7, 6, 11] # 2008, 2012, 2013, 2016 }, 'gauntlet-3': { 'primary': [13], # 2018 - 'secondary': [5, 11, 9] # 2019, 2016, 2023 + 'secondary': [5, 11, 9], # 2019, 2016, 2023 + 'human': [x for x in range(1, 17)] } } diff --git a/app/routers_v2/cards.py b/app/routers_v2/cards.py index 0c6f3af..2d2749a 100644 --- a/app/routers_v2/cards.py +++ b/app/routers_v2/cards.py @@ -225,7 +225,7 @@ async def v1_cards_legal_check( all_cards = Card.select().where(Card.id << card_id) for x in all_cards: - if x.player.cardset_id not in CARDSETS[rarity_name]['primary']: + if x.player.cardset_id not in CARDSETS[rarity_name]['human']: if x.player.p_name in x.player.description: bad_cards.append(x.player.description) else: