[pull] develop from Orcpub:develop

README.md

@@ -220,7 +220,9 @@ We work on forks, and branches.  Fork our repo, then create a new branch for any
 
 - Install Java: http://openjdk.java.net/ 
 - or http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-- Download [Datomic](https://www.datomic.com/get-datomic.html), and unzip it into a directory.
+- For MacOS/Linux Download [Datomic](https://www.datomic.com/get-datomic.html), and unzip it into a directory.
+
+* For Windows [DMV Datomic](https://dungeonmastersvault.app.box.com/s/f9qifk069zfpwjr4poy6u1ngw6dgieqc) - newer versions do not work on Windows. it's a known issue that the Datomic team hasn't bothered to solve.
 
   Launch Datomic by going to shell/cmd prompt in the unzipped directory and run:
 
@@ -284,7 +286,10 @@ You can use the community edition of [IntelliJ IDEA](https://www.jetbrains.com/i
 ### VS Code
 You can use the open source edition of [Visual Studio Code](https://code.visualstudio.com/Download) with the Calva: Clojure & ClojureScript Interactive Programming, Clojure Code, and Bookmarks Extensions.
 
-To start REPL with VS Code, first launch datomic in a cmd window, then jack-in using the Leiningen + Legacy Figwheel, figwheel-native, and select the :dev and optionally :start-server.
+To start REPL with VS Code:
+* first launch datomic in a cmd window with the transactor snippet from above: `bin\transactor config/samples/free-transactor-template.properties`
+  * you can also just add that to a `.ps1` file inside your project for easier reference eg. `run-datomic ps1`
+* THEN jack-in using the `Leiningen + Legacy Figwheel`, `figwheel-native`, and select the `:dev` and optionally `:start-server`
 
 ### REPL
 
@@ -453,7 +458,7 @@ For this reason we have to build a dependency graph of derived attributes and th
 ## FAQs
 **Q: I'm a newb Clojure developer looking to get my feet wet, where to start?**
 
-**A:** *First I would start by getting the fundamentals down at http://www.4clojure.com/ From there you might add some unit tests or pick up an open issue on the "Issues" tab (and add unit tests with it).*
+**A:** *First I would start by getting the fundamentals down at https://4clojure.oxal.org/ From there you might add some unit tests or pick up an open issue on the "Issues" tab (and add unit tests with it).*
 
 
 **Q: Your DSL for defining character options is pretty cool, I can build any type of character option out there. How about I add a bunch on content from the Player's Handbook?**

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")}]))

src/cljc/orcpub/pdf_spec.cljc

@@ -429,8 +429,22 @@
   (str (dice/dice-string die-count die mod)
        (if damage-type (str " " (name damage-type)))))
 
-(defn attacks-and-spellcasting-fields [built-char]
-  (let [all-weapons (mi5e/equipped-items-details (char5e/all-weapons-inventory built-char) mi5e/all-weapons-map)
+(defn attacks-and-spellcasting-fields 
+  "For each weapon, we are creating a new map with the name, the attack bonus, and the damage.
+  The attack bonus is calculated using the function 'char5e/best-weapon-attack-modifier' which
+  calculates the attack bonus for a specific weapon.
+  The damage is calculated using the function 'damage-str' which takes the damage die, damage die count,
+  the damage modifier, and the damage type, and combines them into a string of the form 'dice-string damage-type'.
+  If the weapon is versatile, we also create a second map, where the name is suffixed with ' (two-handed)'
+  and the attack bonus and damage is calculated for the versatile form of the weapon.
+  We then remove any nil maps, and mapcat concatenates all of the maps into a single list.
+  The remove function filters out weapons of type 'ammunition'."
+  [built-char]
+  (let [all-weapons ; map of all weapons in inventory
+        (mi5e/equipped-items-details ; function to filter for equipped weapons
+         (char5e/all-weapons-inventory built-char)
+         @(subscribe [::mi5e/all-weapons-map]) ; re-frame subscription for all weapons
+         )
         weapon-fields (mapcat
                        (fn [{:keys [name ::weapon5e/damage-die ::weapon5e/damage-die-count ::weapon5e/damage-type] :as weapon}]
                          (let [versatile (:versatile weapon)
@@ -452,8 +466,7 @@
                         all-weapons))
         first-3-weapons (take 3 weapon-fields)
         rest-weapons (drop 3 weapon-fields)
-        number-of-attacks (char5e/number-of-attacks built-char)
-        ]
+        number-of-attacks (char5e/number-of-attacks built-char)]
 
     (apply merge
      {:attacks-and-spellcasting (str "Number of Attacks: " number-of-attacks "\n"

src/cljs/orcpub/ver.cljc

@@ -1,5 +1,5 @@
 (ns orcpub.ver)
 ; To be updated by build server
-(defn version [] "v2.5.0.22")
-(defn date [] "08-23-2021")
-(defn description []  "")
+(defn version [] "v2.5.0.25")
+(defn date [] "03-28-2024")
+(defn description []  "Herholin Copperflayer the Dwarf")