feat: migrated duel store

src/components/Armor/components/CoreArmorScene.tsx

@@ -10,7 +10,7 @@ import { nameToArmorId } from '../../../core/blitzkit/nameToArmorId';
 import { resolveArmor } from '../../../core/blitzkit/resolveThickness';
 import { useArmor } from '../../../hooks/useArmor';
 import { useModelDefinitions } from '../../../hooks/useModelDefinitions';
-import { useDuel } from '../../../stores/duel';
+import * as Duel from '../../../stores/duel';
 import * as TankopediaPersistent from '../../../stores/tankopediaPersistent';
 import { CoreArmorSceneComponent } from './CoreArmorSceneComponent';
 import { ShotDisplay } from './ShotDisplay';
@@ -22,7 +22,7 @@ export const CoreArmorScene = memo(() => {
   const gunContainer = useRef<Group>(null);
   const tankopediaPersistentStore = TankopediaPersistent.useStore();
   const initialTankopediaState = tankopediaPersistentStore.getState();
-  const protagonist = useDuel((draft) => draft.protagonist!);
+  const protagonist = Duel.use((draft) => draft.protagonist);
 
   useEffect(() => {
     if (!modelDefinitions) return;
@@ -110,10 +110,10 @@ export const CoreArmorScene = memo(() => {
     return unsubscribe;
   });
 
-  const tank = useDuel((state) => state.protagonist!.tank);
-  const track = useDuel((state) => state.protagonist!.track);
-  const turret = useDuel((state) => state.protagonist!.turret);
-  const gun = useDuel((state) => state.protagonist!.gun);
+  const tank = Duel.use((state) => state.protagonist!.tank);
+  const track = Duel.use((state) => state.protagonist!.track);
+  const turret = Duel.use((state) => state.protagonist!.turret);
+  const gun = Duel.use((state) => state.protagonist!.gun);
   const armorGltf = useArmor(tank.id);
   const armorNodes = Object.values(armorGltf.nodes);
   const tankModelDefinition = modelDefinitions[tank.id];

src/components/Armor/components/CoreArmorSceneComponent/index.tsx

@@ -9,7 +9,7 @@ import { resolvePenetrationCoefficient } from '../../../../core/blitz/resolvePen
 import { hasEquipment } from '../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../core/blitzkit/jsxTree';
 import { ShellDefinition } from '../../../../core/blitzkit/tankDefinitions';
-import { EquipmentMatrix, useDuel } from '../../../../stores/duel';
+import * as Duel from '../../../../stores/duel';
 import * as TankopediaPersistent from '../../../../stores/tankopediaPersistent';
 import fragmentShader from './shaders/fragment.glsl';
 import vertexShader from './shaders/vertex.glsl';
@@ -29,6 +29,7 @@ export function CoreArmorSceneComponent({
   thickness,
 }: CoreArmorSceneComponentProps) {
   const tankopediaPersistentStore = TankopediaPersistent.useStore();
+  const duelStore = Duel.useStore();
   const material = new ShaderMaterial({
     fragmentShader,
     vertexShader,
@@ -70,7 +71,7 @@ export function CoreArmorSceneComponent({
       material.uniforms.damage.value = shell.damage.armor;
       material.uniforms.explosionRadius.value = shell.explosionRadius;
 
-      const duel = useDuel.getState();
+      const duel = duelStore.getState();
       await handleProtagonistEquipmentChange(duel.protagonist!.equipmentMatrix);
       await handleAntagonistEquipmentChange(duel.antagonist!.equipmentMatrix);
     }
@@ -83,9 +84,9 @@ export function CoreArmorSceneComponent({
       material.wireframe = visual.wireframe;
     }
     async function handleProtagonistEquipmentChange(
-      equipment: EquipmentMatrix,
+      equipment: Duel.EquipmentMatrix,
     ) {
-      const duel = useDuel.getState();
+      const duel = duelStore.getState();
       const hasEnhancedArmor = await hasEquipment(
         110,
         duel.protagonist!.tank.equipment,
@@ -95,8 +96,10 @@ export function CoreArmorSceneComponent({
         ? thickness * 1.03
         : thickness;
     }
-    async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
-      const duel = useDuel.getState();
+    async function handleAntagonistEquipmentChange(
+      equipment: Duel.EquipmentMatrix,
+    ) {
+      const duel = duelStore.getState();
       const shell = duel.antagonist!.shell;
       const penetration = resolveNearPenetration(shell.penetration);
       const hasCalibratedShells = await hasEquipment(
@@ -110,26 +113,29 @@ export function CoreArmorSceneComponent({
         resolvePenetrationCoefficient(hasCalibratedShells, shell.type);
     }
 
-    handleShellChange(useDuel.getState().antagonist!.shell);
+    handleShellChange(duelStore.getState().antagonist!.shell);
     handleVisualChange(tankopediaPersistentStore.getState().model.visual);
     handleProtagonistEquipmentChange(
-      useDuel.getState().protagonist!.equipmentMatrix,
+      duelStore.getState().protagonist!.equipmentMatrix,
     );
     handleAntagonistEquipmentChange(
-      useDuel.getState().antagonist!.equipmentMatrix,
+      duelStore.getState().antagonist!.equipmentMatrix,
     );
 
     const unsubscribes = [
-      useDuel.subscribe((state) => state.antagonist!.shell, handleShellChange),
+      duelStore.subscribe(
+        (state) => state.antagonist!.shell,
+        handleShellChange,
+      ),
       tankopediaPersistentStore.subscribe(
         (state) => state.model.visual,
         handleVisualChange,
       ),
-      useDuel.subscribe(
+      duelStore.subscribe(
         (state) => state.protagonist!.equipmentMatrix,
         handleProtagonistEquipmentChange,
       ),
-      useDuel.subscribe(
+      duelStore.subscribe(
         (state) => state.antagonist!.equipmentMatrix,
         handleAntagonistEquipmentChange,
       ),

src/components/Armor/components/SpacedArmorScene.tsx

@@ -11,7 +11,7 @@ import { resolveArmor } from '../../../core/blitzkit/resolveThickness';
 import { useArmor } from '../../../hooks/useArmor';
 import { useModel } from '../../../hooks/useModel';
 import { useModelDefinitions } from '../../../hooks/useModelDefinitions';
-import { useDuel } from '../../../stores/duel';
+import * as Duel from '../../../stores/duel';
 import * as TankopediaPersistent from '../../../stores/tankopediaPersistent';
 import { SpacedArmorSceneComponent } from './SpacedArmorSceneComponent';
 
@@ -32,7 +32,7 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
   const gunContainer = useRef<Group>(null);
   const tankopediaPersistentStore = TankopediaPersistent.useStore();
   const initialTankopediaState = tankopediaPersistentStore.getState();
-  const protagonist = useDuel((draft) => draft.protagonist!);
+  const protagonist = Duel.use((draft) => draft.protagonist);
 
   useEffect(() => {
     if (!modelDefinitions) return;
@@ -120,10 +120,10 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
     return unsubscribe;
   });
 
-  const tank = useDuel((state) => state.protagonist!.tank);
-  const track = useDuel((state) => state.protagonist!.track);
-  const turret = useDuel((state) => state.protagonist!.turret);
-  const gun = useDuel((state) => state.protagonist!.gun);
+  const tank = Duel.use((state) => state.protagonist!.tank);
+  const track = Duel.use((state) => state.protagonist!.track);
+  const turret = Duel.use((state) => state.protagonist!.turret);
+  const gun = Duel.use((state) => state.protagonist!.gun);
   const armorGltf = useArmor(tank.id);
   const { gltf: modelGltf } = useModel(tank.id);
   const armorNodes = Object.values(armorGltf.nodes);

src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx

@@ -12,7 +12,7 @@ import { resolvePenetrationCoefficient } from '../../../../../../core/blitz/reso
 import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../../../core/blitzkit/jsxTree';
 import { ShellDefinition } from '../../../../../../core/blitzkit/tankDefinitions';
-import { EquipmentMatrix, useDuel } from '../../../../../../stores/duel';
+import * as Duel from '../../../../../../stores/duel';
 import { ArmorType } from '../../../SpacedArmorScene';
 import fragmentShader from './shaders/fragment.glsl';
 import vertexShader from './shaders/vertex.glsl';
@@ -30,6 +30,7 @@ export function SpacedArmorSubExternal({
   variant,
   clip,
 }: SpacedArmorSubExternalProps) {
+  const duelStore = Duel.useStore();
   const material = new ShaderMaterial({
     fragmentShader,
     vertexShader,
@@ -53,9 +54,9 @@ export function SpacedArmorSubExternal({
       );
     }
     async function handleProtagonistEquipmentChange(
-      equipment: EquipmentMatrix,
+      equipment: Duel.EquipmentMatrix,
     ) {
-      const duel = useDuel.getState();
+      const duel = duelStore.getState();
       const hasEnhancedArmor = await hasEquipment(
         110,
         duel.protagonist!.tank.equipment,
@@ -65,8 +66,10 @@ export function SpacedArmorSubExternal({
         ? thickness * 1.03
         : thickness;
     }
-    async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
-      const duel = useDuel.getState();
+    async function handleAntagonistEquipmentChange(
+      equipment: Duel.EquipmentMatrix,
+    ) {
+      const duel = duelStore.getState();
       const shell = duel.antagonist!.shell;
       const penetration = resolveNearPenetration(shell.penetration);
       const hasCalibratedShells = await hasEquipment(
@@ -80,21 +83,24 @@ export function SpacedArmorSubExternal({
         resolvePenetrationCoefficient(hasCalibratedShells, shell.type);
     }
 
-    handleShellChange(useDuel.getState().antagonist!.shell);
+    handleShellChange(duelStore.getState().antagonist!.shell);
     handleProtagonistEquipmentChange(
-      useDuel.getState().protagonist!.equipmentMatrix,
+      duelStore.getState().protagonist!.equipmentMatrix,
     );
     handleAntagonistEquipmentChange(
-      useDuel.getState().antagonist!.equipmentMatrix,
+      duelStore.getState().antagonist!.equipmentMatrix,
     );
 
     const unsubscribes = [
-      useDuel.subscribe((state) => state.antagonist!.shell, handleShellChange),
-      useDuel.subscribe(
+      duelStore.subscribe(
+        (state) => state.antagonist!.shell,
+        handleShellChange,
+      ),
+      duelStore.subscribe(
         (state) => state.protagonist!.equipmentMatrix,
         handleProtagonistEquipmentChange,
       ),
-      useDuel.subscribe(
+      duelStore.subscribe(
         (state) => state.antagonist!.equipmentMatrix,
         handleAntagonistEquipmentChange,
       ),

src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx

@@ -13,7 +13,7 @@ import { resolvePenetrationCoefficient } from '../../../../../../core/blitz/reso
 import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../../../core/blitzkit/jsxTree';
 import { ShellDefinition } from '../../../../../../core/blitzkit/tankDefinitions';
-import { EquipmentMatrix, useDuel } from '../../../../../../stores/duel';
+import * as Duel from '../../../../../../stores/duel';
 import { ArmorType } from '../../../SpacedArmorScene';
 import fragmentShader from './shaders/fragment.glsl';
 import vertexShader from './shaders/vertex.glsl';
@@ -32,6 +32,7 @@ export function SpacedArmorSubSpaced({
   node,
   thickness,
 }: SpacedArmorSubSpacedProps) {
+  const duelStore = Duel.useStore();
   const material = new ShaderMaterial({
     fragmentShader,
     vertexShader,
@@ -63,9 +64,9 @@ export function SpacedArmorSubSpaced({
       );
     }
     async function handleProtagonistEquipmentChange(
-      equipment: EquipmentMatrix,
+      equipment: Duel.EquipmentMatrix,
     ) {
-      const duel = useDuel.getState();
+      const duel = duelStore.getState();
       const hasEnhancedArmor = await hasEquipment(
         110,
         duel.protagonist!.tank.equipment,
@@ -75,9 +76,11 @@ export function SpacedArmorSubSpaced({
         ? thickness * 1.03
         : thickness;
     }
-    async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
-      const duel = useDuel.getState();
-      const shell = useDuel.getState().antagonist!.shell;
+    async function handleAntagonistEquipmentChange(
+      equipment: Duel.EquipmentMatrix,
+    ) {
+      const duel = duelStore.getState();
+      const shell = duelStore.getState().antagonist!.shell;
       const penetration = resolveNearPenetration(shell.penetration);
       const hasCalibratedShells = await hasEquipment(
         103,
@@ -90,21 +93,24 @@ export function SpacedArmorSubSpaced({
         resolvePenetrationCoefficient(hasCalibratedShells, shell.type);
     }
 
-    handleShellChange(useDuel.getState().antagonist!.shell);
+    handleShellChange(duelStore.getState().antagonist!.shell);
     handleProtagonistEquipmentChange(
-      useDuel.getState().protagonist!.equipmentMatrix,
+      duelStore.getState().protagonist!.equipmentMatrix,
     );
     handleAntagonistEquipmentChange(
-      useDuel.getState().antagonist!.equipmentMatrix,
+      duelStore.getState().antagonist!.equipmentMatrix,
     );
 
     const unsubscribes = [
-      useDuel.subscribe((state) => state.antagonist!.shell, handleShellChange),
-      useDuel.subscribe(
+      duelStore.subscribe(
+        (state) => state.antagonist!.shell,
+        handleShellChange,
+      ),
+      duelStore.subscribe(
         (state) => state.protagonist!.equipmentMatrix,
         handleProtagonistEquipmentChange,
       ),
-      useDuel.subscribe(
+      duelStore.subscribe(
         (state) => state.antagonist!.equipmentMatrix,
         handleAntagonistEquipmentChange,
       ),

src/components/Armor/components/SpacedArmorSceneComponent/index.tsx

@@ -16,7 +16,7 @@ import { resolvePenetrationCoefficient } from '../../../../core/blitz/resolvePen
 import { hasEquipment } from '../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../core/blitzkit/jsxTree';
 import { ShellType } from '../../../../core/blitzkit/tankDefinitions';
-import { useDuel } from '../../../../stores/duel';
+import * as Duel from '../../../../stores/duel';
 import * as TankopediaEphemeral from '../../../../stores/tankopediaEphemeral';
 import { ArmorType } from '../SpacedArmorScene';
 import { SpacedArmorSubExternal } from './components/SpacedArmorSubExternal';
@@ -74,6 +74,7 @@ export function SpacedArmorSceneComponent({
 }: SpacedArmorSceneComponentProps) {
   const tankopediaEphemeralStore = TankopediaEphemeral.useStore();
   const camera = useThree((state) => state.camera);
+  const duelStore = Duel.useStore();
 
   async function shoot(
     point: Vector3,
@@ -81,7 +82,7 @@ export function SpacedArmorSceneComponent({
     allowRicochet: boolean,
     remainingPenetrationInput?: number,
   ) {
-    const { antagonist, protagonist } = useDuel.getState();
+    const { antagonist, protagonist } = duelStore.getState();
     const shell = antagonist!.shell;
     const cameraNormal = camera.position.clone().sub(point).normalize();
     const shot: TankopediaEphemeral.Shot = {