diff --git a/lang/en.json b/lang/en.json index e40b035c..38a498fe 100755 --- a/lang/en.json +++ b/lang/en.json @@ -1884,6 +1884,10 @@ } } }, + "SpotlightRequests": { + "singular": "Spotlight Request", + "plural": "Spotlight Requests" + }, "Tabs": { "details": "Details", "attack": "Attack", diff --git a/module/applications/ui/combatTracker.mjs b/module/applications/ui/combatTracker.mjs index 258b8898..101e20d6 100644 --- a/module/applications/ui/combatTracker.mjs +++ b/module/applications/ui/combatTracker.mjs @@ -36,7 +36,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C const adversaries = context.turns?.filter(x => x.isNPC) ?? []; const characters = context.turns?.filter(x => !x.isNPC) ?? []; - const sortedCharacters = characters + const spotlightRequests = characters ?.filter(x => !x.isNPC) .filter(x => x.system.spotlight.requestOrderIndex > 0) .sort((a, b) => { @@ -44,13 +44,13 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C const valueB = b.system.spotlight.requestOrderIndex; return valueA - valueB; - }) - .concat(characters?.filter(x => !x.isNPC).filter(x => x.system.spotlight.requestOrderIndex == 0)); + }); Object.assign(context, { actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens, adversaries, - characters: sortedCharacters + characters: characters?.filter(x => !x.isNPC).filter(x => x.system.spotlight.requestOrderIndex == 0), + spotlightRequests }); } diff --git a/templates/ui/combatTracker/combatTracker.hbs b/templates/ui/combatTracker/combatTracker.hbs index 8ad4f7d5..91f7786b 100644 --- a/templates/ui/combatTracker/combatTracker.hbs +++ b/templates/ui/combatTracker/combatTracker.hbs @@ -1,4 +1,7 @@