feat: burst data

packages/website/src/core/blitzkit/filterTank.ts

@@ -31,9 +31,8 @@ export function filterTank(filters: TankFilters, tank: TankDefinition) {
         SHELLS.every(
           (index) =>
             filters.shells[index] === null ||
-            gun.gun_type!.value.base.shells[index] === undefined ||
-            gun.gun_type!.value.base.shells[index].type ===
-              filters.shells[index],
+            gun.shells[index] === undefined ||
+            gun.shells[index].type === filters.shells[index],
         ),
       ),
     )

packages/website/src/core/blitzkit/resolveReload.ts

@@ -2,18 +2,16 @@ import type { GunDefinition } from '@blitzkit/core';
 
 export function resolveReload(gun: GunDefinition) {
   if (gun.gun_type!.$case === 'regular') {
-    return gun.gun_type!.value.extension.reload;
+    return gun.gun_type!.value.reload;
   } else if (gun.gun_type!.$case === 'auto_loader') {
     return (
-      gun.gun_type!.value.extension.clip_reload +
-      (gun.gun_type!.value.extension.shell_count - 1) *
-        gun.gun_type!.value.extension.intra_clip
+      gun.gun_type!.value.clip_reload +
+      (gun.gun_type!.value.shell_count - 1) * gun.gun_type!.value.intra_clip
     );
   } else {
     return (
-      gun.gun_type!.value.extension.shell_reloads.reduce((a, b) => a + b, 0) +
-      (gun.gun_type!.value.extension.shell_count - 1) *
-        gun.gun_type!.value.extension.intra_clip
+      gun.gun_type!.value.shell_reloads.reduce((a, b) => a + b, 0) +
+      (gun.gun_type!.value.shell_count - 1) * gun.gun_type!.value.intra_clip
     );
   }
 }

packages/website/src/core/blitzkit/tankCharacteristics.ts

