backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-18 10:01:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

v1.5.32 - resolve conflicts

Browse source
This commit is contained in:
Azgaar 2021-02-14 19:59:37 +03:00
parent 79584fffac
commit 67ec838160
7 changed files with 465 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/ui/heightmap-editor.js
View file

@ -176,7 +176,6 @@ function editHeightmap() {
reGraph();
drawCoastline();
elevateLakes();
Rivers.generate(change);
if (!change) {
@ -288,10 +287,7 @@ function editHeightmap() {
reGraph();
drawCoastline();
if (changeHeights.checked) {
elevateLakes();
Rivers.generate(changeHeights.checked);
}
if (changeHeights.checked) Rivers.generate(changeHeights.checked);
// assign saved pack data from grid back to pack
const n = pack.cells.i.length;
@ -314,7 +310,6 @@ function editHeightmap() {
for (const i of pack.cells.i) {
const g = pack.cells.g[i];
if (pack.features[pack.cells.f[i]].group === "freshwater") pack.cells.h[i] = 19; // de-elevate lakes
const land = pack.cells.h[i] >= 20;
// check biome

5
modules/ui/tools.js
View file

@ -73,12 +73,7 @@ function processFeatureRegeneration(event, button) {
}
function regenerateRivers() {
elevateLakes();
Rivers.generate();
for (const i of pack.cells.i) {
const f = pack.features[pack.cells.f[i]]; // feature
if (f.group === "freshwater") pack.cells.h[i] = 19; // de-elevate lakes
}
Rivers.specify();
if (!layerIsOn("toggleRivers")) toggleRivers();
}

1
modules/ui/world-configurator.js
View file

@ -45,7 +45,6 @@ function editWorld() {
updateGlobePosition();
calculateTemperatures();
generatePrecipitation();
elevateLakes();
const heights = new Uint8Array(pack.cells.h);
Rivers.generate();
Rivers.specify();