1.0.4 changes

ironmonk88 · Mar 10, 2021 · 5474d5b · 5474d5b
1 parent dc491c1
commit 5474d5b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 38 deletions.
diff --git a/classes/terrainlayer.js b/classes/terrainlayer.js
@@ -87,23 +87,23 @@ export class TerrainLayer extends PlaceablesLayer {
         if (canvas.scene.data.flags?.TerrainLayer) {
             for (let [k, v] of Object.entries(canvas.scene.data.flags?.TerrainLayer)) {
                 if (k.startsWith('terrain')) {
-                    if (k != 'terrainundefined')
+                    if (k != 'terrainundefined' && v != undefined && v.x != undefined && v.y != undefined)
                         canvas.scene.data.terrain.push(v);
                     else
-                        canvas.scene.unsetFlag('TerrainLayer', k);
+                        await canvas.scene.unsetFlag('TerrainLayer', k);
                 }
             };
+        }
 
-            //convert the old data
-            if (canvas.scene.data.flags?.TerrainLayer.costGrid) {
-                let grid = canvas.scene.getFlag('TerrainLayer', 'costGrid');
-                for (let x in grid) {
-                    for (let y in grid[x]) {
-                        this.createTerrain({ x: parseInt(x), x: parseInt(y), multiple: grid[x][y].multiple});
-                    }
+        //convert the old data
+        if (canvas.scene.data.flags?.TerrainLayer?.costGrid) {
+            let grid = canvas.scene.getFlag('TerrainLayer', 'costGrid');
+            for (let y in grid) {
+                for (let x in grid[y]) {
+                    this.createTerrain({ x: parseInt(x), y: parseInt(y), multiple: grid[y][x].multiple });
                 }
-                //canvas.scene.unsetFlag('TerrainLayer', 'costGrid');
             }
+            //canvas.scene.unsetFlag('TerrainLayer', 'costGrid');
         }
 
         const d = canvas.dimensions;
@@ -237,7 +237,10 @@ export class TerrainLayer extends PlaceablesLayer {
         super._onClickLeft(event);
         if (game.activeTool == 'addterrain') {
             let pos = event.data.getLocalPosition(canvas.app.stage);
-            this.createTerrain({ x: pos.x, y: pos.y });
+            let gridPt = canvas.grid.grid.getGridPositionFromPixels(pos.x, pos.y);
+            let [y, x] = gridPt;  //Normalize the returned data because it's in [y,x] format
+
+            this.createTerrain({ x: x, y: y });
             //make sure there isn't a terrain already there
             /*
             let pos = event.data.getLocalPosition(canvas.app.stage);
@@ -264,7 +267,10 @@ export class TerrainLayer extends PlaceablesLayer {
             return this._onDragSelect(event);
         else if (game.activeTool == 'addterrain') {
             let pos = event.data.getLocalPosition(canvas.app.stage);
-            this.createTerrain({ x: pos.x, y: pos.y });
+            let gridPt = canvas.grid.grid.getGridPositionFromPixels(pos.x, pos.y);
+            let [y, x] = gridPt;  //Normalize the returned data because it's in [y,x] format
+
+            this.createTerrain({ x: x, y: y });
             /*let pos = event.data.getLocalPosition(canvas.app.stage);
             let gridPt = canvas.grid.grid.getGridPositionFromPixels(pos.x, pos.y);
             let [y, x] = gridPt;  //Normalize the returned data because it's in [y,x] format
@@ -335,15 +341,7 @@ export class TerrainLayer extends PlaceablesLayer {
     }
 
     createTerrain(data, options = { }) {
-        let gridPt = canvas.grid.grid.getGridPositionFromPixels(data.x, data.y);
-        let [y, x] = gridPt;  //Normalize the returned data because it's in [y,x] format
-
-        if (!this.terrainExists(x, y)) {
-            //const terrain = new Terrain({ x: x, y: y });
-            //terrain.draw();
-            //this.constructor.placeableClass.create(terrain.data);
-            data.x = x;
-            data.y = y;
+        if (!this.terrainExists(data.x, data.y)) {
             data.multiple = data.multiple || this.defaultmultiple;
             this.constructor.placeableClass.create(data, options);
         }

diff --git a/js/controls.js b/js/controls.js
@@ -11,12 +11,12 @@ Hooks.on('getSceneControlButtons', (controls) => {
 		activeTool: 'addterrain',
 		tools: [
 			{
-				name: 'select',
+				name: game.i18n.localize('TerrainLayer.select'),
 				title: 'TerrainLayer.select',
 				icon: 'fas fa-expand'
 			},
 			{
-				name: 'addterrain',
+				name: game.i18n.localize('TerrainLayer.add'),
 				title: 'TerrainLayer.add',
 				icon: 'fas fa-marker'
 			},
@@ -35,7 +35,9 @@ Hooks.on('getSceneControlButtons', (controls) => {
 				title: game.i18n.localize('TerrainLayer.reset'),
 				icon: 'fas fa-trash',
 				visible: isGM,
-				onClick: () => canvas.terrain.deleteAll(),
+				onClick: () => {
+					canvas.terrain.deleteAll()
+				},
 				button: true,
 			}
 		]

diff --git a/lang/en.json b/lang/en.json
@@ -1,20 +1,11 @@
 {
-  "TerrainLayer.ok": "OK",
   "TerrainLayer.sf": "Terrain Grid",
   "TerrainLayer.select": "Select Difficult Terrain",
   "TerrainLayer.add": "Add Difficult Terrain",
-  "TerrainLayer.subtract": "Remove Difficult Terrain",
-  "TerrainLayer.fill": "Fill Grid",
-  "TerrainLayer.confirmFill": "This will mark every grid space as difficult terrain, overwriting any spots you've marked.",
   "TerrainLayer.onoff": "Enable/Disable Terrain",
   "TerrainLayer.reset": "Reset Terrain",
-  "TerrainLayer.confirmReset": "Are you sure? Terrain layer will be reset.",
-  "TerrainLayer.scale-s": "Terrain Icon Scale",
-  "TerrainLayer.scale-l": "The scale of the icons.",
   "TerrainLayer.opacity-s": "Terrain Icon Opacity",
   "TerrainLayer.opacity-l": "Opacity of the Icon and Number.",
-  "TerrainLayer.multiple-s": "Multiple Max",
-  "TerrainLayer.multiple-l": "Set how high multiple goes.",
   "TerrainLayer.showtext-s": "Show Text",
   "TerrainLayer.showtext-l": "Show the text of how difficult the terrain is."
 }
diff --git a/lang/es.json b/lang/es.json
@@ -1,13 +1,8 @@
 {
-    "TerrainLayer.ok": "OK",
     "TerrainLayer.sf": "Cuadrícula del Terreno",
     "TerrainLayer.select":"Seleccionar Terreno Dificil",
     "TerrainLayer.add":"Añadir Terreno Dificil",
-    "TerrainLayer.subtract":"Eliminar Terreno Dificil",
-    "TerrainLayer.fill":"Llenar Cuadrícula",
-    "TerrainLayer.confirmFill":"Este acción marcará todos de las cajas en la cuadrícula con el terreno difícil y sobrescribirá todas de las cajas previamente marcadas.",
     "TerrainLayer.onoff": "Habilitar/Inhabilitar Terreno",
     "TerrainLayer.reset": "Reajustar Terreno",
-    "TerrainLayer.confirmReset": "¿Estas seguro? La capa del terreno se restablecerá."
   }