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: cultures upload

Browse source
This commit is contained in:
Azgaar 2022-06-28 22:11:32 +03:00
parent 6e95ee1be8
commit a617dda3ad
5 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,4 +1,3 @@
.bat
.vscode .vscode
.idea .idea
.DS_Store /node_modules

2
index.html
View file

@ -7825,7 +7825,7 @@
<script defer src="modules/ui/editors.js?v=1.87.01"></script> <script defer src="modules/ui/editors.js?v=1.87.01"></script>
<script defer src="modules/ui/tools.js?v=1.87.03"></script> <script defer src="modules/ui/tools.js?v=1.87.03"></script>
<script defer src="modules/ui/world-configurator.js"></script> <script defer src="modules/ui/world-configurator.js"></script>
<script defer src="modules/ui/heightmap-editor.js"></script> <script defer src="modules/ui/heightmap-editor.js?v=1.87.06"></script>
<script defer src="modules/ui/provinces-editor.js"></script> <script defer src="modules/ui/provinces-editor.js"></script>
<script defer src="modules/ui/biomes-editor.js"></script> <script defer src="modules/ui/biomes-editor.js"></script>
<script defer src="modules/ui/namesbase-editor.js"></script> <script defer src="modules/ui/namesbase-editor.js"></script>

23
modules/dynamic/editors/cultures-editor.js
View file

@ -883,7 +883,9 @@ async function uploadCulturesData() {
} }
current.removed = false; current.removed = false;
current.name = c.culture; current.name = c.name;
if (current.i) {
current.code = abbreviate( current.code = abbreviate(
current.name, current.name,
cultures.map(c => c.code) cultures.map(c => c.code)
@ -891,10 +893,27 @@ async function uploadCulturesData() {
current.color = c.color; current.color = c.color;
current.expansionism = +c.expansionism; current.expansionism = +c.expansionism;
current.origins = JSON.parse(c.origins);
if (cultureTypes.includes(c.type)) current.type = c.type; if (cultureTypes.includes(c.type)) current.type = c.type;
else current.type = "Generic"; else current.type = "Generic";
}
function restoreOrigins(originsString) {
const originNames = originsString
.replaceAll('"', "")
.split(",")
.map(s => s.trim())
.filter(s => s);
const originIds = originNames.map(name => {
const id = cultures.findIndex(c => c.name === name);
return id === -1 ? null : id;
});
current.origins = originIds.filter(id => id !== null);
if (!current.origins.length) current.origins = [0];
}
c.origins = current.i ? restoreOrigins(c.origins) : [null];
const shieldShape = c["emblems shape"].toLowerCase(); const shieldShape = c["emblems shape"].toLowerCase();
if (shapes.includes(shieldShape)) current.shield = shieldShape; if (shapes.includes(shieldShape)) current.shield = shieldShape;

2
modules/ui/editors.js
View file

@ -1182,7 +1182,7 @@ async function editStates() {
async function editCultures() { async function editCultures() {
if (customization) return; if (customization) return;
const Editor = await import("../dynamic/editors/cultures-editor.js?v=1.87.01"); const Editor = await import("../dynamic/editors/cultures-editor.js?v=1.87.06");
Editor.open(); Editor.open();
} }

2
versioning.js
View file

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