From a28c0de9961bf1cf9708935e50d937d6ad5cb88e Mon Sep 17 00:00:00 2001 From: Michael Green Date: Sun, 16 Mar 2025 23:27:18 +0100 Subject: [PATCH 1/2] fix for shorthand formula that was grouped but also evalutade to an empty string being interpreted as non-grouped --- module/actor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/actor.js b/module/actor.js index 0823b8d..4baaa31 100644 --- a/module/actor.js +++ b/module/actor.js @@ -176,7 +176,7 @@ export class SimpleActor extends Actor { let formula = ''; if ( !!shorthand ) { // Handle grouped attributes first. - if ( data.items[item][k][gk] ) { + if ( data.items[item][k][gk] !== undefined ) { formula = data.items[item][k][gk].replace('@item.', `@items.${item}.`); data.items[item][k][gk] = Roll.replaceFormulaData(formula, data); } From f8877aedf33d448d853099be689a9e3859ce4ce9 Mon Sep 17 00:00:00 2001 From: Michael Green Date: Mon, 17 Mar 2025 09:25:41 +0100 Subject: [PATCH 2/2] fix for shorthand formula where the item key may also be undefined --- module/actor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/actor.js b/module/actor.js index 4baaa31..6e84b9d 100644 --- a/module/actor.js +++ b/module/actor.js @@ -176,7 +176,7 @@ export class SimpleActor extends Actor { let formula = ''; if ( !!shorthand ) { // Handle grouped attributes first. - if ( data.items[item][k][gk] !== undefined ) { + if ( data.items[item][k]?.[gk] !== undefined ) { formula = data.items[item][k][gk].replace('@item.', `@items.${item}.`); data.items[item][k][gk] = Roll.replaceFormulaData(formula, data); }