(2) some implementation

packages/core/src/blitzkit/api/server.ts

@@ -1,9 +1,11 @@
 import {
   AbstractVFS,
   Armor,
+  AssaultRanges,
   BlitzCrewType,
   BlitzModuleType,
   BlitzStrings,
+  BlitzTankClass,
   CamouflageDefinitions,
   CamouflagesXml,
   CamouflagesYaml,
@@ -14,7 +16,9 @@ import {
   Crew,
   CrewType,
   EngineDefinitionsList,
+  Equalizer,
   EquipmentDefinitions,
+  GunDefinition,
   GunDefinitionsList,
   I18nString,
   MapDefinitions,
@@ -27,14 +31,18 @@ import {
   ProvisionsCommon,
   ResearchCost,
   ShellDefinitionsList,
+  ShellKind,
+  ShellType,
   SkillDefinitions,
   sluggify,
   SquadBattleTypeStylesYaml,
+  TankClass,
   TankDefinitions,
   TankmenAvatar,
   TankParameters,
   TankPrice,
   TankPriceType,
+  TankType,
   toUniqueId,
   TurretDefinitionsList,
   Unlock,
@@ -45,6 +53,7 @@ import {
 } from "@blitzkit/core";
 import { SUPPORTED_LOCALE_BLITZ_MAP } from "@blitzkit/i18n";
 import locales from "@blitzkit/i18n/locales.json";
+import { parse as parsePath } from "path";
 import { parse as parseYaml } from "yaml";
 import { BlitzKitAPI } from "./base";
 
@@ -84,6 +93,18 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
     loader: CrewType.CREW_TYPE_LOADER,
     radioman: CrewType.CREW_TYPE_RADIOMAN,
   };
+  private blitzTankClassToBlitzkit: Record<BlitzTankClass, TankClass> = {
+    lightTank: TankClass.TANK_CLASS_LIGHT,
+    "AT-SPG": TankClass.TANK_CLASS_TANK_DESTROYER,
+    heavyTank: TankClass.TANK_CLASS_HEAVY,
+    mediumTank: TankClass.TANK_CLASS_MEDIUM,
+  };
+  private blitzShellKindToBlitzkit: Record<ShellKind, ShellType> = {
+    ARMOR_PIERCING: ShellType.SHELL_TYPE_AP,
+    ARMOR_PIERCING_CR: ShellType.SHELL_TYPE_APCR,
+    HIGH_EXPLOSIVE: ShellType.SHELL_TYPE_HE,
+    HOLLOW_CHARGE: ShellType.SHELL_TYPE_HEAT,
+  };
 
   private stringsI18n: Record<string, Record<string, string>> = {};
   private nationsDir?: string[];
@@ -235,6 +256,24 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
     }
   }
 
+  private parseResearchCost(raw: number | string) {
+    if (typeof raw === "number") {
+      return {
+        research_cost_type: { $case: "xp", value: raw },
+      } satisfies ResearchCost;
+    } else {
+      return {
+        research_cost_type: {
+          $case: "seasonal_tokens",
+          value: {
+            season: Number(/prx_season_(\d+):\d+/.exec(raw)![1]),
+            tokens: Number(/prx_season_\d+:(\d+)/.exec(raw)![1]),
+          },
+        },
+      } satisfies ResearchCost;
+    }
+  }
+
   async tankDefinitions() {
     const tankDefinitions = TankDefinitions.create();
 
@@ -515,7 +554,9 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
           }
         }
 
-        const camouflages = Object.entries(camouflagesXml.root.camouflages)
+        const camouflages = Object.entries(
+          this.camouflagesXml!.root.camouflages,
+        )
           .filter(([, camo]) => {
             if (!camo.vehicleFilter.include) return false;
             if (camo.unlockCostCategory !== "legendary-skins-gold")
@@ -535,7 +576,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
           })
           .map(([, camo]) => camo.id);
 
-        let equalizerEntry = tierEqualizer.find(
+        let equalizerEntry = this.tierEqualizer!.find(
           (line) => line[0] === `${nation}:${tankKey}`,
         );
 
@@ -566,8 +607,8 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
           max_provisions: tankDefinition.root.provisionSlots,
           name:
             (tank.shortUserString
-              ? getString(tank.shortUserString)
+              ? this.getString(tank.shortUserString)
-              : undefined) ?? getString(tank.userString),
+              : undefined) ?? this.getString(tank.userString),
           slug,
           nation,
           type: tankTags.includes("collectible")
@@ -576,7 +617,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
               ? TankType.TANK_TYPE_PREMIUM
               : TankType.TANK_TYPE_RESEARCHABLE,
           tier: tank.level,
