v1.3.45

modules/ui/burg-editor.js

@@ -283,9 +283,10 @@ function editBurg(id) {
     const burg = pack.burgs[id];
     const defSeed = +(seed + id.padStart(4, 0));
     if (isCtrlClick(event)) {
-      prompt(`Please provide a Medieval Fantasy City Generator seed. <br>
-        Seed should be a number. Default seed is FMG map seed + burg id padded to 4 chars with zeros (${defSeed}). <br>
-        Please note that if seed is custom, "Overworld" button from MFCG will open a different map`, {default:burg.MFCG||defSeed, step:1, min:1, max:1e13-1}, v => {
+      prompt(`Please provide a Medieval Fantasy City Generator seed. 
+        Seed should be a number. Default seed is FMG map seed + burg id padded to 4 chars with zeros (${defSeed}). 
+        Please note that if seed is custom, "Overworld" button from MFCG will open a different map`,
+        {default:burg.MFCG||defSeed, step:1, min:1, max:1e13-1}, v => {
         burg.MFCG = v;
         openMFCG(v);
       });

modules/ui/heightmap-editor.js

@@ -126,6 +126,11 @@ function editHeightmap() {
       return;
     }
 
+    if (document.getElementById("imageConverter").offsetParent) {
+      tip("Please exit the Image Conversion mode first", null, "error");
+      return;
+    }
+
     customization = 0;
     customizationMenu.style.display = "none";
     if (document.getElementById("options").querySelector(".tab > button.active").id === "toolsTab") toolsContent.style.display = "block";
@@ -960,8 +965,9 @@ function editHeightmap() {
 
     $("#imageConverter").dialog({
       title: "Image Converter", minHeight: "auto", width: "19.5em", resizable: false,
-      position: {my: "right top", at: "right-10 top+10", of: "svg"}
-    }).on('dialogclose', closeImageConverter);
+      position: {my: "right top", at: "right-10 top+10", of: "svg"},
+      beforeClose: closeImageConverter
+    });
 
     // create canvas for image
     const canvas = document.createElement("canvas");
@@ -978,7 +984,7 @@ function editHeightmap() {
     setOverlayOpacity(0);
 
     document.getElementById("convertImageLoad").classList.add("glow"); // add glow effect
-    tip('Image Converter is opened. Upload the image and assign the colors to desired heights', true, "warn"); // main tip
+    tip('Image Converter is opened. Upload the image and assign the height for each of the colors', true, "warn"); // main tip
 
     // remove all heights
     grid.cells.h = new Uint8Array(grid.cells.i.length);
@@ -1003,7 +1009,8 @@ function editHeightmap() {
     document.getElementById("convertAutoLum").addEventListener("click", () => autoAssing("lum"));
     document.getElementById("convertAutoHue").addEventListener("click", () => autoAssing("hue"));
     document.getElementById("convertColorsButton").addEventListener("click", setConvertColorsNumber);
-    document.getElementById("convertComplete").addEventListener("click", () => $("#imageConverter").dialog("close"));
+    document.getElementById("convertComplete").addEventListener("click", applyConversion);
+    document.getElementById("convertCancel").addEventListener("click", cancelConversion);
     document.getElementById("convertOverlay").addEventListener("input", function() {setOverlayOpacity(this.value)});
     document.getElementById("convertOverlayNumber").addEventListener("input", function() {setOverlayOpacity(this.value)});
 
@@ -1170,7 +1177,25 @@ function editHeightmap() {
       document.getElementById("canvas").style.opacity = v;
     }
 
-    function closeImageConverter() {
+    function applyConversion() {
+      viewbox.select("#heights").selectAll("polygon").each(function() {
+        const height = +this.dataset.height || 0;
+        const i = +this.id.slice(4);
+        grid.cells.h[i] = height;
+      });
+
+      viewbox.select("#heights").selectAll("polygon").remove();
+      updateHeightmap();
+      restoreImageConverterState();
+    }
+
+    function cancelConversion() {
+      restoreImageConverterState();
+      viewbox.select("#heights").selectAll("polygon").remove();
+      restoreHistory(edits.n-1);
+    }
+
+    function restoreImageConverterState() {
       const canvas = document.getElementById("canvas");
       if (canvas) canvas.remove(); else return;
       const img = document.getElementById("image");
@@ -1182,15 +1207,30 @@ function editHeightmap() {
       colorsSelectValue.innerHTML = colorsSelectFriendly.innerHTML = 0;
       viewbox.style("cursor", "default").on(".drag", null);
       tip('Heightmap edit mode is active. Click on "Exit Customization" to finalize the heightmap', true);
+      $("#imageConverter").dialog("destroy");
+    }
 
-      viewbox.select("#heights").selectAll("polygon").each(function() {
-        const height = +this.dataset.height || 0;
-        const i = +this.id.slice(4);
-        grid.cells.h[i] = height;
+    function closeImageConverter(event) {
+      event.preventDefault();
+      event.stopPropagation();
+      alertMessage.innerHTML = 'Are you sure you want to close the Image Converter? Click "Cancel" to geck back to convertion. Click "Complete" to apply the conversion. Click "Close" to exit conversion mode and restore previous heightmap';
+      $("#alert").dialog({resizable: false, title: "Close Image Converter",
+        buttons: {
+          Cancel: function() {
+            $(this).dialog("close");
+          },
+          Complete: function() {
+            $(this).dialog("close");
+            applyConversion();
+          },
+          Close: function() {
+            $(this).dialog("close");
+            restoreImageConverterState();
+            viewbox.select("#heights").selectAll("polygon").remove();
+            restoreHistory(edits.n-1);
+          }
+        }
       });
-
-      viewbox.select("#heights").selectAll("polygon").remove();
-      updateHeightmap();
     }
   }
 

modules/ui/lakes-editor.js

@@ -127,7 +127,7 @@ function editLake() {
 
     // just rename if only 1 element left
     const oldGroup = elSelected.node().parentNode;
-    const basic = ["freshwater", "salt", "sinkhole", "frozen", "lava"].includes(oldGroup.id);
+    const basic = ["freshwater", "salt", "sinkhole", "frozen", "lava", "dry"].includes(oldGroup.id);
     if (!basic && oldGroup.childElementCount === 1) {
       document.getElementById("lakeGroup").selectedOptions[0].remove();
       document.getElementById("lakeGroup").options.add(new Option(group, group, false, true));
@@ -150,7 +150,7 @@ function editLake() {
   
   function removeLakeGroup() {
     const group = elSelected.node().parentNode.id;
-    if (["freshwater", "salt", "sinkhole", "frozen", "lava"].includes(group)) {
+    if (["freshwater", "salt", "sinkhole", "frozen", "lava", "dry"].includes(group)) {
       tip("This is one of the default groups, it cannot be removed", false, "error");
       return;
     }

modules/ui/layers.js

@@ -456,6 +456,41 @@ function drawCells() {
   cells.append("path").attr("d", path);
 }
 
+function drawSeaIce() {
+  const seaIce = viewbox.append("g").attr("id", "seaIce").attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("filter", "url(#dropShadow05)");//.attr("opacity", .8);
+  for (const i of grid.cells.i) {
+    const t = grid.cells.temp[i] ;
+    if (t > 2) continue;
+    if (t > -5 && grid.cells.h[i] >= 20) continue;
+    if (t < -5) drawpolygon(i);
+    if (P(normalize(t, -5.5, 2.5))) continue; // t[-5; 2]
+    const size = t < -14 ? 0 : t > -6 ? (7 + t) / 10 : (15 + t) / 100; // [0; 1], where 0 = full size, 1 = zero size
+    resizePolygon(i, rn(size * (.2 + rand() * .9), 2));
+  }
+
+  // -9: .06
+  // -8: .07
+  // -7: .08
+  // -6: .09
+
+  // -5: .2
+  // -4: .3
+  // -3: .4
+  // -2: .5
+  // -1: .6
+  //  0: .7
+
+  function drawpolygon(i) {
+    seaIce.append("polygon").attr("points", getGridPolygon(i));
+  }
+
+  function resizePolygon(i, s) {
+    const c = grid.points[i];
+    const points = getGridPolygon(i).map(p => [p[0] + (c[0]-p[0]) * s, p[1] + (c[1]-p[1]) * s]);
+    seaIce.append("polygon").attr("points", points);
+  }
+}
+
 function toggleCultures(event) {
   const cultures = pack.cultures.filter(c => c.i && !c.removed);
   const empty = !cults.selectAll("path").size();

modules/ui/states-editor.js

@@ -896,12 +896,13 @@ function editStates() {
   
   function downloadStatesData() {
     const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
-    let data = "Id,State,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area "+unit+",Total Population,Rural Population,Urban Population\n"; // headers
+    let data = "Id,State,Form,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area "+unit+",Total Population,Rural Population,Urban Population\n"; // headers
 
     body.querySelectorAll(":scope > div").forEach(function(el) {
       const key = parseInt(el.dataset.id);
       data += el.dataset.id + ",";
       data += el.dataset.name + ",";
+      data += el.dataset.form + ",";
       data += el.dataset.color + ",";
       data += el.dataset.capital + ",";
       data += el.dataset.culture + ",";

modules/ui/tools.js

@@ -250,12 +250,8 @@ function regenerateMilitary() {
 }
 
 function regenerateMarkers(event) {
-  if (isCtrlClick(event)) {
-    prompt("Please provide markers number multiplier", {default:1, step:.01, min:0, max:100}, v => {
-      if (v === null || v === "" || isNaN(+v)) return;
-      addNumberOfMarkers(Math.min(+v, 100));
-    });
-  } else addNumberOfMarkers(gauss(1, .5, .3, 5, 2));
+  if (isCtrlClick(event)) prompt("Please provide markers number multiplier", {default:1, step:.01, min:0, max:100}, v => addNumberOfMarkers(v));
+  else addNumberOfMarkers(gauss(1, .5, .3, 5, 2));
 
   function addNumberOfMarkers(number) {
     // remove existing markers and assigned notes
@@ -270,12 +266,8 @@ function regenerateMarkers(event) {
 }
 
 function regenerateZones(event) {
-  if (isCtrlClick(event)) {
-    prompt("Please provide zones number multiplier", {default:1, step:.01, min:0, max:100}, v => {
-      if (v === null || v === "" || isNaN(+v)) return;
-      addNumberOfZones(Math.min(+v, 100));
-    });
-  } else addNumberOfZones(gauss(1, .5, .6, 5, 2));
+  if (isCtrlClick(event)) prompt("Please provide zones number multiplier", {default:1, step:.01, min:0, max:100}, v => addNumberOfZones(v));
+  else addNumberOfZones(gauss(1, .5, .6, 5, 2));
 
   function addNumberOfZones(number) {
     zones.selectAll("g").remove(); // remove existing zones