From 31d48d092641bf410978e3d3e11eaec4cb3a9d4f Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Wed, 2 Mar 2022 13:42:42 -0500
Subject: [PATCH 1/2] Drive UI

---
 .../Propulsion/Drive}/Engine.stories.svelte   | 12 ++++----
 .../Propulsion/Drive}/index.svelte            |  7 ++---
 .../ShipEdit/Propulsion/index.svelte          | 11 ++++++++
 src/lib/components/ShipEdit/index.svelte      |  3 ++
 src/lib/shipDux/engine.js                     |  8 +++---
 src/lib/shipDux/index.js                      |  5 ++--
 src/lib/shipDux/propulsion/drive.js           | 28 +++++++++++++++++++
 src/lib/shipDux/propulsion/index.js           | 12 ++++++++
 8 files changed, 70 insertions(+), 16 deletions(-)
 rename src/lib/components/{Engine => ShipEdit/Propulsion/Drive}/Engine.stories.svelte (75%)
 rename src/lib/components/{Engine => ShipEdit/Propulsion/Drive}/index.svelte (83%)
 create mode 100644 src/lib/components/ShipEdit/Propulsion/index.svelte
 create mode 100644 src/lib/shipDux/propulsion/drive.js
 create mode 100644 src/lib/shipDux/propulsion/index.js

diff --git a/src/lib/components/Engine/Engine.stories.svelte b/src/lib/components/ShipEdit/Propulsion/Drive/Engine.stories.svelte
similarity index 75%
rename from src/lib/components/Engine/Engine.stories.svelte
rename to src/lib/components/ShipEdit/Propulsion/Drive/Engine.stories.svelte
index 6000962..3e3fa70 100644
--- a/src/lib/components/Engine/Engine.stories.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Drive/Engine.stories.svelte
@@ -1,6 +1,6 @@
 <Meta
