From d3cf8fa2c5c195e5f0a83a1bb648793333a6dea5 Mon Sep 17 00:00:00 2001 From: benjamin Date: Wed, 17 Jan 2024 15:13:47 +0100 Subject: [PATCH 1/2] add death and kill event --- src/log_analyser/objects/map.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/log_analyser/objects/map.py b/src/log_analyser/objects/map.py index 53a9406..3129c2c 100644 --- a/src/log_analyser/objects/map.py +++ b/src/log_analyser/objects/map.py @@ -81,11 +81,17 @@ def add_kill(self, data): team = self.find_team_for_player(data[4]) - if team == list(self.rounds[self.actual_round].teams.keys())[0]: - self.events.append({"type": "kill_team1", "timestamp": data[2], "value": 1, "description": "{} kill {}".format(data[4], data[7])}) - else: - self.events.append({"type": "kill_team2", "timestamp": data[2], "value": 1, - "description": "{} kill {}".format(data[4], data[7])}) + self.events.append({"type": "kill", "timestamp": data[2], "player": data[4], + "description": "{} kill {}".format(data[4], data[7])}) + + self.events.append({"type": "death", "timestamp": data[2], "player": data[7], + "description": "{} kill {}".format(data[4], data[7])}) + + # if team == list(self.rounds[self.actual_round].teams.keys())[0]: + # self.events.append({"type": "kill_team1", "timestamp": data[2], "player": data[4], "description": "{} kill {}".format(data[4], data[7])}) + # else: + # self.events.append({"type": "kill_team2", "timestamp": data[2], "player": data[4], + # "description": "{} kill {}".format(data[4], data[7])}) def add_player_stat(self, data): # self.create_if_player_and_caracter_not_exist(data[4], data[5], data[6]) From eeaf71fc042773db8ffa6db55c4d049570938f6c Mon Sep 17 00:00:00 2001 From: benjamin Date: Wed, 17 Jan 2024 16:35:07 +0100 Subject: [PATCH 2/2] add ultimate use --- src/log_analyser/objects/map.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/log_analyser/objects/map.py b/src/log_analyser/objects/map.py index 3129c2c..ca9de0a 100644 --- a/src/log_analyser/objects/map.py +++ b/src/log_analyser/objects/map.py @@ -127,6 +127,9 @@ def add_ultimate_start(self, data): ultimate_start_data = {"start": data[2]} self.rounds[self.actual_round].teams[data[3]].players[data[4]].characters[data[5]].add_ultimate_start(ultimate_start_data) + self.events.append({"type": "ultimate", "timestamp": data[2], "player": data[4], + "description": "{} use {} ultimate".format(data[4], data[5])}) + def add_ultimate_end(self, data): self.create_if_player_and_caracter_not_exist(data[3], data[4], data[5]) @@ -148,7 +151,6 @@ def add_objective_captured(self, data): self.rounds[self.actual_round].add_objective_captured(objective_capture_data) - def add_objective_progress(self, data): objectif_progress_data = {"time": data[2], "team_name": data[4], "progress": data[6]}