post-merge fixes

index.html

@@ -8066,36 +8066,50 @@
       </defs>
     </svg>
 
-  <!-- <script src="libs/translate.js"></script> -->
   <script src="libs/jquery-3.1.1.min.js"></script>
+    <script src="libs/jquery-ui.min.js"></script>
+    <script src="versioning.js"></script>
   <script src="libs/d3.min.js"></script>
   <script src="libs/priority-queue.min.js"></script>
   <script src="libs/delaunator.min.js"></script>
+
+    <script src="utils/shorthands.js"></script>
+    <script src="utils/commonUtils.js"></script>
+    <script src="utils/arrayUtils.js"></script>
+    <script src="utils/colorUtils.js"></script>
+    <script src="utils/graphUtils.js"></script>
+    <script src="utils/nodeUtils.js"></script>
+    <script src="utils/numberUtils.js"></script>
+    <script src="utils/polyfills.js"></script>
+    <script src="utils/probabilityUtils.js"></script>
+    <script src="utils/stringUtils.js"></script>
+    <script src="utils/languageUtils.js"></script>
+    <script src="utils/unitUtils.js?v=1.87.00"></script>
+
   <script src="modules/voronoi.js"></script>
+  <script src="config/heightmap-templates.js"></script>
+  <script src="config/precreated-heightmaps.js"></script>
   <script src="modules/heightmap-generator.js"></script>
-  <script src="modules/ocean-layers.js"></script>
+  <script src="modules/ocean-layers.js?v=1.87.15"></script>
+  <script src="modules/resources-generator.js"></script>
   <script src="modules/river-generator.js"></script>
   <script src="modules/lakes.js"></script>
-  <script src="modules/names-generator.js"></script>
-  <script src="modules/cultures-generator.js"></script>
-  <script src="modules/resources-generator.js"></script>
-  <script src="modules/burgs-and-states.js"></script>
-  <script src="modules/production-generator.js"></script>
-  <script src="modules/trade-generator.js"></script>
+  <script src="modules/names-generator.js?v=1.87.14"></script>
+  <script src="modules/cultures-generator.js?v=1.87.14"></script>
+  <script src="modules/burgs-and-states.js?v=1.87.10"></script>
   <script src="modules/routes-generator.js"></script>
   <script src="modules/religions-generator.js"></script>
   <script src="modules/military-generator.js"></script>
-  <script src="modules/markers-generator.js"></script>
+  <script src="modules/markers-generator.js?v=1.87.13"></script>
   <script src="modules/coa-generator.js"></script>
   <script src="modules/submap.js"></script>
   <script src="libs/polylabel.min.js"></script>
   <script src="libs/lineclip.min.js"></script>
-  <script src="libs/jquery-ui.min.js"></script>
   <script src="libs/alea.min.js"></script>
   <script src="modules/fonts.js"></script>
   <script src="modules/ui/layers.js"></script>
-  <script src="modules/ui/measurers.js"></script>
-  <script src="libs/umami.js"></script>
+  <script src="modules/ui/measurers.js?v=1.87.02"></script>
+  <script src="modules/ui/stylePresets.js"></script>
 
   <script src="modules/ui/general.js?v=1.87.00"></script>
   <script src="modules/ui/options.js?v=1.87.15"></script>
@@ -8122,14 +8136,14 @@
   <script defer src="modules/ui/relief-editor.js"></script>
   <script defer src="modules/ui/burg-editor.js"></script>
   <script defer src="modules/ui/units-editor.js"></script>
-    <script defer src="modules/ui/notes-editor.js?v=29052022"></script>
+  <script defer src="modules/ui/notes-editor.js"></script>
   <script defer src="modules/ui/diplomacy-editor.js"></script>
-    <script defer src="modules/ui/zones-editor.js?v=18052022"></script>
-    <script defer src="modules/ui/burgs-overview.js?v=29052022"></script>
-    <script defer src="modules/ui/rivers-overview.js?v=29052022"></script>
-    <script defer src="modules/ui/military-overview.js?v=29052022"></script>
-    <script defer src="modules/ui/regiments-overview.js?v=29052022"></script>
-    <script defer src="modules/ui/markers-overview.js?v=29052022"></script>
+  <script defer src="modules/ui/zones-editor.js"></script>
+  <script defer src="modules/ui/burgs-overview.js"></script>
+  <script defer src="modules/ui/rivers-overview.js"></script>
+  <script defer src="modules/ui/military-overview.js"></script>
+  <script defer src="modules/ui/regiments-overview.js"></script>
+  <script defer src="modules/ui/markers-overview.js"></script>
   <script defer src="modules/ui/regiment-editor.js"></script>
   <script defer src="modules/ui/battle-screen.js"></script>
   <script defer src="modules/ui/resource-editor.js"></script>
