Merged with development

module/applications/dialogs/_module.mjs

@@ -5,6 +5,7 @@ export { default as DamageDialog } from './damageDialog.mjs';
 export { default as DamageReductionDialog } from './damageReductionDialog.mjs';
 export { default as DeathMove } from './deathMove.mjs';
 export { default as Downtime } from './downtime.mjs';
+export { default as ImageSelectDialog } from './imageSelectDialog.mjs';
 export { default as MulticlassChoiceDialog } from './multiclassChoiceDialog.mjs';
 export { default as OwnershipSelection } from './ownershipSelection.mjs';
 export { default as RerollDamageDialog } from './rerollDamageDialog.mjs';

module/applications/dialogs/beastformDialog.mjs

@@ -276,7 +276,22 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat
             const featureItem = item;
             app.addEventListener(
                 'close',
-                () => resolve({ selected: app.selected, evolved: app.evolved, hybrid: app.hybrid, item: featureItem }),
+                async () => {
+                    const selected = app.selected.toObject();
+                    const data = await game.system.api.data.items.DHBeastform.getWildcardImage(
+                        app.configData.data.parent,
+                        app.selected
+                    );
+                    if (data) {
+                        if (!data.selectedImage) selected = null;
+                        else {
+                            if (data.usesDynamicToken) selected.system.tokenRingImg = data.selectedImage;
+                            else selected.system.tokenImg = data.selectedImage;
+                        }
+                    }
+
+                    resolve({ selected: selected, evolved: app.evolved, hybrid: app.hybrid, item: featureItem });
+                },
                 { once: true }
             );
             app.render({ force: true });

module/applications/dialogs/imageSelectDialog.mjs

@@ -0,0 +1,67 @@
+const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
+
+export default class ImageSelectDialog extends HandlebarsApplicationMixin(ApplicationV2) {
+    constructor(titleName, images) {
+        super();
+
+        this.titleName = titleName;
+        this.images = images;
+    }
+
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        classes: ['daggerheart', 'dialog', 'dh-style', 'image-select'],
+        position: {
+            width: 600,
+            height: 'auto'
+        },
+        window: {
+            icon: 'fa-solid fa-paw'
+        },
+        actions: {
+            selectImage: ImageSelectDialog.#selectImage,
+            finishSelection: ImageSelectDialog.#finishSelection
+        }
+    };
+
+    get title() {
+        return this.titleName;
+    }
+
+    /** @override */
+    static PARTS = {
+        main: { template: 'systems/daggerheart/templates/dialogs/image-select/main.hbs' },
+        footer: { template: 'systems/daggerheart/templates/dialogs/image-select/footer.hbs' }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.images = this.images;
+        context.selectedImage = this.selectedImage;
+
+        return context;
+    }
+
+    static #selectImage(_event, button) {
+        this.selectedImage = button.dataset.image ?? button.querySelector('img').dataset.image;
+        this.render();
+    }
+
+    static #finishSelection() {
+        this.close({ submitted: true });
+    }
+
+    async close(options = {}) {
+        if (!options.submitted) this.selectedImage = null;
+
+        await super.close();
+    }
+
+    static async configure(title, images) {
+        return new Promise(resolve => {
+            const app = new this(title, images);
+            app.addEventListener('close', () => resolve(app.selectedImage), { once: true });
+            app.render({ force: true });
+        });
+    }
+}

module/applications/sheets/actors/character.mjs

@@ -888,6 +888,23 @@ export default class CharacterSheet extends DHBaseActorSheet {
             itemData.system.inVault = true;
         }
 
+        if (item.type === 'beastform') {
+            if (this.document.effects.find(x => x.type === 'beastform')) {
+                return ui.notifications.warn(
+                    game.i18n.localize('DAGGERHEART.UI.Notifications.beastformAlreadyApplied')
+                );
+            }
+
+            const data = await game.system.api.data.items.DHBeastform.getWildcardImage(this.document, itemData);
+            if (data) {
+                if (!data.selectedImage) return;
+                else {
+                    if (data.usesDynamicToken) itemData.system.tokenRingImg = data.selectedImage;
+                    else itemData.system.tokenImg = data.selectedImage;
+                }
+            }
+        }
+
         if (this.document.uuid === item.parent?.uuid) return this._onSortItem(event, itemData);
         const createdItem = await this._onDropItemCreate(itemData);
 

module/config/generalConfig.mjs

