From 74d0317580af8add1db83ca5e75f3dffea6068f1 Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Sat, 26 Mar 2022 11:47:10 -0400
Subject: [PATCH] weapon print

---
 .../Output/Print/Weapons/Beam/index.svelte        |  6 +++---
 .../components/Output/Print/Weapons/index.svelte  |  2 +-
 src/lib/components/Output/Print/index.svelte      | 15 +++++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/lib/components/Output/Print/Weapons/Beam/index.svelte b/src/lib/components/Output/Print/Weapons/Beam/index.svelte
index 899a8bd..b42a6ec 100644
--- a/src/lib/components/Output/Print/Weapons/Beam/index.svelte
+++ b/src/lib/components/Output/Print/Weapons/Beam/index.svelte
@@ -1,14 +1,14 @@
 <div>
   <Arcs selected={arcs} size="40">
     <text x="50%" y="50%">
-      {weapon_class}
+      {weaponClass}
     </text>
   </Arcs>
 </div>
 
 <script>
-  import Arcs from "$lib/components/Weapon/Arcs/index.svelte";
-  export let weapon_class = 1;
+  import Arcs from "$lib/components/ShipEdit/Weaponry/Weapon/Arcs.svelte";
+  export let weaponClass = 1;
   export let arcs = [];
 </script>
 
diff --git a/src/lib/components/Output/Print/Weapons/index.svelte b/src/lib/components/Output/Print/Weapons/index.svelte
index edb7d6f..307318d 100644
--- a/src/lib/components/Output/Print/Weapons/index.svelte
+++ b/src/lib/components/Output/Print/Weapons/index.svelte
@@ -11,7 +11,7 @@
   export let weapons = [];
 
   let beams = [];
-  $: beams = weapons.filter(({ weapon_type }) => weapon_type === "beam");
+  $: beams = weapons.filter(({ type }) => type === "beam");
 </script>
 
 <style>
diff --git a/src/lib/components/Output/Print/index.svelte b/src/lib/components/Output/Print/index.svelte
index a3221ea..bf93d3b 100644
--- a/src/lib/components/Output/Print/index.svelte
+++ b/src/lib/components/Output/Print/index.svelte
@@ -1,11 +1,14 @@
 <div>
   <Identification {...$state.identification} />
+
+  <Weapons weapons={$state.weaponry.weapons} />
+
+  <MainSystems ftl={$state?.propulsion?.ftl}
+        engine={$state?.propulsion?.drive?.rating} />
 </div>
 <!--
 <aside class="ship-sheet" transition:fade>
-  <Identification {...ship.general} />
 
-  <Weapons weapons={ship.weaponry.weapons} />
 
   <div class="section-2">
     <Hull structure={ship.structure} ship_mass={ship.general.mass} />
@@ -18,8 +21,6 @@
 
 </aside>
 -->
-  <MainSystems ftl={$state?.propulsion?.ftl}
-        engine={$state?.propulsion?.drive?.rating} />
 
 <script>
 import { getContext } from 'svelte';
@@ -28,7 +29,7 @@ import { getContext } from 'svelte';
   import Identification from "./Identification/index.svelte";
   import MainSystems from "./MainSystems/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"; */
 
   /* export let ship; */
@@ -38,15 +39,17 @@ import { getContext } from 'svelte';
 </script>
 
 <style>
-  .ship-sheet {
+  div {
     width: 4.25in;
     height: 5.5in;
     border: 1px solid black;
     padding: 1em;
+    margin: 0px auto;
   }
 
   .section-2 {
     display: flex;
     align-items: start;
   }
+
 </style>