Merge branch 'main' into dev

scripts/buildAssets/boosterIcons.ts

@@ -17,7 +17,10 @@ export async function boosterIcons(production: boolean) {
 
   await Promise.all(
     boosterFiles.map(async (file) => {
-      const name = file.match(/booster_(.+).txt.dvpl/)![1];
+      const name = file.match(/booster_(.+).txt.dvpl/)?.[1];
+
+      if (name === undefined) return;
+
       const sizes = (
         await readStringDVPL(`${DATA}/${POI.boosterIcons}/${file}`)
       )

scripts/buildAssets/circleFlags.ts

@@ -1,5 +1,6 @@
 import { readdir } from 'fs/promises';
-import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL';
+import sharp from 'sharp';
+import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
 import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
@@ -14,7 +15,10 @@ export async function circleFlags(production: boolean) {
           !flag.endsWith('@2x.packed.webp.dvpl'),
       )
       .map(async (flag) => {
-        const content = await readBase64DVPL(`${DATA}/${POI.flags}/${flag}`);
+        const image = sharp(await readDVPLFile(`${DATA}/${POI.flags}/${flag}`));
+        const content = (
+          await image.trim({ threshold: 100 }).toBuffer()
+        ).toString('base64');
         const name = flag.match(/flag_profile-stat_(.+)\.packed\.webp/)![1];
 
         return {

scripts/buildAssets/definitions.ts

@@ -353,11 +353,15 @@ export interface MapAlly {
   points: Array<number[]>;
 }
 
+interface AvailableNationsYaml {
+  available_nations: string[];
+}
+
 const blitzShellKindToBlitzkit: Record<ShellKind, ShellType> = {
-  ARMOR_PIERCING: 'ap',
-  ARMOR_PIERCING_CR: 'ap_cr',
-  HIGH_EXPLOSIVE: 'he',
-  HOLLOW_CHARGE: 'hc',
+  ARMOR_PIERCING: ShellType.AP,
+  ARMOR_PIERCING_CR: ShellType.APCR,
+  HIGH_EXPLOSIVE: ShellType.HE,
+  HOLLOW_CHARGE: ShellType.HEAT,
 };
 const missingStrings: Record<string, string> = {
   '#artefacts:tungstentip/name': 'Tungsten Shells',
@@ -378,6 +382,11 @@ export async function definitions(production: boolean) {
       .split('.')
       .slice(0, 3)
       .join('.'),
+    nations: (
+      await readYAMLDVPL<AvailableNationsYaml>(
+        `${DATA}/available_nations.yaml.dvpl`,
+      )
+    ).available_nations,
   };
   const tankDefinitions: TankDefinitions = {};
   const modelDefinitions: ModelDefinitions = {};

scripts/buildAssets/index.ts

@@ -41,9 +41,9 @@ const methods = [
   consumableProvisionIcons,
   camouflageIcons,
   boosterIcons,
-  tankIcons,
   tankArmors,
   tankModels,
+  tankIcons,
 ];
 
 for (const method of methods) {

scripts/checkVersionMissMatch.ts

@@ -1,12 +0,0 @@
-import { readdir } from 'fs/promises';
-import packageJSON from '../package.json';
-
-const { version } = packageJSON;
-const changelogs = await readdir('docs/changelogs');
-const hasVersion = changelogs.includes(`${version}.md`);
-
-if (hasVersion) {
-  console.log(`Version ${version} found in changelogs`);
-} else {
-  throw new Error(`Version ${version} not found in changelogs`);
-}