From 9ea68296748f2b6e5a37f6d113b145d96cd6e571 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Tue, 24 Dec 2024 14:21:33 -0600 Subject: [PATCH] Day 1 Pokemon updates --- cogs/gameplay.py | 2 +- gauntlets.py | 6 +++++- helpers.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cogs/gameplay.py b/cogs/gameplay.py index 5d370b3..e981431 100644 --- a/cogs/gameplay.py +++ b/cogs/gameplay.py @@ -1916,7 +1916,7 @@ class Gameplay(commands.Cog): cardset_ids = '17,18,13,11,7,8' backup_cardset_ids = '9,3' elif cardsets == 'Hall of Fame': - all_c = [str(x) for x in range(1, 20)] + all_c = [str(x) for x in range(1, 40)] cardset_ids = f'{",".join(all_c)}' backup_cardset_ids = None else: diff --git a/gauntlets.py b/gauntlets.py index 96417b1..dbacfd9 100644 --- a/gauntlets.py +++ b/gauntlets.py @@ -240,6 +240,7 @@ async def get_opponent(this_team, this_event, this_run): t_id = 17 else: raise KeyError(f'Hmm...I do not know who you should be playing right now.') + return await db_get('teams', object_id=t_id, none_okay=False) else: return None @@ -1778,6 +1779,7 @@ async def evolve_pokemon(this_team, channel): ) evolvable_mons = [x for x in c_query['cards'] if x['player']['cardset']['id'] in [23] and x['player']['fangr_id'] is not None and len(x['player']['fangr_id']) > 3] + logging.info(f'evolvable_mons: {evolvable_mons}') if len(evolvable_mons) > 0: evo_target_options = [ SelectOption(label=f'{x["player"]["rarity"]["name"]} | {x["player"]["p_name"]}', value=x['id']) for x in evolvable_mons @@ -1917,7 +1919,9 @@ async def post_result(run_id: int, is_win: bool, this_team, bot, channel): ) # Evolve a card! - if this_run['id'] == 7 and this_run['wins'] < 10 and this_run['losses'] < 2: + logging.info(f'Post-game evolution check: Gauntlet ID {this_run["id"]} / Wins: {this_run["wins"]} / Losses: {this_run["losses"]}') + if this_event['id'] == 7 and this_run['wins'] < 10 and this_run['losses'] < 2: + logging.info(f'trying to evolve now') await evolve_pokemon(this_team, channel) diff --git a/helpers.py b/helpers.py index 18b285e..a60c94a 100644 --- a/helpers.py +++ b/helpers.py @@ -105,7 +105,7 @@ IMAGES = { 'Washington Nationals': f'{PD_CARD_URL}/mvp/washington-nationals.gif', 'Junior All Stars': f'{PD_CARD_URL}/mvp.png', 'Mario Super Sluggers': f'{PD_CARD_URL}/mvp.png', - 'Pokemon': 'https://i.postimg.cc/ydzYB7BR/masterball.jpg' + 'Pokemon League': 'https://i.postimg.cc/ydzYB7BR/masterball.jpg' }, 'gauntlets': f'{PD_CARD_URL}/gauntlets.png' }