From cc82d258faf1bf8e5be3e6b1e7fa4b3cc4c5119b Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sun, 17 Oct 2021 12:01:38 +0300 Subject: [PATCH] urbanDensity - save/load --- index.html | 6 +++--- modules/load.js | 1 + modules/save.js | 3 ++- modules/ui/burg-editor.js | 3 ++- modules/ui/units-editor.js | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index f0fa618a..28c0dea1 100644 --- a/index.html +++ b/index.html @@ -3215,10 +3215,10 @@ -
+
Urban density:
- - + +
diff --git a/modules/load.js b/modules/load.js index a44b4d36..fc58fa55 100644 --- a/modules/load.js +++ b/modules/load.js @@ -231,6 +231,7 @@ function parseLoadedData(data) { if (settings[21]) hideLabels.checked = +settings[21]; if (settings[22]) stylePreset.value = settings[22]; if (settings[23]) rescaleLabels.checked = +settings[23]; + if (settings[24]) urbanDensity = urbanDensity.value = urbanDensityOutput.value = +settings[24]; })(); void (function parseConfiguration() { diff --git a/modules/save.js b/modules/save.js index 6ebda083..04f3e665 100644 --- a/modules/save.js +++ b/modules/save.js @@ -33,7 +33,8 @@ function getMapData() { mapName.value, +hideLabels.checked, stylePreset.value, - +rescaleLabels.checked + +rescaleLabels.checked, + urbanDensity ].join("|"); const coords = JSON.stringify(mapCoordinates); const biomes = [biomesData.color, biomesData.habitability, biomesData.name].join("|"); diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js index 2de633d5..1fcdf434 100644 --- a/modules/ui/burg-editor.js +++ b/modules/ui/burg-editor.js @@ -416,7 +416,8 @@ function editBurg(id) { const {cells} = pack; const {name, population, cell} = burg; const burgSeed = getBurgSeed(burg); - const size = Math.max(Math.min(Math.ceil(2.13*Math.pow(population * populationRate/urbanDensity,0.385)), 100), 6); + const sizeRaw = 2.13 * Math.pow((population * populationRate) / urbanDensity, 0.385); + const size = minmax(Math.ceil(sizeRaw), 6, 100); const people = rn(population * populationRate * urbanization); const hub = +cells.road[cell] > 50; diff --git a/modules/ui/units-editor.js b/modules/ui/units-editor.js index be8f94c4..aa3e4e63 100644 --- a/modules/ui/units-editor.js +++ b/modules/ui/units-editor.js @@ -144,7 +144,7 @@ function editUnits() { urbanDensity = urbanDensityOutput.value = urbanDensityInput.value = 10; localStorage.removeItem("populationRate"); localStorage.removeItem("urbanization"); - localStorage.removeItem("urbanDensity") + localStorage.removeItem("urbanDensity"); } function addRuler() {