Merge branch 'main' into bug/103-enrich-htmlfield-content-before-its-used-in-applications

module/helpers/handlebarsHelper.mjs

@@ -1,3 +1,5 @@
+import { itemAbleRollParse } from './utils.mjs';
+
 export default class RegisterHandlebarsHelpers {
     static registerHelpers() {
         Handlebars.registerHelper({
@@ -6,7 +8,7 @@ export default class RegisterHandlebarsHelpers {
             times: this.times,
             damageFormula: this.damageFormula,
             damageSymbols: this.damageSymbols,
-            tertiary: this.tertiary
+            rollParsed: this.rollParsed
         });
     }
 
@@ -42,7 +44,9 @@ export default class RegisterHandlebarsHelpers {
         return new Handlebars.SafeString(Array.from(symbols).map(symbol => `<i class="fa-solid ${symbol}"></i>`));
     }
 
-    static tertiary(a, b) {
-        return a ?? b;
+    static rollParsed(value, actor, item, numerical) {
+        const isNumerical = typeof numerical === 'boolean' ? numerical : false;
+        const result = itemAbleRollParse(value, actor, item);
+        return isNumerical && !result ? 0 : result;
     }
 }

module/helpers/utils.mjs

@@ -245,10 +245,10 @@ export const getDamageLabel = damage => {
 
 export const damageKeyToNumber = key => {
     return {
-        'none': 0,
-        'minor': 1,
-        'major': 2,
-        'severe': 3
+        none: 0,
+        minor: 1,
+        major: 2,
+        severe: 3
     }[key];
 };
 
@@ -311,3 +311,15 @@ export function getDocFromElement(element) {
     return foundry.utils.fromUuidSync(target.dataset.itemUuid) ?? null;
 }
 
+
+export const itemAbleRollParse = (value, actor, item) => {
+    if (!value) return value;
+
+    const isItemTarget = value.toLowerCase().startsWith('item.');
+    const slicedValue = isItemTarget ? value.slice(5) : value;
+    try {
+        return Roll.safeEval(Roll.replaceFormulaData(slicedValue, isItemTarget ? item : actor));
+    } catch (_) {
+        return '';
+    }
+};