Merge pull request #9 from DataStrike/feature/modify_data_for_graph

Feature/modify data for graph

Author: Zat-Code

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])
@@ -121,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])
@@ -142,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]}