From 423b7632961dfd72bd623a47aab1aed6c5e8e51f Mon Sep 17 00:00:00 2001
From: codeGlaze <github@codeglaze.com>
Date: Mon, 16 Feb 2026 20:14:02 +0000
Subject: [PATCH 1/5] Fix custom weapon dropdown reset in magic item builder

The custom weapon dropdowns (Damage Die Number, Damage Die, Simple/Martial,
Melee/Ranged) were immediately resetting to default values after user
interaction, preventing users from selecting values.

Root cause: Default values were dispatched during component render via a
doseq block in views.cljs, overwriting user selections on every re-render.

Fix:
- Move default value initialisation from render phase to the
  ::mi/toggle-subtype event handler (events.cljs) so defaults are set
  once when "Custom" is first selected, not on every render cycle.
- Remove the problematic doseq dispatch block from views.cljs.
- Convert selection-adder to a Form-2 Reagent component with a local
  atom so the dropdown resets to the placeholder after each selection.
---
 src/cljc/orcpub/components.cljc    | 35 +++++++++++++++++++-----------
 src/cljs/orcpub/dnd/e5/events.cljs | 11 +++++++++-
 src/cljs/orcpub/dnd/e5/views.cljs  |  7 ------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/cljc/orcpub/components.cljc b/src/cljc/orcpub/components.cljc
index a2c99c4e3..e845a2570 100644
--- a/src/cljc/orcpub/components.cljc
+++ b/src/cljc/orcpub/components.cljc
@@ -20,20 +20,29 @@
    {:value key}
    name])
 
