cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-22 02:19:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix assigning includeBase

Browse source
This commit is contained in:
Carlos Fernandez 2026-07-18 19:01:13 -04:00
parent 6460077c94
commit f091c1849a
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
module/data/fields/actionField.mjs
View file

@ -237,7 +237,8 @@ export function ActionMixin(Base) {
await this.parent.updateSource({ [path]: updates }, options); await this.parent.updateSource({ [path]: updates }, options);
result = this.parent; result = this.parent;
} else { } else {
result = await this.item.update({ [path]: updates }, options); // If no changes occur, update returns undefined, but we need to re-retrieve the action anyways
result = (await this.item.update({ [path]: updates }, options)) ?? this.item;
} }
return this.inCollection return this.inCollection

2
templates/actionTypes/damage.hbs
View file

@ -12,7 +12,7 @@
{{#if source.main}} {{#if source.main}}
<div class="nest-inputs"> <div class="nest-inputs">
{{#if @root.hasBaseDamage}} {{#if @root.hasBaseDamage}}
{{formField @root.fields.damage.fields.main.fields.includeBase value=@root.source.damage.includeBase name="damage.main.includeBase" classes="checkbox" localize=true }} {{formField @root.fields.damage.fields.main.fields.includeBase value=source.main.includeBase name="damage.main.includeBase" classes="checkbox" localize=true }}
{{/if}} {{/if}}
{{#unless (eq @root.source.type 'healing')}} {{#unless (eq @root.source.type 'healing')}}
{{formField baseFields.main.fields.direct value=source.main.direct name=(concat path "damage.main.direct") localize=true classes="checkbox"}} {{formField baseFields.main.fields.direct value=source.main.direct name=(concat path "damage.main.direct") localize=true classes="checkbox"}}