Merge pull request #27 from ahandleman/main

Fixed Severe Attack bug with uninitialized sin sheets
diabeatz96 · Aug 28, 2024 · a8fe6da · a8fe6da
2 parents 088061c + ac9b731
commit a8fe6da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/module/sheets/actor-sheet.mjs b/module/sheets/actor-sheet.mjs
@@ -59,9 +59,21 @@ export class CainActorSheet extends ActorSheet {
         relativeTo: this.actor,
       }
     );
-    if (this.actor.system.severeAttack || this.actor.system.attack) {
+    if (this.actor.system.severeAttack) {
       context.enrichedDescription = await TextEditor.enrichHTML(
-        this.actor.system.severeAttack.description  || this.actor.system.attack.description,
+        this.actor.system.severeAttack.description,
+        {
+          secrets: this.document.isOwner,
+          async: true,
+          rollData: this.actor.getRollData(),
+          relativeTo: this.actor,
+        }
+      );
+    }
+
+    if (this.actor.system.attack) {
+      context.enrichedDescription = await TextEditor.enrichHTML(
+        this.actor.system.attack.description,
         {
           secrets: this.document.isOwner,
           async: true,

diff --git a/system.json b/system.json
@@ -20,7 +20,7 @@
       "thumbnail": "systems/cain/assets/cain.png"
     }
   ],
-  "version": "1.0.22",
+  "version": "1.0.23",
   "compatibility": {
     "minimum": 11,
     "verified": "12"