+;; Form-2 component: local atom tracks the dropdown value so that after the
+;; on-change handler fires we can immediately reset the <select> back to the
+;; placeholder.  This prevents the dropdown from appearing "stuck" on the last
+;; selected item after adding it to the list.
 (defn selection-adder [values on-change]
-  [:select.builder-option.builder-option-dropdown
-   {:value ""
-    :on-change on-change}
-   [:option.builder-dropdown-item
-    {:value ""
-     :disabled true}
-    "<select to add>"]
-   (doall
-    (map
-     (fn [{:keys [key name]}]
-       ^{:key key}
-       [selection-item key name false])
-     values))])
+  (let [selected-value (atom "")]
+    (fn [values on-change]
+      [:select.builder-option.builder-option-dropdown
+       {:value @selected-value
+        :on-change (fn [e]
+                     (let [v (-> e .-target .-value)]
+                       (on-change e)
+                       (reset! selected-value "")))}
+       [:option.builder-dropdown-item
+        {:value ""
+         :disabled true}
+        "<select to add>"]
+       (doall
+        (map
+         (fn [{:keys [key name]}]
+           ^{:key key}
+           [selection-item key name false])
+         values))])))
 
 (defn selection [values on-change selected-value]
   [:select
diff --git a/src/cljs/orcpub/dnd/e5/events.cljs b/src/cljs/orcpub/dnd/e5/events.cljs
index 687655c69..23e742516 100644
--- a/src/cljs/orcpub/dnd/e5/events.cljs
+++ b/src/cljs/orcpub/dnd/e5/events.cljs
@@ -3772,7 +3772,16 @@
  (fn [item [_ type]]
    (remove-custom-weapon-fields
     (case type
-      :other (assoc item ::mi/subtypes #{:other})
+      ;; When switching to Custom (:other), initialise weapon fields to sane
+      ;; defaults here in the event handler instead of during view render.
+      ;; Setting them during render caused the dropdowns to reset on every
+      ;; re-render, making user selection impossible.
+      :other (-> item
+                 (assoc ::mi/subtypes #{:other})
+                 (assoc ::mi/damage-die-count 1)
+                 (assoc ::mi/damage-die 4)
+                 (assoc ::mi/weapon-type :simple)
+                 (assoc ::mi/melee-ranged :melee))
       :all (assoc item ::mi/subtypes #{:all})
       (update item
               ::mi/subtypes
diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs
index b37ed142a..33cc02961 100644
--- a/src/cljs/orcpub/dnd/e5/views.cljs
+++ b/src/cljs/orcpub/dnd/e5/views.cljs
@@ -3844,13 +3844,6 @@
             )
             )))])]]
      (when other?
-       ;;;batch-set multiple default values
-       (doseq [evt [[::mi/set-item-damage-die-count 1]
-                    [::mi/set-item-damage-die       4]
-                    [::mi/set-item-weapon-type      :simple]
-                    [::mi/set-item-melee-ranged     :melee]]
-               ]
-         (dispatch evt))
        [:div.main-text-color.m-b-10.m-t-10
         [:span.f-s-18.f-w-b "Base Weapon Details"]
         [:div.flex.flex-wrap.m-t-10

From bfe344dbe8419b8de504ef5642bc28b6e9a6fa85 Mon Sep 17 00:00:00 2001
From: codeGlaze <github@codeglaze.com>
Date: Mon, 16 Feb 2026 20:27:45 +0000
Subject: [PATCH 2/5] Add tests for subtype toggle and extract pure functions

Extract remove-custom-weapon-fields and apply-subtype-toggle into
magic_items.cljc so they can be tested from JVM tests. Simplify the
reg-event-db handler in events.cljs to a one-liner delegating to the
extracted function.

Tests cover:
- Weapon field stripping (all 17 keys removed, non-weapon keys preserved)
- Custom (:other) defaults (die count, die, weapon type, melee/ranged)
- :all subtype toggle
- Named subtype add/remove and :other/:all cleanup
---
 src/cljc/orcpub/components.cljc              |  5 +-
 src/cljc/orcpub/dnd/e5/magic_items.cljc      | 41 +++++++++++++
 src/cljs/orcpub/dnd/e5/events.cljs           | 38 +-----------
 test/cljc/orcpub/dnd/e5/magic_items_test.clj | 64 ++++++++++++++++++++
 4 files changed, 107 insertions(+), 41 deletions(-)

diff --git a/src/cljc/orcpub/components.cljc b/src/cljc/orcpub/components.cljc
index e845a2570..20c55a78a 100644
--- a/src/cljc/orcpub/components.cljc
+++ b/src/cljc/orcpub/components.cljc
@@ -20,10 +20,7 @@
    {:value key}
    name])
 
-;; Form-2 component: local atom tracks the dropdown value so that after the
-;; on-change handler fires we can immediately reset the <select> back to the
-;; placeholder.  This prevents the dropdown from appearing "stuck" on the last
-;; selected item after adding it to the list.
+;; Form-2 component: resets <select> to placeholder after each on-change fires.
 (defn selection-adder [values on-change]
   (let [selected-value (atom "")]
     (fn [values on-change]
diff --git a/src/cljc/orcpub/dnd/e5/magic_items.cljc b/src/cljc/orcpub/dnd/e5/magic_items.cljc
index 52f76eba7..ac2e5c5d9 100644
--- a/src/cljc/orcpub/dnd/e5/magic_items.cljc
+++ b/src/cljc/orcpub/dnd/e5/magic_items.cljc
@@ -3149,3 +3149,44 @@ The boots regain 2 hours of flying capability for every 12 hours they aren’t i
 
 (defn equipped-armor-details [armor]
   (equipped-items-details armor all-armor-map))
+
+;; Strip base-weapon detail keys that only apply to custom (:other) weapons.
+(defn remove-custom-weapon-fields [item]
+  (dissoc item
+          ::weapons5e/finesse?
+          ::weapons5e/versatile?
+          ::weapons5e/reach?
+          ::weapons5e/two-handed?
+          ::weapons5e/thrown?
+          ::weapons5e/heavy?
+          ::weapons5e/light?
+          ::weapons5e/ammunition?
+          ::weapons5e/damage-die-count
+          ::weapons5e/damage-die
+          ::weapons5e/versatile
+          ::weapons5e/melee?
+          ::weapons5e/ranged?
+          ::weapons5e/type
+          ::weapons5e/range
+          ::weapons5e/damage-type))
+
+;; Apply a subtype toggle to an item. Initialises sane defaults when
+;; switching to :other (Custom) so the view doesn't need to dispatch
+;; defaults during render.
+(defn apply-subtype-toggle [item type]
+  (remove-custom-weapon-fields
+   (case type
+     :other (-> item
+                (assoc ::subtypes #{:other})
+                (assoc ::damage-die-count 1)
+                (assoc ::damage-die 4)
+                (assoc ::weapon-type :simple)
+                (assoc ::melee-ranged :melee))
+     :all (assoc item ::subtypes #{:all})
+     (update item
+             ::subtypes
+             (fn [s]
+               (let [clean (disj (or s #{}) :other :all)]
+                 (if (get clean type)
+                   (disj clean type)
+                   (conj clean type))))))))
diff --git a/src/cljs/orcpub/dnd/e5/events.cljs b/src/cljs/orcpub/dnd/e5/events.cljs
index 23e742516..895f88bd8 100644
--- a/src/cljs/orcpub/dnd/e5/events.cljs
+++ b/src/cljs/orcpub/dnd/e5/events.cljs
@@ -3747,47 +3747,11 @@
                   ability-kw
                   value)))
 
-(defn remove-custom-weapon-fields [item]
-  (dissoc item
-          ::weapons/finesse?
-          ::weapons/versatile?
-          ::weapons/reach?
-          ::weapons/two-handed?
-          ::weapons/thrown?
-          ::weapons/heavy?
-          ::weapons/light?
-          ::weapons/ammunition?
-          ::weapons/damage-die-count
-          ::weapons/damage-die
-          ::weapons/versatile
-          ::weapons/melee?
-          ::weapons/ranged?
-          ::weapons/type
-          ::weapons/range
-          ::weapons/damage-type))
-
 (reg-event-db
  ::mi/toggle-subtype
  item-interceptors
  (fn [item [_ type]]
-   (remove-custom-weapon-fields
-    (case type
-      ;; When switching to Custom (:other), initialise weapon fields to sane
-      ;; defaults here in the event handler instead of during view render.
-      ;; Setting them during render caused the dropdowns to reset on every
-      ;; re-render, making user selection impossible.
-      :other (-> item
-                 (assoc ::mi/subtypes #{:other})
-                 (assoc ::mi/damage-die-count 1)
-                 (assoc ::mi/damage-die 4)
-                 (assoc ::mi/weapon-type :simple)
-                 (assoc ::mi/melee-ranged :melee))
-      :all (assoc item ::mi/subtypes #{:all})
-      (update item
-              ::mi/subtypes
-              #(as-> % $
-                 (disj $ :other :all)
-                 (toggle-set type $)))))))
+   (mi/apply-subtype-toggle item type)))
 
 (reg-event-fx
  ::char5e/open-character
diff --git a/test/cljc/orcpub/dnd/e5/magic_items_test.clj b/test/cljc/orcpub/dnd/e5/magic_items_test.clj
index b873d57fc..bb292b354 100644
--- a/test/cljc/orcpub/dnd/e5/magic_items_test.clj
+++ b/test/cljc/orcpub/dnd/e5/magic_items_test.clj
@@ -2,6 +2,7 @@
   (:require [clojure.test :refer [testing deftest is]]
             [orcpub.dnd.e5.magic-items :as mi]
             [orcpub.dnd.e5.character :as char]
+            [orcpub.dnd.e5.weapons :as weapons5e]
             [orcpub.modifiers :as mod]
             [orcpub.dnd.e5.modifiers :as mod5e]))
 
@@ -140,3 +141,66 @@
                 ::mi/type :armor
                 ::mi/item-subtype (constantly false)}]
       (is (thrown? IllegalArgumentException (mi/expand-armor item))))))
+
+(deftest test-remove-custom-weapon-fields
+  (testing "strips all weapon-specific keys"
+    (let [item {::mi/name "Test Weapon"
+                ::weapons5e/finesse? true
+                ::weapons5e/versatile? true
+                ::weapons5e/reach? false
+                ::weapons5e/two-handed? true
+                ::weapons5e/thrown? false
+                ::weapons5e/heavy? true
+                ::weapons5e/light? false
+                ::weapons5e/ammunition? false
+                ::weapons5e/damage-die-count 2
+                ::weapons5e/damage-die 6
+                ::weapons5e/versatile 8
+                ::weapons5e/melee? true
+                ::weapons5e/ranged? false
+                ::weapons5e/type :martial
+                ::weapons5e/range [20 60]
+                ::weapons5e/damage-type :slashing}
+          result (mi/remove-custom-weapon-fields item)]
+      (is (= {::mi/name "Test Weapon"} result))))
+  (testing "preserves item when no weapon keys present"
+    (let [item {::mi/name "Ring" ::mi/type :ring}
+          result (mi/remove-custom-weapon-fields item)]
+      (is (= item result)))))
+
+(deftest test-apply-subtype-toggle--custom
+  (testing ":other sets custom defaults and strips weapon fields"
+    (let [item {::mi/name "My Sword"
+                ::weapons5e/finesse? true}
+          result (mi/apply-subtype-toggle item :other)]
+      (is (= #{:other} (::mi/subtypes result)))
+      (is (= 1 (::mi/damage-die-count result)))
+      (is (= 4 (::mi/damage-die result)))
+      (is (= :simple (::mi/weapon-type result)))
+      (is (= :melee (::mi/melee-ranged result)))
+      (is (nil? (::weapons5e/finesse? result))
+          "base weapon keys should be stripped")))
+  (testing ":other is idempotent"
+    (let [item {}
+          r1 (mi/apply-subtype-toggle item :other)
+          r2 (mi/apply-subtype-toggle r1 :other)]
+      (is (= r1 r2)))))
+
+(deftest test-apply-subtype-toggle--all
+  (testing ":all sets subtypes to #{:all}"
+    (let [result (mi/apply-subtype-toggle {} :all)]
+      (is (= #{:all} (::mi/subtypes result))))))
+
+(deftest test-apply-subtype-toggle--named
+  (testing "adds a named subtype"
+    (let [result (mi/apply-subtype-toggle {} :sword)]
+      (is (= #{:sword} (::mi/subtypes result)))))
+  (testing "toggles off an existing subtype"
+    (let [item {::mi/subtypes #{:sword}}
+          result (mi/apply-subtype-toggle item :sword)]
+      (is (= #{} (::mi/subtypes result)))))
+  (testing "clears :other/:all when toggling a named subtype"
+    (let [item {::mi/subtypes #{:other}}
+          result (mi/apply-subtype-toggle item :sword)]
+      (is (= #{:sword} (::mi/subtypes result)))
+      (is (not (contains? (::mi/subtypes result) :other))))))

From ab95ba7750faf627721b946d1199cf9a97fc21e8 Mon Sep 17 00:00:00 2001
From: codeGlaze <github@codeglaze.com>
Date: Mon, 16 Feb 2026 22:29:54 +0000
Subject: [PATCH 3/5] Fix custom weapon defaults using wrong namespace keys

apply-subtype-toggle was writing defaults to ::mi/ keys instead of
::weapons5e/ keys, so custom weapon properties (damage die, type,
melee/ranged, damage type) were silently dropped during serialization.
Also fixes item-save-success to update the custom-items list in app-db
so saved items appear immediately without a page reload.
---
 src/cljc/orcpub/dnd/e5/magic_items.cljc      | 40 ++++++++-----
 src/cljs/orcpub/dnd/e5/events.cljs           | 22 ++++++-
 test/cljc/orcpub/dnd/e5/magic_items_test.clj | 63 ++++++++++++++++++--
 3 files changed, 103 insertions(+), 22 deletions(-)

diff --git a/src/cljc/orcpub/dnd/e5/magic_items.cljc b/src/cljc/orcpub/dnd/e5/magic_items.cljc
index ac2e5c5d9..bf3b68df7 100644
--- a/src/cljc/orcpub/dnd/e5/magic_items.cljc
+++ b/src/cljc/orcpub/dnd/e5/magic_items.cljc
@@ -230,6 +230,7 @@
                     ::weapons5e/range
                     ::weapons5e/versatile
                     ::weapons5e/special?
+                    ::weapons5e/loading?
                     ::weapons5e/melee?
                     ::weapons5e/ranged?
                     ::weapons5e/heavy?
@@ -3161,6 +3162,8 @@ The boots regain 2 hours of flying capability for every 12 hours they aren’t i
           ::weapons5e/heavy?
           ::weapons5e/light?
           ::weapons5e/ammunition?
+          ::weapons5e/special?
+          ::weapons5e/loading?
           ::weapons5e/damage-die-count
           ::weapons5e/damage-die
           ::weapons5e/versatile
@@ -3174,19 +3177,24 @@ The boots regain 2 hours of flying capability for every 12 hours they aren’t i
 ;; switching to :other (Custom) so the view doesn't need to dispatch
 ;; defaults during render.
 (defn apply-subtype-toggle [item type]
-  (remove-custom-weapon-fields
-   (case type
-     :other (-> item
-                (assoc ::subtypes #{:other})
-                (assoc ::damage-die-count 1)
-                (assoc ::damage-die 4)
-                (assoc ::weapon-type :simple)
-                (assoc ::melee-ranged :melee))
-     :all (assoc item ::subtypes #{:all})
-     (update item
-             ::subtypes
-             (fn [s]
-               (let [clean (disj (or s #{}) :other :all)]
-                 (if (get clean type)
-                   (disj clean type)
-                   (conj clean type))))))))
+  (case type
+    :other (-> item
+               remove-custom-weapon-fields
+               (assoc ::subtypes #{:other})
+               (assoc ::weapons5e/damage-die-count 1)
+               (assoc ::weapons5e/damage-die 4)
+               (assoc ::weapons5e/type :simple)
+               (assoc ::weapons5e/damage-type :bludgeoning)
+               (assoc ::weapons5e/melee? true)
+               (assoc ::weapons5e/ranged? false))
+    :all (-> item
+             remove-custom-weapon-fields
+             (assoc ::subtypes #{:all}))
+    (-> item
+        remove-custom-weapon-fields
+        (update ::subtypes
+                (fn [s]
+                  (let [clean (disj (or s #{}) :other :all)]
+                    (if (get clean type)
+                      (disj clean type)
+                      (conj clean type))))))))
diff --git a/src/cljs/orcpub/dnd/e5/events.cljs b/src/cljs/orcpub/dnd/e5/events.cljs
index 895f88bd8..4ef2ca9ac 100644
--- a/src/cljs/orcpub/dnd/e5/events.cljs
+++ b/src/cljs/orcpub/dnd/e5/events.cljs
@@ -440,8 +440,14 @@
  :item-save-success
  (fn [{:keys [db]} [_ response]]
    (let [strict-item (:body response)
-         item (mi/to-internal-item strict-item)]
-     {:dispatch-n [[:show-message "Your item has been saved."]
+         item (mi/to-internal-item strict-item)
+         item-id (:db/id strict-item)
+         existing-items (::mi/custom-items db)
+         updated-items (if (some #(= item-id (:db/id %)) existing-items)
+                         (mapv #(if (= item-id (:db/id %)) strict-item %) existing-items)
+                         (conj (vec existing-items) strict-item))]
+     {:db (assoc db ::mi/custom-items updated-items)
+      :dispatch-n [[:show-message "Your item has been saved."]
                    [::mi/set-item item]]})))
 
 (reg-event-fx
@@ -3072,6 +3078,18 @@
  (fn [item _]
    (update item ::weapons/ammunition? not)))
 
+(reg-event-db
+ ::mi/toggle-item-special?
+ item-interceptors
+ (fn [item _]
+   (update item ::weapons/special? not)))
+
+(reg-event-db
+ ::mi/toggle-item-loading?
+ item-interceptors
+ (fn [item _]
+   (update item ::weapons/loading? not)))
+
 (reg-event-db
  ::mi/toggle-item-versatile?
  item-interceptors
diff --git a/test/cljc/orcpub/dnd/e5/magic_items_test.clj b/test/cljc/orcpub/dnd/e5/magic_items_test.clj
index bb292b354..aa58cca07 100644
--- a/test/cljc/orcpub/dnd/e5/magic_items_test.clj
+++ b/test/cljc/orcpub/dnd/e5/magic_items_test.clj
@@ -153,6 +153,8 @@
                 ::weapons5e/heavy? true
                 ::weapons5e/light? false
                 ::weapons5e/ammunition? false
+                ::weapons5e/special? true
+                ::weapons5e/loading? true
                 ::weapons5e/damage-die-count 2
                 ::weapons5e/damage-die 6
                 ::weapons5e/versatile 8
@@ -174,10 +176,12 @@
                 ::weapons5e/finesse? true}
           result (mi/apply-subtype-toggle item :other)]
       (is (= #{:other} (::mi/subtypes result)))
-      (is (= 1 (::mi/damage-die-count result)))
-      (is (= 4 (::mi/damage-die result)))
-      (is (= :simple (::mi/weapon-type result)))
-      (is (= :melee (::mi/melee-ranged result)))
+      (is (= 1 (::weapons5e/damage-die-count result)))
+      (is (= 4 (::weapons5e/damage-die result)))
+      (is (= :simple (::weapons5e/type result)))
+      (is (= :bludgeoning (::weapons5e/damage-type result)))
+      (is (true? (::weapons5e/melee? result)))
+      (is (false? (::weapons5e/ranged? result)))
       (is (nil? (::weapons5e/finesse? result))
           "base weapon keys should be stripped")))
   (testing ":other is idempotent"
@@ -204,3 +208,54 @@
           result (mi/apply-subtype-toggle item :sword)]
       (is (= #{:sword} (::mi/subtypes result)))
       (is (not (contains? (::mi/subtypes result) :other))))))
+
+(deftest test-custom-weapon-round-trip
+  (testing "custom weapon defaults survive from-internal-item serialization"
+    (let [builder-item (-> {::mi/name "Test Blade"
+                            ::mi/type :weapon
+                            ::mi/rarity :uncommon}
+                           (mi/apply-subtype-toggle :other))
+          serialized (mi/from-internal-item builder-item)]
+      (is (= "Test Blade" (::mi/name serialized)))
+      (is (= :weapon (::mi/type serialized)))
+      (is (= :uncommon (::mi/rarity serialized)))
+      (is (= #{:other} (::mi/subtypes serialized)))
+      (is (= 1 (::weapons5e/damage-die-count serialized))
+          "damage die count must survive serialization")
+      (is (= 4 (::weapons5e/damage-die serialized))
+          "damage die must survive serialization")
+      (is (= :simple (::weapons5e/type serialized))
+          "weapon type must survive serialization")
+      (is (= :bludgeoning (::weapons5e/damage-type serialized))
+          "damage type must survive serialization")
+      (is (true? (::weapons5e/melee? serialized))
+          "melee flag must survive serialization")))
+  (testing "custom weapon with user overrides round-trips correctly"
+    (let [builder-item (-> {::mi/name "Fire Lance"
+                            ::mi/type :weapon
+                            ::mi/rarity :rare}
+                           (mi/apply-subtype-toggle :other)
+                           (assoc ::weapons5e/damage-die-count 2)
+                           (assoc ::weapons5e/damage-die 8)
+                           (assoc ::weapons5e/type :martial)
+                           (assoc ::weapons5e/damage-type :fire)
+                           (assoc ::weapons5e/melee? false)
+                           (assoc ::weapons5e/ranged? true))
+          serialized (mi/from-internal-item builder-item)]
+      (is (= 2 (::weapons5e/damage-die-count serialized)))
+      (is (= 8 (::weapons5e/damage-die serialized)))
+      (is (= :martial (::weapons5e/type serialized)))
+      (is (= :fire (::weapons5e/damage-type serialized)))
+      (is (true? (::weapons5e/ranged? serialized)))))
+  (testing "special and loading properties survive round-trip"
+    (let [builder-item (-> {::mi/name "Net Launcher"
+                            ::mi/type :weapon
+                            ::mi/rarity :common}
+                           (mi/apply-subtype-toggle :other)
+                           (assoc ::weapons5e/special? true)
+                           (assoc ::weapons5e/loading? true))
+          serialized (mi/from-internal-item builder-item)]
+      (is (true? (::weapons5e/special? serialized))
+          "special? must survive serialization")
+      (is (true? (::weapons5e/loading? serialized))
+          "loading? must survive serialization"))))

From 8dadbc79ddda39ac4cbcf9dcc1d2a527270fa9fe Mon Sep 17 00:00:00 2001
From: codeGlaze <github@codeglaze.com>
Date: Mon, 16 Feb 2026 22:30:04 +0000
Subject: [PATCH 4/5] Add Special and Loading weapon properties (#276)

Adds missing Special and Loading checkboxes to the custom weapon
builder. Special was partially wired (schema + serialization) but
had no UI/events/subs. Loading is new end-to-end including tagging
existing weapons (crossbows, blowgun, firearms) per 5e PHB rules.
---
 src/clj/orcpub/db/schema.clj        |  1 +
 src/cljc/orcpub/dnd/e5/weapons.cljc |  6 ++++++
 src/cljs/orcpub/dnd/e5/subs.cljs    | 12 ++++++++++++
 src/cljs/orcpub/dnd/e5/views.cljs   |  8 +++++++-
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/clj/orcpub/db/schema.clj b/src/clj/orcpub/db/schema.clj
index 48c3170bd..1826d7267 100644
--- a/src/clj/orcpub/db/schema.clj
+++ b/src/clj/orcpub/db/schema.clj
@@ -369,6 +369,7 @@
    (map
     bool-prop-no-history
     [::weapon5e/special?
+     ::weapon5e/loading?
      ::weapon5e/melee?
      ::weapon5e/ranged?
      ::weapon5e/heavy?
diff --git a/src/cljc/orcpub/dnd/e5/weapons.cljc b/src/cljc/orcpub/dnd/e5/weapons.cljc
index aa39f2f62..019eebe2f 100644
--- a/src/cljc/orcpub/dnd/e5/weapons.cljc
+++ b/src/cljc/orcpub/dnd/e5/weapons.cljc
@@ -12,6 +12,7 @@
     :key :crossbow-light
     ::two-handed? true
     ::ammunition? true
+    ::loading? true
     ::link "https://en.wikipedia.org/wiki/Crossbow"}
    {::ranged? true,
     :key :dart,
@@ -332,6 +333,7 @@
     ::ranged? true,
     ::range {::min 25, ::max 100},
     ::ammunition? true
+    ::loading? true
     :key :blowgun}
    {:name "Crossbow, hand",
     ::damage-type :piercing,
@@ -341,6 +343,7 @@
     ::ranged? true,
     ::range {::min 30, ::max 120},
     ::ammunition? true
+    ::loading? true
     ::light? true
     :key :crossbow-hand}
    {:name "Crossbow, heavy",
@@ -353,6 +356,7 @@
     ::range {::min 100, ::max 400},
     :key :crossbow-heavy
     ::ammunition? true
+    ::loading? true
     ::two-handed? true}
    {:name "Longbow",
     ::damage-type :piercing,
@@ -383,6 +387,7 @@
     ::heavy? true,
     ::range {::min 30, ::max 90},
     :key :firearm-hand
+    ::loading? true
     ::two-handed? false}
    {:name "Firearm, Burst (DMV)",
     ::damage-type :piercing,
@@ -403,6 +408,7 @@
     ::heavy? true,
     ::range {::min 60, ::max 120},
     :key :firearm-long
+    ::loading? true
     ::two-handed? true}])
 
 (def ammunition
diff --git a/src/cljs/orcpub/dnd/e5/subs.cljs b/src/cljs/orcpub/dnd/e5/subs.cljs
index f8f66f78c..1c1f40217 100644
--- a/src/cljs/orcpub/dnd/e5/subs.cljs
+++ b/src/cljs/orcpub/dnd/e5/subs.cljs
@@ -1105,6 +1105,18 @@
  (fn [item _]
    (get item ::weapon5e/ammunition?)))
 
+(reg-sub
+ ::mi5e/item-special?
+ :<- [::mi5e/builder-item]
+ (fn [item _]
+   (get item ::weapon5e/special?)))
+
+(reg-sub
+ ::mi5e/item-loading?
+ :<- [::mi5e/builder-item]
+ (fn [item _]
+   (get item ::weapon5e/loading?)))
+
 (reg-sub
  ::mi5e/item-versatile?
  :<- [::mi5e/builder-item]
diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs
index 33cc02961..bf366b88d 100644
--- a/src/cljs/orcpub/dnd/e5/views.cljs
+++ b/src/cljs/orcpub/dnd/e5/views.cljs
@@ -3870,7 +3870,13 @@
           [labeled-checkbox "Light?" @(subscribe [::mi/item-light?])]]
          [:div.m-l-10
           {:on-click (make-event-handler ::mi/toggle-item-ammunition?)}
-          [labeled-checkbox "Ammunition?" @(subscribe [::mi/item-ammunition?])]]]
+          [labeled-checkbox "Ammunition?" @(subscribe [::mi/item-ammunition?])]]
+         [:div.m-l-10
+          {:on-click (make-event-handler ::mi/toggle-item-special?)}
+          [labeled-checkbox "Special?" @(subscribe [::mi/item-special?])]]
+         [:div.m-l-10
+          {:on-click (make-event-handler ::mi/toggle-item-loading?)}
+          [labeled-checkbox "Loading?" @(subscribe [::mi/item-loading?])]]]
         [:div.flex.flex-wrap
          [:div.m-t-10
           [labeled-dropdown

From 9d955737b48f6165693288ee5e5cf1d97142479e Mon Sep 17 00:00:00 2001
From: codeGlaze <github@codeglaze.com>
Date: Tue, 17 Feb 2026 03:30:31 +0000
Subject: [PATCH 5/5] Fix equipment name resolution to include magic items in
 PDF export

The PDF equipment fields were only looking up names from the base
equipment map, causing magic items to display as raw keywords. Merge
the magic items map into the lookup. Also ensure add-key populates
:name so custom items resolve correctly.
---
 src/cljc/orcpub/dnd/e5/magic_items.cljc | 4 +++-
 src/cljc/orcpub/pdf_spec.cljc           | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cljc/orcpub/dnd/e5/magic_items.cljc b/src/cljc/orcpub/dnd/e5/magic_items.cljc
index bf3b68df7..7e2273850 100644
--- a/src/cljc/orcpub/dnd/e5/magic_items.cljc
+++ b/src/cljc/orcpub/dnd/e5/magic_items.cljc
@@ -2951,7 +2951,9 @@ The boots regain 2 hours of flying capability for every 12 hours they aren’t i
    weapons5e/ammunition))
 
 (defn add-key [item]
-  (assoc item :key (common/name-to-kw (name-key item))))
+  (assoc item
+         :key (common/name-to-kw (name-key item))
+         :name (name-key item)))
 
 (def weapon-subtypes
   #{:axe :sword :staff})
diff --git a/src/cljc/orcpub/pdf_spec.cljc b/src/cljc/orcpub/pdf_spec.cljc
index aa515c6cf..4fed204be 100644
--- a/src/cljc/orcpub/pdf_spec.cljc
+++ b/src/cljc/orcpub/pdf_spec.cljc
@@ -158,7 +158,8 @@
 (def coin-keys [:cp :sp :ep :gp :pp])
 
 (defn equipment-fields [built-char]
-  (let [equipment (es/entity-val built-char :equipment)
+  (let [equipment-map (merge mi5e/all-equipment-map @(subscribe [::mi5e/all-magic-items-map]))
+        equipment (es/entity-val built-char :equipment)
         armor (es/entity-val built-char :armor)
         magic-armor (es/entity-val built-char :magic-armor)
         magic-items (es/entity-val built-char :magic-items)
@@ -188,8 +189,8 @@
                    (map
                    (fn [[kw {count ::char-equip5e/quantity}]]
                      (if (> count 1)
-                       (str (disp5e/equipment-name mi5e/all-equipment-map kw) " x" count )
-                       (str (disp5e/equipment-name mi5e/all-equipment-map kw))
+                       (str (disp5e/equipment-name equipment-map kw) " x" count )
+                       (str (disp5e/equipment-name equipment-map kw))
                        )
                      )
                    (filter
@@ -199,7 +200,7 @@
                   "\n"
                   (map
                    (fn [[kw {count ::char-equip5e/quantity}]]
-                     (str (disp5e/equipment-name mi5e/all-equipment-map kw) " (" count ")"))
+                     (str (disp5e/equipment-name equipment-map kw) " (" count ")"))
                    (merge
                     (apply dissoc treasure coin-keys)
                     unequipped-items)))})))