cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-15 05:01:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes some measurement issues with templates (#1065)

Browse source 
Co-authored-by: Chris Ryan <chrisr@blackhole>
This commit is contained in:
Chris Ryan 2025-08-23 21:24:28 +10:00 • committed by GitHub
parent d5f7e17339
commit 471cbd55df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
module/canvas/placeables/measuredTemplate.mjs
View file

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