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

Merge branch 'master' into gzip-map

Browse source
This commit is contained in:
Azgaar 2023-08-15 12:24:02 +04:00 • committed by GitHub
commit 538f3e05e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
index.html
View file

@ -8005,7 +8005,6 @@
<script defer src="modules/coa-renderer.js?v=1.91.00"></script> <script defer src="modules/coa-renderer.js?v=1.91.00"></script>
<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.93.00"></script> <script defer src="modules/io/save.js?v=1.93.00"></script>
<script defer src="modules/io/load.js?v=1.93.00"></script> <script defer src="modules/io/load.js?v=1.93.00"></script>
<script defer src="modules/io/cloud.js"></script> <script defer src="modules/io/cloud.js"></script>

6
modules/dynamic/auto-update.js
View file

@ -678,21 +678,21 @@ export function resolveVersionConflicts(version) {
// from 1.91.00 coaSize is moved to coa object // from 1.91.00 coaSize is moved to coa object
pack.states.forEach(state => { pack.states.forEach(state => {
if (state.coaSize) { if (state.coaSize && state.coa) {
state.coa.size = state.coaSize; state.coa.size = state.coaSize;
delete state.coaSize; delete state.coaSize;
} }
}); });
pack.provinces.forEach(province => { pack.provinces.forEach(province => {
if (province.coaSize) { if (province.coaSize && province.coa) {
province.coa.size = province.coaSize; province.coa.size = province.coaSize;
delete province.coaSize; delete province.coaSize;
} }
}); });
pack.burgs.forEach(burg => { pack.burgs.forEach(burg => {
if (burg.coaSize) { if (burg.coaSize && burg.coa) {
burg.coa.size = burg.coaSize; burg.coa.size = burg.coaSize;
delete burg.coaSize; delete burg.coaSize;
} }

2
modules/io/load.js
View file

@ -452,7 +452,7 @@ async function parseLoadedData(data) {
{ {
// dynamically import and run auto-udpdate script // dynamically import and run auto-udpdate script
const versionNumber = parseFloat(params[0]); const versionNumber = parseFloat(params[0]);
const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.92.04"); const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.92.05");
resolveVersionConflicts(versionNumber); resolveVersionConflicts(versionNumber);
} }