From 481e78ce8cf709a106b7a88b41cbd82862908a47 Mon Sep 17 00:00:00 2001 From: eli fessler Date: Tue, 29 Nov 2022 11:07:00 -1000 Subject: [PATCH] fix salmon run keys for 2.0.0 update (#85) --- s3s.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/s3s.py b/s3s.py index 6c6668c..a1260e2 100755 --- a/s3s.py +++ b/s3s.py @@ -310,6 +310,7 @@ def fetch_json(which, separate=False, exportall=False, specific=False, numbers_o combined = ink_list + salmon_list return combined + def fetch_detailed_result(is_vs_history, history_id, swim): '''Helper function for fetch_json().''' @@ -871,9 +872,9 @@ def prepare_job_result(job, ismonitoring, isblackout, overview_data=None): for teammate in job["memberResults"]: players_json.append(teammate) - for player in players_json: + for i, player in enumerate(players_json): player_info = {} - player_info["me"] = "yes" if player["player"]["isMyself"] else "no" + player_info["me"] = "yes" if i == 0 else "no" player_info["name"] = player["player"]["name"] player_info["number"] = player["player"]["nameId"] player_info["splashtag_title"] = player["player"]["byname"] @@ -906,8 +907,8 @@ def prepare_job_result(job, ismonitoring, isblackout, overview_data=None): player_info["uniform"] = translate_slop[slop_num] try: - special_id = utils.b64d(player["specialWeapon"]["id"]) - player_info["special"] = translate_special[special_id] + special_id = + player_info["special"] = translate_special[player["specialWeapon"]["weaponId"]] except TypeError: # player.specialWeapon is null - player dc'd pass except KeyError: # invalid special weapon - likely defaulted to '1' before it could be assigned