From dcc8207fb65eb8872bf53b60e9cc0c7bd16a00fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Wed, 10 Dec 2025 17:31:03 -0600 Subject: [PATCH] fix: deconstructor --- .../scripts/src/buildAssets/boosterIcons.ts | 10 ++++---- .../scripts/src/buildAssets/definitions.ts | 24 ++++++++++--------- .../scripts/src/buildAssets/skillIcons.ts | 2 +- .../scripts/src/core/github/assetUploader.ts | 2 +- packages/scripts/src/core/vfs/abstract.ts | 2 +- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/packages/scripts/src/buildAssets/boosterIcons.ts b/packages/scripts/src/buildAssets/boosterIcons.ts index 486a732b2..4046ba88b 100644 --- a/packages/scripts/src/buildAssets/boosterIcons.ts +++ b/packages/scripts/src/buildAssets/boosterIcons.ts @@ -5,10 +5,12 @@ import { vfs } from "./constants"; export async function boosterIcons() { console.log("Building booster icons..."); - using uploader = new AssetUploader("booster icons"); - const boosterFiles = (vfs.dir(`Data/Gfx/Shared/boosters`)).filter( - (file) => !file.includes("@2x.txt") && !file.startsWith("texture0") - ); + const uploader = new AssetUploader("booster icons"); + const boosterFiles = vfs + .dir("Data/Gfx/Shared/boosters") + .filter( + (file) => !file.includes("@2x.txt") && !file.startsWith("texture0") + ); const image = sharp( await vfs.file(`Data/Gfx/Shared/boosters/texture0.packed.webp`) ); diff --git a/packages/scripts/src/buildAssets/definitions.ts b/packages/scripts/src/buildAssets/definitions.ts index fc669459f..9708173f5 100644 --- a/packages/scripts/src/buildAssets/definitions.ts +++ b/packages/scripts/src/buildAssets/definitions.ts @@ -534,11 +534,11 @@ const blitzModuleTypeToBlitzkit: Record = { export async function definitions() { console.log("Building definitions..."); - using uploader = new AssetUploader("definitions"); + const uploader = new AssetUploader("definitions"); const gameDefinitions: GameDefinitions = { - version: (await vfs.text('Data/version.txt')).split(" ")[0], + version: (await vfs.text("Data/version.txt")).split(" ")[0], nations: ( - await vfs.yaml('Data/available_nations.yaml') + await vfs.yaml("Data/available_nations.yaml") ).available_nations, gameModes: {}, roles: {}, @@ -561,10 +561,12 @@ export async function definitions() { [TankClass.TANK_DESTROYER]: { skills: [] }, }, }; - const nations = vfs.dir('Data/XML/item_defs/vehicles').filter((nation) => nation !== "common") + const nations = vfs + .dir("Data/XML/item_defs/vehicles") + .filter((nation) => nation !== "common"); const tankStringIdMap: Record = {}; const optionalDevices = await vfs.xml<{ root: OptionalDevices }>( - 'Data/XML/item_defs/vehicles/common/optional_devices.xml' + "Data/XML/item_defs/vehicles/common/optional_devices.xml" ); const stringsI18n: Record> = {}; @@ -617,9 +619,7 @@ export async function definitions() { const provisions: ProvisionsCommon = {}; for (const match of ( - await vfs.text( - `Data/XML/item_defs/vehicles/common/consumables/list.xml` - ) + await vfs.text(`Data/XML/item_defs/vehicles/common/consumables/list.xml`) ).matchAll(//g)) { if (match[1] === "prototypes") continue; @@ -634,9 +634,7 @@ export async function definitions() { } for (const match of ( - await vfs.text( - `Data/XML/item_defs/vehicles/common/provisions/list.xml` - ) + await vfs.text(`Data/XML/item_defs/vehicles/common/provisions/list.xml`) ).matchAll(//g)) { if (match[1] === "prototypes") continue; @@ -1780,6 +1778,10 @@ export async function definitions() { }; }); + console.log(gameDefinitions); + + console.log(GameDefinitions.encode(gameDefinitions).finish().length); + await uploader.add({ content: GameDefinitions.encode(gameDefinitions).finish(), path: "definitions/game.pb", diff --git a/packages/scripts/src/buildAssets/skillIcons.ts b/packages/scripts/src/buildAssets/skillIcons.ts index 4c6b67a4c..60dec1f5d 100644 --- a/packages/scripts/src/buildAssets/skillIcons.ts +++ b/packages/scripts/src/buildAssets/skillIcons.ts @@ -28,7 +28,7 @@ export async function skillIcons() { const avatar = await vfs.xml<{ root: Avatar }>( `Data/XML/item_defs/tankmen/avatar.xml` ); - using uploader = new AssetUploader("skill icons"); + const uploader = new AssetUploader("skill icons"); for (const key in avatar.root.skills) { const skill = avatar.root.skills[key]; diff --git a/packages/scripts/src/core/github/assetUploader.ts b/packages/scripts/src/core/github/assetUploader.ts index ce24de2e3..0a064e25e 100644 --- a/packages/scripts/src/core/github/assetUploader.ts +++ b/packages/scripts/src/core/github/assetUploader.ts @@ -99,7 +99,7 @@ export class AssetUploader { } if (diff.status === DiffStatus.Unchanged) { - // console.log(`🔵 ${change.path}`); + console.log(`🔵 ${change.path}`); } else { console.log( `${diff.status === DiffStatus.New ? "🟢" : "🟡"} (${ diff --git a/packages/scripts/src/core/vfs/abstract.ts b/packages/scripts/src/core/vfs/abstract.ts index 5566794ba..b6027d9d4 100644 --- a/packages/scripts/src/core/vfs/abstract.ts +++ b/packages/scripts/src/core/vfs/abstract.ts @@ -51,7 +51,7 @@ export abstract class AbstractVFS { const parentSegments = path.split("/").length; const children: string[] = []; - for (const [child] of this.paths()) { + for (const child of this.paths()) { const childSegments = child.split("/"); if (