@@ -80,8 +80,7 @@ export function tankCharacteristics(
 ) {
   const preset = equipmentDefinitions.presets[tank.equipment_preset];
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
-  const gunModelDefinition =
-    turretModelDefinition.guns[gun.gun_type!.value.base.id];
+  const gunModelDefinition = turretModelDefinition.guns[gun.id];
 
   function equipment(id: number) {
     return preset.slots.some((slot, index) => {
@@ -160,9 +159,8 @@ export function tankCharacteristics(
       [applySpallLiner && shell.type === ShellType.HE, -0.2],
     );
   const assaultDamageCoefficient =
-    gun.gun_type!.value.base.assault_ranges &&
-    gun.gun_type!.value.base.assault_ranges.types.includes(shell.type)
-      ? (gun.gun_type!.value.base.assault_ranges.ranges.find(
+    gun.assault_ranges && gun.assault_ranges.types.includes(shell.type)
+      ? (gun.assault_ranges.ranges.find(
           ({ distance }) => distance >= assaultDistance,
         )?.factor ?? 0)
       : 1;
@@ -322,18 +320,14 @@ export function tankCharacteristics(
     ),
   );
   const weightKg =
-    tank.weight +
-    engine.weight +
-    track.weight +
-    turret.weight +
-    gun.gun_type!.value.base.weight;
+    tank.weight + engine.weight + track.weight + turret.weight + gun.weight;
   const weightTons = weightKg / 1000;
   const stockWeight =
     tank.weight +
     stockEngine.weight +
     stockTrack.weight +
     stockTurret.weight +
-    stockGun.gun_type!.value.base.weight;
+    stockGun.weight;
   const resolvedEnginePower = engine.power * enginePowerCoefficient;
   const damageCoefficientWithoutAssault = armorDamageCoefficient;
   const damageCoefficient =
@@ -348,10 +342,10 @@ export function tankCharacteristics(
   const intraClip =
     gun.gun_type?.$case === 'regular'
       ? undefined
-      : gun.gun_type!.value.extension.intra_clip * intraClipCoefficient;
+      : gun.gun_type!.value.intra_clip * intraClipCoefficient;
   const mostOptimalShellIndex =
     gun.gun_type!.$case === 'auto_reloader'
-      ? gun.gun_type!.value.extension.shell_reloads.reduce<null | {
+      ? gun.gun_type!.value.shell_reloads.reduce<null | {
           index: number;
           reload: number;
         }>((current, reloadRaw, index) => {
@@ -369,43 +363,34 @@ export function tankCharacteristics(
   const damage = shell.armor_damage * damageCoefficient;
   const dpmEffective =
     gun.gun_type!.$case === 'auto_reloader'
-      ? gun.gun_type!.value.extension.shell_reloads[0] >
-        gun.gun_type!.value.extension.shell_reloads[1] +
-          gun.gun_type!.value.extension.intra_clip
+      ? gun.gun_type!.value.shell_reloads[0] >
+        gun.gun_type!.value.shell_reloads[1] + gun.gun_type!.value.intra_clip
         ? ((armorDamageCoefficient * shell.armor_damage) /
-            (gun.gun_type!.value.extension.shell_reloads.at(-1)! *
-              reloadCoefficient +
-              gun.gun_type!.value.extension.intra_clip *
-                intraClipCoefficient)) *
+            (gun.gun_type!.value.shell_reloads.at(-1)! * reloadCoefficient +
+              gun.gun_type!.value.intra_clip * intraClipCoefficient)) *
             (60 -
-              (gun.gun_type!.value.extension.shell_reloads.slice(0, -1).length -
-                1) *
-                gun.gun_type!.value.extension.intra_clip *
+              (gun.gun_type!.value.shell_reloads.slice(0, -1).length - 1) *
+                gun.gun_type!.value.intra_clip *
                 intraClipCoefficient) +
           armorDamageCoefficient *
             shell.armor_damage *
-            gun.gun_type!.value.extension.shell_reloads.slice(0, -1).length
+            gun.gun_type!.value.shell_reloads.slice(0, -1).length
         : ((armorDamageCoefficient * shell.armor_damage) /
-            (gun.gun_type!.value.extension.shell_reloads[0] *
-              reloadCoefficient +
-              gun.gun_type!.value.extension.intra_clip *
-                intraClipCoefficient)) *
+            (gun.gun_type!.value.shell_reloads[0] * reloadCoefficient +
+              gun.gun_type!.value.intra_clip * intraClipCoefficient)) *
             (60 -
-              (gun.gun_type!.value.extension.shell_reloads.slice(1).length -
-                1) *
-                gun.gun_type!.value.extension.intra_clip *
+              (gun.gun_type!.value.shell_reloads.slice(1).length - 1) *
+                gun.gun_type!.value.intra_clip *
                 intraClipCoefficient) +
           armorDamageCoefficient *
             shell.armor_damage *
-            gun.gun_type!.value.extension.shell_reloads.slice(1).length
+            gun.gun_type!.value.shell_reloads.slice(1).length
       : undefined;
   const shells =
-    gun.gun_type!.$case === 'regular'
-      ? 1
-      : gun.gun_type!.value.extension.shell_count;
+    gun.gun_type!.$case === 'regular' ? 1 : gun.gun_type!.value.shell_count;
   const shellReloads =
     gun.gun_type!.$case === 'auto_reloader'
-      ? gun.gun_type!.value.extension.shell_reloads.map(
+      ? gun.gun_type!.value.shell_reloads.map(
           (reload) => reload * reloadCoefficient,
         )
       : undefined;
@@ -413,30 +398,28 @@ export function tankCharacteristics(
     gun.gun_type!.$case === 'auto_reloader'
       ? undefined
       : (gun.gun_type!.$case === 'regular'
-          ? gun.gun_type!.value.extension.reload
-          : gun.gun_type!.value.extension.clip_reload) * reloadCoefficient;
+          ? gun.gun_type!.value.reload
+          : gun.gun_type!.value.clip_reload) * reloadCoefficient;
   const caliber = shell.caliber;
   const penetration = shell.penetration.near * penetrationCoefficient;
   const clipDamage =
     gun.gun_type!.$case === 'regular'
       ? undefined
-      : gun.gun_type!.value.extension.shell_count * damage;
+      : gun.gun_type!.value.shell_count * damage;
   const moduleDamage = shell.module_damage * moduleDamageCoefficient;
   const explosionRadius = shell.explosion_radius;
   const shellVelocity = shell.velocity * shellVelocityCoefficient;
-  const aimTime = gun.gun_type!.value.base.aim_time * aimTimeCoefficient;
-  const dispersion =
-    gun.gun_type!.value.base.dispersion_base * dispersionStillCoefficient;
+  const aimTime = gun.aim_time * aimTimeCoefficient;
+  const dispersion = gun.dispersion_base * dispersionStillCoefficient;
   const dispersionMoving = track.dispersion_move * dispersionMovingCoefficient;
   const dispersionHullTraversing =
     track.dispersion_traverse * dispersionHullTraverseCoefficient;
   const dispersionTurretTraversing =
-    gun.gun_type!.value.base.dispersion_traverse *
-    dispersionTurretTraverseCoefficient;
+    gun.dispersion_traverse * dispersionTurretTraverseCoefficient;
   const dispersionShooting =
-    gun.gun_type!.value.base.dispersion_shot * dispersionAfterShotCoefficient;
+    gun.dispersion_shot * dispersionAfterShotCoefficient;
   const dispersionGunDamaged =
-    gun.gun_type!.value.base.dispersion_damaged * dispersionDamagedCoefficient;
+    gun.dispersion_damaged * dispersionDamagedCoefficient;
   const gunDepression =
     gunModelDefinition.pitch.max +
     gunDefaultPitch +
@@ -478,8 +461,7 @@ export function tankCharacteristics(
     resolvedEnginePower / weightTons / softTerrainCoefficientRaw;
   const weight = weightTons;
   const turretTraverseSpeed = turret.traverse_speed * turretTraverseCoefficient;
-  const gunTraverseSpeed =
-    gun.gun_type!.value.base.rotation_speed * turretTraverseCoefficient;
+  const gunTraverseSpeed = gun.rotation_speed * turretTraverseCoefficient;
   /**
    * resistance_hard is used in all cases as this is the coefficient between
    * the absolute best coefficient and the current
@@ -511,14 +493,12 @@ export function tankCharacteristics(
       ? tank.camouflage_still * camouflageCoefficientStill
       : tank.camouflage_moving * camouflageCoefficientMoving;
   const camouflageShootingStill =
-    tank.camouflage_still *
-    gun.gun_type!.value.base.camouflage_loss *
-    camouflageCoefficientStill;
+    tank.camouflage_still * gun.camouflage_loss * camouflageCoefficientStill;
   const camouflageShootingMoving =
     (tank.class === TankClass.LIGHT
       ? tank.camouflage_still * camouflageCoefficientStill
       : tank.camouflage_moving * camouflageCoefficientMoving) *
-    gun.gun_type!.value.base.camouflage_loss;
+    gun.camouflage_loss;
   const camouflageCaughtOnFire =
     tank.camouflage_onFire * tank.camouflage_still * camouflageCoefficientStill;
   const width = size.z;
@@ -529,7 +509,7 @@ export function tankCharacteristics(
   const shellRicochet = isExplosive(shell.type) ? undefined : shell.ricochet;
   const crewCount = tank.crew.length;
   const shellRange = shell.range;
-  const shellCapacity = gun.gun_type!.value.base.shell_capacity;
+  const shellCapacity = gun.shell_capacity;
   const gunType = gun.gun_type!.$case;
   const penetrationAt250m = shell.penetration.far;
 

packages/website/src/core/blitzkit/tankToDuelMember.ts

@@ -23,11 +23,10 @@ export function tankToDuelMember(
     provisions: createDefaultProvisions(tank, gun, provisionDefinitions),
     engine: tank.engines.at(-1)!,
     gun,
-    shell: tank.turrets.at(-1)!.guns.at(-1)!.gun_type!.value.base.shells[0],
+    shell: tank.turrets.at(-1)!.guns.at(-1)!.shells[0],
     tank,
     track: tank.tracks.at(-1)!,
     turret,
-    assaultDistance:
-      (gun.gun_type!.value.base.assault_ranges?.ranges[0].distance ?? 0) / 2,
+    assaultDistance: (gun.assault_ranges?.ranges[0].distance ?? 0) / 2,
   } satisfies DuelMember;
 }