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

Jump to bottom

235 fix natural unarmored ac stack #412

Merged
merged 11 commits into from
Jul 16, 2020
Merged

235 fix natural unarmored ac stack #412

merged 11 commits into from
Jul 16, 2020

Conversation

codeGlaze
Copy link

Description:

Related issue - Unarmored AC trait was stacking with Natural AC trait: fixes #235

Checklist:

  • The code change is tested and works locally.
  • I have commented my code, particularly in hard-to-understand areas
  • [-] I have made corresponding changes to the documentation if necessary
  • There is no commented out code in this PR.
  • My changes generate no new warnings (check the console)

codeGlaze added 11 commits April 26, 2019 23:23
@codeGlaze
Merge pull request Orcpub#1 from KingMob/bugfix/update-figwheel-repl-…
6979b84 
…support

Add Figwheel support to REPL again
@codeGlaze
Merge remote-tracking branch 'Orcpub/develop' into develop
5fa2f37
@codeGlaze
Merge remote-tracking branch 'origin/develop' into develop
431e3bf
@codeGlaze
Revert "Merge branch 'develop' into DMV-orcpub/develop"
6e9204a 
This reverts commit 840a5a8bffd42291cd290f269871ead39fa3ac40.
@codeGlaze
Merge remote-tracking branch 'Orcpub/develop' into develop
f966f84
@codeGlaze
Merge remote-tracking branch 'Orcpub/develop' into develop
85d2ffb
@codeGlaze
Merge branch 'develop' of https://github.com/codeglaze/orcpub into de…
de484de 
…velop
@codeGlaze
Merge remote-tracking branch 'DMV-orcpub/develop' into develop
27187fc
@codeGlaze
Merge remote-tracking branch 'DMV-orcpub/develop' into develop
9cfee2c
@codeGlaze
Merge remote-tracking branch 'Orcpub/develop' into develop
c2caff6
@codeGlaze
Fixes issue Orcpub#235
85e84c6 
Checks for unarmored AC and whether it's higher than natural AC. Sets to 0 if either condition is false.
@datdamnzotz datdamnzotz added area/application Task related to orcpub application itself bug Something isn't working labels Jul 14, 2020
@datdamnzotz datdamnzotz added this to the 2.5.0.17 milestone Jul 14, 2020
datdamnzotz
datdamnzotz reviewed Jul 14, 2020
View reviewed changes
Copy link

@datdamnzotz datdamnzotz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@datdamnzotz datdamnzotz merged commit 8062e2d into Orcpub:develop Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@datdamnzotz datdamnzotz datdamnzotz approved these changes

Assignees

@codeGlaze codeGlaze

Labels
area/application Task related to orcpub application itself bug Something isn't working
Projects
None yet
Milestone
2.5.0.17
Development

Successfully merging this pull request may close these issues.

Natural Armor shouldn't stack with Barbarian's Unarmored Defense
2 participants
@codeGlaze @datdamnzotz