From 71238935d6fb5dae3d6bcb34b1c5b2fe46e33f3f Mon Sep 17 00:00:00 2001
From: Chris Ryan <chrisr@blackhole>
Date: Wed, 20 Aug 2025 21:57:15 +1000
Subject: [PATCH] Use the flags setting

---
 .../applications/scene/sceneConfigSettings.mjs | 18 ------------------
 module/canvas/placeables/measuredTemplate.mjs  |  8 +++++---
 module/data/_module.mjs                        |  3 +++
 module/data/scene/SceneConfig.mjs              | 15 ---------------
 module/data/scene/_module.mjs                  |  1 -
 templates/scene/dh-config.hbs                  | 11 +++--------
 6 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 module/data/scene/SceneConfig.mjs
 delete mode 100644 module/data/scene/_module.mjs

diff --git a/module/applications/scene/sceneConfigSettings.mjs b/module/applications/scene/sceneConfigSettings.mjs
index 1ec2ef43..145d89fa 100644
--- a/module/applications/scene/sceneConfigSettings.mjs
+++ b/module/applications/scene/sceneConfigSettings.mjs
@@ -3,8 +3,6 @@ import DhSceneConfig from '../../data/scene/SceneConfig.mjs';
 export default class DhSceneConfigSettings extends foundry.applications.sheets.SceneConfig {
   constructor(options, ...args) {
     super(options, ...args);
-    // this.settings = new DhSceneConfig();
-    // this.rangeMeasurementSettingsOverrideField = this.settings.initial;
   }
 
   /** @override */
@@ -41,20 +39,4 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S
     }
   };
 
-  /** @inheritDoc */
-  async _preparePartContext(partId, context, options) {
-    console.log("_preparePartContext", partId, context, options);
-    context = await super._preparePartContext(partId, context, options);
-    switch (partId) {
-      case "dh":
-        // context.settings = this.settings;
-        // context.rangeMeasurementSettingsOverrideField = this.rangeMeasurementSettingsOverrideField;
-        break;
-      default:
-        context = await super._preparePartContext(partId, context, options);
-    }
-    if (partId in context.tabs) context.tab = context.tabs[partId];
-    return context;
-  }
-
 }
\ No newline at end of file
diff --git a/module/canvas/placeables/measuredTemplate.mjs b/module/canvas/placeables/measuredTemplate.mjs
index 1ac1ce23..f57c1892 100644
--- a/module/canvas/placeables/measuredTemplate.mjs
+++ b/module/canvas/placeables/measuredTemplate.mjs
@@ -11,14 +11,16 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
             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) : '' ;
+                this.ruler.text = result.distance + result.units ? (' ' + result.units) : '';
             }
         }
     }
 
     static getRangeLabels(distance, settings) {
-        let result = { distance : '', units: null }
-        if (canvas.scene?.rangeMeasurementSettingsOverride === true) {
+        let result = { distance: '', units: null }
+        const rangeMeasurementOverride = canvas.scene.flags.daggerheart?.rangeMeasurementOverride;
+
+        if (rangeMeasurementOverride === true) {
             result.distance = distance;
             result.units = canvas.scene?.grid?.units;
             return result
diff --git a/module/data/_module.mjs b/module/data/_module.mjs
index cac02a4a..a128e13f 100644
--- a/module/data/_module.mjs
+++ b/module/data/_module.mjs
@@ -7,3 +7,6 @@ export * as actors from './actor/_module.mjs';
 export * as chatMessages from './chat-message/_modules.mjs';
 export * as fields from './fields/_module.mjs';
 export * as items from './item/_module.mjs';
+
+export * as scene from './scene/_module.mjs';
+
diff --git a/module/data/scene/SceneConfig.mjs b/module/data/scene/SceneConfig.mjs
deleted file mode 100644
index 5cf4cc95..00000000
--- a/module/data/scene/SceneConfig.mjs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-export default class DhSceneConfig extends foundry.abstract.DataModel {
-    static defineSchema() {
-        const fields = foundry.data.fields;
-
-        return {
-            ...super.defineSchema(),
-            rangeMeasurementSettingsOverrideField: new fields.BooleanField({
-                initial: false,
-                label: "Override Global Range Measurement Settings"
-            })
-        }
-    }
-}
\ No newline at end of file
diff --git a/module/data/scene/_module.mjs b/module/data/scene/_module.mjs
deleted file mode 100644
index 27cbfaff..00000000
--- a/module/data/scene/_module.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { default as DhSceneConfig } from './SceneConfig.mjs';
diff --git a/templates/scene/dh-config.hbs b/templates/scene/dh-config.hbs
index a9a15fb4..63590d3b 100644
--- a/templates/scene/dh-config.hbs
+++ b/templates/scene/dh-config.hbs
@@ -1,14 +1,9 @@
 <div class="tab{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
     <div class="form-group">
         <div class="form-fields">
-            <label>
-                <div class="form-group">
-                    <div class="form-fields">
-                        <label>{{localize "Override Global Range Measurement Settings"}}</label>
-                        <input type="checkbox" name="flags.daggerheart.rangeMeasurementOverride" {{checked document.flags.daggerheart.rangeMeasurementOverride}} />
-                    </div>
-                </div>
-            </label>
+            <label>{{localize "Override Global Range Measurement Settings"}}</label>
+            <input type="checkbox" name="flags.daggerheart.rangeMeasurementOverride" {{checked
+                document.flags.daggerheart.rangeMeasurementOverride}} />
         </div>
     </div>
 </div>
\ No newline at end of file