@@ -166,11 +166,16 @@ export const healingTypes = {
 
 export const defeatedConditions = () => {
     const defeated = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).defeated;
-    return Object.values(defeatedConditionChoices).map(x => ({
-        ...x,
-        img: defeated[`${x.id}Icon`],
-        description: `DAGGERHEART.CONFIG.Condition.${x.id}.description`
-    }));
+    return Object.keys(defeatedConditionChoices).reduce((acc, key) => {
+        const choice = defeatedConditionChoices[key];
+        acc[key] = {
+            ...choice,
+            img: defeated[`${choice.id}Icon`],
+            description: `DAGGERHEART.CONFIG.Condition.${choice.id}.description`
+        };
+
+        return acc;
+    }, {});
 };
 
 const defeatedConditionChoices = {

module/data/fields/action/beastformField.mjs

@@ -79,7 +79,7 @@ export default class BeastformField extends fields.SchemaField {
      * @returns
      */
     static async transform(selectedForm, evolvedData, hybridData) {
-        const formData = evolvedData?.form ? evolvedData.form.toObject() : selectedForm.toObject();
+        const formData = evolvedData?.form ? evolvedData.form.toObject() : selectedForm;
         const beastformEffect = formData.effects.find(x => x.type === 'beastform');
         if (!beastformEffect) {
             ui.notifications.error('DAGGERHEART.UI.Notifications.beastformMissingEffect');

module/data/fields/action/damageField.mjs

@@ -85,7 +85,7 @@ export default class DamageField extends fields.SchemaField {
         const targetDamage = [];
         const damagePromises = [];
         for (let target of targets) {
-            const actor = fromUuidSync(target.actorId);
+            const actor = foundry.utils.fromUuidSync(target.actorId);
             if (!actor) continue;
             if (!config.hasHealing && config.onSave && target.saved?.success === true) {
                 const mod = CONFIG.DH.ACTIONS.damageOnSave[config.onSave]?.mod ?? 1;
@@ -98,17 +98,16 @@ export default class DamageField extends fields.SchemaField {
                 });
             }
 
+            const token = game.scenes.find(x => x.active).tokens.find(x => x.id === target.id);
             if (config.hasHealing)
                 damagePromises.push(
-                    actor
-                        .takeHealing(config.damage)
-                        .then(updates => targetDamage.push({ token: actor.token ?? actor.prototypeToken, updates }))
+                    actor.takeHealing(config.damage).then(updates => targetDamage.push({ token, updates }))
                 );
             else
                 damagePromises.push(
                     actor
                         .takeDamage(config.damage, config.isDirect)
-                        .then(updates => targetDamage.push({ token: actor.token ?? actor.prototypeToken, updates }))
+                        .then(updates => targetDamage.push({ token, updates }))
                 );
         }
 

module/data/item/beastform.mjs

@@ -33,11 +33,13 @@ export default class DHBeastform extends BaseDataItem {
             tokenImg: new fields.FilePathField({
                 initial: 'icons/svg/mystery-man.svg',
                 categories: ['IMAGE'],
+                wildcard: true,
                 base64: false
             }),
             tokenRingImg: new fields.FilePathField({
                 initial: 'icons/svg/mystery-man.svg',
                 categories: ['IMAGE'],
+                wildcard: true,
                 base64: false
             }),
             tokenSize: new fields.SchemaField({
@@ -108,6 +110,30 @@ export default class DHBeastform extends BaseDataItem {
         };
     }
 
+    static async getWildcardImage(actor, beastform) {
+        const usesDynamicToken = actor.prototypeToken.ring.enabled && beastform.system.tokenRingImg;
+        const tokenPath = usesDynamicToken ? beastform.system.tokenRingImg : beastform.system.tokenImg;
+        const usesWildcard = tokenPath.includes('*');
+        if (usesWildcard) {
+            const filePicker = new foundry.applications.apps.FilePicker.implementation(tokenPath);
+            const { files } = await foundry.applications.apps.FilePicker.implementation.browse(
+                filePicker.activeSource,
+                tokenPath,
+                {
+                    wildcard: true,
+                    type: 'image'
+                }
+            );
+            const selectedImage = await game.system.api.applications.dialogs.ImageSelectDialog.configure(
+                game.i18n.localize('DAGGERHEART.APPLICATIONS.ImageSelect.title'),
+                files
+            );
+            return { usesDynamicToken, selectedImage };
+        }
+
+        return null;
+    }
+
     async _preCreate() {
         if (!this.actor) return;