Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes 35 - PDF custom weapon display bug #605

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Fixes 35 - PDF custom weapon display bug #605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f41415
Merge branch '602-fix-icon-asclepius-svg' into tinkan-wip
codeGlaze Mar 11, 2024
7f64b5a
Fixes custom weapons/items not displaying on PDFs
codeGlaze Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/cljc/orcpub/pdf_spec.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand Down
Loading