Merge branch 'main' into feature/death-moves

module/applications/dialogs/d20RollDialog.mjs

@@ -195,9 +195,9 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         if (this.config.roll) {
             this.reactionOverride = !this.reactionOverride;
             this.config.actionType = this.reactionOverride
-                ? CONFIG.DH.ITEM.actionTypes.reaction.id
-                : this.config.actionType === CONFIG.DH.ITEM.actionTypes.reaction.id
-                  ? CONFIG.DH.ITEM.actionTypes.action.id
+                ? 'reaction'
+                : this.config.actionType === 'reaction'
+                  ? 'action'
                   : this.config.actionType;
             this.render();
         }

module/applications/dialogs/downtime.mjs

@@ -93,7 +93,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
     }
 
     getRefreshables() {
-        const actionItems = this.actor.items.reduce((acc, x) => {
+        const actionItems = this.actor.items.filter(x => this.actor.system.isItemAvailable(x)).reduce((acc, x) => {
             if (x.system.actions) {
                 const recoverable = x.system.actions.reduce((acc, action) => {
                     if (refreshIsAllowed([this.shortrest ? 'shortRest' : 'longRest'], action.uses.recovery)) {

module/applications/dialogs/itemTransfer.mjs

@@ -1,69 +1,61 @@
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 export default class ItemTransferDialog extends HandlebarsApplicationMixin(ApplicationV2) {
-    constructor(item) {
+    constructor(data) {
         super({});
-
-        this.item = item;
-        this.quantity = item.system.quantity;
+        this.data = data;
     }
 
     get title() {
-        return this.item.name;
+        return this.data.title;
     }
 
     static DEFAULT_OPTIONS = {
         tag: 'form',
         classes: ['daggerheart', 'dh-style', 'dialog', 'item-transfer'],
-        position: { width: 300, height: 'auto' },
+        position: { width: 400, height: 'auto' },
         window: { icon: 'fa-solid fa-hand-holding-hand' },
         actions: {
             finish: ItemTransferDialog.#finish
-        },
-        form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
+        }
     };
 
     static PARTS = {
-        main: { template: 'systems/daggerheart/templates/dialogs/item-transfer.hbs' }
+        main: { template: 'systems/daggerheart/templates/dialogs/item-transfer.hbs', root: true }
     };
 
-    _attachPartListeners(partId, htmlElement, options) {
-        super._attachPartListeners(partId, htmlElement, options);
-
-        htmlElement.querySelector('.number-display').addEventListener('change', event => {
-            this.quantity = isNaN(event.target.value) ? this.quantity : Number(event.target.value);
-            this.render();
-        });
-    }
-
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
-        context.item = this.item;
-        context.quantity = this.quantity;
-
-        return context;
-    }
-
-    static async updateData(_event, _element, formData) {
-        const { quantity } = foundry.utils.expandObject(formData.object);
-        this.quantity = quantity;
-        this.render();
+        return foundry.utils.mergeObject(context, this.data);
     }
 
     static async #finish() {
-        this.close({ submitted: true });
+        this.selected = this.form.elements.quantity.valueAsNumber || null;
+        this.close();
     }
 
-    close(options = {}) {
-        if (!options.submitted) this.quantity = null;
+    static #determineTransferOptions({ originActor, targetActor, item, currency }) {
+        originActor ??= item?.actor;
+        const homebrewKey = CONFIG.DH.SETTINGS.gameSettings.Homebrew;
+        const currencySetting = game.settings.get(CONFIG.DH.id, homebrewKey).currency?.[currency] ?? null;
 
-        super.close();
+        return {
+            originActor,
+            targetActor,
+            itemImage: item?.img,
+            currencyIcon: currencySetting?.icon,
+            max: item?.system.quantity ?? originActor.system.gold[currency] ?? 0,
+            title: item?.name ?? currencySetting?.label
+        };
     }
 
-    static async configure(item) {
+    static async configure(options) {
         return new Promise(resolve => {
-            const app = new this(item);
-            app.addEventListener('close', () => resolve(app.quantity), { once: true });
+            const data = this.#determineTransferOptions(options);
+            if (data.max <= 1) return resolve(data.max);
+
+            const app = new this(data);
+            app.addEventListener('close', () => resolve(app.selected), { once: true });
             app.render({ force: true });
         });
     }

module/applications/dialogs/tagTeamDialog.mjs

@@ -220,8 +220,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
                         !roll.system.isCritical && criticalRoll
                             ? (await getCritDamageBonus(damage.formula)) + damage.total
                             : damage.total;
+                    const updatedDamageParts = damage.parts;
                     if (systemData.damage[key]) {
-                        const updatedDamageParts = damage.parts;
                         if (!roll.system.isCritical && criticalRoll) {
                             for (let part of updatedDamageParts) {
                                 const criticalDamage = await getCritDamageBonus(part.formula);