Merge branch 'main' into ue4

2026-10-23 19:49:50 +02:00 · 2025-08-15 12:40:17 -05:00
commit 8478930f2e
@@ -1,6 +1,5 @@
 // @ts-check

-import partytown from '@astrojs/partytown';
 import react from '@astrojs/react';
 import sitemap from '@astrojs/sitemap';
 import { SUPPORTED_LOCALES } from '@blitzkit/i18n';
@@ -21,7 +20,7 @@ export default defineConfig({
  outDir: '../../dist/website',
  prefetch: true,

-  integrations: [react(), sitemap(), partytown()],
+  integrations: [react(), sitemap()],
  vite: {
    resolve: {
      alias: {
@@ -1,3 +1,5 @@
+precision mediump float;
+
 #define USE_FOG

 #include <fog_pars_fragment>
@@ -1,3 +1,5 @@
+precision mediump float;
+
 #define USE_FOG

 #include <fog_pars_vertex>
@@ -1,3 +1,5 @@
+precision mediump float;
+
 uniform float thickness;
 uniform float penetration;

@@ -1,3 +1,5 @@
+precision mediump float;
+
 #include <clipping_planes_pars_vertex>

 void main() {
@@ -1,3 +1,5 @@
+precision mediump float;
+
 varying vec3 vNormal;
 varying vec3 vViewPosition;

@@ -1,3 +1,5 @@
+precision mediump float;
+
 varying vec3 vNormal;
 varying vec3 vViewPosition;

@@ -79,6 +79,12 @@ export function Body({ stats }: BodyProps) {

      <Table.Body>
        <CompareRow stats={stats} value="dpm" decimals={0} />
+        <CompareRow stats={stats} value="damage" decimals={0} />
+        {hasNonRegularGun && (
+          <CompareRow stats={stats} indent value="clipDamage" decimals={0} />
+        )}
+        <CompareRow stats={stats} value="moduleDamage" decimals={0} />
+        <CompareRow stats={stats} value="penetration" decimals={0} />
        <CompareRow
          stats={stats}
          name={strings.website.tools.tankopedia.characteristics.values.reload}
@@ -105,12 +111,6 @@ export function Body({ stats }: BodyProps) {
            <CompareRow stats={stats} value="shells" decimals={0} />
          </>
        )}
-        <CompareRow stats={stats} value="penetration" decimals={0} />
-        <CompareRow stats={stats} value="damage" decimals={0} />
-        {hasNonRegularGun && (
-          <CompareRow stats={stats} indent value="clipDamage" decimals={0} />
-        )}
-        <CompareRow stats={stats} value="moduleDamage" decimals={0} />
        <CompareRow stats={stats} value="caliber" decimals={0} />
        <CompareRow stats={stats} value="shellNormalization" decimals={0} />
        <CompareRow
@@ -127,8 +127,8 @@ const strings = getStrings(locale);
    </Flex>
  </Flex>

-  <Flex gap="5" display={{ initial: 'flex', sm: 'none' }}>
-    <Flex direction="column" justify="between" align="end">
+  <Flex gap="5" display={{ initial: 'flex', sm: 'none' }} width="100%">
+    <Flex direction="column" gap="1" flexGrow="1" flexBasis="0" align="end">
      <Text size="2" color="gray">BlitzKit</Text>
      {
        PUBLIC_ASSET_BRANCH !== 'preview' && (
@@ -140,7 +140,7 @@ const strings = getStrings(locale);
      <Text size="2" color="gray">CDN</Text>
    </Flex>

-    <Flex direction="column" justify="between" align="start">
+    <Flex direction="column" gap="1" flexGrow="1" flexBasis="0" align="start">
      <Code size="2" color="gray">
        {packageJson.version}
      </Code>
@@ -17,7 +17,7 @@ export interface Props {
  integrated?: boolean;
 }

-const { integrated } = Astro.props;
+const { integrated = false } = Astro.props;
 const toolsFiltered = TOOLS.filter((tool) => !('href' in tool));
 const { locale } = Astro.params;
 const branchName = resolveBranchName(locale);
@@ -47,7 +47,7 @@ const strings = getStrings(locale);
    height: 100%;
  }

-  .navbar[data-expanded='false'] .content {
+  .navbar[data-expanded='false'][data-integrated='false'] .content {
    background-color: var(--black-a8);
    backdrop-filter: blur(4rem);
    box-shadow: var(--shadow-3);
@@ -87,6 +87,7 @@ const strings = getStrings(locale);
  direction="column"
  align="center"
  data-expanded="false"
+  data-integrated={`${integrated}`}
  className="navbar"
  width="100%"
  top="0"
@@ -232,7 +233,7 @@ const strings = getStrings(locale);
                <Box
                  style={{
                    borderRadius: Var('radius-2'),
-                    backgroundImage: `url(/assets/images/${tool.id}.webp)`,
+                    backgroundImage: `url(/assets/images/tools/${tool.id}.webp)`,
                    backgroundSize: '200%',
                    backgroundPosition: 'right center',
                  }}
@@ -6,42 +6,20 @@ const PUBLIC_GOOGLE_TAG_MANAGER_ID = assertSecret(
 );
 ---

-{/* google analytics */}
 <script
  is:inline
  async
-  type="text/partytown"
  src={`https://www.googletagmanager.com/gtag/js?id=${PUBLIC_GOOGLE_TAG_MANAGER_ID}`}
 ></script>
-<script
-  is:inline
-  define:vars={{ PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  type="text/partytown"
->
+
+<script is:inline define:vars={{ PUBLIC_GOOGLE_TAG_MANAGER_ID }}>
  window.dataLayer = window.dataLayer || [];

  function gtag() {
    dataLayer.push(arguments);
  }
+
  gtag('js', new Date());
+
  gtag('config', PUBLIC_GOOGLE_TAG_MANAGER_ID);
 </script>
-
-{/* nitro ads */}
-{
-  /*
-<script is:inline data-cfasync="false">
-  window.nitroAds = window.nitroAds || {
-    createAd: function () {
-      return new Promise((e) => {
-        window.nitroAds.queue.push(['createAd', arguments, e]);
-      });
-    },
-    addUserToken: function () {
-      window.nitroAds.queue.push(['addUserToken', arguments]);
-    },
-    queue: [],
-  };
-</script>
-*/
-}
@@ -80,7 +80,7 @@ export const TankCard = forwardRef<HTMLSpanElement, TankCardProps>(
        >
          <img
            alt={unwrap(tank.name)}
-            src={asset(`icons/tanks/blitzkit/${tank.id}.webp`)}
+            src={asset(`icons/tanks/big/${tank.id}.webp`)}
            className="image"
            draggable={false}
          />
@@ -27,6 +27,7 @@ export function TankSearchCard({ tank, onSelect }: TankSearchCardProps) {
    const gun = turret.guns.at(-1)!;
    const shell0 = gun.gun_type!.value.base.shells[0];
    const shell1 = gun.gun_type!.value.base.shells[1];
+    const shell2 = gun.gun_type!.value.base.shells[2];
    const tracks = tank.tracks.at(-1)!;
    const engine = tank.engines.at(-1)!;
    const tankModelDefinition = modelDefinitions.models[tank.id];
@@ -57,6 +58,8 @@ export function TankSearchCard({ tank, onSelect }: TankSearchCardProps) {
        return shell0.penetration.near.toFixed(0);
      case 'fire.premiumPenetration':
        return shell1 ? shell1.penetration.near.toFixed(0) : '--';
+      case 'fire.tertiaryPenetration':
+        return shell1 ? shell2.penetration.near.toFixed(0) : '--';
      case 'fire.shellVelocity':
        return shell0.velocity.toFixed(0);
      case 'fire.shellCapacity':
@@ -84,6 +84,7 @@ function ShellFilter({ index, premium }: { index: number; premium?: boolean }) {

              return (
                <IconButton
+                  key={shellType}
                  value={`${shellType}`}
                  radius="none"
                  variant={selected ? 'solid' : 'soft'}
@@ -21,27 +21,17 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) {
  const input = useRef<HTMLInputElement>(null);
  const performSearch = useCallback(
    debounce(() => {
-      // tankFiltersStore.setState({ searching: false });
      $tankFilters.setKey('searching', false);

      if (!input.current) return;

      const sanitized = input.current.value.trim();

-      // tankFiltersStore.setState({
-      //   search: sanitized.length === 0 ? undefined : sanitized,
-      // });
-      $tankFilters.setKey(
-        'search',
-        sanitized.length === 0 ? undefined : sanitized,
-      );
+      $tankFilters.setKey('search', sanitized.length === 0 ? null : sanitized);
    }, 500),
    [],
  );
  const handleChange = useCallback(() => {
-    // if (!tankFiltersStore.getState().searching) {
-    //   tankFiltersStore.setState({ searching: true });
-    // }
    if (!tankFilters.searching) {
      $tankFilters.setKey('searching', true);
    }
@@ -69,7 +59,7 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) {
        <TextField.Root
          variant="classic"
          disabled={skeleton}
-          defaultValue={tankFilters.search}
+          defaultValue={tankFilters.search ?? undefined}
          style={{ flex: 1 }}
          ref={input}
          placeholder={strings.website.common.tank_search.search_bar_hint}
@@ -63,6 +63,7 @@ export function Sort() {
            <Item by="fire.caliber" />
            <Item by="fire.standardPenetration" />
            <Item by="fire.premiumPenetration" />
+            <Item by="fire.tertiaryPenetration" />
            <Item by="fire.damage" />
            <Item by="fire.moduleDamage" />
            <Item by="fire.shellVelocity" />
@@ -60,7 +60,7 @@ export const TankSearch = memo<TankSearchProps>(
    const tankFilters = useStore($tankFilters);
    const tankopediaSort = useStore($tankopediaSort);
    const tanksFiltered = useMemo(() => {
-      if (tankFilters.search === undefined) {
+      if (tankFilters.search === null) {
        const filtered = awaitedTanksDefinitionsArray.filter((tank) =>
          filterTank(tankFilters, tank),
        );
@@ -238,6 +238,16 @@ export const TankSearch = memo<TankSearchProps>(
            );
            break;

+          case 'fire.tertiaryPenetration':
+            sorted = filtered.sort(
+              (a, b) =>
+                (a.turrets.at(-1)!.guns.at(-1)!.gun_type!.value.base.shells[2]
+                  ?.penetration.near ?? 0) -
+                (b.turrets.at(-1)!.guns.at(-1)!.gun_type!.value.base.shells[2]
+                  ?.penetration.near ?? 0),
+            );
+            break;
+
          case 'fire.damage':
            sorted = filtered.sort(
              (a, b) =>
@@ -0,0 +1,7 @@
+#assault-cursor {
+  cursor: grab;
+}
+
+#assault-cursor:active {
+  cursor: grabbing;
+}
@@ -0,0 +1,123 @@
+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 {
+  fakeLogSquishyHigh,
+  fakeLogSquishyHighInverse,
+} from '../../../../../../../../../core/blitzkit/fakeLog';
+import { Var } from '../../../../../../../../../core/radix/var';
+import { Duel } from '../../../../../../../../../stores/duel';
+import './index.css';
+
+interface Props {
+  maxDistance: number;
+  maxFakeDistance: number;
+}
+
+export function AssaultCursor({ maxDistance, maxFakeDistance }: Props) {
+  const assaultDistance = Duel.use(
+    (state) => state.protagonist.assaultDistance,
+  );
+  const [x, setX] = useState(fakeLogSquishyHigh(assaultDistance / maxDistance));
+  const cursor = useRef<HTMLDivElement>(null);
+  const mutateDuel = Duel.useMutation();
+
+  useEffect(() => {
+    let localX = x;
+    let lastX = 0;
+
+    function handlePointerDown(event: PointerEvent) {
+      event.preventDefault();
+
+      lastX = event.clientX;
+
+      window.addEventListener('pointermove', handlePointerMove);
+      window.addEventListener('pointerup', handlePointerUp);
+    }
+
+    function handlePointerMove(event: PointerEvent) {
+      event.preventDefault();
+
+      const parent = cursor.current?.parentElement;
+
+      if (!parent) return;
+
+      const width = parent.clientWidth;
+      const movementX = event.clientX - lastX;
+      lastX = event.clientX;
+
+      setX((state) => {
+        localX = clamp(state + movementX / width, 0, 1);
+        return localX;
+      });
+    }
+
+    function handlePointerUp() {
+      mutateDuel((draft) => {
+        draft.protagonist.assaultDistance =
+          fakeLogSquishyHighInverse(localX * maxFakeDistance) * maxDistance;
+      });
+
+      window.removeEventListener('pointermove', handlePointerMove);
+      window.removeEventListener('pointerup', handlePointerUp);
+    }
+
+    cursor.current?.addEventListener('pointerdown', handlePointerDown);
+
+    return () => {
+      cursor.current?.removeEventListener('pointerdown', handlePointerDown);
+      window.removeEventListener('pointermove', handlePointerMove);
+      window.removeEventListener('pointerup', handlePointerUp);
+    };
+  }, []);
+
+  return (
+    <Box
+      ref={cursor}
+      position="absolute"
+      top="0"
+      left={`${x * 100}%`}
+      height="100%"
+      width="2pt"
+      id="assault-cursor"
+      style={{
+        touchAction: 'none',
+        transform: 'translateX(-50%)',
+        backgroundColor: Var('accent-11'),
+      }}
+    >
+      <Flex
+        align="center"
+        direction="column"
+        position="absolute"
+        left="50%"
+        bottom="100%"
+        style={{ transform: 'translateX(-50%)' }}
+      >
+        <Flex
+          align="center"
+          justify="center"
+          style={{
+            width: '1.5rem',
+            height: '1.5rem',
+            backgroundColor: Var('accent-9'),
+            borderRadius: `50% 50% ${Var('radius-1')} ${Var('radius-1')}`,
+          }}
+        >
+          <Text style={{ display: 'flex' }} highContrast color="purple">
+            <DragHandleDots2Icon />
+          </Text>
+        </Flex>
+
+        <Box
+          height="0.5rem"
+          width="2pt"
+          style={{
+            backgroundColor: Var('accent-11'),
+          }}
+        />
+      </Flex>
+    </Box>
+  );
+}
@@ -0,0 +1,157 @@
+import type { AssaultRanges } from '@blitzkit/core';
+import { literals } from '@blitzkit/i18n';
+import { Box, Card, Flex, Text } from '@radix-ui/themes';
+import { clamp } from 'three/src/math/MathUtils.js';
+import {
+  fakeLogSquishyHigh,
+  fakeLogSquishyLow,
+} from '../../../../../../../core/blitzkit/fakeLog';
+import type { TankCharacteristics } from '../../../../../../../core/blitzkit/tankCharacteristics';
+import { Var } from '../../../../../../../core/radix/var';
+import { useLocale } from '../../../../../../../hooks/useLocale';
+import { AssaultCursor } from './components/Cursor';
+
+interface Props {
+  ranges: AssaultRanges;
+  stats: TankCharacteristics;
+}
+
+export function AssaultRangesVisualizer({ ranges: _ranges, stats }: Props) {
+  const maxDistance = _ranges.ranges.at(-1)!.distance;
+  const ranges = _ranges.ranges.map((range) => ({
+    factor: range.factor,
+    distance: range.distance,
+    fakeDistance: fakeLogSquishyHigh(range.distance / maxDistance),
+  }));
+  const maxFakeDistance = ranges.at(-1)!.fakeDistance;
+  const maxFactor = ranges[0].factor;
+
+  const { strings } = useLocale();
+
+  return (
+    <Card mb="6" variant="classic" style={{ aspectRatio: '1 / 1' }}>
+      <Flex
+        position="absolute"
+        top="0"
+        left="0"
+        width="100%"
+        height="100%"
+        direction="column"
+      >
+        <Text m="3" size="2" color="gray">
+          {strings.website.tools.tankopedia.visualizers.assault.title}
+        </Text>
+
+        <Flex
+          direction="column"
+          p="3"
+          pt="8"
+          pr="5"
+          style={{ backgroundColor: Var('gray-1') }}
+          flexGrow="1"
+        >
+          <Flex flexGrow="1">
+            <Box position="relative" width={Var('space-8')}>
+              {ranges.map((range, index) => (
+                <Text
+                  key={index}
+                  style={{
+                    position: 'absolute',
+                    left: 0,
+                    bottom: `${fakeLogSquishyLow(range.factor / maxFactor) * 100}%`,
+                    transform: 'translateY(50%)',
+                  }}
+                  color="gray"
+                  size="1"
+                  wrap="nowrap"
+                >
+                  {literals(strings.common.units.hp, [
+                    `${Math.round(stats.damageWithoutAssault * range.factor)}`,
+                  ])}
+                </Text>
+              ))}
+            </Box>
+
+            <Flex flexGrow="1" align="end" position="relative">
+              {ranges.map((range, index) => {
+                const mix =
+                  clamp(2 * (range.factor / maxFactor - 1) + 1, 0, 1) * 100;
+                const color0 = `color-mix(in hsl, ${Var('tomato-9')}, ${Var('jade-9')} ${mix}%)`;
+                const color1 = `color-mix(in hsl, ${Var('tomato-7')}, ${Var('jade-7')} ${mix}%)`;
+                const last = ranges[index - 1];
+                const lastFakeDistance = last?.fakeDistance ?? 0;
+                const fakeWidth = range.fakeDistance - lastFakeDistance;
+                const fraction = fakeWidth / ranges.at(-1)!.fakeDistance;
+
+                return (
+                  <Box
+                    width={`${fraction * 100}%`}
+                    height={`${fakeLogSquishyLow(range.factor / maxFactor) * 100}%`}
+                    style={{
+                      background: `linear-gradient(45deg, ${color1}, ${color0})`,
+                    }}
+                    key={index}
+                  />
+                );
+              })}
+
+              {ranges.map((range, index) => (
+                <Box
+                  key={index}
+                  position="absolute"
+                  left="0"
+                  bottom={`${fakeLogSquishyLow(range.factor / maxFactor) * 100}%`}
+                  width="100%"
+                  height="1pt"
+                  style={{
+                    transform: 'translateY(50%)',
+                    backgroundColor: Var('gray-11'),
+                  }}
+                />
+              ))}
+
+              <AssaultCursor
+                maxDistance={maxDistance}
+                maxFakeDistance={maxFakeDistance}
+              />
+            </Flex>
+          </Flex>
+
+          <Flex ml="8" height={Var('space-7')}>
+            {ranges.map((range, index) => {
+              const last = ranges[index - 1];
+              const lastFakeDistance = last?.fakeDistance ?? 0;
+              const fakeWidth = range.fakeDistance - lastFakeDistance;
+              const fraction = fakeWidth / ranges.at(-1)!.fakeDistance;
+
+              return (
+                <Box
+                  position="relative"
+                  key={index}
+                  width={`${fraction * 100}%`}
+                  height="100%"
+                >
+                  <Text
+                    size="1"
+                    color="gray"
+                    mt="2"
+                    style={{
+                      position: 'absolute',
+                      right: 0,
+                      transform: 'translateX(50%)',
+                      writingMode: 'vertical-rl',
+                    }}
+                  >
+                    {literals(strings.common.units.m, [
+                      `${Math.round(range.distance)}`,
+                    ])}
+                  </Text>
+                </Box>
+              );
+            })}
+          </Flex>
+        </Flex>
+      </Flex>
+    </Card>
+  );
+}
@@ -21,6 +21,7 @@ import { useEquipment } from '../../../../../../hooks/useEquipment';
 import { useLocale } from '../../../../../../hooks/useLocale';
 import { useTankModelDefinition } from '../../../../../../hooks/useTankModelDefinition';
 import { Duel } from '../../../../../../stores/duel';
+import { AssaultRangesVisualizer } from './AssaultRangesVisualizer';
 import { Info } from './Info';
 import { InfoWithDelta } from './InfoWithDelta';
 import { RicochetVisualizer } from './RicochetVisualizer';
@@ -112,6 +113,20 @@ export function Firepower({ stats }: StatsAcceptorProps) {
        {strings.common.gun_types[gun.gun_type!.$case]}
      </Info>
      <InfoWithDelta stats={stats} decimals={0} value="dpm" />
+      <InfoWithDelta stats={stats} decimals={0} value="damage" />
+      {gun.gun_type!.$case !== 'regular' && (
+        <InfoWithDelta stats={stats} indent decimals={0} value="clipDamage" />
+      )}
+      <InfoWithDelta stats={stats} decimals={0} value="moduleDamage" />
+      <InfoWithDelta stats={stats} decimals={0} value="penetration" />
+
+      {gun.gun_type!.value.base.assault_ranges?.types.includes(shell.type) && (
+        <AssaultRangesVisualizer
+          stats={stats}
+          ranges={gun.gun_type!.value.base.assault_ranges}
+        />
+      )}
+
      {gun.gun_type!.$case === 'auto_reloader' && (
        <InfoWithDelta stats={stats} decimals={0} indent value="dpmEffective" />
      )}
@@ -172,7 +187,6 @@ export function Firepower({ stats }: StatsAcceptorProps) {
      )}
      {/* <ReloadVisualizer stats={stats} /> */}

-      <InfoWithDelta stats={stats} decimals={0} value="penetration" />
      {typeof shell.penetration !== 'number' && (
        <>
          <InfoWithDelta
@@ -240,11 +254,6 @@ export function Firepower({ stats }: StatsAcceptorProps) {
          </Flex>
        </>
      )}
-      <InfoWithDelta stats={stats} decimals={0} value="damage" />
-      {gun.gun_type!.$case !== 'regular' && (
-        <InfoWithDelta stats={stats} indent decimals={0} value="clipDamage" />
-      )}
-      <InfoWithDelta stats={stats} decimals={0} value="moduleDamage" />
      {isExplosive(shell.type) && (
        <InfoWithDelta
          stats={stats}
@@ -65,6 +65,14 @@ export function InfoWithDelta({
      : (stats[props.value] as number);
  const delta = useDelta(uhWhatDoICallThisVariable);
  const protagonistTank = Duel.use((state) => state.protagonist.tank);
+  const shellIndex = Duel.use((state) =>
+    state.protagonist.gun.gun_type!.value.base.shells.indexOf(
+      state.protagonist.shell,
+    ),
+  );
+  const equipmentMatrix = Duel.use(
+    (state) => state.protagonist.equipmentMatrix,
+  );
  const others = useMemo(() => {
    const defaultSkills = createDefaultSkills(skillDefinitions);

@@ -86,6 +94,10 @@ export function InfoWithDelta({
          provisionDefinitions,
        );

+        if (member.gun.gun_type!.value.base.shells[shellIndex] === undefined) {
+          return undefined;
+        }
+
        return tankCharacteristics(
          {
            applyDynamicArmor: false,
@@ -97,8 +109,8 @@ export function InfoWithDelta({
            provisions: member.provisions,
            engine: member.engine,
            gun: member.gun,
-            equipmentMatrix: member.equipmentMatrix,
-            shell: member.shell,
+            equipmentMatrix: equipmentMatrix,
+            shell: member.gun.gun_type!.value.base.shells[shellIndex],
            stockEngine: tank.engines[0],
            stockGun: tank.turrets[0].guns[0],
            stockTrack: tank.tracks[0],
@@ -106,6 +118,7 @@ export function InfoWithDelta({
            tank,
            track: member.track,
            turret: member.turret,
+            assaultDistance: member.assaultDistance,
          },
          {
            equipmentDefinitions,
@@ -115,14 +128,16 @@ export function InfoWithDelta({
        );
      })
      .filter((tank) => {
+        if (tank === undefined) return false;
+
        const othersValue =
          typeof props.value === 'function'
            ? props.value(tank)!
            : (tank[props.value] as number);

        return othersValue !== undefined;
-      });
-  }, [relativeAgainst]);
+      }) as TankCharacteristics[];
+  }, [relativeAgainst, shellIndex, equipmentMatrix]);
  const betterTanks = others.filter((tank) => {
    const othersValue =
      typeof props.value === 'function'
@@ -24,6 +24,9 @@ export function Characteristics() {
  const provisions = Duel.use((state) => state.protagonist.provisions);
  const consumables = Duel.use((state) => state.protagonist.consumables);
  const camouflage = Duel.use((state) => state.protagonist.camouflage);
+  const assaultDistance = Duel.use(
+    (state) => state.protagonist.assaultDistance,
+  );
  const equipmentMatrix = Duel.use(
    (state) => state.protagonist.equipmentMatrix,
  );
@@ -58,6 +61,7 @@ export function Characteristics() {
      applyReactiveArmor: false,
      applyDynamicArmor: false,
      applySpallLiner: false,
+      assaultDistance,
    },
    {
      tankModelDefinition,
@@ -0,0 +1,25 @@
+import { Box, Progress } from '@radix-ui/themes';
+import { useProgress } from '@react-three/drei';
+
+interface Props {
+  fontSize?: string;
+}
+
+export function Tracker({ fontSize }: Props) {
+  const { loaded, total } = useProgress();
+  const progress = total === 0 ? 0 : (loaded / total) * 100;
+
+  return (
+    <Box
+      position="absolute"
+      left="50%"
+      bottom="0"
+      width="min(100%, 16rem)"
+      style={{
+        transform: `translate(-50%, calc(${fontSize} / 2))`,
+      }}
+    >
+      <Progress color="gray" value={progress} />
+    </Box>
+  );
+}
@@ -1,13 +1,14 @@
 import { TankType } from '@blitzkit/core';
 import { Box, Heading } from '@radix-ui/themes';
-import { Var } from '../../../../../core/radix/var';
-import { useLocale } from '../../../../../hooks/useLocale';
-import { Duel } from '../../../../../stores/duel';
-import type { RadixColor } from '../../../../../stores/embedState';
-import { TankopediaEphemeral } from '../../../../../stores/tankopediaEphemeral';
+import { Var } from '../../../../../../core/radix/var';
+import { useLocale } from '../../../../../../hooks/useLocale';
+import { Duel } from '../../../../../../stores/duel';
+import type { RadixColor } from '../../../../../../stores/embedState';
+import { TankopediaEphemeral } from '../../../../../../stores/tankopediaEphemeral';
+import { Tracker } from './components/Tracker';

 interface TitleProps {
-  outline?: boolean;
+  foreground?: boolean;
 }

 export const NATION_COLORS: Record<
@@ -65,7 +66,7 @@ export const NATION_COLORS: Record<
  },
 };

-export function Title({ outline }: TitleProps) {
+export function Title({ foreground }: TitleProps) {
  const { unwrap } = useLocale();
  const protagonist = Duel.use((state) => state.protagonist.tank);
  const disturbed = TankopediaEphemeral.use((state) => state.disturbed);
@@ -81,6 +82,11 @@ export function Title({ outline }: TitleProps) {
      : `${nationColors.text}-12`,
  );
  const name = unwrap(protagonist.name);
+  const fontSize = revealed
+    ? disturbed
+      ? '2rem'
+      : `min(65vh, ${125 / name.length}vw)`
+    : `min(48vh, ${75 / name.length}vw)`;

  return (
    <Box
@@ -97,17 +103,10 @@ export function Title({ outline }: TitleProps) {
          fontWeight: 900,
          userSelect: 'none',
          pointerEvents: 'none',
-          fontSize: revealed
-            ? disturbed
-              ? '2rem'
-              : `min(65vh, ${125 / name.length}vw)`
-            : `min(48vh, ${75 / name.length}vw)`,
+          fontSize,
          whiteSpace: 'nowrap',
-          color: outline ? Var(`${nationColors.tint}-a2`) : color,
-          opacity: outline && disturbed ? 0 : 1,
-          WebkitTextStroke: outline
-            ? `${revealed ? (disturbed ? '1px' : 'min(2px, 0.2vw)') : 0} ${color}`
-            : undefined,
+          color: foreground ? Var('gray-a10') : color,
+          opacity: foreground && disturbed ? 0 : 1,
          letterSpacing: disturbed || !revealed ? 0 : '-0.03em',
          transition: `
            letter-spacing 1.5s ${disturbed ? '' : 'cubic-bezier(.81,-2,.68,1)'},
@@ -120,6 +119,8 @@ export function Title({ outline }: TitleProps) {
      >
        {name}
      </Heading>
+
+      {!revealed && <Tracker fontSize={fontSize} />}
    </Box>
  );
 }
@@ -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,6 +99,7 @@ export function SceneProps() {
      stockTurret: tank.turrets[0],
      stockTrack: tank.tracks[0],
      track,
+      assaultDistance,
    },
    { equipmentDefinitions, provisionDefinitions, tankModelDefinition },
  );
@@ -1,3 +1,5 @@
+precision mediump float;
+
 #define USE_FOG

 #include <fog_pars_fragment>
@@ -1,3 +1,5 @@
+precision mediump float;
+
 #define USE_FOG

 #include <fog_pars_vertex>
@@ -39,11 +39,11 @@ interface TankSandboxProps {
  naked?: boolean;
 }

-export const forNear0 = 20;
-export const fogFar0 = 25;
+export const forNear0 = 30;
+export const fogFar0 = 50;
 export const forNear1 = 0;
 export const fogFar1 = 0;
-export const fogAnimationTime = 1.5;
+export const fogAnimationTime = 2.5;

 export const TankSandbox = forwardRef<HTMLCanvasElement, TankSandboxProps>(
  ({ thicknessRange, naked }, ref) => {
@@ -74,7 +74,7 @@ export const TankSandbox = forwardRef<HTMLCanvasElement, TankSandboxProps>(
      const interval = setInterval(() => {
        const t = (Date.now() - t0) / 1000;
        const x = t / fogAnimationTime;
-        const y = Math.cbrt(-2 * Math.abs(x - 0.5)) + 1;
+        const y = Math.sin(Math.PI * x);

        const near = forNear0 + (forNear1 - forNear0) * y;
        const far = fogFar0 + (fogFar1 - fogFar0) * y;
@@ -103,7 +103,7 @@ export function HeroSection({ skeleton }: MaybeSkeletonComponentProps) {
          transitionDuration: '1s',
          background: isFullScreen ? 'black' : undefined,
        }}
-        height={disturbed && !isFullScreen ? 'calc(100svh - 6rem)' : '100vh'}
+        height={!isFullScreen ? 'calc(100svh - 6rem)' : '100vh'}
        maxHeight={isFullScreen ? undefined : '60rem'}
        maxWidth={isFullScreen ? undefined : '120rem'}
        flexGrow="1"
@@ -136,7 +136,7 @@ export function HeroSection({ skeleton }: MaybeSkeletonComponentProps) {
                  height: '100%',
                  transitionDuration: '2s',
                  opacity: revealed ? 1 : 0,
-                  filter: disturbed ? undefined : `drop-shadow(0 0 2rem black)`,
+                  filter: disturbed ? undefined : `drop-shadow(0 0 1rem black)`,
                }}
              >
                <Suspense>
@@ -153,7 +153,7 @@ export function HeroSection({ skeleton }: MaybeSkeletonComponentProps) {
          </Box>
        </Box>

-        <Title outline />
+        <Title foreground />
      </Flex>
    </Flex>
  );
@@ -0,0 +1,17 @@
+const GAMMA = 1.2;
+
+export function fakeLogSquishyHigh(x: number) {
+  return Math.sin((Math.PI / 2) * x) ** (1 / GAMMA);
+}
+
+export function fakeLogSquishyHighInverse(y: number) {
+  return (2 / Math.PI) * Math.asin(y ** GAMMA);
+}
+
+export function fakeLogSquishyLow(x: number) {
+  return x ** 2;
+}
+
+export function fakeLogSquishyLowInverse(y: number) {
+  return y ** (1 / 2);
+}
@@ -1,12 +1,12 @@
-import { fetchEquipmentDefinitions } from '@blitzkit/core';
 import type { EquipmentMatrix } from '../../stores/duel';
+import { awaitableEquipmentDefinitions } from '../awaitables/equipmentDefinitions';

 export async function hasEquipment(
  id: number,
  equipmentPreset: string,
  equipmentMatrix: EquipmentMatrix,
 ) {
-  const equipmentDefinitions = await fetchEquipmentDefinitions();
+  const equipmentDefinitions = await awaitableEquipmentDefinitions;
  const preset = equipmentDefinitions.presets[equipmentPreset];
  return preset.slots.some((slot, index) => {
    const row = Math.floor(index / 3);
@@ -46,6 +46,7 @@ export function tankCharacteristics(
    applyReactiveArmor,
    applyDynamicArmor,
    applySpallLiner,
+    assaultDistance,
  }: {
    tank: TankDefinition;
    turret: TurretDefinition;
@@ -65,6 +66,7 @@ export function tankCharacteristics(
    applyReactiveArmor: boolean;
    applyDynamicArmor: boolean;
    applySpallLiner: boolean;
+    assaultDistance: number;
  },
  {
    tankModelDefinition,
@@ -157,7 +159,15 @@ export function tankCharacteristics(
      [applyDynamicArmor, -0.1],
      [applySpallLiner && shell.type === ShellType.HE, -0.2],
    );
-  const moduleDamageCoefficient = coefficient([hasTungsten, 0.15]);
+  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(
+          ({ distance }) => distance >= assaultDistance,
+        )?.factor ?? 0)
+      : 1;
+  const moduleDamageCoefficient =
+    coefficient([hasTungsten, 0.15]) * assaultDamageCoefficient;
  const reloadCoefficient =
    (coefficient([hasGunRammer, -0.05]) *
      coefficient([true, degressiveStat(loaderMastery)])) /
@@ -326,10 +336,13 @@ export function tankCharacteristics(
    stockTurret.weight +
    stockGun.gun_type!.value.base.weight;
  const resolvedEnginePower = engine.power * enginePowerCoefficient;
+  const damageCoefficientWithoutAssault = armorDamageCoefficient;
+  const damageCoefficient =
+    damageCoefficientWithoutAssault * assaultDamageCoefficient;
  const dpm = resolveDpm(
    gun,
    shell,
-    armorDamageCoefficient,
+    damageCoefficient,
    reloadCoefficient,
    intraClipCoefficient,
  );
@@ -352,7 +365,9 @@ export function tankCharacteristics(
          return current;
        }, null)!.index
      : undefined;
-  const damage = shell.armor_damage * armorDamageCoefficient;
+  const damageWithoutAssault =
+    shell.armor_damage * damageCoefficientWithoutAssault;
+  const damage = shell.armor_damage * damageCoefficient;
  const dpmEffective =
    gun.gun_type!.$case === 'auto_reloader'
      ? gun.gun_type!.value.extension.shell_reloads[0] >
@@ -533,6 +548,7 @@ export function tankCharacteristics(
    caliber,
    penetration,
    damage,
+    damageWithoutAssault,
    clipDamage,
    moduleDamage,
    explosionRadius,
@@ -40,5 +40,7 @@ export function tankToDuelMember(
    yaw,
    pitch,
    turret,
+    assaultDistance:
+      (gun.gun_type!.value.base.assault_ranges?.ranges[0].distance ?? 0) / 2,
  } satisfies DuelMember;
 }
@@ -85,6 +85,7 @@ function Content() {
                member.key !== thisMember.key &&
                member.provisions.includes(101),
            ),
+            assaultDistance: thisMember.assaultDistance,
          },
          {
            equipmentDefinitions: equipmentDefinitions,
@@ -60,6 +60,7 @@ const url = import.meta.env.SITE + Astro.url.pathname;
 const icon = asset(`icons/tanks/big/${id}.webp`);
 const turret = tank.turrets.at(-1)!;
 const gun = turret.guns.at(-1)!;
+const shell = gun.gun_type!.value.base.shells[0];
 const characteristics = tankCharacteristics(
  {
    tank,
@@ -74,12 +75,13 @@ const characteristics = tankCharacteristics(
    turret,
    gun,
    provisions: createDefaultProvisions(tank, gun, provisionDefinitions),
-    shell: gun.gun_type!.value.base.shells[0],
+    shell,
    stockEngine: tank.engines[0],
    stockGun: tank.turrets[0].guns[0],
    stockTurret: tank.turrets[0],
    stockTrack: tank.tracks[0],
    track: tank.tracks.at(-1)!,
+    assaultDistance: 0,
  },
  { equipmentDefinitions, provisionDefinitions, tankModelDefinition },
 );
@@ -1,9 +1,12 @@
 import type { APIContext } from 'astro';

+const ALLOW_ROBOTS = import.meta.env.ALLOW_ROBOTS;
+
 export async function GET({ request }: APIContext) {
  const flags: Record<string, string | null> = {
    'User-agent': '*',
-    Allow: '/',
+    Allow: ALLOW_ROBOTS ? '/' : null,
+    Disallow: ALLOW_ROBOTS ? null : '/',

    space: null,
    Sitemap: `${new URL(request.url).origin}/sitemap-index.xml`,
@@ -39,6 +39,7 @@ export interface DuelMember {
  provisions: number[];
  camouflage: boolean;
  cooldownBooster: number;
+  assaultDistance: number;
 }

 export interface DuelStore {
@@ -18,7 +18,7 @@ export interface TankFilters {
  classes: TankClass[];
  types: TankType[];
  testing: 'include' | 'exclude' | 'only';
-  search?: string;
+  search: string | null;
  searching: boolean;
  gunType: CaseType<GunDefinition>[];
  shells: [ShellType | null, ShellType | null, ShellType | null];
@@ -30,7 +30,7 @@ export const initialTankFilters: TankFilters = {
  classes: [],
  types: [],
  testing: 'include',
-  search: undefined,
+  search: null,
  searching: false,
  gunType: [],
  shells: [null, null, null],
@@ -14,6 +14,7 @@ export const SORT_UNITS: Record<TankopediaSortBy, string | undefined> = {
  'fire.gunDepression': '°',
  'fire.gunElevation': '°',
  'fire.premiumPenetration': 'mm',
+  'fire.tertiaryPenetration': 'mm',
  'fire.reload': 's',
  'fire.shellVelocity': 'm/s',
  'fire.shellRange': 'm',