From 94c3608ca7418c825c8257f9c8ec094a587faf3c Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Tue, 4 Aug 2026 13:35:51 -0500 Subject: [PATCH] fix missing tank map --- packages/core/src/blitzkit/api/client.ts | 5 +++++ packages/core/src/blitzkit/api/server/0_base.ts | 17 ++++++++++++++++- .../blitzkit/api/server/1_tankDefinitions.ts | 11 +---------- .../api/server/7_provisionDefinitions.ts | 2 +- .../definitions/consumables.pb.ts | 3 --- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/packages/core/src/blitzkit/api/client.ts b/packages/core/src/blitzkit/api/client.ts index f4e1c6aed..8ba62e128 100644 --- a/packages/core/src/blitzkit/api/client.ts +++ b/packages/core/src/blitzkit/api/client.ts @@ -3,6 +3,7 @@ import { CamouflageDefinitions, ConsumableDefinitions, GameDefinitions, + ModelDefinitions, ProvisionDefinitions, TankDefinitions, } from "../../protos"; @@ -28,4 +29,8 @@ export class ClientBlitzKitAPI extends BlitzKitAPI { provisionDefinitions() { return fetchPB("/api/definitions/provisions.pb", ProvisionDefinitions); } + + modelDefinitions() { + return fetchPB("/api/definitions/models.pb", ModelDefinitions); + } } diff --git a/packages/core/src/blitzkit/api/server/0_base.ts b/packages/core/src/blitzkit/api/server/0_base.ts index 75eb3c240..a41ec123d 100644 --- a/packages/core/src/blitzkit/api/server/0_base.ts +++ b/packages/core/src/blitzkit/api/server/0_base.ts @@ -21,6 +21,8 @@ import { SquadBattleTypeStylesYaml, TankClass, TankmenAvatar, + toUniqueId, + VehicleDefinitionList, } from "@blitzkit/core"; import { AbstractVFS } from "@blitzkit/core/src/blitzkit/vfs/abstract"; import { SUPPORTED_LOCALE_BLITZ_MAP } from "@blitzkit/i18n"; @@ -217,7 +219,20 @@ export abstract class ServerBlitzKitAPI0 extends BlitzKitAPI { ); } - console.log("Initialization complete, enjoy :)"); + for (const nation of this.nationsDir!) { + const tankList = await this.vfs.xml<{ root: VehicleDefinitionList }>( + `Data/XML/item_defs/vehicles/${nation}/list.xml`, + ); + + for (const tankKey in tankList.root) { + if (this.botPattern.test(tankKey)) continue; + + const tank = tankList.root[tankKey]; + const tankId = toUniqueId(nation, tank.id); + + this.tankStringIdMap[`${nation}:${tankKey}`] = tankId; + } + } return this; } diff --git a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts index 3f5ab137e..9269a4900 100644 --- a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts @@ -15,7 +15,6 @@ import { ShellKind, sluggify, TankDefinitions, - TankParameters, TankPrice, TankPriceType, TankType, @@ -26,10 +25,7 @@ import { VehicleDefinitionList, VehicleDefinitions, } from "@blitzkit/core"; -import { - Cache, - ServerBlitzKitAPI0, -} from "./0_base"; +import { Cache, ServerBlitzKitAPI0 } from "./0_base"; export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { private parseResearchCost(raw: number | string) { @@ -238,16 +234,11 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { const tankDefinition = await this.vfs.xml<{ root: VehicleDefinitions }>( `Data/XML/item_defs/vehicles/${nation}/${tankKey}.xml`, ); - const tankParameters = await this.vfs.yaml( - `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`, - ); const tankId = toUniqueId(nation, tank.id); const tankTags = tank.tags.split(" "); const equipment = tankDefinition.root.optDevicePreset; - this.tankStringIdMap[`${nation}:${tankKey}`] = tankId; - const slug = slugs.get(tankId); if (slug === undefined) { diff --git a/packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts b/packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts index 59d1ec9fe..32db2bcc1 100644 --- a/packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts @@ -11,7 +11,7 @@ export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 { async provisionDefinitions() { const provisionDefinitions = ProvisionDefinitions.create(); - Object.entries(this.provisionsCommon).forEach(([key, provision]) => { + Object.entries(this.provisionsCommon).forEach(([, provision]) => { const entry: Provision = { id: provision.id, exclude: [], diff --git a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts index da2ce067e..80b6adcf8 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts @@ -5,9 +5,6 @@ export { getStaticPaths } from "../_index"; export async function GET() { const definitions = await api.consumableDefinitions(); - - console.dir(definitions, { depth: null }); - const bytes = ConsumableDefinitions.encode(definitions).finish(); return new Response(bytes);