fix: some linting for new proto 6

packages/website/src/components/Armor/components/PrimaryArmorScene.tsx

@@ -24,7 +24,8 @@ export const PrimaryArmorScene = memo(() => {
   const tankModelDefinition = useTankModelDefinition();
   const trackModelDefinition = tankModelDefinition.tracks[track.id];
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
-  const gunModelDefinition = turretModelDefinition.guns[gun.id];
+  const gunModelDefinition =
+    turretModelDefinition.guns[gun.gunType!.value.base.id];
   const hullOrigin = correctZYTuple(trackModelDefinition.origin);
   const turretOrigin = correctZYTuple(tankModelDefinition.turretOrigin);
   const gunOrigin = correctZYTuple(turretModelDefinition.gunOrigin);
@@ -68,7 +69,7 @@ export const PrimaryArmorScene = memo(() => {
       <group ref={turretContainer}>
         {armorNodes.map((node) => {
           const isCurrentTurret = node.name.startsWith(
-            `turret_${turretModelDefinition.model.toString().padStart(2, '0')}`,
+            `turret_${turretModelDefinition.modelId.toString().padStart(2, '0')}`,
           );
           const isVisible = isCurrentTurret;
           const armorId = nameToArmorId(node.name);
@@ -102,7 +103,7 @@ export const PrimaryArmorScene = memo(() => {
         <group ref={gunContainer}>
           {armorNodes.map((node) => {
             const isCurrentGun = node.name.startsWith(
-              `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`,
+              `gun_${gunModelDefinition.modelId.toString().padStart(2, '0')}`,
             );
             const isVisible = isCurrentGun;
             const armorId = nameToArmorId(node.name);

packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx

@@ -2,7 +2,6 @@ import {
   type ShellDefinition,
   canSplash,
   isExplosive,
-  resolveNearPenetration,
   resolvePenetrationCoefficient,
 } from '@blitzkit/core';
 import { useFrame } from '@react-three/fiber';
@@ -69,7 +68,7 @@ export function PrimaryArmorSceneComponent({
       );
       material.uniforms.isExplosive.value = isExplosive(shell.type);
       material.uniforms.canSplash.value = canSplash(shell.type);
-      material.uniforms.damage.value = shell.damage.armor;
+      material.uniforms.damage.value = shell.armorDamage;
       material.uniforms.explosionRadius.value = shell.explosionRadius;
 
       const duel = duelStore.getState();
@@ -91,7 +90,7 @@ export function PrimaryArmorSceneComponent({
       const duel = duelStore.getState();
       const hasEnhancedArmor = await hasEquipment(
         110,
-        duel.protagonist.tank.equipment,
+        duel.protagonist.tank.equipmentPreset,
         equipment,
       );
       material.uniforms.thickness.value = hasEnhancedArmor
@@ -101,10 +100,10 @@ export function PrimaryArmorSceneComponent({
     async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
       const duel = duelStore.getState();
       const shell = duel.antagonist.shell;
-      const penetration = resolveNearPenetration(shell.penetration);
+      const penetration = shell.penetration.near;
       const hasCalibratedShells = await hasEquipment(
         103,
-        duel.antagonist.tank.equipment,
+        duel.antagonist.tank.equipmentPreset,
         equipment,
       );
 

packages/website/src/components/Armor/components/SpacedArmorScene.tsx

@@ -37,7 +37,8 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
   const tankModelDefinition = useTankModelDefinition();
   const trackModelDefinition = tankModelDefinition.tracks[track.id];
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
-  const gunModelDefinition = turretModelDefinition.guns[gun.id];
+  const gunModelDefinition =
+    turretModelDefinition.guns[gun.gunType!.value.base.id];
   const hullOrigin = correctZYTuple(trackModelDefinition.origin);
   const turretOrigin = correctZYTuple(tankModelDefinition.turretOrigin);
   const gunOrigin = correctZYTuple(turretModelDefinition.gunOrigin);
@@ -105,7 +106,7 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
       <group ref={turretContainer}>
         {armorNodes.map((node) => {
           const isCurrentTurret = node.name.startsWith(
-            `turret_${turretModelDefinition.model.toString().padStart(2, '0')}`,
+            `turret_${turretModelDefinition.modelId.toString().padStart(2, '0')}`,
           );
           const isVisible = isCurrentTurret;
           const armorId = nameToArmorId(node.name);
@@ -140,7 +141,7 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
         <group ref={gunContainer}>
           {armorNodes.map((node) => {
             const isCurrentGun = node.name.startsWith(
-              `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`,
+              `gun_${gunModelDefinition.modelId.toString().padStart(2, '0')}`,
             );
             const isVisible = isCurrentGun;
             const armorId = nameToArmorId(node.name);
@@ -172,7 +173,7 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
           })}
 
           {modelNodes.map((node) => {
-            const gunString = `gun_${gunModelDefinition.model
+            const gunString = `gun_${gunModelDefinition.modelId
               .toString()
               .padStart(2, '0')}`;
             const isCurrentGun = gunModelDefinition.mask

packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx

@@ -1,6 +1,5 @@
 import {
   isExplosive,
-  resolveNearPenetration,
   resolvePenetrationCoefficient,
   type ShellDefinition,
 } from '@blitzkit/core';
@@ -54,9 +53,7 @@ export function SpacedArmorSubSpaced({
 
   useEffect(() => {
     function handleShellChange(shell: ShellDefinition) {
-      material.uniforms.penetration.value = resolveNearPenetration(
-        shell.penetration,
-      );
+      material.uniforms.penetration.value = shell.penetration.near;
       material.uniforms.caliber.value = shell.caliber;
       material.uniforms.ricochet.value = degToRad(
         isExplosive(shell.type) ? 90 : shell.ricochet!,
@@ -71,7 +68,7 @@ export function SpacedArmorSubSpaced({
       const duel = duelStore.getState();
       const hasEnhancedArmor = await hasEquipment(
         110,
-        duel.protagonist.tank.equipment,
+        duel.protagonist.tank.equipmentPreset,
         equipment,
       );
       material.uniforms.thickness.value = hasEnhancedArmor
@@ -81,10 +78,10 @@ export function SpacedArmorSubSpaced({
     async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
       const duel = duelStore.getState();
       const shell = duelStore.getState().antagonist.shell;
-      const penetration = resolveNearPenetration(shell.penetration);
+      const penetration = shell.penetration.near;
       const hasCalibratedShells = await hasEquipment(
         103,
-        duel.antagonist.tank.equipment,
+        duel.antagonist.tank.equipmentPreset,
         equipment,
       );
 

packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx

@@ -1,7 +1,6 @@
 import {
   ShellType,
   isExplosive,
-  resolveNearPenetration,
   resolvePenetrationCoefficient,
 } from '@blitzkit/core';
 import { useThree } from '@react-three/fiber';
@@ -104,16 +103,16 @@ export function SpacedArmorSceneComponent({
 
       const hasCalibratedShells = await hasEquipment(
         103,
-        antagonist.tank.equipment,
+        antagonist.tank.equipmentPreset,
         antagonist.equipmentMatrix,
       );
       const hasEnhancedArmor = await hasEquipment(
         110,
-        protagonist.tank.equipment,
+        protagonist.tank.equipmentPreset,
         protagonist.equipmentMatrix,
       );
       const penetration =
-        resolveNearPenetration(shell.penetration) *
+        shell.penetration.near *
         resolvePenetrationCoefficient(hasCalibratedShells, shell.type);
       const thicknessCoefficient = hasEnhancedArmor ? 1.03 : 1;
       const filteredIntersections = intersections.filter(
@@ -289,7 +288,7 @@ export function SpacedArmorSceneComponent({
           const finalDamage = Math.max(
             0,
             0.5 *
-              shell.damage.armor *
+              shell.armorDamage *
               (1 - distanceFromSpacedArmor / shell.explosionRadius!) -
               1.1 *
                 (lastLayer.thicknessAngled +
@@ -312,7 +311,7 @@ export function SpacedArmorSceneComponent({
             shot.damage = finalDamage;
           } else {
             shot.in.status = 'penetration';
-            shot.damage = shell.damage.armor;
+            shot.damage = shell.armorDamage;
           }
         } else {
           if (lastLayer.status === 'blocked') {
@@ -320,7 +319,7 @@ export function SpacedArmorSceneComponent({
             shot.damage = 0;
           } else if (lastLayer.status === 'penetration') {
             shot.in.status = 'penetration';
-            shot.damage = shell.damage.armor;
+            shot.damage = shell.armorDamage;
           } else {
             const caster = new Raycaster();
             // https://math.stackexchange.com/a/13263/1222875