tank states

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

@@ -1,39 +0,0 @@
-import {
-  createDefaultProvisions,
-  Equalizer,
-  type ProvisionDefinitions,
-  type TankDefinition,
-} from "@blitzkit/core";
-import type { DuelMember } from "../../stores/duel";
-import { genericDefaultEquipmentMatrix } from "../../stores/duel/constants";
-
-export function tankToDuelMember(
-  tank: TankDefinition,
-  provisionDefinitions: ProvisionDefinitions,
-) {
-  const turret = tank.turrets.at(-1)!;
-  const gun = turret.guns.at(-1)!;
-
-  return {
-    camouflage: true,
-    consumables: [],
-    equipmentMatrix: genericDefaultEquipmentMatrix,
-    cooldownBooster: 0,
-    provisions: createDefaultProvisions(tank, gun, provisionDefinitions),
-    engine: tank.engines.at(-1)!,
-    gun,
-    shell: tank.turrets.at(-1)!.guns.at(-1)!.shells[0],
-    tank,
-    track: tank.tracks.at(-1)!,
-    turret,
-    assaultDistance: (gun.assault_ranges?.ranges[0].distance ?? 0) / 2,
-  } satisfies DuelMember;
-}
-
-export const defaultEqualizer: Equalizer = {
-  armor: 1,
-  damage: 1,
-  health: 1,
-  module_health: 1,
-  penetration: 1,
-};

packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx

@@ -4,7 +4,6 @@ import { computeCharacteristics } from "../../../../../blitzkit/computeCharacter
 import { withErrorWrapper } from "../../../../../hocs/withErrorWrapper";
 import { withLocale } from "../../../../../hocs/withLocale";
 import { useAwait } from "../../../../../hooks/useAwait";
-import { useEquipment } from "../../../../../hooks/useEquipment";
 import { Tankopedia } from "../../../../../stores/tankopedia";
 import styles from "./_index.module.css";
 
