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

fix(#905): make sure burg0 is not getting locked [v.1.88.05]

Browse source
This commit is contained in:
Azgaar 2022-12-15 15:43:40 +03:00
parent ce07c20fff
commit 3883933385
5 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
index.html
View file

@ -7849,7 +7849,7 @@
<script src="modules/military-generator.js"></script>
<script src="modules/markers-generator.js?v=1.87.13"></script>
<script src="modules/coa-generator.js"></script>
<script src="modules/submap.js"></script>
<script src="modules/submap.js?v=1.88.05"></script>
<script src="libs/polylabel.min.js"></script>
<script src="libs/lineclip.min.js"></script>
<script src="libs/alea.min.js"></script>
@ -7865,7 +7865,7 @@
<script defer src="modules/relief-icons.js"></script>
<script defer src="modules/ui/style.js"></script>
<script defer src="modules/ui/editors.js?v=1.87.07"></script>
<script defer src="modules/ui/tools.js?v=1.87.03"></script>
<script defer src="modules/ui/tools.js?v=1.88.05"></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/provinces-editor.js"></script>
@ -7903,7 +7903,7 @@
<script defer src="libs/jquery.ui.touch-punch.min.js"></script>
<script defer src="modules/io/save.js"></script>
<script defer src="modules/io/load.js?v=1.88.01"></script>
<script defer src="modules/io/load.js?v=1.88.05"></script>
<script defer src="modules/io/cloud.js"></script>
<script defer src="modules/io/export.js"></script>
<script defer src="modules/io/formats.js"></script>

9
modules/io/load.js
View file

@ -500,6 +500,15 @@ async function parseLoadedData(data) {
});
pack.burgs.forEach(burg => {
if ((!burg.i || burg.removed) && burg.lock) {
ERROR &&
console.error(
`Data Integrity Check. Burg ${burg.i || "0"} is removed or invalid but still locked. Unlocking the burg`
);
delete burg.lock;
return;
}
if (!burg.i || burg.removed) return;
if (burg.cell === undefined || burg.x === undefined || burg.y === undefined) {
ERROR &&

2
modules/submap.js
View file

@ -403,7 +403,7 @@ window.Submap = (function () {
} else {
b.cell = cityCell;
}
if (!b.lock) b.lock = options.lockBurgs;
if (b.i && !b.lock) b.lock = options.lockBurgs;
cells.burg[b.cell] = id;
});
}

2
modules/ui/tools.js
View file

@ -261,7 +261,7 @@ function regenerateProvinces() {
function regenerateBurgs() {
const {cells, states} = pack;
const lockedburgs = pack.burgs.filter(b => b.lock);
const lockedburgs = pack.burgs.filter(b => b.i && !b.removed && b.lock);
rankCells();
cells.burg = new Uint16Array(cells.i.length);

2
versioning.js
View file

@ -1,7 +1,7 @@
"use strict";
// version and caching control
const version = "1.88.04"; // generator version, update each time
const version = "1.88.05"; // generator version, update each time
{
document.title += " v" + version;