#137

- #137: Fix error when no config data.
Larkinabout · Nov 15, 2024 · c72a95c · c72a95c
1 parent e0ad253
commit c72a95c
Show file tree

Hide file tree

Showing 20 changed files with 142 additions and 140 deletions.
diff --git a/scripts/activation-costs.js b/scripts/activation-costs.js
@@ -54,6 +54,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -66,13 +73,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/actor-sizes.js b/scripts/actor-sizes.js
@@ -52,6 +52,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -67,13 +74,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/armor-calculations.js b/scripts/armor-calculations.js
@@ -53,6 +53,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -64,13 +71,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/armor-ids.js b/scripts/armor-ids.js
@@ -45,6 +45,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -53,13 +60,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/armor-types.js b/scripts/armor-types.js
@@ -45,6 +45,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -53,13 +60,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/consumable-types.js b/scripts/consumable-types.js
@@ -45,6 +45,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -55,13 +62,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/currency.js b/scripts/currency.js
@@ -84,6 +84,13 @@ function registerHooks () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -97,13 +104,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/damage-types.js b/scripts/damage-types.js
@@ -52,6 +52,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -66,13 +73,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/feature-types.js b/scripts/feature-types.js
@@ -45,6 +45,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -55,13 +62,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/item-action-types.js b/scripts/item-action-types.js
@@ -46,6 +46,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -54,13 +61,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/item-activation-cost-types.js b/scripts/item-activation-cost-types.js
@@ -46,6 +46,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -54,13 +61,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/item-properties.js b/scripts/item-properties.js
@@ -87,6 +87,13 @@ function getSettingDefault () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E.itemProperties)) {
+            resetDnd5eConfig('itemProperties')
+        }
+        return
+    }
+
     const buildConfig = (data) => Object.fromEntries(
         Object.entries(data)
             .filter(([_, value]) => value.visible || value.visible === undefined)
@@ -125,13 +132,6 @@ export function setConfig (data = null) {
         ? foundry.utils.deepClone(CONFIG.CUSTOM_DND5E.validProperties)
         : validProperties
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E.itemProperties)) {
-            resetDnd5eConfig('itemProperties')
-        }
-        return
-    }
-
     const config = buildConfig(data)
     config && (CONFIG.DND5E.itemProperties = config)
 }
diff --git a/scripts/item-rarity.js b/scripts/item-rarity.js
@@ -51,6 +51,13 @@ function registerHooks () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -59,13 +66,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)

diff --git a/scripts/languages.js b/scripts/languages.js
@@ -44,6 +44,13 @@ function registerSettings () {
  * @param {object} data
  */
 export function setConfig (data = null) {
+    if (checkEmpty(data)) {
+        if (checkEmpty(CONFIG.DND5E[property])) {
+            resetDnd5eConfig(property)
+        }
+        return
+    }
+
     const buildConfig = (keys, data) => Object.fromEntries(
         keys.filter((key) => data[key].visible || data[key].visible === undefined)
             .map((key) => [
@@ -54,13 +61,6 @@ export function setConfig (data = null) {
             ])
     )
 
-    if (checkEmpty(data)) {
-        if (checkEmpty(CONFIG.DND5E[property])) {
-            resetDnd5eConfig(property)
-        }
-        return
-    }
-
     const defaultConfig = foundry.utils.deepClone(CONFIG.CUSTOM_DND5E[property])
     const config = buildConfig(Object.keys(data), foundry.utils.mergeObject(defaultConfig, data))
     config && (CONFIG.DND5E[property] = config)