From 2fc5b01f091edca3138aa83fdfbf1d055c1a6f19 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Date: Fri, 5 Jun 2026 05:31:01 -0400
Subject: [PATCH 1/2] Fix rerolling when hope/fear automation is enabled
 (#1972)

---
 module/dice/helpers.mjs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/dice/helpers.mjs b/module/dice/helpers.mjs
index 33519949..35adb8b7 100644
--- a/module/dice/helpers.mjs
+++ b/module/dice/helpers.mjs
@@ -1,3 +1,5 @@
+import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
+
 export function updateResourcesForDualityReroll(oldDuality, newDuality, actor) {
     const { hopeFear } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
     if (game.user.isGM ? !hopeFear.gm : !hopeFear.players) return;

From 5be79f4ab83b2b4483a0f4deb7f7e7f60bc60e34 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Date: Fri, 5 Jun 2026 05:33:20 -0400
Subject: [PATCH 2/2] Fix several issues with inline damage (#1973)

---
 module/data/actor/tierAdjustment.mjs | 5 +++--
 module/dice/dhRoll.mjs               | 1 +
 module/enrichers/DamageEnricher.mjs  | 4 ++--
 module/enrichers/parser.mjs          | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/data/actor/tierAdjustment.mjs b/module/data/actor/tierAdjustment.mjs
index 785eec2b..bc6ad176 100644
--- a/module/data/actor/tierAdjustment.mjs
+++ b/module/data/actor/tierAdjustment.mjs
@@ -1,5 +1,6 @@
 import { calculateExpectedValue, parseTermsFromSimpleFormula } from '../../helpers/utils.mjs';
 import { adversaryExpectedDamage, adversaryScalingData } from '../../config/actorConfig.mjs';
+import { parseInlineParams } from '../../enrichers/parser.mjs';
 
 export function getTierAdjustedAdversary(source, tier) {
     const currentTier = source.tier ?? 1;
@@ -60,8 +61,8 @@ export function getTierAdjustedAdversary(source, tier) {
         const descriptionFormulas = [];
         for (const withDescription of [item.system, ...Object.values(item.system.actions)]) {
             withDescription.description = withDescription.description.replace(damageRegex, (match, inner) => {
-                const { value: formula } = parseInlineParams(inner);
-                if (!formula || !type) return match;
+                const { value: formula } = parseInlineParams(inner, { first: 'value' });
+                if (!formula) return match;
 
                 try {
                     const newFormula = calculateAdjustedDamage(formula, 'action', damageMeta)?.formula;
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index 02c4ab24..fb20870f 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -37,6 +37,7 @@ export default class DHRoll extends Roll {
     static async buildConfigure(config = {}, message = {}) {
         config.hooks = [...this.getHooks(), ''];
         config.dialog ??= {};
+        config.damageOptions ??= {};
 
         for (const hook of config.hooks) {
             if (Hooks.call(`${CONFIG.DH.id}.preRoll${hook.capitalize()}`, config, message) === false) return null;
diff --git a/module/enrichers/DamageEnricher.mjs b/module/enrichers/DamageEnricher.mjs
index e3f9c42a..db0e8729 100644
--- a/module/enrichers/DamageEnricher.mjs
+++ b/module/enrichers/DamageEnricher.mjs
@@ -1,7 +1,7 @@
 import { parseInlineParams } from './parser.mjs';
 
 export default function DhDamageEnricher(match, _options) {
-    const { value, type, inline } = parseInlineParams(match[1]);
+    const { value, type, inline } = parseInlineParams(match[1], { first: 'value' });
     if (!value || !type) return match[0];
     return getDamageMessage(value, type, inline, match[0]);
 }
@@ -59,7 +59,7 @@ export const renderDamageButton = async event => {
             {
                 formula: value,
                 applyTo: CONFIG.DH.GENERAL.healingTypes.hitPoints.id,
-                type: type
+                damageTypes: type
             }
         ]
     };
diff --git a/module/enrichers/parser.mjs b/module/enrichers/parser.mjs
index 365caec9..76ea0b73 100644
--- a/module/enrichers/parser.mjs
+++ b/module/enrichers/parser.mjs
@@ -8,7 +8,7 @@ export function parseInlineParams(paramString, { first } = {}) {
     const parts = paramString.split('|').map(x => x.trim());
     const params = {};
     for (const [idx, param] of parts.entries()) {
-        if (first && idx === 0) {
+        if (first && idx === 0 && !param.includes(':')) {
             params[first] = param;
         } else {
             const parts = param.split(':');