diff --git a/module/applications/dialogs/beastformDialog.mjs b/module/applications/dialogs/beastformDialog.mjs index 3dd88d6c..09a9222b 100644 --- a/module/applications/dialogs/beastformDialog.mjs +++ b/module/applications/dialogs/beastformDialog.mjs @@ -278,19 +278,26 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat 'close', async () => { const selected = app.selected.toObject(); + const evolved = app.evolved.form ? app.evolved.form.toObject() : null; const data = await game.system.api.data.items.DHBeastform.getWildcardImage( app.configData.data.parent, - app.selected + evolved ?? app.selected ); if (data) { if (!data.selectedImage) selected = null; else { - if (data.usesDynamicToken) selected.system.tokenRingImg = data.selectedImage; - else selected.system.tokenImg = data.selectedImage; + const imageSource = evolved ?? selected; + if (imageSource.usesDynamicToken) imageSource.system.tokenRingImg = data.selectedImage; + else imageSource.system.tokenImg = data.selectedImage; } } - resolve({ selected: selected, evolved: app.evolved, hybrid: app.hybrid, item: featureItem }); + resolve({ + selected: selected, + evolved: { ...app.evolved, form: evolved }, + hybrid: app.hybrid, + item: featureItem + }); }, { once: true } ); diff --git a/module/data/fields/action/beastformField.mjs b/module/data/fields/action/beastformField.mjs index 6185f0f8..e19807c7 100644 --- a/module/data/fields/action/beastformField.mjs +++ b/module/data/fields/action/beastformField.mjs @@ -76,7 +76,7 @@ export default class BeastformField extends fields.SchemaField { * @returns */ static async transform(selectedForm, evolvedData, hybridData) { - const formData = evolvedData?.form ? evolvedData.form.toObject() : selectedForm; + const formData = evolvedData?.form ?? selectedForm; const beastformEffect = formData.effects.find(x => x.type === 'beastform'); if (!beastformEffect) { ui.notifications.error('DAGGERHEART.UI.Notifications.beastformMissingEffect'); diff --git a/system.json b/system.json index 0dcbc398..ce361568 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "id": "daggerheart", "title": "Daggerheart", "description": "An unofficial implementation of the Daggerheart system", - "version": "1.4.2", + "version": "1.4.3", "compatibility": { "minimum": "13.346", "verified": "13.351",