From 5dc7f029a68d90908f69031f00122bf67de01dec Mon Sep 17 00:00:00 2001
From: codeGlaze <github@codeglaze.com>
Date: Mon, 11 Mar 2024 12:12:27 -0400
Subject: [PATCH 1/2] Fixes #602 - minor - SVG icon swap

minor
+ adds svg icons for rod-of-asclepius
+ changes CON icon to RoA
+ added some basic documentation to relevant functions
---
 resources/public/image/black/rod-of-asclepius.svg |  1 +
 resources/public/image/rod-of-asclepius.svg       |  1 +
 src/cljc/orcpub/dnd/e5/template.cljc              | 12 ++++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 resources/public/image/black/rod-of-asclepius.svg
 create mode 100644 resources/public/image/rod-of-asclepius.svg

diff --git a/resources/public/image/black/rod-of-asclepius.svg b/resources/public/image/black/rod-of-asclepius.svg
new file mode 100644
index 000000000..e88075973
--- /dev/null
+++ b/resources/public/image/black/rod-of-asclepius.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><path d="M0 0h512v512H0z" fill="#ffffff" fill-opacity="0"></path><g class="" transform="translate(0,0)" style=""><path d="M287.7 18.92l-68.6 3.62 1.1 15.11.4-.1c5.8-1.24 11.3-1.89 16.4-2.05 15.4-.48 27.9 3.45 38.2 9 3.9 2.13 7.5 4.43 11 6.76zm-47.8 34.39c-.7 0-1.5 0-2.2.1-3.9.17-8.1.73-12.8 1.7-27.7 9.5-46.1 20.91-56.5 32.09-10.5 11.18-13.2 21.6-11.2 32 3.8 19.2 28.1 41.2 68.3 54.9v-33.3c-5-2.7-8.9-5.9-10.8-11.5-1.3-3.7-.9-7.8.2-10.9 1.1-3.2 2.8-5.7 4.8-8.4l4.5-6.1 6.8 3.5c48.1 24.4 81.6 30.6 108.3 19.5 12.8-5.3 16.4-10.3 16.8-11.9.3-1.6-.5-4.5-5.7-9-10.2-9.22-33.2-18.78-47.1-22.2l-1-.27-1-.52c-13.7-7.23-23.7-16.7-34.7-22.68-7.8-4.2-15.8-7.11-26.7-7.02zm49.8 37.19a7.916 7.878 0 0 1 7.9 7.88 7.916 7.878 0 0 1-7.9 7.92 7.916 7.878 0 0 1-7.9-7.92 7.916 7.878 0 0 1 7.9-7.88zm147.8 32.7c-12.3.3-24 3.5-33 8.4-10.5-1.4-21.4-4.2-32.7-7.7-2.7 5.6-7.6 10.2-14.6 14.3 13.9 4.6 28.1 8.7 42.4 10.9 2.7 12.8 8 25.5 17.7 37.1l13.8-11.6c-7.7-9.2-11.9-18.7-14-29 8.4-3.3 20.7-5.5 31.2-3.5l3.2-17.8c-4.7-.8-9.4-1.2-14-1.1zm-194 9.9v57.7c6.7-1.8 12.8-3.5 17.6-5 3.6-1.2 6.1-2.2 7.6-3l.3-40c-8.2-2.6-16.6-5.8-25.5-9.7zm43.4 25.8l-.2 27.4v-.3c.1 3.6-1.7 6.7-3.3 8.5-1.7 1.8-3.4 2.8-5.1 3.8-3.5 1.9-7.3 3.2-11.8 4.6-8.9 2.8-20.1 5.6-31.3 9-11.2 3.4-22.4 7.6-30.6 12.4-8.1 4.9-12.6 10-13.6 15.2-3.1 16.4-.1 25.6 7.5 34.2 5.2 6.1 13.6 11.7 24 17.2l-2.4-21.3 6.1-2.6c18.3-8.1 38.3-13.8 55.3-21.1 17.1-7.2 30.7-15.8 38.2-28.2 4.7-7.9 5.5-13.6 4.5-19-.9-5.3-4-10.7-9.1-16.4-7-7.8-17.5-15.5-28.2-23.4zm-17.1 110.9c-10.4 3.8-20.8 7.3-30.3 11.2l3.3 30.2h.1c9-2.9 17.4-5.4 22.9-7.6 2.3-1 3.7-1.8 4.6-2.4zm18.3 15.4l.3 18.2v.2c0 5.3-3.4 9.2-6.3 11.5-2.9 2.2-6 3.7-9.5 5.1-7 2.9-15.4 5.3-24.1 8.1-17.1 5.5-34 13.4-38.9 21.3-5.5 15.8-3.5 23.3 2 30 3.4 4.2 9 8 15.8 11.8l-2.2-18.7 7.3-2.1s19.9-5.9 40.2-15.8c10.2-5 20.4-10.9 27.9-17.3 7.6-6.3 12-12.8 12.8-18.1.4-2.5-.8-6.7-4-11.9-3.3-5.1-8.4-10.7-13.8-15.7-2.5-2.4-5.1-4.6-7.5-6.6zm-19.9 91.5c-9.9 4.2-17.8 6.9-23.1 8.6l.5 7 3.5 29.7-1.4-.7.1 1.2 1.2-.3c5.9-1.4 10.9-2.9 13.5-4.3 2.7-1.4 2.2-1.3 2.2-1.4l3.3-37.2zm16.6 17.6l-2.1 23.8c-.7 7.5-6.5 13-11.9 15.8-5.5 2.8-11.5 4.3-17.7 5.8-12.4 2.9-25.9 5.8-33.1 10.6-7.1 4.7-11.3 9.3-13.3 12.9-2 3.7-2.1 6.1-1.2 9.1 1.3 4 6.1 9.4 14.2 14.5-.1-4.4.4-8.5 2.2-12.6 1.9-4.3 5.8-7.8 9.8-9.7 4-1.9 8.2-2.8 13.2-3.7 11.1-1.9 27.9-5.5 41.6-12.2 13.7-6.7 23.2-15.4 24.7-28.1.2-2-.8-4.9-3.9-8.8-3-3.8-7.9-7.9-13-11.5-3.3-2.2-6.5-4.2-9.5-5.9zM266 474.8c-5.2 1.3-10 2.3-14.2 3.1l1 14.5 12.3.7z" fill="#000000" fill-opacity="1"></path></g></svg>
\ No newline at end of file
diff --git a/resources/public/image/rod-of-asclepius.svg b/resources/public/image/rod-of-asclepius.svg
new file mode 100644
index 000000000..6c7a8d300
--- /dev/null
+++ b/resources/public/image/rod-of-asclepius.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><path d="M0 0h512v512H0z" fill="#ffffff" fill-opacity="0"></path><g class="" transform="translate(0,0)" style=""><path d="M287.7 18.92l-68.6 3.62 1.1 15.11.4-.1c5.8-1.24 11.3-1.89 16.4-2.05 15.4-.48 27.9 3.45 38.2 9 3.9 2.13 7.5 4.43 11 6.76zm-47.8 34.39c-.7 0-1.5 0-2.2.1-3.9.17-8.1.73-12.8 1.7-27.7 9.5-46.1 20.91-56.5 32.09-10.5 11.18-13.2 21.6-11.2 32 3.8 19.2 28.1 41.2 68.3 54.9v-33.3c-5-2.7-8.9-5.9-10.8-11.5-1.3-3.7-.9-7.8.2-10.9 1.1-3.2 2.8-5.7 4.8-8.4l4.5-6.1 6.8 3.5c48.1 24.4 81.6 30.6 108.3 19.5 12.8-5.3 16.4-10.3 16.8-11.9.3-1.6-.5-4.5-5.7-9-10.2-9.22-33.2-18.78-47.1-22.2l-1-.27-1-.52c-13.7-7.23-23.7-16.7-34.7-22.68-7.8-4.2-15.8-7.11-26.7-7.02zm49.8 37.19a7.916 7.878 0 0 1 7.9 7.88 7.916 7.878 0 0 1-7.9 7.92 7.916 7.878 0 0 1-7.9-7.92 7.916 7.878 0 0 1 7.9-7.88zm147.8 32.7c-12.3.3-24 3.5-33 8.4-10.5-1.4-21.4-4.2-32.7-7.7-2.7 5.6-7.6 10.2-14.6 14.3 13.9 4.6 28.1 8.7 42.4 10.9 2.7 12.8 8 25.5 17.7 37.1l13.8-11.6c-7.7-9.2-11.9-18.7-14-29 8.4-3.3 20.7-5.5 31.2-3.5l3.2-17.8c-4.7-.8-9.4-1.2-14-1.1zm-194 9.9v57.7c6.7-1.8 12.8-3.5 17.6-5 3.6-1.2 6.1-2.2 7.6-3l.3-40c-8.2-2.6-16.6-5.8-25.5-9.7zm43.4 25.8l-.2 27.4v-.3c.1 3.6-1.7 6.7-3.3 8.5-1.7 1.8-3.4 2.8-5.1 3.8-3.5 1.9-7.3 3.2-11.8 4.6-8.9 2.8-20.1 5.6-31.3 9-11.2 3.4-22.4 7.6-30.6 12.4-8.1 4.9-12.6 10-13.6 15.2-3.1 16.4-.1 25.6 7.5 34.2 5.2 6.1 13.6 11.7 24 17.2l-2.4-21.3 6.1-2.6c18.3-8.1 38.3-13.8 55.3-21.1 17.1-7.2 30.7-15.8 38.2-28.2 4.7-7.9 5.5-13.6 4.5-19-.9-5.3-4-10.7-9.1-16.4-7-7.8-17.5-15.5-28.2-23.4zm-17.1 110.9c-10.4 3.8-20.8 7.3-30.3 11.2l3.3 30.2h.1c9-2.9 17.4-5.4 22.9-7.6 2.3-1 3.7-1.8 4.6-2.4zm18.3 15.4l.3 18.2v.2c0 5.3-3.4 9.2-6.3 11.5-2.9 2.2-6 3.7-9.5 5.1-7 2.9-15.4 5.3-24.1 8.1-17.1 5.5-34 13.4-38.9 21.3-5.5 15.8-3.5 23.3 2 30 3.4 4.2 9 8 15.8 11.8l-2.2-18.7 7.3-2.1s19.9-5.9 40.2-15.8c10.2-5 20.4-10.9 27.9-17.3 7.6-6.3 12-12.8 12.8-18.1.4-2.5-.8-6.7-4-11.9-3.3-5.1-8.4-10.7-13.8-15.7-2.5-2.4-5.1-4.6-7.5-6.6zm-19.9 91.5c-9.9 4.2-17.8 6.9-23.1 8.6l.5 7 3.5 29.7-1.4-.7.1 1.2 1.2-.3c5.9-1.4 10.9-2.9 13.5-4.3 2.7-1.4 2.2-1.3 2.2-1.4l3.3-37.2zm16.6 17.6l-2.1 23.8c-.7 7.5-6.5 13-11.9 15.8-5.5 2.8-11.5 4.3-17.7 5.8-12.4 2.9-25.9 5.8-33.1 10.6-7.1 4.7-11.3 9.3-13.3 12.9-2 3.7-2.1 6.1-1.2 9.1 1.3 4 6.1 9.4 14.2 14.5-.1-4.4.4-8.5 2.2-12.6 1.9-4.3 5.8-7.8 9.8-9.7 4-1.9 8.2-2.8 13.2-3.7 11.1-1.9 27.9-5.5 41.6-12.2 13.7-6.7 23.2-15.4 24.7-28.1.2-2-.8-4.9-3.9-8.8-3-3.8-7.9-7.9-13-11.5-3.3-2.2-6.5-4.2-9.5-5.9zM266 474.8c-5.2 1.3-10 2.3-14.2 3.1l1 14.5 12.3.7z" fill="#ffffff" fill-opacity="1"></path></g></svg>
\ No newline at end of file
diff --git a/src/cljc/orcpub/dnd/e5/template.cljc b/src/cljc/orcpub/dnd/e5/template.cljc
index de8c957cb..a6f6493fb 100644
--- a/src/cljc/orcpub/dnd/e5/template.cljc
+++ b/src/cljc/orcpub/dnd/e5/template.cljc
@@ -49,14 +49,22 @@
                (assoc a k other-v other-k v))))))
 
 (def ability-icons
+  "Icons / names are provided by https://game-icons.net/"
   {::char5e/str "strong"
-   ::char5e/con "caduceus"
+   ::char5e/con "rod-of-asclepius"
    ::char5e/dex "body-balance"
    ::char5e/int "read"
    ::char5e/wis "meditation"
    ::char5e/cha "aura"})
 