-          class: blitzTankClassToBlitzkit[tankTags[0] as BlitzTankClass],
+          class: this.blitzTankClassToBlitzkit[tankTags[0] as BlitzTankClass],
           testing: tankTags.includes("testTank"),
           deprecated: tankTags.includes("deprecated"),
           price: tankPrice,
@@ -601,7 +642,8 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
               );
             }
 
-            tankDefinitions.tanks[tankId].roles[id] = combatRoles[role].id;
+            tankDefinitions.tanks[tankId].roles[id] =
+              this.combatRoles![role].id;
           });
         }
 
@@ -616,7 +658,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
           tankDefinitions.tanks[tankId].tracks.push({
             id: trackId,
             weight: track.weight,
-            name: getString(track.userString),
+            name: this.getString(track.userString),
             traverse_speed: track.rotationSpeed,
             dispersion_move: track.shotDispersionFactors.vehicleMovement,
             dispersion_traverse: track.shotDispersionFactors.vehicleRotation,
@@ -624,7 +666,10 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
             resistance_medium: terrainResistances[1],
             resistance_soft: terrainResistances[2],
             tier: track.level,
-            unlocks: resolveUnlocks(track.unlocks),
+            unlocks: resolveUnlocks(
+              this.blitzModuleTypeToBlitzkit,
+              track.unlocks,
+            ),
           });
         });
 
@@ -636,17 +681,21 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
           totalUnlocks.push(engine.unlocks);
           tankDefinitions.tanks[tankId].engines.push({
             id: engineId,
-            name: getString(engineListEntry.userString),
+            name: this.getString(engineListEntry.userString),
             fire_chance: engineListEntry.fireStartingChance,
             tier: engineListEntry.level,
             weight: engineListEntry.weight,
             power: engineListEntry.power,
-            unlocks: resolveUnlocks(engine.unlocks),
+            unlocks: resolveUnlocks(
+              this.blitzModuleTypeToBlitzkit,
+              engine.unlocks,
+            ),
           });
         });
 
