From e11b9bbeaaf4e929fe361ceee2439e41c7edd6c5 Mon Sep 17 00:00:00 2001
From: nsalyzyn <nsalyzyn@gmail.com>
Date: Tue, 16 Dec 2025 18:53:42 -0700
Subject: [PATCH] Include item effects when applying rangeDependence

---
 daggerheart.mjs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/daggerheart.mjs b/daggerheart.mjs
index 644d6d86..86bdcb02 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -252,7 +252,8 @@ Hooks.on('moveToken', async (movedToken, data) => {
     const effectsAutomation = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).effects;
     if (!effectsAutomation.rangeDependent) return;
 
-    const rangeDependantEffects = movedToken.actor.effects.filter(effect => effect.system.rangeDependence?.enabled);
+    const allEffects = [...movedToken.actor.allApplicableEffects()];
+    const rangeDependantEffects = allEffects.filter(effect => effect.system.rangeDependence?.enabled);
 
     const updateEffects = async (disposition, token, effects, effectUpdates) => {
         const rangeMeasurement = game.settings.get(
@@ -287,7 +288,8 @@ Hooks.on('moveToken', async (movedToken, data) => {
             await updateEffects(token.disposition, token, rangeDependantEffects, effectUpdates);
         }
 
-        if (token.actor) await updateEffects(movedToken.disposition, token, token.actor.effects, effectUpdates);
+        if (token.actor)
+            await updateEffects(movedToken.disposition, token, [...token.actor.allApplicableEffects()], effectUpdates);
     }
 
     for (let key in effectUpdates) {