mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-17 09:41:24 +01:00
fix: erase data before regeneration on heightmap erase mode to avoid lock state, v1.89.06
This commit is contained in:
parent
eb5d924cbd
commit
8288335514
4 changed files with 18 additions and 9 deletions
|
|
@ -7845,7 +7845,7 @@
|
||||||
<script src="modules/river-generator.js"></script>
|
<script src="modules/river-generator.js"></script>
|
||||||
<script src="modules/lakes.js"></script>
|
<script src="modules/lakes.js"></script>
|
||||||
<script src="modules/names-generator.js?v=1.87.14"></script>
|
<script src="modules/names-generator.js?v=1.87.14"></script>
|
||||||
<script src="modules/cultures-generator.js?v=1.89.00"></script>
|
<script src="modules/cultures-generator.js?v=1.89.06"></script>
|
||||||
<script src="modules/burgs-and-states.js?v=1.89.05"></script>
|
<script src="modules/burgs-and-states.js?v=1.89.05"></script>
|
||||||
<script src="modules/routes-generator.js"></script>
|
<script src="modules/routes-generator.js"></script>
|
||||||
<script src="modules/religions-generator.js?v=1.89.01"></script>
|
<script src="modules/religions-generator.js?v=1.89.01"></script>
|
||||||
|
|
@ -7870,7 +7870,7 @@
|
||||||
<script defer src="modules/ui/editors.js?v=1.89.05"></script>
|
<script defer src="modules/ui/editors.js?v=1.89.05"></script>
|
||||||
<script defer src="modules/ui/tools.js?v=1.89.00"></script>
|
<script defer src="modules/ui/tools.js?v=1.89.00"></script>
|
||||||
<script defer src="modules/ui/world-configurator.js"></script>
|
<script defer src="modules/ui/world-configurator.js"></script>
|
||||||
<script defer src="modules/ui/heightmap-editor.js?v=1.88.03"></script>
|
<script defer src="modules/ui/heightmap-editor.js?v=1.89.06"></script>
|
||||||
<script defer src="modules/ui/provinces-editor.js?v=1.89.00"></script>
|
<script defer src="modules/ui/provinces-editor.js?v=1.89.00"></script>
|
||||||
<script defer src="modules/ui/biomes-editor.js"></script>
|
<script defer src="modules/ui/biomes-editor.js"></script>
|
||||||
<script defer src="modules/ui/namesbase-editor.js?v=1.87.10"></script>
|
<script defer src="modules/ui/namesbase-editor.js?v=1.87.10"></script>
|
||||||
|
|
|
||||||
|
|
@ -116,14 +116,14 @@ window.Cultures = (function () {
|
||||||
|
|
||||||
cultures.forEach(c => (c.base = c.base % nameBases.length));
|
cultures.forEach(c => (c.base = c.base % nameBases.length));
|
||||||
|
|
||||||
function selectCultures(c) {
|
function selectCultures(culturesNumber) {
|
||||||
let def = getDefault(c);
|
let def = getDefault(culturesNumber);
|
||||||
if (c === def.length) return def;
|
if (culturesNumber === def.length) return def;
|
||||||
if (def.every(d => d.odd === 1)) return def.splice(0, c);
|
if (def.every(d => d.odd === 1)) return def.splice(0, culturesNumber);
|
||||||
|
|
||||||
|
const count = Math.min(culturesNumber, def.length);
|
||||||
|
|
||||||
const count = Math.min(c, def.length);
|
|
||||||
const cultures = [];
|
const cultures = [];
|
||||||
|
|
||||||
pack.cultures?.forEach(function (culture) {
|
pack.cultures?.forEach(function (culture) {
|
||||||
if (culture.lock) cultures.push(culture);
|
if (culture.lock) cultures.push(culture);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -204,6 +204,13 @@ function editHeightmap(options) {
|
||||||
INFO && console.group("Edit Heightmap");
|
INFO && console.group("Edit Heightmap");
|
||||||
TIME && console.time("regenerateErasedData");
|
TIME && console.time("regenerateErasedData");
|
||||||
|
|
||||||
|
// remove data
|
||||||
|
pack.cultures = [];
|
||||||
|
pack.burgs = [];
|
||||||
|
pack.states = [];
|
||||||
|
pack.provinces = [];
|
||||||
|
pack.religions = [];
|
||||||
|
|
||||||
const erosionAllowed = allowErosion.checked;
|
const erosionAllowed = allowErosion.checked;
|
||||||
markFeatures();
|
markFeatures();
|
||||||
markupGridOcean();
|
markupGridOcean();
|
||||||
|
|
@ -231,8 +238,10 @@ function editHeightmap(options) {
|
||||||
Lakes.defineGroup();
|
Lakes.defineGroup();
|
||||||
defineBiomes();
|
defineBiomes();
|
||||||
rankCells();
|
rankCells();
|
||||||
|
|
||||||
Cultures.generate();
|
Cultures.generate();
|
||||||
Cultures.expand();
|
Cultures.expand();
|
||||||
|
|
||||||
BurgsAndStates.generate();
|
BurgsAndStates.generate();
|
||||||
Religions.generate();
|
Religions.generate();
|
||||||
BurgsAndStates.defineStateForms();
|
BurgsAndStates.defineStateForms();
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
// version and caching control
|
// version and caching control
|
||||||
const version = "1.89.05"; // generator version, update each time
|
const version = "1.89.06"; // generator version, update each time
|
||||||
|
|
||||||
{
|
{
|
||||||
document.title += " v" + version;
|
document.title += " v" + version;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue