From a38239a6f95445e747c47d99cbf196a6d9a67fb3 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 23 Sep 2026 13:58:29 -0500 Subject: [PATCH] tankClassOrder --- packages/core/src/blitz/constants.ts | 41 ------------------- packages/core/src/blitz/index.ts | 1 - .../blitzkit/averageDefinitions/constants.ts | 22 ---------- .../src/blitzkit/averageDefinitions/index.ts | 17 -------- packages/core/src/blitzkit/index.ts | 1 - packages/core/src/blitzkit/metaSortTank.ts | 14 +++---- packages/core/src/config/tankClassOrder.ts | 8 ++++ packages/core/src/config/treeTypeOrder.ts | 7 ++++ 8 files changed, 20 insertions(+), 91 deletions(-) delete mode 100644 packages/core/src/blitz/constants.ts delete mode 100644 packages/core/src/blitzkit/averageDefinitions/constants.ts delete mode 100644 packages/core/src/blitzkit/averageDefinitions/index.ts create mode 100644 packages/core/src/config/tankClassOrder.ts create mode 100644 packages/core/src/config/treeTypeOrder.ts diff --git a/packages/core/src/blitz/constants.ts b/packages/core/src/blitz/constants.ts deleted file mode 100644 index 729cd5ef9..000000000 --- a/packages/core/src/blitz/constants.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { TankClass, TankType } from "@blitzkit/protos"; -import type { BlitzStats } from "../statistics"; - -export const TANK_TYPES = [ - TankType.TANK_TYPE_RESEARCHABLE, - TankType.TANK_TYPE_PREMIUM, - TankType.TANK_TYPE_COLLECTOR, -]; - -export const TANK_TYPE_COMMAND_NAMES = { - [TankType.TANK_TYPE_RESEARCHABLE]: "researchable", - [TankType.TANK_TYPE_PREMIUM]: "premium", - [TankType.TANK_TYPE_COLLECTOR]: "collector", -}; - -export const TANK_CLASSES = [ - TankClass.TANK_CLASS_LIGHT, - TankClass.TANK_CLASS_MEDIUM, - TankClass.TANK_CLASS_HEAVY, - TankClass.TANK_CLASS_TANK_DESTROYER, -]; - -export const emptyAllStats: BlitzStats = { - battles: 0, - capture_points: 0, - damage_dealt: 0, - damage_received: 0, - dropped_capture_points: 0, - frags: 0, - frags8p: 0, - hits: 0, - losses: 0, - max_frags: 0, - max_xp: 0, - shots: 0, - spotted: 0, - survived_battles: 0, - xp: 0, - win_and_survived: 0, - wins: 0, -}; diff --git a/packages/core/src/blitz/index.ts b/packages/core/src/blitz/index.ts index 00aaabe43..83a366a90 100644 --- a/packages/core/src/blitz/index.ts +++ b/packages/core/src/blitz/index.ts @@ -1,7 +1,6 @@ export * from "./canSplash"; export * from "./clans"; export * from "./classes"; -export * from "./constants"; export * from "./equipmentPrice"; export * from "./fetchBlitz"; export * from "./fetchGlossary"; diff --git a/packages/core/src/blitzkit/averageDefinitions/constants.ts b/packages/core/src/blitzkit/averageDefinitions/constants.ts deleted file mode 100644 index d95a53091..000000000 --- a/packages/core/src/blitzkit/averageDefinitions/constants.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { emptyAllStats } from '../../blitz/constants'; -import { Samples } from '../../../../protos/src/blitzkit'; -import type { BlitzkitStats } from '../../statistics'; - -export const emptyAverageDefinitionsAllStats: BlitzkitStats = { - ...emptyAllStats, - battle_life_time: 0, -}; - -export const averageDefinitionsAllStatsKeys = Object.keys( - emptyAverageDefinitionsAllStats, -) as (keyof BlitzkitStats)[]; - -export const emptySamples: Samples = { - d_1: 0, - d_7: 0, - d_30: 0, - d_60: 0, - d_90: 0, - d_120: 0, - total: 0, -}; diff --git a/packages/core/src/blitzkit/averageDefinitions/index.ts b/packages/core/src/blitzkit/averageDefinitions/index.ts deleted file mode 100644 index 9ac6e401a..000000000 --- a/packages/core/src/blitzkit/averageDefinitions/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { staticAsset } from "@blitzkit/core"; -import { AverageDefinitions } from "../../../../protos/src/blitzkit"; -import { fetchPB } from "../../api"; - -export interface AverageDefinitionsManifest { - version: 1; - /** - * epoch in days - */ - latest: number; -} - -export async function fetchAverage() { - return await fetchPB(staticAsset("averages.pb"), AverageDefinitions); -} - -export * from "./constants"; diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts index 14072a4bb..a5f4bf29b 100644 --- a/packages/core/src/blitzkit/index.ts +++ b/packages/core/src/blitzkit/index.ts @@ -2,7 +2,6 @@ export * from "./alias"; export * from "./api"; export * from "./assertSecret"; export * from "./availableProvisions"; -export * from "./averageDefinitions"; export * from "./coefficient"; export * from "./createDefaultProvisions"; export * from "./createDefaultSkills"; diff --git a/packages/core/src/blitzkit/metaSortTank.ts b/packages/core/src/blitzkit/metaSortTank.ts index 1b41cbbdc..a81974a64 100644 --- a/packages/core/src/blitzkit/metaSortTank.ts +++ b/packages/core/src/blitzkit/metaSortTank.ts @@ -1,11 +1,6 @@ -import { GameDefinitions, TankDefinition, TankType } from "@blitzkit/protos"; -import { TANK_CLASSES } from "../blitz/constants"; - -const treeTypeOrder = [ - TankType.TANK_TYPE_RESEARCHABLE, - TankType.TANK_TYPE_PREMIUM, - TankType.TANK_TYPE_COLLECTOR, -]; +import { GameDefinitions, TankDefinition } from "@blitzkit/protos"; +import { tankClassOrder } from "../config/tankClassOrder"; +import { treeTypeOrder } from "../config/treeTypeOrder"; export function metaSortTank( tanks: TankDefinition[], @@ -17,7 +12,8 @@ export function metaSortTank( (a, b) => treeTypeOrder.indexOf(b.type) - treeTypeOrder.indexOf(a.type), ) .sort( - (a, b) => TANK_CLASSES.indexOf(b.class) - TANK_CLASSES.indexOf(a.class), + (a, b) => + tankClassOrder.indexOf(b.class) - tankClassOrder.indexOf(a.class), ) .sort( (a, b) => diff --git a/packages/core/src/config/tankClassOrder.ts b/packages/core/src/config/tankClassOrder.ts new file mode 100644 index 000000000..14458a7ee --- /dev/null +++ b/packages/core/src/config/tankClassOrder.ts @@ -0,0 +1,8 @@ +import { TankClass } from "@blitzkit/protos"; + +export const tankClassOrder = [ + TankClass.TANK_CLASS_LIGHT, + TankClass.TANK_CLASS_MEDIUM, + TankClass.TANK_CLASS_HEAVY, + TankClass.TANK_CLASS_TANK_DESTROYER, +]; diff --git a/packages/core/src/config/treeTypeOrder.ts b/packages/core/src/config/treeTypeOrder.ts new file mode 100644 index 000000000..fbf11a7ce --- /dev/null +++ b/packages/core/src/config/treeTypeOrder.ts @@ -0,0 +1,7 @@ +import { TankType } from "@blitzkit/protos"; + +export const treeTypeOrder = [ + TankType.TANK_TYPE_RESEARCHABLE, + TankType.TANK_TYPE_PREMIUM, + TankType.TANK_TYPE_COLLECTOR, +];