Merge pull request #49 from kandashi/0.8.5

0.8.5
kandashi · May 24, 2021 · a805397 · a805397
2 parents 1a7e19f + ad9942d
commit a805397
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/module.json b/module.json
@@ -5,7 +5,7 @@
 	"author": "Kandashi",
 	"version": "0.2.12",
 	"minimumCoreVersion": "0.8.3",
-	"compatibleCoreVersion": "0.8.3",
+	"compatibleCoreVersion": "0.8.5",
 
 	"scripts": [
 		"src/activeLighting.js"

diff --git a/src/activeLighting.js b/src/activeLighting.js
@@ -1,4 +1,3 @@
-
 class ATL {
 
     static init() {
@@ -459,7 +458,7 @@ class ATL {
                 }
             }
             else {
-                let preValue = overrides[updateKey] ? overrides[updateKey] : originals[updateKey] || null;
+                let preValue = (overrides[updateKey] ? overrides[updateKey] : originals[updateKey]) ?? null;
                 let result = ATL.apply(entity, change, originals, preValue);
                 if (result !== null) {
                     let resultTmp;
@@ -570,13 +569,14 @@ class ATL {
     static applyOverride(token, change, originals, current) {
         let { key, value, mode } = change;
         key = key.slice(4)
-        //const current = typeof getProperty(originals, key) === "number" ? getProperty(originals, key) : getProperty(token.data, key) || null;
+        // current = typeof getProperty(originals, key) === "number" ? getProperty(originals, key) : getProperty(token.data, key) || null;
         if (mode === CONST.ACTIVE_EFFECT_MODES.UPGRADE) {
             if ((typeof (current) === "number") && (current >= Number(value))) return null;
         }
         if (mode === CONST.ACTIVE_EFFECT_MODES.DOWNGRADE) {
             if ((typeof (current) === "number") && (current < Number(value))) return null;
         }
+        if (typeof current === "number") return Number(value);
         return value;
     }
 }