Merge pull request #38 from orffen/r8

R8
orffen · Sep 26, 2022 · 857d886 · 857d886
2 parents b2eafe3 + 736a30a
commit 857d886
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
@@ -88,18 +88,20 @@ export class BasicFantasyRPGActor extends Actor {
       let specialAbilityLookup = [3, 12, 25, 30, 40, 45, 55, 65, 70, 75, 90, 95, 100, 110, 115, 125, 135, 145, 160, 175, 200, 225, 250, 275, 300, 325];
       let xpValue = 0;
       let xpSpecialAbilityBonus = 0;
-      if (data.hitDice.size == "d8" && data.hitDice.mod >= 0) {
-        xpValue = xpLookup[data.hitDice.number];
-        xpSpecialAbilityBonus = specialAbilityLookup[data.hitDice.number] * data.specialAbility.value;
-      } else {
+      if (data.hitDice.number < 1 || (data.hitDice.number == 1 && data.hitDice.mod < 0) || data.hitDice.size < "d8") {
         xpValue = xpLookup[0];
         xpSpecialAbilityBonus = specialAbilityLookup[0] * data.specialAbility.value;
+      } else if (data.hitDice.number > 25) {
+        xpValue = 9000 + (data.hitDice.number - 25) * 750;
+        xpSpecialAbilityBonus = (325 + (data.hitDice.number - 25) * 25) * data.specialAbility.value;
+      } else {
+        xpValue = xpLookup[data.hitDice.number];
+        xpSpecialAbilityBonus = specialAbilityLookup[data.hitDice.number] * data.specialAbility.value;
       }
-      return xpValue + xpSpecialAbilityBonus;
+      return xpValue + Math.max(0, xpSpecialAbilityBonus); // never return a negative special ability bonus
     };
 
     data.attackBonus.value = this._calculateMonsterAttackBonus();
-
   }
 
   /**
@@ -108,7 +110,9 @@ export class BasicFantasyRPGActor extends Actor {
   _calculateMonsterAttackBonus() {
     if (this.system.hitDice.number < 1) {
       return 0;
-    } 
+    } else if (this.system.hitDice.number > 31) {
+      return 16;
+    }
     switch (this.system.hitDice.number) {
       case 9: return 8;
       case 10:
@@ -133,7 +137,7 @@ export class BasicFantasyRPGActor extends Actor {
       case 29:
       case 30:
       case 31: return 15;
-      default: return this.system.hitDice.number;
+      default: return this.system.hitDice.number; // this handles 1-9
     }
   }
 

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
   "id": "basicfantasyrpg",
   "title": "Basic Fantasy RPG",
   "description": "The Basic Fantasy RPG system for FoundryVTT!",
-  "version": "r7",
+  "version": "r8",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
@@ -32,6 +32,6 @@
   "secondaryTokenAttribute": null,
   "url": "https://github.com/orffen/basicfantasyrpg",
   "manifest": "https://raw.githubusercontent.com/orffen/basicfantasyrpg/main/system.json",
-  "download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r7.zip",
+  "download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r8.zip",
   "license": "LICENSE.txt"
 }