lang/en.json

@@ -409,7 +409,7 @@
                 "openCountdowns": "Countdowns",
                 "adversaryCategories": {
                     "friendly": "Friendly",
-                    "adversaries": "Adversaries"
+                    "neutral": "Neutral"
                 }
             },
             "CompendiumBrowserSettings": {

module/applications/ui/combatTracker.mjs

@@ -57,8 +57,11 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         await super._prepareTrackerContext(context, options);
 
         const npcs = context.turns?.filter(x => x.isNPC) ?? [];
-        const adversaries = npcs.filter(x => x.disposition !== CONST.TOKEN_DISPOSITIONS.FRIENDLY);
+        const adversaries = npcs.filter(x => x.disposition === CONST.TOKEN_DISPOSITIONS.HOSTILE);
         const friendlies = npcs.filter(x => x.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY);
+        const neutrals = npcs.filter(x =>
+            [CONST.TOKEN_DISPOSITIONS.SECRET, CONST.TOKEN_DISPOSITIONS.NEUTRAL].includes(x.disposition)
+        );
         const characters = context.turns?.filter(x => !x.isNPC) ?? [];
         const spotlightQueueEnabled = game.settings.get(
             CONFIG.DH.id,
@@ -78,6 +81,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
             actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens,
             adversaries,
             friendlies,
+            neutrals,
             allCharacters: characters,
             characters: characters.filter(x => !spotlightQueueEnabled || x.system.spotlight.requestOrderIndex == 0),
             spotlightRequests

templates/ui/combatTracker/combatTracker.hbs

@@ -8,7 +8,10 @@
     {{#if (gt this.friendlies.length 0)}}
         {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.friendly") turns=this.friendlies}}
     {{/if}}
+    {{#if (gt this.neutrals.length 0)}}
+        {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.neutral") turns=this.neutrals}}
+    {{/if}}
     {{#if (gt this.adversaries.length 0)}}
-        {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.adversaries") turns=this.adversaries}}
+        {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Adversary.plural") turns=this.adversaries}}
     {{/if}}
 </div>