-(defn ability-icon [k size theme]
+;; REVIEW: use generic function for all icons instead?
+(defn ability-icon
+  "Takes [k size theme] to generate css class name based on the size and theme.
+   `k` is the icon name/key in image set,
+   `size` sets both h and w,
+   `theme` sets light/dark color and opacity.
+   Only used for `ability-icons` -- see body of function below."
+  [k size theme]
   (let [light-theme? (= "light-theme" theme)]
     [:img {:class-name (str "h-" size " w-" size (if light-theme? " opacity-7"))
            :src (str (if light-theme? "/image/black/" "/image/") (ability-icons k) ".svg")}]))

From c86e07c66d0fc71b37da27950105500c298eb7b7 Mon Sep 17 00:00:00 2001
From: codeGlaze <github@codeglaze.com>
Date: Mon, 11 Mar 2024 20:27:33 -0400
Subject: [PATCH 2/2] Fixes 548 - value not setting on load

* Added dispatch to set default value
* Changed range from 1:5 to 0:5
---
 src/cljs/orcpub/dnd/e5/views.cljs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs
index 97002e815..a413ca5ed 100644
--- a/src/cljs/orcpub/dnd/e5/views.cljs
+++ b/src/cljs/orcpub/dnd/e5/views.cljs
@@ -4258,24 +4258,25 @@
                                  option
                                  set-path-prop-event
                                  toggle-path-prop-event]
