fix: consider shells

packages/core/src/protos/tank_definitions.ts

@@ -294,7 +294,7 @@ export interface TankDefinition {
   crew: Crew[];
   health: number;
   nation: string;
-  name: I18nString | undefined;
+  name: I18nString;
   type: TankType;
   max_consumables: number;
   max_provisions: number;

packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/AssaultRangesVisualizer/components/Cursor/index.tsx

@@ -2,7 +2,10 @@ import { DragHandleDots2Icon } from '@radix-ui/react-icons';
 import { Box, Flex, Text } from '@radix-ui/themes';
 import { useEffect, useRef, useState } from 'react';
 import { clamp } from 'three/src/math/MathUtils.js';
-import { fakeLogInverse } from '../../../../../../../../../core/blitzkit/fakeLog';
+import {
+  fakeLog,
+  fakeLogInverse,
+} from '../../../../../../../../../core/blitzkit/fakeLog';
 import { Var } from '../../../../../../../../../core/radix/var';
 import { Duel } from '../../../../../../../../../stores/duel';
 import './index.css';
@@ -13,7 +16,10 @@ interface Props {
 }
 
 export function AssaultCursor({ maxDistance, maxFakeDistance }: Props) {
-  const [x, setX] = useState(0.5);
+  const assaultDistance = Duel.use(
+    (state) => state.protagonist.assaultDistance,
+  );
+  const [x, setX] = useState(fakeLog(assaultDistance / maxDistance, 2));
   const cursor = useRef<HTMLDivElement>(null);
   const mutateDuel = Duel.useMutation();
 

packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx

@@ -120,7 +120,7 @@ export function Firepower({ stats }: StatsAcceptorProps) {
       <InfoWithDelta stats={stats} decimals={0} value="moduleDamage" />
       <InfoWithDelta stats={stats} decimals={0} value="penetration" />
 
-      {gun.gun_type!.value.base.assault_ranges && (
+      {gun.gun_type!.value.base.assault_ranges?.types.includes(shell.type) && (
         <AssaultRangesVisualizer
           stats={stats}
           ranges={gun.gun_type!.value.base.assault_ranges}

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

@@ -73,6 +73,9 @@ export function SceneProps() {
   const crewSkills = TankopediaEphemeral.use((state) => state.skills);
   const consumables = Duel.use((state) => state.protagonist.consumables);
   const provisions = Duel.use((state) => state.protagonist.provisions);
+  const assaultDistance = Duel.use(
+    (state) => state.protagonist.assaultDistance,
+  );
   const equipmentMatrix = Duel.use(
     (state) => state.protagonist.equipmentMatrix,
   );
@@ -96,7 +99,7 @@ export function SceneProps() {
       stockTurret: tank.turrets[0],
       stockTrack: tank.tracks[0],
       track,
-      assaultDistance: 0,
+      assaultDistance,
     },
     { equipmentDefinitions, provisionDefinitions, tankModelDefinition },
   );

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

@@ -159,12 +159,13 @@ export function tankCharacteristics(
       [applyDynamicArmor, -0.1],
       [applySpallLiner && shell.type === ShellType.HE, -0.2],
     );
-  const assaultDamageCoefficient = gun.gun_type!.value.base.assault_ranges
+  const assaultDamageCoefficient =
-    ? // && gun.gun_type!.value.base.assault_ranges.types.includes(shell.type)
+    gun.gun_type!.value.base.assault_ranges &&
-      (gun.gun_type!.value.base.assault_ranges.ranges.find(
+    gun.gun_type!.value.base.assault_ranges.types.includes(shell.type)
-        ({ distance }) => distance >= assaultDistance,
+      ? (gun.gun_type!.value.base.assault_ranges.ranges.find(
-      )?.factor ?? 0)
+          ({ distance }) => distance >= assaultDistance,
-    : 1;
+        )?.factor ?? 0)
+      : 1;
   const moduleDamageCoefficient =
     coefficient([hasTungsten, 0.15]) * assaultDamageCoefficient;
   const reloadCoefficient =

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

@@ -40,6 +40,7 @@ export function tankToDuelMember(
     yaw,
     pitch,
     turret,
-    assaultDistance: 0,
+    assaultDistance:
+      (gun.gun_type!.value.base.assault_ranges?.ranges[0].distance ?? 0) / 2,
   } satisfies DuelMember;
 }

packages/website/src/pages/[...locale]/compare/_index.tsx

@@ -85,7 +85,7 @@ function Content() {
                 member.key !== thisMember.key &&
                 member.provisions.includes(101),
             ),
-            assaultDistance: 0,
+            assaultDistance: thisMember.assaultDistance,
           },
           {
             equipmentDefinitions: equipmentDefinitions,