add kill, stat for every character

Author: Zat-Code

src/log_analyser/log_analyser.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from objects.match import Match
 
 
@@ -7,7 +7,7 @@ class LogAnalyser:
     def __init__(self, path_csv, name) -> None:
 
         self.path_csv = path_csv
-        self.name  = "Log-2023-12-22-21-12-32.txt"
+        self.name = "Log-2023-12-22-21-12-32.txt"
 
         self.date = self.name2datetime()
 
@@ -16,7 +16,13 @@ def __init__(self, path_csv, name) -> None:
         self.actions = {"match_start": self.process_match_start,
                         "round_start": self.process_round_start,
                         "hero_spawn": self.process_hero_spawn,
-                        "hero_swap": self.process_hero_swap
+                        "hero_swap": self.process_hero_swap,
+                        "kill": self.process_kill,
+                        "ultimate_charged": self.process_ultimate_charged,
+                        "ultimate_start": self.process_ultimate_start,
+                        "ultimate_end": self.process_ultimate_end,
+                        "objective_captured": self.process_objective_captured,
+                        "player_stat": self.process_player_stat
                         }
 
     def run(self):
@@ -41,21 +47,30 @@ def name2datetime(self):
         date_object = datetime.strptime(date_string, '%Y-%m-%d-%H-%M-%S')
 
         return date_object
-        
 
-    def process_kill(self):
+    def process_kill(self, data):
+        self.match.add_kill(data)
+
+    def process_player_stat(self, data):
+        self.match.add_player_stat(data)
+
+    def process_objective_captured(self, data):
+        pass
+        # self.match.add_objective_captured(data)
+
+    def process_ultimate_start(self, data):
+        pass
+
+    def process_ultimate_end(self, data):
         pass
 
-    
-    def process_ultimate_charged(self):
+    def process_ultimate_charged(self, data):
         pass
 
     def process_round_start(self, data):
 
-        self.match.add_round()
+        self.match.add_round(data)
         # self.match.export_json()
-    def process_round_stop(self):
-        pass
 
     def process_match_start(self, data):
 
@@ -69,14 +84,23 @@ def process_match_start(self, data):
 
     def process_hero_spawn(self, data):
 
-        player_data = {"team_name": data[3], "player_name": data[4], "character_name": data[5]}
+        player_data = {"time": data[0], "team_name": data[3], "player_name": data[4], "character_name": data[5]}
         self.match.add_player(player_data)
 
     def process_hero_swap(self, data):
 
-        hero_data = {"team_name": data[3], "player_name": data[4], "character_name": data[6]}
+        hero_data = {"time": data[0], "team_name": data[3], "player_name": data[4], "character_name": data[5]}
         self.match.add_player(hero_data)
 
+    def convert_timefile_to_datetime(self, time_string):
+
+        # Utilisation de strptime pour convertir la chaîne en datetime
+        time_delta = datetime.strptime(time_string, "[%H:%M:%S]")
+
+        # Conversion en timedelta (représentation de la durée)
+        duration = timedelta(hours=time_delta.hour, minutes=time_delta.minute, seconds=time_delta.second)
+        return duration
+
 
 la = LogAnalyser('../logs/Log-2023-12-22-21-12-32.txt', "Log-2023-12-22-21-12-32.txt")
 la.run()

src/log_analyser/objects/character.py

@@ -9,6 +9,7 @@ def __init__(self, **kwargs):
 
         super().__init__(data_schema, **kwargs)
 
+        self.played_time = []
         self.stats = {}
         self.kills = []
         self.deads = []
@@ -17,10 +18,13 @@ def __init__(self, **kwargs):
         self.ultimate_charged = []
         self.ultimate_use = []
 
+    def add_played_time(self, data):
+        self.played_time.append(data)
+
     def add_kill(self, data):
         self.kills.append(data)
 
-    def add_dead(self, data):
+    def add_death(self, data):
         self.deads.append(data)
 
     def add_offensive_assist(self, data):

src/log_analyser/objects/match.py

@@ -20,32 +20,74 @@ def __init__(self, **kwargs):
 
         self.actual_round = -1
 
-    def add_round(self):
+    def add_round(self, data):
 
         teams = {}
         teams[self.team1_name] = Team.from_json({"name": self.team1_name, "players": {}})
         teams[self.team2_name] = Team.from_json({"name": self.team2_name, "players": {}})
-        self.rounds.append(Round.from_json({"teams": teams}))
+        self.rounds.append(Round.from_json({"teams": teams, "start_time": data[0]}))
 
         self.actual_round += 1
