From 4bedf71d3d6283628011ac08dabd66a9e4a67829 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Nov 2023 20:02:08 -0500 Subject: [PATCH] sao: fix trial_tower_play_end --- titles/sao/base.py | 111 ++++-------------------------------- titles/sao/handlers/base.py | 29 ++++++++++ 2 files changed, 41 insertions(+), 99 deletions(-) diff --git a/titles/sao/base.py b/titles/sao/base.py index 4e520c7..91bdd1a 100644 --- a/titles/sao/base.py +++ b/titles/sao/base.py @@ -605,104 +605,17 @@ class SaoBase: def handle_c918(self, header: SaoRequestHeader, request: bytes) -> bytes: #quest/trial_tower_play_end - req = bytes.fromhex(request)[24:] - - req_struct = Struct( - Padding(20), - "ticket_id" / Bytes(1), # needs to be parsed as an int - Padding(1), - "user_id_size" / Rebuild(Int32ub, len_(this.user_id) * 2), # calculates the length of the user_id - "user_id" / PaddedString(this.user_id_size, "utf_16_le"), # user_id is a (zero) padded string - Padding(2), - "trial_tower_id" / Int16ub, # trial_tower_id is a short, - Padding(3), - "play_end_request_data" / Int8ub, # play_end_request_data is a byte - Padding(1), - "play_result_flag" / Int8ub, # play_result_flag is a byte - Padding(2), - "base_get_data_length" / Rebuild(Int8ub, len_(this.base_get_data)), # base_get_data_length is a byte, - "base_get_data" / Array(this.base_get_data_length, Struct( - "get_hero_log_exp" / Int32ub, # get_hero_log_exp is an int - "get_col" / Int32ub, # get_num is a short - )), - Padding(3), - "get_player_trace_data_list_length" / Rebuild(Int8ub, len_(this.get_player_trace_data_list)), # get_player_trace_data_list_length is a byte - "get_player_trace_data_list" / Array(this.get_player_trace_data_list_length, Struct( - "user_quest_scene_player_trace_id" / Int32ub, # user_quest_scene_player_trace_id is an int - )), - Padding(3), - "get_rare_drop_data_list_length" / Rebuild(Int8ub, len_(this.get_rare_drop_data_list)), # get_rare_drop_data_list_length is a byte - "get_rare_drop_data_list" / Array(this.get_rare_drop_data_list_length, Struct( - "quest_rare_drop_id" / Int32ub, # quest_rare_drop_id is an int - )), - Padding(3), - "get_special_rare_drop_data_list_length" / Rebuild(Int8ub, len_(this.get_special_rare_drop_data_list)), # get_special_rare_drop_data_list_length is a byte - "get_special_rare_drop_data_list" / Array(this.get_special_rare_drop_data_list_length, Struct( - "quest_special_rare_drop_id" / Int32ub, # quest_special_rare_drop_id is an int - )), - Padding(3), - "get_unanalyzed_log_tmp_reward_data_list_length" / Rebuild(Int8ub, len_(this.get_unanalyzed_log_tmp_reward_data_list)), # get_unanalyzed_log_tmp_reward_data_list_length is a byte - "get_unanalyzed_log_tmp_reward_data_list" / Array(this.get_unanalyzed_log_tmp_reward_data_list_length, Struct( - "unanalyzed_log_grade_id" / Int32ub, # unanalyzed_log_grade_id is an int, - )), - Padding(3), - "get_event_item_data_list_length" / Rebuild(Int8ub, len_(this.get_event_item_data_list)), # get_event_item_data_list_length is a byte, - "get_event_item_data_list" / Array(this.get_event_item_data_list_length, Struct( - "event_item_id" / Int32ub, # event_item_id is an int - "get_num" / Int16ub, # get_num is a short - )), - Padding(3), - "discovery_enemy_data_list_length" / Rebuild(Int8ub, len_(this.discovery_enemy_data_list)), # discovery_enemy_data_list_length is a byte - "discovery_enemy_data_list" / Array(this.discovery_enemy_data_list_length, Struct( - "enemy_kind_id" / Int32ub, # enemy_kind_id is an int - "destroy_num" / Int16ub, # destroy_num is a short - )), - Padding(3), - "destroy_boss_data_list_length" / Rebuild(Int8ub, len_(this.destroy_boss_data_list)), # destroy_boss_data_list_length is a byte - "destroy_boss_data_list" / Array(this.destroy_boss_data_list_length, Struct( - "boss_type" / Int8ub, # boss_type is a byte - "enemy_kind_id" / Int32ub, # enemy_kind_id is an int - "destroy_num" / Int16ub, # destroy_num is a short - )), - Padding(3), - "mission_data_list_length" / Rebuild(Int8ub, len_(this.mission_data_list)), # mission_data_list_length is a byte - "mission_data_list" / Array(this.mission_data_list_length, Struct( - "mission_id" / Int32ub, # enemy_kind_id is an int - "clear_flag" / Int8ub, # boss_type is a byte - "mission_difficulty_id" / Int16ub, # destroy_num is a short - )), - Padding(3), - "score_data_length" / Rebuild(Int8ub, len_(this.score_data)), # score_data_length is a byte - "score_data" / Array(this.score_data_length, Struct( - "clear_time" / Int32ub, # clear_time is an int - "combo_num" / Int32ub, # boss_type is a int - "total_damage_size" / Rebuild(Int32ub, len_(this.total_damage) * 2), # calculates the length of the total_damage - "total_damage" / PaddedString(this.total_damage_size, "utf_16_le"), # total_damage is a (zero) padded string - "concurrent_destroying_num" / Int16ub, # concurrent_destroying_num is a short - "reaching_skill_level" / Int16ub, # reaching_skill_level is a short - "ko_chara_num" / Int8ub, # ko_chara_num is a byte - "acceleration_invocation_num" / Int16ub, # acceleration_invocation_num is a short - "boss_destroying_num" / Int16ub, # boss_destroying_num is a short - "synchro_skill_used_flag" / Int8ub, # synchro_skill_used_flag is a byte - "used_friend_skill_id" / Int32ub, # used_friend_skill_id is an int - "friend_skill_used_flag" / Int8ub, # friend_skill_used_flag is a byte - "continue_cnt" / Int16ub, # continue_cnt is a short - "total_loss_num" / Int16ub, # total_loss_num is a short - )), - - ) - - req_data = req_struct.parse(req) + req_data = SaoTrialTowerPlayEndRequest(header, request) # Add tower progression to database user_id = req_data.user_id trial_tower_id = req_data.trial_tower_id next_tower_id = 0 - quest_clear_flag = bool(req_data.score_data[0].boss_destroying_num) - clear_time = req_data.score_data[0].clear_time - combo_num = req_data.score_data[0].combo_num - total_damage = req_data.score_data[0].total_damage - concurrent_destroying_num = req_data.score_data[0].concurrent_destroying_num + quest_clear_flag = bool(req_data.play_end_request_data_list[0].score_data_list[0].boss_destroying_num) + clear_time = req_data.play_end_request_data_list[0].score_data_list[0].clear_time + combo_num = req_data.play_end_request_data_list[0].score_data_list[0].combo_num + total_damage = req_data.play_end_request_data_list[0].score_data_list[0].total_damage + concurrent_destroying_num = req_data.play_end_request_data_list[0].score_data_list[0].concurrent_destroying_num if quest_clear_flag is True: # Save tower progression - to be revised to avoid saving worse score @@ -747,7 +660,7 @@ class SaoBase: profile = self.game_data.profile.get_profile(user_id) exp = int(profile["rank_exp"]) + 100 #always 100 extra exp for some reason - col = int(profile["own_col"]) + int(req_data.base_get_data[0].get_col) + col = int(profile["own_col"]) + int(req_data.play_end_request_data_list[0].base_get_data_list[0].get_col) # Calculate level based off experience and the CSV list with open(r'titles/sao/data/PlayerRank.csv') as csv_file: @@ -790,7 +703,7 @@ class SaoBase: for i in range(0,len(hero_list)): hero_data = self.game_data.item.get_hero_log(user_id, hero_list[i]) - log_exp = int(hero_data["log_exp"]) + int(req_data.base_get_data[0].get_hero_log_exp) + log_exp = int(hero_data["log_exp"]) + int(req_data.play_end_request_data_list[0].base_get_data_list[0].get_hero_log_exp) # Calculate hero level based off experience and the CSV list with open(r'titles/sao/data/HeroLogLevel.csv') as csv_file: @@ -826,8 +739,8 @@ class SaoBase: json_data = {"data": []} # Grab the rare loot from the table, match it with the right item and then push to the player profile - for r in range(0,req_data.get_rare_drop_data_list_length): - rewardList = self.game_data.static.get_rare_drop_id(int(req_data.get_rare_drop_data_list[r].quest_rare_drop_id)) + for x in req_data.play_end_request_data_list[0].get_rare_drop_data_list: + rewardList = self.game_data.static.get_rare_drop_id(int(x.quest_rare_drop_id)) commonRewardId = rewardList["commonRewardId"] heroList = self.game_data.static.get_hero_id(commonRewardId) @@ -842,14 +755,14 @@ class SaoBase: self.game_data.item.put_item(user_id, commonRewardId) # Generate random hero(es) based off the response - for a in range(0,req_data.get_unanalyzed_log_tmp_reward_data_list_length): + for x in req_data.play_end_request_data_list[0].get_unanalyzed_log_tmp_reward_data_list: with open('titles/sao/data/RewardTable.csv', 'r') as f: keys_unanalyzed = next(f).strip().split(',') data_unanalyzed = list(DictReader(f, fieldnames=keys_unanalyzed)) randomized_unanalyzed_id = choice(data_unanalyzed) - while int(randomized_unanalyzed_id['UnanalyzedLogGradeId']) != req_data.get_unanalyzed_log_tmp_reward_data_list[a].unanalyzed_log_grade_id: + while int(randomized_unanalyzed_id['UnanalyzedLogGradeId']) != x.unanalyzed_log_grade_id: randomized_unanalyzed_id = choice(data_unanalyzed) heroList = self.game_data.static.get_hero_id(randomized_unanalyzed_id['CommonRewardId']) diff --git a/titles/sao/handlers/base.py b/titles/sao/handlers/base.py index fc13faf..3c20e80 100644 --- a/titles/sao/handlers/base.py +++ b/titles/sao/handlers/base.py @@ -1717,6 +1717,35 @@ class SaoTrialTowerPlayStartRequest(SaoBaseRequest): class SaoTrialTowerPlayEndRequest(SaoBaseRequest): def __init__(self, header: SaoRequestHeader, data: bytes) -> None: super().__init__(header, data) + off = 0 + ticket_id = decode_str(data, off) + self.ticket_id = ticket_id[0] + off += ticket_id[1] + + user_id = decode_str(data, off) + self.user_id = user_id[0] + off += user_id[1] + + self.trial_tower_id = decode_int(data, off) + off += INT_OFF + + self.play_end_request_data_count = decode_int(data, off) + off += INT_OFF + + self.play_end_request_data_list: List[PlayEndRequestData] = [] + for _ in range(self.play_end_request_data_count): + tmp = PlayEndRequestData(data, off) + off += tmp.get_size() + self.play_end_request_data_list.append(tmp) + + self.multi_play_end_request_data_count = decode_int(data, off) + off += INT_OFF + + self.multi_play_end_request_data_list: List[MultiPlayEndRequestData] = [] + for _ in range(self.multi_play_end_request_data_count): + tmp = MultiPlayEndRequestData(data, off) + off += tmp.get_size() + self.multi_play_end_request_data_list.append(tmp) class SaoTrialTowerPlayEndResponse(SaoBaseResponse): def __init__(self, cmd) -> None: