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: 1.103.02 - parse old .map - markers data fix

Browse source
This commit is contained in:
Azgaar 2024-09-04 22:30:24 +02:00
parent 637aa398bb
commit 0b8d3c63fc
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

@ -8069,7 +8069,7 @@
<script src="modules/routes-generator.js?v=1.99.04"></script> <script src="modules/routes-generator.js?v=1.99.04"></script>
<script src="modules/religions-generator.js?v=1.99.05"></script> <script src="modules/religions-generator.js?v=1.99.05"></script>
<script src="modules/military-generator.js?v=1.99.00"></script> <script src="modules/military-generator.js?v=1.99.00"></script>
<script src="modules/markers-generator.js?v=1.99.00"></script> <script src="modules/markers-generator.js?v=1.103.02"></script>
<script src="modules/zones-generator.js?v=1.100.00"></script> <script src="modules/zones-generator.js?v=1.100.00"></script>
<script src="modules/coa-generator.js?v=1.99.00"></script> <script src="modules/coa-generator.js?v=1.99.00"></script>
<script src="modules/submap.js?v=1.100.00"></script> <script src="modules/submap.js?v=1.100.00"></script>
@ -8129,7 +8129,7 @@
<script defer src="libs/rgbquant.min.js"></script> <script defer src="libs/rgbquant.min.js"></script>
<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?v=1.100.00"></script> <script defer src="modules/io/save.js?v=1.100.00"></script>
<script defer src="modules/io/load.js?v=1.103.01"></script> <script defer src="modules/io/load.js?v=1.103.02"></script>
<script defer src="modules/io/cloud.js?v=1.99.00"></script> <script defer src="modules/io/cloud.js?v=1.99.00"></script>
<script defer src="modules/io/export.js?v=1.100.00"></script> <script defer src="modules/io/export.js?v=1.100.00"></script>
</body> </body>

4
modules/io/load.js
View file

@ -114,7 +114,7 @@ function uploadMap(file, callback) {
const isInvalid = !mapData || !isValidVersion(mapVersion) || mapData.length < 26 || !mapData[5]; const isInvalid = !mapData || !isValidVersion(mapVersion) || mapData.length < 26 || !mapData[5];
const isUpdated = compareVersions(mapVersion, VERSION).isEqual; const isUpdated = compareVersions(mapVersion, VERSION).isEqual;
const isAncient = compareVersions(mapVersion, "0.7.0").isOlder; const isAncient = compareVersions(mapVersion, "0.70.0").isOlder;
const isNewer = compareVersions(mapVersion, VERSION).isNewer; const isNewer = compareVersions(mapVersion, VERSION).isNewer;
const isOutdated = compareVersions(mapVersion, VERSION).isOlder; const isOutdated = compareVersions(mapVersion, VERSION).isOlder;
@ -153,7 +153,7 @@ async function parseLoadedResult(result) {
const mapData = decoded.split("\r\n"); const mapData = decoded.split("\r\n");
const mapVersionString = mapData[0].split("|")[0] || mapData[0] || ""; const mapVersionString = mapData[0].split("|")[0] || mapData[0] || "";
const [major, minor, patch = "00"] = mapVersionString.split("."); const [major, minor, patch = 0] = mapVersionString.split(".").map(parseFloat);
const mapVersion = `${major}.${minor}.${patch}`; const mapVersion = `${major}.${minor}.${patch}`;
return [mapData, mapVersion]; return [mapData, mapVersion];

2
modules/markers-generator.js
View file

@ -117,6 +117,7 @@ window.Markers = (function () {
while (quantity && candidates.length) { while (quantity && candidates.length) {
const [cell] = extractAnyElement(candidates); const [cell] = extractAnyElement(candidates);
const marker = addMarker({icon, type, dx, dy, px}, {cell}); const marker = addMarker({icon, type, dx, dy, px}, {cell});
if (!marker) continue;
add("marker" + marker.i, cell); add("marker" + marker.i, cell);
quantity--; quantity--;
} }
@ -150,6 +151,7 @@ window.Markers = (function () {
} }
function addMarker(base, marker) { function addMarker(base, marker) {
if (marker.cell === undefined) return;
const i = last(pack.markers)?.i + 1 || 0; const i = last(pack.markers)?.i + 1 || 0;
const [x, y] = getMarkerCoordinates(marker.cell); const [x, y] = getMarkerCoordinates(marker.cell);
marker = {...base, x, y, ...marker, i}; marker = {...base, x, y, ...marker, i};

2
versioning.js
View file

@ -12,7 +12,7 @@
* *
* Example: 1.102.0 -> Major version 1, Minor version 102, Patch version 0 * Example: 1.102.0 -> Major version 1, Minor version 102, Patch version 0
*/ */
const VERSION = "1.103.01"; const VERSION = "1.103.02";
{ {
document.title += " v" + VERSION; document.title += " v" + VERSION;