daggerheart.mjs

@@ -300,8 +300,8 @@ Hooks.on('chatMessage', (_, message) => {
         const difficulty = rollCommand.difficulty;
 
         const target = getCommandTarget({ allowNull: true });
-        const title = flavor ??
+        const title = traitValue
-            traitValue ? game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
+            ? game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
                   ability: game.i18n.localize(SYSTEM.ACTOR.abilities[traitValue].label)
               })
             : game.i18n.localize('DAGGERHEART.GENERAL.duality');

module/applications/dialogs/deathMove.mjs

@@ -180,8 +180,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
                 'systems/daggerheart/templates/ui/chat/deathMove.hbs',
                 {
                     player: this.actor.name,
-                    actor: this.actor,
+                    actor: { name: this.actor.name, img: this.actor.img },
-                    actorId: this.actor._id,
                     author: game.users.get(game.user.id),
                     title: game.i18n.localize(this.selectedMove.name),
                     img: this.selectedMove.img,

module/applications/dialogs/riskItAllDialog.mjs

@@ -41,8 +41,6 @@ export default class RiskItAllDialog extends HandlebarsApplicationMixin(Applicat
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
         context.resourceValue = this.resourceValue;
-        context.maxHitPointsValue = Math.min(this.resourceValue, this.actor.system.resources.hitPoints.max);
-        context.maxStressValue = Math.min(this.resourceValue, this.actor.system.resources.stress.max);
         context.remainingResource = this.resourceValue - this.choices.hitPoints - this.choices.stress;
         context.unfinished = context.remainingResource !== 0;
 

module/applications/ui/chatLog.mjs

@@ -391,7 +391,6 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
 
     async riskItAllClearStressAndHitPoints(event, data) {
         const resourceValue = event.target.dataset.resourceValue;
-        const actor = game.actors.get(event.target.dataset.actorId);
+        new game.system.api.applications.dialogs.RiskItAllDialog(data.actor, resourceValue).render({ force: true });
-        new game.system.api.applications.dialogs.RiskItAllDialog(actor, resourceValue).render({ force: true });
     }
 }

module/data/item/base.mjs

@@ -240,7 +240,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
 
             game.system.registeredTriggers.unregisterTriggers(triggersToRemove, this.parent.uuid);
 
-            if (this.parent.parent && !(this.parent.parent.token instanceof game.system.api.documents.DhToken)) {
+            if (!(this.parent.parent.token instanceof game.system.api.documents.DhToken)) {
                 for (const token of this.parent.parent.getActiveTokens()) {
                     game.system.registeredTriggers.unregisterTriggers(
                         triggersToRemove,

module/data/registeredTriggers.mjs

@@ -60,7 +60,7 @@ export default class RegisteredTriggers extends Map {
 
     unregisterItemTriggers(items) {
         for (const item of items) {
-            if (!item.system.actions?.size) continue;
+            if (!item.system.actions.size) continue;
 
             const triggers = (item.system.actions ?? []).reduce((acc, action) => {
                 acc.push(...action.triggers.map(x => x.trigger));

module/dice/dualityRoll.mjs

@@ -118,6 +118,10 @@ export default class DualityRoll extends D20Roll {
 
     /** @inheritDoc */
     static fromData(data) {
+        if (data.options.guaranteedCritical) {
+            console.log('TODO: set the max values for Hope and Fear here?');
+        }
+
         data.terms[0].class = foundry.dice.terms.Die.name;
         data.terms[2].class = foundry.dice.terms.Die.name;
         return super.fromData(data);

module/documents/item.mjs

@@ -217,7 +217,7 @@ export default class DHItem extends foundry.documents.Item {
 
         game.system.registeredTriggers.unregisterTriggers(triggerKeys, this.uuid);
 
-        if (this.actor && !(this.actor.parent instanceof game.system.api.documents.DhToken)) {
+        if (!(this.actor.parent instanceof game.system.api.documents.DhToken)) {
             for (const token of this.actor.getActiveTokens()) {
                 game.system.registeredTriggers.unregisterTriggers(triggerKeys, `${token.document.uuid}.${this.uuid}`);
             }

module/enrichers/DualityRollEnricher.mjs

@@ -2,7 +2,7 @@ import { abilities } from '../config/actorConfig.mjs';
 import { getCommandTarget, rollCommandToJSON } from '../helpers/utils.mjs';
 
 export default function DhDualityRollEnricher(match, _options) {
-    const roll = rollCommandToJSON(match[0]);
+    const roll = rollCommandToJSON(match[1], match[0]);
     if (!roll) return match[0];
 
     return getDualityMessage(roll.result, roll.flavor);

module/enrichers/FateRollEnricher.mjs

@@ -1,7 +1,7 @@
 import { getCommandTarget, rollCommandToJSON } from '../helpers/utils.mjs';
 
 export default function DhFateRollEnricher(match, _options) {
-    const roll = rollCommandToJSON(match[0]);
+    const roll = rollCommandToJSON(match[1], match[0]);
     if (!roll) return match[0];
 
     return getFateMessage(roll.result, roll?.flavor);
@@ -45,6 +45,7 @@ function getFateMessage(roll, flavor) {
 export const renderFateButton = async event => {
     const button = event.currentTarget,
         target = getCommandTarget({ allowNull: true });
+    console.log('button', button);
 
     const fateTypeData = getFateTypeData(button.dataset?.fatetype);
 

module/helpers/utils.mjs

@@ -5,10 +5,10 @@ export const capitalize = string => {
     return string.charAt(0).toUpperCase() + string.slice(1);
 };
 
-export function rollCommandToJSON(text) {
+export function rollCommandToJSON(text, raw) {
     if (!text) return {};
 
-    const flavorMatch = text?.match(/{(.*)}$/);
+    const flavorMatch = raw?.match(/{(.*)}$/);
     const flavor = flavorMatch ? flavorMatch[1] : null;
 
     // Match key="quoted string"  OR  key=unquotedValue
@@ -31,7 +31,7 @@ export function rollCommandToJSON(text) {
         }
         result[key] = value;
     }
-    return { result, flavor };
+    return Object.keys(result).length > 0 ? { result, flavor } : null;
 }
 
 export const getCommandTarget = (options = {}) => {

src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json

@@ -81,7 +81,7 @@
       "name": "Bold Presence",
       "img": "icons/magic/holy/barrier-shield-winged-blue.webp",
       "origin": "Compendium.daggerheart.domains.Item.tdsL00yTSLNgZWs6",
-      "transfer": true,
+      "transfer": false,
       "_id": "2XEYhuAcRGTtqvED",
       "type": "base",
       "system": {

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.5.4",
+    "version": "1.5.2",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",

templates/dialogs/riskItAllDialog.hbs

@@ -10,11 +10,11 @@
         <div class="resource-section">
             <div class="resource-container">
                 <label>{{localize "DAGGERHEART.APPLICATIONS.RiskItAllDialog.clearResource" resource=(localize "DAGGERHEART.GENERAL.HitPoints.short")}}: {{this.choices.hitPoints}}</label>
-                <input type="range" step="1" min="0" max="{{this.maxHitPointsValue}}" value="{{this.choices.hitPoints}}" name="choices.hitPoints" data-choice="hitPoints" />
+                <input type="range" step="1" min="0" max="{{this.resourceValue}}" value="{{this.choices.hitPoints}}" name="choices.hitPoints" data-choice="hitPoints" />
             </div>
             <div class="resource-container">
                 <label>{{localize "DAGGERHEART.APPLICATIONS.RiskItAllDialog.clearResource" resource=(localize "DAGGERHEART.GENERAL.stress")}}: {{this.choices.stress}}</label>
-                <input type="range" step="1" min="0" max="{{this.maxStressValue}}" value="{{this.choices.stress}}" name="choices.stress" data-choice="stress" />
+                <input type="range" step="1" min="0" max="{{this.resourceValue}}" value="{{this.choices.stress}}" name="choices.stress" data-choice="stress" />
             </div>
         </div>
 

templates/ui/chat/deathMove.hbs

@@ -19,7 +19,7 @@
     </div>
     {{#if this.showRiskItAllButton}}
     <div>
-        <button class="risk-it-all-button" data-resource-value="{{this.riskItAllHope}}" data-actor-id="{{this.actorId}}">
+        <button class="risk-it-all-button" data-resource-value="{{this.riskItAllHope}}">
             <span>
                 {{this.riskItAllButtonLabel}}
             </span>
@@ -28,5 +28,4 @@
     {{/if}}
 
     </div>
-    </div>
 </div>