v1.0.06

modules/ui/biomes-editor.js

@@ -114,7 +114,7 @@ function editBiomes() {
 
     if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
     applySorting(biomesHeader);
-    $("#biomesEditor").dialog();
+    $("#biomesEditor").dialog({width: fitContent()});
   }
 
   function biomeHighlightOn(event) {

modules/ui/cultures-editor.js

@@ -129,7 +129,7 @@ function editCultures() {
 
     if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
     applySorting(culturesHeader);
-    $("#culturesEditor").dialog();
+    $("#culturesEditor").dialog({width: fitContent()});
   }
 
   function getTypeOptions(type) {

modules/ui/diplomacy-editor.js

@@ -15,11 +15,11 @@ function editDiplomacy() {
   if (layerIsOn("toggleReligions")) toggleReligions();
 
   const body = document.getElementById("diplomacyBodySection");
-  const statuses = ["Ally", "Sympathy", "Neutral", "Suspicion", "Enemy", "Unknown", "Rival", "Vassal", "Suzerain"];
+  const statuses = ["Ally", "Friendly", "Neutral", "Suspicion", "Enemy", "Unknown", "Rival", "Vassal", "Suzerain"];
   const colors = ["#00b300", "#d4f8aa", "#edeee8", "#f3c7c4", "#e64b40", "#a9a9a9", "#ad5a1f", "#87CEFA", "#00008B"];
   refreshDiplomacyEditor();
 
-  tip("Click on a state to see its diplomatical relations", false, "warning");
+  tip("Click on a state to see its diplomatic relations", false, "warning");
   viewbox.style("cursor", "crosshair").on("click", selectStateOnMapClick);
 
   if (modules.editDiplomacy) return;
@@ -213,11 +213,7 @@ function editDiplomacy() {
       message += `<tr><th>${s.name}</th>` + s.diplomacy.filter((v, i) => valid.includes(i)).map(r => `<td class='${r}'>${r}</td>`).join("") + "</tr>";
     });
     message += `</table>`;
-    console.log(alertMessage.innerHTML)
-    console.log(message)
     alertMessage.innerHTML = message;
-    console.log(alertMessage.innerHTML)
-
     $("#alert").dialog({title: "Relations matrix", width: fitContent(), position: {my: "center", at: "center", of: "svg"}, buttons: {}});
   }
 

modules/ui/general.js

@@ -48,7 +48,7 @@ function moved() {
   if (i === undefined) return;
   showNotes(d3.event, i);
   const g = findGridCell(point[0], point[1]); // grid cell id
-  if (tooltip.dataset.main) showMainTip(); else showMapTooltip(d3.event, i, g);
+  if (tooltip.dataset.main) showMainTip(); else showMapTooltip(point, d3.event, i, g);
   if (toolsContent.style.display === "block" && cellInfo.style.display === "block") updateCellInfo(point, i, g);
 }
 
@@ -71,7 +71,7 @@ function showNotes(e, i) {
 }
 
 // show viewbox tooltip if main tooltip is blank
-function showMapTooltip(e, i, g) {
+function showMapTooltip(point, e, i, g) {
   tip(""); // clear tip
   const tag = e.target.tagName;
   const path = e.composedPath ? e.composedPath() : getComposedPath(e.target); // apply polyfill
@@ -116,7 +116,7 @@ function showMapTooltip(e, i, g) {
     tip(prov + state);
   } else
   if (layerIsOn("toggleCultures") && pack.cells.culture[i]) tip("Culture: " + pack.cultures[pack.cells.culture[i]].name); else
-  if (layerIsOn("toggleHeight")) tip("Height: " + getFriendlyHeight(pack.cells.h[i]));
+  if (layerIsOn("toggleHeight")) tip("Height: " + getFriendlyHeight(point));
 }
 
 // get cell info on mouse move
@@ -127,7 +127,8 @@ function updateCellInfo(point, i, g) {
   infoCell.innerHTML = i;
   const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
   infoArea.innerHTML = cells.area[i] ? si(cells.area[i] * distanceScaleInput.value ** 2) + unit : "n/a";
-  infoHeight.innerHTML = getFriendlyHeight(cells.h[i]) + " (" + cells.h[i] + ")";
+  const h = pack.cells.h[i] < 20 ? grid.cells.h[pack.cells.g[i]] : pack.cells.h[i];
+  infoHeight.innerHTML = getFriendlyHeight(point) + " (" + h + ")";
   infoTemp.innerHTML = convertTemperature(grid.cells.temp[g]);
   infoPrec.innerHTML = cells.h[i] >= 20 ? getFriendlyPrecipitation(i) : "n/a";
   infoState.innerHTML = cells.h[i] >= 20 ? cells.state[i] ? `${pack.states[cells.state[i]].fullName} (${cells.state[i]})` : "neutral lands (0)" : "no";
@@ -142,12 +143,16 @@ function updateCellInfo(point, i, g) {
 }
 
 // get user-friendly (real-world) height value from map data
-function getFriendlyHeight(h) {
+function getFriendlyHeight(p) {
   const unit = heightUnit.value;
   let unitRatio = 3.281; // default calculations are in feet
   if (unit === "m") unitRatio = 1; // if meter
   else if (unit === "f") unitRatio = 0.5468; // if fathom
 
+  const packH = pack.cells.h[findCell(p[0], p[1])];
+  const gridH = grid.cells.h[findGridCell(p[0], p[1])];
+  const h = packH < 20 ? gridH : packH;
+
   let height = -990;
   if (h >= 20) height = Math.pow(h - 18, +heightExponentInput.value);
   else if (h < 20 && h > 0) height = (h - 20) / h * 50;

modules/ui/heightmap-editor.js

@@ -82,8 +82,7 @@ function editHeightmap() {
     heightmapInfoX.innerHTML = rn(p[0]);
     heightmapInfoY.innerHTML = rn(p[1]);
     heightmapInfoCell.innerHTML = cell;
-    const h = grid.cells.h[cell];
-    heightmapInfoHeight.innerHTML = `${h} (${getFriendlyHeight(h)})`;
+    heightmapInfoHeight.innerHTML = `${grid.cells.h[cell]} (${getHeight(grid.cells.h[cell])})`;
     if (tooltip.dataset.main) showMainTip();
 
     // move radius circle if drag mode is active
@@ -92,6 +91,20 @@ function editHeightmap() {
     moveCircle(p[0], p[1], brushRadius.valueAsNumber, "#333");
   }
 
+// get user-friendly (real-world) height value from map data
+function getHeight(h) {
+  const unit = heightUnit.value;
+  let unitRatio = 3.281; // default calculations are in feet
+  if (unit === "m") unitRatio = 1; // if meter
+  else if (unit === "f") unitRatio = 0.5468; // if fathom
+
+  let height = -990;
+  if (h >= 20) height = Math.pow(h - 18, +heightExponentInput.value);
+  else if (h < 20 && h > 0) height = (h - 20) / h * 50;
+
+  return rn(height * unitRatio) + " " + unit;
+}
+
   // Exit customization mode
   function finalizeHeightmap() {
     if (terrs.selectAll("*").size() < 200) {

modules/ui/markers-editor.js

@@ -183,33 +183,49 @@ function editMarker() {
         ["1F4B0", "💰", "Money bag"],
         ["1F6A8", "🚨", "Revolving Light"],
         ["1F309", "🌉", "Bridge at Night"],
-        ["1F4A8", "💨", "Dashing away"],
-        ["1F334", "🌴", "Palm"],
-        ["1F335", "🌵", "Cactus"],
-        ["1F33E", "🌾", "Sheaf"],
         ["1F5FB", "🗻", "Mountain"],
         ["1F30B", "🌋", "Volcano"],
+        ["270A", "✊", "Raised Fist"],
+        ["1F44A", "👊", "Oncoming Fist"],
+        ["1F4AA", "💪", "Flexed Biceps"],
+        ["1F47C", "👼", "Baby Angel"],
         ["1F40E", "🐎", "Horse"],
         ["1F434", "🐴", "Horse Face"],
         ["1F42E", "🐮", "Cow"],
         ["1F43A", "🐺", "Wolf Face"],
         ["1F435", "🐵", "Monkey face"],
         ["1F437", "🐷", "Pig face"],
-        ["1F414", "🐔", "Chiken"],
-        ["1F411", "🐑", "Eve"],
+        ["1F414", "🐔", "Chicken"],
+        ["1F411", "🐑", "Ewe"],
         ["1F42B", "🐫", "Camel"],
         ["1F418", "🐘", "Elephant"],
         ["1F422", "🐢", "Turtle"],
         ["1F40C", "🐌", "Snail"],
         ["1F40D", "🐍", "Snake"],
+        ["1F41D", "🐝", "Honeybee"],
+        ["1F41C", "🐜", "Ant"],
+        ["1F41B", "🐛", "Bug"],
+        ["1F426", "🐦", "Bird"],
+        ["1F438", "🐸", "Frog Face"],
         ["1F433", "🐳", "Whale"],
         ["1F42C", "🐬", "Dolphin"],
         ["1F420", "🐟", "Fish"],
+        ["1F480", "💀", "Skull"],
         ["1F432", "🐲", "Dragon Head"],
         ["1F479", "👹", "Ogre"],
+        ["1F47A", "👺", "Goblin"],
         ["1F47B", "👻", "Ghost"],
         ["1F47E", "👾", "Alien"],
-        ["1F480", "💀", "Skull"],
+        ["1F383", "🎃", "Jack-O-Lantern"],
+        ["1F384", "🎄", "Christmas Tree"],
+        ["1F334", "🌴", "Palm"],
+        ["1F335", "🌵", "Cactus"],
+        ["2618", "☘️", "Shamrock"],
+        ["1F340", "🍀", "Four Leaf Clover"],
+        ["1F341", "🍁", "Maple Leaf"],
+        ["1F33F", "🌿", "Herb"],
+        ["1F33E", "🌾", "Sheaf"],
+        ["1F344", "🍄", "Mushroom"],
         ["1F374", "🍴", "Fork and knife"],
         ["1F372", "🍲", "Food"],
         ["1F35E", "🍞", "Bread"],
@@ -223,24 +239,37 @@ function editMarker() {
         ["1F377", "🍷", "Wine glass"],
         ["1F3BB", "🎻", "Violin"],
         ["1F3B8", "🎸", "Guitar"],
+        ["1F52A", "🔪", "Knife"],
+        ["1F52B", "🔫", "Pistol"],
+        ["1F4A3", "💣", "Bomb"],
+        ["1F4A5", "💥", "Collision"],
+        ["1F4A8", "💨", "Dashing away"],
+        ["1F301", "🌁", "Foggy"],
+        ["2744", "❄️", "Snowflake"],
         ["26A1", "⚡", "Electricity"],
         ["1F320", "🌠", "Shooting star"],
         ["1F319", "🌙", "Crescent moon"],
         ["1F525", "🔥", "Fire"],
         ["1F4A7", "💧", "Droplet"],
         ["1F30A", "🌊", "Wave"],
+        ["23F0", "⏰", "Alarm Clock"],
         ["231B", "⌛", "Hourglass"],
         ["1F3C6", "🏆", "Goblet"],
         ["26F2", "⛲", "Fountain"],
         ["26F5", "⛵", "Sailboat"],
-        ["26FA", "⛺", "Tend"],
+        ["26FA", "⛺", "Campfire"],
+        ["2764", "❤", "Red Heart"],
+        ["1F498", "💘", "Heart With Arrow"],
         ["1F489", "💉", "Syringe"],
+        ["1F4D5", "📕", "Closed Book"],
         ["1F4D6", "📚", "Books"],
+        ["1F381", "🎁", "Wrapped Gift"],
         ["1F3AF", "🎯", "Archery"],
         ["1F52E", "🔮", "Magic ball"],
         ["1F3AD", "🎭", "Performing arts"],
         ["1F3A8", "🎨", "Artist palette"],
         ["1F457", "👗", "Dress"],
+        ["1F392", "🎒", "Backpack"],
         ["1F451", "👑", "Crown"],
         ["1F48D", "💍", "Ring"],
         ["1F48E", "💎", "Gem"],
@@ -259,7 +288,6 @@ function editMarker() {
         ["21F6", "⇶", "Three arrows"],
         ["2699", "⚙", "Gear"],
         ["269B", "⚛", "Atom"],
-        ["0024", "$", "Dollar"],
         ["2680", "⚀", "Die1"],
         ["2681", "⚁", "Die2"],
         ["2682", "⚂", "Die3"],

modules/ui/options.js

@@ -873,13 +873,13 @@ function randomizeOptions() {
   if (!locked("regions")) regionsInput.value = regionsOutput.value = gauss(15, 3, 2, 30);
   if (!locked("provinces")) provincesInput.value = provincesOutput.value = gauss(40, 20, 20, 100);
   if (!locked("manors")) {manorsInput.value = 1000; manorsOutput.value = "auto";}
-  if (!locked("religions")) religionsInput.value = religionsOutput.value = gauss(6, 2, 3, 20);
+  if (!locked("religions")) religionsInput.value = religionsOutput.value = gauss(5, 2, 2, 10);
   if (!locked("power")) powerInput.value = powerOutput.value = gauss(3, 2, 0, 10);
   if (!locked("neutral")) neutralInput.value = neutralOutput.value = rn(1 + Math.random(), 1);
   if (!locked("cultures")) culturesInput.value = culturesOutput.value = gauss(12, 3, 5, 30);
 
   // 'Configure World' settings
-  if (!locked("prec")) precInput.value = precOutput.value = gauss(100, 40, 0, 500);
+  if (!locked("prec")) precInput.value = precOutput.value = gauss(100, 20, 5, 500);
   const tMax = +temperatureEquatorOutput.max, tMin = +temperatureEquatorOutput.min; // temperature extremes
   if (!locked("temperatureEquator")) temperatureEquatorOutput.value = temperatureEquatorInput.value = rand(tMax-6, tMax);
   if (!locked("temperaturePole")) temperaturePoleOutput.value = temperaturePoleInput.value = rand(tMin, tMin+10);

modules/ui/religions-editor.js

@@ -25,6 +25,7 @@ function editReligions() {
   document.getElementById("religionsEditorRefresh").addEventListener("click", refreshReligionsEditor);
   document.getElementById("religionsLegend").addEventListener("click", toggleLegend);
   document.getElementById("religionsPercentage").addEventListener("click", togglePercentageMode);
+  document.getElementById("religionsExtinct").addEventListener("click", toggleExtinct);
   document.getElementById("religionsManually").addEventListener("click", enterReligionsManualAssignent);
   document.getElementById("religionsManuallyApply").addEventListener("click", applyReligionsManualAssignent);
   document.getElementById("religionsManuallyCancel").addEventListener("click", () => exitReligionsManualAssignment());
@@ -56,11 +57,13 @@ function editReligions() {
 
     for (const r of pack.religions) {
       if (r.removed) continue;
+
       const area = r.area * (distanceScaleInput.value ** 2);
       const rural = r.rural * populationRate.value;
       const urban = r.urban * populationRate.value * urbanization.value;
       const population = rn(rural + urban);
-      const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}`;
+      if (r.i && !population && body.dataset.extinct !== "show") continue; // hide extinct religions
+      const populationTip = `Believers: ${si(population)}; Rural areas: ${si(rural)}; Urban areas: ${si(urban)}`;
       totalArea += area;
       totalPopulation += population;
 
@@ -98,7 +101,11 @@ function editReligions() {
     body.innerHTML = lines;
 
     // update footer
-    religionsFooterNumber.innerHTML = pack.religions.filter(r => r.i && !r.removed).length;
+    const valid = pack.religions.filter(r => r.i && !r.removed);
+    religionsOrganized.innerHTML = valid.filter(r => r.type === "Organized").length;
+    religionsHeresies.innerHTML = valid.filter(r => r.type === "Heresy").length;
+    religionsCults.innerHTML = valid.filter(r => r.type === "Cult").length;
+    religionsFolk.innerHTML = valid.filter(r => r.type === "Folk").length;
     religionsFooterArea.innerHTML = si(totalArea) + unit;
     religionsFooterPopulation.innerHTML = si(totalPopulation);
     religionsFooterArea.dataset.area = totalArea;
@@ -118,7 +125,7 @@ function editReligions() {
 
     if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
     applySorting(religionsHeader);
-    $("#religionsEditor").dialog();
+    $("#religionsEditor").dialog({width: fitContent()});
   }
 
   function getTypeOptions(type) {
@@ -204,7 +211,7 @@ function editReligions() {
   }
 
   function drawReligionCenters() {
-    const tooltip = "Drag to move the religion center";
+    const tooltip = "Drag to move the religion center (it won't affect religions distribution)";
     debug.select("#religionCenters").remove();
     const religionCenters = debug.append("g").attr("id", "religionCenters")
       .attr("stroke-width", 2).attr("stroke", "#444444").style("cursor", "move");
@@ -252,6 +259,11 @@ function editReligions() {
     }
   }
 
+  function toggleExtinct() {
+    body.dataset.extinct = body.dataset.extinct !== "show" ? "show" : "hide";
+    religionsEditorAddLines();
+  }
+
   function enterReligionsManualAssignent() {
     if (!layerIsOn("toggleReligions")) toggleReligions();
     customization = 7;
@@ -398,8 +410,8 @@ function editReligions() {
 
   function downloadReligionsData() {
     const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
-    let data = "Id,Religion,Color,Type,Form,Deity,Area "+unit+",Population\n"; // headers
-    
+    let data = "Id,Religion,Color,Type,Form,Deity,Area "+unit+",Believers\n"; // headers
+
     body.querySelectorAll(":scope > div").forEach(function(el) {
       data += el.dataset.id + ",";
       data += el.dataset.name + ",";

modules/ui/states-editor.js

@@ -151,7 +151,7 @@ function editStates() {
 
     if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
     applySorting(statesHeader);
-    $("#statesEditor").dialog();
+    $("#statesEditor").dialog({width: fitContent()});
   }
   
   function getCultureOptions(culture) {

modules/ui/zones-editor.js

@@ -86,7 +86,7 @@ function editZones() {
     body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseleave", ev => zoneHighlightOff(ev)));
 
     if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
-    $("#zonesEditor").dialog();
+    $("#zonesEditor").dialog({width: fitContent()});
   }
 
   function zoneHighlightOn(event) {