diff --git a/main.js b/main.js index b4afecf5..102f090a 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,7 @@ // https://github.com/Azgaar/Fantasy-Map-Generator "use strict"; -const version = "1.5"; // generator version +const version = "1.59"; // generator version document.title += " v" + version; // Switches to disable/enable logging features diff --git a/modules/river-generator.js b/modules/river-generator.js index 87c80688..0a6e5fd9 100644 --- a/modules/river-generator.js +++ b/modules/river-generator.js @@ -389,9 +389,9 @@ const remove = function(id) { } const getBasin = function(r) { - const parent = pack.rivers.find(river => river.i === r)?.parent; - if (!parent || r === parent) return r; - return getBasin(parent); + const parent = pack.rivers.find(river => river.i === r)?.parent; + if (!parent || r === parent) return r; + return getBasin(parent); } return {generate, resolveDepressions, addMeandering, getPath, specify, getName, getBasin, remove}; diff --git a/modules/save-and-load.js b/modules/save-and-load.js index f93c2846..22720dd1 100644 --- a/modules/save-and-load.js +++ b/modules/save-and-load.js @@ -1099,6 +1099,23 @@ function parseLoadedData(data) { }); } + if (version < 1.59) { + // v 1.6 changed rivers data + for (const river of pack.rivers) { + const el = document.getElementById("river"+river.i); + if (el) { + el.removeAttribute("data-width"); + el.removeAttribute("data-increment"); + river.widthFactor = +this.getAttribute("data-width"); + river.discharge = pack.cells.fl[river.mouth] || 1; + river.width = rn(river.length / 100, 2); + river.sourceWidth = .1; + } else { + Rivers.remove(river.i); + } + } + } + }() void function checkDataIntegrity() {