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

v1.5.35 - fixed #569

Browse source
This commit is contained in:
Azgaar 2021-02-15 23:12:13 +03:00
parent cd7b9549c0
commit 5ba7653ad9
5 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -2863,8 +2863,8 @@
<div id="emblemsBottom"> <div id="emblemsBottom">
<button id="emblemsRegenerate" data-tip="Regenerate emblem" class="icon-shuffle"></button> <button id="emblemsRegenerate" data-tip="Regenerate emblem" class="icon-shuffle"></button>
<button id="emblemsArmoria" data-tip="Edit the emblem in Armoria - dedicated heraldry editor. Download emblem and upload it back map the generator" class="icon-brush"></button> <button id="emblemsArmoria" data-tip="Edit the emblem in Armoria - dedicated heraldry editor. Download emblem and upload it back map the generator" class="icon-brush"></button>
<button id="emblemsUpload" data-tip="Upload png, jpg or svg image from Armoria or other sources as emblem" class="icon-upload"></button>
<button id="emblemsDownload" data-tip="Set size, select file format and download emblem image" class="icon-download"></button> <button id="emblemsDownload" data-tip="Set size, select file format and download emblem image" class="icon-download"></button>
<button id="emblemsUpload" data-tip="Upload png, jpg or svg image from Armoria or other sources as emblem" class="icon-upload"></button>
<button id="emblemsGallery" data-tip="Download emblems gallery as html document (open in browser; downloading takes some time)" class="icon-layer-group"></button> <button id="emblemsGallery" data-tip="Download emblems gallery as html document (open in browser; downloading takes some time)" class="icon-layer-group"></button>
<button id="emblemsFocus" data-tip="Show emblem associated area or place" class="icon-target"></button> <button id="emblemsFocus" data-tip="Show emblem associated area or place" class="icon-target"></button>
</div> </div>

2
libs/jquery-ui.css vendored
View file

@ -434,7 +434,7 @@ body .ui-dialog {
font-family: Arial,Helvetica,sans-serif; font-family: Arial,Helvetica,sans-serif;
font-size: 1em; font-size: 1em;
} }
.ui-widget button { .ui-widget button[class^="icon-"] {
padding: 1px 6px; padding: 1px 6px;
} }
.ui-widget.ui-widget-content { .ui-widget.ui-widget-content {

2
modules/coa-generator.js
View file

@ -467,7 +467,7 @@
const emblemShape = document.getElementById("emblemShape").value; const emblemShape = document.getElementById("emblemShape").value;
if (emblemShape === "state" && state && pack.states[state].coa) return pack.states[state].coa.shield; if (emblemShape === "state" && state && pack.states[state].coa) return pack.states[state].coa.shield;
if (pack.cultures[culture].shield) return pack.cultures[culture].shield; if (pack.cultures[culture].shield) return pack.cultures[culture].shield;
console.error("Emblem shape is not defined on culture level", pack.cultures[culture]); console.error("Shield shape is not defined on culture level", pack.cultures[culture]);
return "heater"; return "heater";
} }

22
modules/save-and-load.js
View file

@ -1060,27 +1060,31 @@ function parseLoadedData(data) {
} }
if (version < 1.5) { if (version < 1.5) {
// v 1.5 added emblems
emblems = viewbox.append("g").attr("id", "emblems").style("display", "none");
emblems.append("g").attr("id", "burgEmblems");
emblems.append("g").attr("id", "provinceEmblems");
emblems.append("g").attr("id", "stateEmblems");
regenerateEmblems();
toggleEmblems();
// not need to store default styles from v 1.5 // not need to store default styles from v 1.5
localStorage.removeItem("styleClean"); localStorage.removeItem("styleClean");
localStorage.removeItem("styleGloom"); localStorage.removeItem("styleGloom");
localStorage.removeItem("styleAncient"); localStorage.removeItem("styleAncient");
localStorage.removeItem("styleMonochrome"); localStorage.removeItem("styleMonochrome");
// v 1.5 cultures has shield attribute
pack.cultures.forEach(culture => {
if (culture.removed) return;
culture.shield = Cultures.getRandomShield();
});
// v 1.5 added burg type value // v 1.5 added burg type value
pack.burgs.forEach(burg => { pack.burgs.forEach(burg => {
if (!burg.i || burg.removed) return; if (!burg.i || burg.removed) return;
burg.type = BurgsAndStates.getType(burg.cell, burg.port); burg.type = BurgsAndStates.getType(burg.cell, burg.port);
}); });
BurgsAndStates.getType(cell, false); // v 1.5 added emblems
emblems = viewbox.insert("g", "#population").attr("id", "emblems").style("display", "none");
emblems.append("g").attr("id", "burgEmblems");
emblems.append("g").attr("id", "provinceEmblems");
emblems.append("g").attr("id", "stateEmblems");
regenerateEmblems();
toggleEmblems();
} }
}() }()

2
modules/ui/emblems-editor.js
View file

@ -181,7 +181,7 @@ function editEmblem(type, id, el) {
function openInArmoria() { function openInArmoria() {
const coa = el.coa && el.coa !== "custom" ? el.coa : {t1: "sable"}; const coa = el.coa && el.coa !== "custom" ? el.coa : {t1: "sable"};
const json = JSON.stringify(coa).replaceAll("#", "%23"); const json = JSON.stringify(coa).replaceAll("#", "%23");
const url = `http://azgaar.github.io/Armoria/?coa=${json}&from=FMG`; const url = `https://azgaar.github.io/Armoria/?coa=${json}&from=FMG`;
openURL(url); openURL(url);
} }