Initial idea

module/canvas/placeables/token.mjs

@@ -9,6 +9,35 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
             this.previewHelp ||= this.addChild(this.#drawPreviewHelp());
     }
 
+    /**@inheritdoc */
+    _refreshTurnMarker() {
+        // Should a Turn Marker be active?
+        const { turnMarker } = this.document;
+        const markersEnabled =
+            CONFIG.Combat.settings.turnMarker.enabled && turnMarker.mode !== CONST.TOKEN_TURN_MARKER_MODES.DISABLED;
+        const isTurn = game.combat?.combatant?.tokenId === this.id;
+        const spotlighted = game.settings
+            .get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.SpotlightTracker)
+            .spotlightedTokens.has(this.document.uuid);
+
+        const markerActive = markersEnabled && (isTurn || spotlighted);
+
+        // Activate a Turn Marker
+        if (markerActive) {
+            if (!this.turnMarker)
+                this.turnMarker = this.addChildAt(new foundry.canvas.placeables.tokens.TokenTurnMarker(this), 0);
+            canvas.tokens.turnMarkers.add(this);
+            this.turnMarker.draw();
+        }
+
+        // Remove a Turn Marker
+        else if (this.turnMarker) {
+            canvas.tokens.turnMarkers.delete(this);
+            this.turnMarker.destroy();
+            this.turnMarker = null;
+        }
+    }
+
     /** @inheritDoc */
     async _drawEffects() {
         this.effects.renderable = false;

module/config/settingsConfig.mjs

@@ -40,7 +40,8 @@ export const gameSettings = {
     LastMigrationVersion: 'LastMigrationVersion',
     TagTeamRoll: 'TagTeamRoll',
     SpotlightRequestQueue: 'SpotlightRequestQueue',
-    CompendiumBrowserSettings: 'CompendiumBrowserSettings'
+    CompendiumBrowserSettings: 'CompendiumBrowserSettings',
+    SpotlightTracker: 'SpotlightTracker'
 };
 
 export const actionAutomationChoices = {

module/data/_module.mjs

@@ -4,6 +4,7 @@ export { default as DhTagTeamRoll } from './tagTeamRoll.mjs';
 export { default as DhRollTable } from './rollTable.mjs';
 export { default as RegisteredTriggers } from './registeredTriggers.mjs';
 export { default as CompendiumBrowserSettings } from './compendiumBrowserSettings.mjs';
+export { default as SpotlighTracker } from './spotlightTracker.mjs';
 
 export * as countdowns from './countdowns.mjs';
 export * as actions from './action/_module.mjs';

module/data/spotlightTracker.mjs

@@ -0,0 +1,9 @@
+export default class SpotlightTracker extends foundry.abstract.DataModel {
+    static defineSchema() {
+        const fields = foundry.data.fields;
+
+        return {
+            spotlightedTokens: new fields.SetField(new fields.DocumentUUIDField())
+        };
+    }
+}

module/macros/spotlightCombatant.mjs

@@ -5,17 +5,33 @@
  * 2) HoveredCombatant
  */
 const spotlightCombatant = () => {
-    if (!game.combat)
+    const selectedTokens = canvas.tokens.controlled.length > 0 ? canvas.tokens.controlled : [];
-        return ui.notifications.error(game.i18n.localize('DAGGERHEART.MACROS.Spotlight.errors.noActiveCombat'));
+    const hoveredTokens = game.canvas.tokens.hover ? [game.canvas.tokens.hover] : [];
 
-    const selectedCombatant = canvas.tokens.controlled.length > 0 ? canvas.tokens.controlled[0].combatant : null;
+    const tokens = selectedTokens.length ? selectedTokens : hoveredTokens;
-    const hoveredCombatant = game.canvas.tokens.hover?.combatant;
+    if (!tokens.length)
-
-    const combatant = selectedCombatant ?? hoveredCombatant;
-    if (!combatant)
         return ui.notifications.error(game.i18n.localize('DAGGERHEART.MACROS.Spotlight.errors.noCombatantSelected'));
 
-    ui.combat.setCombatantSpotlight(combatant.id);
+    const spotlightTracker = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.SpotlightTracker);
+    spotlightTracker.updateSource();
+
+    for (const token of tokens) {
+        if (game.combat && token.combatant) {
+            ui.combat.setCombatantSpotlight(token.combatant.id);
+        } else {
+            const isSpotlighted = spotlightTracker.spotlightedTokens.has(token.document.uuid);
+            spotlightTracker.updateSource({
+                spotlightedTokens: isSpotlighted
+                    ? [...spotlightTracker.spotlightedTokens].filter(x => x !== token.document.uuid)
+                    : [...spotlightTracker.spotlightedTokens, token.document.uuid]
+            });
+        }
+    }
+
+    game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.SpotlightTracker, spotlightTracker);
+    for (const token of tokens) {
+        token.renderFlags.set({ refreshTurnMarker: true });
+    }
 };
 
 export default spotlightCombatant;

module/systemRegistration/settings.mjs

@@ -16,6 +16,7 @@ import {
     DhVariantRuleSettings
 } from '../applications/settings/_module.mjs';
 import { CompendiumBrowserSettings, DhTagTeamRoll } from '../data/_module.mjs';
+import SpotlightTracker from '../data/spotlightTracker.mjs';
 
 export const registerDHSettings = () => {
     registerKeyBindings();
@@ -183,4 +184,10 @@ const registerNonConfigSettings = () => {
         config: false,
         type: CompendiumBrowserSettings
     });
+
+    game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.SpotlightTracker, {
+        scope: 'world',
+        config: false,
+        type: SpotlightTracker
+    });
 };