From b5b8a48456d19a3ea00828c0bc01a8d57b444f36 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Wed, 13 Nov 2019 10:19:28 +0300
Subject: [PATCH] v1.22.06

---
 index.html                     | 3 ++-
 modules/river-generator.js     | 7 +++++--
 modules/ui/heightmap-editor.js | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 655eb720..7f9ffed6 100644
--- a/index.html
+++ b/index.html
@@ -1888,7 +1888,8 @@
           Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan),
           Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI,
           Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, 
-          Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff and many others!</p>
+          Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, 
+          Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil and many others!</p>
 
         <ul class="share-buttons">
           <li><a href="https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fazgaar.github.io%2FFantasy-Map-Generator%2F&quote=" data-tip="Share on Facebook" target="_blank"><img alt="Share on Facebook" src="images/Facebook.png" /></a></li>
diff --git a/modules/river-generator.js b/modules/river-generator.js
index d5673cd7..f2593984 100644
--- a/modules/river-generator.js
+++ b/modules/river-generator.js
@@ -4,7 +4,7 @@
     (global.Rivers = factory());
 }(this, (function () {'use strict';
 
-  const generate = function() {
+  const generate = function(changeHeights = true) {
     console.time('generateRivers');
     Math.seedrandom(seed);
     const cells = pack.cells, p = cells.p, features = pack.features;
@@ -132,6 +132,9 @@
         .attr("data-width", d => d[2]).attr("data-increment", d => d[3]);
     }()
 
+    // apply change heights as basic one
+    if (changeHeights) cells.h = Uint8Array.from(h);
+
     console.timeEnd('generateRivers');
   }
 
@@ -148,7 +151,7 @@
         const minHeight = d3.min(cells.c[i].map(c => h[c]));
         if (minHeight === 100) continue; // already max height
         if (h[i] <= minHeight) {
-          h[i] = minHeight + 1;
+          h[i] = Math.min(minHeight + 1, 100);
           depression++;
           depressed = true;
         }
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index fd70c905..6a66f895 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -157,7 +157,7 @@ function editHeightmap() {
     drawCoastline();
 
     elevateLakes();
-    Rivers.generate();
+    Rivers.generate(change);
 
     if (!change) {
       for (const i of pack.cells.i) {
@@ -265,7 +265,7 @@ function editHeightmap() {
 
     if (changeHeights.checked) {
       elevateLakes();
-      Rivers.generate();
+      Rivers.generate(changeHeights.checked);
     }
 
     // assign saved pack data from grid back to pack