+        print("###### NEW ROUND {} #######".format(self.actual_round))
 
     def add_player(self, data):
 
         if data["player_name"] in self.rounds[self.actual_round].teams[data["team_name"]].players:
-            print("player already exist")
             self.add_character(data)
             return -1
         else:
             self.rounds[self.actual_round].teams[data["team_name"]].add_player(
                 {"name": data["player_name"], "characters": {}})
+            print("add player", data["player_name"])
             self.add_character(data)
             return 0
 
-
     def add_character(self, data):
 
         if data["character_name"] in self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].characters:
-            print("character already exist")
             return -2
         else:
             self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].add_character({"name": data["character_name"]})
+
+        if len(self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].characters[data["character_name"]].played_time) > 0:
+            self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].characters[data["character_name"]].played_time[-1]["end"] = data["time"]
+
+        self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].characters[data["character_name"]].add_played_time({"start": data["time"]})
+
+    def add_kill(self, data):
+
+        killer_data = {"time": data[0], "player_victim": data[7], "character_victim": data[8]}
+        victim_data = {"time": data[0], "player_killer": data[4], "character_killer": data[5]}
+
+        self.create_if_player_and_caracter_not_exist(data[3], data[4], data[5])
+        self.create_if_player_and_caracter_not_exist(data[6], data[7], data[8])
+
+        if not data[5] in self.rounds[self.actual_round].teams[data[3]].players[data[4]].characters:
+            self.add_character({"time": data[0], "team_name": data[3], "player_name": data[4], "character_name": data[5]})
+
+        if not data[6] in self.rounds[self.actual_round].teams[data[6]].players[data[7]].characters:
+            self.add_character({"time": data[0], "team_name": data[6], "player_name": data[7], "character_name": data[8]})
+
+        self.rounds[self.actual_round].teams[data[3]].players[data[4]].characters[data[5]].add_kill(killer_data)
+        self.rounds[self.actual_round].teams[data[6]].players[data[7]].characters[data[8]].add_death(victim_data)
+
+    def add_player_stat(self, data):
+
+        self.create_if_player_and_caracter_not_exist(data[4], data[5], data[6])
+
+        player_data = {"eliminations": data[6], "final_blows": data[7], "deaths": data[8], "damage": data[9],
+                       "barrier_damage": data[10], "hero_damage": data[11], "healing": data[12], "healing_receive": data[13],
+                       "self_healing": data[14], "damage_taken": data[15], "damage_blocked": data[16], "defensive_assist": data[17],
+                       "offensive_assists": data[18], "ultimated_earn": data[19], "ultimates_used": data[20], "solo_kills": data[23],
+                       "critical_hits_accuracy": data[28], "weapon_accuracy": data[37], "hero_time_played": data[38]}
+
+        if player_data["hero_time_played"] != "0":
+            self.rounds[self.actual_round].teams[data[4]].players[data[5]].characters[data[6]].add_character_stats(player_data)
+
+    def create_if_player_and_caracter_not_exist(self, team, player_name, character_name):
+
+        if not player_name in self.rounds[self.actual_round].teams[team].players:
+            self.add_player({"team_name": team, "player_name": player_name, "character_name": character_name, "time": self.rounds[self.actual_round].start_time})
+
+        if not character_name in self.rounds[self.actual_round].teams[team].players[player_name].characters:
+            self.add_character({"team_name": team, "player_name": player_name, "character_name": character_name, "time": self.rounds[self.actual_round].start_time})

src/log_analyser/objects/object.py

@@ -1,5 +1,5 @@
 import json
-from datetime import datetime
+from datetime import datetime, timedelta
 
 class Object:
     def __init__(self, class_model, **kwargs):   
@@ -41,8 +41,16 @@ def export_json(self):
 
         return json.dumps(dict_class)
 
+    def convert_timefile_to_datetime(self, time_string):
 
 
+        # Utilisation de strptime pour convertir la chaîne en datetime
+        time_delta = datetime.strptime(time_string, "[%H:%M:%S]")
+
+        # Conversion en timedelta (représentation de la durée)
+        duration = timedelta(hours=time_delta.hour, minutes=time_delta.minute, seconds=time_delta.second)
+        return duration
+
     @classmethod
     def from_json(self, data):
         object = self(**data)

src/log_analyser/objects/round.py

@@ -5,7 +5,8 @@ class Round(Object):
 
     def __init__(self, **kwargs):
 
-        data_schema = {"teams": dict
+        data_schema = {"teams": dict,
+                       "start_time": str
                        }
 
         super().__init__(data_schema, **kwargs)