feat: wm8 and average tier calculation

src/core/blitz/getWN8.ts

@@ -0,0 +1,45 @@
+import { AllStats } from '../../types/accountInfo.js';
+
+/**
+ * Formula from https://web.archive.org/web/20190105064817/http://wiki.wnefficiency.net/pages/WN8
+ */
+export default function getWN8(expected: AllStats, average: AllStats) {
+  const avgDmg = average.damage_dealt / average.battles;
+  const avgSpot = average.spotted / average.battles;
+  const avgFrag = average.frags / average.battles;
+  const avgDef = average.dropped_capture_points / average.battles;
+  const avgWinRate = average.wins / average.battles;
+
+  const expDmg = expected.damage_dealt / expected.battles;
+  const expSpot = expected.spotted / expected.battles;
+  const expFrag = expected.frags / expected.battles;
+  const expDef = expected.dropped_capture_points / expected.battles;
+  const expWinRate = expected.wins / expected.battles;
+
+  const rDAMAGE = avgDmg / expDmg;
+  const rSPOT = avgSpot / expSpot;
+  const rFRAG = avgFrag / expFrag;
+  const rDEF = avgDef / expDef;
+  const rWIN = avgWinRate / expWinRate;
+
+  const rWINc = Math.max(0, (rWIN - 0.71) / (1 - 0.71));
+  const rDAMAGEc = Math.max(0, (rDAMAGE - 0.22) / (1 - 0.22));
+  const rFRAGc = Math.max(
+    0,
+    Math.min(rDAMAGEc + 0.2, (rFRAG - 0.12) / (1 - 0.12)),
+  );
+  const rSPOTc = Math.max(
+    0,
+    Math.min(rDAMAGEc + 0.1, (rSPOT - 0.38) / (1 - 0.38)),
+  );
+  const rDEFc = Math.max(0, Math.min(rDAMAGEc + 0.1, (rDEF - 0.1) / (1 - 0.1)));
+
+  const WN8 =
+    980 * rDAMAGEc +
+    210 * rDAMAGEc * rFRAGc +
+    155 * rFRAGc * rSPOTc +
+    75 * rDEFc * rFRAGc +
+    145 * Math.min(1.8, rWINc);
+
+  return WN8;
+}

src/core/blitz/tankopedia.ts

@@ -1,145 +1,49 @@
-import { args } from '../process/args.js';
+import { WargamingResponse } from '../../types/wargamingResponse.js';
 import isDev from '../process/isDev.js';
 import URLToBase64 from '../ui/URLToBase64.js';
