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: check scheme before setting

Browse source
This commit is contained in:
Azgaar 2024-03-24 17:53:00 +01:00
parent ff39143b84
commit af927ed345
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -8093,7 +8093,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.96.00"></script> <script defer src="modules/io/save.js?v=1.96.00"></script>
<script defer src="modules/io/load.js?v=1.97.02"></script> <script defer src="modules/io/load.js?v=1.97.04"></script>
<script defer src="modules/io/cloud.js?v=1.96.00"></script> <script defer src="modules/io/cloud.js?v=1.96.00"></script>
<script defer src="modules/io/export.js?v=1.97.03"></script> <script defer src="modules/io/export.js?v=1.97.03"></script>

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

@ -743,7 +743,7 @@ export function resolveVersionConflicts(version) {
const opacity = terrs.attr("opacity"); const opacity = terrs.attr("opacity");
const filter = terrs.attr("filter"); const filter = terrs.attr("filter");
const scheme = terrs.attr("scheme"); const scheme = terrs.attr("scheme") || "bright";
const terracing = terrs.attr("terracing"); const terracing = terrs.attr("terracing");
const skip = terrs.attr("skip"); const skip = terrs.attr("skip");
const relax = terrs.attr("relax"); const relax = terrs.attr("relax");

10
modules/io/load.js
View file

@ -456,16 +456,16 @@ async function parseLoadedData(data, mapVersion) {
{ {
// dynamically import and run auto-update script // dynamically import and run auto-update script
const versionNumber = parseFloat(params[0]); const versionNumber = parseFloat(params[0]);
const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.97.00"); const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.97.04");
resolveVersionConflicts(versionNumber); resolveVersionConflicts(versionNumber);
} }
// add custom heightmap color scheme if any // add custom heightmap color scheme if any
if (heightmapColorSchemes) { if (heightmapColorSchemes) {
const oceanScheme = terrs.select("#oceanHeights").attr("scheme"); const oceanScheme = byId("oceanHeights")?.getAttribute("scheme");
const landScheme = terrs.select("#landHeights").attr("scheme"); if (oceanScheme && !(oceanScheme in heightmapColorSchemes)) addCustomColorScheme(oceanScheme);
if (!(oceanScheme in heightmapColorSchemes)) addCustomColorScheme(oceanScheme); const landScheme = byId("#landHeights")?.getAttribute("scheme");
if (!(landScheme in heightmapColorSchemes)) addCustomColorScheme(landScheme); if (landScheme && !(landScheme in heightmapColorSchemes)) addCustomColorScheme(landScheme);
} }
{ {

2
versioning.js
View file

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