New translations en.json (Portuguese)

[ci skip]

package.json

@@ -10,8 +10,7 @@
     "build-protos": "cd packages/scripts && bun run build-protos",
     "record-performance": "cd packages/scripts && bun run record-performance",
     "download-client": "cd packages/scripts && bun run download-client",
-    "clean-astro": "rm -rf packages/website/.astro packages/website/node_modules/.astro packages/website/node_modules/.vite",
+    "clean-astro": "rm -rf packages/website/.astro packages/website/node_modules/.astro packages/website/node_modules/.vite"
-    "vfs": "cd packages/scripts && bun run vfs"
   },
   "type": "module",
   "workspaces": [

packages/core/src/blitzkit/api/server/0_base.ts

@@ -246,27 +246,6 @@ export abstract class ServerBlitzKitAPI0 extends BlitzKitAPI {
     return this;
   }
 
-  protected getTankFilterIds(
-    name: string,
-    definitionKey: string,
-    filter: "include" | "exclude",
-  ) {
-    const keys = name.trim().split(/\s+/).filter(Boolean);
-
-    return keys.flatMap((key) => {
-      const id = this.tankStringIdMap[key];
-
-      if (id === undefined) {
-        console.warn(
-          `Skipping unavailable tank "${key}" in ${filter} vehicle filter for "${definitionKey}"`,
-        );
-        return [];
-      }
-
-      return [id];
-    });
-  }
-
   protected getString(name: string) {
     const collection: Record<string, string> = {
       [locales.default]: this.stringsI18n[locales.default][name],

packages/core/src/blitzkit/api/server/1_tankDefinitions.ts

@@ -595,25 +595,9 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
             for (const shellKey in gunListEntry.shots) {
               const gunShellEntry = gunListEntry.shots[shellKey];
               const shell = shellList.root[shellKey];
-
-              // Newer client data stores shot properties on the shell rather
-              // than repeating them under every gun's <shots> entry.
-              const speed =
-                typeof gunShellEntry === "string"
-                  ? shell.speed
-                  : gunShellEntry.speed;
-              const maxDistance =
-                typeof gunShellEntry === "string"
-                  ? shell.maxDistance
-                  : gunShellEntry.maxDistance;
-              const piercingPower =
-                typeof gunShellEntry === "string"
-                  ? shell.piercingPower
-                  : gunShellEntry.piercingPower;
-
               const shellId = toUniqueId(nation, shell.id);
               const shellName = this.getString(shell.userString);
-              const penetrationRaw = piercingPower
+              const penetrationRaw = gunShellEntry.piercingPower
                 .split(" ")
                 .filter((penetrationString) => penetrationString !== "")
                 .map(Number);
@@ -623,7 +607,7 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
               ].shells.push({
                 id: shellId,
                 name: shellName,
-                velocity: speed,
+                velocity: gunShellEntry.speed,
                 armor_damage: shell.damage.armor,
                 module_damage: shell.damage.devices,
                 caliber: shell.caliber,
@@ -639,7 +623,7 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
                   near: penetrationRaw[0],
                   far: penetrationRaw[1],
                 },
-                range: maxDistance,
+                range: gunShellEntry.maxDistance,
               });
             }
 

packages/core/src/blitzkit/api/server/2_camouflageDefinitions.ts

@@ -10,8 +10,6 @@ export abstract class ServerBlitzKitAPI2 extends ServerBlitzKitAPI1 {
     for (const camoKey in this.camouflagesXml!.root.camouflages) {
       const camo = this.camouflagesXml!.root.camouflages[camoKey];
 
-      if (!(camoKey in this.camouflagesYaml!)) continue;
-
       const yamlEntry = this.camouflagesYaml![camoKey];
       const fullName = yamlEntry.userString
         ? this.getString(yamlEntry.userString)

packages/core/src/blitzkit/api/server/3_modelDefinitions.ts

@@ -4,13 +4,7 @@ import {
   ChassisDefinitionsList,
   Crew,
   GunDefinitionsList,
-  I_HAT,
-  J_HAT,
-  K_HAT,
   ModelDefinitions,
-  parseHierarchies,
-  Sc2ReadStream,
-  ScgReadStream,
   TankParameters,
   toUniqueId,
   TurretDefinitionsList,
@@ -18,10 +12,9 @@ import {
   VehicleDefinitionArmor,
   VehicleDefinitionList,
   VehicleDefinitions,
-  VertexAttribute,
 } from "@blitzkit/core";
 import { parse as parsePath } from "path";
-import { MathUtils, Vector3 as THREEVector3, Vector3Tuple } from "three";
+import { Vector3Tuple } from "three";
 import { Cache } from "./0_base";
 import { ServerBlitzKitAPI2 } from "./2_camouflageDefinitions";
 
@@ -30,87 +23,6 @@ export abstract class ServerBlitzKitAPI3 extends ServerBlitzKitAPI2 {
     return { x: tuple[0], y: tuple[1], z: tuple[2] } satisfies Vector3;
   }
 
-  private async collisionBoundingBoxes(
-    nation: string,
-    tankKey: string,
-    turretRotation?: { yaw: number; pitch: number; roll: number },
-  ) {
-    const boundingBoxes: Record<
-      string,
-      { min: Vector3Tuple; max: Vector3Tuple }
-    > = {};
-    const path = `Data/3d/Tanks/CollisionMeshes/${nation}-${tankKey}`;
-
-    if (!(await this.vfs.resolve(`${path}.sc2`))) {
-      throw new Error(`Missing collision mesh for ${nation}-${tankKey}`);
-    }
-
-    const sc2 = new Sc2ReadStream(
-      (await this.vfs.file(`${path}.sc2`)).buffer as ArrayBuffer,
-    ).sc2();
-    const scg = new ScgReadStream(
-      (await this.vfs.file(`${path}.scg`)).buffer as ArrayBuffer,
-    ).scg();
-
-    parseHierarchies(sc2["#hierarchy"], null, (hierarchy, components) => {
-      for (const component of components) {
-        if (component["comp.typename"] !== "RenderComponent") continue;
-
-        const polygonGroup = scg.get(
-          component["rc.renderObj"]["ro.batches"]["0000"]["rb.datasource"],
-        );
-
-        if (!polygonGroup) continue;
-
-        const min: Vector3Tuple = [Infinity, Infinity, Infinity];
-        const max: Vector3Tuple = [-Infinity, -Infinity, -Infinity];
-        const rotate =
-          turretRotation && hierarchy.name.toLowerCase().startsWith("turret");
-
-        polygonGroup.vertices.forEach((vertex) => {
-          vertex.forEach(({ attribute, value }) => {
-            if (attribute !== VertexAttribute.VERTEX) return;
-
-            const position = new THREEVector3(...value);
-
-            if (rotate) {
-              position
-                .applyAxisAngle(
-                  I_HAT,
-                  -MathUtils.degToRad(turretRotation.pitch),
-                )
-                .applyAxisAngle(
-                  J_HAT,
-                  -MathUtils.degToRad(turretRotation.roll),
-                )
-                .applyAxisAngle(
-                  K_HAT,
-                  -MathUtils.degToRad(turretRotation.yaw),
-                );
-            }
-
-            const coordinates = position.toArray();
-
-            for (let axis = 0; axis < 3; axis++) {
-              min[axis] = Math.min(min[axis], coordinates[axis]);
-              max[axis] = Math.max(max[axis], coordinates[axis]);
-            }
-          });
-        });
-
-        boundingBoxes[hierarchy.name.toLowerCase()] = { min, max };
-      }
-
-      return null;
-    });
-
-    if (!boundingBoxes.hull) {
-      throw new Error(`Missing hull collision mesh for ${nation}-${tankKey}`);
-    }
-
-    return boundingBoxes;
-  }
-
   private assignArmor(
     raw: VehicleDefinitionArmor[string],
     id: number,
@@ -155,12 +67,6 @@ export abstract class ServerBlitzKitAPI3 extends ServerBlitzKitAPI2 {
         const tankParameters = await this.vfs.yaml<TankParameters>(
           `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`,
         );
-        const collisionBoundingBoxes = await this.collisionBoundingBoxes(
-          nation,
-          tankKey,
-          tankDefinition.root.hull.turretInitialRotation,
-        );
-        const hullBoundingBox = collisionBoundingBoxes.hull;
         const turretOrigin = tankDefinition.root.hull.turretPositions.turret
           .split(" ")
           .map(Number) as Vector3Tuple;
@@ -235,8 +141,12 @@ export abstract class ServerBlitzKitAPI3 extends ServerBlitzKitAPI2 {
               }
             : undefined,
           bounding_box: {
-            min: this.vector3TupleToBlitzkit(hullBoundingBox.min),
+            min: this.vector3TupleToBlitzkit(
-            max: this.vector3TupleToBlitzkit(hullBoundingBox.max),
+              tankParameters.collision.hull.bbox.min,
+            ),
+            max: this.vector3TupleToBlitzkit(
+              tankParameters.collision.hull.bbox.max,
+            ),
           },
           turrets: {},
           tracks: {},
@@ -298,35 +208,26 @@ export abstract class ServerBlitzKitAPI3 extends ServerBlitzKitAPI2 {
 
           turret.userString;
 
-          const turretCollisionName = parsePath(
-            turret.hitTester.collisionModel,
-          ).name.toLowerCase();
-          const isFullYaw = -turretYaw[0] + turretYaw[1] === 360;
-
-          if (!collisionBoundingBoxes[turretCollisionName] && isFullYaw) {
-            throw new Error(
-              `Missing turret collision mesh for ${nation}-${tankKey} ${turretKey}`,
-            );
-          }
-
-          const turretBoundingBox = collisionBoundingBoxes[
-            turretCollisionName
-          ] ?? {
-            min: [0, 0, 0] as Vector3Tuple,
-            max: [0, 0, 0] as Vector3Tuple,
-          };
-
           modelDefinitions.models[tankId].turrets[turretId] = {
             armor: turretArmor,
             gun_origin: this.vector3TupleToBlitzkit(gunOrigin),
             model_id: turretModel,
-            yaw: isFullYaw
+            yaw:
-              ? undefined
+              -turretYaw[0] + turretYaw[1] === 360
-              : { min: turretYaw[0], max: turretYaw[1] },
+                ? undefined
+                : { min: turretYaw[0], max: turretYaw[1] },
             guns: {},
             bounding_box: {
-              min: this.vector3TupleToBlitzkit(turretBoundingBox.min),
+              min: this.vector3TupleToBlitzkit(
-              max: this.vector3TupleToBlitzkit(turretBoundingBox.max),
+                tankParameters.collision[
+                  parsePath(turret.hitTester.collisionModel).name.toLowerCase()
+                ].bbox.min,
+              ),
+              max: this.vector3TupleToBlitzkit(
+                tankParameters.collision[
+                  parsePath(turret.hitTester.collisionModel).name.toLowerCase()
+                ].bbox.max,
+              ),
             },
           };
 

packages/core/src/blitzkit/api/server/6_consumableDefinitions.ts

@@ -44,7 +44,9 @@ export abstract class ServerBlitzKitAPI6 extends ServerBlitzKitAPI5 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: this.getTankFilterIds(includeRaw.name, key, "include"),
+                ids: includeRaw.name.split(/ +/).map((key) => {
+                  return this.tankStringIdMap[key];
+                }),
               },
             },
           });
@@ -70,7 +72,9 @@ export abstract class ServerBlitzKitAPI6 extends ServerBlitzKitAPI5 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: this.getTankFilterIds(excludeRaw.name, key, "exclude"),
+                ids: excludeRaw.name.split(/ +/).map((key) => {
+                  return this.tankStringIdMap[key];
+                }),
               },
             },
           });

packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts

@@ -11,7 +11,7 @@ export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 {
   async provisionDefinitions() {
     const provisionDefinitions = ProvisionDefinitions.create();
 
-    Object.entries(this.provisionsCommon).forEach(([key, provision]) => {
+    Object.entries(this.provisionsCommon).forEach(([, provision]) => {
       const entry: Provision = {
         id: provision.id,
         exclude: [],
@@ -42,7 +42,9 @@ export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: this.getTankFilterIds(includeRaw.name, key, "include"),
+                ids: includeRaw.name.split(/ +/).map((key) => {
+                  return this.tankStringIdMap[key];
+                }),
               },
             },
           });
@@ -68,7 +70,9 @@ export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: this.getTankFilterIds(excludeRaw.name, key, "exclude"),
+                ids: excludeRaw.name
+                  .split(/ +/)
+                  .map((key) => this.tankStringIdMap[key]),
               },
             },
           });

packages/core/src/blitzkit/index.ts

@@ -25,7 +25,6 @@ export * from "./sluggify";
 export * from "./staticAsset";
 export * from "./sum";
 export * from "./tankDefinitions";
-export * from "./tankBoundingBox";
 export * from "./tankIcon";
 export * from "./tankNames";
 export * from "./unionBoundingBox";

packages/core/src/blitzkit/tankBoundingBox.ts

