diff --git a/src/module/logic.js b/src/module/logic.js index 0ac6280..7f78732 100644 --- a/src/module/logic.js +++ b/src/module/logic.js @@ -465,7 +465,7 @@ export class HealthEstimate { tokenEffectsPath(token) { const deadIcon = this.estimationProvider.deathMarker.config ? this.deathMarker - : CONFIG.statusEffects.find((x) => x.id === "dead")?.img ?? this.deathMarker; + : (Array.isArray(CONFIG.statusEffects) ? CONFIG.statusEffects : Object.values(CONFIG.statusEffects)).find((x) => x.id === "dead")?.img ?? this.deathMarker; return Array.from(token.actor.effects.values()).some((x) => x.img === deadIcon); } diff --git a/src/module/providers/swade.js b/src/module/providers/swade.js index 0a813ac..da0d611 100644 --- a/src/module/providers/swade.js +++ b/src/module/providers/swade.js @@ -58,7 +58,7 @@ export default class swadeEstimationProvider extends EstimationProvider { } tokenEffects(token) { - const incapIcon = CONFIG.statusEffects.find((effect) => effect.id === "incapacitated").img; + const incapIcon = (Array.isArray(CONFIG.statusEffects) ? CONFIG.statusEffects : Object.values(CONFIG.statusEffects)).find((effect) => effect.id === "incapacitated").img; return !!token.actor.effects.find((e) => e.img === incapIcon); } diff --git a/src/module/providers/templates/Base.js b/src/module/providers/templates/Base.js index 8e1f531..c9586cf 100644 --- a/src/module/providers/templates/Base.js +++ b/src/module/providers/templates/Base.js @@ -33,11 +33,11 @@ export default class EstimationProvider { this.deathMarker = { /** Sets if the setting will be visible in the module's settings */ config: - !CONFIG.statusEffects.find((x) => x.id === "dead") + !(Array.isArray(CONFIG.statusEffects) ? CONFIG.statusEffects : Object.values(CONFIG.statusEffects)).find((x) => x.id === "dead") || game.modules.get("combat-utility-belt")?.active || game.modules.get("condition-lab-triggler")?.active, /** Sets the setting's default value */ - default: CONFIG.statusEffects.find((x) => x.id === "dead")?.img || "icons/svg/skull.svg", + default: (Array.isArray(CONFIG.statusEffects) ? CONFIG.statusEffects : Object.values(CONFIG.statusEffects)).find((x) => x.id === "dead")?.img || "icons/svg/skull.svg", }; /**