fix: some linting for new proto 4

packages/website/src/hooks/useEquipment.ts

@@ -1,31 +1,31 @@
-import { equipmentDefinitions } from '@blitzkit/core';
+import { fetchEquipmentDefinitions } from '@blitzkit/core';
 import { useMemo } from 'react';
 import { Duel } from '../stores/duel';
 
-const awaitedEquipmentDefinitions = await equipmentDefinitions;
+const equipmentDefinitions = await fetchEquipmentDefinitions();
 
 export function useEquipment(id: number, antagonist = false) {
   const member = Duel.use(
     (state) => state[antagonist ? 'antagonist' : 'protagonist']!,
   );
-  const equipmentRows =
-    awaitedEquipmentDefinitions.presets[member.tank.equipment];
+  const preset = equipmentDefinitions.presets[member.tank.equipmentPreset];
   const equipmentMatrix = Duel.use(
     (state) =>
       state[antagonist ? 'antagonist' : 'protagonist']!.equipmentMatrix,
   );
-  const value = useMemo(
-    () =>
-      equipmentRows.some((equipmentRow, rowIndex) => {
-        return equipmentRow.some((equipment, columnIndex) => {
-          const choice = equipmentMatrix[rowIndex][columnIndex];
-          if (choice === 0) return false;
-          const equipped = equipment[choice === -1 ? 0 : 1];
-          return equipped === id;
-        });
-      }),
-    [equipmentMatrix, member.tank],
-  );
+  const value = useMemo(() => {
+    return preset.slots.some((slot, index) => {
+      const row = Math.floor(index / 3);
+      const column = index % 3;
+      const choice = equipmentMatrix[row][column];
+
+      if (choice === 0) return false;
+
+      const equipped = slot[choice === -1 ? 'left' : 'right'];
+
+      return equipped === id;
+    });
+  }, [equipmentMatrix, member.tank]);
 
   return value;
 }

packages/website/src/hooks/useProvision.ts

@@ -1,4 +1,4 @@
-import * as Duel from '../stores/duel';
+import { Duel } from '../stores/duel';
 
 export function useProvision(id: number) {
   const provisions = Duel.use((state) => state.protagonist.provisions);

packages/website/src/hooks/useTankTransform.ts

@@ -52,12 +52,16 @@ export function useTankTransform(
         .applyAxisAngle(new Vector3(0, 0, 1), yaw);
       turretRotation.set(0, 0, yaw);
 
-      if (tankModelDefinition.turretRotation) {
+      if (tankModelDefinition.initialTurretRotation) {
         const initialPitch = -degToRad(
-          tankModelDefinition.turretRotation.pitch,
+          tankModelDefinition.initialTurretRotation.pitch,
+        );
+        const initialYaw = -degToRad(
+          tankModelDefinition.initialTurretRotation.yaw,
+        );
+        const initialRoll = -degToRad(
+          tankModelDefinition.initialTurretRotation.roll,
         );
-        const initialYaw = -degToRad(tankModelDefinition.turretRotation.yaw);
-        const initialRoll = -degToRad(tankModelDefinition.turretRotation.roll);
 
         turretPosition
           .applyAxisAngle(I_HAT, initialPitch)