@@ -123,6 +123,13 @@

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

       (content-after ": ")]])

+(defclass regular-list []

+    {:padding-left 0}

+    [:li {:list-style :inside

+          :list-style-type "'* '"}

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

+                      :margin-right :0.5rem}]])

+

 (defclass equipment-panel []

     {}

     title-style

@@ -145,6 +145,12 @@

 (defn- capacity [x]

     (some-> x :capacity))

+(defn- armor-class [x]

+  (let [ac (-> x :armor_class)]

+    (spaced (ac :base)

+            (when (ac :dex_bonus) "+ Dex modifier")

+            (when (ac :max_bonus) (parenthesize (str "max " (ac :max_bonus)))))))

+

 (defn- short-spell-description [spell]

   (spaced

     (-> spell :level ordinal)

@@ -196,15 +202,65 @@

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

        [license-notice spell]])

-(defn equipment-panel [item]

+

+(defn gear-panel [item]

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

      [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)))]

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

+     [property-list

+      :Weight

+        (weight item)

+      :Cost

+        (spaced

+         (cost item)

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

+     [description item]

+     [license-notice item]])

+

+(defn pack-panel [pack]

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

+     [heading pack]

+     [:span.kind

+      (spaced

+       (-> pack :equipment_category :name)

+       (-> pack :gear_category :name string/lower-case parenthesize))]

+     [property-list

+      :Cost (cost pack)]

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

+      (for [x (pack :contents)]

+        ^{:key (-> x :item :url)}

+         [:li

+           [:span [code (-> x :item :name)]]

+           (when (> (x :quantity) 1)

+             [:span (-> x :quantity parenthesize)])])]

+     [license-notice pack]])

+

+(defn tool-panel [item]

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

+     [heading item]

+     [:span.kind

+       (spaced (-> item :equipment_category :name string/lower-case)

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

+     [property-list

+      :Weight

+        (weight item)

+      :Cost

+        (spaced

+         (cost item)

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

+     [description item]

+     [license-notice item]])

+

+(defn vehicle-panel [item]

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

+     [heading item]

+     [:span.kind

+      (spaced

+       (-> item :equipment_category :name string/lower-case)

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

      [property-list

       :Speed

         (speed item)

@@ -213,12 +269,31 @@

       :Weight

         (weight item)

       :Cost

-        (spaced

-         (cost item)

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

+        (cost item)]

      [description item]

      [license-notice item]])

+(defn armor-panel [armor]

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

+     [heading armor]

+     [:span.kind (spaced (-> armor :armor_category string/lower-case) "armor")]

+     [property-list

+      "Armor Class"

+        (armor-class armor)

+      :Strength

+        (when (> (armor :str_minimum) 0)

+          (str (armor :str_minimum) "+"))

+      :Stealth

+        (when (armor :stealth_disadvantage)

+          "disadvantage")

+      :Weight

+        (weight armor)

+      :Cost

+        (cost armor)]

+

+     [description armor]

+     [license-notice armor]])

+

 (defn weapon-panel [weapon]

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

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

@@ -246,6 +321,18 @@

        (cost weapon)]

     [license-notice weapon]]))

+

+(defn equipment-panel [item]

+  (case (-> item :equipment_category :index keyword)

+   :weapon              [weapon-panel item]

+   :armor               [armor-panel item]

+   :adventuring-gear    (case (-> item :gear_category :index)

+                           "equipment-packs" [pack-panel item]

+                           [gear-panel item])

+   :tools               [tool-panel item]

+   :mounts-and-vehicles [vehicle-panel item]))

+

+

 (defn spell-list-panel [spells]

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

     [heading "Spells"]

@@ -295,9 +382,7 @@

       (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-equipment? x) [equipment-panel x]

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

 (defn history []