Compare commits

..

2 commits

Author SHA1 Message Date
WBHarry
20cf7dadcf . 2026-05-10 21:49:34 +02:00
WBHarry
63b986f6e4 Removed neutral split 2026-05-10 21:41:00 +02:00
3 changed files with 3 additions and 10 deletions

View file

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

View file

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

View file

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