Merge pull request #314 from marloso2/action-features

Organized Class Features
Orcpub · Feb 29, 2020 · 613d4f8 · 613d4f8
2 parents d480fd1 + f1002b0
commit 613d4f8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/src/cljc/orcpub/pdf_spec.cljc b/src/cljc/orcpub/pdf_spec.cljc
@@ -119,10 +119,14 @@
               (vec-trait "Immunities" (resistance-strings immunities))]))))
 
 (defn traits-fields [built-char]
-  (let [bonus-actions (sort-by :name (es/entity-val built-char :bonus-actions))
-        actions (sort-by :name (es/entity-val built-char :actions))
-        reactions (sort-by :name (es/entity-val built-char :reactions))
-        traits (sort-by :name (es/entity-val built-char :traits))
+  (let [traits-by-type (group-by :type (es/entity-val built-char :traits))
+        bonus-actions (sort-by :name (concat (es/entity-val built-char :bonus-actions)
+                                             (traits-by-type :b-action)))
+        actions (sort-by :name (concat (es/entity-val built-char :actions)
+                                       (traits-by-type :action)))
+        reactions (sort-by :name (concat (es/entity-val built-char :reactions)
+                                         (traits-by-type :reaction)))
+        traits (sort-by :name (traits-by-type nil))
         traits-str (traits-string traits)
         actions? (or (seq bonus-actions)
                      (seq actions)

diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs
@@ -3249,10 +3249,15 @@
         damage-vulnerabilities @(subscribe [::char/damage-vulnerabilities id])
         condition-immunities @(subscribe [::char/condition-immunities id])
         immunities @(subscribe [::char/immunities id])
-        actions @(subscribe [::char/actions id])
-        bonus-actions @(subscribe [::char/bonus-actions id])
-        reactions @(subscribe [::char/reactions id])
-        traits @(subscribe [::char/traits id])
+        traits-by-type (group-by :type @(subscribe [::char/traits id]))
+        actions (concat @(subscribe [::char/actions id])
+                        (traits-by-type :action))
+        bonus-actions (concat @(subscribe [::char/bonus-actions id])
+                              (traits-by-type :b-action))
+        reactions (concat @(subscribe [::char/reactions id])
+                          (traits-by-type :reaction))
+        traits (concat (traits-by-type nil)
+                       (traits-by-type :other))
         attacks @(subscribe [::char/attacks id])
         all-traits (concat actions bonus-actions reactions traits attacks)
         freqs (into #{} (map has-frequency-units? all-traits))]
@@ -5581,7 +5586,15 @@
        ::e5/edit-class-trait-type
        ::e5/edit-class-trait-description
        ::e5/delete-class-trait
-       :edit-trait-level-event ::e5/edit-class-trait-level]]]))
+       :edit-trait-level-event ::e5/edit-class-trait-level
+       :types [{:title "Other"
+                :value :other}
+               {:title "Action"
+                :value :action}
+               {:title "Bonus Action"
+                :value :b-action}
+               {:title "Reaction"
+                :value :reaction}]]]]))
 
 (defn subclass-spells [subclass spells-title spells-kw]
   [:div
@@ -5707,7 +5720,15 @@
       ::e5/edit-subclass-trait-type
       ::e5/edit-subclass-trait-description
       ::e5/delete-subclass-trait
-      :edit-trait-level-event ::e5/edit-subclass-trait-level]]))
+      :edit-trait-level-event ::e5/edit-subclass-trait-level
+       :types [{:title "Other"
+                :value :other}
+               {:title "Action"
+                :value :action}
+               {:title "Bonus Action"
+                :value :b-action}
+               {:title "Reaction"
+                :value :reaction}]]]))
 
 (defn option-spell [index
                      {:keys [level value] :as spell-cfg}