-  title="Engine"
-  component={Engine}
+  title="ShipEdit/Propulsion/Drive"
+  component={Drive}
   argTypes={{
     rating: { type: "number", defaultValue: 6 },
     advanced: { type: "boolean", defaultValue: false },
@@ -12,7 +12,7 @@
 
 <Template let:args>
   <div style="width: 50em">
-    <Engine {...args} />
+    <Drive {...args} />
   </div>
 </Template>
 
@@ -22,10 +22,12 @@
 
   import { setContext } from "svelte";
 
-  import Engine from "./index.svelte";
+  import Drive from "./index.svelte";
 
   setContext("ship", {
-    dispatch: (type, detail) => action(type)(detail),
+      dispatch: {
+          setDrive: action('setDrive')
+      },
   });
 
   let advanced = false;
diff --git a/src/lib/components/Engine/index.svelte b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
similarity index 83%
rename from src/lib/components/Engine/index.svelte
rename to src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
index c106aea..9af3248 100644
--- a/src/lib/components/Engine/index.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
@@ -17,11 +17,10 @@
   export let advanced = false;
   export let rating = 0;
 
-  const ship = getContext("ship") || {
-    dispatch: (...args) => console.log(args),
-  };
+  const ship = getContext("ship");
 
-  $: ship.dispatch("setEngine", { rating, advanced });
+  console.log( ship.dispatch )
+  $: ship.dispatch.setDrive({ rating, advanced });
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/Propulsion/index.svelte b/src/lib/components/ShipEdit/Propulsion/index.svelte
new file mode 100644
index 0000000..d5b446a
--- /dev/null
+++ b/src/lib/components/ShipEdit/Propulsion/index.svelte
@@ -0,0 +1,11 @@
+<Section label="propulsion">
+    <Drive { ...propulsion.drive  } />
+</Section>
+
+<script>
+  import Section from "$lib/components/Section/index.svelte";
+  import Drive from './Drive/index.svelte';
+
+  export let propulsion = {};
+  $: console.log(propulsion)
+</script>
diff --git a/src/lib/components/ShipEdit/index.svelte b/src/lib/components/ShipEdit/index.svelte
index 5a96ab0..c745b75 100644
--- a/src/lib/components/ShipEdit/index.svelte
+++ b/src/lib/components/ShipEdit/index.svelte
@@ -4,11 +4,14 @@
     <ShipCost {...$shipState.reqs} />
 </div>
 
+<Propulsion propulsion={$shipState.propulsion}/>
+
 <script>
     import { getContext } from "svelte";
 
     import Identification from "./Identification/index.svelte";
     import ShipCost from "./ShipCost.svelte";
+    import Propulsion from "./Propulsion/index.svelte";
 
     const { state: shipState } = getContext("ship");
 </script>
diff --git a/src/lib/shipDux/engine.js b/src/lib/shipDux/engine.js
index d0d4d70..1e33ed8 100644
--- a/src/lib/shipDux/engine.js
+++ b/src/lib/shipDux/engine.js
@@ -10,13 +10,13 @@ const dux = new Updux({
     advanced: false,
   },
   actions: {
-    setEngine: null,
-    setEngineReqs: null,
+    setDrive: null,
+    setDriveReqs: null,
   },
 });
 
-dux.setMutation("setEngine", (changes) => u(changes));
-dux.setMutation("setEngineReqs", (reqs) => u({ reqs }));
+dux.setMutation("setDrive", (changes) => u(changes));
+dux.setMutation("setDriveReqs", (reqs) => u({ reqs }));
 
 export function calcDriveReqs(shipMass, rating, advanced = false) {
   const mass = Math.ceil(rating * 0.05 * shipMass);
diff --git a/src/lib/shipDux/index.js b/src/lib/shipDux/index.js
index 3cf5750..cbe4fde 100644
--- a/src/lib/shipDux/index.js
+++ b/src/lib/shipDux/index.js
@@ -1,14 +1,13 @@
 import { Updux } from "updux";
 import u from 'updeep';
 
-import engine from "./engine.js";
+import propulsion from "./propulsion/index.js";
 import identification from "./identification.js";
-import reqs from "./reqs.js";
 
 const dux = new Updux({
   subduxes: {
     identification,
-    engine,
+    propulsion
   },
   initial: {
     reqs: { cost: 0, mass: 10, usedMass: 0 },
diff --git a/src/lib/shipDux/propulsion/drive.js b/src/lib/shipDux/propulsion/drive.js
new file mode 100644
index 0000000..ec9ca64
--- /dev/null
+++ b/src/lib/shipDux/propulsion/drive.js
@@ -0,0 +1,28 @@
+import { Updux } from "updux";
+import u from "updeep";
+
+import reqs from "../reqs.js";
+
+const dux = new Updux({
+  subduxes: { reqs },
+  initial: {
+    rating: 1,
+    advanced: false,
+  },
+  actions: {
+    setDrive: null,
+    setDriveReqs: null,
+  },
+});
+
+dux.setMutation("setDrive", (changes) => u(changes));
+dux.setMutation("setDriveReqs", (reqs) => u({ reqs }));
+
+export function calcDriveReqs(shipMass, rating, advanced = false) {
+  const mass = Math.ceil(rating * 0.05 * shipMass);
+  const cost = mass * (advanced ? 3 : 2);
+
+  return { mass, cost };
+}
+
+export default dux;
diff --git a/src/lib/shipDux/propulsion/index.js b/src/lib/shipDux/propulsion/index.js
new file mode 100644
index 0000000..e9cb366
--- /dev/null
+++ b/src/lib/shipDux/propulsion/index.js
@@ -0,0 +1,12 @@
+import { Updux } from "updux";
+import u from 'updeep';
+
+import drive from './drive.js';
+
+const dux = new Updux({
+  subduxes: {
+        drive
+  },
+});
+
+export default dux;

From b350c714c441499f4ef9360283616177d8c55bb6 Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Wed, 2 Mar 2022 14:00:18 -0500
Subject: [PATCH 2/2] Drive dux

---
 src/lib/shipDux/index.js            |  3 +++
 src/lib/shipDux/propulsion/drive.js | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/lib/shipDux/index.js b/src/lib/shipDux/index.js
index cbe4fde..e03e866 100644
--- a/src/lib/shipDux/index.js
+++ b/src/lib/shipDux/index.js
@@ -3,6 +3,7 @@ import u from 'updeep';
 
 import propulsion from "./propulsion/index.js";
 import identification from "./identification.js";
+import { calculateDriveReqs } from './propulsion/drive.js';
 
 const dux = new Updux({
   subduxes: {
@@ -19,4 +20,6 @@ const dux = new Updux({
 
 dux.setMutation( 'setShipMass', mass => u({reqs: {mass}}) );
 
+dux.addReaction( calculateDriveReqs );
+
 export default dux;
diff --git a/src/lib/shipDux/propulsion/drive.js b/src/lib/shipDux/propulsion/drive.js
index ec9ca64..f165e7d 100644
--- a/src/lib/shipDux/propulsion/drive.js
+++ b/src/lib/shipDux/propulsion/drive.js
@@ -1,5 +1,6 @@
 import { Updux } from "updux";
 import u from "updeep";
+import { createSelector } from "reselect";
 
 import reqs from "../reqs.js";
 
@@ -18,6 +19,18 @@ const dux = new Updux({
 dux.setMutation("setDrive", (changes) => u(changes));
 dux.setMutation("setDriveReqs", (reqs) => u({ reqs }));
 
+// needs to be at the top level
+export const calculateDriveReqs = store =>
+  createSelector(
+    [
+      (ship) => ship.reqs.mass,
+      (ship) => ship.propulsion.drive.rating,
+      (ship) => ship.propulsion.drive.advanced,
+    ],
+    (ship_mass, rating, advanced) =>
+      store.dispatch.setDriveReqs(calcDriveReqs(ship_mass, rating, advanced))
+      );
+
 export function calcDriveReqs(shipMass, rating, advanced = false) {
   const mass = Math.ceil(rating * 0.05 * shipMass);
   const cost = mass * (advanced ? 3 : 2);