From 4cf01f7427bb7d24195a2dc0429e82412bd78e16 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 23 Aug 2025 18:29:00 +0200
Subject: [PATCH] Added handling for multiselect toggleCombat

---
 module/applications/hud/tokenHUD.mjs | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/module/applications/hud/tokenHUD.mjs b/module/applications/hud/tokenHUD.mjs
index b23e26c6..48d5ac89 100644
--- a/module/applications/hud/tokenHUD.mjs
+++ b/module/applications/hud/tokenHUD.mjs
@@ -1,6 +1,9 @@
 export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
     static DEFAULT_OPTIONS = {
-        classes: ['daggerheart']
+        classes: ['daggerheart'],
+        actions: {
+            combat: DHTokenHUD.#onToggleCombat
+        }
     };
 
     /** @override */
@@ -11,11 +14,14 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
         }
     };
 
+    static #nonCombatTypes = ['environment', 'companion'];
+
     async _prepareContext(options) {
         const context = await super._prepareContext(options);
-        const nonCombatTypes = ['environment', 'companion'];
 
-        context.canToggleCombat = nonCombatTypes.includes(this.actor.type) ? false : context.canToggleCombat;
+        context.canToggleCombat = DHTokenHUD.#nonCombatTypes.includes(this.actor.type)
+            ? false
+            : context.canToggleCombat;
         context.systemStatusEffects = Object.keys(context.statusEffects).reduce((acc, key) => {
             const effect = context.statusEffects[key];
             if (effect.systemEffect) acc[key] = effect;
@@ -39,6 +45,20 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
         return context;
     }
 
+    static async #onToggleCombat() {
+        const tokens = canvas.tokens.controlled
+            .filter(t => !t.actor || !DHTokenHUD.#nonCombatTypes.includes(t.actor.type))
+            .map(t => t.document);
+        if (!this.object.controlled) tokens.push(this.document);
+
+        try {
+            if (this.document.inCombat) await TokenDocument.implementation.deleteCombatants(tokens);
+            else await TokenDocument.implementation.createCombatants(tokens);
+        } catch (err) {
+            ui.notifications.warn(err.message);
+        }
+    }
+
     _getStatusEffectChoices() {
         // Include all HUD-enabled status effects
         const choices = {};