diff --git a/daggerheart.mjs b/daggerheart.mjs index 0bbbd274..2cb02170 100644 --- a/daggerheart.mjs +++ b/daggerheart.mjs @@ -35,6 +35,8 @@ CONFIG.Dice.daggerheart = { FateRoll: FateRoll }; +CONFIG.Dice.termTypes.DualityDie = dice.diceTypes.DualityDie; + CONFIG.Actor.documentClass = documents.DhpActor; CONFIG.Actor.dataModels = models.actors.config; CONFIG.Actor.collection = collections.DhActorCollection; diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs index 5fdefcbd..33ddfbc0 100644 --- a/module/applications/dialogs/tagTeamDialog.mjs +++ b/module/applications/dialogs/tagTeamDialog.mjs @@ -200,6 +200,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio partContext.members[partId] = { ...data, + roll: data.roll, isEditable: actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER), key: partId, readyToRoll: Boolean(data.rollChoice), @@ -448,24 +449,15 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio const { member, diceType } = button.dataset; const memberData = this.party.system.tagTeam.members[member]; - const dieIndex = diceType === 'hope' ? 0 : diceType === 'fear' ? 2 : 4; - - const { parsedRoll, newRoll } = await game.system.api.dice.DualityRoll.reroll( - memberData.rollData, - dieIndex, - diceType, - false - ); - const rollData = parsedRoll.toJSON(); + const dieIndex = diceType === 'hope' ? 0 : diceType === 'fear' ? 1 : 2; + const newRoll = game.system.api.dice.DualityRoll.fromData(memberData.rollData); + const dice = newRoll.dice[dieIndex]; + await dice.reroll(`/r1=${dice.total}`, { liveRoll: true }); + await newRoll._evaluate(); + const rollData = newRoll.toJSON(); this.updatePartyData( { - [`system.tagTeam.members.${member}.rollData`]: { - ...rollData, - options: { - ...rollData.options, - roll: newRoll - } - } + [`system.tagTeam.members.${member}.rollData`]: rollData }, this.getUpdatingParts(button) ); @@ -700,7 +692,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio const error = this.checkInitiatorHopeError(this.party.system.tagTeam.initiator); if (error) return error; - const mainRoll = (await this.getJoinedRoll()).rollData; + const joinedRoll = await this.getJoinedRoll(); + const mainRoll = joinedRoll.rollData; const mainActor = this.party.system.partyMembers.find(x => x.uuid === mainRoll.options.source.actor); mainRoll.options.title = game.i18n.localize('DAGGERHEART.APPLICATIONS.TagTeamSelect.chatMessageRollTitle'); @@ -711,7 +704,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio title: game.i18n.localize('DAGGERHEART.APPLICATIONS.TagTeamSelect.title'), speaker: cls.getSpeaker({ actor: mainActor }), system: mainRoll.options, - rolls: [mainRoll], + rolls: [JSON.stringify(joinedRoll.roll)], sound: null, flags: { core: { RollTable: true } } }; @@ -719,34 +712,34 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio await cls.create(msgData); /* Handle resource updates from the finished TagTeamRoll */ - const tagTeamData = this.party.system.tagTeam; - const fearUpdate = { key: 'fear', value: null, total: null, enabled: true }; - for (let memberId in tagTeamData.members) { - const resourceUpdates = []; - const rollGivesHope = mainRoll.options.roll.isCritical || mainRoll.options.roll.result.duality === 1; - if (memberId === tagTeamData.initiator.memberId) { - const value = tagTeamData.initiator.cost - ? rollGivesHope - ? 1 - tagTeamData.initiator.cost - : -tagTeamData.initiator.cost - : 1; - resourceUpdates.push({ key: 'hope', value: value, total: -value, enabled: true }); - } else if (rollGivesHope) { - resourceUpdates.push({ key: 'hope', value: 1, total: -1, enabled: true }); - } - if (mainRoll.options.roll.isCritical) - resourceUpdates.push({ key: 'stress', value: -1, total: 1, enabled: true }); - if (mainRoll.options.roll.result.duality === -1) { - fearUpdate.value = fearUpdate.value === null ? 1 : fearUpdate.value + 1; - fearUpdate.total = fearUpdate.total === null ? -1 : fearUpdate.total - 1; - } + // const tagTeamData = this.party.system.tagTeam; + // const fearUpdate = { key: 'fear', value: null, total: null, enabled: true }; + // for (let memberId in tagTeamData.members) { + // const resourceUpdates = []; + // const rollGivesHope = mainRoll.options.roll.isCritical || mainRoll.options.roll.result.duality === 1; + // if (memberId === tagTeamData.initiator.memberId) { + // const value = tagTeamData.initiator.cost + // ? rollGivesHope + // ? 1 - tagTeamData.initiator.cost + // : -tagTeamData.initiator.cost + // : 1; + // resourceUpdates.push({ key: 'hope', value: value, total: -value, enabled: true }); + // } else if (rollGivesHope) { + // resourceUpdates.push({ key: 'hope', value: 1, total: -1, enabled: true }); + // } + // if (mainRoll.options.roll.isCritical) + // resourceUpdates.push({ key: 'stress', value: -1, total: 1, enabled: true }); + // if (mainRoll.options.roll.result.duality === -1) { + // fearUpdate.value = fearUpdate.value === null ? 1 : fearUpdate.value + 1; + // fearUpdate.total = fearUpdate.total === null ? -1 : fearUpdate.total - 1; + // } - game.actors.get(memberId).modifyResource(resourceUpdates); - } + // game.actors.get(memberId).modifyResource(resourceUpdates); + // } - if (fearUpdate.value) { - mainActor.modifyResource([fearUpdate]); - } + // if (fearUpdate.value) { + // mainActor.modifyResource([fearUpdate]); + // } /* Fin */ this.cancelRoll({ confirm: false }); diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs index e29498e6..79f12e7f 100644 --- a/module/applications/ui/chatLog.mjs +++ b/module/applications/ui/chatLog.mjs @@ -175,7 +175,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo action.use(event); } - async rerollEvent(event, message) { + async rerollEvent(event, messageData) { event.stopPropagation(); if (!event.shiftKey) { const confirmed = await foundry.applications.api.DialogV2.confirm({ @@ -187,6 +187,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo if (!confirmed) return; } + const message = game.messages.get(messageData._id); const target = event.target.closest('[data-die-index]'); if (target.dataset.type === 'damage') { @@ -209,27 +210,17 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo } }); } else { - let originalRoll_parsed = message.rolls.map(roll => JSON.parse(roll))[0]; - const rollClass = - game.system.api.dice[ - message.type === 'dualityRoll' - ? 'DualityRoll' - : target.dataset.type === 'damage' - ? 'DHRoll' - : 'D20Roll' - ]; - - if (!game.modules.get('dice-so-nice')?.active) foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice }); - - const { newRoll, parsedRoll } = await rollClass.reroll( - originalRoll_parsed, - target.dataset.dieIndex, - target.dataset.type - ); - - await game.messages.get(message._id).update({ - 'system.roll': newRoll, - 'rolls': [parsedRoll] + const rerollDice = message.system.roll.dice[target.dataset.dieIndex]; + await rerollDice.reroll(`/r1=${rerollDice.total}`, { + liveRoll: { + roll: message.system.roll, + actor: message.system.actionActor, + isReaction: message.system.roll.options.actionType === 'reaction' + } + }); + // await message.system.roll._evaluate(); + await message.update({ + rolls: [message.system.roll.toJSON()] }); } } diff --git a/module/data/chat-message/actorRoll.mjs b/module/data/chat-message/actorRoll.mjs index 1ea7ff93..e601f86d 100644 --- a/module/data/chat-message/actorRoll.mjs +++ b/module/data/chat-message/actorRoll.mjs @@ -32,7 +32,6 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel { return { title: new fields.StringField(), actionDescription: new fields.HTMLField(), - roll: new fields.ObjectField(), targets: targetsField(), hasRoll: new fields.BooleanField({ initial: false }), hasDamage: new fields.BooleanField({ initial: false }), @@ -55,6 +54,16 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel { }; } + get roll() { + if (this.parent.type === 'dualityRoll') + return this.parent.rolls.find(x => x instanceof game.system.api.dice.DualityRoll); + + if (this.parent.type === 'fateRoll') + return this.parent.rolls.find(x => x instanceof game.system.api.dice.FateRoll); + + return null; + } + get actionActor() { if (!this.source.actor) return null; return fromUuidSync(this.source.actor); diff --git a/module/dice/_module.mjs b/module/dice/_module.mjs index b9339d87..523f15c1 100644 --- a/module/dice/_module.mjs +++ b/module/dice/_module.mjs @@ -4,3 +4,4 @@ export { default as DamageRoll } from './damageRoll.mjs'; export { default as DHRoll } from './dhRoll.mjs'; export { default as DualityRoll } from './dualityRoll.mjs'; export { default as FateRoll } from './fateRoll.mjs'; +export { Dice, diceTypes } from './die/_module.mjs'; diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs index f117ff65..f3ee3685 100644 --- a/module/dice/d20Roll.mjs +++ b/module/dice/d20Roll.mjs @@ -224,42 +224,4 @@ export default class D20Roll extends DHRoll { resetFormula() { return (this._formula = this.constructor.getFormula(this.terms)); } - - static async reroll(rollString, _target, message) { - let parsedRoll = game.system.api.dice.D20Roll.fromData(rollString); - parsedRoll = await parsedRoll.reroll(); - const newRoll = game.system.api.dice.D20Roll.postEvaluate(parsedRoll, { - targets: message.system.targets, - roll: { - advantage: message.system.roll.advantage?.type, - difficulty: message.system.roll.difficulty ? Number(message.system.roll.difficulty) : null - } - }); - - if (game.modules.get('dice-so-nice')?.active) { - await game.dice3d.showForRoll(parsedRoll, game.user, true); - } - - const rerolled = { - any: true, - rerolls: [ - ...(message.system.roll.dice[0].rerolled?.rerolls?.length > 0 - ? [message.system.roll.dice[0].rerolled?.rerolls] - : []), - rollString.terms[0].results - ] - }; - return { - newRoll: { - ...newRoll, - dice: [ - { - ...newRoll.dice[0], - rerolled: rerolled - } - ] - }, - parsedRoll - }; - } } diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs index 3310b9ca..dd09afcd 100644 --- a/module/dice/dhRoll.mjs +++ b/module/dice/dhRoll.mjs @@ -138,6 +138,7 @@ export default class DHRoll extends Roll { const chatData = await this._prepareChatRenderContext({ flavor, isPrivate, ...options }); return foundry.applications.handlebars.renderTemplate(template, { ...chatData, + roll: this, parent: chatData.parent, targetMode: chatData.targetMode, metagamingSettings diff --git a/module/dice/die/_module.mjs b/module/dice/die/_module.mjs new file mode 100644 index 00000000..e2a96208 --- /dev/null +++ b/module/dice/die/_module.mjs @@ -0,0 +1,7 @@ +import DualityDie from './dualityDie.mjs'; + +export const Dice = [DualityDie]; + +export const diceTypes = { + DualityDie +}; diff --git a/module/dice/die/dualityDie.mjs b/module/dice/die/dualityDie.mjs new file mode 100644 index 00000000..90288704 --- /dev/null +++ b/module/dice/die/dualityDie.mjs @@ -0,0 +1,51 @@ +import { ResourceUpdateMap } from '../../data/action/baseAction.mjs'; + +export default class DualityDie extends foundry.dice.terms.Die { + constructor(options) { + super(options); + + this.modifiers = []; + } + + #getDualityState(roll) { + if (!roll) return null; + return roll.withHope ? 1 : roll.withFear ? -1 : 0; + } + + #updateResources(oldDuality, newDuality, actor) { + const { hopeFear } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation); + if (game.user.isGM ? !hopeFear.gm : !hopeFear.players) return; + + const updates = []; + const hope = (newDuality >= 0 ? 1 : 0) - (oldDuality >= 0 ? 1 : 0); + const stress = (newDuality === 0 ? 1 : 0) - (oldDuality === 0 ? 1 : 0); + const fear = (newDuality === -1 ? 1 : 0) - (oldDuality === -1 ? 1 : 0); + + if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true }); + if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true }); + if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true }); + + const resourceUpdates = new ResourceUpdateMap(actor); + resourceUpdates.addResources(updates); + resourceUpdates.updateResources(); + } + + async reroll(modifier, options) { + const oldDuality = this.#getDualityState(options.liveRoll.roll); + await super.reroll(modifier, options); + + if (options?.liveRoll) { + if (game.modules.get('dice-so-nice')?.active) { + /* Dice Customization for the roll */ + } else { + foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice }); + } + + await options.liveRoll.roll._evaluate(); + if (options.liveRoll.isReaction) return; + + const newDuality = this.#getDualityState(options.liveRoll.roll); + this.#updateResources(oldDuality, newDuality, options.liveRoll.actor); + } + } +} diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs index 84e0b493..56cecfd7 100644 --- a/module/dice/dualityRoll.mjs +++ b/module/dice/dualityRoll.mjs @@ -1,8 +1,6 @@ import D20RollDialog from '../applications/dialogs/d20RollDialog.mjs'; import D20Roll from './d20Roll.mjs'; import { parseRallyDice, setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs'; -import { getDiceSoNicePresets } from '../config/generalConfig.mjs'; -import { ResourceUpdateMap } from '../data/action/baseAction.mjs'; export default class DualityRoll extends D20Roll { _advantageFaces = 6; @@ -19,6 +17,22 @@ export default class DualityRoll extends D20Roll { static DefaultDialog = D20RollDialog; + /**@inheritdoc */ + static instantiateAST(ast) { + /* First two dice are always the DualityDice */ + const nodes = CONFIG.Dice.parser.flattenTree(ast); + const dieNodes = nodes.filter(x => x.class === 'DiceTerm'); + if (dieNodes.length > 1) { + dieNodes[0].class = 'DualityDie'; + dieNodes[1].class = 'DualityDie'; + } + + return nodes.map(node => { + const cls = foundry.dice.terms[node.class] ?? foundry.dice.terms.RollTerm; + return cls.fromParseNode(node); + }); + } + get title() { return game.i18n.localize( `DAGGERHEART.GENERAL.${this.options?.actionType === 'reaction' ? 'reactionRoll' : 'dualityRoll'}` @@ -65,6 +79,21 @@ export default class DualityRoll extends D20Roll { this._advantageNumber = Number(value); } + /* This isn't fullproof, but trying to cover parathetical situations is ridiculously complex */ + get modifierTotal() { + let modifierTotal = 0; + for (let i = 0; i < this.terms.length; i++) { + if ( + this.terms[i] instanceof foundry.dice.terms.NumericTerm && + !!this.terms[i - 1] && + this.terms[i - 1] instanceof foundry.dice.terms.OperatorTerm + ) + modifierTotal += Number(`${this.terms[i - 1].operator}${this.terms[i].total}`); + } + + return modifierTotal; + } + setRallyChoices() { return this.data?.parent?.appliedEffects.reduce((a, c) => { const change = c.system.changes.find(ch => ch.key === 'system.bonuses.rally'); @@ -116,24 +145,20 @@ export default class DualityRoll extends D20Roll { return [...(hooks ?? []), 'Duality']; } - /** @inheritDoc */ - static fromData(data) { - data.terms[0].class = foundry.dice.terms.Die.name; - data.terms[2].class = foundry.dice.terms.Die.name; - return super.fromData(data); - } - createBaseDice() { - if (this.dice[0] instanceof foundry.dice.terms.Die && this.dice[1] instanceof foundry.dice.terms.Die) { + if ( + this.dice[0] instanceof game.system.api.dice.diceTypes.DualityDie && + this.dice[1] instanceof game.system.api.dice.diceTypes.DualityDie + ) { this.terms = [this.terms[0], this.terms[1], this.terms[2]]; return; } - this.terms[0] = new foundry.dice.terms.Die({ + this.terms[0] = new game.system.api.dice.diceTypes.DualityDie({ faces: this.data.rules.dualityRoll?.defaultHopeDice ?? 12 }); this.terms[1] = new foundry.dice.terms.OperatorTerm({ operator: '+' }); - this.terms[2] = new foundry.dice.terms.Die({ + this.terms[2] = new game.system.api.dice.diceTypes.DualityDie({ faces: this.data.rules.dualityRoll?.defaultFearDice ?? 12 }); } @@ -371,63 +396,4 @@ export default class DualityRoll extends D20Roll { if (currentCombatant?.actorId == config.data.id) ui.combat.setCombatantSpotlight(currentCombatant.id); } } - - static async reroll(rollBase, dieIndex, diceType, updateResources = true) { - let parsedRoll = game.system.api.dice.DualityRoll.fromData({ ...rollBase, evaluated: false }); - const term = parsedRoll.terms[dieIndex]; - await term.reroll(`/r1=${term.total}`); - const result = await parsedRoll.evaluate(); - - if (game.modules.get('dice-so-nice')?.active) { - const diceSoNiceRoll = { - _evaluated: true, - dice: [ - new foundry.dice.terms.Die({ - ...term, - faces: term._faces, - results: term.results.filter(x => !x.rerolled) - }) - ], - options: { appearance: {} } - }; - - const diceSoNicePresets = await getDiceSoNicePresets(`d${term._faces}`, `d${term._faces}`); - if (diceSoNicePresets[diceType]) { - diceSoNiceRoll.dice[0].options = diceSoNicePresets[diceType]; - } - - await game.dice3d.showForRoll(diceSoNiceRoll, game.user, true); - } else { - foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice }); - } - - const newRoll = game.system.api.dice.DualityRoll.postEvaluate(parsedRoll, { - targets: parsedRoll.options.targets ?? [], - roll: { - advantage: parsedRoll.options.roll.advantage?.type, - difficulty: parsedRoll.options.roll.difficulty ? Number(parsedRoll.options.roll.difficulty) : null - } - }); - - const extraIndex = newRoll.advantage ? 3 : 2; - newRoll.extra = newRoll.extra.slice(extraIndex); - - const actor = parsedRoll.options.source.actor - ? await foundry.utils.fromUuid(parsedRoll.options.source.actor) - : null; - const config = { - source: { actor: parsedRoll.options.source.actor ?? '' }, - targets: parsedRoll.targets, - roll: newRoll, - rerolledRoll: parsedRoll.options.roll, - resourceUpdates: new ResourceUpdateMap(actor) - }; - - if (updateResources) { - await DualityRoll.addDualityResourceUpdates(config); - await config.resourceUpdates.updateResources(); - } - - return { newRoll, parsedRoll }; - } } diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs index 8b094678..920b2875 100644 --- a/module/documents/chatMessage.mjs +++ b/module/documents/chatMessage.mjs @@ -1,4 +1,4 @@ -import { emitAsGM, GMUpdateEvent, RefreshType, socketEvent } from '../systemRegistration/socket.mjs'; +import { emitAsGM, GMUpdateEvent } from '../systemRegistration/socket.mjs'; export default class DhpChatMessage extends foundry.documents.ChatMessage { targetHook = null; @@ -78,17 +78,9 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { if (this.isContentVisible) { if (this.type === 'dualityRoll') { html.classList.add('duality'); - switch (this.system.roll?.result?.duality) { - case 1: - html.classList.add('hope'); - break; - case -1: - html.classList.add('fear'); - break; - default: - html.classList.add('critical'); - break; - } + if (this.system.roll.withHope) html.classList.add('hope'); + else if (this.system.roll.withFear) html.classList.add('fear'); + else html.classList.add('critical'); } if (this.type === 'fateRoll') { html.classList.add('fate'); diff --git a/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs b/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs index 058777a5..49fc8f4f 100644 --- a/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs +++ b/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs @@ -7,7 +7,7 @@ {{#each damage.parts as |part|}}
{{#each part.dice as |dice index|}} - + {{dice.total}} diff --git a/templates/dialogs/tagTeamDialog/tagTeamMember.hbs b/templates/dialogs/tagTeamDialog/tagTeamMember.hbs index 5c100d02..7510422f 100644 --- a/templates/dialogs/tagTeamDialog/tagTeamMember.hbs +++ b/templates/dialogs/tagTeamDialog/tagTeamMember.hbs @@ -62,32 +62,30 @@
- {{#if rollData}} - {{#with rollData.options.roll}} -
-
{{this.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=this.result.label}}
-
- - {{this.hope.value}} - - - + - - {{this.fear.value}} - - - {{#if this.advantage.type}} - {{#if (eq this.advantage.type 1)}}+{{else}}-{{/if}} - - {{this.advantage.value}} - - - {{/if}} - {{#if (gte this.modifierTotal 0)}}+{{else}}-{{/if}} - {{positive this.modifierTotal}} -
+ {{#if roll}} +
+
{{roll.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=roll.totalLabel}}
+
+ + {{roll.dHope.total}} + + + + + + {{roll.dFear.total}} + + + {{#if roll.advantage.type}} + {{#if (eq roll.advantage.type 1)}}+{{else}}-{{/if}} + + {{roll.advantage.value}} + + + {{/if}} + {{#if (gte roll.modifierTotal 0)}}+{{else}}-{{/if}} + {{positive roll.modifierTotal}}
- {{/with}} +
{{else}} {{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}} {{/if}} diff --git a/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs b/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs index 478255ce..79b5138e 100644 --- a/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs +++ b/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs @@ -6,16 +6,16 @@ {{#if hintText}}
{{localize hintText}}
{{else}} - {{#if joinedRoll.rollData}} + {{#if joinedRoll.roll}}
{{localize "DAGGERHEART.GENERAL.dualityRoll"}}
-
{{joinedRoll.rollData.options.roll.total}}
-
{{localize "DAGGERHEART.GENERAL.withThing" thing=joinedRoll.rollData.options.roll.result.label}}
+
{{joinedRoll.roll.total}}
+
{{localize "DAGGERHEART.GENERAL.withThing" thing=joinedRoll.roll.totalLabel}}
{{/if}} - {{#if hasDamage}} + {{#if joinedRoll.rollData.options.hasDamage}}
{{localize "DAGGERHEART.GENERAL.damage"}} {{#each joinedRoll.rollData.options.damage as |damage key|}} diff --git a/templates/ui/chat/parts/roll-part.hbs b/templates/ui/chat/parts/roll-part.hbs index ea962f9e..9a94a786 100644 --- a/templates/ui/chat/parts/roll-part.hbs +++ b/templates/ui/chat/parts/roll-part.hbs @@ -7,7 +7,7 @@ {{localize "DAGGERHEART.GENERAL.criticalShort"}} {{else}} {{#if (and roll.result (not (eq roll.type "reaction")))}} - {{localize "DAGGERHEART.GENERAL.withThing" thing=roll.result.label}} + {{localize "DAGGERHEART.GENERAL.withThing" thing=roll.totalLabel}} {{/if}} {{/if}} @@ -47,19 +47,19 @@
{{/if}} {{else}} - {{#if roll.hope}} + {{#if roll.dHope}}
-
- {{#if roll.hope.rerolled.any}}{{/if}} - {{roll.hope.value}} +
+ {{#if roll.dHopehope.rerolled.any}}{{/if}} + {{roll.dHope.total}}
-
- {{#if roll.fear.rerolled.any}}{{/if}} - {{roll.fear.value}} +
+ {{#if roll.dFear.rerolled.any}}{{/if}} + {{roll.dFear.total}}
{{#if roll.advantage.type}}