pull master

This commit is contained in:
mosuzi 2023-07-18 02:08:39 +08:00
commit e6457c4e4e
25 changed files with 930 additions and 447 deletions

View file

@ -40,6 +40,7 @@
<style type="text/css">
body {
margin: 0;
top: 0 !important;
font-size: 10px;
overflow: hidden;
}
@ -127,7 +128,7 @@
}
</style>
<link rel="preload" href="index.css?v=1.89.13" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="index.css?v=1.89.21" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="icons.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="libs/jquery-ui.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
</head>
@ -362,10 +363,10 @@
<use href="#rose" x="50%" y="50%" />
</svg>
<div id="loading-typography">
<div id="titleName"><t data-t="titleName">Azgaar's</t></div>
<div id="title"><t data-t="title">Fantasy Map Generator</t></div>
<div id="versionText"><t data-t="version">v</t><span id="version"></span></div>
<p id="loading-text"><t data-t="loading">LOADING</t><span>.</span><span>.</span><span>.</span></p>
<div id="titleName">Azgaar's</div>
<div id="title">Fantasy Map Generator</div>
<div id="versionText"></div>
<p id="loading-text">LOADING<span>.</span><span>.</span><span>.</span></p>
</div>
</div>
@ -373,7 +374,6 @@
<div id="collapsible">
<button
id="optionsTrigger"
data-t="tipOptionsTrigger"
data-tip="Click to show the Menu"
data-shortcut="Tab"
class="options glow"
@ -383,24 +383,22 @@
</button>
<button
id="regenerate"
data-t="tipRegenerate"
data-tip="Click to generate a new map"
data-shortcut="F2"
onclick="regeneratePrompt()"
class="options"
style="display: none"
>
<t data-t="newMap">New Map!</t>
New Map!
</button>
</div>
<div id="options" style="display: none">
<div class="drag-trigger" data-t="optionsDragTrigger" data-tip="Drag to move the Menu"></div>
<div class="drag-trigger" data-tip="Drag to move the Menu"></div>
<div class="tab">
<button
id="optionsHide"
data-t="optionsHide"
data-tip="Click to hide the Menu"
data-shortcut="Tab or Esc"
class="options"
@ -408,26 +406,11 @@
>
</button>
<button id="layersTab" data-t="layersTab" data-tip="Click to change map layers" class="options active">
<t data-t="layers">Layers</t>
</button>
<button id="styleTab" data-t="styleTab" data-tip="Click to open style editor" class="options">
<t data-t="style">Style</t>
</button>
<button
id="optionsTab"
data-t="optionsTab"
data-tip="Click to change generation and UI options"
class="options"
>
<t data-t="options">Options</t>
</button>
<button id="toolsTab" data-t="toolsTab" data-tip="Click to open tools menu" class="options">
<t data-t="tools">Tools</t>
</button>
<button id="aboutTab" data-t="aboutTab" data-tip="Click to see Generator info" class="options">
<t data-t="about">About</t>
</button>
<button id="layersTab" data-tip="Click to change map layers" class="options active">Layers</button>
<button id="styleTab" data-tip="Click to open style editor" class="options">Style</button>
<button id="optionsTab" data-tip="Click to change generation and UI options" class="options">Options</button>
<button id="toolsTab" data-tip="Click to open tools menu" class="options">Tools</button>
<button id="aboutTab" data-tip="Click to see Generator info" class="options">About</button>
</div>
<div id="layersContent" class="tabcontent" style="display: block">
@ -1707,18 +1690,6 @@
Generator settings:
</p>
<table>
<tr data-tip="Set what Generator should do on opening">
<td></td>
<td>Onload behavior</td>
<td>
<select id="onloadMap" data-stored="onloadMap">
<option value="random" selected>Generate random map</option>
<option value="saved">Open last saved map</option>
</select>
</td>
<td></td>
</tr>
<tr
data-tip="Set user interface size. Please note browser zoom also affects interface size (Ctrl + or Ctrl - to change)"
>
@ -1767,6 +1738,33 @@
</td>
</tr>
<tr data-tip="Set autosave interval in minutes. Set 0 to disable autosave. Map is saved to browser memory">
<td></td>
<td>Autosave interval</td>
<td>
<input
id="autosaveIntervalInput"
data-stored="autosaveInterval"
type="range"
min="0"
max="60"
step="1"
value="15"
/>
</td>
<td>
<input
id="autosaveIntervalOutput"
data-stored="autosaveInterval"
type="number"
min="0"
max="60"
step="1"
value="15"
/>
</td>
</tr>
<tr data-tip="Select speech synthesis voice to pronounce generated names">
<td></td>
<td>Speaker voice</td>
@ -1905,17 +1903,19 @@
<td></td>
</tr>
<!-- <tr data-tip="Select language (not all languages are fully supported). Reload the page to apply">
<td></td>
<td>Language</td>
<td>
<select id="selectLanguage" data-stored="lang">
<option value="en" selected>English (100%)</option>
<option value="ru">Русский (1%)</option>
</select>
</td>
<td></td>
</tr> -->
<tr
data-tip="Load Google Translate and select language. Note that automatic translation can break some page functional. In this case reset the language back to English or refresh the page"
>
<td>
<i data-tip="Reset language to English" id="resetLanguage" class="icon-ccw"></i>
</td>
<td>Language</td>
<td>
<button id="loadGoogleTranslateButton">Init Google Translate</button>
<div id="google_translate_element"></div>
</td>
<td></td>
</tr>
</table>
<div>
@ -2057,7 +2057,7 @@
>
Military
</button>
<button id="regenerateIce" data-tip="Click to icebergs and glaciers">Ice</button>
<button id="regenerateIce" data-tip="Click to regenerate icebergs and glaciers">Ice</button>
<button id="regenerateMarkers" data-tip="Click to regenerate unlocked markers">
Markers <i id="configRegenerateMarkers" class="icon-cog" data-tip="Click to set number multiplier"></i>
</button>
@ -2257,7 +2257,8 @@
<a data-tip="Click to see list of supporters" onclick="showSupporters()">all supporters</a> on Patreon!
</p>
<!-- <div style="display: flex; justify-content: center; padding: 0.4em">
<!-- <div style="display: flex; justify-content: center; padding: 0.8em 0.4em 0.4em; font-family: cursive">
<a
href="https://war.ukraine.ua/support-ukraine"
style="width: 80%"
@ -3254,7 +3255,7 @@
style="margin-left: 0.1em"
></i>
</div>
<iframe id="mfcgPreview" sandbox="allow-scripts allow-same-origin"></iframe>
<iframe id="mfcgPreview" sandbox="allow-scripts"></iframe>
</div>
</div>
@ -4917,7 +4918,10 @@
>
Any image
</button>
<button id="emblemsUploadSVG" data-tip="Upload prepared SVG image, e.g. SVG from Armoria">
<button
id="emblemsUploadSVG"
data-tip="Upload prepared SVG image (SVG from Armoria or SVG processed with 'Optimize vector' tool)"
>
Prepared SVG
</button>
<a
@ -5809,7 +5813,7 @@
</button>
<button
onclick="quickSave()"
data-tip="Save the project to browser storage. It can be unreliable"
data-tip="Save the project to browser storage. It will overwrite the latest autosave"
data-shortcut="F6"
>
browser
@ -7838,9 +7842,10 @@
<script src="libs/d3.min.js"></script>
<script src="libs/priority-queue.min.js"></script>
<script src="libs/delaunator.min.js"></script>
<script src="libs/indexedDB.js?v=1.89.32"></script>
<script src="utils/shorthands.js"></script>
<script src="utils/commonUtils.js"></script>
<script src="utils/commonUtils.js?v=1.89.29"></script>
<script src="utils/arrayUtils.js"></script>
<script src="utils/colorUtils.js"></script>
<script src="utils/graphUtils.js?v=1.88.02"></script>
@ -7863,32 +7868,32 @@
<script src="modules/cultures-generator.js?v=1.89.10"></script>
<script src="modules/burgs-and-states.js?v=1.89.07"></script>
<script src="modules/routes-generator.js"></script>
<script src="modules/religions-generator.js?v=1.89.15"></script>
<script src="modules/religions-generator.js?v=1.89.28"></script>
<script src="modules/military-generator.js"></script>
<script src="modules/markers-generator.js?v=1.87.13"></script>
<script src="modules/markers-generator.js?v=1.89.23"></script>
<script src="modules/coa-generator.js"></script>
<script src="modules/submap.js?v=1.88.05"></script>
<script src="libs/polylabel.min.js"></script>
<script src="libs/lineclip.min.js"></script>
<script src="libs/alea.min.js"></script>
<script src="modules/fonts.js"></script>
<script src="modules/fonts.js?v=1.89.18"></script>
<script src="modules/ui/layers.js"></script>
<script src="modules/ui/measurers.js?v=1.87.02"></script>
<script src="modules/ui/stylePresets.js?v=1.89.11"></script>
<script src="modules/ui/general.js?v=1.87.03"></script>
<script src="modules/ui/options.js?v=1.88.14"></script>
<script src="main.js?v=1.89.12"></script>
<script src="modules/ui/options.js?v=1.89.19"></script>
<script src="main.js?v=1.89.32"></script>
<script defer src="modules/relief-icons.js"></script>
<script defer src="modules/ui/style.js"></script>
<script defer src="modules/ui/editors.js?v=1.89.12"></script>
<script defer src="modules/ui/tools.js?v=1.89.13"></script>
<script defer src="modules/ui/tools.js?v=1.89.27"></script>
<script defer src="modules/ui/world-configurator.js"></script>
<script defer src="modules/ui/heightmap-editor.js?v=1.89.06"></script>
<script defer src="modules/ui/provinces-editor.js?v=1.89.00"></script>
<script defer src="modules/ui/biomes-editor.js"></script>
<script defer src="modules/ui/namesbase-editor.js?v=1.87.10"></script>
<script defer src="modules/ui/namesbase-editor.js?v=1.89.26"></script>
<script defer src="modules/ui/elevation-profile.js"></script>
<script defer src="modules/ui/temperature-graph.js"></script>
<script defer src="modules/ui/routes-editor.js?v=1.89.04"></script>
@ -7904,14 +7909,14 @@
<script defer src="modules/ui/notes-editor.js?v=1.89.03"></script>
<script defer src="modules/ui/diplomacy-editor.js?v=1.88.04"></script>
<script defer src="modules/ui/zones-editor.js"></script>
<script defer src="modules/ui/burgs-overview.js"></script>
<script defer src="modules/ui/burgs-overview.js?v=1.89.20"></script>
<script defer src="modules/ui/rivers-overview.js"></script>
<script defer src="modules/ui/military-overview.js"></script>
<script defer src="modules/ui/regiments-overview.js"></script>
<script defer src="modules/ui/markers-overview.js"></script>
<script defer src="modules/ui/regiments-overview.js?v=1.89.20"></script>
<script defer src="modules/ui/markers-overview.js?v=1.89.20"></script>
<script defer src="modules/ui/regiment-editor.js"></script>
<script defer src="modules/ui/battle-screen.js"></script>
<script defer src="modules/ui/emblems-editor.js"></script>
<script defer src="modules/ui/emblems-editor.js?v=1.89.21"></script>
<script defer src="modules/ui/markers-editor.js"></script>
<script defer src="modules/ui/3d.js"></script>
<script defer src="modules/ui/submap.js"></script>
@ -7920,10 +7925,10 @@
<script defer src="libs/rgbquant.min.js"></script>
<script defer src="libs/jquery.ui.touch-punch.min.js"></script>
<script defer src="modules/io/save.js"></script>
<script defer src="modules/io/load.js?v=1.88.05"></script>
<script defer src="modules/io/save.js?v=1.89.29"></script>
<script defer src="modules/io/load.js?v=1.89.30"></script>
<script defer src="modules/io/cloud.js"></script>
<script defer src="modules/io/export.js"></script>
<script defer src="modules/io/export.js?v=1.89.17"></script>
<script defer src="modules/io/formats.js"></script>
<!-- Web Components -->