@@ -8150,5 +8164,5 @@
 
   <!-- Web Components -->
   <script defer src="components/fill-box.js"></script>
-  </body>
+</body>
 </html>

main.js

@@ -2,10 +2,7 @@
 // https://github.com/Azgaar/Fantasy-Map-Generator
 
 "use strict";
-const version = "1.662"; // generator version
-document.title += " v" + version;
-
-// switches to disable/enable logging features
+// set debug options
 const PRODUCTION = location.hostname && location.hostname !== "localhost" && location.hostname !== "127.0.0.1";
 const DEBUG = localStorage.getItem("debug");
 const INFO = DEBUG || !PRODUCTION;
@@ -53,7 +50,7 @@ let landmass = viewbox.append("g").attr("id", "landmass");
 let texture = viewbox.append("g").attr("id", "texture");
 let terrs = viewbox.append("g").attr("id", "terrs");
 let biomes = viewbox.append("g").attr("id", "biomes");
-let gridCells = viewbox.append("g").attr("id", "cells");
+let cells = viewbox.append("g").attr("id", "cells");
 let gridOverlay = viewbox.append("g").attr("id", "gridOverlay");
 let coordinates = viewbox.append("g").attr("id", "coordinates");
 let compass = viewbox.append("g").attr("id", "compass");
@@ -731,21 +728,6 @@ async function generate(options) {
     BurgsAndStates.defineStateForms();
     BurgsAndStates.defineTaxes();
 
-    Production.collectResources();
-
-    Trade.defineCenters();
-    Trade.calculateDistances();
-    Trade.exportGoods();
-    Trade.importGoods();
-
-    // temp, replace with route generator
-    // pack.cells.road = new Uint16Array(pack.cells.i.length);
-    // pack.cells.crossroad = new Uint16Array(pack.cells.i.length);
-
-    Religions.generate();
-    BurgsAndStates.defineStateForms();
-    BurgsAndStates.defineTaxes();
-
     Production.collectResources();
     Production.defineExport();
 

modules/ui/burg-editor.js

@@ -96,12 +96,6 @@ function editBurg(id) {
     document.getElementById('burgExport').innerHTML = getExport(deals.filter((deal) => deal.exporter === b.i));
     document.getElementById('burgImport').innerHTML = '';
 
-    // economics block
-    document.getElementById('burgProduction').innerHTML = getProduction(b.produced);
-    const deals = pack.trade.deals;
-    document.getElementById('burgExport').innerHTML = getExport(deals.filter((deal) => deal.exporter === b.i));
-    document.getElementById('burgImport').innerHTML = '';
-
     //toggle lock
     updateBurgLockIcon();
 
@@ -663,16 +657,8 @@ function editBurg(id) {
           }
         }
       });
-    } else {
-      const message = 'Are you sure you want to remove the burg? <br>This action cannot be reverted';
-      const onConfirm = () => {
-        removeBurg(id);
-        $('#burgEditor').dialog('close');
-      };
-      confirmationDialog({title: 'Remove burg', message, confirm: 'Remove', onConfirm});
     } 
   }
-
   function closeBurgEditor() {
     document.getElementById('burgRelocate').classList.remove('pressed');
     burgLabels.selectAll('text').call(d3.drag().on('drag', null)).classed('draggable', false);

modules/ui/heightmap-editor.js

@@ -3,7 +3,7 @@
 function editHeightmap(options) {
   const {mode, tool} = options || {};
   restartHistory();
-  viewbox.insert('g', '#terrs').attr('id', 'heights');
+  viewbox.insert("g", "#terrs").attr("id", "heights");
 
   if (!mode) showModeDialog();
   else enterHeightmapEditMode(mode);
@@ -982,9 +982,6 @@ function editHeightmap(options) {
       const steps = byId("templateBody").querySelectorAll("#templateBody > div");
       if (!steps.length) return;
 
-      const seed = byId("templateSeed").value;
-      if (seed) Math.random = aleaPRNG(seed);
-
       grid.cells.h = createTypedArray({maxValue: 100, length: grid.points.length});
       HeightmapGenerator.setGraph(grid);
       restartHistory();

modules/ui/tools.js

@@ -343,13 +343,6 @@ function regenerateBurgs() {
   if (document.getElementById("statesEditorRefresh")?.offsetParent) statesEditorRefresh.click();
 }
 
-function regenerateResources() {
-  Resources.generate();
-  goods.selectAll('*').remove();
-  if (layerIsOn('toggleResources')) drawResources();
-  refreshAllEditors();
-}
-
 function regenerateResources() {
   Resources.generate();
   goods.selectAll("*").remove();