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

fix: add integrity check if burg is linked to removed state (1.88.01)

Browse source
This commit is contained in:
Azgaar 2022-12-04 14:51:27 +03:00
parent 4a96c24cf3
commit 0b1a2048a7
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -7902,7 +7902,7 @@
<script defer src="libs/jquery.ui.touch-punch.min.js"></script> <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
<script defer src="modules/io/save.js"></script> <script defer src="modules/io/save.js"></script>
<script defer src="modules/io/load.js?v=1.87.08"></script> <script defer src="modules/io/load.js?v=1.88.01"></script>
<script defer src="modules/io/cloud.js"></script> <script defer src="modules/io/cloud.js"></script>
<script defer src="modules/io/export.js"></script> <script defer src="modules/io/export.js"></script>
<script defer src="modules/io/formats.js"></script> <script defer src="modules/io/formats.js"></script>

17
modules/io/load.js
View file

@ -439,7 +439,7 @@ async function parseLoadedData(data) {
const cells = pack.cells; const cells = pack.cells;
if (pack.cells.i.length !== pack.cells.state.length) { if (pack.cells.i.length !== pack.cells.state.length) {
const message = "Data Integrity Check. Striping issue. To fix edit the heightmap in erase mode"; const message = "Data Integrity Check. Striping issue detected. To fix edit the heightmap in erase mode";
ERROR && console.error(message); ERROR && console.error(message);
} }
@ -482,11 +482,13 @@ async function parseLoadedData(data) {
ERROR && console.error("Data Integrity Check. Invalid feature", f, "is assigned to cells", invalidCells); ERROR && console.error("Data Integrity Check. Invalid feature", f, "is assigned to cells", invalidCells);
}); });
const invalidBurgs = [...new Set(cells.burg)].filter(b => b && (!pack.burgs[b] || pack.burgs[b].removed)); const invalidBurgs = [...new Set(cells.burg)].filter(
invalidBurgs.forEach(b => { burgId => burgId && (!pack.burgs[burgId] || pack.burgs[burgId].removed)
const invalidCells = cells.i.filter(i => cells.burg[i] === b); );
invalidBurgs.forEach(burgId => {
const invalidCells = cells.i.filter(i => cells.burg[i] === burgId);
invalidCells.forEach(i => (cells.burg[i] = 0)); invalidCells.forEach(i => (cells.burg[i] = 0));
ERROR && console.error("Data Integrity Check. Invalid burg", b, "is assigned to cells", invalidCells); ERROR && console.error("Data Integrity Check. Invalid burg", burgId, "is assigned to cells", invalidCells);
}); });
const invalidRivers = [...new Set(cells.r)].filter(r => r && !pack.rivers.find(river => river.i === r)); const invalidRivers = [...new Set(cells.r)].filter(r => r && !pack.rivers.find(river => river.i === r));
@ -524,6 +526,11 @@ async function parseLoadedData(data) {
burg.state = 0; burg.state = 0;
} }
if (burg.state && pack.states[burg.state].removed) {
ERROR && console.error("Data Integrity Check. Burg", burg.i, "is linked to removed state", burg.state);
burg.state = 0;
}
if (burg.state === undefined) { if (burg.state === undefined) {
ERROR && console.error("Data Integrity Check. Burg", burg.i, "has no state data"); ERROR && console.error("Data Integrity Check. Burg", burg.i, "has no state data");
burg.state = 0; burg.state = 0;

2
versioning.js
View file

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