Add ballcam/handbrake times (#259)

* Add ballcam/handbrake times * Remove comments
SaltieRL · Oct 14, 2020 · 3e66f17 · 3e66f17 · github-actions · Oct 14, 2020
1 parent 29a4c27
commit 3e66f17
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/CARBALL_VERSION b/CARBALL_VERSION
@@ -1 +1 @@
-4
+5
diff --git a/api/stats/player_stats.proto b/api/stats/player_stats.proto
@@ -76,6 +76,8 @@ message Controller {
     optional bool is_keyboard = 1;
     optional float analogue_steering_input_percent = 2;
     optional float analogue_throttle_input_percent = 3;
+    optional float time_ballcam = 4;
+    optional float time_handbrake = 5;
 }
 
 // Stats for carrying

diff --git a/carball/analysis/stats/controls/controls.py b/carball/analysis/stats/controls/controls.py
@@ -1,9 +1,11 @@
 from logging import getLogger
 from typing import Dict
 
+import numpy as np
 import pandas as pd
 
 from ....analysis.stats.stats import BaseStat
+from ....analysis.stats.utils.pandas_utils import sum_deltas_by_truthy_data
 from ....generated.api import game_pb2
 from ....generated.api.player_pb2 import Player
 from ....generated.api.stats.player_stats_pb2 import PlayerStats
@@ -20,6 +22,7 @@ def calculate_player_stat(self, player_stat_map: Dict[str, PlayerStats], game: G
         for player_key, stats in player_map.items():
             try:
                 player_name = player_map[player_key].name
+                player_data_frame = data_frame[player_name].copy()
 
                 steering_percentage = self.get_analogue_percentage("steer", data_frame, player_name)
                 throttle_percentage = self.get_analogue_percentage("throttle", data_frame, player_name)
@@ -29,10 +32,24 @@ def calculate_player_stat(self, player_stat_map: Dict[str, PlayerStats], game: G
                 controller_stats.is_keyboard = is_keyboard
                 controller_stats.analogue_steering_input_percent = throttle_percentage
                 controller_stats.analogue_throttle_input_percent = steering_percentage
+                if 'ball_cam' in player_data_frame:
+                    time_ballcam = self.get_ballcam_duration(data_frame, player_data_frame)
+                    controller_stats.time_ballcam = time_ballcam
+                if 'handbrake' in player_data_frame:
+                    time_handbrake = self.get_handbrake_duration(data_frame, player_data_frame)
+                    controller_stats.time_handbrake = time_handbrake
             except KeyError as e:
                 logger.warning('Player never pressed control %s', e)
 
     def get_analogue_percentage(self, column: str, data_frame: pd.DataFrame, player_name: str):
         total_frames = len(data_frame[player_name][column])
         count = (data_frame[player_name][column] == 0).sum() + (data_frame[player_name][column] == 128).sum()  + (data_frame[player_name][column] == 255).sum() + data_frame[player_name][column].isna().sum()
         return 100 - ((count * 100) / total_frames)
+
+    @staticmethod
+    def get_ballcam_duration(data_frame: pd.DataFrame, player_dataframe: pd.DataFrame) -> np.float64:
+        return sum_deltas_by_truthy_data(data_frame, player_dataframe.ball_cam)
+
+    @staticmethod
+    def get_handbrake_duration(data_frame: pd.DataFrame, player_dataframe: pd.DataFrame) -> np.float64:
+        return sum_deltas_by_truthy_data(data_frame, player_dataframe.handbrake)