From b18017d7533ec0b5af50666bd98140a4863a05ef Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Mon, 20 Mar 2023 11:59:50 -0400
Subject: [PATCH] story for ShipItem

---
 histoire.config.js                            |   6 +
 package.json                                  |   3 +
 ...story.svelte => Carrier.story.svelte.todo} |   0
 .../Carrier/{stories.js => stories.js.todo}   |   0
 ...s.svelte => Changelog.stories.svelte.todo} |   0
 ...st.story.svelte => Cost.story.svelte.todo} |   0
 .../components/CostMass/index.story.svelte    |   9 ++
 .../index.svelte}                             |   4 +-
 .../Field/{stories.js => stories.js.todo}     |   0
 .../Ftl/{stories.js => stories.js.todo}       |   0
 ...ries.svelte => Armour.stories.svelte.todo} |   0
 ...s.svelte => Integrity.stories.svelte.todo} |   0
 .../Integrity/{stories.js => stories.js.todo} |   0
 .../{stories.js => stories.js.todo}           |   0
 ...ories.svelte => Print.stories.svelte.todo} |   0
 ...es.svelte => Firecons.stories.svelte.todo} |   0
 ...ies.svelte => Screens.stories.svelte.todo} |   0
 .../Weapons/{stories.js => stories.js.todo}   |   0
 ...ies.svelte => Carrier.stories.svelte.todo} |   0
 ...lte => Identification.stories.svelte.todo} |   0
 .../ShipEdit/Identification/index.svelte      |   4 +-
 ...ries.svelte => Engine.stories.svelte.todo} |   0
 .../ShipEdit/Propulsion/Drive/index.svelte    |  11 +-
 src/lib/components/ShipEdit/ShipCost.svelte   | 130 +++++++++---------
 ...es.svelte => ShipEdit.stories.svelte.todo} |   0
 ...es.svelte => Weaponry.stories.svelte.todo} |   0
 src/lib/components/ShipItem.story.svelte      |  14 ++
 .../index.svelte => ShipItem.svelte}          |   7 +-
 .../Armour/{stories.js => stories.js.todo}    |   0
 .../Weapons/{stories.js => stories.js.todo}   |   0
 src/lib/shipDux/engine.ts                     |  48 +++----
 src/lib/shipDux/identification.ts             |  48 ++++---
 src/lib/shipDux/index.ts                      |  14 +-
 src/lib/shipDux/propulsion/index.ts           |   5 +
 src/lib/shipDux/shipReqs.ts                   |   2 +
 src/lib/store/ship.js                         |  43 +++---
 vite.config.js                                |   8 +-
 37 files changed, 209 insertions(+), 147 deletions(-)
 create mode 100644 histoire.config.js
 rename src/lib/components/Carrier/{Carrier.story.svelte => Carrier.story.svelte.todo} (100%)
 rename src/lib/components/Carrier/{stories.js => stories.js.todo} (100%)
 rename src/lib/components/{Changelog.stories.svelte => Changelog.stories.svelte.todo} (100%)
 rename src/lib/components/{Cost.story.svelte => Cost.story.svelte.todo} (100%)
 create mode 100644 src/lib/components/CostMass/index.story.svelte
 rename src/lib/components/{CostMass.svelte => CostMass/index.svelte} (76%)
 rename src/lib/components/Field/{stories.js => stories.js.todo} (100%)
 rename src/lib/components/Ftl/{stories.js => stories.js.todo} (100%)
 rename src/lib/components/Output/Print/Hull/{Armour.stories.svelte => Armour.stories.svelte.todo} (100%)
 rename src/lib/components/Output/Print/Hull/Integrity/{Integrity.stories.svelte => Integrity.stories.svelte.todo} (100%)
 rename src/lib/components/Output/Print/Hull/Integrity/{stories.js => stories.js.todo} (100%)
 rename src/lib/components/Output/Print/MainSystems/{stories.js => stories.js.todo} (100%)
 rename src/lib/components/Output/Print/{Print.stories.svelte => Print.stories.svelte.todo} (100%)
 rename src/lib/components/Output/Print/Systems/Firecons/{Firecons.stories.svelte => Firecons.stories.svelte.todo} (100%)
 rename src/lib/components/Output/Print/Systems/Screens/{Screens.stories.svelte => Screens.stories.svelte.todo} (100%)
 rename src/lib/components/Output/Print/Weapons/{stories.js => stories.js.todo} (100%)
 rename src/lib/components/ShipEdit/Carrier/{Carrier.stories.svelte => Carrier.stories.svelte.todo} (100%)
 rename src/lib/components/ShipEdit/Identification/{Identification.stories.svelte => Identification.stories.svelte.todo} (100%)
 rename src/lib/components/ShipEdit/Propulsion/Drive/{Engine.stories.svelte => Engine.stories.svelte.todo} (100%)
 rename src/lib/components/ShipEdit/{ShipEdit.stories.svelte => ShipEdit.stories.svelte.todo} (100%)
 rename src/lib/components/ShipEdit/Weaponry/{Weaponry.stories.svelte => Weaponry.stories.svelte.todo} (100%)
 create mode 100644 src/lib/components/ShipItem.story.svelte
 rename src/lib/components/{ShipItem/index.svelte => ShipItem.svelte} (90%)
 rename src/lib/components/Structure/Armour/{stories.js => stories.js.todo} (100%)
 rename src/lib/components/Weapons/{stories.js => stories.js.todo} (100%)

