28: Fix issue with reserved groups

This commit is contained in:
Matt Smith 2022-01-12 17:44:20 +00:00 committed by Andrew
parent 7d8eb74ee7
commit 6eee073a24
3 changed files with 22 additions and 7 deletions

View file

@ -49,7 +49,6 @@ export class SimpleActor extends Actor {
if ( !!shorthand ) {
delete data.attributes;
delete data.attr;
delete data.abil;
delete data.groups;
}
return data;
@ -211,11 +210,11 @@ export class SimpleActor extends Actor {
}
// Non-grouped attributes.
if ( data.attributes[k]?.value ) {
data.attributes[k].value = Roll.replaceFormulaData(data.attributes[k].value, data);
data.attributes[k].value = Roll.replaceFormulaData(String(data.attributes[k].value), data);
}
// Grouped attributes.
else if ( attr ) {
data.attributes[k][attr].value = Roll.replaceFormulaData(data.attributes[k][attr].value, data);
data.attributes[k][attr].value = Roll.replaceFormulaData(String(data.attributes[k][attr].value), data);
}
// Duplicate values to shorthand.