Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator

into custom-heightmap-color-scheme
Azgaar · Nov 18, 2023 · 1176840 · 1176840
2 parents 1fe5535 + 778bea1
commit 1176840
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -8035,7 +8035,7 @@
     <script defer src="modules/io/save.js?v=1.93.02"></script>
     <script defer src="modules/io/load.js?v=1.93.02"></script>
     <script defer src="modules/io/cloud.js"></script>
-    <script defer src="modules/io/export.js?v=1.89.36"></script>
+    <script defer src="modules/io/export.js?v=1.93.12"></script>
     <script defer src="modules/io/formats.js"></script>
 
     <!-- Web Components -->

diff --git a/modules/dynamic/export-json.js b/modules/dynamic/export-json.js
@@ -162,7 +162,7 @@ function getPackCellsData() {
       religion: dataArrays.religion[cellId],
       province: dataArrays.province[cellId]
     })),
-    vertices: pack.vertices.c.map(vertexId => ({
+    vertices: Array.from(pack.vertices.p).map((_, vertexId) => ({
       i: vertexId,
       p: pack.vertices.p[vertexId],
       v: pack.vertices.v[vertexId],
@@ -203,11 +203,11 @@ function getGridCellsData() {
       temp: dataArrays.temp[cellId],
       prec: dataArrays.prec[cellId]
     })),
-    vertices: grid.vertices.c.map(vertexId => ({
+    vertices: Array.from(grid.vertices.p).map((_, vertexId) => ({
       i: vertexId,
-      p: pack.vertices.p[vertexId],
-      v: pack.vertices.v[vertexId],
-      c: pack.vertices.c[vertexId]
+      p: grid.vertices.p[vertexId],
+      v: grid.vertices.v[vertexId],
+      c: grid.vertices.c[vertexId]
     })),
     cellsDesired: grid.cellsDesired,
     spacing: grid.spacing,