-        Object.keys(tankDefinition.root.turrets0).forEach(
+        let turretIndex = 0;
-          (turretKey, turretIndex) => {
+        for (const turretKey in tankDefinition.root.turrets0) {
+          {
             const turret = tankDefinition.root.turrets0[turretKey];
             const turretId = toUniqueId(nation, turretList.root.ids[turretKey]);
 
@@ -665,7 +714,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                 const armorId = parseInt(armorIdString);
                 const armorRaw = turret.armor[name];
 
-                assignArmor(armorRaw, armorId, turretArmor);
+                this.assignArmor(armorRaw, armorId, turretArmor);
               });
 
             turret.userString;
@@ -673,16 +722,21 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
             tankDefinitions.tanks[tankId].turrets.push({
               id: turretId,
               traverse_speed: turret.rotationSpeed,
-              name: getString(turret.userString),
+              name: this.getString(turret.userString),
               tier: turret.level,
               guns: [],
               health: turret.maxHealth,
               view_range: turret.circularVisionRadius,
               weight: turret.weight,
-              unlocks: resolveUnlocks(turret.unlocks),
+              unlocks: resolveUnlocks(
+                this.blitzModuleTypeToBlitzkit,
+                turret.unlocks,
+              ),
             });
 
-            Object.keys(turret.guns).forEach((gunKey, gunIndex) => {
+            let gunIndex = 0;
+            for (const gunKey in turret.guns) {
+              {
                 const gun = turret.guns[gunKey];
                 const gunId = toUniqueId(nation, gunList.root.ids[gunKey]);
                 const gunListEntry = gunList.root.shared[gunKey];
@@ -698,7 +752,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                 const gunModel = Number(
                   parsePath(gun.models.undamaged).name.split("_")[1],
                 );
-              const gunName = getString(gunListEntry.userString);
+                const gunName = this.getString(gunListEntry.userString);
                 const gunType =
                   "clip" in gun
                     ? gun.pumpGunMode
@@ -707,10 +761,12 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                     : "regular";
                 // const gunReload = gun.reloadTime;
                 // const shellReloads =
-              const gunClipCount = gunType === "regular" ? 1 : gun.clip!.count;
+                const gunClipCount =
+                  gunType === "regular" ? 1 : gun.clip!.count;
                 const gunArmor: Armor = { thickness: {}, spaced: [] };
                 const shotDispersionFactors =
-                gun.shotDispersionFactors ?? gunListEntry.shotDispersionFactors;
+                  gun.shotDispersionFactors ??
+                  gunListEntry.shotDispersionFactors;
                 const maskName = `gun_${gunModel.toString().padStart(2, "0")}`;
                 const maskEnabled =
                   tankParameters.maskSlice?.[maskName]?.enabled ?? false;
@@ -722,8 +778,10 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                     .map((string) => {
                       const trimmed = string.trim();
 
-                    if (trimmed in blitzShellKindToBlitzkit) {
+                      if (trimmed in this.blitzShellKindToBlitzkit) {
-                      return blitzShellKindToBlitzkit[trimmed as ShellKind];
+                        return this.blitzShellKindToBlitzkit[
+                          trimmed as ShellKind
+                        ];
                       }
 
                       throw new SyntaxError(`Invalid shell kind: ${trimmed}`);
@@ -745,13 +803,6 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                   };
                 }
 
-              if (maskEnabled) {
-                const maskRaw = tankParameters.maskSlice![maskName]!;
-                mask = maskRaw.planePosition[1];
-              } else {
-                mask = undefined;
-              }
-
                 totalUnlocks.push(gun.unlocks);
                 Object.keys(gun.armor)
                   .filter((name) => name.startsWith("armor_"))
@@ -763,7 +814,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                     const armorId = parseInt(armorIdString);
                     const armorRaw = gun.armor[name];
 
-                  assignArmor(armorRaw, armorId, gunArmor);
+                    this.assignArmor(armorRaw, armorId, gunArmor);
                   });
 
                 tankDefinitions.tanks[tankId].turrets[turretIndex].guns.push({
@@ -779,11 +830,15 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                       : gun.invisibilityFactorAtShot.at(-1)!,
                   aim_time: gun.aimingTime ?? gunListEntry.aimingTime,
                   dispersion_base:
-                  gun.shotDispersionRadius ?? gunListEntry.shotDispersionRadius,
+                    gun.shotDispersionRadius ??
+                    gunListEntry.shotDispersionRadius,
                   dispersion_damaged: shotDispersionFactors.whileGunDamaged,
                   dispersion_shot: shotDispersionFactors.afterShot,
                   dispersion_traverse: shotDispersionFactors.turretRotation,
-                unlocks: resolveUnlocks(gun.unlocks),
+                  unlocks: resolveUnlocks(
+                    this.blitzModuleTypeToBlitzkit,
+                    gun.unlocks,
+                  ),
                   shell_capacity: gun.maxAmmo ?? gunListEntry.maxAmmo,
                   assault_ranges,
                   burst:
@@ -822,11 +877,12 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                           },
                 } satisfies GunDefinition);
 
-              Object.keys(gunListEntry.shots).forEach((shellKey) => {
+                for (const shellKey in gunListEntry.shots) {
+                  {
                     const gunShellEntry = gunListEntry.shots[shellKey];
                     const shell = shellList.root[shellKey];
                     const shellId = toUniqueId(nation, shell.id);
-                const shellName = getString(shell.userString);
+                    const shellName = this.getString(shell.userString);
                     const penetrationRaw = gunShellEntry.piercingPower
                       .split(" ")
                       .filter((penetrationString) => penetrationString !== "")
@@ -843,7 +899,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                       caliber: shell.caliber,
                       normalization: shell.normalizationAngle,
                       ricochet: shell.ricochetAngle,
-                  type: blitzShellKindToBlitzkit[shell.kind],
+                      type: this.blitzShellKindToBlitzkit[shell.kind],
                       explosion_radius:
                         shell.kind === "HIGH_EXPLOSIVE"
                           ? (shell.explosionRadius ?? 0)
@@ -855,23 +911,34 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                       },
                       range: gunShellEntry.maxDistance,
                     });
-              });
+                  }
-            });
+                }
-          },
+              }
-        );
 
