Skip to content

5.6.8 #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ClipplerBlood merged 1 commit into from
Apr 25, 2026
+3 −3
Merged

5.6.8 #314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/module/combat/combat-tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,14 +245,14 @@ calculateEncounterDifficulty(combatants) {
else
trackerHeader.innerHTML = trackerHeader.innerHTML + `<div class="encounter-controls combat"><class="encounter-difficulty">&nbsp;</div>`
}

html.querySelectorAll('.combatant')?.forEach(el => {
// For each combatant in the tracker, change the initiative selector
const combId = el.getAttribute('data-combatant-id')
const combatant = combatants.get(combId)
if (!combatant) return

if (this.initiativeMethod === 's' && !game.modules.get('lancer-initiative').active) {
if (this.initiativeMethod === 's' && !game.modules.get('lancer-initiative')?.active) {
const multipleCombatants = game.combat.getCombatantsByToken(combatant.token)
const title = (game.user.isGM || combatant.actor.isOwner) && game.combat?.turn === null ? i18n('DL.TurnChangeTurn') : ''
const style = (game.user.isGM || combatant.actor.isOwner) && game.combat?.turn === null ? 'font-weight: bold; cursor: pointer;' : 'font-weight: normal; cursor: auto; opacity: 0.5;'
Expand All @@ -275,7 +275,7 @@ calculateEncounterDifficulty(combatants) {
}
}

if (this.initiativeMethod === 'h' && game.user.isGM && !game.modules.get('lancer-initiative').active)
if (this.initiativeMethod === 'h' && game.user.isGM && !game.modules.get('lancer-initiative')?.active)
{
let groupID = combatant.flags?.demonlord?.group
switch (groupID) {
Expand Down
Loading