-import getWargamingResponse from './getWargamingResponse.js';
+
+/*
+"1": {
+      "name": "T-34",
+      "nation": "ussr",
+      "is_premium": false,
+      "tier": 5,
+      "cost": {
+        "price_credit": 400000,
+        "price_gold": 0
+      },
+      "images": {
+        "preview": "/api/bs-cache/tank-icons/https%3A%2F%2Fglossary-eu-static.gcdn.co%2Ficons%2Fwotb%2Fcurrent%2Fuploaded%2Fvehicles%2Fhd_thumbnail%2FT-34.png",
+        "normal": "http://glossary-eu-static.gcdn.co/icons/wotb/current/uploaded/vehicles/hd/T-34.png"
+      },
+      "tank_id": 1,
+      "type": "mediumTank",
+      "description": "The legend of the Soviet armored forces and the most widely-produced Soviet tank of World War II, with a total of 33,805 vehicles manufactured. Three variants of this model were produced at several Soviet factories from 1940 through 1944."
+    },
+    */
 
 export interface Tankopedia {
   [id: number]: {
-    description: string;
-    engines: number[];
-    guns: number[];
-    is_premium: boolean;
     name: string;
     nation: string;
-    next_tanks: { [id: number]: number };
-    prices_xp: { [id: number]: number };
-    suspensions: number[];
-    tank_id: number;
+    is_premium: boolean;
     tier: number;
-    turrets: number[] | null;
+    cost: { price_credit: number; price_gold: number };
+    images: { preview: string; normal: string };
+    tank_id: number;
     type: string;
-    cost: {
-      price_credit: number;
-      price_gold: number;
-    };
-    default_profile: {
-      battle_level_range_max: number;
-      battle_level_range_min: number;
-      engine_id: number;
-      firepower: number;
-      gun_id: number;
-      hp: number;
-      hull_hp: number;
-      hull_weight: number;
-      is_default: boolean;
-      maneuverability: number;
-      max_ammo: number;
-      max_weight: number;
-      profile_id: string;
-      protection: number;
-      shot_efficiency: number;
-      signal_range: number;
-      speed_backward: number;
-      suspension_id: number;
-      turret_id: number;
-      weight: number;
-      armor: {
-        hull: {
-          front: number;
-          rear: number;
-          sides: number;
-        };
-        turret: {
-          front: number;
-          rear: number;
-          sides: number;
-        };
-      };
-      engine: {
-        fire_chance: number;
-        name: string;
-        power: number;
-        tier: number;
-        weight: number;
-      };
-      gun: {
-        aim_time: number;
-        caliber: number;
-        clip_capacity: number;
-        clip_reload_time: number;
-        dispersion: number;
-        fire_rate: number;
-        move_down_arc: number;
-        move_up_arc: number;
-        name: string;
-        reload_time: number;
-        tier: number;
-        traverse_speed: number;
-        weight: number;
-      };
-      shells: {
-        damage: number;
-        penetration: number;
-        type: string;
-      };
-      suspension: {
-        load_limit: number;
-        name: string;
-        tier: number;
-        traverse_speed: number;
-        weight: number;
-      };
-      turret: {
-        hp: number;
-        name: string;
-        tier: number;
-        traverse_left_arc: number;
-        traverse_right_arc: number;
-        traverse_speed: number;
-        view_range: number;
-        weight: number;
-      };
-    };
-    images: {
-      normal: string;
-      preview: string;
-    };
-    modules_tree: {
-      [id: number]: {
-        is_default: boolean;
-        module_id: number;
-        name: string;
-        next_modules: number[] | null;
-        next_tanks: number[] | null;
-        price_credit: number;
-        price_xp: number;
-        type: string;
-      };
-    };
+    description: string;
   };
 }
 
-export interface TankopediaInfo {
-  achievement_sections: { [name: string]: { name: string; order: number } };
-  tanks_updated_at: number;
-  languages: { [name: string]: string };
-  vehicle_types: { [name: string]: string };
-  vehicle_nations: { [name: string]: string };
-  game_version: string;
-}
-
 console.log('Caching tankopedia...');
-export const tankopedia = await getWargamingResponse<Tankopedia>(
-  `https://api.wotblitz.com/wotb/encyclopedia/vehicles/?application_id=${args['wargaming-application-id']}`,
-);
+export const tankopedia = (
+  (await (
+    await fetch('https://www.blitzstars.com/bs-tankopedia.json')
+  ).json()) as WargamingResponse<Tankopedia> & { status: 'ok' }
+).data;
 console.log('Cached tankopedia');
 
-console.log('Caching tankopedia info...');
-export const tankopediaInfo = await getWargamingResponse<TankopediaInfo>(
-  `https://api.wotblitz.com/wotb/encyclopedia/info/?application_id=${args['wargaming-application-id']}`,
-);
-console.log('Cached tankopedia info');
-
 /**
  * @deprecated
  */

src/core/blitzstars/getPeriodStart.ts