@@ -19,7 +18,7 @@ export const Page = withErrorWrapper(
     Tankopedia.useInitialization(protagonistTank);
 
     const protagonist = Tankopedia.use((state) => state.protagonist);
-    const protagonistEquipment = useEquipment(protagonistTank.tank!);
+    // const protagonistEquipment = useEquipment(protagonistTank.tank!);
 
     const characteristics = useMemo(
       () => computeCharacteristics(),

packages/website/src/stores/duel/constants.ts

@@ -1,7 +0,0 @@
-import type { EquipmentMatrix } from '.';
-
-export const genericDefaultEquipmentMatrix: EquipmentMatrix = [
-  [-1, 1, -1],
-  [0, 0, 0],
-  [0, 0, 0],
-];

packages/website/src/stores/duel/index.ts

@@ -1,56 +0,0 @@
-import {
-  ModelDefinition,
-  type EngineDefinition,
-  type GunDefinition,
-  type ShellDefinition,
-  type TankDefinition,
-  type TrackDefinition,
-  type TurretDefinition,
-} from "@blitzkit/core";
-import { Varuna } from "varuna";
-import { api } from "../../blitzkit/api";
-import { tankToDuelMember } from "../../core/blitzkit/tankToDuelMember";
-
-type EquipmentMatrixItem = -1 | 0 | 1;
-type EquipmentMatrixRow = [
-  EquipmentMatrixItem,
-  EquipmentMatrixItem,
-  EquipmentMatrixItem,
-];
-export type EquipmentMatrix = [
-  EquipmentMatrixRow,
-  EquipmentMatrixRow,
-  EquipmentMatrixRow,
-];
-
-export interface DuelMember {
-  tank: TankDefinition;
-  engine: EngineDefinition;
-  turret: TurretDefinition;
-  gun: GunDefinition;
-  shell: ShellDefinition;
-  track: TrackDefinition;
-  equipmentMatrix: EquipmentMatrix;
-  consumables: number[];
-  provisions: number[];
-  camouflage: boolean;
-  cooldownBooster: number;
-  assaultDistance: number;
-}
-
-export interface DuelStore {
-  protagonist: DuelMember;
-  antagonist: DuelMember;
-  equalize: boolean;
-}
-
-const provisionDefinitions = await api.provisions();
-
-export const Duel = new Varuna<
-  DuelStore,
-  { tank: TankDefinition; model: ModelDefinition }
->(({ tank, model }) => {
-  const protagonist = tankToDuelMember(tank, provisionDefinitions);
-
-  return { protagonist, antagonist: protagonist, model, equalize: false };
-});

packages/website/src/stores/tankopedia.ts

@@ -1,6 +1,11 @@
 import {
   createDefaultSkills,
+  EngineDefinition,
+  GunDefinition,
   ShellDefinition,
+  TankDefinition,
+  TrackDefinition,
+  TurretDefinition,
   type ModelDefinition,
 } from "@blitzkit/core";
 import type { Vector3 } from "three";
@@ -9,6 +14,8 @@ import { api } from "../blitzkit/api";
 import type { ArmorType } from "../components/Armor/components/SpacedArmorScene";
 import type { ExternalModuleVariant } from "../components/Armor/components/SpacedArmorSceneComponent";
 import type { XP_MULTIPLIERS } from "../components/Tankopedia/TechTreeSection";
+import { createTankState } from "../tankopedia/createTankState";
+import type { EquipmentMatrix } from "./duel";
 import { TankopediaDisplay } from "./tankopediaPersistent/constants";
 
 export interface ShotLayerBase {
@@ -76,13 +83,34 @@ export enum TankopediaRelativeAgainst {
   All,
 }
 
+export interface TankState {
+  tank: TankDefinition;
+  model: ModelDefinition;
+
+  engine: EngineDefinition;
+  turret: TurretDefinition;
+  gun: GunDefinition;
+  shell: ShellDefinition;
+  track: TrackDefinition;
+
+  equipment_matrix: EquipmentMatrix;
+
+  consumables: number[];
+  provisions: number[];
+  camouflage: boolean;
+  cooldown_booster: number;
+  assault_distance: number;
+}
+
 interface Tankopedia {
   disturbed: boolean;
   revealed: boolean;
+
+  protagonist: TankState;
+
   shot?: Shot;
   skills: Record<string, number>;
   relativeAgainst: TankopediaRelativeAgainst;
-  model: ModelDefinition;
   editStatic: boolean;
   highlightArmor?: {
     editingPlate: boolean;
@@ -105,15 +133,19 @@ interface Tankopedia {
   statSearch?: string;
 }
 
-const skillDefinitions = await api.skills();
+const skills = await api.skills();
+const models = await api.models();
 
-export const Tankopedia = new Varuna<Tankopedia, ModelDefinition>((model) => ({
+export const Tankopedia = new Varuna<Tankopedia, TankDefinition>((tank) => ({
   disturbed: false,
   revealed: false,
+
+  protagonist: createTankState(tank),
+  model: models.models[tank.id],
+
   relativeAgainst: TankopediaRelativeAgainst.Class,
   editStatic: false,
-  skills: createDefaultSkills(skillDefinitions),
-  model,
+  skills: createDefaultSkills(skills),
   xpMultiplier: 1,
   requestedDisplay: TankopediaDisplay.Model,
   display: TankopediaDisplay.Model,

packages/website/src/tankopedia/createTankState.ts

@@ -0,0 +1,38 @@
+import { createDefaultProvisions, type TankDefinition } from "@blitzkit/core";
+import { api } from "../blitzkit/api";
+import type { EquipmentMatrix } from "../stores/duel";
+import type { TankState } from "../stores/tankopedia";
+
+const models = await api.models();
+const provisions = await api.provisions();
+const scripts = await api.scripts();
+
+export const genericDefaultEquipmentMatrix: EquipmentMatrix = [
+  [-1, 1, -1],
+  [0, 0, 0],
+  [0, 0, 0],
+];
+
+export function createTankState(tank: TankDefinition) {
+  const turret = tank.turrets.at(-1)!;
+  const gun = turret.guns.at(-1)!;
+
+  return {
+    tank,
+    model: models.models[turret.id],
+
+    engine: tank.engines.at(-1)!,
+    turret,
+    gun,
+    shell: gun.shells[0],
+    track: tank.tracks.at(-1)!,
+
+    equipment_matrix: genericDefaultEquipmentMatrix,
+
+    consumables: [],
+    provisions: createDefaultProvisions(tank, gun, provisions, scripts),
+    camouflage: true,
+    cooldown_booster: 0,
+    assault_distance: (gun.assault_ranges?.ranges[0].distance ?? 0) / 2,
+  } satisfies TankState;
+}