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

235 fix natural unarmored ac stack #412

Merged
merged 11 commits into from
Jul 16, 2020
Merged

235 fix natural unarmored ac stack #412

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6979b84
Merge pull request #1 from KingMob/bugfix/update-figwheel-repl-support
codeGlaze Apr 27, 2019
5fa2f37
Merge remote-tracking branch 'Orcpub/develop' into develop
codeGlaze Jan 18, 2020
431e3bf
Merge remote-tracking branch 'origin/develop' into develop
codeGlaze Jan 21, 2020
6e9204a
Revert "Merge branch 'develop' into DMV-orcpub/develop"
codeGlaze Jan 21, 2020
f966f84
Merge remote-tracking branch 'Orcpub/develop' into develop
codeGlaze Mar 17, 2020
85d2ffb
Merge remote-tracking branch 'Orcpub/develop' into develop
codeGlaze Apr 15, 2020
de484de
Merge branch 'develop' of https://github.com/codeglaze/orcpub into de…
codeGlaze May 1, 2020
27187fc
Merge remote-tracking branch 'DMV-orcpub/develop' into develop
codeGlaze May 1, 2020
9cfee2c
Merge remote-tracking branch 'DMV-orcpub/develop' into develop
codeGlaze May 28, 2020
c2caff6
Merge remote-tracking branch 'Orcpub/develop' into develop
codeGlaze Jul 7, 2020
85e84c6
Fixes issue #235
codeGlaze Jul 7, 2020
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
7 changes: 4 additions & 3 deletions src/cljc/orcpub/dnd/e5/template_base.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
(es/make-entity
{?armor-class (+ 10 (?ability-bonuses ::char5e/dex))
?base-armor-class (+ 10 (?ability-bonuses ::char5e/dex)
?natural-ac-bonus
;; Checks whether barbarian unarmored bonus exists (or is higher) than natural AC/Draconic Bloodline AC
(if (> ?unarmored-ac-bonus ?natural-ac-bonus ) 0 ?natural-ac-bonus)
?magical-ac-bonus)
?levels {}
?ac-bonus 0
Expand Down Expand Up @@ -119,7 +120,7 @@
{}
?ability-bonuses)
?total-levels (apply + (map (fn [[k {l :class-level}]] l) ?levels))

?class-level (fn [class-kw] (get-in ?levels [class-kw :class-level]))
?barbarian-level (?class-level :barbarian)
?bard-level (?class-level :bard)
Expand All @@ -132,7 +133,7 @@
?sorcerer-level (?class-level :sorcerer)
?warlock-level (?class-level :warlock)
?wizard-level (?class-level :wizard)

?proficiency-bonus-increase 0
?prof-bonus (+ (int (/ (dec ?total-levels) 4)) 2 ?proficiency-bonus-increase)
?default-skill-bonus {}
Expand Down