fix: some linting for new proto 6

packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx

@@ -1,16 +1,16 @@
-import { equipmentDefinitions } from '@blitzkit/core';
+import { fetchEquipmentDefinitions } from '@blitzkit/core';
 import { Button, Flex, Heading } from '@radix-ui/themes';
 import { Duel } from '../../../../stores/duel';
 import { EquipmentManager } from '../../../EquipmentManager';
 import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
 
-const awaitedEquipmentDefinitions = await equipmentDefinitions;
+const equipmentDefinitions = await fetchEquipmentDefinitions();
 
 export function Equipment() {
   const mutateDuel = Duel.useMutation();
   const protagonist = Duel.use((state) => state.protagonist);
   const equipmentPreset =
-    awaitedEquipmentDefinitions.presets[protagonist.tank.equipment];
+    equipmentDefinitions.presets[protagonist.tank.equipmentPreset];
   const equipmentMatrix = Duel.use(
     (state) => state.protagonist.equipmentMatrix,
   );

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/TankModel.tsx

@@ -28,7 +28,8 @@ export const TankModel = memo(() => {
   const tankModelDefinition = useTankModelDefinition();
   const turretModelDefinition =
     tankModelDefinition.turrets[protagonist.turret.id];
-  const gunModelDefinition = turretModelDefinition.guns[protagonist.gun.id];
+  const gunModelDefinition =
+    turretModelDefinition.guns[protagonist.gun.gunType!.value.base.id];
   const { gltf } = useModel(protagonist.tank.id);
   const nodes = Object.values(gltf.nodes);
   const isDynamicArmorActive = Duel.use((state) =>
@@ -135,7 +136,7 @@ export const TankModel = memo(() => {
           const isTurret = node.name.startsWith('turret_');
           const isCurrentTurret =
             node.name ===
-            `turret_${turretModelDefinition.model.toString().padStart(2, '0')}`;
+            `turret_${turretModelDefinition.modelId.toString().padStart(2, '0')}`;
           const isVisible = isCurrentTurret;
           const position = new Vector2();
           const delta = new Vector2();
@@ -168,7 +169,7 @@ export const TankModel = memo(() => {
             const duel = duelStore.getState();
             const hasImprovedVerticalStabilizer = await hasEquipment(
               122,
-              duel.protagonist.tank.equipment,
+              duel.protagonist.tank.equipmentPreset,
               duel.protagonist.equipmentMatrix,
             );
             const boundingRect = canvas.getBoundingClientRect();
@@ -231,12 +232,12 @@ export const TankModel = memo(() => {
           {nodes.map((node) => {
             const isCurrentMantlet =
               node.name ===
-              `gun_${gunModelDefinition.model
+              `gun_${gunModelDefinition.modelId
                 .toString()
                 .padStart(2, '0')}_mask`;
             const isCurrentGun =
               node.name ===
-              `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`;
+              `gun_${gunModelDefinition.modelId.toString().padStart(2, '0')}`;
             const isVisible = isCurrentGun || isCurrentMantlet;
             const position = new Vector2();
             const delta = new Vector2();
@@ -268,7 +269,7 @@ export const TankModel = memo(() => {
               const duel = duelStore.getState();
               const hasImprovedVerticalStabilizer = await hasEquipment(
                 122,
-                duel.protagonist.tank.equipment,
+                duel.protagonist.tank.equipmentPreset,
                 duel.protagonist.equipmentMatrix,
               );
               const boundingRect = canvas.getBoundingClientRect();

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx

@@ -44,7 +44,8 @@ export const TankSandbox = forwardRef<HTMLCanvasElement, TankSandboxProps>(
     const tankModelDefinition = useTankModelDefinition();
     const turretModelDefinition =
       tankModelDefinition.turrets[protagonist.turret.id];
-    const gunModelDefinition = turretModelDefinition.guns[protagonist.gun.id];
+    const gunModelDefinition =
+      turretModelDefinition.guns[protagonist.gun.gunType!.value.base.id];
     const display = TankopediaPersistent.useDeferred(
       (state) => state.display,
       TankopediaDisplay.Model,
@@ -185,7 +186,6 @@ export const TankSandbox = forwardRef<HTMLCanvasElement, TankSandboxProps>(
         <ArmorPlateDisplay />
         <AutoClear />
 
-        {/* idk why the shot display doesn't work without suspense here lol */}
         <Suspense fallback={<ModelLoader />}>
           {display === TankopediaDisplay.DynamicArmor && <Armor />}
           {display === TankopediaDisplay.StaticArmor && (

packages/website/src/components/Tankopedia/HeroSection/index.tsx

@@ -1,6 +1,6 @@
 import { fetchTankDefinitions, TankType } from '@blitzkit/core';
 import { Box, Flex, Heading, Text } from '@radix-ui/themes';
-import { Suspense, useEffect, useMemo, useRef } from 'react';
+import { Suspense, useMemo, useRef } from 'react';
 import { NAVBAR_HEIGHT } from '../../../constants/navbar';
 import { Var } from '../../../core/radix/var';
 import { useFullScreen } from '../../../hooks/useFullScreen';
@@ -44,10 +44,6 @@ export function HeroSection() {
     return { value } satisfies ThicknessRange;
   }, [protagonist]);
 
-  useEffect(() => {
-    // setDummyLoader(false);
-  }, []);
-
   return (
     <Flex justify="center" style={{ backgroundColor: Var('color-surface') }}>
       <Flex

packages/website/src/components/Tankopedia/MetaSection/index.tsx

@@ -199,10 +199,12 @@ export function MetaSection() {
                 />
               </Flex>
             </Listing>
-            {protagonist.xp && (
+            {protagonist.researchCost && (
               <Listing label="Research XP">
                 <Flex align="center" gap="1">
-                  {protagonist.xp.toLocaleString()}
+                  {(
+                    protagonist.researchCost.researchCostType!.value as number
+                  ).toLocaleString()}
                   <img
                     style={{ width: '1em', height: '1em' }}
                     alt="xp"