@@ -3,8 +3,16 @@ import { StatPeriod } from '../options/addStatPeriodChoices.js';
 export default function getPeriodicStart(period: StatPeriod) {
   if (period === 'career') {
     return -Infinity;
+  } else if (period === 'today') {
+    const now = new Date();
+    now.setHours(5, 0, 0, 0);
+
+    // If it's after 5:00 AM today, subtract one day
+    if (now.getTime() > Date.now()) now.setDate(now.getDate() - 1);
+
+    return now.getTime() / 1000;
   } else {
-    const daysAgo = period === 'today' ? 0 : Number(period) - 1;
+    const daysAgo = Number(period) - 1;
     const periodStart = new Date();
 
     periodStart.setDate(periodStart.getDate() - daysAgo);

src/core/blitzstars/getPlayerStats.ts

@@ -1,15 +0,0 @@
-import { CacheType, ChatInputCommandInteraction } from 'discord.js';
-import { PlayerStats } from '../../types/playerStats.js';
-
-export default async function getPlayerStats(
-  interaction: ChatInputCommandInteraction<CacheType>,
-  command: string,
-  id: number,
-  callback: (playerStats: PlayerStats) => void,
-) {
-  fetch(`https://www.blitzstars.com/api/playerstats/${id}`).then(
-    async (response) => {
-      callback((await response.json()) as PlayerStats);
-    },
-  );
-}

src/core/blitzstars/getTankStatsOverTime.ts

@@ -47,8 +47,8 @@ export type TankHistory = TankHistoryNode[];
 export default async function getTankStatsOverTime(
   server: BlitzServer,
   id: number,
-  start = -Infinity,
-  end = Infinity,
+  start: number,
+  end: number,
 ) {
   const latestTankStatsRaw = await getWargamingResponse<TanksStats>(
     `https://api.wotblitz.${server}/wotb/tanks/stats/?application_id=${args['wargaming-application-id']}&account_id=${id}`,

src/core/blitzstars/tankaverages.ts

@@ -0,0 +1,90 @@
+import { AllStats } from '../../types/accountInfo.js';
+
+export interface SpecialStats {
+  winrate: number;
+  damageRatio: number;
+  kdr: number;
+  damagePerBattle: number;
+  killsPerBattle: number;
+  hitsPerBattle: number;
+  spotsPerBattle: number;
+  wpm: number;
+  dpm: number;
+  kpm: number;
+  hitRate: number;
+  survivalRate: number;
+}
+
+export type Percentiles = [
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+];
+
+export interface SpecialPercentiles {
+  winRate: Percentiles;
+  damageRatio: Percentiles;
+  kdr: Percentiles;
+  damagePerBattle: Percentiles;
+  killsPerBattle: Percentiles;
+  hitsPerBattle: Percentiles;
+  spotsPerBattle: Percentiles;
+  wpm: Percentiles;
+  dpm: Percentiles;
+  kpm: Percentiles;
+  hitRate: Percentiles;
+  survivalRate: Percentiles;
+}
+
+export interface MeanSd {
+  winrateMean: number;
+  winrateSd: number;
+  hitRateMean: number;
+  hitRateSd: number;
+  survivalRateMean: number;
+  survivalRateSd: number;
+  damageRatioMean: number;
+  damageRatioSd: number;
+  kdrMean: number;
+  kdrSd: number;
+  dpbMean: number;
+  dpbSd: number;
+  kpbMean: number;
+  kpbSd: number;
+  hpbMean: number;
+  hpbSd: number;
+  spbMean: number;
+  spbSd: number;
+}
+
+export interface IndividualTankAverages {
+  _id: number;
+  battle_life_time: number;
+  total_battle_life_time: number;
+  number_of_players: number;
+  tank_id: number;
+  all: AllStats;
+  special: SpecialStats;
+  percentiles: SpecialPercentiles;
+  percentiles_player_count: number;
+  meanSd: MeanSd;
+  shotEff: number;
+  last_update: number;
+}
+
+console.log('Caching tank averages...');
+const tankAveragesRaw = (await (
+  await fetch('https://www.blitzstars.com/api/tankaverages.json')
+).json()) as IndividualTankAverages[];
+export const tankAverages: Record<number, IndividualTankAverages> = {};
+
+Object.entries(tankAveragesRaw).forEach(([, tank]) => {
+  tankAverages[tank.tank_id] = tank;
+});
+console.log('Tank averages cached');