back to storybook

.storybook/main.js

@@ -0,0 +1,34 @@
+const path = require("path");
+const preprocess = require("svelte-preprocess");
+
+module.exports = {
+  staticDirs: ["../static", "../pictures"],
+  stories: [
+    "../src/**/*.stories.mdx",
+    "../src/**/*.stories.svelte",
+    "../src/**/stories.svelte",
+  ],
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@storybook/addon-svelte-csf",
+  ],
+  framework: "@storybook/svelte",
+  svelteOptions: {
+    preprocess: preprocess(),
+  },
+  webpackFinal: async (config) => {
+    return {
+      ...config,
+      resolve: {
+        ...config.resolve,
+        alias: {
+          ...config.resolve?.alias,
+          $app: path.resolve("./fake/app"),
+          "\\$lib": path.resolve(__dirname, "../src/lib/"),
+          $lib: path.resolve(__dirname, "../src/lib/"),
+        },
+      },
+    };
+  },
+};

.storybook/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

.storybook/preview.js

@@ -0,0 +1,11 @@
+import "$lib/style/index.js";
+
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+};

.vitebook/App.svelte

@@ -1,5 +1,6 @@
+<svelte:component this={component} />
+
 <script>
+  import "$lib/style/index.js";
   export let component;
 </script>
-
-<svelte:component this={component} />

.vitebook/config.js

