cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-22 07:23:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Moved the flag vs global setting logic to documents/scene

Browse source
This commit is contained in:
WBHarry 2026-04-05 21:46:53 +02:00
parent a4a5d18098
commit 541052b013
3 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
module/data/fields/action/damageField.mjs
View file

@ -234,13 +234,8 @@ export default class DamageField extends fields.SchemaField {
if (!canvas.scene) return []; if (!canvas.scene) return [];
const targets = Array.from(game.user.targets); const targets = Array.from(game.user.targets);
const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting; const rangeSettings = canvas.scene?.rangeSettings;
const sceneMeasurements = canvas.scene?.flags.daggerheart?.rangeMeasurement; if (!rangeSettings) return [];
const globalMeasurements = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.variantRules
).rangeMeasurement;
const rangeSettings = sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
const maxDistance = rangeSettings[range]; const maxDistance = rangeSettings[range];
return canvas.scene.tokens.filter(x => { return canvas.scene.tokens.filter(x => {

10
module/documents/scene.mjs
View file

@ -1,6 +1,16 @@
import DHToken from './token.mjs'; import DHToken from './token.mjs';
export default class DhScene extends Scene { export default class DhScene extends Scene {
get rangeSettings() {
const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
const sceneMeasurements = this.flags.daggerheart?.rangeMeasurement;
const globalMeasurements = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.variantRules
).rangeMeasurement;
return sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
}
/** A map of `TokenDocument` IDs embedded in this scene long with new dimensions from actor size-category changes */ /** A map of `TokenDocument` IDs embedded in this scene long with new dimensions from actor size-category changes */
#sizeSyncBatch = new Map(); #sizeSyncBatch = new Map();

11
module/enrichers/TemplateEnricher.mjs
View file

@ -118,13 +118,6 @@ const getTemplateDistance = range => {
const rangeNumber = Number(range); const rangeNumber = Number(range);
if (!Number.isNaN(rangeNumber)) return rangeNumber; if (!Number.isNaN(rangeNumber)) return rangeNumber;
const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting; const settings = canvas.scene?.rangeSettings;
const sceneMeasurements = canvas.scene?.flags.daggerheart?.rangeMeasurement; return settings ? settings[range] : 0;
const globalMeasurements = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.variantRules
).rangeMeasurement;
const settings = sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
return settings[range];
}; };