Merge pull request #1622 from crnormand/r0156

Fixed GCS 5 disad calcs
crnormand · Sep 30, 2022 · fb345fa · fb345fa
2 parents 99bca74 + ed541f7
commit fb345fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,8 +4,9 @@ If you can't access the Google doc, here is a [PDF](https://github.com/crnormand
 
 Release 0.15.6
 
-- Fix GCS import when melee attack has no level.
-
+- Fixed GCS 5 import when melee attack has no level.
+- Fixed GCS 5 disad calculations.
+
 Release 0.15.5 9/28/2022
 
 - Fixed drag and drop items between non-GM characters

diff --git a/module/actor/actor.js b/module/actor/actor.js
@@ -1909,6 +1909,7 @@ export class GurpsActor extends Actor {
       if (toplevel) {
         if (a > 0) ads += a
         else disads += a
+        disads += d
       } else ads += a + d
     } else if (i.calc?.points == -1) quirks += i.calc?.points
     else if (i.calc?.points > 0) ads += i.calc?.points