Zombie Beholder macro fix

MrPrimate · May 18, 2024 · e7dec32 · e7dec32
1 parent ef6ce53
commit e7dec32
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Next Up
+
+- Fix for Beholder Zombie Eye Ray macro
+
 # 5.1.25
 
 - Monster Effects: Beholder Legendary Eye Ray action will now roll Eye Rays macro.

diff --git a/src/effects/DDBEffectHelper.js b/src/effects/DDBEffectHelper.js
@@ -919,6 +919,30 @@ export default class DDBEffectHelper {
         });
       });
     }
+    if (results.length > 0) return results;
+    return DDBEffectHelper.extractParagraphItems(text, { titleType });
+  }
+
+  static extractParagraphItems(text, { type = "p", titleType = "em" } = {}) {
+    const results = [];
+    const parsedDoc = utils.htmlToDoc(text);
+
+    const listItems = parsedDoc.querySelectorAll(type);
+    let i = 1;
+    for (const item of listItems) {
+      const title = item.querySelector(titleType);
+      // eslint-disable-next-line no-continue
+      if (!title) continue;
+      const content = title.nextSibling;
+      results.push({
+        number: i,
+        title: title.textContent.replace(/\.$/, "").trim(),
+        content: content.innerHTML?.trim() ?? content.wholeText?.trim() ?? content.textContent?.trim(),
+        full: item.innerHTML,
+      });
+      i++;
+    }
+
     return results;
   }