cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 23:49:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Hope gain on Duality Roll

Browse source
This commit is contained in:
Dapoolp 2025-08-13 13:34:59 +02:00
parent 5d6eb4b145
commit d2b0ed4947
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
module/applications/sheets/actors/character.mjs
View file

@ -638,15 +638,21 @@ export default class CharacterSheet extends DHBaseActorSheet {
ability: abilityLabel ability: abilityLabel
}) })
}); });
// setTimeout(() => { this.consumeResource(result?.costs);
// this.consumeResource(result?.costs);
// }, 50);
} }
// Remove when Action Refactor part #2 done
async consumeResource(costs) { async consumeResource(costs) {
if (!costs?.length) return; if (!costs?.length) return;
const usefulResources = foundry.utils.deepClone(this.actor.system.resources); const usefulResources = {
...foundry.utils.deepClone(this.actor.system.resources),
fear: {
value: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear),
max: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxFear,
reversed: false
}
};
const resources = game.system.api.fields.ActionFields.CostField.getRealCosts(costs).map(c => { const resources = game.system.api.fields.ActionFields.CostField.getRealCosts(costs).map(c => {
const resource = usefulResources[c.key]; const resource = usefulResources[c.key];
return { return {

2
module/data/action/baseAction.mjs
View file

@ -208,7 +208,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
} }
async consume(config, successCost = false) { async consume(config, successCost = false) {
console.log("Action consume", config)
const usefulResources = { const usefulResources = {
...foundry.utils.deepClone(this.actor.system.resources), ...foundry.utils.deepClone(this.actor.system.resources),
fear: { fear: {
@ -247,7 +246,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
} }
}, []); }, []);
console.log(resources)
await (this.actor.system.partner ?? this.actor).modifyResource(resources); await (this.actor.system.partner ?? this.actor).modifyResource(resources);
if ( if (
config.uses?.enabled && config.uses?.enabled &&

8
module/dice/dhRoll.mjs
View file

@ -239,12 +239,10 @@ export const registerRollDiceHooks = () => {
if (updates.length) { if (updates.length) {
const target = actor.system.partner ?? actor; const target = actor.system.partner ?? actor;
if (!['dead', 'unconscious'].some(x => actor.statuses.has(x))) { if (!['dead', 'unconscious'].some(x => actor.statuses.has(x))) {
console.log(config.costs, updates) if(config.rerolledRoll)
updates = [...(config.costs ?? []), ...updates];
if(config.source.action)
config.costs = updates;
else
target.modifyResource(updates); target.modifyResource(updates);
else
config.costs = [...(config.costs ?? []), ...updates];
} }
} }

2
templates/ui/chat/foundryRollTooltip.hbs
View file

@ -5,7 +5,7 @@
<legend> <legend>
{{localize "DAGGERHEART.UI.Chat.dicePool.title"}} {{localize "DAGGERHEART.UI.Chat.dicePool.title"}}
</legend> </legend>
<div class="roll-dice">{{log @root}} <div class="roll-dice">
{{#each parts}} {{#each parts}}
{{#each rolls}} {{#each rolls}}
<div class="roll-die"> <div class="roll-die">