feat: stat generalzation

.vscode/settings.json

@@ -11,6 +11,7 @@
     "applypatches",
     "artefacts",
     "atgm",
+    "Avearges",
     "AYUV",
     "battleresults",
     "bbox",
@@ -82,6 +83,7 @@
     "loadouts",
     "loddist",
     "lods",
+    "lossrate",
     "mantlets",
     "metallicness",
     "minitelrose",

src/app/tools/session/page.tsx

@@ -21,6 +21,11 @@ import { use, useEffect, useMemo, useRef, useState } from 'react';
 import PageWrapper from '../../../components/PageWrapper';
 import { UNLOCALIZED_REGION_NAMES_SHORT } from '../../../constants/regions';
 import { authURL } from '../../../core/blitz/authURL';
+import {
+  generateStats,
+  prettifyStats,
+  STAT_NAMES,
+} from '../../../core/blitz/generateStats';
 import {
   getAccountInfo,
   IndividualAccountInfo,
@@ -32,6 +37,7 @@ import searchPlayersAcrossRegions, {
 } from '../../../core/blitz/searchPlayersAcrossRegions';
 import { tankDefinitions } from '../../../core/blitzkit/tankDefinitions';
 import { tankIcon } from '../../../core/blitzkit/tankIcon';
+import { tankAverages } from '../../../core/blitzstars/tankAverages';
 import { theme } from '../../../stitches.config';
 import { useApp } from '../../../stores/app';
 import mutateSession, {
@@ -42,6 +48,7 @@ import { IndividualTankStats } from '../../../types/tanksStats';
 
 export default function Page() {
   const awaitedTankDefinitions = use(tankDefinitions);
+  const awaitedTankAvearges = use(tankAverages);
   const [showSearch, setShowSearch] = useState(false);
   const [searching, setSearching] = useState(false);
   const [searchResults, setSearchResults] = useState<AccountListWithServer>([]);
@@ -306,8 +313,11 @@ export default function Page() {
           <Table.Header>
             <Table.Row>
               <Table.ColumnHeaderCell>Tank</Table.ColumnHeaderCell>
-              <Table.ColumnHeaderCell width="0">Battles</Table.ColumnHeaderCell>
+              {session.columns.map((column) => (
-              <Table.ColumnHeaderCell width="0">Winrate</Table.ColumnHeaderCell>
+                <Table.ColumnHeaderCell width="0" key={column} align="right">
+                  {STAT_NAMES[column]}
+                </Table.ColumnHeaderCell>
+              ))}
             </Table.Row>
           </Table.Header>
 
@@ -315,8 +325,12 @@ export default function Page() {
             {tankStatsB
               .filter((stat) => stat.all.battles > 0)
               .sort((a, b) => b.last_battle_time - a.last_battle_time)
-              .map((stat) => {
+              .map((entry) => {
-                const tank = awaitedTankDefinitions[stat.tank_id];
+                const tank = awaitedTankDefinitions[entry.tank_id];
+                const average = awaitedTankAvearges[tank.id];
+                const stats = prettifyStats(
+                  generateStats(entry.all, average?.all),
+                );
 
                 return (
                   <Table.Row
@@ -373,10 +387,11 @@ export default function Page() {
                         </Text>
                       </Link>
                     </Table.RowHeaderCell>
-                    <Table.Cell align="right">{stat.all.battles}</Table.Cell>
+                    {session.columns.map((column) => (
-                    <Table.Cell align="right">
+                      <Table.Cell key={column} align="right">
-                      {((100 * stat.all.wins) / stat.all.battles).toFixed(0)}%
+                        {stats[column]}
-                    </Table.Cell>
+                      </Table.Cell>
+                    ))}
                   </Table.Row>
                 );
               })}

src/core/blitz/generateStats.ts

@@ -0,0 +1,29 @@
+import calculateWN8 from '../statistics/calculateWN8';
+import { AllStats } from './getAccountInfo';
+
+export type Stat = keyof ReturnType<typeof generateStats>;
+
+export const STAT_NAMES: Record<Stat, string> = {
+  battles: 'Battles',
+  winrate: 'Winrate',
+  wn8: 'WN8',
+  damage: 'Damage',
+};
+
+export function generateStats(s: AllStats, e?: AllStats) {
+  return {
+    battles: s.battles,
+    winrate: s.wins / s.battles,
+    wn8: e ? calculateWN8(e, s) : null,
+    damage: s.damage_dealt / s.battles,
+  };
+}
+
+export function prettifyStats(s: ReturnType<typeof generateStats>) {
+  return {
+    battles: `${s.battles}`,
+    winrate: `${(s.winrate * 100).toFixed(0)}%`,
+    wn8: s.wn8 ? s.wn8.toFixed(0) : '--',
+    damage: s.damage.toFixed(0),
+  } satisfies Record<Stat, string>;
+}

src/stores/session.ts

@@ -3,8 +3,11 @@ import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { Region } from '../constants/regions';
+import { Stat } from '../core/blitz/generateStats';
 
-interface SessionBase {}
+interface SessionBase {
+  columns: Stat[];
+}
 
 export interface SessionTracking extends SessionBase {
   tracking: true;
@@ -24,6 +27,7 @@ type Session = SessionTracking | SessionNotTracking;
 export const useSession = create<Session>()(
   persist(
     (set) => ({
+      columns: ['battles', 'winrate', 'wn8', 'damage'],
       tracking: false,
     }),
     { name: 'session-2', merge: (a, b) => merge(b, a) },