diff --git a/histoire.config.js b/histoire.config.js
new file mode 100644
index 0000000..0427fca
--- /dev/null
+++ b/histoire.config.js
@@ -0,0 +1,6 @@
+import { defineConfig } from "histoire";
+import { HstSvelte } from "@histoire/plugin-svelte";
+
+export default defineConfig({
+  plugins: [HstSvelte()],
+});
diff --git a/package.json b/package.json
index ea1eb2c..28c710f 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "format": "prettier --write ."
   },
   "devDependencies": {
+    "@histoire/plugin-svelte": "^0.15.9",
     "@sveltejs/adapter-static": "^1.0.0-next.28",
     "@sveltejs/kit": "^1.10.0",
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.38",
@@ -28,11 +29,13 @@
     "vitest-svelte-kit": "^0.0.6"
   },
   "dependencies": {
+    "@picocss/pico": "^1.5.7",
     "@reduxjs/toolkit": "^1.9.3",
     "@sveltejs/adapter-node": "^1.0.0-next.0",
     "@yanick/updeep-remeda": "^2.1.0",
     "chota": "^0.8.0",
     "effector": "^22.5.2",
+    "histoire": "^0.15.9",
     "lodash": "^4.17.21",
     "redux": "^4.1.2",
     "remeda": "^1.1.0",
diff --git a/src/lib/components/Carrier/Carrier.story.svelte b/src/lib/components/Carrier/Carrier.story.svelte.todo
similarity index 100%
rename from src/lib/components/Carrier/Carrier.story.svelte
rename to src/lib/components/Carrier/Carrier.story.svelte.todo
diff --git a/src/lib/components/Carrier/stories.js b/src/lib/components/Carrier/stories.js.todo
similarity index 100%
rename from src/lib/components/Carrier/stories.js
rename to src/lib/components/Carrier/stories.js.todo
diff --git a/src/lib/components/Changelog.stories.svelte b/src/lib/components/Changelog.stories.svelte.todo
similarity index 100%
rename from src/lib/components/Changelog.stories.svelte
rename to src/lib/components/Changelog.stories.svelte.todo
diff --git a/src/lib/components/Cost.story.svelte b/src/lib/components/Cost.story.svelte.todo
similarity index 100%
rename from src/lib/components/Cost.story.svelte
rename to src/lib/components/Cost.story.svelte.todo
diff --git a/src/lib/components/CostMass/index.story.svelte b/src/lib/components/CostMass/index.story.svelte
new file mode 100644
index 0000000..a8ed7e8
--- /dev/null
+++ b/src/lib/components/CostMass/index.story.svelte
@@ -0,0 +1,9 @@
+<Hst.Story title="CostMass">
+  <CostMass mass={12} cost={21} />
+</Hst.Story>
+
+<script>
+  export let Hst;
+
+  import CostMass from "./index.svelte";
+</script>
diff --git a/src/lib/components/CostMass.svelte b/src/lib/components/CostMass/index.svelte
similarity index 76%
rename from src/lib/components/CostMass.svelte
rename to src/lib/components/CostMass/index.svelte
index f00e986..024aaf6 100644
--- a/src/lib/components/CostMass.svelte
+++ b/src/lib/components/CostMass/index.svelte
@@ -1,8 +1,8 @@
-<div class="mass">{mass}<img src="{base}/mass.svg" alt="mass"/></div>
+<div class="mass">{mass}<img src="{base}/mass.svg" alt="mass" /></div>
 <div class="cost">{cost}</div>
 
 <script>
-    import { base } from '$app/paths';
+  import { base } from "$app/paths";
   export let mass;
   export let cost;
 </script>
diff --git a/src/lib/components/Field/stories.js b/src/lib/components/Field/stories.js.todo
similarity index 100%
rename from src/lib/components/Field/stories.js
rename to src/lib/components/Field/stories.js.todo
diff --git a/src/lib/components/Ftl/stories.js b/src/lib/components/Ftl/stories.js.todo
similarity index 100%
rename from src/lib/components/Ftl/stories.js
rename to src/lib/components/Ftl/stories.js.todo
diff --git a/src/lib/components/Output/Print/Hull/Armour.stories.svelte b/src/lib/components/Output/Print/Hull/Armour.stories.svelte.todo
similarity index 100%
rename from src/lib/components/Output/Print/Hull/Armour.stories.svelte
rename to src/lib/components/Output/Print/Hull/Armour.stories.svelte.todo
diff --git a/src/lib/components/Output/Print/Hull/Integrity/Integrity.stories.svelte b/src/lib/components/Output/Print/Hull/Integrity/Integrity.stories.svelte.todo
similarity index 100%
rename from src/lib/components/Output/Print/Hull/Integrity/Integrity.stories.svelte
rename to src/lib/components/Output/Print/Hull/Integrity/Integrity.stories.svelte.todo
diff --git a/src/lib/components/Output/Print/Hull/Integrity/stories.js b/src/lib/components/Output/Print/Hull/Integrity/stories.js.todo
similarity index 100%
rename from src/lib/components/Output/Print/Hull/Integrity/stories.js
rename to src/lib/components/Output/Print/Hull/Integrity/stories.js.todo
diff --git a/src/lib/components/Output/Print/MainSystems/stories.js b/src/lib/components/Output/Print/MainSystems/stories.js.todo
similarity index 100%
rename from src/lib/components/Output/Print/MainSystems/stories.js
rename to src/lib/components/Output/Print/MainSystems/stories.js.todo
diff --git a/src/lib/components/Output/Print/Print.stories.svelte b/src/lib/components/Output/Print/Print.stories.svelte.todo
similarity index 100%
rename from src/lib/components/Output/Print/Print.stories.svelte
rename to src/lib/components/Output/Print/Print.stories.svelte.todo
diff --git a/src/lib/components/Output/Print/Systems/Firecons/Firecons.stories.svelte b/src/lib/components/Output/Print/Systems/Firecons/Firecons.stories.svelte.todo
similarity index 100%
rename from src/lib/components/Output/Print/Systems/Firecons/Firecons.stories.svelte
rename to src/lib/components/Output/Print/Systems/Firecons/Firecons.stories.svelte.todo
diff --git a/src/lib/components/Output/Print/Systems/Screens/Screens.stories.svelte b/src/lib/components/Output/Print/Systems/Screens/Screens.stories.svelte.todo
similarity index 100%
rename from src/lib/components/Output/Print/Systems/Screens/Screens.stories.svelte
rename to src/lib/components/Output/Print/Systems/Screens/Screens.stories.svelte.todo
diff --git a/src/lib/components/Output/Print/Weapons/stories.js b/src/lib/components/Output/Print/Weapons/stories.js.todo
similarity index 100%
rename from src/lib/components/Output/Print/Weapons/stories.js
rename to src/lib/components/Output/Print/Weapons/stories.js.todo
diff --git a/src/lib/components/ShipEdit/Carrier/Carrier.stories.svelte b/src/lib/components/ShipEdit/Carrier/Carrier.stories.svelte.todo
similarity index 100%
rename from src/lib/components/ShipEdit/Carrier/Carrier.stories.svelte
rename to src/lib/components/ShipEdit/Carrier/Carrier.stories.svelte.todo
diff --git a/src/lib/components/ShipEdit/Identification/Identification.stories.svelte b/src/lib/components/ShipEdit/Identification/Identification.stories.svelte.todo
similarity index 100%
rename from src/lib/components/ShipEdit/Identification/Identification.stories.svelte
rename to src/lib/components/ShipEdit/Identification/Identification.stories.svelte.todo
diff --git a/src/lib/components/ShipEdit/Identification/index.svelte b/src/lib/components/ShipEdit/Identification/index.svelte
index 6d79133..d9abc10 100644
--- a/src/lib/components/ShipEdit/Identification/index.svelte
+++ b/src/lib/components/ShipEdit/Identification/index.svelte
@@ -27,8 +27,8 @@
   $: if (shipTypes.length > 0 && !shipTypes.includes(shipType))
     shipType = shipTypes[0];
 
-  $: ship.dispatch.setShipType(shipType);
-  $: ship.dispatch.setShipClass(shipClass);
+  $: ship.dispatch(ship.actions.setShipType(shipType));
+  $: ship.dispatch(ship.actions.setShipClass(shipClass));
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/Propulsion/Drive/Engine.stories.svelte b/src/lib/components/ShipEdit/Propulsion/Drive/Engine.stories.svelte.todo
similarity index 100%
rename from src/lib/components/ShipEdit/Propulsion/Drive/Engine.stories.svelte
rename to src/lib/components/ShipEdit/Propulsion/Drive/Engine.stories.svelte.todo
diff --git a/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
index 75d8eef..d54cf84 100644
--- a/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
@@ -1,7 +1,14 @@
 <ShipItem {...reqs}>
   <div>
     <Field label="thrust rating">
-      <input class="short" type="number" bind:value={rating} min="0" max="20" step="1" />
+      <input
+        class="short"
+        type="number"
+        bind:value={rating}
+        min="0"
+        max="20"
+        step="1"
+      />
     </Field>
 
     <label><input type="checkbox" bind:checked={advanced} /> advanced</label>
@@ -19,7 +26,7 @@
 
   const ship = getContext("ship");
 
-  $: ship.dispatch.setDrive({ rating, advanced });
+  $: ship.dispatch(ship.actions.setDrive({ rating, advanced }));
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/ShipCost.svelte b/src/lib/components/ShipEdit/ShipCost.svelte
index 1482eb1..c06dcd1 100644
--- a/src/lib/components/ShipEdit/ShipCost.svelte
+++ b/src/lib/components/ShipEdit/ShipCost.svelte
@@ -1,87 +1,87 @@
 <div class="mass">
-    <Field label="ship tonnage">
-        <input class="short" bind:value={mass} type="number" min="10" max="300" />
-        <img class="mass_symbol" src="{base}/mass.svg" alt="mass"/>
+  <Field label="ship tonnage">
+    <input class="short" bind:value={mass} type="number" min="10" max="300" />
+    <img class="mass_symbol" src="{base}/mass.svg" alt="mass" />
 
-        <div class="note" class:warning={!withinBudget}>
-            {#if withinBudget}
-                mass unused: {massUnused}
-            {:else}
-                excessive mass: {-massUnused}
-            {/if}
-        </div>
-    </Field>
+    <div class="note" class:warning={!withinBudget}>
+      {#if withinBudget}
+        mass unused: {massUnused}
+      {:else}
+        excessive mass: {-massUnused}
+      {/if}
+    </div>
+  </Field>
 </div>
 
 <div class="cost">
-    <Field label="cost">
-        <span class="cost">{cost}</span>
-    </Field>
+  <Field label="cost">
+    <span class="cost">{cost}</span>
+  </Field>
 </div>
 
 <script>
-    import { base } from '$app/paths';
-    import { getContext } from "svelte";
-    import Field from "$lib/components/Field/index.svelte";
+  import { base } from "$app/paths";
+  import { getContext } from "svelte";
+  import Field from "$lib/components/Field/index.svelte";
 
-    export let ship = getContext("ship");
+  export let ship = getContext("ship");
 
-    export let mass = 10;
-    export let cost = 10;
-    export let usedMass = 5;
+  export let mass = 10;
+  export let cost = 10;
+  export let usedMass = 5;
 
-    $: massUnused = mass - usedMass;
-    $: withinBudget = massUnused >= 0;
+  $: massUnused = mass - usedMass;
+  $: withinBudget = massUnused >= 0;
 
-    $: ship.dispatch.setShipMass(mass);
+  $: ship.dispatch(ship.actions.setShipMass(mass));
 
-    /*   const change_tonnage = ({ target: { value } }) => */
-    /*     ship.dispatch(ship.actions.set_ship_mass(parseInt(value))); */
+  /*   const change_tonnage = ({ target: { value } }) => */
+  /*     ship.dispatch(ship.actions.set_ship_mass(parseInt(value))); */
 
-    /*   let mass_unused; */
-    /*   $: mass_unused = $ship.general.mass - $ship.general.used_mass; */
+  /*   let mass_unused; */
+  /*   $: mass_unused = $ship.general.mass - $ship.general.used_mass; */
 
-    /*   let within_budget = true; */
+  /*   let within_budget = true; */
 
-    /*   $: within_budget = mass_unused >= 0; */
+  /*   $: within_budget = mass_unused >= 0; */
 </script>
 
 <style>
-    .ship_cost {
-        display: flex;
-        grid-column: span 3;
-        justify-content: space-around;
-    }
-    input {
-        width: 5em;
-        display: inline !important;
-    }
-    .mass_symbol {
-        width: 0.75em;
-        display: inline-block;
-        margin-left: 0.5em;
-    }
-    .warning {
-        color: red;
-    }
-    .note {
-        font-size: smaller;
-    }
+  .ship_cost {
+    display: flex;
+    grid-column: span 3;
+    justify-content: space-around;
+  }
+  input {
+    width: 5em;
+    display: inline !important;
+  }
+  .mass_symbol {
+    width: 0.75em;
+    display: inline-block;
+    margin-left: 0.5em;
+  }
+  .warning {
+    color: red;
+  }
+  .note {
+    font-size: smaller;
+  }
 
-    .mass,
-    div.cost {
-        padding: 0px 2em;
-        justify-self: right;
-    }
+  .mass,
+  div.cost {
+    padding: 0px 2em;
+    justify-self: right;
+  }
 
-    .mass {
-        width: 15em;
-    }
-    div.cost {
-        grid-column: 3;
-    }
-    span.cost:after {
-        content: "\00A4";
-        margin-left: 0.5em;
-    }
+  .mass {
+    width: 15em;
+  }
+  div.cost {
+    grid-column: 3;
+  }
+  span.cost:after {
+    content: "\00A4";
+    margin-left: 0.5em;
+  }
 </style>
diff --git a/src/lib/components/ShipEdit/ShipEdit.stories.svelte b/src/lib/components/ShipEdit/ShipEdit.stories.svelte.todo
similarity index 100%
rename from src/lib/components/ShipEdit/ShipEdit.stories.svelte
rename to src/lib/components/ShipEdit/ShipEdit.stories.svelte.todo
diff --git a/src/lib/components/ShipEdit/Weaponry/Weaponry.stories.svelte b/src/lib/components/ShipEdit/Weaponry/Weaponry.stories.svelte.todo
similarity index 100%
rename from src/lib/components/ShipEdit/Weaponry/Weaponry.stories.svelte
rename to src/lib/components/ShipEdit/Weaponry/Weaponry.stories.svelte.todo
diff --git a/src/lib/components/ShipItem.story.svelte b/src/lib/components/ShipItem.story.svelte
new file mode 100644
index 0000000..4b18500
--- /dev/null
+++ b/src/lib/components/ShipItem.story.svelte
@@ -0,0 +1,14 @@
+<Hst.Story>
+  <ShipItem {mass} {cost}>Thingy</ShipItem>
+  <svelte:fragment slot="controls">
+    <Hst.Number bind:value={mass} title="Mass" />
+    <Hst.Number bind:value={cost} title="Cost" />
+  </svelte:fragment>
+</Hst.Story>
+
+<script>
+  export let Hst;
+  import ShipItem from "./ShipItem.svelte";
+  let mass = 1;
+  let cost = 3;
+</script>
diff --git a/src/lib/components/ShipItem/index.svelte b/src/lib/components/ShipItem.svelte
similarity index 90%
rename from src/lib/components/ShipItem/index.svelte
rename to src/lib/components/ShipItem.svelte
index f5fdce4..61a2194 100644
--- a/src/lib/components/ShipItem/index.svelte
+++ b/src/lib/components/ShipItem.svelte
@@ -2,14 +2,15 @@
   <div><slot /></div>
 
   <div class="reqs">
-    <div class="mass" bind:this={mass_el}>{mass} <img src="{base}/mass.svg"
-            alt="mass"/></div>
+    <div class="mass" bind:this={mass_el}>
+      {mass} <img src="{base}/mass.svg" alt="mass" />
+    </div>
     <div class="cost" bind:this={cost_el}>{cost}</div>
   </div>
 </div>
 
 <script>
-  import { base } from '$app/paths';
+  import { base } from "$app/paths";
   import { tick } from "svelte";
 
   export let mass;
diff --git a/src/lib/components/Structure/Armour/stories.js b/src/lib/components/Structure/Armour/stories.js.todo
similarity index 100%
rename from src/lib/components/Structure/Armour/stories.js
rename to src/lib/components/Structure/Armour/stories.js.todo
diff --git a/src/lib/components/Weapons/stories.js b/src/lib/components/Weapons/stories.js.todo
similarity index 100%
rename from src/lib/components/Weapons/stories.js
rename to src/lib/components/Weapons/stories.js.todo
diff --git a/src/lib/shipDux/engine.ts b/src/lib/shipDux/engine.ts
index b98a6c0..4d0511d 100644
--- a/src/lib/shipDux/engine.ts
+++ b/src/lib/shipDux/engine.ts
@@ -5,36 +5,38 @@ import u from "updeep";
 import { Reqs, reqs } from "./reqs.js";
 
 const initialState = {
-    rating: 1,
-    advanced: false,
-    reqs,
+  rating: 1,
+  advanced: false,
+  reqs,
 };
 
 const engine = createSlice({
-    name: "engine",
-    initialState,
-    reducers: {
-        setDriveRating(state, action: PayloadAction<number>) {
-            state.rating = action.payload;
-        },
-        setDriveAdvanced(state, action: PayloadAction<boolean>) {
-            state.advanced = action.payload;
-        },
-        setDriverReqs(state, action: PayloadAction<Reqs>) {
-            state.reqs = action.payload;
-        },
+  name: "engine",
+  initialState,
+  reducers: {
+    setDriveRating(state, action: PayloadAction<number>) {
+      state.rating = action.payload;
     },
+    setDriveAdvanced(state, action: PayloadAction<boolean>) {
+      state.advanced = action.payload;
+    },
+    setDriverReqs(state, action: PayloadAction<Reqs>) {
+      state.reqs = action.payload;
+    },
+  },
 });
 
-export function calcDriveReqs(
-    shipMass: number,
-    rating: number,
-    advanced = false
-) {
-    const mass = Math.ceil(rating * 0.05 * shipMass);
-    const cost = mass * (advanced ? 3 : 2);
+export const { actions, reducer } = engine;
 
-    return { mass, cost };
+export function calcDriveReqs(
+  shipMass: number,
+  rating: number,
+  advanced = false
+) {
+  const mass = Math.ceil(rating * 0.05 * shipMass);
+  const cost = mass * (advanced ? 3 : 2);
+
+  return { mass, cost };
 }
 
 export default engine;
diff --git a/src/lib/shipDux/identification.ts b/src/lib/shipDux/identification.ts
index bdb647d..b7c3cfa 100644
--- a/src/lib/shipDux/identification.ts
+++ b/src/lib/shipDux/identification.ts
@@ -1,28 +1,32 @@
-import { Updux } from "updux";
-import u from "updeep";
+import { createSlice, type PayloadAction } from "@reduxjs/toolkit";
+import * as carrier from "./carrier.js";
 
-import carrier from "./carrier.js";
+const initialState = {
+  shipType: "",
+  shipClass: "",
+  isCarrier: false,
+  mass: 10,
+};
 
-const dux = new Updux({
-  actions: {
-    setShipType: null,
-    setShipClass: null,
-    setCarrierBays: carrier.actions.setCarrierBays,
+const identification = createSlice({
+  name: "identification",
+  initialState,
+  reducers: {
+    setShipType(state, action: PayloadAction<string>) {
+      state.shipType = action.payload;
+    },
+    setShipClass(state, action: PayloadAction<string>) {
+      state.shipClass = action.payload;
+    },
   },
-  initial: {
-    shipType: "",
-    shipClass: "",
-    isCarrier: false,
-    mass: 10,
+  extraReducers(builder) {
+    builder.addCase(
+      carrier.actions.setCarrierBays,
+      (state, action: PayloadAction<number>) => {
+        state.isCarrier = action.payload > 0;
+      }
+    );
   },
 });
 
-dux.setMutation("setShipType", (shipType) => u({ shipType }));
-dux.setMutation("setShipClass", (shipClass) => u({ shipClass }));
-dux.setMutation("setCarrierBays", (bays) =>
-  u({
-    isCarrier: bays > 0,
-  })
-);
-
-export default dux;
+export const { actions, reducer } = identification;
diff --git a/src/lib/shipDux/index.ts b/src/lib/shipDux/index.ts
index 448d316..98ea861 100644
--- a/src/lib/shipDux/index.ts
+++ b/src/lib/shipDux/index.ts
@@ -5,6 +5,9 @@ import * as propulsion from "./propulsion";
 import * as structure from "./structure";
 import * as weaponry from "./weaponry/index.js";
 import * as carrier from "./carrier";
+import * as identification from "./identification.js";
+import * as shipReqs from "./shipReqs";
+import * as engine from "./engine";
 
 const shipSlice = createSlice({
   name: "ship",
@@ -14,10 +17,12 @@ const shipSlice = createSlice({
     builder.addMatcher(
       () => true,
       combineReducers({
+        identification: identification.reducer,
         propulsion: propulsion.reducer,
         structure: structure.reducer,
         weaponry: weaponry.reducer,
         carrier: carrier.reducer,
+        engine: engine.reducer,
       })
     );
   },
@@ -29,11 +34,16 @@ export function createStore() {
   });
 }
 
-export const actions = shipSlice.actions;
+export const actions = {
+  ...shipReqs.actions,
+  ...shipSlice.actions,
+  ...identification.actions,
+  ...engine.actions,
+  ...propulsion.actions,
+};
 
 /**
 import * as propulsion from "./propulsion/index.js";
-import * as identification from "./identification.js";
 import { calculateDriveReqs } from "./propulsion/drive.js";
 import { ftlReqsReaction } from "./propulsion/ftl.js";
 import * as structure from "./structure/index.js";
diff --git a/src/lib/shipDux/propulsion/index.ts b/src/lib/shipDux/propulsion/index.ts
index 8c409d5..5a65446 100644
--- a/src/lib/shipDux/propulsion/index.ts
+++ b/src/lib/shipDux/propulsion/index.ts
@@ -11,3 +11,8 @@ export const initialState = {
   drive: drive.initialState,
   ftl: ftl.initialState,
 };
+
+export const actions = {
+  ...drive.actions,
+  ...ftl.actions,
+};
diff --git a/src/lib/shipDux/shipReqs.ts b/src/lib/shipDux/shipReqs.ts
index d3566ec..366a09d 100644
--- a/src/lib/shipDux/shipReqs.ts
+++ b/src/lib/shipDux/shipReqs.ts
@@ -22,3 +22,5 @@ const shipReqs = createSlice({
     },
   },
 });
+
+export const { actions, reducer } = shipReqs;
diff --git a/src/lib/store/ship.js b/src/lib/store/ship.js
index daab0da..a47360b 100644
--- a/src/lib/store/ship.js
+++ b/src/lib/store/ship.js
@@ -2,39 +2,38 @@ import { browser, dev } from "$app/environment";
 import { readable, get, derived } from "svelte/store";
 import { compose, applyMiddleware } from "redux";
 
-import shipDux from "../shipDux/index";
+import { createStore, actions } from "../shipDux/index";
 import { initial } from "lodash";
 
 let composeEnhancers = compose;
 
 if (dev && browser && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) {
-    composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__;
+  composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__;
 }
 
 export default (initialState = undefined) => {
-    if (browser) {
-        const i = localStorage.getItem("ship");
+  if (browser) {
+    const i = localStorage.getItem("ship");
 
-        if (i) initialState = JSON.parse(localStorage.getItem("ship"));
-    }
+    if (i) initialState = JSON.parse(localStorage.getItem("ship"));
+  }
 
-    const duxStore = shipDux.createStore(initialState, (mw) =>
-        composeEnhancers(applyMiddleware(mw))
-    );
+  const duxStore = createStore();
 
-    let previous;
-    const state = readable(duxStore.getState(), (set) => {
-        duxStore.subscribe(() => {
-            if (previous === duxStore.getState()) return;
-            previous = duxStore.getState();
-            set(previous);
-            if (browser) localStorage.setItem("ship", JSON.stringify(previous));
-        });
+  let previous;
+  const state = readable(duxStore.getState(), (set) => {
+    duxStore.subscribe(() => {
+      if (previous === duxStore.getState()) return;
+      previous = duxStore.getState();
+      set(previous);
+      if (browser) localStorage.setItem("ship", JSON.stringify(previous));
     });
+  });
 
-    return {
-        dispatch: duxStore.dispatch,
-        state,
-        shipMass: derived(state, (state) => state.reqs.mass),
-    };
+  return {
+    dispatch: duxStore.dispatch,
+    state,
+    actions,
+    shipMass: derived(state, (state) => state.reqs.mass),
+  };
 };
diff --git a/vite.config.js b/vite.config.js
index ffcacdb..948dbc9 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -3,10 +3,10 @@ import { sveltekit } from "@sveltejs/kit/vite";
 
 /** @type {import('vite').UserConfig} */
 const config = {
-  plugins: [sveltekit()],
-
-  ssr: {},
-  optimizeDeps: {},
+    plugins: [sveltekit()],
+    publicDir: "./static",
+    ssr: {},
+    optimizeDeps: {},
 };
 
 export default config;