+  (dispatch [set-path-prop-event [:profs proficiency-choice-key :choose] (get-in option [:profs proficiency-choice-key :choose] 0)]) ;; set the default value
   [:div.m-b-20
-   [:div.f-s-24.f-w-b.m-b-20 title]
-   [:div.m-b-10
+    [:div.f-s-24.f-w-b.m-b-20 title]
+    [:div.m-b-10
     [labeled-dropdown
-     "Choose"
-     {:items (map
+      "Choose"
+      {:items (map
               value-to-item
-              (range 1 6))
+              (range 0 6))
       :value (get-in option [:profs proficiency-choice-key :choose] 1)
       :on-change #(dispatch [set-path-prop-event [:profs proficiency-choice-key :choose] (js/parseInt %)])}]]
-   [:div.f-s-18.f-w-b.m-b-20 "Options"]
-   [:div.flex.flex-wrap
+    [:div.f-s-18.f-w-b.m-b-20 "Options"]
+    [:div.flex.flex-wrap
     (doall
-     (map
+      (map
       (fn [{:keys [name key]}]
         ^{:key key}
         [:span.m-r-20.m-b-10
-         [comps/labeled-checkbox
+          [comps/labeled-checkbox
           name
           (get-in option [:profs proficiency-choice-key :options key])
           false