@@ -19,10 +19,13 @@

 (defn execute

     [db cmdline]

  (let [spells (db :spells)

+       equipment (db :equipment)

        cmd (keyword cmdline)]

+  ; TODO: Replace with the 'match' macro

   (cond

    (contains? spells cmd) {:spell (spells cmd)}

-   :else {:err (str "No spell named '" cmdline "'")})))

+   (contains? equipment cmd) {:equipment (equipment cmd)}

+   :else {:err (str "Unknown command '" cmdline "'")})))

 (re-frame/reg-event-db

  ::submit-cmd

@@ -87,6 +87,13 @@

 (defn- content-after [x] [(s/& s/after) {:content (str "'" x "'")}])

 (defn- content-before [x] [(s/& s/before) {:content (str "'" x "'")}])

+(def title-style

+  [:h1 {:margin-top :0.2rem

+        :margin-bottom :0.2rem

+        :background-color (colorscheme :dark1)

+        :color (colorscheme :light0-soft)

+        :padding :0.2rem}])

+

 (defclass spell-panel []

     {}

     [:h1 {:margin-top :0.2rem

@@ -103,6 +110,13 @@

      [s/first-child {:font-weight :bold}

       (content-after ": ")]])

+(defclass equipment-panel []

+    {})

+

+(defclass weapon-panel []

+    {}

+    title-style

+    [:span.kind {:font-style :italic}])

 (defclass error-message []

     {:background-color (colorscheme :faded-red)

@@ -2,6 +2,7 @@

   (:require

    [re-frame.core :as re-frame]

    [clojure.string :as string]

+   [goog.string :as gstr]

    [dmr.styles :as styles]

    [dmr.subs :as subs]

    [dmr.events :as events]))

@@ -45,6 +46,17 @@

     [s]

     (when s (str "(" s ")")))

+(defn- property-list    [& props]

+    (into

+     [:ul {:class (styles/property-list)}]

+     (->> props

+          (partition 2)

+          (filter second)

+          (map #(vector

+                 :li

+                 [:span (-> % first)]

+                 [:span (-> % second)])))))

+

 (defn spell-panel [spell]

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

        [:h1 (:name spell)]

@@ -73,6 +85,36 @@

         [:span (-> spell :higher_level join-lines)]]])

+(defn equipment-panel [item]

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

+     [:h1 (item :name)]])

+

+(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)}

+    [:h1 (weapon :name)]

+    [:span.kind (string/join " " [weapon-category weapon-kind "weapon"])]

+    (property-list

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

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

+     :Damage

+       (let [damage-type (-> weapon :damage :damage_type :name string/lower-case)

+             damage (-> weapon :damage :damage_dice)

+             two-handed-damage (some-> weapon :two_handed_damage :damage_dice)]

+        (if two-handed-damage

+          (str damage " " (parenthesize two-handed-damage) ", " damage-type)

+          (str damage ", " damage-type)))

+     :Range

+       (when (= weapon-kind "ranged")

+         (gstr/format "%d' (%d')" (-> weapon :range :normal) (-> weapon :range :long)))

+     :Properties

+       (comma-separated (->> weapon :properties (map :name) (map string/lower-case)))

+     :Weight

+       (spaced (weapon :weight) "lbs")

+     :Cost

+       (spaced (-> weapon :cost :quantity) (-> weapon :cost :unit)))]))

+

 (defn error-message

     [e]

     [:div {:class (styles/error-message)} e])

@@ -84,8 +126,10 @@

     [:div.output

      (cond

       (contains? x :spell) (spell-panel (x :spell))

+      (contains? x :equipment) (weapon-panel (x :equipment))

       (contains? x :err) (error-message (x :err)))])

+

 (defn history []

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

     (into