Fix broken TemplateEnricher - CONFIG.MeasuredTemplate.types has been … (#1246)

* Fix broken TemplateEnricher - CONFIG.MeasuredTemplate.types has been deprecated and the error was breaking the code

* Fix for shortHand of ranges

---------

Co-authored-by: Chris Ryan <chrisr@blackhole>
Co-authored-by: WBHarry <williambjrklund@gmail.com>
This commit is contained in:
Chris Ryan 2025-11-09 05:28:49 +10:00 committed by GitHub
parent a7d035bcdb
commit a7bc8db55f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -5,20 +5,22 @@ export default function DhTemplateEnricher(match, _options) {
const { type, angle = CONFIG.MeasuredTemplate.defaults.angle, inline = false } = params; const { type, angle = CONFIG.MeasuredTemplate.defaults.angle, inline = false } = params;
const direction = Number(params.direction) || 0; const direction = Number(params.direction) || 0;
const range = const range =
params.range && Number.isNaN(params.range) params.range && Number.isNaN(Number(params.range))
? Object.values(CONFIG.DH.GENERAL.templateRanges).find( ? Object.values(CONFIG.DH.GENERAL.templateRanges).find(
x => x.id.toLowerCase() === split[1] || x.short === split[1] x => x.id.toLowerCase() === params.range || x.short === params.range
)?.id )?.id
: params.range; : params.range;
if (!(type in CONFIG.MeasuredTemplate.types) || !range) return match[0];
if (!Object.values(CONFIG.DH.GENERAL.templateTypes).find(x => x === type) || !range) return match[0];
const label = game.i18n.localize(`DAGGERHEART.CONFIG.TemplateTypes.${type}`); const label = game.i18n.localize(`DAGGERHEART.CONFIG.TemplateTypes.${type}`);
const rangeDisplay = Number.isNaN(Number(range)) ? game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.name`) : range; const rangeDisplay = Number.isNaN(Number(range))
? game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.name`)
: range;
let angleDisplay = ''; let angleDisplay = '';
if (angle != CONFIG.MeasuredTemplate.defaults.angle) { if (angle != CONFIG.MeasuredTemplate.defaults.angle) {
angleDisplay = 'angle:' + angle; angleDisplay = 'angle:' + angle;
} }
let directionDisplay = ''; let directionDisplay = '';
if (direction != 0) { if (direction != 0) {
@ -64,8 +66,9 @@ export const renderMeasuredTemplate = async event => {
let baseDistance = range; let baseDistance = range;
if (Number.isNaN(Number(range))) { if (Number.isNaN(Number(range))) {
baseDistance = baseDistance = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement[
game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement[range]; range
];
} }
const distance = type === CONFIG.DH.GENERAL.templateTypes.EMANATION ? baseDistance + 2.5 : baseDistance; const distance = type === CONFIG.DH.GENERAL.templateTypes.EMANATION ? baseDistance + 2.5 : baseDistance;