diff --git a/module/canvas/placeables/measuredTemplate.mjs b/module/canvas/placeables/measuredTemplate.mjs index 49142685..83cddfe1 100644 --- a/module/canvas/placeables/measuredTemplate.mjs +++ b/module/canvas/placeables/measuredTemplate.mjs @@ -10,38 +10,38 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur const splitRulerText = this.ruler.text.split(' '); if (splitRulerText.length > 0) { const rulerValue = Number(splitRulerText[0]); - const result = this.constructor.getRangeLabels(rulerValue, rangeMeasurementSettings); - this.ruler.text = result.distance + result.units ? (' ' + result.units) : ''; + const result = DhMeasuredTemplate.getRangeLabels(rulerValue, rangeMeasurementSettings); + this.ruler.text = result.distance + (result.units ? (' ' + result.units) : ''); } } } - static getRangeLabels(distance, settings) { - let result = { distance: '', units: null } + static getRangeLabels(distanceValue, settings) { + let result = { distance: distanceValue, units: '' } const rangeMeasurementOverride = canvas.scene.flags.daggerheart?.rangeMeasurementOverride; if (rangeMeasurementOverride === true) { - result.distance = distance; + result.distance = distanceValue; result.units = canvas.scene?.grid?.units; return result } - if (distance <= settings.melee) { + if (distanceValue <= settings.melee) { result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.melee.name'); return result; } - if (distance <= settings.veryClose) { + if (distanceValue <= settings.veryClose) { result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryClose.name'); return result; } - if (distance <= settings.close) { + if (distanceValue <= settings.close) { result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.close.name'); return result; } - if (distance <= settings.far) { + if (distanceValue <= settings.far) { result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.far.name'); return result; } - if (distance > settings.far) { + if (distanceValue > settings.far) { result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryFar.name'); }