-
+
-
-
+
-
- {{#if (and showAttribution document.system.attributionLabel)}}
-
- {{/if}}
-
-
{{#if source.system.difficulty}}
@@ -35,6 +14,25 @@
{{localize "DAGGERHEART.GENERAL.difficulty"}}
+
+ {{#if (and showAttribution document.system.attributionLabel)}}
+
+ {{/if}}
+
diff --git a/templates/sheets/actors/party/header.hbs b/templates/sheets/actors/party/header.hbs
index c48902c8..efa6e5b8 100644
--- a/templates/sheets/actors/party/header.hbs
+++ b/templates/sheets/actors/party/header.hbs
@@ -2,9 +2,7 @@
\ No newline at end of file
From e529dd0f883c3bdd21eb6f7abd8913e7146779cb Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Tue, 26 May 2026 00:49:46 +0200
Subject: [PATCH 05/11] Fixed so that advantage dice do not get duplicated
(#1929)
---
module/applications/dialogs/d20RollDialog.mjs | 14 +++++------
module/dice/dualityRoll.mjs | 24 ++++++++++++-------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 067aa473..76b2e751 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -175,14 +175,14 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
this.disadvantage = advantage === -1;
this.config.roll.advantage = this.config.roll.advantage === advantage ? 0 : advantage;
+ if (this.config.roll.advantage === 0) return this.render();
- if (this.config.roll.advantage === 1 && this.config.data.rules.roll.defaultAdvantageDice) {
- const faces = Number.parseInt(this.config.data.rules.roll.defaultAdvantageDice);
- this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
- } else if (this.config.roll.advantage === -1 && this.config.data.rules.roll.defaultDisadvantageDice) {
- const faces = Number.parseInt(this.config.data.rules.roll.defaultDisadvantageDice);
- this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
- }
+ const defaultFaces =
+ this.config.roll.advantage === 1
+ ? this.config.data.rules.roll.defaultAdvantageDice
+ : this.config.data.rules.roll.defaultDisadvantageDice;
+ const faces = Number.parseInt(defaultFaces);
+ this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
this.render();
}
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 5e03a680..d58811fe 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -148,14 +148,22 @@ export default class DualityRoll extends D20Roll {
}
applyAdvantage() {
- if (this.hasAdvantage || this.hasDisadvantage) {
- const dieFaces = this.advantageFaces,
- advDie = new foundry.dice.terms.Die({ faces: dieFaces, number: this.advantageNumber });
- if (this.advantageNumber > 1) advDie.modifiers = ['kh'];
- this.terms.push(
- new foundry.dice.terms.OperatorTerm({ operator: this.hasDisadvantage ? '-' : '+' }),
- advDie
- );
+ const advDieClass = this.hasAdvantage
+ ? game.system.api.dice.diceTypes.AdvantageDie
+ : this.hasDisadvantage
+ ? game.system.api.dice.diceTypes.DisadvantageDie
+ : null;
+ if (advDieClass) {
+ const advDie = new advDieClass({ faces: this.advantageFaces, number: this.advantageNumber });
+ if (this.terms.length < 4) {
+ if (this.advantageNumber > 1) advDie.modifiers = ['kh'];
+ this.terms.push(
+ new foundry.dice.terms.OperatorTerm({ operator: this.hasDisadvantage ? '-' : '+' }),
+ advDie
+ );
+ } else {
+ this.terms[4] = advDie;
+ }
}
if (this.rallyFaces)
this.terms.push(
From ccc4186e42e96771ed5c00d4e9c3f8479f97792d Mon Sep 17 00:00:00 2001
From: Carlos Fernandez
Date: Tue, 26 May 2026 06:27:17 -0400
Subject: [PATCH 06/11] Disable contenteditable inputs when read only (#1935)
---
module/applications/sheets/actors/character.mjs | 3 +++
module/applications/sheets/api/base-actor.mjs | 9 +++++++++
2 files changed, 12 insertions(+)
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index d85838e1..19b82712 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -184,6 +184,9 @@ export default class CharacterSheet extends DHBaseActorSheet {
for (const input of form.querySelectorAll('input:not([type=search]), .editor.prosemirror')) {
input.disabled = disabled;
}
+ for (const element of form.querySelectorAll('.input[contenteditable]')) {
+ element.classList.toggle('disabled', disabled);
+ }
}
/** @inheritDoc */
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index e23a4426..5cd0f6a5 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -166,6 +166,15 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
}
}
+ /** Add support for input content editables */
+ _toggleDisabled(disabled) {
+ super._toggleDisabled(disabled);
+ const form = this.form;
+ for (const element of form.querySelectorAll('.input[contenteditable]')) {
+ element.classList.toggle('disabled', disabled);
+ }
+ }
+
/* -------------------------------------------- */
/* Context Menu */
/* -------------------------------------------- */
From b9416ead5a31b28ea187f883432b5362dfa5c439 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez
Date: Tue, 26 May 2026 09:41:26 -0400
Subject: [PATCH 07/11] Fix usable checks on adversary features and locked
compendium actors (#1934)
---
module/data/action/baseAction.mjs | 8 ++++++--
module/documents/item.mjs | 6 ++++--
.../sheets/global/partials/inventory-item-compact.hbs | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index b3775dc9..acd104a7 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -148,10 +148,14 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
: null;
}
- /** Returns true if the action is usable */
+ /**
+ * Returns true if the action is usable.
+ * An action is usable on any actor type. For example, an adversary might have a base attack action.
+ */
get usable() {
const actor = this.actor;
- return this.isOwner && actor?.type === 'character';
+ const pack = actor?.pack ? game.packs.get(actor.pack) : null;
+ return !pack?.locked && this.isOwner;
}
static getRollType(parent) {
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index 93aa3b28..603ca594 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -73,8 +73,10 @@ export default class DHItem extends foundry.documents.Item {
/** Returns true if the item can be used */
get usable() {
const actor = this.actor;
- const actionsList = this.system.actionsList;
- return this.isOwner && actor?.type === 'character' && (actionsList?.size || actionsList?.length);
+ const pack = actor?.pack ? game.packs.get(actor.pack) : null;
+ const hasActions = this.system.actionsList?.size || this.system.actionsList?.length;
+ const isValidType = actor?.type === 'character' || this.type === 'feature';
+ return !pack?.locked && this.isOwner && isValidType && hasActions;
}
/** @inheritdoc */
diff --git a/templates/sheets/global/partials/inventory-item-compact.hbs b/templates/sheets/global/partials/inventory-item-compact.hbs
index daba6721..78eaf087 100644
--- a/templates/sheets/global/partials/inventory-item-compact.hbs
+++ b/templates/sheets/global/partials/inventory-item-compact.hbs
@@ -5,7 +5,7 @@
(hasProperty item "toChat" ) "toChat" "editDoc" ) }}' {{#unless hideTooltip}} {{#if (eq type 'attack' )}}
data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}}>
- {{#if (or item.system.actionsList.size item.system.actionsList.length item.actionType)}}
+ {{#if item.usable}}
{{#if @root.isNPC}}
{{else}}
From de0ab9d0476d7a1118c7d9152e8fcf1eb2285e41 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez
Date: Tue, 26 May 2026 09:43:36 -0400
Subject: [PATCH 08/11] Include more item types when viewing compendium browser
from item tab (#1931)
---
module/applications/ui/itemBrowser.mjs | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index d98cf2da..45e8863f 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -606,7 +606,16 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
items: {
folder: 'equipments',
render: {
- noFolder: true
+ folders: [
+ 'equipments',
+ 'ancestries',
+ 'classes',
+ 'subclasses',
+ 'domains',
+ 'communities',
+ 'beastforms'
+ // excluded: features
+ ]
}
},
compendium: {}
From c2f8b34ef25a4e51e12585fb72c9de3ef4a26342 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez
Date: Tue, 26 May 2026 09:46:08 -0400
Subject: [PATCH 09/11] Show actor sheet when clicking actors in item browser
(#1930)
---
module/applications/ui/itemBrowser.mjs | 12 ++++++++++--
styles/less/ui/item-browser/item-browser.less | 2 +-
templates/ui/itemBrowser/itemContainer.hbs | 16 +++++++++-------
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index 45e8863f..8f38918a 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -1,3 +1,4 @@
+import { getDocFromElement } from '../../helpers/utils.mjs';
import { RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@@ -47,7 +48,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
expandContent: this.expandContent,
resetFilters: this.resetFilters,
sortList: this.sortList,
- openSettings: this.openSettings
+ openSettings: this.openSettings,
+ viewSheet: this.#onViewSheet
},
position: {
left: 100,
@@ -306,7 +308,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
{
items: this.items,
menu: this.selectedMenu,
- formatLabel: this.formatLabel
+ formatLabel: this.formatLabel,
+ viewSheet: this.items[0] instanceof Actor
}
);
@@ -568,6 +571,11 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
}
}
+ static async #onViewSheet(_, target) {
+ const document = await getDocFromElement(target);
+ document?.sheet?.render(true);
+ }
+
_createDragProcess() {
new foundry.applications.ux.DragDrop.implementation({
dragSelector: '.item-container',
diff --git a/styles/less/ui/item-browser/item-browser.less b/styles/less/ui/item-browser/item-browser.less
index 066da73b..a40c0fae 100644
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@@ -245,7 +245,7 @@
}
.item-list-header,
- .item-list [data-action='expandContent'] {
+ .item-list .item-info[data-action] {
display: flex;
> * {
diff --git a/templates/ui/itemBrowser/itemContainer.hbs b/templates/ui/itemBrowser/itemContainer.hbs
index 8dd75156..a5f067e8 100644
--- a/templates/ui/itemBrowser/itemContainer.hbs
+++ b/templates/ui/itemBrowser/itemContainer.hbs
@@ -1,7 +1,7 @@
{{#each items}}
Date: Wed, 27 May 2026 19:01:47 +0200
Subject: [PATCH 10/11] Fixed DamageReroll
---
module/applications/ui/chatLog.mjs | 8 +++---
module/data/chat-message/actorRoll.mjs | 35 ++++++++++++++++++++++++++
module/dice/d20Roll.mjs | 15 +++++++++++
module/dice/damageRoll.mjs | 7 +++++-
4 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index b829b2e7..7036a5df 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -108,7 +108,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
icon: '',
visible: li => {
const message = game.messages.get(li.dataset.messageId);
- return game.user.isGM || message.isAuthor;
+ return message.system.hasRoll && (game.user.isGM || message.isAuthor);
},
callback: async li => {
const message = game.messages.get(li.dataset.messageId);
@@ -128,10 +128,8 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
},
callback: async li => {
const message = game.messages.get(li.dataset.messageId);
- const damageRoll = new game.system.api.dice.DamageRoll(message.system.damage.hitPoints.roll);
- await message.system.action.workflow.get('damage')?.execute(message.system, message.id, true);
- // message.update({ rolls: [reroll] });
- console.log('test');
+ const update = await message.system.getRerolledDamage();
+ message.update(update);
}
}
];
diff --git a/module/data/chat-message/actorRoll.mjs b/module/data/chat-message/actorRoll.mjs
index eaa1cdc2..caffde09 100644
--- a/module/data/chat-message/actorRoll.mjs
+++ b/module/data/chat-message/actorRoll.mjs
@@ -130,6 +130,41 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
});
}
+ /* TODO: Change how damage data is stored somehow to enable better rerolling */
+ async getRerolledDamage() {
+ if (!this.damage) return;
+
+ const rerolls = [];
+ const update = { system: { damage: {} } };
+ for (const partKey in this.damage) {
+ const part = this.damage[partKey];
+ const testRoll = Roll.fromData(part.parts[0].roll);
+ const rerolled = await testRoll.reroll();
+ rerolls.push(rerolled);
+
+ if (!update.system.damage[partKey]) update.system.damage[partKey] = { parts: [part.parts[0]] };
+ const partData = update.system.damage[partKey].parts[0];
+ update.system.damage[partKey].total = rerolled.total;
+ partData.modifierTotal = rerolled.terms.reduce((acc, x) => {
+ if (x.isDeterministic && !x.operator) acc += x.total;
+ return acc;
+ }, 0);
+ partData.dice = rerolled.dice;
+ partData.total = rerolled.total;
+ partData.roll = rerolled.toJSON();
+ }
+
+ if (game.modules.get('dice-so-nice')?.active) {
+ for (const roll of rerolls) {
+ await game.dice3d.showForRoll(roll, game.user, true);
+ }
+ } else {
+ foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice });
+ }
+
+ return update;
+ }
+
registerTargetHook() {
if (!this.parent.isAuthor || !this.hasTarget) return;
if (this.targetMode && this.parent.targetHook !== null) {
diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index 509f5d69..2cc6baf6 100644
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@@ -224,4 +224,19 @@ export default class D20Roll extends DHRoll {
resetFormula() {
return (this._formula = this.constructor.getFormula(this.terms));
}
+
+ async reroll(options) {
+ const result = await super.reroll(options);
+ if (this instanceof game.system.api.dice.DualityRoll) return result;
+
+ if (options?.liveRoll) {
+ if (game.modules.get('dice-so-nice')?.active) {
+ await game.dice3d.showForRoll(result, game.user, true);
+ } else {
+ foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice });
+ }
+ }
+
+ return result;
+ }
}
diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index 98fd8401..1fc30d29 100644
--- a/module/dice/damageRoll.mjs
+++ b/module/dice/damageRoll.mjs
@@ -18,7 +18,12 @@ export default class DamageRoll extends DHRoll {
if (config.evaluate !== false) for (const roll of config.roll) await roll.roll.evaluate();
roll._evaluated = true;
- const parts = config.roll.map(r => this.postEvaluate(r));
+
+ const parts = [];
+ for (const roll of config.roll) {
+ parts.push(this.postEvaluate(roll));
+ roll.roll = JSON.stringify(roll.roll.toJSON());
+ }
config.damage = this.unifyDamageRoll(parts);
}
From 505cc634d356e903f2057c993d5fde5282dba584 Mon Sep 17 00:00:00 2001
From: WBHarry
Date: Wed, 27 May 2026 20:56:07 +0200
Subject: [PATCH 11/11] Fixed d20 modifiers
---
module/data/fields/action/rollField.mjs | 19 -------------------
module/dice/d20Roll.mjs | 24 +++++++++++++++++++++++-
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/module/data/fields/action/rollField.mjs b/module/data/fields/action/rollField.mjs
index 63d48990..a1c813c6 100644
--- a/module/data/fields/action/rollField.mjs
+++ b/module/data/fields/action/rollField.mjs
@@ -78,24 +78,6 @@ export class DHActionRollData extends foundry.abstract.DataModel {
return formula;
}
- getModifier() {
- const modifiers = [];
- if (!this.parent?.actor) return modifiers;
- switch (this.parent.actor.type) {
- case 'companion':
- case 'adversary':
- if (this.type === CONFIG.DH.GENERAL.rollTypes.attack.id)
- modifiers.push({
- label: 'Bonus to Hit',
- value: this.bonus ?? this.parent.actor.system.attack.roll.bonus ?? 0
- });
- break;
- default:
- break;
- }
- return modifiers;
- }
-
get rollTrait() {
if (this.parent?.actor?.type !== 'character') return null;
switch (this.type) {
@@ -145,7 +127,6 @@ export default class RollField extends fields.EmbeddedDataField {
config.dialog.configure = RollField.getAutomation() ? !config.dialog.configure : config.dialog.configure;
const roll = {
- baseModifiers: this.roll.getModifier(),
label: 'Attack',
type: this.roll?.type,
trait: this.roll?.rollTrait,
diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index 2cc6baf6..346f6b87 100644
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@@ -128,8 +128,30 @@ export default class D20Roll extends DHRoll {
}
}
+ getBaseModifiers() {
+ const modifiers = [];
+ const actor = foundry.utils.fromUuidSync(this.options.source.actor);
+ if (!actor) return modifiers;
+ switch (actor.type) {
+ case 'companion':
+ case 'adversary':
+ if (
+ this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||
+ this.options.source.action === actor.system.attack.id
+ )
+ modifiers.push({
+ label: 'Bonus to Hit',
+ value: this.data.attack.roll.bonus ?? 0
+ });
+ break;
+ default:
+ break;
+ }
+ return modifiers;
+ }
+
applyBaseBonus() {
- const modifiers = foundry.utils.deepClone(this.options.roll.baseModifiers) ?? [];
+ const modifiers = this.getBaseModifiers();
modifiers.push(
...this.getBonus(
-
- -
+
{{else}}
From de0ab9d0476d7a1118c7d9152e8fcf1eb2285e41 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez
-
{{/each}}
\ No newline at end of file
From 126a8e4660071554614ff0d5b580f27802a8ad12 Mon Sep 17 00:00:00 2001
From: WBHarry
+
{{name}}
{{#each ../menu.data.columns}}
@@ -9,11 +9,13 @@
{{/each}}
-
-
- {{{system.enrichedTags}}}
- {{{system.enrichedDescription}}}
-
-
+ {{#unless viewSheet}}
+
+
+ {{{system.enrichedTags}}}
+ {{{system.enrichedDescription}}}
+
+
+ {{/unless}}