From cbf320454f5608e4e20e5eae8c1aadf7a52abc93 Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 30 Sep 2026 18:38:15 -0500
Subject: [PATCH] various bug fixes

---
 packages/core/src/blitzkit/api/server/5_equipments.ts    | 6 ++++--
 .../[...locale]/tanks/[slug]/_index.tsx                  | 9 +++++----
 .../[...locale]/tanks/[slug]/index.astro                 | 4 +++-
 packages/website/src/tankopedia/createTankState.ts       | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/blitzkit/api/server/5_equipments.ts b/packages/core/src/blitzkit/api/server/5_equipments.ts
index e7c0b6053..6895cffbc 100644
--- a/packages/core/src/blitzkit/api/server/5_equipments.ts
+++ b/packages/core/src/blitzkit/api/server/5_equipments.ts
@@ -27,8 +27,10 @@ export abstract class ServerBlitzKitAPI5 extends ServerBlitzKitAPI4 {
             .map((level) => {
               return Object.values(level).map((options) => {
                 return {
-                  left: this.optionalDevices!.root[options.device0].id,
-                  right: this.optionalDevices!.root[options.device1].id,
+                  options: [
+                    this.optionalDevices!.root[options.device0].id,
+                    this.optionalDevices!.root[options.device1].id,
+                  ],
                 } satisfies EquipmentSlot;
               });
             })
diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx
index ca338d736..b416d4608 100644
--- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx
+++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx
@@ -10,16 +10,17 @@ import { withLocale } from "../../../../../hocs/withLocale";
 import { useAwait } from "../../../../../hooks/useAwait";
 import { Tankopedia } from "../../../../../stores/tankopedia";
 import { computeCharacteristics } from "../../../../../tankopedia/computeCharacteristics";
+import type { MaybeSkeletonComponentProps } from "../../../../../types/maybeSkeletonComponentProps";
 import styles from "./_index.module.css";
 
-interface PageProps {
+type PageProps = MaybeSkeletonComponentProps & {
   id: number;
-}
+};
 
 const tanks = await api.tanks();
 
 export const Page = withErrorWrapper(
-  withLocale<PageProps>(({ id }) => {
+  withLocale<PageProps>(({ skeleton, id }) => {
     const protagonistTank = useAwait(() => api.tank(id), `tank-${id}`);
 
     Tankopedia.useInitialization(protagonistTank);
@@ -60,7 +61,7 @@ export const Page = withErrorWrapper(
         </div>
 
         <div className={styles.sandbox}>
-          <TankopediaSandbox thicknessRange={thicknessRange} />
+          {!skeleton && <TankopediaSandbox thicknessRange={thicknessRange} />}
           <TankopediaCharacteristics
             computedCharacteristics={characteristics}
           />
diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro
index 402d94c50..c6967f8eb 100644
--- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro
+++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro
@@ -27,5 +27,7 @@ const { id, locale } = Astro.props;
   <ColorScale color="amber" />
   <ColorScale color="jade" />
 
-  <Page {locale} {id} client:load />
+  <Page {id} {locale} client:only="react">
+    <Page slot="fallback" {id} {locale} skeleton />
+  </Page>
 </BaseLayout>
diff --git a/packages/website/src/tankopedia/createTankState.ts b/packages/website/src/tankopedia/createTankState.ts
index fbea2160a..eaed6b008 100644
--- a/packages/website/src/tankopedia/createTankState.ts
+++ b/packages/website/src/tankopedia/createTankState.ts
@@ -33,7 +33,7 @@ export function createTankState(tank: TankDefinition) {
     equipment: {},
     status: createTankStatus(),
 
-    model: models.models[turret.id],
+    model: models.models[tank.id],
 
     consumables: [],
     provisions: createDefaultProvisions(tank, gun, provisions, scripts),