{{formGroup settingFields.schema.fields.enabled value=settingFields._source.enabled localize=true}}
{{formGroup settingFields.schema.fields.melee value=settingFields._source.melee localize=true}}
diff --git a/templates/settings/variant-rules.hbs b/templates/settings/variant-rules.hbs
index 1ee18b99..75a5534b 100644
--- a/templates/settings/variant-rules.hbs
+++ b/templates/settings/variant-rules.hbs
@@ -1,4 +1,8 @@
+
+
{{localize "DAGGERHEART.SETTINGS.Menu.variantRules.actionTokens"}}
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs
index 9610d8e2..24f7836f 100644
--- a/templates/sheets/actors/character/inventory.hbs
+++ b/templates/sheets/actors/character/inventory.hbs
@@ -12,6 +12,30 @@
+
+
+ {{localize this.inventory.currency.coins}}
+ {{formInput systemFields.gold.fields.coins value=source.system.gold.coins enriched=source.system.gold.coins
+ localize=true toggled=true}}
+
+
+ {{localize this.inventory.currency.handfulls}}
+ {{formInput systemFields.gold.fields.handfulls value=source.system.gold.handfulls
+ enriched=source.system.gold.handfulls localize=true toggled=true}}
+
+
+ {{localize this.inventory.currency.bags}}
+ {{formInput systemFields.gold.fields.bags value=source.system.gold.bags enriched=source.system.gold.bags
+ localize=true toggled=true}}
+
+
+ {{localize this.inventory.currency.chests}}
+ {{formInput systemFields.gold.fields.chests value=source.system.gold.chests
+ enriched=source.system.gold.chests localize=true toggled=true}}
+
+
+
+
{{> 'daggerheart.inventory-items'
title='TYPES.Item.weapon'
@@ -44,28 +68,4 @@
canCreate=true
}}
-
-
-
- {{localize this.inventory.currency.coins}}
- {{formInput systemFields.gold.fields.coins value=source.system.gold.coins enriched=source.system.gold.coins
- localize=true toggled=true}}
-
-
- {{localize this.inventory.currency.handfulls}}
- {{formInput systemFields.gold.fields.handfulls value=source.system.gold.handfulls
- enriched=source.system.gold.handfulls localize=true toggled=true}}
-
-
- {{localize this.inventory.currency.bags}}
- {{formInput systemFields.gold.fields.bags value=source.system.gold.bags enriched=source.system.gold.bags
- localize=true toggled=true}}
-
-
- {{localize this.inventory.currency.chests}}
- {{formInput systemFields.gold.fields.chests value=source.system.gold.chests
- enriched=source.system.gold.chests localize=true toggled=true}}
-
-
-
\ No newline at end of file
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index b9ac28a6..6ed47fc7 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -142,7 +142,7 @@
{{#each document.system.experiences as |experience id|}}
- +{{experience.total}}
+ +{{experience.value}}
From 6301e575e3dcb6df04415dff35c024f9d96f73c4 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Wed, 23 Jul 2025 01:01:21 +0200
Subject: [PATCH 3/3] [Feature] Allow Dice Reroll in ChatMessage (#395)
* Troubleshooting
Created test button in 'duality-roll.hbs' and functionality in chatLog.mjs
* Updated functionality
dialog recheck.
* Update duality-roll.hbs
testing toggle on specific areas so only tooltip is triggered.
Rest of CSS functionality not affected.
* Redoing Dice Reroll functionality
Attempting something new
* The rise of NaNs
Resolved Dice Parsing Errors, now dealing with parsing errors from system values.
* Forcing string evaluation for testing
* Fixed rerolling of duality dice
* Fixed message.rolls not being updated
* Added support for d20 rolls
* PR fixes
---------
Co-authored-by: Nikhil Nagarajan
---
daggerheart.mjs | 15 +-
lang/en.json | 6 +
module/applications/ui/chatLog.mjs | 131 ++--
module/data/chat-message/adversaryRoll.mjs | 2 +-
module/data/fields/actorField.mjs | 5 +-
module/dice/d20Roll.mjs | 23 +-
module/dice/dualityRoll.mjs | 48 ++
module/enrichers/DualityRollEnricher.mjs | 2 +-
styles/less/dialog/actions/action-list.less | 38 +-
styles/less/global/elements.css | 723 ++++++++++----------
styles/less/ui/chat/chat.less | 29 +
templates/ui/chat/adversary-roll.hbs | 15 +-
templates/ui/chat/duality-roll.hbs | 46 +-
13 files changed, 593 insertions(+), 490 deletions(-)
diff --git a/daggerheart.mjs b/daggerheart.mjs
index da04334c..4568c670 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -2,14 +2,14 @@ import { SYSTEM } from './module/config/system.mjs';
import * as applications from './module/applications/_module.mjs';
import * as models from './module/data/_module.mjs';
import * as documents from './module/documents/_module.mjs';
+import * as dice from './module/dice/_module.mjs';
import RegisterHandlebarsHelpers from './module/helpers/handlebarsHelper.mjs';
import { enricherConfig, enricherRenderSetup } from './module/enrichers/_module.mjs';
import { getCommandTarget, rollCommandToJSON } from './module/helpers/utils.mjs';
import { NarrativeCountdowns } from './module/applications/ui/countdowns.mjs';
import { DualityRollColor } from './module/data/settings/Appearance.mjs';
import { DHRoll, DualityRoll, D20Roll, DamageRoll, DualityDie } from './module/dice/_module.mjs';
-import { enrichedDualityRoll, renderDualityButton } from './module/enrichers/DualityRollEnricher.mjs';
-import { renderMeasuredTemplate } from './module/enrichers/TemplateEnricher.mjs';
+import { enrichedDualityRoll } from './module/enrichers/DualityRollEnricher.mjs';
import { registerCountdownHooks } from './module/data/countdowns.mjs';
import {
handlebarsRegistration,
@@ -20,14 +20,14 @@ import { placeables } from './module/canvas/_module.mjs';
import { registerRollDiceHooks } from './module/dice/dhRoll.mjs';
import { registerDHActorHooks } from './module/documents/actor.mjs';
import './node_modules/@yaireo/tagify/dist/tagify.css';
-import { renderDamageButton } from './module/enrichers/DamageEnricher.mjs';
Hooks.once('init', () => {
CONFIG.DH = SYSTEM;
game.system.api = {
applications,
models,
- documents
+ documents,
+ dice
};
CONFIG.TextEditor.enrichers.push(...enricherConfig);
@@ -49,7 +49,12 @@ Hooks.once('init', () => {
DamageRoll: DamageRoll
};
- CONFIG.Dice.rolls = [...CONFIG.Dice.rolls, ...[DHRoll, DualityRoll, D20Roll, DamageRoll]];
+ CONFIG.Dice.terms = {
+ ...CONFIG.Dice.terms,
+ DualityDie
+ };
+
+ CONFIG.Dice.rolls = [...CONFIG.Dice.rolls, DHRoll, DualityRoll, D20Roll, DamageRoll];
CONFIG.MeasuredTemplate.objectClass = placeables.DhMeasuredTemplate;
const { DocumentSheetConfig } = foundry.applications.apps;
diff --git a/lang/en.json b/lang/en.json
index fc51a610..8af39fa3 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -1339,6 +1339,8 @@
"quantity": "Quantity",
"range": "Range",
"recovery": "Recovery",
+ "reroll": "Reroll",
+ "rerollThing": "Reroll {thing}",
"resource": "Resource",
"roll": "Roll",
"rollAll": "Roll All",
@@ -1615,6 +1617,10 @@
"title": "Heal - {healing}",
"heal": "Heal"
},
+ "reroll": {
+ "confirmTitle": "Reroll Dice",
+ "confirmText": "Are you sure you want to reroll?"
+ },
"resourceRoll": {
"playerMessage": "{user} rerolled their {name}"
}
diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index 41f9ef20..bcdff961 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -46,17 +46,14 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
html.querySelectorAll('.target-indicator').forEach(element =>
element.addEventListener('click', this.onToggleTargets)
);
- html.querySelectorAll('.advantage').forEach(element =>
- element.addEventListener('mouseenter', this.hoverAdvantage)
- );
- html.querySelectorAll('.advantage').forEach(element =>
- element.addEventListener('click', event => this.selectAdvantage.call(this, event, data.message))
- );
html.querySelectorAll('.ability-use-button').forEach(element =>
- element.addEventListener('click', event => this.abilityUseButton.call(this, event, data.message))
+ element.addEventListener('click', event => this.abilityUseButton(this, event, data.message))
);
html.querySelectorAll('.action-use-button').forEach(element =>
- element.addEventListener('click', event => this.actionUseButton.call(this, event, data.message))
+ element.addEventListener('click', event => this.actionUseButton(this, event, data.message))
+ );
+ html.querySelectorAll('.reroll-button').forEach(element =>
+ element.addEventListener('click', event => this.rerollEvent(this, event, data.message))
);
};
@@ -70,7 +67,6 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
}
async getActor(id) {
- // return game.actors.get(id);
return await fromUuid(id);
}
@@ -85,7 +81,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
return action;
}
- onRollDamage = async (event, message) => {
+ async onRollDamage(event, message) {
event.stopPropagation();
const actor = await this.getActor(message.system.source.actor);
if (game.user.character?.id !== actor.id && !game.user.isGM) return true;
@@ -94,9 +90,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
if (!action || !action?.rollDamage) return;
await action.rollDamage(event, message);
}
- };
+ }
- onRollHealing = async (event, message) => {
+ async onRollHealing(event, message) {
event.stopPropagation();
const actor = await this.getActor(message.system.source.actor);
if (!actor || !game.user.isGM) return true;
@@ -105,9 +101,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
if (!action || !action?.rollHealing) return;
await action.rollHealing(event, message);
}
- };
+ }
- onRollSave = async (event, message) => {
+ async onRollSave(event, message) {
event.stopPropagation();
const actor = await this.getActor(message.system.source.actor),
tokenId = event.target.closest('[data-token]')?.dataset.token,
@@ -118,9 +114,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
if (!action || !action?.hasSave) return;
action.rollSave(token, event, message);
}
- };
+ }
- onRollAllSave = async (event, message) => {
+ onRollAllSave(event, _message) {
event.stopPropagation();
const targets = event.target.parentElement.querySelectorAll(
'.target-section > [data-token] .target-save-container'
@@ -128,9 +124,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
targets.forEach(el => {
el.dispatchEvent(new PointerEvent('click', { shiftKey: true }));
});
- };
+ }
- onApplyEffect = async (event, message) => {
+ async onApplyEffect(event, message) {
event.stopPropagation();
const actor = await this.getActor(message.system.source.actor);
if (!actor || !game.user.isGM) return true;
@@ -142,9 +138,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
await action.applyEffects(event, message, targets);
}
- };
+ }
- onTargetSelection = async (event, message) => {
+ onTargetSelection(event, message) {
event.stopPropagation();
const targetSelection = Boolean(event.target.dataset.targetHit),
msg = ui.chat.collection.get(message._id);
@@ -154,9 +150,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
msg.system.targetSelection = targetSelection;
msg.system.prepareDerivedData();
ui.chat.updateMessage(msg);
- };
+ }
- getTargetList = (event, message) => {
+ getTargetList(event, message) {
const targetSelection = event.target
.closest('.message-content')
.querySelector('.button-target-selection.target-selected'),
@@ -167,20 +163,20 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
? message.system.targets.filter(t => t.hit === true).map(target => game.canvas.tokens.get(target.id))
: Array.from(game.user.targets)
};
- };
+ }
- hoverTarget = event => {
+ hoverTarget(event) {
event.stopPropagation();
const token = canvas.tokens.get(event.currentTarget.dataset.token);
if (!token?.controlled) token._onHoverIn(event, { hoverOutOthers: true });
- };
+ }
- unhoverTarget = event => {
+ unhoverTarget(event) {
const token = canvas.tokens.get(event.currentTarget.dataset.token);
if (!token?.controlled) token._onHoverOut(event);
- };
+ }
- clickTarget = event => {
+ clickTarget(event) {
event.stopPropagation();
const token = canvas.tokens.get(event.currentTarget.dataset.token);
if (!token) {
@@ -188,9 +184,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
return;
}
game.canvas.pan(token);
- };
+ }
- onDamage = async (event, message) => {
+ async onDamage(event, message) {
event.stopPropagation();
const { isHit, targets } = this.getTargetList(event, message);
@@ -228,9 +224,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
target.actor.takeDamage(damages);
}
- };
+ }
- onHealing = async (event, message) => {
+ async onHealing(event, message) {
event.stopPropagation();
const targets = Array.from(game.user.targets);
@@ -240,7 +236,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
for (var target of targets) {
target.actor.takeHealing(message.system.roll);
}
- };
+ }
/**
* Toggle visibility of target containers.
@@ -253,51 +249,15 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
.forEach(el => el.classList.toggle('hidden'));
}
- /**
- * Highlight advantage icons on hover.
- * @param {MouseEvent} event
- */
- hoverAdvantage(event) {
- const parent = event.currentTarget.parentElement;
- if (!parent) return;
-
- parent.querySelectorAll('.advantage').forEach(el => {
- if (el !== event.currentTarget) {
- el.classList.toggle('unused');
- }
- });
- }
-
- /**
- * Handle selecting an advantage and disable further selection.
- * @param {MouseEvent} event
- * @param {object} message
- */
- async selectAdvantage(event, message) {
- event.stopPropagation();
-
- const updateMessage = game.messages.get(message._id);
- await updateMessage?.update({
- system: { advantageSelected: event.currentTarget.id === 'hope' ? 1 : 2 }
- });
-
- const parent = event.currentTarget.parentElement;
- if (!parent) return;
-
- parent.querySelectorAll('.advantage').forEach(el => {
- el.replaceWith(el.cloneNode(true));
- });
- }
-
- abilityUseButton = async (event, message) => {
+ async abilityUseButton(event, message) {
event.stopPropagation();
const action = message.system.actions[Number.parseInt(event.currentTarget.dataset.index)];
const actor = game.actors.get(message.system.source.actor);
await actor.useAction(action);
- };
+ }
- actionUseButton = async (event, message) => {
+ async actionUseButton(event, message) {
const { moveIndex, actionIndex } = event.currentTarget.dataset;
const parent = await foundry.utils.fromUuid(message.system.actor);
const actionType = message.system.moves[moveIndex].actions[actionIndex];
@@ -308,5 +268,30 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
);
action.use(event);
- };
+ }
+
+ async rerollEvent(event, message) {
+ if (!event.shiftKey) {
+ const confirmed = await foundry.applications.api.DialogV2.confirm({
+ window: {
+ title: game.i18n.localize('DAGGERHEART.UI.Chat.reroll.confirmTitle')
+ },
+ content: game.i18n.localize('DAGGERHEART.UI.Chat.reroll.confirmText')
+ });
+ if (!confirmed) return;
+ }
+
+ const target = event.target.closest('button[data-die-index]');
+ 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'
+ ];
+ const { newRoll, parsedRoll } = await rollClass.reroll(originalRoll_parsed, target, message);
+
+ await game.messages.get(message._id).update({
+ 'system.roll': newRoll,
+ 'rolls': [parsedRoll]
+ });
+ }
}
diff --git a/module/data/chat-message/adversaryRoll.mjs b/module/data/chat-message/adversaryRoll.mjs
index 9210ef99..1e2d8da1 100644
--- a/module/data/chat-message/adversaryRoll.mjs
+++ b/module/data/chat-message/adversaryRoll.mjs
@@ -6,7 +6,7 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
static defineSchema() {
return {
title: new fields.StringField(),
- roll: new fields.DataField(),
+ roll: new fields.ObjectField(),
targets: new fields.ArrayField(
new fields.SchemaField({
id: new fields.StringField({}),
diff --git a/module/data/fields/actorField.mjs b/module/data/fields/actorField.mjs
index 047b6f4f..0b1113fb 100644
--- a/module/data/fields/actorField.mjs
+++ b/module/data/fields/actorField.mjs
@@ -26,10 +26,7 @@ const stressDamageReductionRule = localizationPath =>
const bonusField = label =>
new fields.SchemaField({
bonus: new fields.NumberField({ integer: true, initial: 0, label: `${game.i18n.localize(label)} Value` }),
- dice: new fields.ArrayField(
- new fields.StringField(),
- { label: `${game.i18n.localize(label)} Dice` }
- )
+ dice: new fields.ArrayField(new fields.StringField(), { label: `${game.i18n.localize(label)} Dice` })
});
export { attributeField, resourceField, stressDamageReductionRule, bonusField };
diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index 95cba5ca..5f95b80d 100644
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@@ -147,7 +147,10 @@ export default class D20Roll extends DHRoll {
const difficulty = config.roll.difficulty ?? target.difficulty ?? target.evasion;
target.hit = this.isCritical || roll.total >= difficulty;
});
- } else if (config.roll.difficulty) data.success = roll.isCritical || roll.total >= config.roll.difficulty;
+ } else if (config.roll.difficulty) {
+ data.difficulty = config.roll.difficulty;
+ data.success = roll.isCritical || roll.total >= config.roll.difficulty;
+ }
data.advantage = {
type: config.roll.advantage,
dice: roll.dAdvantage?.denomination,
@@ -169,4 +172,22 @@ 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);
+ }
+
+ return { newRoll, parsedRoll };
+ }
}
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 142f21e8..151d63df 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -1,6 +1,7 @@
import D20RollDialog from '../applications/dialogs/d20RollDialog.mjs';
import D20Roll from './d20Roll.mjs';
import { setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs';
+import { getDiceSoNicePresets } from '../config/generalConfig.mjs';
export default class DualityRoll extends D20Roll {
_advantageFaces = 6;
@@ -110,6 +111,13 @@ export default class DualityRoll extends D20Roll {
return [...(hooks ?? []), 'Duality'];
}
+ /** @inheritDoc */
+ static fromData(data) {
+ data.terms[0].class = game.system.api.dice.DualityDie.name;
+ data.terms[2].class = game.system.api.dice.DualityDie.name;
+ return super.fromData(data);
+ }
+
createBaseDice() {
if (
this.dice[0] instanceof CONFIG.Dice.daggerheart.DualityDie &&
@@ -186,4 +194,44 @@ export default class DualityRoll extends D20Roll {
return data;
}
+
+ static async reroll(rollString, target, message) {
+ let parsedRoll = game.system.api.dice.DualityRoll.fromData({ ...rollString, evaluated: false });
+ const term = parsedRoll.terms[target.dataset.dieIndex];
+ await term.reroll(`/r1=${term.total}`);
+ 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 = getDiceSoNicePresets();
+ const type = target.dataset.type;
+ if (diceSoNicePresets[type]) {
+ diceSoNiceRoll.dice[0].options = { appearance: diceSoNicePresets[type] };
+ }
+
+ await game.dice3d.showForRoll(diceSoNiceRoll, game.user, true);
+ }
+
+ await parsedRoll.evaluate();
+
+ const newRoll = game.system.api.dice.DualityRoll.postEvaluate(parsedRoll, {
+ targets: message.system.targets,
+ roll: {
+ advantage: message.system.roll.advantage?.type,
+ difficulty: message.system.roll.difficulty ? Number(message.system.roll.difficulty) : null
+ }
+ });
+ newRoll.extra = newRoll.extra.slice(2);
+
+ return { newRoll, parsedRoll };
+ }
}
diff --git a/module/enrichers/DualityRollEnricher.mjs b/module/enrichers/DualityRollEnricher.mjs
index dde82a48..70f376e7 100644
--- a/module/enrichers/DualityRollEnricher.mjs
+++ b/module/enrichers/DualityRollEnricher.mjs
@@ -48,7 +48,7 @@ function getDualityMessage(roll) {
>
{{total}}
-
- {{#each results}}
- {{result}}
- {{/each}}
+
+
+ {{#each results as |result index|}}
+ {{result.result}}
+ {{/each}}
+
- {{#if (eq index 0)}}
-
- {{#if (eq ../roll.advantage.type 1)}}{{localize "DAGGERHEART.GENERAL.Advantage.full"}}{{/if}}{{#if (eq ../roll.advantage.type -1)}}{{localize "DAGGERHEART.GENERAL.Disadvantage.full"}}{{/if}}
-
- {{/if}}
diff --git a/templates/ui/chat/duality-roll.hbs b/templates/ui/chat/duality-roll.hbs
index 8076e093..d83136fe 100644
--- a/templates/ui/chat/duality-roll.hbs
+++ b/templates/ui/chat/duality-roll.hbs
@@ -1,6 +1,6 @@
-
-
{{title}}
-
+
+
{{title}}
+
{{#each roll.modifiers}}
{{localize label}} {{#if (gte value 0)}}+{{/if}}{{value}}
@@ -22,12 +22,12 @@
{{/if}}
-