Fix overlayEffect deprecation warning

Fix #250
mclemente · Jul 10, 2024 · c358935 · c358935
1 parent 4a9820c
commit c358935
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 22 deletions.
diff --git a/src/module/logic.js b/src/module/logic.js
@@ -460,10 +460,8 @@ export class HealthEstimate {
 	tokenEffectsPath(token) {
 		const deadIcon = this.estimationProvider.deathMarker.config
 			? this.deathMarker
-			: CONFIG.statusEffects.find((x) => x.id === "dead")?.icon ?? this.deathMarker;
-		return Array.from(token.actor.effects.values()).some((x) => x.icon === deadIcon)
-			|| token.document.overlayEffect === deadIcon
-			|| token.document.overlayEffect === "icons/svg/skull.svg";
+			: 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/D35E.js b/src/module/providers/D35E.js
@@ -49,12 +49,6 @@ export default class D35EEstimationProvider extends EstimationProvider {
 		return (hp.value - addNonlethal + addTemp) / hp.max;
 	}
 
-	tokenEffects(token) {
-		const deadIcons = CONFIG.statusEffects.filter((x) => x.id === "dead").map((x) => x.icon);
-		return Array.from(token.actor.effects.values()).some((x) => deadIcons.includes(x.icon))
-			|| deadIcons.includes(token.document.overlayEffect);
-	}
-
 	get settings() {
 		return {
 			"PF1.addNonlethal": {

diff --git a/src/module/providers/dsa5.js b/src/module/providers/dsa5.js
@@ -5,8 +5,4 @@ export default class dsa5EstimationProvider extends EstimationProvider {
 		let hp = token.actor.system.status.wounds;
 		return hp.value / hp.max;
 	}
-
-	tokenEffects(token) {
-		return token.document.overlayEffect === game.healthEstimate.deathMarker;
-	}
 }
diff --git a/src/module/providers/dungeonworld.js b/src/module/providers/dungeonworld.js
@@ -14,8 +14,4 @@ export default class dungeonworldEstimationProvider extends EstimationProvider {
 	get breakCondition() {
 		return "|| (game.settings.get('healthEstimate', 'core.breakOnZeroMaxHP') && token.actor.system.attributes.hp.max === 0)";
 	}
-
-	tokenEffects(token) {
-		return token.document.overlayEffect === game.healthEstimate.deathMarker;
-	}
 }
diff --git a/src/module/providers/pf2e.js b/src/module/providers/pf2e.js
@@ -68,8 +68,4 @@ export default class pf2eEstimationProvider extends EstimationProvider {
         || token.actor.type === 'party'
         || (game.settings.get('healthEstimate', 'core.breakOnZeroMaxHP') && token.actor.system.attributes.hp.max === 0)`;
 	}
-
-	tokenEffects(token) {
-		return token.document.overlayEffect === game.healthEstimate.deathMarker;
-	}
 }