Updated combat contextmenu

module/applications/ui/combatTracker.mjs

@@ -84,19 +84,49 @@ 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.ClearMovementHistories',
+                label: 'COMBAT.ACTIONS.EditName',
-                icon: '<i class="fa-solid fa-shoe-prints"></i>',
+                icon: 'fa-solid fa-tag',
-                visible: () => game.user.isGM && this.viewed?.combatants.size > 0,
+                visible: () => game.user.isGM && !!this.viewed,
-                callback: () => this.viewed.clearMovementHistories()
+                onClick: () => DhCombatTracker.#onEditName.call(this)
             },
             {
-                label: 'COMBAT.Delete',
+                label: 'COMBAT.ACTIONS.LinkToScene',
-                icon: '<i class="fa-solid fa-trash"></i>',
+                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,
-                callback: () => this.viewed.endCombat()
+                onClick: () => this.viewed.endCombat()
             }
         ];
     }

templates/ui/combatTracker/combatTrackerHeader.hbs

@@ -50,6 +50,11 @@
     </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">