@@ -16,8 +16,3 @@

  ::cmd-history

  (fn [db]

    (get-in db [:cmdline :history])))

-

-(re-frame/reg-sub

- ::spell

- (fn [db [_ spell-id]]

-   (get-in db [:spells spell-id])))

@@ -139,9 +139,9 @@

 (defn spell-panel [spell]

       [:article {:class (styles/spell-panel)}

-       (heading spell)

+       [heading spell]

        [:div [:span.kind (short-spell-description spell)]]

-       (property-list

+       [property-list

         ; Refactor these so that we get the "name" from the keyword by replacing

         ; '-' and '_' and capitalizing

          :Damage

@@ -160,25 +160,25 @@

          :Duration

            (spaced

             (-> spell :duration string/lower-case)

-            (when (spell :concentration) "(requires concentration)")))

-       (description spell)

+            (when (spell :concentration) "(requires concentration)"))]

+       [description spell]

        (let [at-higher-levels (some-> spell :higher_level join-lines)]

         (when at-higher-levels

            [:section.higher-level

              [:span "At higher levels"]

              [:span at-higher-levels]]))

-       (license-notice spell)])

+       [license-notice spell]])

 (defn equipment-panel [item]

     [:article {:class (styles/equipment-panel)}

-     (heading item)

+     [heading item]

      [:span.kind

       (spaced

        (-> item :equipment_category :name)

        (cond

          (item :gear_category) (-> item :gear_category :name string/lower-case parenthesize)

          (item :vehicle_category) (-> item :vehicle_category string/lower-case parenthesize)))]

-     (property-list

+     [property-list

       :Speed

         (speed item)

       "Carrying Capacity"

@@ -188,17 +188,17 @@

       :Cost

         (spaced

          (cost item)

-         (some->> item :quantity (str "for ") parenthesize)))

-     (description item)

-     (license-notice item)])

+         (some->> item :quantity (str "for ") parenthesize))]

+     [description item]

+     [license-notice item]])

 (defn weapon-panel [weapon]

  (let [weapon-kind (-> weapon :weapon_range string/lower-case)

        weapon-category (-> weapon :weapon_category string/lower-case)]

   [:article {:class (styles/weapon-panel)}

-    (heading weapon)

+    [heading weapon]

     [:span.kind (spaced weapon-category weapon-kind "weapon")]

-    (property-list

+    [property-list

      ; 'two-handed-damage' is defined for *single-handed* weapons with the "versatile"

      ; property. Actual two-handed weapons have 'damage' only.

      :Damage

@@ -216,12 +216,12 @@

      :Weight

        (weight weapon)

      :Cost

-       (cost weapon))

-    (license-notice weapon)]))

+       (cost weapon)]

+    [license-notice weapon]]))

 (defn spell-list-panel [spells]

   [:article {:class (styles/spell-list-panel)}

-    (heading "Spells")

+    [heading "Spells"]

     [:ul

      (for [[index spell] (enumerated (sort-by :name spells))]

         ^{:key index}

@@ -231,8 +231,8 @@

 (defn equipment-list-panel [items]

   [:article {:class (styles/item-list-panel)}

-   (heading "Items")

-   (property-table items

+   [heading "Items"]

+   [property-table items

      :Name

        {}

        :name

@@ -241,7 +241,7 @@

        cost

      :Weight

        {:align :right}

-       #(weight % :unit "lb" :no-quantity true))])

+       #(weight % :unit "lb" :no-quantity true)]])

 (defn error-message

     [{e :err}]

@@ -262,22 +262,22 @@

 (defn output [x]

     [:div.output

      (cond

-      (is-license? x) (license-panel x)

-      (is-equipment-list? x) (equipment-list-panel x)

-      (is-spell-list? x) (spell-list-panel x)

+      (is-license? x) [license-panel x]

+      (is-equipment-list? x) [equipment-list-panel x]

+      (is-spell-list? x) [spell-list-panel x]

       (is-spell? x) (spell-panel x)

       (is-equipment? x) (cond

-                         (is-weapon? x) (weapon-panel x)

-                         :else (equipment-panel x))

-      (is-error? x) (error-message x))])

+                         (is-weapon? x) [weapon-panel x]

+                         :else [equipment-panel x])

+      (is-error? x) [error-message x])])

 (defn history []

   (let [history (re-frame/subscribe [::subs/cmd-history])]

     [:ul {:class (styles/history-style)}

       (for [[index item] (enumerated @history)]

-        ^{:key index} [:li (-> item :input input) (-> item :output output)])]))

+        ^{:key index} [:li [input (item :input)] [output (item :output)]])]))

 (defn main-panel []

   [:div {:class (styles/screen)}

    [:div {:class (styles/main-panel)}

-    (title) (history) (prompt)]])

+    [title] [history] [prompt]]])