Fixed token vision not updating

Author: HadaIonut

gulpfile.js

@@ -121,7 +121,7 @@ gulp.task('link', () => {
 gulp.task('build', gulp.series(
     'move-non-convertible-files',
     'compile-and-copy-ts',
-    'compile-minify-and-copy-sass'
+    //'compile-minify-and-copy-sass'
 ));
 
 gulp.task('build-watch', () => {
@@ -131,5 +131,5 @@ gulp.task('build-watch', () => {
         '!./src/styles/**/*.scss'
     ], gulp.series('move-non-convertible-files'));
     gulp.watch('./src/scripts/**/*.ts', gulp.series('compile-and-copy-ts'));
-    gulp.watch('./src/styles/**/*.scss', gulp.series('compile-minify-and-copy-sass'));
+    //gulp.watch('./src/styles/**/*.scss', gulp.series('compile-minify-and-copy-sass'));
 });

src/module.json

@@ -2,8 +2,15 @@
   "name": "Foundry-MGL",
   "title": "Foundry Meters, Grams & Liters",
   "description": "An expandable module that allows for easy and quick conversion of any data in the imperial system to the metric system.",
-  "author": ["HadaIonut"],
-  "version": "1.0.1",
+  "author": "HadaIonut",
+  "authors": [
+    {
+      "name": "HadaIonut",
+      "discord": "assassinduke#0983",
+      "url": "https://github.com/HadaIonut"
+    }
+  ],
+  "version": "1.1.0",
   "esmodules": ["scripts/foundry-mgl.js"],
   "styles": ["styles/foundry-mgl.css"],
   "languages":
@@ -16,7 +23,7 @@
   "minimumCoreVersion": "0.6.5",
   "compatibleCoreVersion": "0.7.7",
   "url": "https://github.com/HadaIonut/Foundry-mgl",
-  "manifest": "https://github.com/HadaIonut/Foundry-mgl/releases/download/v1.0.1/module.json",
-  "download": "https://github.com/HadaIonut/Foundry-mgl/releases/download/v1.0.1/module.zip",
+  "manifest": "https://github.com/HadaIonut/Foundry-mgl/releases/download/v1.1.0/module.json",
+  "download": "https://github.com/HadaIonut/Foundry-mgl/releases/download/v1.1.0/module.zip",
   "changelog": ""
 }

src/scripts/Dnd5e/BatchConversion.ts

@@ -1,5 +1,5 @@
 import {
-    actorDataConverter,
+    actorDataConverter, actorTokenConverter,
     convertDistance, convertStringFromImperialToMetric,
     convertText,
     convertValueToMetric,
@@ -38,14 +38,20 @@ const itemsUpdater = (items: any[]): void => {
 const actorUpdater = (actor: any, loading): void => {
     const actorClone = JSON.parse(JSON.stringify(actor));
 
-    actorClone.data = actorDataConverter(actorClone.data);
+    if (!actor.getFlag("Foundry-MGL", "converted")) {
+        actorClone.data = actorDataConverter(actorClone.data);
+        actorClone.token = actorTokenConverter(actorClone.token);
+    }
 
-    actor.update(actorClone)
+    actor.setFlag("Foundry-MGL", "converted", true)
         .then(() => {
-            itemsUpdater(actor.items.entries);
-            loading();
+            actor.update(actorClone)
+                .then(() => {
+                    itemsUpdater(actor.items.entries);
+                    loading();
+                })
+                .catch((e) => createErrorMessage(e, 'actor.update', actorClone.data))
         })
-        .catch((e) => createErrorMessage(e, 'actor.update', actorClone.data))
 }
 
 const journalUpdater = (journal: any, loading): void => {

src/scripts/Dnd5e/Compendium5eConverter.ts

@@ -1,5 +1,5 @@
 import {
-    actorDataConverter,
+    actorDataConverter, actorTokenConverter,
     convertDistance,
     convertStringFromImperialToMetric,
     convertText,
@@ -26,6 +26,7 @@ const itemsUpdater = (items: any[], onlyLabel?: boolean, onlyUnit?:boolean): any
 
 const actorUpdater = (actor: any, onlyLabel?: boolean, onlyUnit?:boolean): any => {
     actor.data = actorDataConverter(actor.data);
+    actor.token = actorTokenConverter(actor.token);
     actor.items = itemsUpdater(actor.items, onlyLabel, onlyUnit);
     return actor;
 }

src/scripts/Dnd5e/Dnd5eConverterNew.ts

@@ -1,5 +1,5 @@
 import {
-    actorDataConverter, convertDistance,
+    actorDataConverter, actorTokenConverter, convertDistance,
     convertStringFromImperialToMetric, convertText,
     convertValueToMetric, labelConverter,
 } from "../Utils/ConversionEngineNew";
@@ -39,10 +39,14 @@ const itemsUpdater = async (items: Array<any>, onlyLabel?: boolean, onlyUnit?:bo
 const actorUpdater = async (actor: any, onlyLabel?: boolean, onlyUnit?:boolean): Promise<void> => {
     const actorClone = JSON.parse(JSON.stringify(actor));
 
-    actorClone.data = actorDataConverter(actorClone.data);
+    if (!actor.getFlag("Foundry-MGL", "converted")) {
+        actorClone.data = actorDataConverter(actorClone.data);
+        actorClone.token = actorTokenConverter(actorClone.token);
+    }
 
     try {
         await actor.update(actorClone);
+        await actor.setFlag("Foundry-MGL", "converted", true);
     } catch (e) {
         createErrorMessage(e, 'actor.update', actorClone.data);
     }

src/scripts/MetricModule.ts

@@ -65,22 +65,22 @@ class MetricModule {
         //             break;
         //     }
         // })
-        let unitFix = $(`<a class="popout" style><i class="fas fa-ruler"></i>Unit fix</a>`);
-        unitFix.on('click', ()=> {
-            switch (type) {
-                case 'actor':
-                    actorUpdater(actor, true, true);
-                    break;
-                case 'item':
-                    itemUpdater(actor, true, true);
-                    break;
-                case 'compendium':
-                    compendiumUpdater(actor, true, true);
-                    break;
-            }
-        })
+        // let unitFix = $(`<a class="popout" style><i class="fas fa-ruler"></i>Unit fix</a>`);
+        // unitFix.on('click', ()=> {
+        //     switch (type) {
+        //         case 'actor':
+        //             actorUpdater(actor, true, true);
+        //             break;
+        //         case 'item':
+        //             itemUpdater(actor, true, true);
+        //             break;
+        //         case 'compendium':
+        //             compendiumUpdater(actor, true, true);
+        //             break;
+        //     }
+        // })
         element.after(button);
-        element.after(unitFix);
+        //element.after(unitFix);
         //element.after(labelButton);
     }
 

src/scripts/Utils/ConversionEngineNew.ts

@@ -171,6 +171,14 @@ const actorDataConverter = (data: any): any => {
     return data;
 }
 
+const actorTokenConverter = (token: any) => {
+    token.brightLight = convertValueToMetric(token.brightLight, 'feet');
+    token.brightSight = convertValueToMetric(token.brightSight, 'feet');
+    token.dimLight = convertValueToMetric(token.dimLight, 'feet');
+    token.dimSight = convertValueToMetric(token.dimSight, 'feet');
+    return token;
+}
+
 const labelConverter = (label: string): string => {
     return label.replace(/(([0-9]+) \/ )?([0-9]+) ([\w]+)/, (_0, _1, optionalValue, mainValue, unit) => {
         if (optionalValue)
@@ -215,6 +223,7 @@ export {
     imperialReplacer,
     convertText,
     actorDataConverter,
+    actorTokenConverter,
     convertDistance,
     labelConverter,
     relinkText