@@ -1,32 +0,0 @@
-import { ModelDefinition, TurretModelDefinition } from "../protos";
-import { unionBoundingBox } from "./unionBoundingBox";
-
-export function tankBoundingBox(
-  tankModelDefinition: ModelDefinition,
-  turretModelDefinition: TurretModelDefinition,
-) {
-  const hull = tankModelDefinition.bounding_box!;
-  const turret = turretModelDefinition.bounding_box!;
-  const origin = tankModelDefinition.turret_origin!;
-
-  if (
-    turret.min!.x === turret.max!.x &&
-    turret.min!.y === turret.max!.y &&
-    turret.min!.z === turret.max!.z
-  ) {
-    return unionBoundingBox(hull, hull);
-  }
-
-  return unionBoundingBox(hull, {
-    min: {
-      x: turret.min!.x + origin.x,
-      y: turret.min!.y + origin.z,
-      z: turret.min!.z + origin.y,
-    },
-    max: {
-      x: turret.max!.x + origin.x,
-      y: turret.max!.y + origin.z,
-      z: turret.max!.z + origin.y,
-    },
-  });
-}

packages/core/src/blitzkit/tankDefinitions/constants.ts

@@ -1,5 +1,5 @@
 import { times } from "lodash-es";
-import { CrewType, ShellType } from "../../protos";
+import { CrewType, ShellType, TankClass, TankType } from "../../protos";
 
 export const SHELL_NAMES: Record<ShellType, string> = {
   [ShellType.SHELL_TYPE_AP]: "AP",
@@ -15,6 +15,33 @@ export const CREW_MEMBER_NAMES = {
   [CrewType.CREW_TYPE_RADIOMAN]: "radioman",
 } as const;
 
+/**
+ * @deprecated use svg
+ */
+export const TANK_ICONS: Record<TankClass, string> = {
+  [TankClass.TANK_CLASS_TANK_DESTROYER]: "https://i.imgur.com/BIHSEH0.png",
+  [TankClass.TANK_CLASS_LIGHT]: "https://i.imgur.com/CSNha5V.png",
+  [TankClass.TANK_CLASS_MEDIUM]: "https://i.imgur.com/wvf3ltm.png",
+  [TankClass.TANK_CLASS_HEAVY]: "https://i.imgur.com/ECeqlZa.png",
+};
+/**
+ * @deprecated use svg
+ */
+export const TANK_ICONS_PREMIUM: Record<TankClass, string> = {
+  [TankClass.TANK_CLASS_TANK_DESTROYER]: "https://i.imgur.com/TCu3EdR.png",
+  [TankClass.TANK_CLASS_LIGHT]: "https://i.imgur.com/zdkpTRb.png",
+  [TankClass.TANK_CLASS_MEDIUM]: "https://i.imgur.com/3z7eHX6.png",
+  [TankClass.TANK_CLASS_HEAVY]: "https://i.imgur.com/P3vbmyA.png",
+};
+/**
+ * @deprecated use svg
+ */
+export const TANK_ICONS_COLLECTOR: Record<TankClass, string> = {
+  [TankClass.TANK_CLASS_TANK_DESTROYER]: "https://i.imgur.com/WTjeirB.png",
+  [TankClass.TANK_CLASS_LIGHT]: "https://i.imgur.com/EwhtKkU.png",
+  [TankClass.TANK_CLASS_MEDIUM]: "https://i.imgur.com/u8YDMBh.png",
+  [TankClass.TANK_CLASS_HEAVY]: "https://i.imgur.com/8xRf3nc.png",
+};
 export const TIERS = times(10, (index) => index + 1);
 export const TIER_ROMAN_NUMERALS: Record<number, string> = {
   1: "I",
@@ -41,3 +68,8 @@ export const flags: Record<string, string> = {
   european: "🇪🇺",
   other: "<:other:1218421572243558482>",
 };
+export const TREE_TYPE_ICONS: Record<TankType, Record<TankClass, string>> = {
+  [TankType.TANK_TYPE_RESEARCHABLE]: TANK_ICONS,
+  [TankType.TANK_TYPE_PREMIUM]: TANK_ICONS_PREMIUM,
+  [TankType.TANK_TYPE_COLLECTOR]: TANK_ICONS_COLLECTOR,
+};

packages/core/src/imgur/imgur.ts

@@ -0,0 +1,50 @@
+export enum ImgurSize {
+  /**
+   * The default size
+   */
+  Default = '',
+  /**
+   * Unknown size but really really small
+   */
+  UltraSmall = 'ss',
+  /**
+   * 90x90
+   */
+  SmallSquare = 's',
+  /**
+   * 160x160
+   */
+  BigSquare = 'b',
+  /**
+   * 160x160
+   */
+  SmallThumbnail = 't',
+  /**
+   * 320x320
+   */
+  MediumThumbnail = 'm',
+  /**
+   * 640x640
+   */
+  LargeThumbnail = 'l',
+  /**
+   * 1024x1024
+   */
+  HugeThumbnail = 'h',
+}
+
+interface ImgurOptions {
+  format: 'jpeg' | 'png';
+  size: ImgurSize;
+}
+
+const defaultImgurOptions: ImgurOptions = {
+  format: 'png',
+  size: ImgurSize.Default,
+};
+
+export function imgur(id: string, imgurOptions?: Partial<ImgurOptions>) {
+  const options = { ...defaultImgurOptions, ...imgurOptions };
+
+  return `https://i.imgur.com/${id}${options.size}.${options.format}`;
+}

packages/core/src/imgur/index.ts

@@ -0,0 +1 @@
+export * from './imgur';

packages/core/src/index.ts

@@ -1,5 +1,6 @@
 export * from "./blitz";
 export * from "./blitzkit";
+export * from "./imgur";
 export * from "./math";
 export * from "./patreon";
 export * from "./protobuf";

packages/core/src/streams/sc2.ts

@@ -90,28 +90,6 @@ export interface Hierarchy {
   name: string;
 }
 
-export function parseHierarchies<Parent>(
-  hierarchies: Hierarchy[],
-  parent: Parent,
-  parseHierarchy: (
-    hierarchy: Hierarchy,
-    components: Component[],
-    parent: Parent,
-  ) => Parent | undefined,
-) {
-  for (const hierarchy of hierarchies) {
-    const components = Array.from(
-      { length: hierarchy.components.count },
-      (_, index) => hierarchy.components[index.toString().padStart(4, "0")],
-    );
-    const child = parseHierarchy(hierarchy, components, parent);
-
-    if (child !== undefined && hierarchy["#hierarchy"]) {
-      parseHierarchies(hierarchy["#hierarchy"], child, parseHierarchy);
-    }
-  }
-}
-
 // 0001, 0002, 0003...: Component
 type Components = {
   count: number;

packages/core/src/types/gunDefinitionsList.ts

@@ -20,13 +20,11 @@ export interface GunDefinitionsList {
       burst?: { count: number; rate: number };
       clip?: { count: number; rate: number };
       shots: {
-        [key: string]:
+        [key: string]: {
-          | ""
+          speed: number;
-          | {
+          piercingPower: string;
-              speed: number;
+          maxDistance: number;
-              piercingPower: string;
+        };
-              maxDistance: number;
-            };
       };
     };
   };

packages/core/src/types/shellDefinitionsList.ts

@@ -10,9 +10,6 @@ export type ShellDefinitionsList = Record<
     normalizationAngle?: number;
     ricochetAngle?: number;
     explosionRadius?: number;
-    speed: number;
-    maxDistance?: number;
-    piercingPower: string;
   }
 > & {
   icons: Record<string, string>;

packages/scripts/package.json

@@ -5,8 +5,7 @@
     "discover-ids": "bun src/discoverIds/index.ts",
     "build-protos": "bun src/protos.ts",
     "record-performance": "bun src/recordPerformance/index.ts",
-    "download-client": "bun src/downloadClient/index.ts",
+    "download-client": "bun src/downloadClient/index.ts"
-    "vfs": "bun src/vfs/index.ts"
   },
   "dependencies": {
     "@blitzkit/closed": "workspace:*",

packages/scripts/src/vfs/index.ts

@@ -1,23 +0,0 @@
-import { assertSecret } from "@blitzkit/core";
-import { LocalVFS } from "@blitzkit/core/src/blitzkit/vfs/local";
-
-export const vfs = new LocalVFS(assertSecret(import.meta.env.CLIENT_DIR));
-
-const command = Bun.argv[2];
-const path = Bun.argv[3];
-
-if (!path) {
-  console.error("Gimme a path to assess dumb ass");
-  process.exit(1);
-}
-
-if (command === "cat") {
-  const content = await vfs.file(path);
-  await Bun.write(Bun.stdout, content);
-} else if (command === "ls") {
-  const files = await vfs.dir(path);
-
-  for (const file of files) {
-    console.log(file);
-  }
-}

packages/website/src/components/ArticlePlug.astro

@@ -0,0 +1,38 @@
+---
+import { tankIcon } from "@blitzkit/core";
+import { Flex, Heading, Link, Strong, Text } from "@radix-ui/themes";
+---
+
+<Flex justify="center" px="4">
+  <Link
+    color="gray"
+    highContrast
+    style={{ display: "content" }}
+    href="/docs/guides/christmas-2025"
+    underline="none"
+  >
+    <Flex
+      mt="3"
+      px="5"
+      py="4"
+      style={{
+        borderRadius: "var(--radius-3)",
+        backgroundImage: "url(https://i.imgur.com/LRYmSkg.png)",
+        backgroundSize: "cover",
+        backgroundPosition: "center",
+        boxSizing: "border-box",
+      }}
+      align="center"
+      gap="5"
+    >
+      <img src={tankIcon(25169)} style={{ height: "min(15vw, 5rem)" }} />
+
+      <Flex direction="column">
+        <Heading size={{ initial: "4", sm: "6" }}>Christmas 2025</Heading>
+        <Text size={{ initial: "2", sm: "3" }}>
+          Win the <Strong>GSOR the TANK</Strong> and more!
+        </Text>
+      </Flex>
+    </Flex>
+  </Link>
+</Flex>

packages/website/src/components/Giveaway.tsx

@@ -3,9 +3,9 @@ import { useEffect, useState, type ReactNode } from "react";
 import type { MaybeSkeletonComponentProps } from "../types/maybeSkeletonComponentProps";
 import { InlineSkeleton } from "./InlineSkeleton";
 
-const TIME = 1792598400 * 1000;
+const TIME = 1764898200 * 1000;
 
-export function Countdown({ skeleton }: MaybeSkeletonComponentProps) {
+export function Giveaway({ skeleton }: MaybeSkeletonComponentProps) {
   const [timeLeft, setTimeLeft] = useState<number>(TIME - Date.now());
 
   useEffect(() => {
@@ -31,14 +31,14 @@ export function Countdown({ skeleton }: MaybeSkeletonComponentProps) {
 
     string = (
       <>
-        revealed in{" "}
+        in{" "}
         <Code highContrast>
           {hours}h {minutes}m {seconds}s
         </Code>
       </>
     );
   } else {
-    string = "have been revealed.";
+    string = "has ended. Come again later!";
   }
 
   return (
@@ -47,7 +47,7 @@ export function Countdown({ skeleton }: MaybeSkeletonComponentProps) {
         color="gray"
         highContrast
         style={{ display: "content" }}
-        href="https://preview.blitzkit.app/tanks"
+        href="https://discord.gg/njQdBhNS?event=1446208951136813117"
         underline="none"
       >
         <Flex
@@ -56,17 +56,17 @@ export function Countdown({ skeleton }: MaybeSkeletonComponentProps) {
           py="4"
           style={{
             borderRadius: "var(--radius-3)",
-            backgroundImage: "url(https://i.imgur.com/xgngxoy.png)",
+            backgroundImage: "url(https://i.imgur.com/LRYmSkg.png)",
             backgroundSize: "cover",
             backgroundPosition: "center",
             boxSizing: "border-box",
-            boxShadow: "0 0 var(--space-7) var(--white-a2)",
+            boxShadow: "0 0 var(--space-7) var(--blue-a5)",
           }}
           align="center"
           gap="5"
         >
           <img
-            src="https://i.imgur.com/kXV3r3P.png"
+            src="https://i.imgur.com/mvmJQgB.png"
             style={{
               height: "min(15vw, 5rem)",
               filter: "drop-shadow(0.5rem 0.5rem 1rem #00000080)",
@@ -75,11 +75,11 @@ export function Countdown({ skeleton }: MaybeSkeletonComponentProps) {
 
           <Flex direction="column">
             <Heading size={{ initial: "4", sm: "6" }}>
-              Tier XIs {!skeleton && string}{" "}
+              Music Box giveaway {!skeleton && string}{" "}
               {skeleton && <InlineSkeleton width="10rem" />}
             </Heading>
             <Text size={{ initial: "2", sm: "3" }}>
-              Get ready to go to the Tankopedia!
+              Join the BlitzKit Discord server event
             </Text>
           </Flex>
         </Flex>

packages/website/src/components/Markdown.tsx

@@ -1,20 +1,13 @@
 import { Link, Table } from '@radix-ui/themes';
 import MarkdownToJSX from 'markdown-to-jsx';
 import type { ComponentProps } from 'react';
-import { docImageUrl, isExternalImage } from '../core/blitzkit/docImages';
 
 interface MarkdownProps {
   children: string;
 }
 
-function Image({ src, ...props }: ComponentProps<'img'>) {
+function Image(props: ComponentProps<'img'>) {
-  return (
+  return <img style={{ maxWidth: '100%' }} {...props} />;
-    <img
-      style={{ maxWidth: '100%' }}
-      src={src && isExternalImage(src) ? docImageUrl(src) : src}
-      {...props}
-    />
-  );
 }
 
 export function Markdown({ children }: MarkdownProps) {

packages/website/src/components/StupidCat.tsx

@@ -0,0 +1,3 @@
+export function StupidCat() {
+  return <img src="https://i.imgur.com/6FBBzb9.png" />;
+}

packages/website/src/components/TankSearch/components/Card.tsx

@@ -1,7 +1,7 @@
 import {
   normalizeBoundingBox,
   resolveDpm,
-  tankBoundingBox,
+  unionBoundingBox,
   type TankDefinition,
 } from "@blitzkit/core";
 import { useMemo } from "react";
@@ -112,7 +112,10 @@ export function TankSearchCard({ tank, onSelect }: TankSearchCardProps) {
         return (tank.camouflage_still * gun.camouflage_loss * 100).toFixed(0);
       case "survivability.volume": {
         const dimensions = normalizeBoundingBox(
-          tankBoundingBox(tankModelDefinition, turretModelDefinition),
+          unionBoundingBox(
+            tankModelDefinition.bounding_box!,
+            turretModelDefinition.bounding_box!,
+          ),
         );
 
         return (dimensions.x * dimensions.y * dimensions.z).toFixed(0);
@@ -120,7 +123,10 @@ export function TankSearchCard({ tank, onSelect }: TankSearchCardProps) {
 
       case "survivability.length": {
         const bounds = normalizeBoundingBox(
-          tankBoundingBox(tankModelDefinition, turretModelDefinition),
+          unionBoundingBox(
+            tankModelDefinition.bounding_box!,
+            turretModelDefinition.bounding_box!,
+          ),
         );
 
         return Math.max(bounds.x, bounds.y, bounds.z).toFixed(0);

packages/website/src/components/TankSearch/index.tsx

@@ -3,7 +3,7 @@ import {
   normalizeBoundingBox,
   resolveDpm,
   SEARCH_KEYS,
-  tankBoundingBox,
+  unionBoundingBox,
   type TankDefinition,
 } from "@blitzkit/core";
 import { literals } from "@blitzkit/i18n/src/literals";
@@ -137,10 +137,16 @@ export const TankSearch = memo<TankSearchProps>(
               const bTurretModelDefinition =
                 bTankModelDefinition.turrets[b.turrets.at(-1)!.id];
               const aSize = normalizeBoundingBox(
-                tankBoundingBox(aTankModelDefinition, aTurretModelDefinition),
+                unionBoundingBox(
+                  aTankModelDefinition.bounding_box!,
+                  aTurretModelDefinition.bounding_box!,
+                ),
               );
               const bSize = normalizeBoundingBox(
-                tankBoundingBox(bTankModelDefinition, bTurretModelDefinition),
+                unionBoundingBox(
+                  bTankModelDefinition.bounding_box!,
+                  bTurretModelDefinition.bounding_box!,
+                ),
               );
               const aVolume = aSize.x * aSize.y * aSize.z;
               const bVolume = bSize.x * bSize.y * bSize.z;
@@ -158,10 +164,16 @@ export const TankSearch = memo<TankSearchProps>(
               const bTurretModelDefinition =
                 bTankModelDefinition.turrets[b.turrets.at(-1)!.id];
               const aSize = normalizeBoundingBox(
-                tankBoundingBox(aTankModelDefinition, aTurretModelDefinition),
+                unionBoundingBox(
+                  aTankModelDefinition.bounding_box!,
+                  aTurretModelDefinition.bounding_box!,
+                ),
               );
               const bSize = normalizeBoundingBox(
-                tankBoundingBox(bTankModelDefinition, bTurretModelDefinition),
+                unionBoundingBox(
+                  bTankModelDefinition.bounding_box!,
+                  bTurretModelDefinition.bounding_box!,
+                ),
               );
               const aLength = Math.max(aSize.x, aSize.y, aSize.z);
               const bLength = Math.max(bSize.x, bSize.y, bSize.z);

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

@@ -1,32 +0,0 @@
-import { alias } from "@blitzkit/core";
-
-const EXTERNAL_IMAGE = /^https?:\/\//;
-const MARKDOWN_IMAGES = [
-  /!\[[^\]]*\]\((\S+?)(?:\s+"[^"]*")?\)/g,
-  /<img[^>]*\ssrc=["']([^"']+)["']/g,
-];
-
-export function isExternalImage(src: string) {
-  return EXTERNAL_IMAGE.test(src);
-}
-
-export function docImageId(url: string) {
-  let hash = 0x811c9dc5;
-
-  for (let index = 0; index < url.length; index++) {
-    hash ^= url.charCodeAt(index);
-    hash = Math.imul(hash, 0x01000193) >>> 0;
-  }
-
-  return hash.toString(16).padStart(8, "0");
-}
-
-export function docImageUrl(url: string) {
-  return alias("api", `/docs/images/${docImageId(url)}.webp`);
-}
-
-export function externalDocImages(markdown: string) {
-  return MARKDOWN_IMAGES.flatMap((pattern) =>
-    Array.from(markdown.matchAll(pattern), (match) => match[1]),
-  ).filter(isExternalImage);
-}

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

@@ -8,8 +8,8 @@ import {
   resolvePenetrationCoefficient,
   ShellType,
   sum,
-  tankBoundingBox,
   TankClass,
+  unionBoundingBox,
   type EngineDefinition,
   type EquipmentDefinitions,
   type GunDefinition,
@@ -336,7 +336,10 @@ export function tankCharacteristics(
   );
 
   const size = normalizeBoundingBox(
-    tankBoundingBox(tankModelDefinition, turretModelDefinition),
+    unionBoundingBox(
+      tankModelDefinition.bounding_box!,
+      turretModelDefinition.bounding_box!,
+    ),
   );
   const weightKg =
     tank.weight + engine.weight + track.weight + turret.weight + gun.weight;

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

@@ -7,23 +7,12 @@ import {
 import type { DuelMember } from "../../stores/duel";
 import { genericDefaultEquipmentMatrix } from "../../stores/duel/constants";
 
-export function defaultTankWeapon(tank: TankDefinition) {
-  for (const turret of [...tank.turrets].reverse()) {
-    for (const gun of [...turret.guns].reverse()) {
-      const shell = gun.shells[0];
-
-      if (shell) return { turret, gun, shell };
-    }
-  }
-
-  throw new Error(`Tank ${tank.id} has no gun with shells`);
-}
-
 export function tankToDuelMember(
   tank: TankDefinition,
   provisionDefinitions: ProvisionDefinitions,
 ) {
-  const { turret, gun, shell } = defaultTankWeapon(tank);
+  const turret = tank.turrets.at(-1)!;
+  const gun = turret.guns.at(-1)!;
 
   return {
     camouflage: true,
@@ -33,7 +22,7 @@ export function tankToDuelMember(
     provisions: createDefaultProvisions(tank, gun, provisionDefinitions),
     engine: tank.engines.at(-1)!,
     gun,
-    shell,
+    shell: tank.turrets.at(-1)!.guns.at(-1)!.shells[0],
     tank,
     track: tank.tracks.at(-1)!,
     turret,

packages/website/src/pages/[...chunk_api]/docs/images/[id].webp.ts

@@ -1,39 +0,0 @@
-import type { APIContext, GetStaticPathsItem } from "astro";
-import sharp from "sharp";
-import {
-  docImageId,
-  externalDocImages,
-} from "../../../../core/blitzkit/docImages";
-import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths";
-import { getStaticPaths as _getStaticPaths } from "../../_index";
-
-export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => {
-  const documents = import.meta.glob<string>(
-    "../../../../../../../docs/**/*.md",
-    { eager: true, query: "?raw", import: "default" },
-  );
-  const urls = new Set(Object.values(documents).flatMap(externalDocImages));
-
-  return Array.from(
-    urls,
-    (url) =>
-      ({
-        params: { id: docImageId(url) },
-        props: { url },
-      }) satisfies GetStaticPathsItem,
-  );
-});
-
-export async function GET({ props }: APIContext<{ url: string }>) {
-  const response = await fetch(props.url);
-
-  if (!response.ok) {
-    throw new Error(`Failed to fetch ${props.url}: ${response.status}`);
-  }
-
-  const image = await sharp(Buffer.from(await response.arrayBuffer()))
-    .webp()
-    .toBuffer();
-
-  return new Response(new Uint8Array(image));
-}

packages/website/src/pages/[...chunk_api]/tanks/[id]/collision.glb.ts

@@ -1,15 +1,16 @@
 import {
-  parseHierarchies,
   Sc2ReadStream,
   ScgReadStream,
   toUniqueId,
   VertexAttribute,
   vertexAttributeVectorSizes,
+  type Hierarchy,
   type VehicleDefinitionList,
 } from "@blitzkit/core";
 import type { AbstractVFS } from "@blitzkit/core/src/blitzkit/vfs/abstract";
 import { Accessor, Document, Node, NodeIO, Scene } from "@gltf-transform/core";
 import type { APIContext } from "astro";
+import { times } from "lodash-es";
 import { vfs } from "../../../../core/blitzkit/vfs";
 
 export { getStaticPaths } from "./_index";
@@ -55,10 +56,13 @@ async function extractArmor(vfs: AbstractVFS, fileName: string) {
   const scene = document.createScene();
   const buffer = document.createBuffer();
 
-  parseHierarchies<Scene | Node>(
+  function parseHierarchies(hierarchies: Hierarchy[], parent: Scene | Node) {
-    sc2["#hierarchy"],
+    hierarchies.forEach((hierarchy) => {
-    scene,
+      const components = times(
-    (hierarchy, components, parent) => {
+        hierarchy.components.count,
+        (index) => hierarchy.components[index.toString().padStart(4, "0")],
+      );
+
       components.forEach((component) => {
         switch (component["comp.typename"]) {
           case "TransformComponent":
@@ -159,9 +163,13 @@ async function extractArmor(vfs: AbstractVFS, fileName: string) {
         }
       });
 
-      return parent;
+      if (hierarchy["#hierarchy"]) {
-    },
+        parseHierarchies(hierarchy["#hierarchy"], parent);
-  );
+      }
+    });
+  }
+
+  parseHierarchies(sc2["#hierarchy"], scene);
 
   return document;
 }

packages/website/src/pages/[...chunk_api]/tanks/[id]/model.glb.ts

@@ -1,13 +1,13 @@
 import {
   bufferToBigInt,
   DdsReadStream,
-  parseHierarchies,
   PvrReadStream,
   Sc2ReadStream,
   ScgReadStream,
   toUniqueId,
   VertexAttribute,
   type ConfigArchive,
+  type Hierarchy,
   type TankParameters,
   type Textures,
   type VehicleDefinitionList,
@@ -240,10 +240,8 @@ async function extractModel(vfs: AbstractVFS, path: string) {
     materials.set(id, resolvedMaterial);
   });
 
-  parseHierarchies<Scene | Node>(
+  function parseHierarchies(hierarchies: Hierarchy[], parent: Scene | Node) {
-    sc2["#hierarchy"],
+    hierarchies.forEach((hierarchy) => {
-    scene,
-    (hierarchy, components, parent) => {
       if (
         omitMeshNames.start.some((omit) => hierarchy.name.startsWith(omit)) ||
         omitMeshNames.end.some((omit) => hierarchy.name.endsWith(omit))
@@ -251,6 +249,10 @@ async function extractModel(vfs: AbstractVFS, path: string) {
         return;
 
       const node = document.createNode(hierarchy.name);
+      const components = times(
+        hierarchy.components.count,
+        (index) => hierarchy.components[index.toString().padStart(4, "0")],
+      );
 
       components.forEach((component) => {
         switch (component["comp.typename"]) {
@@ -359,11 +361,15 @@ async function extractModel(vfs: AbstractVFS, path: string) {
         }
       });
 
-      parent.addChild(node);
+      if (hierarchy["#hierarchy"]) {
+        parseHierarchies(hierarchy["#hierarchy"], node);
+      }
 
-      return node;
+      parent.addChild(node);
-    },
+    });
-  );
+  }
+
+  parseHierarchies(sc2["#hierarchy"], scene);
 
   scene.addChild(document.createNode("test"));
 

packages/website/src/pages/[...chunk_default]/[...locale]/index.astro

@@ -5,7 +5,6 @@ import locales from "@blitzkit/i18n/locales.json";
 import { literals } from "@blitzkit/i18n/src/literals";
 import { Box, Flex, Link } from "@radix-ui/themes";
 import { AesonPlug } from "../../../components/AesonPlug";
-import { Countdown } from "../../../components/Countdown";
 import HomeHero from "../../../components/HomeHero.astro";
 import { Plugs } from "../../../components/Plugs";
 import ToolCard from "../../../components/ToolCard.astro";
@@ -66,8 +65,6 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => {
 <BaseLayout {locale}>
   <HomeHero />
 
-  <Countdown client:load />
-
   {
     locale !== locales.default && (
       <Flex justify="center" pt="4" my="4">

packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro

@@ -13,7 +13,6 @@ import { load } from "cheerio";
 import { api } from "../../../../../core/blitzkit/api";
 import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths";
 import { tankCharacteristics } from "../../../../../core/blitzkit/tankCharacteristics";
-import { defaultTankWeapon } from "../../../../../core/blitzkit/tankToDuelMember";
 import { getStrings } from "../../../../../core/i18n/getStrings";
 import BaseLayout from "../../../../../layouts/BaseLayout.astro";
 import { genericDefaultEquipmentMatrix } from "../../../../../stores/duel/constants";
@@ -54,7 +53,9 @@ const title = literals(strings.website.tools.tankopedia.tank_seo_title, {
 const url = import.meta.env.SITE + Astro.url.pathname;
 
 const icon = alias("api", `/tanks/${id}/icons/big.webp`);
-const { turret, gun, shell } = defaultTankWeapon(tank);
+const turret = tank.turrets.at(-1)!;
+const gun = turret.guns.at(-1)!;
+const shell = gun.shells[0];
 const characteristics = tankCharacteristics(
   {
     tank,