From 9dcd15e2891af6855ba053bf5f8c00e76bfd7cfa Mon Sep 17 00:00:00 2001 From: Jylpah Date: Thu, 29 Oct 2020 11:07:37 +0200 Subject: [PATCH 1/2] BattleCategorization.get_results(): fix double printing, add player_damage_dealt --- analyze_wotb_replays.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/analyze_wotb_replays.py b/analyze_wotb_replays.py index 151688b..9d0c328 100755 --- a/analyze_wotb_replays.py +++ b/analyze_wotb_replays.py @@ -398,7 +398,7 @@ class BattleRecordCategory(): row = [ self.RESULT_CAT_FRMT.format(cat) ] row.extend(self.categories[cat].get_results()) results.append(row) - if self.type == 'bucket': + elif self.type == 'bucket': for cat in [ c for c in self.bucket_labels if c in self.categories.keys()]: row = [ self.RESULT_CAT_FRMT.format(cat) ] row.extend(self.categories[cat].get_results()) @@ -450,11 +450,12 @@ class BattleRecord(): 'time_alive%' : [ 'T alive%', 'Percentage of time being alive in a battle', 8, '{:8.0%}' ], 'top_tier' : [ 'Top tier', 'Share of games as top tier', 8, '{:8.0%}' ], 'player_wins' : [ 'Player WR', 'Average WR of the player', 9, '{:9.2%}' ], - 'player_battles' : [ 'Player Btls', 'Average number battles of the player', 11, '{:11.0f}' ], 'allies_wins' : [ 'Allies WR', 'Average WR of allies at the tier of their tank', 9, '{:9.2%}' ], 'enemies_wins' : [ 'Enemies WR', 'Average WR of enemies at the tier of their tank', 10, '{:10.2%}' ], + 'player_battles' : [ 'Player Btls', 'Average number battles of the player', 11, '{:11.0f}' ], 'allies_battles' : [ 'Allies Btls', 'Average number battles of the allies', 11, '{:11.0f}' ], 'enemies_battles' : [ 'Enemies Btls', 'Average number battles of the enemies', 12, '{:12.0f}' ], + 'player_damage_dealt' : [ 'Player Avg Dmg', 'Player Average damage', 11, '{:11.0f}' ], 'allies_damage_dealt' : [ 'Allies Avg Dmg', 'Average damage of the allies', 11, '{:11.0f}' ], 'enemies_damage_dealt' : [ 'Enemies Avg Dmg', 'Average damage of the enemies', 12, '{:12.0f}' ], MISSING_STATS : [ 'No stats', 'Players without stats avail', 8, '{:8.1%}'] @@ -481,8 +482,10 @@ class BattleRecord(): 'player_wins', 'allies_wins', 'enemies_wins', + 'player_damage_dealt', 'allies_damage_dealt', 'enemies_damage_dealt', + 'player_battles', 'allies_battles', 'enemies_battles' ] From 10cb858039debfdd73b4630e03d30a311816cfa8 Mon Sep 17 00:00:00 2001 From: Jylpah Date: Sat, 31 Oct 2020 13:56:05 +0200 Subject: [PATCH 2/2] FIX: OPT_MODE referenced before assignment in main() --- analyze_wotb_replays.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/analyze_wotb_replays.py b/analyze_wotb_replays.py index 9d0c328..45f1a2d 100755 --- a/analyze_wotb_replays.py +++ b/analyze_wotb_replays.py @@ -791,12 +791,13 @@ OPT_MODE_HELP = 'help' OPT_MODES = [ None, OPT_MODE_TEAM, OPT_MODE_EXTENDED, OPT_MODE_HELP ] async def main(argv): - global wg, wi, WG_APP_ID + global wg, wi, WG_APP_ID, OPT_MODE # set the directory for the script current_dir = os.getcwd() os.chdir(os.path.dirname(sys.argv[0])) ## Default options: + OPT_MODE = OPT_MODE_DEFAULT OPT_DB = False OPT_HIST = False OPT_STAT_FUNC = 'player'