-        totalUnlocks.forEach((unlocks) => {
+              gunIndex++;
+            }
+          }
+
+          turretIndex++;
+        }
+
+        for (const unlocks of totalUnlocks) {
           if (unlocks === undefined) return;
 
-          Object.entries(unlocks).forEach(([key, value]) => {
+          for (const key in unlocks) {
-            (Array.isArray(value) ? value : [value]).forEach((vehicle) => {
+            const value = unlocks[key as keyof BlitzModuleType];
+
+            for (const vehicle of Array.isArray(value) ? value : [value]) {
               switch (key as keyof BlitzModuleType) {
                 case "vehicle": {
                   const tankListEntry = tankList.root[vehicle["#text"]];
                   const currentTank = tankDefinitions.tanks[tankId];
                   const successorId = toUniqueId(nation, tankListEntry.id);
 
-                  tankXps.set(successorId, parseResearchCost(vehicle.cost));
+                  tankXps.set(
+                    successorId,
+                    this.parseResearchCost(vehicle.cost),
+                  );
 
                   if (currentTank.successors === undefined) {
                     currentTank.successors = [];
@@ -885,7 +952,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                 case "gun": {
                   gunXps.set(
                     toUniqueId(nation, gunList.root.ids[vehicle["#text"]]),
-                    parseResearchCost(vehicle.cost),
+                    this.parseResearchCost(vehicle.cost),
                   );
                   break;
                 }
@@ -893,7 +960,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                 case "turret": {
                   turretXps.set(
                     toUniqueId(nation, turretList.root.ids[vehicle["#text"]]),
-                    parseResearchCost(vehicle.cost),
+                    this.parseResearchCost(vehicle.cost),
                   );
                   break;
                 }
@@ -901,7 +968,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                 case "engine": {
                   engineXps.set(
                     toUniqueId(nation, enginesList.root.ids[vehicle["#text"]]),
-                    parseResearchCost(vehicle.cost),
+                    this.parseResearchCost(vehicle.cost),
                   );
                   break;
                 }
@@ -909,14 +976,14 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
                 case "chassis": {
                   trackXps.set(
                     toUniqueId(nation, chassisList.root.ids[vehicle["#text"]]),
-                    parseResearchCost(vehicle.cost),
+                    this.parseResearchCost(vehicle.cost),
                   );
                   break;
                 }
               }
-            });
+            }
-          });
+          }
-        });
+        }
 
         Object.values(tankDefinitions.tanks[tankId].turrets).forEach(
           (turret) => {
@@ -974,7 +1041,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
   async modelDefinitions() {
     const modelDefinitions = ModelDefinitions.create();
 
-    for (const nation of nationsDir) {
+    for (const nation of this.nationsDir!) {
       const tankList = await vfs.xml<{ root: VehicleDefinitionList }>(
         `Data/XML/item_defs/vehicles/${nation}/list.xml`,
       );

packages/core/src/types/shellDefinitionsList.ts

@@ -15,7 +15,7 @@ export type ShellDefinitionsList = Record<
   icons: Record<string, string>;
 };
 
-type ShellKind =
+export type ShellKind =
   | "ARMOR_PIERCING"
   | "ARMOR_PIERCING_CR"
   | "HIGH_EXPLOSIVE"

packages/scripts/src/buildAssets/definitions.ts

@@ -4,40 +4,18 @@ import {
   Consumable,
   ConsumableDefinitions,
   ConsumableTankCategoryFilterCategory,
-  CrewType,
   EquipmentDefinitions,
   EquipmentSlot,
   MapDefinitions,
   ModelDefinitions,
   Provision,
   ProvisionDefinitions,
-  ResearchCost,
-  ShellType,
   SkillDefinitions,
-  TankClass,
   TankDefinitions,
   Vector3,
 } from "@blitzkit/core";
 import type { Vector3Tuple } from "three";
 
-function parseResearchCost(raw: number | string) {
-  if (typeof raw === "number") {
-    return {
-      research_cost_type: { $case: "xp", value: raw },
-    } satisfies ResearchCost;
-  } else {
-    return {
-      research_cost_type: {
-        $case: "seasonal_tokens",
-        value: {
-          season: Number(/prx_season_(\d+):\d+/.exec(raw)![1]),
-          tokens: Number(/prx_season_\d+:(\d+)/.exec(raw)![1]),
-        },
-      },
-    } satisfies ResearchCost;
-  }
-}
-
 type BlitzTankFilterDefinitionCategory = "clip";
 const blitzTankFilterDefinitionCategoryToBlitzkit: Record<
   BlitzTankFilterDefinitionCategory,
@@ -48,18 +26,11 @@ const blitzTankFilterDefinitionCategoryToBlitzkit: Record<
 function vector3TupleToBlitzkit(tuple: Vector3Tuple) {
   return { x: tuple[0], y: tuple[1], z: tuple[2] } satisfies Vector3;
 }
-const blitzTankClassToBlitzkit: Record<BlitzTankClass, TankClass> = {
+
-  lightTank: TankClass.TANK_CLASS_LIGHT,
-  "AT-SPG": TankClass.TANK_CLASS_TANK_DESTROYER,
-  heavyTank: TankClass.TANK_CLASS_HEAVY,
-  mediumTank: TankClass.TANK_CLASS_MEDIUM,
-};
 export interface BlitzStrings {
   [key: string]: string;
 }
 
-
-
 export interface ConsumablesCommon {
   [key: string]: {
     id: number;
@@ -116,13 +87,6 @@ type CombatRolesYaml = Record<
   }
 >;
 
-const blitzShellKindToBlitzkit: Record<ShellKind, ShellType> = {
-  ARMOR_PIERCING: ShellType.SHELL_TYPE_AP,
-  ARMOR_PIERCING_CR: ShellType.SHELL_TYPE_APCR,
-  HIGH_EXPLOSIVE: ShellType.SHELL_TYPE_HE,
-  HOLLOW_CHARGE: ShellType.SHELL_TYPE_HEAT,
-};
-
 export async function definitions() {
   Object.values(tankDefinitions.tanks).forEach((tank) => {
     tank.research_cost = tankXps.get(tank.id);