TresAbhi/blitzkit
1
0 Fork 0
mirror of https://github.com/blitzkit/blitzkit.git synced 2026-10-24 03:59:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle duplicate armor

Browse Source
This commit is contained in:
TrèsAbhi committed 2026-04-01 22:06:42 -05:00
1 parent 3a9af7505f
commit d80f47a6c8
1 file changed
+21 -22
Download Patch File Download Diff File Expand all files Collapse all files
packages/scripts/src/buildAssets/definitions.ts
+21 -22
View File
@@ -135,7 +135,7 @@ export interface ChassisDefinitionsList {
} }
type VehicleDefinitionArmor = Record< type VehicleDefinitionArmor = Record<
string, string,
number | { vehicleDamageFactor: 0; "#text": number } number | { vehicleDamageFactor: 0; "#text": number } | number[]
>; >;
interface UnlocksInner { interface UnlocksInner {
cost: number | string; cost: number | string;
@@ -531,6 +531,22 @@ const blitzModuleTypeToBlitzkit: Record<keyof BlitzModuleType, ModuleType> = {
vehicle: ModuleType.MODULE_TYPE_VEHICLE, vehicle: ModuleType.MODULE_TYPE_VEHICLE,
}; };
function assignArmor(
raw: VehicleDefinitionArmor[string],
id: number,
armor: Armor,
) {
if (typeof raw === "number") {
armor.thickness[id] = raw;
} else if (Array.isArray(raw)) {
armor.thickness[id] = raw.at(-1)!;
} else {
if (!armor.spaced) armor.spaced = [];
armor.thickness[id] = raw["#text"];
armor.spaced.push(id);
}
}
export async function definitions() { export async function definitions() {
console.log("Building definitions..."); console.log("Building definitions...");
@@ -923,13 +939,7 @@ export async function definitions() {
const armorId = parseInt(armorIdString); const armorId = parseInt(armorIdString);
const armorRaw = tankDefinition.root.hull.armor[name]; const armorRaw = tankDefinition.root.hull.armor[name];
if (typeof armorRaw === "number") { assignArmor(armorRaw, armorId, hullArmor);
hullArmor.thickness[armorId] = armorRaw;
} else {
if (!hullArmor.spaced) hullArmor.spaced = [];
hullArmor.thickness[armorId] = armorRaw["#text"];
hullArmor.spaced.push(armorId);
}
}); });
const crew: Crew[] = []; const crew: Crew[] = [];
const fixedCamouflage = tankTags.includes("eventCamouflage_user"); const fixedCamouflage = tankTags.includes("eventCamouflage_user");
@@ -1151,13 +1161,7 @@ export async function definitions() {
const armorId = parseInt(armorIdString); const armorId = parseInt(armorIdString);
const armorRaw = turret.armor[name]; const armorRaw = turret.armor[name];
if (typeof armorRaw === "number") { assignArmor(armorRaw, armorId, turretArmor);
turretArmor.thickness[armorId] = armorRaw;
} else {
if (!turretArmor.spaced) turretArmor.spaced = [];
turretArmor.thickness[armorId] = armorRaw["#text"];
turretArmor.spaced.push(armorId);
}
}); });
turret.userString; turret.userString;
@@ -1288,13 +1292,8 @@ export async function definitions() {
} }
const armorId = parseInt(armorIdString); const armorId = parseInt(armorIdString);
const armorRaw = gun.armor[name]; const armorRaw = gun.armor[name];
if (typeof armorRaw === "number") {
gunArmor.thickness[armorId] = armorRaw; assignArmor(armorRaw, armorId, gunArmor);
} else {
if (!gunArmor.spaced) gunArmor.spaced = [];
gunArmor.thickness[armorId] = armorRaw["#text"];
gunArmor.spaced.push(armorId);
}
}); });
tankDefinitions.tanks[tankId].turrets[turretIndex].guns.push({ tankDefinitions.tanks[tankId].turrets[turretIndex].guns.push({