lang/en.json

@@ -711,9 +711,9 @@
             },
             "PendingReactionsDialog": {
                 "title": "Pending Reaction Rolls Found",
-                "unfinishedRolls": "Some Tokens have not finished their Reaction Rolls.",
+                "unfinishedRolls": "Some Tokens still need to roll their Reaction Roll.",
-                "warning": "Unfinished reaction rolls will be considered as failed.",
+                "confirmation": "Are you sure you want to continue ?",
-                "confirmation": "Are you sure you want to continue?"
+                "warning": "Undone reaction rolls will be considered as failed"
             },
             "ReactionRoll": {
                 "title": "Reaction Roll: {trait}"

module/applications/sheets/actors/adversary.mjs

@@ -31,16 +31,6 @@ export default class AdversarySheet extends DHBaseActorSheet {
                 dragSelector: '[data-item-id][draggable="true"], [data-item-id] [draggable="true"]',
                 dropSelector: null
             }
-        ],
-        contextMenus: [
-            {
-                handler: DHBaseActorSheet.getBaseAttackContextOptions,
-                selector: '[data-item-uuid][data-type="attack"]',
-                options: {
-                    parentClassHooks: false,
-                    fixed: true
-                }
-            }
         ]
     };
 

module/applications/sheets/actors/character.mjs

@@ -65,14 +65,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
                     fixed: true
                 }
             },
-            {
-                handler: DHBaseActorSheet.getBaseAttackContextOptions,
-                selector: '[data-item-uuid][data-type="attack"]',
-                options: {
-                    parentClassHooks: false,
-                    fixed: true
-                }
-            },
             {
                 handler: CharacterSheet.#getDomainCardContextOptions,
                 selector: '[data-item-uuid][data-type="domainCard"]',
@@ -1053,7 +1045,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         game.tooltip.activate(target, {
             html,
             locked: true,
-            cssClass: 'bordered-tooltip dh-style',
+            cssClass: 'bordered-tooltip',
             direction: 'DOWN'
         });
 
@@ -1149,7 +1141,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         game.tooltip.activate(target, {
             html,
             locked: true,
-            cssClass: 'bordered-tooltip dh-style',
+            cssClass: 'bordered-tooltip',
             direction: 'DOWN',
             noOffset: true
         });

module/applications/sheets/actors/companion.mjs

@@ -11,17 +11,7 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
             toggleStress: DhCompanionSheet.#toggleStress,
             actionRoll: DhCompanionSheet.#actionRoll,
             levelManagement: DhCompanionSheet.#levelManagement
-        },
+        }
-        contextMenus: [
-            {
-                handler: DHBaseActorSheet.getBaseAttackContextOptions,
-                selector: '[data-item-uuid][data-type="attack"]',
-                options: {
-                    parentClassHooks: false,
-                    fixed: true
-                }
-            }
-        ]
     };
 
     static PARTS = {

module/applications/sheets/api/base-actor.mjs

@@ -189,43 +189,6 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         return this._getContextMenuCommonOptions.call(this, { usable: true, toChat: true });
     }
 
-    /**
-     * Get the set of ContextMenu options for the base attack.
-     * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
-     * @this {CharacterSheet}
-     * @protected
-     */
-    static getBaseAttackContextOptions() {
-        /**@type {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} */
-        return [
-            {
-                label: 'DAGGERHEART.CONFIG.RollTypes.attack.name',
-                icon: 'fa-solid fa-burst',
-                onClick: async (event, target) => (await getDocFromElement(target)).use(event)
-            },
-            {
-                label: 'DAGGERHEART.GENERAL.damage',
-                icon: 'fa-solid fa-explosion',
-                onClick: async (event, target) => {
-                    const doc = await getDocFromElement(target),
-                        action = doc?.system?.attack ?? doc;
-                    const config = action.prepareConfig(event);
-                    config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(
-                        this.document,
-                        doc
-                    );
-                    config.hasRoll = false;
-                    return action && action.workflow.get('damage').execute(config, null, true);
-                }
-            },
-            {
-                label: 'DAGGERHEART.APPLICATIONS.ContextMenu.sendToChat',
-                icon: 'fa-solid fa-message',
-                onClick: async (_, target) => (await getDocFromElement(target)).toChat(this.document.uuid)
-            }
-        ];
-    }
-
     /* -------------------------------------------- */
     /*  Application Listener Actions                */
     /* -------------------------------------------- */

module/applications/ui/combatTracker.mjs

@@ -84,49 +84,19 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         });
     }
 