@@ -1,30 +1,30 @@
-import { svelte } from '@sveltejs/vite-plugin-svelte';
+import { svelte } from "@sveltejs/vite-plugin-svelte";
-import { clientPlugin, defineConfig } from '@vitebook/client/node';
+import { clientPlugin, defineConfig } from "@vitebook/client/node";
-import { defaultThemePlugin } from '@vitebook/theme-default/node';
+import { defaultThemePlugin } from "@vitebook/theme-default/node";
-import preprocess from 'svelte-preprocess';
+import preprocess from "svelte-preprocess";
 
 export default defineConfig({
-  include: ['src/**/*.story.svelte'],
+  include: ["src/**/*.story.svelte"],
   alias: {
-    $app: '/node_modules/@sveltejs/kit/assets/app',
+    $app: "/node_modules/@sveltejs/kit/assets/app",
-    $lib: '/src/lib',
+    $lib: "/src/lib",
   },
   plugins: [
-    clientPlugin({ appFile: 'App.svelte' }),
+    clientPlugin({ appFile: "App.svelte" }),
     defaultThemePlugin(),
     svelte({
       compilerOptions: {
-        hydratable: true
+        hydratable: true,
       },
-      extensions: ['.svelte'],
+      extensions: [".svelte"],
       // Consult https://github.com/sveltejs/svelte-preprocess for more information
       // about preprocessors.
       preprocess: preprocess(),
     }),
   ],
   site: {
-    title: '',
+    title: "",
-    description: '',
+    description: "",
     /** @type {(import('@vitebook/theme-default/node').DefaultThemeConfig} */
     theme: {},
   },

.vitebook/theme/index.js

@@ -1,3 +1,3 @@
-import Theme from '@vitebook/theme-default';
+import Theme from "@vitebook/theme-default";
 
 export default Theme;

package.json

@@ -7,6 +7,7 @@
     "preview": "svelte-kit preview",
     "lint": "prettier --check . && eslint --ignore-path .gitignore .",
     "format": "prettier --write .",
+    "storybook": "storybook-server",
     "vitebook:dev": "vitebook dev",
     "vitebook:build": "vitebook build",
     "vitebook:preview": "vitebook preview"
@@ -28,14 +29,21 @@
   },
   "type": "module",
   "dependencies": {
+    "@storybook/addon-actions": "^6.4.19",
+    "@storybook/addon-essentials": "^6.4.19",
+    "@storybook/addon-links": "6.4.19",
+    "@storybook/addon-svelte-csf": "^1.1.0",
+    "@storybook/svelte": "^6.4.19",
     "@sveltejs/adapter-node": "^1.0.0-next.0",
     "@yanick/updeep": "link:/home/yanick/work/javascript/updeep",
     "lodash": "^4.17.21",
     "redux": "^4.1.2",
     "reselect": "^4.1.5",
     "rollup-plugin-analyzer": "^4.0.0",
+    "svelte-knobby": "^0.3.4",
     "ts-action": "^11.0.0",
-    "updux": "link:/home/yanick/work/javascript/updux/"
+    "updux": "link:/home/yanick/work/javascript/updux/",
+    "webpack": "5"
   },
   "prettier": {
     "svelteSortOrder": "options-markup-scripts-styles",

src/lib/components/App-original.svelte

@@ -1,7 +1,5 @@
 <nav>
-  <button class="button is-danger" type="button" on:click={reset}
+  <button class="button is-danger" type="button" on:click={reset}>reset</button>
-    >reset</button
-  >
 
   <div class="spacer" />
 
@@ -15,9 +13,7 @@
       <button class="button" on:click={() => set_output("json")}>json</button>
     </p>
     <p class="control">
-      <button class="button" on:click={() => set_output("print")}
+      <button class="button" on:click={() => set_output("print")}>print</button>
-        >print</button
-      >
     </p>
   </div>
 </nav>
@@ -65,12 +61,7 @@
       <AddWeapon />
 
       {#each weapons as weapon (weapon.id)}
-        <Weapon
+        <Weapon {weapon} id={weapon.id} cost={weapon.cost} mass={weapon.mass} />
-          {weapon}
-          id={weapon.id}
-          cost={weapon.cost}
-          mass={weapon.mass}
-        />
       {/each}
     </Section>
 

src/lib/components/App.svelte

@@ -2,10 +2,8 @@
 <Header />
 
 <script>
-import Ribbon from './Ribbon.svelte';
+  import Ribbon from "./Ribbon.svelte";
-import Header from './Header.svelte';
+  import Header from "./Header.svelte";
-
-
 </script>
 
 <style>

src/lib/components/Carrier/Carrier.story.svelte

@@ -0,0 +1,14 @@
+<Carrier />
+
+<script>
+  import Carrier from "./index.svelte";
+
+  const props = {
+    bays: 3,
+    squadrons: [
+      { id: 1, type: "standard", ftl: false, nbr_fighters: 6 },
+      { id: 2, type: "fast", ftl: false, nbr_fighters: 6 },
+      { id: 3, type: "none", ftl: false, nbr_fighters: 6 },
+    ],
+  };
+</script>

src/lib/components/Carrier/Squadron/index.svelte

@@ -1,4 +1,4 @@
-<ShipItem {cost} {mass} >
+<ShipItem {cost} {mass}>
   <Field label={`squadron ${id}`}>
     <select bind:value={type}>
       {#each types as type (type)}
@@ -9,30 +9,29 @@
 </ShipItem>
 
 <script>
-  import {getContext } from 'svelte';
+  import { getContext } from "svelte";
 
   import Section from "$lib/components/Section/index.svelte";
   import Field from "$lib/components/Field/index.svelte";
   import ShipItem from "$lib/components/ShipItem/index.svelte";
-  import dux from '$lib/dux/carrier';
+  import dux from "$lib/dux/carrier";
-  import squadron_types from '$lib/dux/carrier/squadron_types';
+  import squadron_types from "$lib/dux/carrier/squadron_types";
 
-  const types = squadron_types.map( ({type}) => type );
+  const types = squadron_types.map(({ type }) => type);
 
   export let id = 1;
   export let type = "standard";
   export let ftl = false;
-  export let cost =0;
+  export let cost = 0;
   export let mass = 0;
 
-  export let ship = getContext('ship');
+  export let ship = getContext("ship");
-
-  $: ship?.dispatch_action('set_squadron',{ id, type, });
 
+  $: ship?.dispatch_action("set_squadron", { id, type });
 </script>
 
 <style>
-div {
+  div {
     background-color: red;
-}
+  }
 </style>

src/lib/components/Carrier/index.svelte

@@ -1,3 +1,4 @@
+<!--
 <Section label="carrier">
   <ShipItem {cost} {mass}>
     <Field label="bays">
@@ -9,15 +10,18 @@
     <Squadron {...squad} />
   {/each}
 </Section>
+-->
+
+Hey!
 
 <script>
   import { getContext } from "svelte";
 
-  import Section from "../Section/index.svelte";
+  /* import Section from "../Section/index.svelte"; */
-  import Field from "../Field/index.svelte";
+  /* import Field from "../Field/index.svelte"; */
-  import ShipItem from "../ShipItem/index.svelte";
+  /* import ShipItem from "../ShipItem/index.svelte"; */
-  import Squadron from "./Squadron/index.svelte";
+  //  import Squadron from "./Squadron/index.svelte";
-  import dux from "../../dux/carrier";
+  //  import dux from "../../dux/carrier";
 
   export let bays = 0;
   export let squadrons = [];
@@ -26,6 +30,5 @@
 
   export let ship = getContext("ship");
 
-  $: ship?.dispatch_action('set_carrier_bays',bays);
+  $: ship?.dispatch_action("set_carrier_bays", bays);
-
 </script>

src/lib/components/Carrier/stories.js

@@ -1,9 +1,9 @@
-import { action } from '@storybook/addon-actions';
+import { action } from "@storybook/addon-actions";
 
-import Carrier from './index.svelte';
+import Carrier from "./index.svelte";
 
 export default {
-    title: 'Carrier',
+  title: "Carrier",
 };
 
 export const basic = () => ({
@@ -15,6 +15,6 @@ export const basic = () => ({
       { id: 2, type: "fast", ftl: false, nbr_fighters: 6 },
       { id: 3, type: "none", ftl: false, nbr_fighters: 6 },
     ],
-        ship_change: action('ship_change'),
+    ship_change: action("ship_change"),
   },
-})
+});

src/lib/components/Cost.story.svelte

@@ -1,5 +1,5 @@
-<Cost cost={12}/>
+<Cost cost={12} />
 
 <script>
-import Cost from './Cost.svelte';
+  import Cost from "./Cost.svelte";
 </script>

src/lib/components/Cost.svelte

@@ -5,5 +5,8 @@
 </script>
 
 <style>
-  div:after { content: '\00A4'; margin-left: 0.5em; }
+  div:after {
+    content: "\00A4";
+    margin-left: 0.5em;
+  }
 </style>

src/lib/components/CostMass.svelte

@@ -1,21 +1,29 @@
-<div class="mass">{ mass }</div>
+<div class="mass">{mass}</div>
-<div class="cost">{ cost }</div>
+<div class="cost">{cost}</div>
 
 <script>
   export let mass;
   export let cost;
-
 </script>
 
 <style>
-  .cost { grid-column: 3; }
+  .cost {
-  .mass { grid-column: 2; }
+    grid-column: 3;
+  }
+  .mass {
+    grid-column: 2;
+  }
   img {
     width: 0.75em;
   }
-  .cost:after { content: '\00A4'; margin-left: 0.5em; }
+  .cost:after {
-  .mass:after { content: url("/mass.svg"); width: 0.75em; display:
+    content: "\00A4";
-  inline-block; margin-left: 0.5em; }
+    margin-left: 0.5em;
-
+  }
-
+  .mass:after {
+    content: url("/mass.svg");
+    width: 0.75em;
+    display: inline-block;
+    margin-left: 0.5em;
+  }
 </style>

src/lib/components/Engine/Engine.stories.svelte

@@ -0,0 +1,33 @@
+<Meta
+  title="Engine"
+  component={Engine}
+  argTypes={{
+    rating: { type: "number", defaultValue: 6 },
+    advanced: { type: "boolean", defaultValue: false },
+    reqs: { type: "object", defaultValue: { cost: 6, mass: 3 } },
+  }}
+/>
+
+<Story name="Primary" args={{}} />
+
+<Template let:args>
+  <div style="width: 50em">
+    <Engine {...args} />
+  </div>
+</Template>
+
+<script>
+  import { Meta, Template, Story } from "@storybook/addon-svelte-csf";
+  import { action } from "@storybook/addon-actions";
+
+  import { setContext } from "svelte";
+
+  import Engine from "./index.svelte";
+
+  setContext("ship", {
+    dispatch: (type, detail) => action(type)(detail),
+  });
+
+  let advanced = false;
+  let rating = 0;
+</script>

src/lib/components/Engine/index.svelte

@@ -1,40 +1,39 @@
-<ShipItem {cost} {mass}>
+<ShipItem {...reqs}>
-
+  <div>
-<div>
+    <Field label="thrust rating">
-<Field label="thrust rating">
+      <input type="number" bind:value={rating} min="0" max="20" step="1" />
-    <input type="number" bind:value={ rating }
+    </Field>
-        min="0" max="20" step="1" />
-</Field>
-
-<label><input type="checkbox" bind:checked={advanced} /> advanced</label>
-</div>
 
+    <label><input type="checkbox" bind:checked={advanced} /> advanced</label>
+  </div>
 </ShipItem>
 
-
 <script>
-    import { createEventDispatcher } from 'svelte';
+  import { getContext } from "svelte";
+  import Field from "$lib/components/Field/index.svelte";
+  import ShipItem from "$lib/components/ShipItem/index.svelte";
 
-  import Field from '$lib/components/Field/index.svelte';
+  export let reqs = {};
-  import ShipItem from '$lib/components/ShipItem/index.svelte';
-
-    export let cost;
-    export let mass;
   export let advanced = false;
   export let rating = 0;
 
-    const dispatch = createEventDispatcher();
+  const ship = getContext("ship") || {
-
+    dispatch: (...args) => console.log(args),
-console.log(advanced);
+  };
-    $: dispatch( 'change_engine', { rating, advanced } );
 
+  $: ship.dispatch("setEngine", { rating, advanced });
 </script>
 
 <style>
-div {
+  div {
     display: flex;
     align-items: end;
-}
+  }
-label { margin-left: 2em; }
+  label {
-  input[type="number"] { width: 5em; }
+    font-family: var(--main-font-family);
+    margin-left: 2em;
+  }
+  input[type="number"] {
+    width: 5em;
+  }
 </style>

src/lib/components/Field/BasicStory.svelte

@@ -1,5 +1,5 @@
 <Field label="the label" />
 
 <script>
-import Field from './index.svelte';
+  import Field from "./index.svelte";
 </script>

src/lib/components/Field/index.svelte

@@ -1,10 +1,10 @@
 <div>
-{#if label}
+  {#if label}
-<label>{label}</label>
+    <label>{label}</label>
-{/if}
+  {/if}
-<slot>
+  <slot>
-<input type="text" {placeholder} {value} on:change />
+    <input type="text" {placeholder} {value} on:change />
-</slot>
+  </slot>
 </div>
 
 <script>
@@ -14,16 +14,19 @@
 </script>
 
 <style>
+  div {
+    font-family: var(--main-font-family);
+  }
   div > :global(*) {
     margin-left: 1em;
   }
   div > label {
     margin-left: 0em;
   }
-label {
+  label {
     font-size: var(--font-scale-8);
     font-weight: lighter;
     font-family: Dosis;
     color: var(--indigo-dye);
-}
+  }
 </style>

src/lib/components/Field/stories.js

@@ -1,10 +1,10 @@
-import Component from './index.svelte';
+import Component from "./index.svelte";
-import BasicStory from './BasicStory.svelte';
+import BasicStory from "./BasicStory.svelte";
 
-import '../../../public/global.css';
+import "../../../public/global.css";
 
 export default {
-    title: 'Field'
+  title: "Field",
 };
 
 export const basic = () => ({

src/lib/components/Firecons.svelte

@@ -5,15 +5,16 @@
 </ShipItem>
 
 <script>
-import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
-  import ShipItem from './ShipItem/index.svelte';
+  import ShipItem from "./ShipItem/index.svelte";
-  import Field from './Field/index.svelte';
+  import Field from "./Field/index.svelte";
 
-    export let nbr, cost, mass = (0,0,0);
+  export let nbr,
+    cost,
+    mass = (0, 0, 0);
 
   const dispatch = createEventDispatcher();
-    $: dispatch( 'change_firecons', nbr);
+  $: dispatch("change_firecons", nbr);
-
 </script>
 
 <style>

src/lib/components/Ftl/index.svelte

@@ -1,35 +1,34 @@
+<ShipItem {mass} {cost}>
+  <Field label="FTL drive">
+    {#each types as t (t)}
+      <label
+        ><input type="radio" bind:group={type} value={t} on:change={change} />
+        {t}
+      </label>
+    {/each}
+  </Field>
+</ShipItem>
+
 <script>
-    import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
-    import ShipItem from '../ShipItem/index.svelte';
+  import ShipItem from "../ShipItem/index.svelte";
-    import Field from '../Field/index.svelte';
+  import Field from "../Field/index.svelte";
 
-    export let type = 'none';
+  export let type = "none";
   export let cost = 0;
   export let mass = 0;
 
   const dispatch = createEventDispatcher();
 
-    const change = () => dispatch( 'change_ftl', type );
+  const change = () => dispatch("change_ftl", type);
-
-    const types = [ 'none', 'standard', 'advanced' ];
-
 
+  const types = ["none", "standard", "advanced"];
 </script>
 
-<ShipItem {mass} {cost}>
-    <Field label="FTL drive">
-
-    {#each types as t (t)}
-        <label><input type="radio" bind:group={type} value={t} 
-            on:change={change} /> {t} </label>
-    {/each}
-    </Field>
-</ShipItem>
-
 <style>
-label {
+  label {
     display: inline;
     margin-right: 1em;
-}
+  }
 </style>

src/lib/components/Ftl/stories.js

@@ -1,13 +1,13 @@
 export default {
-    title: 'FTL Drive'
+  title: "FTL Drive",
 };
 
-import Component from '.';
+import Component from ".";
-import shipStore from '../../stores/ship.js';
+import shipStore from "../../stores/ship.js";
 
 export const basic = () => ({
   Component,
   props: {
-        ship: shipStore()
+    ship: shipStore(),
-    }
+  },
 });

src/lib/components/Header.svelte

@@ -1,11 +1,12 @@
 <header>
   <h1>The Docks</h1>
-  <h2>a <a
+  <h2>
-        href="https://shop.groundzerogames.co.uk/rules.html">Full Thrust</a> ship builder</h2>
+    a <a href="https://shop.groundzerogames.co.uk/rules.html">Full Thrust</a> ship
-  </header>
+    builder
-
+  </h2>
-  <style>
+</header>
 
+<style>
   header {
     display: flex;
     align-items: baseline;
@@ -13,7 +14,8 @@
     margin-left: auto;
     margin-right: auto;
   }
-  h1, h2 {
+  h1,
+  h2 {
     font-family: Faktos;
     padding: 0px;
     margin: 0px;
@@ -25,4 +27,4 @@
     padding-left: 2em;
     font-size: var(--font-scale-12);
   }
-  </style>
+</style>

src/lib/components/Hull/Armour/Layer/index.svelte

@@ -1,24 +1,22 @@
-<Field label={ `layer ${layer}` }>
+<Field label={`layer ${layer}`}>
   <input type="number" min="0" bind:value={rating} />
 </Field>
 
-
 <script>
-    import { getContext} from 'svelte';
+  import { getContext } from "svelte";
 
-    import Field from '$lib/components/Field/index.svelte';
+  import Field from "$lib/components/Field/index.svelte";
 
   export let layer = 1;
   export let rating = 0;
 
-    const ship = getContext('ship');
+  const ship = getContext("ship");
-
-    $: ship?.dispatch_action( 'set_armour_layer', {layer,rating} );
 
+  $: ship?.dispatch_action("set_armour_layer", { layer, rating });
 </script>
 
 <style>
   input {
     width: 5em;
   }
-  </style>
+</style>

src/lib/components/Hull/Armour/index.svelte

@@ -1,56 +1,48 @@
-<ShipItem {cost} {mass} >
+<ShipItem {cost} {mass}>
-
+  <div>
-<div>
+    <div class="nbr_layers">
-
+      <Field label="armour layers">
-<div class="nbr_layers">
-<Field label="armour layers">
         <input type="number" min="0" bind:value={nbr_layers} />
-</Field>
+      </Field>
-</div>
+    </div>
 
-<div class="layers">
+    <div class="layers">
-    {#each armour as layer ( layer.layer )}
+      {#each armour as layer (layer.layer)}
-        <Layer {...layer} on:ship_change/>
+        <Layer {...layer} on:ship_change />
       {/each}
-</div>
+    </div>
-
+  </div>
-
-</div>
-
 </ShipItem>
 
 <script>
-  import { createEventDispatcher} from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
-    import ShipItem from '$lib/components/ShipItem/index.svelte';
+  import ShipItem from "$lib/components/ShipItem/index.svelte";
-    import Field from '$lib/components/Field/index.svelte';
+  import Field from "$lib/components/Field/index.svelte";
-    import Layer from './Layer/index.svelte';
+  import Layer from "./Layer/index.svelte";
-    import dux from '$lib/dux/structure/armour';
+  import dux from "$lib/dux/structure/armour";
-    import _ from 'lodash';
+  import _ from "lodash";
 
   export let armour = [];
   export let cost = 0;
   export let mass = 0;
 
-    $: cost = _.sum( _.map( armour, 'cost' ) );
+  $: cost = _.sum(_.map(armour, "cost"));
-    $: mass = _.sum( _.map( armour, 'mass' ) );
+  $: mass = _.sum(_.map(armour, "mass"));
 
   let nbr_layers = armour.length;
 
   const dispatch = createEventDispatcher();
 
-    $: dispatch( 'ship_change', dux.actions.set_armour_nbr_layers(nbr_layers) );
+  $: dispatch("ship_change", dux.actions.set_armour_nbr_layers(nbr_layers));
-
 </script>
 
 <style>
   .layers {
     display: flex;
-
   }
 
   input {
     width: 5em;
   }
-
 </style>

src/lib/components/Hull/Armour/stories.js

@@ -1,4 +1,4 @@
-import Armour from './index.svelte';
+import Armour from "./index.svelte";
 
 export default {
   title: "Armour",
@@ -10,9 +10,9 @@ export const basic = () => ({
     armour: [
       { layer: 1, rating: 12, cost: 1, mass: 2 },
       { layer: 2, rating: 12, cost: 1, mass: 2 },
-        ]
+    ],
   },
   on: {
-        ship_change: ({detail}) => console.log(detail)
+    ship_change: ({ detail }) => console.log(detail),
-    }
+  },
 });

src/lib/components/Hull/Cargo/index.svelte

@@ -17,12 +17,10 @@
   export let mass = 0;
 
   $: ship?.dispatch_action("set_cargo", space);
-
 </script>
 
 <style>
   input {
     width: 5em;
   }
-
 </style>

src/lib/components/Hull/Screens/index.svelte

@@ -1,6 +1,5 @@
-<ShipItem { cost } { mass }>
+<ShipItem {cost} {mass}>
   <div>
-
     <Field label="screens">
       <input type="number" bind:value={standard} min="0" />
     </Field>
@@ -8,16 +7,15 @@
     <Field label="advanced screens">
       <input type="number" bind:value={advanced} min="0" />
     </Field>
-</div>
+  </div>
-
 </ShipItem>
 
 <script>
-    import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
-  import Section from '$lib/components/Section/index.svelte';
+  import Section from "$lib/components/Section/index.svelte";
-  import Field from '$lib/components/Field/index.svelte';
+  import Field from "$lib/components/Field/index.svelte";
-  import ShipItem from '../../ShipItem/index.svelte';
+  import ShipItem from "../../ShipItem/index.svelte";
 
   export let cost = 0;
   export let mass = 0;
@@ -28,7 +26,7 @@
 
   const dispatch = createEventDispatcher();
 
-    $: dispatch( 'set_screens', { standard, advanced } );
+  $: dispatch("set_screens", { standard, advanced });
 </script>
 
 <style>
@@ -39,4 +37,4 @@
     display: flex;
     gap: 2em;
   }
-  </style>
+</style>

src/lib/components/Hull/Streamlining/index.svelte

@@ -3,36 +3,39 @@
     <div>
       <label>
         <input type="radio" bind:group={type} value="none" />
-    none</label>
+        none</label
+      >
       <label>
-
         <input type="radio" bind:group={type} value="partial" />
-    partial</label>
+        partial</label
+      >
       <label>
         <input type="radio" bind:group={type} value="full" />
-    full</label>
+        full</label
+      >
     </div>
   </Field>
 </ShipItem>
 
-  <script>
+<script>
-  import ShipItem from '$lib/components/ShipItem/index.svelte';
+  import ShipItem from "$lib/components/ShipItem/index.svelte";
-  import Field from '$lib/components/Field/index.svelte';
+  import Field from "$lib/components/Field/index.svelte";
 
-  import {getContext } from 'svelte';
+  import { getContext } from "svelte";
 
-  export let type = 'none';
+  export let type = "none";
   export let cost = 0;
   export let mass = 0;
-  export let ship = getContext('ship');
+  export let ship = getContext("ship");
 
-  $: ship?.dispatch_action( 'set_streamlining', type);
+  $: ship?.dispatch_action("set_streamlining", type);
+</script>
 
-  </script>
+<style>
-
+  div {
-  <style>
+    display: flex;
-  div { display: flex }
+  }
   label {
     margin-left: 1em;
   }
-  </style>
+</style>

src/lib/components/Hull/index.svelte

@@ -1,37 +1,36 @@
 <Section label="hull">
-
+  <ShipItem {cost} {mass}>
-<ShipItem {cost} {mass} >
     <Field label="integrity">
-        <input
+      <input bind:value={rating} type="number" {min} {max} />
-            bind:value={rating}
-            type="number" {min} {max} />
     </Field>
-</ShipItem>
+  </ShipItem>
 
+  <Screens {...screens} on:set_screens />
 
-<Screens {...screens} on:set_screens />
+  <Armour {armour} on:ship_change />
 
-<Armour {armour} on:ship_change />
+  <Cargo {...cargo} on:set_cargo />
 
-<Cargo {...cargo} on:set_cargo />
+  <Streamlining {...streamlining} />
-
-<Streamlining {...streamlining} />
 </Section>
 
 <script>
-    import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
-  import Section from '../Section/index.svelte';
+  import Section from "../Section/index.svelte";
-  import Field from '../Field/index.svelte';
+  import Field from "../Field/index.svelte";
-  import ShipItem from '../ShipItem/index.svelte';
+  import ShipItem from "../ShipItem/index.svelte";
-  import Screens from './Screens/index.svelte';
+  import Screens from "./Screens/index.svelte";
-  import Armour from './Armour/index.svelte';
+  import Armour from "./Armour/index.svelte";
-  import Cargo from './Cargo/index.svelte';
+  import Cargo from "./Cargo/index.svelte";
-  import Streamlining from './Streamlining/index.svelte';
+  import Streamlining from "./Streamlining/index.svelte";
 
-    export let cost, mass, ship_mass, rating, screens, armour = (
+  export let cost,
-        0, 0, 10, 1, [], []
+    mass,
-    );
+    ship_mass,
+    rating,
+    screens,
+    armour = (0, 0, 10, 1, [], []);
 
   export let cargo = {};
   export let streamlining = {};
@@ -40,12 +39,13 @@
   $: min = Math.ceil(ship_mass / 10);
   $: max = ship_mass;
 
-const dispatch = createEventDispatcher();
+  const dispatch = createEventDispatcher();
-
-    $: dispatch( 'change_hull', { rating } );
 
+  $: dispatch("change_hull", { rating });
 </script>
 
 <style>
-  input { width: 5em; }
+  input {
+    width: 5em;
+  }
 </style>

src/lib/components/Notes.svelte

@@ -24,9 +24,9 @@
   </p>
 
   <p>
-    The app is mostly developed for Firefox. I also check as much as I can
+    The app is mostly developed for Firefox. I also check as much as I can that
-    that I don't mess things too badly on Chrome. For the other browsers...
+    I don't mess things too badly on Chrome. For the other browsers... caveat
-    caveat emptor.
+    emptor.
   </p>
 
   <p>

src/lib/components/Output/Json.svelte

@@ -5,13 +5,13 @@
 <script>
   export let ship = {};
   let json;
-  $: json = JSON.stringify(ship,null,2);
+  $: json = JSON.stringify(ship, null, 2);
 
-    import { fly, fade } from 'svelte/transition';
+  import { fly, fade } from "svelte/transition";
-    import {createEventDispatcher} from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
   const dispatch = createEventDispatcher();
-    const close = () => dispatch('close');
+  const close = () => dispatch("close");
 </script>
 
 <style>
@@ -20,13 +20,11 @@
     font-size: var(--font-scale-9);
     overflow: scroll;
     height: 90%;
-
   }
   div {
     text-align: right;
   }
   aside {
-
     padding: 1em;
     border: 3px solid var(--indigo-dye);
     border-radius: 1em;

src/lib/components/Output/Print/Hull/Armour/index.svelte

@@ -1,17 +1,15 @@
 <div class="layers">
   {#each armour as layer (layer)}
     <div class="layer">
-      {#each _.range(layer.rating) as i (i) }
+      {#each _.range(layer.rating) as i (i)}
-        <div class="cell">
+        <div class="cell" />
-        </div>
       {/each}
     </div>
   {/each}
-
 </div>
 
 <script>
-  import _ from 'lodash';
+  import _ from "lodash";
 
   export let armour = [];
 
@@ -19,14 +17,14 @@
 </script>
 
 <style>
-.cell {
+  .cell {
     display: inline-block;
     margin-right: 0.5em;
     width: 1em;
     height: 1em;
     border: 1px solid black;
     border-radius: 0.5em;
-}
+  }
   .layers {
     display: flex;
     flex-direction: column-reverse;

src/lib/components/Output/Print/Hull/Integrity/index.svelte

@@ -1,7 +1,7 @@
 <div>
-  {#each rows as row,i (i)}
+  {#each rows as row, i (i)}
     <div class="row">
-      {#each row as item,j (j)}
+      {#each row as item, j (j)}
         <div class="cell">
           {#if item}
             <img src="icons/crew-star.svg" alt="crew loss threshold" />
@@ -10,11 +10,10 @@
       {/each}
     </div>
   {/each}
-
 </div>
 
 <script>
-  import { ceil } from '$lib/dux/utils';
+  import { ceil } from "$lib/dux/utils";
 
   export let ship_mass = 0;
   export let rating = 0;
@@ -27,45 +26,40 @@
   $: cells = Array(rating).fill(false);
 
   let dcp;
-  $: dcp= ceil(ship_mass/20);
+  $: dcp = ceil(ship_mass / 20);
 
-  $: cells = divide(cells, dcp).map(
+  $: cells = divide(cells, dcp)
-    g => {
+    .map((g) => {
-      g[g.length-1] = true;
+      g[g.length - 1] = true;
       return g;
-    }
+    })
-  ).flat();
+    .flat();
 
   function divide(list, divider) {
-    if( divider <= 1 ) return [ list ];
+    if (divider <= 1) return [list];
 
     let div = list.length / divider;
     const mod = list.length % divider;
 
-    if(mod) div++;
+    if (mod) div++;
 
-    return [
+    return [list.slice(0, div), ...divide(list.slice(div), divider - 1)];
-      list.slice(0,div),
-      ...divide( list.slice(div), divider-1 )
-    ]
   }
 
   let rows = [];
-  $: rows = divide( cells, nbr_rows );
+  $: rows = divide(cells, nbr_rows);
-
-
 </script>
 
 <style>
   .row {
   }
-.cell {
+  .cell {
     display: inline-block;
     margin-right: 0.5em;
     width: 1em;
     height: 1em;
     border: 1px solid black;
-}
+  }
   img {
     width: 1em;
   }

src/lib/components/Output/Print/Hull/Integrity/stories.js

@@ -1,7 +1,7 @@
-import Component from '.';
+import Component from ".";
 
 export default {
-    title: "printouts/hull/integrity"
+  title: "printouts/hull/integrity",
 };
 
 export const basic = () => ({
@@ -10,7 +10,7 @@ export const basic = () => ({
     ship_mass: 50,
     rating: 14,
     advanced: false,
-    }
+  },
 });
 
 export const advanced = () => ({
@@ -19,5 +19,5 @@ export const advanced = () => ({
     ship_mass: 50,
     rating: 14,
     advanced: true,
-    }
+  },
 });

src/lib/components/Output/Print/Hull/index.svelte

@@ -8,8 +8,8 @@
 </div>
 
 <script>
-  import Integrity from './Integrity/index.svelte';
+  import Integrity from "./Integrity/index.svelte";
-  import Armour from './Armour/index.svelte';
+  import Armour from "./Armour/index.svelte";
 
   export let structure = {};
   export let ship_mass = 0;

src/lib/components/Output/Print/Identification/index.svelte

@@ -1,4 +1,6 @@
-<h1>ship name: <div class="fill"></div> </h1>
+<h1>
+  ship name: <div class="fill" />
+</h1>
 
 <div class="details">
   <h2>{ship_class}-class, {ship_type}</h2>
@@ -10,12 +12,13 @@
 </div>
 
 <script>
-  import Cost from '../../../Cost.svelte';
+  import Cost from "../../../Cost.svelte";
-  import Mass from '$lib/components/Mass.svelte';
+  import Mass from "$lib/components/Mass.svelte";
 
-export let ship_class;
+  export let ship_class;
-export let ship_type;
+  export let ship_type;
-  export let cost, mass = ( 0, 0 );
+  export let cost,
+    mass = (0, 0);
 </script>
 
 <style>

src/lib/components/Output/Print/MainSystems/index.svelte

@@ -1,6 +1,5 @@
 <div class="main_systems">
-
+  {#if ftl !== "none"}
-  {#if ftl !== "none" }
     <img class="ftl" src="icons/ftl-drive.svg" alt="ftl drive" />
   {/if}
 
@@ -8,13 +7,16 @@
     <div class="thrust">{engine}</div>
   {/if}
 
-  <img class="internal" src="icons/internal-systems.svg" alt="internal systems"/>
+  <img
-  </div>
+    class="internal"
+    src="icons/internal-systems.svg"
+    alt="internal systems"
+  />
+</div>
 
 <script>
-  export let ftl = 'none';
+  export let ftl = "none";
   export let engine = 0;
-
 </script>
 
 <style>
@@ -27,14 +29,16 @@
     line-height: 2em;
     text-align: center;
   }
-.main_systems {
+  .main_systems {
     display: flex;
     align-items: center;
     gap: 1em;
     justify-content: space-evenly;
     margin-top: 1em;
-}
+  }
-  img.ftl { height: 2em; }
+  img.ftl {
+    height: 2em;
+  }
   img.internal {
     height: 2em;
   }

src/lib/components/Output/Print/MainSystems/stories.js

@@ -1,13 +1,13 @@
-import Component from '.';
+import Component from ".";
 
 export default {
-    title: "printouts/main_systems"
+  title: "printouts/main_systems",
 };
 
 export const basic = () => ({
   Component,
   props: {
-        ftl: 'standard',
+    ftl: "standard",
     engine: 4,
-    }
+  },
-})
+});

src/lib/components/Output/Print/Systems/Screens/index.svelte

@@ -1,15 +1,14 @@
 <div>
-  {#each _.range(standard) as i }
+  {#each _.range(standard) as i}
     <img src="icons/screen.svg" alt="screen" />
   {/each}
-  {#each _.range(advanced) as i }
+  {#each _.range(advanced) as i}
     <img src="icons/screen-advanced.svg" alt="advanced screen" />
   {/each}
-
 </div>
 
 <script>
-  import _ from 'lodash';
+  import _ from "lodash";
 
   export let standard = 0;
   export let advanced = 0;

src/lib/components/Output/Print/Systems/index.svelte

@@ -1,16 +1,15 @@
 <div>
-  <Firecons {firecons}/>
+  <Firecons {firecons} />
 
   <Screens {...screens} />
 </div>
 
 <script>
-  import Firecons from './Firecons/index.svelte';
+  import Firecons from "./Firecons/index.svelte";
-  import Screens from './Screens/index.svelte';
+  import Screens from "./Screens/index.svelte";
 
   export let firecons = 0;
   export let screens = {};
-
 </script>
 
 <style>
@@ -23,6 +22,5 @@
   }
   div > :global(*) {
     margin-bottom: 1em;
-
   }
-  </style>
+</style>

src/lib/components/Output/Print/Weapons/Beam/index.svelte

@@ -1,13 +1,13 @@
 <div>
   <Arcs selected={arcs} size="40">
-    <text x="50%" y="50%" >
+    <text x="50%" y="50%">
       {weapon_class}
     </text>
   </Arcs>
 </div>
 
 <script>
-  import Arcs from '$lib/components/Weapon/Arcs/index.svelte';
+  import Arcs from "$lib/components/Weapon/Arcs/index.svelte";
   export let weapon_class = 1;
   export let arcs = [];
 </script>

src/lib/components/Output/Print/Weapons/index.svelte

@@ -1,21 +1,17 @@
 <div class="weapons">
-
   <div class="beams">
     {#each beams as beam}
       <Beam {...beam} />
     {/each}
   </div>
-
-
 </div>
 
 <script>
-  import Beam from './Beam/index.svelte';
+  import Beam from "./Beam/index.svelte";
   export let weapons = [];
 
   let beams = [];
-  $: beams = weapons.filter( ({ weapon_type }) => weapon_type === 'beam' );
+  $: beams = weapons.filter(({ weapon_type }) => weapon_type === "beam");
-
 </script>
 
 <style>

src/lib/components/Output/Print/Weapons/stories.js

@@ -1,33 +1,28 @@
-import Component from '.';
+import Component from ".";
 
 export default {
-    title: "printouts/weapons"
+  title: "printouts/weapons",
 };
 
 export const basic = () => ({
   Component,
   props: {
-    "weapons": [
+    weapons: [
       {
-        "weapon_type": "submunition",
+        weapon_type: "submunition",
-        "arcs": [
+        arcs: ["F"],
-          "F"
+        mass: 1,
-        ],
+        cost: 3,
-        "mass": 1,
+        id: 1,
-        "cost": 3,
-        "id": 1
       },
       {
-        "weapon_type": "beam",
+        weapon_type: "beam",
-        "weapon_class": "2",
+        weapon_class: "2",
-        "arcs": [
+        arcs: ["A", "AS", "FS"],
-          "A",
+        mass: 2,
-          "AS",
+        cost: 6,
-          "FS"
+        id: 2,
+      },
     ],
-        "mass": 2,
+  },
-        "cost": 6,
+});
-        "id": 2
-      }, ]
-    }
-})

src/lib/components/Output/Print/index.svelte

@@ -4,50 +4,41 @@
   <Weapons weapons={ship.weaponry.weapons} />
 
   <div class="section-2">
-  <Hull structure={ship.structure}
+    <Hull structure={ship.structure} ship_mass={ship.general.mass} />
-    ship_mass={ship.general.mass} />
 
     <Systems
       firecons={ship.weaponry.firecons.nbr}
       screens={ship.structure.screens}
     />
-</div>
+  </div>
-
-  <MainSystems
-    ftl={ship.ftl.type}
-    engine={ship.engine.rating}
-  />
 
+  <MainSystems ftl={ship.ftl.type} engine={ship.engine.rating} />
 </aside>
 
 <script>
-  import _ from 'lodash';
+  import _ from "lodash";
 
-  import Identification from './Identification/index.svelte';
+  import Identification from "./Identification/index.svelte";
-  import MainSystems from './MainSystems/index.svelte';
+  import MainSystems from "./MainSystems/index.svelte";
-  import Hull from './Hull/index.svelte';
+  import Hull from "./Hull/index.svelte";
-  import Weapons from './Weapons/index.svelte';
+  import Weapons from "./Weapons/index.svelte";
-  import Systems from './Systems/index.svelte';
+  import Systems from "./Systems/index.svelte";
 
   export let ship;
 
-    import { fly, fade } from 'svelte/transition';
+  import { fly, fade } from "svelte/transition";
-
 </script>
 
 <style>
-.ship-sheet {
+  .ship-sheet {
     width: 4.25in;
     height: 5.5in;
     border: 1px solid black;
     padding: 1em;
-}
+  }
 
-.section-2 {
+  .section-2 {
     display: flex;
     align-items: start;
-}
+  }
-
-
-
 </style>

src/lib/components/Output/Print/sample.js

@@ -1,114 +1,108 @@
 export default {
-  "ftl": {
+  ftl: {
-    "mass": 0,
+    mass: 0,
-    "cost": 0,
+    cost: 0,
-    "type": "standard"
+    type: "standard",
   },
-  "engine": {
+  engine: {
-    "mass": 40,
+    mass: 40,
-    "cost": 80,
+    cost: 80,
-    "rating": 6,
+    rating: 6,
-    "advanced": false
+    advanced: false,
   },
-  "general": {
+  general: {
-    "ship_class": "Deviant",
+    ship_class: "Deviant",
-    "name": "",
+    name: "",
-    "ship_type": "Battleship",
+    ship_type: "Battleship",
-    "mass": 132,
+    mass: 132,
-    "used_mass": 131,
+    used_mass: 131,
-    "cost": 415
+    cost: 415,
   },
-  "weaponry": {
+  weaponry: {
-    "firecons": {
+    firecons: {
-      "nbr": 5,
+      nbr: 5,
-      "mass": 5,
+      mass: 5,
-      "cost": 20
+      cost: 20,
     },
-    "weapons": [
+    weapons: [
       {
-        "weapon_type": "submunition",
+        weapon_type: "submunition",
-        "arcs": [
+        arcs: ["F"],
-          "F"
+        mass: 1,
+        cost: 3,
+        id: 1,
+      },
+      {
+        weapon_type: "beam",
+        weapon_class: "2",
+        arcs: ["A", "AS", "FS"],
+        mass: 2,
+        cost: 6,
+        id: 2,
+      },
+      {
+        weapon_type: "pds",
+        mass: 1,
+        cost: 3,
+        id: 3,
+      },
     ],
-        "mass": 1,
+    adfc: {
-        "cost": 3,
+      rating: 0,
-        "id": 1
+      cost: 0,
+      mass: 0,
+    },
+  },
+  structure: {
+    mass: 0,
+    cost: 0,
+    hull: {
+      rating: 22,
+      advanced: false,
+      cost: 44,
+      mass: 22,
+    },
+    screens: {
+      standard: 2,
+      advanced: 1,
+      cost: 105,
+      mass: 35,
+    },
+    armour: [
+      {
+        layer: 1,
+        rating: 7,
+        cost: 14,
+        mass: 14,
       },
       {
-        "weapon_type": "beam",
+        layer: 2,
-        "weapon_class": "2",
+        rating: 2,
-        "arcs": [
+        cost: 8,
-          "A",
+        mass: 4,
-          "AS",
+      },
-          "FS"
+      {
+        layer: 3,
+        rating: 0,
+        cost: 0,
+        mass: 0,
+      },
     ],
-        "mass": 2,
-        "cost": 6,
-        "id": 2
   },
-      {
+  cargo: {
-        "weapon_type": "pds",
+    space: 7,
-        "mass": 1,
+    cost: 0,
-        "cost": 3,
+    mass: 7,
-        "id": 3
-      }
-    ],
-    "adfc": {
-      "rating": 0,
-      "cost": 0,
-      "mass": 0
-    }
   },
-  "structure": {
+  streamlining: {
-    "mass": 0,
+    type: "none",
-    "cost": 0,
+    cost: 0,
-    "hull": {
+    mass: 0,
-      "rating": 22,
-      "advanced": false,
-      "cost": 44,
-      "mass": 22
   },
-    "screens": {
+  carrier: {
-      "standard": 2,
+    bays: 0,
-      "advanced": 1,
+    cost: 0,
-      "cost": 105,
+    mass: 0,
-      "mass": 35
+    squadrons: [],
   },
-    "armour": [
+};
-      {
-        "layer": 1,
-        "rating": 7,
-        "cost": 14,
-        "mass": 14
-      },
-      {
-        "layer": 2,
-        "rating": 2,
-        "cost": 8,
-        "mass": 4
-      },
-      {
-        "layer": 3,
-        "rating": 0,
-        "cost": 0,
-        "mass": 0
-      }
-    ]
-  },
-  "cargo": {
-    "space": 7,
-    "cost": 0,
-    "mass": 7
-  },
-  "streamlining": {
-    "type": "none",
-    "cost": 0,
-    "mass": 0
-  },
-  "carrier": {
-    "bays": 0,
-    "cost": 0,
-    "mass": 0,
-    "squadrons": []
-  }
-}

src/lib/components/Output/Print/stories.js

@@ -1,13 +1,13 @@
-import Print from './index.svelte';
+import Print from "./index.svelte";
-import sample from './sample';
+import sample from "./sample";
 
 export default {
-    title: "printouts"
+  title: "printouts",
 };
 
 export const basic = () => ({
   Component: Print,
   props: {
-        ship: sample
+    ship: sample,
-    }
+  },
 });

src/lib/components/Propulsion/index.svelte

@@ -1,18 +1,14 @@
-
 <Section label="propulsion">
-
   <Engine {...engine} on:change_engine />
 
   <Ftl {...ftl} on:change_ftl />
-
 </Section>
 
 <script>
-    import Ftl from '../Ftl/index.svelte';
+  import Ftl from "../Ftl/index.svelte";
-    import Engine from '../Engine/index.svelte';
+  import Engine from "../Engine/index.svelte";
-    import Section from '../Section/index.svelte';
+  import Section from "../Section/index.svelte";
 
   export let ftl = {};
   export let engine = {};
-
 </script>

src/lib/components/Section/index.svelte

@@ -7,7 +7,6 @@
 
 <script>
   export let label;
-
 </script>
 
 <style>
@@ -24,5 +23,4 @@
     flex: 1;
     background: #333;
   }
-
 </style>

src/lib/components/ShipItem/index.svelte

@@ -1,7 +1,11 @@
-<div><slot /></div>
+<div class="ship-item">
+  <div><slot /></div>
 
-<div class="mass" bind:this={mass_el}>{mass}</div>
+  <div class="reqs">
-<div class="cost" bind:this={cost_el}>{cost}</div>
+    <div class="mass" bind:this={mass_el}>{mass}</div>
+    <div class="cost" bind:this={cost_el}>{cost}</div>
+  </div>
+</div>
 
 <script>
   import { tick } from "svelte";
@@ -21,24 +25,19 @@
 
   $: update_el(mass_el, mass);
   $: update_el(cost_el, cost);
-
 </script>
 
 <style>
   div {
     margin-bottom: 1em;
   }
+
   .cost,
   .mass {
-    padding: 0px 2em;
+    width: 4em;
+    padding: 0px 0.5em;
     text-align: right;
   }
-  .cost {
-    grid-column: 3;
-  }
-  .mass {
-    grid-column: 2;
-  }
 
   .ship-item {
     display: flex;
@@ -87,4 +86,12 @@
     }
   }
 
+  .ship-item {
+    display: flex;
+  }
+  .reqs {
+    flex: 0;
+    width: 10em;
+    display: flex;
+  }
 </style>

src/lib/components/ShipSpecs/Identification.svelte

@@ -1,6 +1,9 @@
 <div>
-    <Field label="ship class" value={general.ship_class}
+  <Field
-        on:change={change_class} />
+    label="ship class"
+    value={general.ship_class}
+    on:change={change_class}
+  />
 
   <Field label="ship type">
     <select value={ship_type} on:change={change_ship_type}>
@@ -12,30 +15,29 @@
 </div>
 
 <script>
-  import { getContext } from 'svelte';
+  import { getContext } from "svelte";
 
-  import Field from '$lib/components/Field/index.svelte';
+  import Field from "$lib/components/Field/index.svelte";
-  import { candidate_ship_types } from '../../dux/ship_types';
+  import { candidate_ship_types } from "../../dux/ship_types";
 
-  export let ship = getContext('ship');
+  export let ship = getContext("ship");
   let general;
   $: general = $ship.general;
 
-  const change_class = (event) => ship.dispatch(
+  const change_class = (event) =>
-    ship.actions.set_ship_class(event.target.value)
+    ship.dispatch(ship.actions.set_ship_class(event.target.value));
-  );
 
   let ship_type;
   $: ship_type = $ship.general.ship_type;
 
-    const change_ship_type = ({ target: {value}}) =>
+  const change_ship_type = ({ target: { value } }) =>
     ship.dispatch.set_ship_type(value);
 
   let ship_types;
-  $: ship_types = candidate_ship_types($ship.general.mass,$ship.carrier.bays>0).map(
+  $: ship_types = candidate_ship_types(
-    ({name}) => name
+    $ship.general.mass,
-  );
+    $ship.carrier.bays > 0
-
+  ).map(({ name }) => name);
 </script>
 
 <style>

src/lib/components/ShipSpecs/ShipCost.svelte

@@ -5,8 +5,9 @@
       on:change={change_tonnage}
       type="number"
       min="10"
-      max="300" />
+      max="300"
-    <span class="mass_symbol"></span>
+    />
+    <span class="mass_symbol" />
 
     <div class="note" class:warning={!within_budget}>
       {#if within_budget}
@@ -18,7 +19,8 @@
 
 <div class="cost">
   <Field label="cost">
-    <span class="cost">{$ship.general.cost}</span></Field>
+    <span class="cost">{$ship.general.cost}</span></Field
+  >
 </div>
 
 <script>
@@ -60,8 +62,10 @@
     font-size: smaller;
   }
 
-  .mass,div.cost {
+  .mass,
-    padding: 0px 2em; justify-self: right;
+  div.cost {
+    padding: 0px 2em;
+    justify-self: right;
   }
 
   .mass {
@@ -71,7 +75,7 @@
     grid-column: 3;
   }
   span.cost:after {
-    content: '\00A4';
+    content: "\00A4";
     margin-left: 0.5em;
   }
 </style>

src/lib/components/ShipSpecs/index.svelte

@@ -1,16 +1,14 @@
-  <Identification />
+<Identification />
-
-  <ShipCost />
 
+<ShipCost />
 
 <script>
   import Identification from "./Identification.svelte";
   import ShipCost from "./ShipCost.svelte";
-
 </script>
 
 <style>
-div {
+  div {
     background-color: red;
-}
+  }
 </style>

src/lib/components/Weapon/Arcs/index.svelte

@@ -1,32 +1,32 @@
-
 <svg width="{size}px" height="{size}px">
-{#each all_arcs as arc (arc)}
+  {#each all_arcs as arc (arc)}
-  <Arc {arc} radius={size/2}
+    <Arc
+      {arc}
+      radius={size / 2}
       active={selected.includes(arc)}
-        on:click={()=>click_arc(arc)}
+      on:click={() => click_arc(arc)}
     />
-{/each}
+  {/each}
-    <circle cx="50%" cy="50%" r={size /3} />
+  <circle cx="50%" cy="50%" r={size / 3} />
   <slot />
 </svg>
 
 <script>
-  import Arc from '../../Weapons/Arc.svelte';
+  import Arc from "../../Weapons/Arc.svelte";
-  import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
-    const all_arcs = [ 'FS', 'F', 'FP', 'AP', 'A', 'AS' ];
+  const all_arcs = ["FS", "F", "FP", "AP", "A", "AS"];
 
   export let selected = [];
   export let size = 60;
 
   const dispatch = createEventDispatcher();
 
-  const click_arc = arc => dispatch('click_arc',arc);
+  const click_arc = (arc) => dispatch("click_arc", arc);
-
 </script>
 
 <style>
-circle {
+  circle {
     fill: white;
-}
+  }
 </style>

src/lib/components/Weapon/Beam/index.svelte

@@ -93,7 +93,6 @@
     weapon_class,
     arcs: cache.split(":"),
   });
-
 </script>
 
 <style>
@@ -102,5 +101,4 @@
     flex-direction: column;
     margin-right: 1em;
   }
-
 </style>

src/lib/components/Weapon/Needle/index.svelte

@@ -1,37 +1,35 @@
 <label> needle weapon</label>
-<Arcs selected={arcs} on:click_arc={({detail}) => click_arc(detail)} />
+<Arcs selected={arcs} on:click_arc={({ detail }) => click_arc(detail)} />
 
 <script>
-  import {getContext } from 'svelte';
+  import { getContext } from "svelte";
-  import Arcs from '../Arcs/index.svelte';
+  import Arcs from "../Arcs/index.svelte";
-    import dux from '$lib/dux';
+  import dux from "$lib/dux";
-  import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
-    const all_arcs = [ 'FS', 'F', 'FP', 'AP', 'A', 'AS' ];
+  const all_arcs = ["FS", "F", "FP", "AP", "A", "AS"];
 
-    export let arcs = ['F'];
+  export let arcs = ["F"];
-    export let ship_change = getContext('ship_change') || ( () => {} );
+  export let ship_change = getContext("ship_change") || (() => {});
 
   const click_arc = (arc) => {
-      if( arcs[0] === arc ) return;
+    if (arcs[0] === arc) return;
-      arcs = [ arc ];
+    arcs = [arc];
-    }
+  };
 
   const dispatch = createEventDispatcher();
   let cache;
   $: cache = arcs.join(":");
 
-    $: dispatch( 'change', {
+  $: dispatch("change", {
     arcs: cache.split(":"),
-    })
+  });
 </script>
 
 <style>
-.arc {
+  .arc {
     display: flex;
     flex-direction: column;
     margin-right: 1em;
-}
+  }
-
+</style>
-  </style>
-

src/lib/components/Weapon/PointDefenceSystem/index.svelte

@@ -1,2 +1 @@
 <label>point defence system</label>
-

src/lib/components/Weapon/Scattergun/index.svelte

@@ -1,2 +1 @@
 <label>scattergun</label>
-

src/lib/components/Weapon/Submunition/index.svelte

@@ -1,37 +1,35 @@
 <label> submunition pack</label>
-<Arcs selected={arcs} on:click_arc={({detail}) => click_arc(detail)} />
+<Arcs selected={arcs} on:click_arc={({ detail }) => click_arc(detail)} />
 
 <script>
-  import {getContext } from 'svelte';
+  import { getContext } from "svelte";
-  import Arcs from '../Arcs/index.svelte';
+  import Arcs from "../Arcs/index.svelte";
-    import dux from '$lib/dux';
+  import dux from "$lib/dux";
-  import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
-    const all_arcs = [ 'FS', 'F', 'FP', 'AP', 'A', 'AS' ];
+  const all_arcs = ["FS", "F", "FP", "AP", "A", "AS"];
 
-    export let arcs = ['F'];
+  export let arcs = ["F"];
-    export let ship_change = getContext('ship_change') || ( () => {} );
+  export let ship_change = getContext("ship_change") || (() => {});
 
   const click_arc = (arc) => {
-      if( arcs[0] === arc ) return;
+    if (arcs[0] === arc) return;
-      arcs = [ arc ];
+    arcs = [arc];
-    }
+  };
 
   const dispatch = createEventDispatcher();
   let cache;
   $: cache = arcs.join(":");
 
-    $: dispatch( 'change', {
+  $: dispatch("change", {
     arcs: cache.split(":"),
-    })
+  });
 </script>
 
 <style>
-.arc {
+  .arc {
     display: flex;
     flex-direction: column;
     margin-right: 1em;
-}
+  }
-
+</style>
-  </style>
-

src/lib/components/Weapon/index.svelte

@@ -56,7 +56,6 @@
       ...detail,
     });
   };
-
 </script>
 
 <style>
@@ -124,5 +123,4 @@
   .weapon_row > :global(*) {
     margin-right: 2em;
   }
-
 </style>

src/lib/components/Weaponry/ADFC/index.svelte

@@ -4,7 +4,6 @@
   </Field>
 </ShipItem>
 
-
 <script>
   import ShipItem from "../../ShipItem/index.svelte";
   import Field from "../../Field/index.svelte";
@@ -16,5 +15,5 @@
   export let mass = 0;
   export let ship = getContext("ship");
 
-  $: ship?.dispatch_action('set_adfc',rating);
+  $: ship?.dispatch_action("set_adfc", rating);
 </script>

src/lib/components/Weaponry/AddWeapon/index.svelte

@@ -23,5 +23,4 @@
   export let ship = getContext("ship");
 
   const add_weapon = () => ship?.dispatch_action("add_weapon", weapon_type);
-
 </script>

src/lib/components/Weapons/Add.svelte

@@ -1,91 +1,87 @@
-<input class="add-weapon button small blue" type="button" value="add"
+<input
-    on:click={add} />
+  class="add-weapon button small blue"
+  type="button"
+  value="add"
+  on:click={add}
+/>
 
 <div class="weapon">
-
+  <select bind:value={weapon_type}>
-<select bind:value={weapon_type}>
     <option>beam</option>
-</select>
+  </select>
 
-<select bind:value={weapon_class}>
+  <select bind:value={weapon_class}>
-<option>1</option>
+    <option>1</option>
-<option>2</option>
+    <option>2</option>
-<option>3</option>
+    <option>3</option>
-<option>4</option>
+    <option>4</option>
-</select>
+  </select>
 
-<select bind:value={nbr_arcs}>
+  <select bind:value={nbr_arcs}>
-{#each arc_options[weapon_class] as opt (opt)}
+    {#each arc_options[weapon_class] as opt (opt)}
       <option>{opt}</option>
-{/each}
+    {/each}
-</select>
+  </select>
 
-<svg width="60px" height="60px">
+  <svg width="60px" height="60px">
-{#each arcs as arc (arc)}
+    {#each arcs as arc (arc)}
-    <Arc {arc} radius={30}
+      <Arc
+        {arc}
+        radius={30}
         active={selected_arc[arc]}
-        on:click={()=>click_arc(arc)}
+        on:click={() => click_arc(arc)}
       />
-{/each}
+    {/each}
     <circle cx="30" cy="30" r="15" />
-
+  </svg>
-
-</svg>
 
   <div>{weapon.cost}</div>
   <div>{weapon.mass}</div>
-
 </div>
 
 <script>
-    let weapon_type = 'beam';
+  let weapon_type = "beam";
   let weapon_class = 1;
   let nbr_arcs = 6;
   $: nbr_arcs = arc_options[weapon_class][0];
 
-    import Arc from './Arc.svelte';
+  import Arc from "./Arc.svelte";
-    import { weapon_cost_mass } from '../../dux/weapons/rules.js';
+  import { weapon_cost_mass } from "../../dux/weapons/rules.js";
 
-    const arcs = [
+  const arcs = ["FS", "F", "FP", "AP", "A", "AS"];
-        'FS', 'F', 'FP', 'AP', 'A', 'AS'
-    ];
 
-    import _ from 'lodash';
+  import _ from "lodash";
-    import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher } from "svelte";
 
   let arc_options = {
-        1: [ 6],
+    1: [6],
-        2: [ 3, 6 ],
+    2: [3, 6],
-        3: [ 1, 2, 3, 4, 5, 6, 'broadside' ],
+    3: [1, 2, 3, 4, 5, 6, "broadside"],
-        4: [ 1, 2, 3, 4, 5, 6, 'broadside' ]
+    4: [1, 2, 3, 4, 5, 6, "broadside"],
   };
 
-    let selected_arc = Object.fromEntries(
+  let selected_arc = Object.fromEntries(arcs.map((arc) => [arc, false]));
-        arcs.map( arc => [ arc, false ] )
-    );
 
-    const nbr_selected_arcs = () => Object.values(selected_arc).filter(
+  const nbr_selected_arcs = () =>
-        x => x ).length;
+    Object.values(selected_arc).filter((x) => x).length;
 
-    $: if ( nbr_selected_arcs() !== nbr_arcs ) {
+  $: if (nbr_selected_arcs() !== nbr_arcs) {
-        if( nbr_arcs === 'broadside' ) {
+    if (nbr_arcs === "broadside") {
       const new_arcs = {};
-            arcs.forEach( arc => new_arcs[arc] = true );
+      arcs.forEach((arc) => (new_arcs[arc] = true));
       new_arcs.A = false;
       new_arcs.F = false;
       selected_arc = new_arcs;
-        }
+    } else {
-        else{
+      let first_index = arcs.findIndex((arc) => selected_arc[arc]);
-
+      if (first_index === -1) first_index = 0;
-        let first_index = arcs.findIndex( arc => selected_arc[arc] );
-        if( first_index === -1 ) first_index = 0;
 
       const new_arcs = {};
-        arcs.forEach( arc => new_arcs[arc] = false );
+      arcs.forEach((arc) => (new_arcs[arc] = false));
 
-        _.range(nbr_arcs).forEach( i => {
+      _.range(nbr_arcs).forEach((i) => {
-            new_arcs[ arcs[first_index] ] = true;
+        new_arcs[arcs[first_index]] = true;
-            first_index = ( first_index + 1 ) % arcs.length;
+        first_index = (first_index + 1) % arcs.length;
       });
 
       selected_arc = new_arcs;
@@ -93,110 +89,106 @@
   }
 
   const click_arc = (first_arc) => {
-        if( nbr_arcs === 'broadside' ) return;
+    if (nbr_arcs === "broadside") return;
 
-        let first_index = arcs.findIndex( arc => arc === first_arc );
+    let first_index = arcs.findIndex((arc) => arc === first_arc);
 
     const new_arcs = {};
-        arcs.forEach( arc => new_arcs[arc] = false );
+    arcs.forEach((arc) => (new_arcs[arc] = false));
 
-        _.range(nbr_arcs).forEach( i => {
+    _.range(nbr_arcs).forEach((i) => {
       console.log(first_index);
       console.log(selected_arc);
-            new_arcs[ arcs[first_index] ] = true;
+      new_arcs[arcs[first_index]] = true;
-            first_index = ( first_index + 1 ) % arcs.length;
+      first_index = (first_index + 1) % arcs.length;
     });
 
     selected_arc = new_arcs;
-
+  };
-    }
 
   let weapon = {};
-    $: weapon= {
+  $: weapon = {
     weapon_type,
     weapon_class,
     arcs,
-        ...weapon_cost_mass({ weapon_type, weapon_class, arcs: arcs.filter(
+    ...weapon_cost_mass({
-        arc => selected_arc[arc]
+      weapon_type,
-        ) })
+      weapon_class,
+      arcs: arcs.filter((arc) => selected_arc[arc]),
+    }),
   };
 
   const dispatch = createEventDispatcher();
 
   const add = () => {
-        dispatch('add_weapon', weapon);
+    dispatch("add_weapon", weapon);
-    }
+  };
-
 </script>
 
 <style>
-
+  .weapon {
-.weapon {
     display: flex;
     align-items: center;
-}
+  }
 
-.weapon > * {
+  .weapon > * {
     margin-right: 2em;
-}
+  }
 
-.arcs {
+  .arcs {
     display: grid;
     grid-template-rows: 1fr 1fr 1fr 1fr;
     grid-template-columns: 1fr 1fr 1fr 1fr;
     align-items: center;
     justify-items: center;
     width: 6em;
-}
+  }
 
-
+  .arc input {
-.arc input {
     margin: 0px;
-}
+  }
 
-
+  .arc.F {
-.arc.F {
     grid-column: 2 / span 2;
     grid-row: 1;
-}
+  }
 
-.arc.FS {
+  .arc.FS {
     grid-column: 1;
     grid-row: 1 / span 2;
-}
+  }
 
-.arc.FP {
+  .arc.FP {
     grid-column: 4;
     grid-row: 1 / span 2;
-}
+  }
 
-.arc.AS {
+  .arc.AS {
     grid-column: 1;
     grid-row: 3 / span 2;
-}
+  }
 
-.arc.AP {
+  .arc.AP {
     grid-column: 4;
     grid-row: 3 / span 2;
-}
+  }
 
-.arc.A {
+  .arc.A {
     grid-column: 2 / span 2;
     grid-row: 4;
-}
+  }
 
-.arc {
+  .arc {
     display: flex;
     flex-direction: column;
     margin-right: 1em;
-}
+  }
 
-.add-weapon {
+  .add-weapon {
     display: block;
-}
+  }
 
-circle {
+  circle {
     fill: white;
-}
+  }
-
 </style>

src/lib/components/Weapons/Arc.svelte

@@ -1,50 +1,50 @@
-<script>
+<g {transform}>
-export let arc;
+  <path d={path} class:active on:click />
-export let radius;
+</g>
-export let active = false;
 
-const rotation = {
+<script>
+  export let arc;
+  export let radius;
+  export let active = false;
+
+  const rotation = {
     F: 0,
     FS: 300,
     AS: 240,
     A: 180,
     AP: 120,
     FP: 60,
-};
+  };
 
-let y, x_delta;
+  let y, x_delta;
-$: y = Math.round( radius * ( 1 - Math.sin(60/180*Math.PI) ) );
+  $: y = Math.round(radius * (1 - Math.sin((60 / 180) * Math.PI)));
-$: x_delta = Math.round( radius*Math.cos(60/180*Math.PI) );
+  $: x_delta = Math.round(radius * Math.cos((60 / 180) * Math.PI));
 
-let path;
+  let path;
-$: path = `M ${radius},${radius} L ${radius-x_delta},${y} A ${radius},${radius} 0 0 1 ${radius+x_delta},${y} Z`;
+  $: path = `M ${radius},${radius} L ${
-
+    radius - x_delta
-let transform;
+  },${y} A ${radius},${radius} 0 0 1 ${radius + x_delta},${y} Z`;
-$: transform = `rotate(${rotation[arc]},${radius},${radius})`
 
+  let transform;
+  $: transform = `rotate(${rotation[arc]},${radius},${radius})`;
 </script>
 
-    <g { transform }>
-        <path d={path} class:active on:click />
-    </g>
-
 <style>
-path {
+  path {
     fill: lightgrey;
     stroke: white;
     stroke-width: 2px;
-}
+  }
 
-path:hover {
+  path:hover {
     fill: pink;
-}
+  }
 
-path.active:hover {
+  path.active:hover {
     fill: pink;
-}
+  }
 
-path.active {
+  path.active {
     fill: #313131;
-}
+  }
 </style>
-

src/lib/components/Weapons/stories.js

@@ -1,4 +1,4 @@
-import AddWeapon from './Add.svelte';
+import AddWeapon from "./Add.svelte";
 
 export default {
   title: "add weapon",
@@ -7,4 +7,3 @@ export default {
 export const beam = () => ({
   Component: AddWeapon,
 });
-

src/lib/style/index.css

@@ -0,0 +1,4 @@
+:root {
+  --main-font-family: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI",
+    Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+}

src/lib/style/index.js

@@ -0,0 +1,4 @@
+import "../../../static/fonts/faktos.css";
+import "../../../static/fonts/dosis/dosis.css";
+import "../../../static/global.css";
+import "./index.css";

src/routes/index.svelte

@@ -1,9 +1,9 @@
 <App />
 
 <script>
-  import '../../static/fonts/faktos.css';
+  import "../../static/fonts/faktos.css";
-  import '../../static/fonts/dosis/dosis.css';
+  import "../../static/fonts/dosis/dosis.css";
-  import '../../static/global.css';
+  import "../../static/global.css";
 
   import App from "$lib/components/App.svelte";
 </script>

svelte.config.js

@@ -1,5 +1,5 @@
-import adapter from '@sveltejs/adapter-static';
+import adapter from "@sveltejs/adapter-static";
-import analyze from 'rollup-plugin-analyzer';
+import analyze from "rollup-plugin-analyzer";
 
 /** @type {import('@sveltejs/kit').Config} */
 export default {
@@ -9,9 +9,10 @@ export default {
     vite: {
       build: {
         rollupOptions: {
-            plugins: [ analyze() ],
+          plugins: [analyze()],
-//            external: ['updux','@yanick/updeep']
+          //            external: ['updux','@yanick/updeep']
-        }
+        },
-    }
+      },
-	}},
+    },
+  },
 };