Character & Companion Experience Hope Cost

module/applications/dialogs/d20RollDialog.mjs

@@ -45,6 +45,10 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         return this.config.title;
     }
 
+    get actor() {
+        return this.config?.data?.parent;
+    }
+
     /** @override */
     static PARTS = {
         header: {
@@ -72,7 +76,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         this.config.costs ??= [];
         if (this.config.costs?.length) {
             const updatedCosts = game.system.api.fields.ActionFields.CostField.calcCosts.call(
-                this.action,
+                this.action ?? { actor: this.actor },
                 this.config.costs
             );
             context.costs = updatedCosts.map(x => ({
@@ -81,7 +85,10 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
                     ? this.action.parent.parent.name
                     : game.i18n.localize(CONFIG.DH.GENERAL.abilityCosts[x.key].label)
             }));
-            context.canRoll = game.system.api.fields.ActionFields.CostField.hasCost.call(this.action, updatedCosts);
+            context.canRoll = game.system.api.fields.ActionFields.CostField.hasCost.call(
+                this.action ?? { actor: this.actor },
+                updatedCosts
+            );
             this.config.data.scale = this.config.costs[0].total;
         }
         if (this.config.uses?.max) {
@@ -144,10 +151,12 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             this.config.experiences.indexOf(button.dataset.key) > -1
                 ? this.config.experiences.filter(x => x !== button.dataset.key)
                 : [...this.config.experiences, button.dataset.key];
-        this.config.costs =
-            this.config.costs.indexOf(this.config.costs.find(c => c.extKey === button.dataset.key)) > -1
-                ? this.config.costs.filter(x => x.extKey !== button.dataset.key)
-                : [...this.config.costs, { extKey: button.dataset.key, key: 'hope', value: 1}];
+        if(this.config?.data?.parent?.type === 'character' || this.config?.data?.parent?.type === 'companion') {
+            this.config.costs =
+                this.config.costs.indexOf(this.config.costs.find(c => c.extKey === button.dataset.key)) > -1
+                    ? this.config.costs.filter(x => x.extKey !== button.dataset.key)
+                    : [...this.config.costs, { extKey: button.dataset.key, key: 'hope', value: 1, name: this.config.data?.experiences?.[button.dataset.key]?.name }];
+        }
         this.render();
     }
 

module/applications/sheets/actors/character.mjs

@@ -631,13 +631,34 @@ export default class CharacterSheet extends DHBaseActorSheet {
             },
             hasRoll: true
         };
-        this.document.diceRoll({
+        const result = await this.document.diceRoll({
             ...config,
             headerTitle: `${game.i18n.localize('DAGGERHEART.GENERAL.dualityRoll')}: ${this.actor.name}`,
             title: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
                 ability: abilityLabel
             })
         });
+
+        setTimeout(() => {
+            this.consumeResource(result?.costs);
+        }, 50);
+    }
+
+    async consumeResource(costs) {
+        if(!costs?.length) return;
+        const usefulResources = foundry.utils.deepClone(this.actor.system.resources);
+        const resources = game.system.api.fields.ActionFields.CostField.getRealCosts(costs)
+            .map(c => {
+                const resource = usefulResources[c.key];
+                return {
+                    key: c.key,
+                    value: (c.total ?? c.value) * (resource.isReversed ? 1 : -1),
+                    target: resource.target,
+                    keyIsID: resource.keyIsID
+                };
+            });
+
+        await this.actor.modifyResource(resources);
     }
 
     //TODO: redo toggleEquipItem method

module/data/action/baseAction.mjs

@@ -223,12 +223,11 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             }
         }
 
-        const resources = config.costs
+        const resources = game.system.api.fields.ActionFields.CostField.getRealCosts(config.costs)
             .filter(
                 c =>
-                    c.enabled !== false &&
-                    ((!successCost && (!c.consumeOnSuccess || config.roll?.success)) ||
-                        (successCost && c.consumeOnSuccess))
+                    (!successCost && (!c.consumeOnSuccess || config.roll?.success)) ||
+                        (successCost && c.consumeOnSuccess)
             )
             .map(c => {
                 const resource = usefulResources[c.key];
@@ -240,7 +239,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
                 };
             });
 
-        await this.actor.modifyResource(resources);
+        await (this.actor.system.partner ?? this.actor).modifyResource(resources);
         if (
             config.uses?.enabled &&
             ((!successCost && (!config.uses?.consumeOnSuccess || config.roll?.success)) ||

module/data/fields/action/costField.mjs

@@ -47,7 +47,7 @@ export default class CostField extends fields.ArrayField {
     static hasCost(costs) {
         const realCosts = CostField.getRealCosts.call(this, costs),
             hasFearCost = realCosts.findIndex(c => c.key === 'fear');
-        CostField.mergeCost.call(this, realCosts)
+        
         if (hasFearCost > -1) {
             const fearCost = realCosts.splice(hasFearCost, 1)[0];
             if (
@@ -71,7 +71,8 @@ export default class CostField extends fields.ArrayField {
     }
 
     static getResources(costs) {
-        const actorResources = this.actor.system.resources;
+        const actorResources = foundry.utils.deepClone(this.actor.system.resources);
+        if(this.actor.system.partner) actorResources.hope = foundry.utils.deepClone(this.actor.system.partner.system.resources.hope);
         const itemResources = {};
         for (let itemResource of costs) {
             if (itemResource.keyIsID) {
@@ -90,7 +91,13 @@ export default class CostField extends fields.ArrayField {
 
     static getRealCosts(costs) {
         const realCosts = costs?.length ? costs.filter(c => c.enabled) : [];
-        return realCosts;
+        let mergedCosts = [];
+        realCosts.forEach(c =>  {
+            const getCost = Object.values(mergedCosts).find(gc => gc.key === c.key);
+            if(getCost) getCost.total += c.total;
+            else mergedCosts.push(c);
+        });
+        return mergedCosts;
     }
 
     static formatMax(max) {
@@ -101,8 +108,4 @@ export default class CostField extends fields.ArrayField {
         }
         return Number(max);
     }
-
-    static mergeCost(costs) {
-        console.log(costs)
-    }
 }

module/dice/dhRoll.mjs

@@ -207,7 +207,9 @@ export const registerRollDiceHooks = () => {
         if (updates.length) {
             const target = actor.system.partner ?? actor;
             if (!['dead', 'unconcious'].some(x => actor.statuses.has(x))) {
-                target.modifyResource(updates);
+                setTimeout(() => {
+                    target.modifyResource(updates);
+                }, 50);
             }
         }