-    /**
-     * Open the dialog used to edit the name of the currently viewed Combat encounter.
-     * @this {CombatTracker}
-     * @returns {Promise<void>}
-     */
-    static async #onEditName() {
-        const combat = this.viewed;
-        if (!combat || !game.user.isGM) return null;
-        const field = combat.schema.fields.name;
-        const inputHTML = field.toFormGroup({}, { name: 'name', value: combat.name, autofocus: true }).outerHTML;
-        const formData = await foundry.applications.api.DialogV2.input({
-            window: { icon: 'fa-solid fa-tag', title: 'COMBAT.ACTIONS.EditNameTitle' },
-            position: { width: 480 },
-            content: inputHTML
-        });
-        await combat.update({ name: formData.name || '' });
-    }
-
     _getCombatContextOptions() {
         return [
             {
-                label: 'COMBAT.ACTIONS.EditName',
+                label: 'COMBAT.ClearMovementHistories',
-                icon: 'fa-solid fa-tag',
+                icon: '<i class="fa-solid fa-shoe-prints"></i>',
+                visible: () => game.user.isGM && this.viewed?.combatants.size > 0,
+                callback: () => this.viewed.clearMovementHistories()
+            },
+            {
+                label: 'COMBAT.Delete',
+                icon: '<i class="fa-solid fa-trash"></i>',
                 visible: () => game.user.isGM && !!this.viewed,
-                onClick: () => DhCombatTracker.#onEditName.call(this)
+                callback: () => this.viewed.endCombat()
-            },
-            {
-                label: 'COMBAT.ACTIONS.LinkToScene',
-                icon: '<i class="fa-solid fa-link"></i>',
-                visible: () => game.user.isGM && !this.scene,
-                onClick: () => this.viewed.toggleSceneLink()
-            },
-            {
-                label: 'COMBAT.ACTIONS.UnlinkFromScene',
-                icon: '<i class="fa-solid fa-unlink"></i>',
-                visible: () => game.user.isGM && !!this.scene,
-                onClick: () => this.viewed.toggleSceneLink()
-            },
-            {
-                label: 'COMBAT.End',
-                icon: 'fa-solid fa-xmark',
-                visible: () => game.user.isGM && !!this.viewed,
-                onClick: () => this.viewed.endCombat()
             }
         ];
     }

module/data/action/attackAction.mjs

@@ -75,12 +75,7 @@ export default class DHAttackAction extends DHDamageAction {
         const useAltDamage = this.actor?.effects?.find(x => x.type === 'horde')?.active;
         for (const { value, valueAlt, type } of damage.parts) {
             const usedValue = useAltDamage ? valueAlt : value;
-            const damageString = Roll.replaceFormulaData(usedValue.getFormula(), this.actor?.getRollData() ?? {});
+            const str = Roll.replaceFormulaData(usedValue.getFormula(), this.actor?.getRollData() ?? {});
-            const str = damageString
-                ? damageString
-                : game.i18n.format('DAGGERHEART.GENERAL.missingX', {
-                      x: game.i18n.localize('DAGGERHEART.GENERAL.damage')
-                  });
 
             const icons = Array.from(type)
                 .map(t => CONFIG.DH.GENERAL.damageTypes[t]?.icon)

module/data/action/countdownAction.mjs

@@ -36,7 +36,7 @@ export default class DhCountdownAction extends DHBaseAction {
 
     /** @inheritDoc */
     static migrateData(source) {
-        for (const countdown of Object.values(source.countdown)) {
+        for (const countdown of source.countdown) {
             if (countdown.progress.max) {
                 countdown.progress.startFormula = countdown.progress.max;
                 countdown.progress.start = 1;

module/documents/chatMessage.mjs

@@ -183,11 +183,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             if (pendingingSaves.length) {
                 const confirm = await foundry.applications.api.DialogV2.confirm({
                     window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
-                    content: `
+                    content: `<p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p><p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p><p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>`
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p>
-                        <p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p>
-                    `
                 });
                 if (!confirm) return;
             }
@@ -251,24 +247,8 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
         const targets = this.filterPermTargets(this.system.hitTargets),
             config = foundry.utils.deepClone(this.system);
         config.event = event;
-
         if (targets.length === 0)
-            return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelectedOrPerm'));
+            ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelectedOrPerm'));
-        else if (config.hasSave) {
-            const pendingingSaves = targets.filter(t => t.saved.success === null);
-            if (pendingingSaves.length) {
-                const confirm = await foundry.applications.api.DialogV2.confirm({
-                    window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
-                    content: `
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p>
-                        <p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p>
-                    `
-                });
-                if (!confirm) return;
-            }
-        }
-
         this.consumeOnSuccess();
         this.system.action?.workflow.get('effects')?.execute(config, targets, true);
     }

module/documents/tooltipManager.mjs

@@ -3,6 +3,7 @@ import { AdversaryBPPerEncounter, BaseBPPerEncounter } from '../config/encounter
 export default class DhTooltipManager extends foundry.helpers.interaction.TooltipManager {
     #wide = false;
     #bordered = false;
+    #active = false;
 
     async activate(element, options = {}) {
         const { TextEditor } = foundry.applications.ux;

styles/less/hud/token-hud/token-hud.less

@@ -38,9 +38,6 @@
     }
 
     .status-effects {
-        // TODO: Remove when the issue https://github.com/foundryvtt/foundryvtt/issues/14410 is resolved and Foundry handles it cleanly themselves.
-        grid-template-rows: min-content;
-
         .effect-control-container {
             position: relative;
 

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.3.1",
+    "version": "2.3.0",
     "compatibility": {
         "minimum": "14.361",
         "verified": "14.363",
@@ -10,7 +10,7 @@
     },
     "url": "https://github.com/Foundryborne/daggerheart",
     "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.3.1/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.3.0/system.zip",
     "authors": [
         {
             "name": "WBHarry"

templates/ui/combatTracker/combatTrackerHeader.hbs

@@ -50,11 +50,6 @@
     </nav>
     {{/if}}
 
-    {{!-- Encounter Name --}}
-    {{#if combat.name}}
-    <h2 class="encounter-name">{{ combat.name }}</h2>
-    {{/if}}
-
     <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
         {{!-- Combat Status --}}
         <strong class="encounter-title">