Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into urquhart-routes

This commit is contained in:
Azgaar 2024-07-29 15:40:28 +02:00
commit c4370774e4
27 changed files with 423 additions and 294 deletions

View file

@ -138,7 +138,7 @@
}
</style>
<link rel="preload" href="index.css?v=1.96.00" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="index.css?v=1.98.01" 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>
@ -380,7 +380,7 @@
<rect x="-1%" y="-1%" width="102%" height="102%" fill="url(#oceanic)" />
</svg>
<svg id="loading-rose" width="100%" height="100%" viewBox="0 0 700 700">
<use href="#rose" x="50%" y="50%" />
<use href="#defs-compass-rose" x="50%" y="50%" />
</svg>
<div id="loading-typography">
<div id="titleName">Azgaar's</div>
@ -469,9 +469,7 @@
onclick="removePreset()"
></button>
<p data-tip="Click to toggle a layer, drag to raise or lower a layer. Ctrl + click to edit layer style">
Displayed layers and layers order:
</p>
<p>Displayed layers and layers order:</p>
<ul
data-tip="Click to toggle a layer, drag to raise or lower a layer. Ctrl + click to edit layer style"
id="mapLayers"
@ -717,13 +715,15 @@
<li
id="toggleVignette"
data-tip="Vignette (border fading): click to toggle. Ctrl + click to edit style"
data-shortcut="[ (left bracket)"
data-shortcut="[ (left square bracket)"
onclick="toggleVignette(event)"
class="solid"
>
Vignette
</li>
</ul>
<div class="tip">Click to toggle, drag to raise or lower the layer</div>
<div class="tip">Ctrl + click to edit layer style</div>
<div id="viewMode" data-tip="Set view node">
<p>View mode:</p>
@ -1317,6 +1317,12 @@
<td><select id="styleStatesBodyFilter" /></td>
</tr>
<tr style="margin-top: 0.8em">
<td style="font-style: italic">
Halo is only rendered if "Rendering" option is set to "Best quality"!
</td>
</tr>
<tr data-tip="Set states halo effect width">
<td>Halo width</td>
<td>
@ -2063,23 +2069,16 @@
</div>
<div id="toolsContent" class="tabcontent">
<p>Click to configure:</p>
<div>
<button
id="editHeightmapButton"
data-tip="Click to open Heightmap customization menu"
data-shortcut="Shift + H"
>
Heightmap
</button>
<div class="separator">Edit</div>
<div class="grid">
<button id="editBiomesButton" data-tip="Click to open Biomes Editor" data-shortcut="Shift + B">
Biomes
</button>
<button id="editStatesButton" data-tip="Click to open States Editor" data-shortcut="Shift + S">
States
<button id="overviewBurgsButton" data-tip="Click to open Burgs Overview" data-shortcut="Shift + T">
Burgs
</button>
<button id="editProvincesButton" data-tip="Click to open Provinces Editor" data-shortcut="Shift + P">
Provinces
<button id="editCulturesButton" data-tip="Click to open Cultures Editor" data-shortcut="Shift + C">
Cultures
</button>
<button
id="editDiplomacyButton"
@ -2088,40 +2087,18 @@
>
Diplomacy
</button>
<button id="editCulturesButton" data-tip="Click to open Cultures Editor" data-shortcut="Shift + C">
Cultures
</button>
<button id="editNamesBaseButton" data-tip="Click to open Namesbase Editor" data-shortcut="Shift + N">
Namesbase
</button>
<button id="editZonesButton" data-tip="Click to open Zones Editor" data-shortcut="Shift + Z">Zones</button>
<button id="editReligions" data-tip="Click to open Religions Editor" data-shortcut="Shift + R">
Religions
</button>
<button id="editEmblemButton" data-tip="Click to open Emblem Editor" data-shortcut="Shift + Y">
Emblems
</button>
<button id="editUnitsButton" data-tip="Click to open Units Editor" data-shortcut="Shift + Q">Units</button>
<button id="editNotesButton" data-tip="Click to open Notes Editor" data-shortcut="Shift + O">Notes</button>
</div>
<p>Click to overview:</p>
<div>
<button
id="overviewChartsButton"
data-tip="Click to open Charts to overview cells data"
data-shortcut="Shift + A"
id="editHeightmapButton"
data-tip="Click to open Heightmap customization menu"
data-shortcut="Shift + H"
>
Charts
Heightmap
</button>
<button id="overviewBurgsButton" data-tip="Click to open Burgs Overview" data-shortcut="Shift + T">
Burgs
</button>
<button id="overviewRoutesButton" data-tip="Click to open Routes Overview" data-shortcut="Shift + U">
Routes
</button>
<button id="overviewRiversButton" data-tip="Click to open Rivers Overview" data-shortcut="Shift + V">
Rivers
<button id="overviewMarkersButton" data-tip="Click to open Markers Overview" data-shortcut="Shift + K">
Markers
</button>
<button
id="overviewMilitaryButton"
@ -2130,41 +2107,58 @@
>
Military
</button>
<button id="overviewMarkersButton" data-tip="Click to open Markers Overview" data-shortcut="Shift + K">
Markers
<button id="editNamesBaseButton" data-tip="Click to open Namesbase Editor" data-shortcut="Shift + N">
Namesbase
</button>
<button id="overviewCellsButton" data-tip="Click to open Cell details view" data-shortcut="Shift + E">
Cells
<button id="editNotesButton" data-tip="Click to open Notes Editor" data-shortcut="Shift + O">Notes</button>
<button id="editProvincesButton" data-tip="Click to open Provinces Editor" data-shortcut="Shift + P">
Provinces
</button>
<button id="editReligions" data-tip="Click to open Religions Editor" data-shortcut="Shift + R">
Religions
</button>
<button id="overviewRiversButton" data-tip="Click to open Rivers Overview" data-shortcut="Shift + V">
Rivers
</button>
<button id="overviewRoutesButton" data-tip="Click to open Routes Overview" data-shortcut="Shift + U">
Routes
</button>
<button id="editStatesButton" data-tip="Click to open States Editor" data-shortcut="Shift + S">
States
</button>
<button id="editUnitsButton" data-tip="Click to open Units Editor" data-shortcut="Shift + Q">Units</button>
<button id="editZonesButton" data-tip="Click to open Zones Editor" data-shortcut="Shift + Z">Zones</button>
</div>
<p>Click to regenerate:</p>
<div id="regenerateFeature">
<div class="separator">Regenerate</div>
<div id="regenerateFeature" class="grid">
<button
id="regenerateBurgs"
data-tip="Click to regenerate all unlocked burgs and routes. States will remain as they are. Note: burgs are only generated in populated areas with culture assigned"
>
Burgs
</button>
<button id="regenerateCultures" data-tip="Click to regenerate non-locked cultures">Cultures</button>
<button id="regenerateEmblems" data-tip="Click to regenerate all emblems">Emblems</button>
<button id="regenerateIce" data-tip="Click to regenerate icebergs and glaciers">Ice</button>
<button
id="regenerateStateLabels"
data-tip="Click to update state labels placement based on current borders"
>
Labels
</button>
<button
id="regenerateReliefIcons"
data-tip="Click to regenerate all relief icons based on current cell biome and elevation"
>
Relief
<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>
<button id="regenerateRoutes" data-tip="Click to regenerate all routes">Routes</button>
<button id="regenerateRivers" data-tip="Click to regenerate all rivers (restore default state)">
Rivers
<button
id="regenerateMilitary"
data-tip="Click to recalculate military forces based on current military options"
>
Military
</button>
<button id="regeneratePopulation" data-tip="Click to recalculate rural and urban population">
Population
</button>
<button
id="regenerateStates"
data-tip="Click to select new capitals and regenerate non-locked states. Emblems and military forces will be regenerated as well, burgs will remain as they are"
>
States
</button>
<button
id="regenerateProvinces"
data-tip="Click to regenerate non-locked provinces. States will remain as they are"
@ -2172,23 +2166,21 @@
Provinces
</button>
<button
id="regenerateBurgs"
data-tip="Click to regenerate all unlocked burgs and routes. States will remain as they are. Note: burgs are only generated in populated areas with culture assigned"
id="regenerateReliefIcons"
data-tip="Click to regenerate all relief icons based on current cell biome and elevation"
>
Burgs
Relief
</button>
<button id="regenerateEmblems" data-tip="Click to regenerate all emblems">Emblems</button>
<button id="regenerateReligions" data-tip="Click to regenerate non-locked religions">Religions</button>
<button id="regenerateCultures" data-tip="Click to regenerate non-locked cultures">Cultures</button>
<button
id="regenerateMilitary"
data-tip="Click to recalculate military forces based on current military options"
>
Military
<button id="regenerateRivers" data-tip="Click to regenerate all rivers (restore default state)">
Rivers
</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 id="regenerateRoutes" data-tip="Click to regenerate all routes">Routes</button>
<button
id="regenerateStates"
data-tip="Click to select new capitals and regenerate non-locked states. Emblems and military forces will be regenerated as well, burgs will remain as they are"
>
States
</button>
<button
id="regenerateZones"
@ -2198,8 +2190,8 @@
</button>
</div>
<p>Click to add:</p>
<div id="addFeature">
<div class="separator">Add</div>
<div id="addFeature" class="grid">
<button
id="addBurgTool"
data-tip="Click on map to place a burg. Hold Shift to add multiple"
@ -2214,14 +2206,6 @@
>
Label
</button>
<button
id="addRiver"
data-tip="Click on map to place a river. Hold Shift to add multiple"
data-shortcut="Shift + 3"
>
River
</button>
<button id="addRoute" data-tip="Open route creation dialog" data-shortcut="Shift + 4">Route</button>
<button
id="addMarker"
data-tip="Click on map to place a marker. Hold Shift to add multiple"
@ -2229,10 +2213,36 @@
>
Marker
</button>
<button
id="addRiver"
data-tip="Click on map to place a river. Hold Shift to add multiple"
data-shortcut="Shift + 3"
>
River
</button>
<<<<<<< HEAD
<button id="addRoute" data-tip="Open route creation dialog" data-shortcut="Shift + 4">Route</button>
=======
<button id="addRoute" data-tip="Click on map to place a route" data-shortcut="Shift + 4">Route</button>
</div>
<p>Click to create a new map:</p>
<div>
<div class="separator">Show</div>
<div class="grid">
<button id="overviewCellsButton" data-tip="Click to open Cell details view" data-shortcut="Shift + E">
Cells
</button>
>>>>>>> 00abd5213b446922a60e2053eaca711a6d4067e2
<button
id="overviewChartsButton"
data-tip="Click to open Charts to overview cells data"
data-shortcut="Shift + A"
>
Charts
</button>
</div>
<div class="separator">Create</div>
<div class="grid">
<button id="openSubmapMenu" data-tip="Click to generate a submap from the current viewport">Submap</button>
<button id="openResampleMenu" data-tip="Click to transform the map">Transform</button>
</div>
@ -2321,8 +2331,7 @@
<div id="aboutContent" class="tabcontent">
<p>
<a href="https://github.com/Azgaar/Fantasy-Map-Generator" target="_blank">Fantasy Map Generator</a> is a
free
<a href="https://github.com/Azgaar/Fantasy-Map-Generator" target="_blank">Fantasy Map Generator</a> is an
<a href="https://github.com/Azgaar/Fantasy-Map-Generator/blob/master/LICENSE" target="_blank"
>open source</a
>
@ -2341,7 +2350,7 @@
<p>
Join our <a href="https://discordapp.com/invite/X7E84HU" target="_blank">Discord server</a> and
<a href="https://www.reddit.com/r/FantasyMapGenerator/" target="_blank">Reddit community</a> to ask
questions, get help and share maps.
questions, get help and share maps. The created maps can be used for free, even for commercial purposes.
</p>
<p>
@ -2539,15 +2548,15 @@
<i data-locked="0" id="lock_mapSize" class="icon-lock-open"></i>
<label data-tip="Set map size relative to the world size">
<i>Map size:</i>
<input id="mapSizeInput" data-stored="mapSize" type="number" min="1" max="100" />%
<input id="mapSizeOutput" data-stored="mapSize" type="range" min="1" max="100" />
<input id="mapSizeInput" data-stored="mapSize" type="number" min="1" max="100" step="0.1" />%
<input id="mapSizeOutput" data-stored="mapSize" type="range" min="1" max="100" step="0.1" />
</label>
</div>
<div>
<i data-locked="0" id="lock_latitude" class="icon-lock-open"></i>
<label data-tip="Set a North-South map shift">
<label data-tip="Set a North-South map shift, set to 50 to make map center lie on Equator">
<i>Latitudes:</i>
<input id="latitudeInput" data-stored="latitude" type="number" min="0" max="100" step="1" />
<input id="latitudeInput" data-stored="latitude" type="number" min="0" max="100" step="0.1" />
<br /><i>N</i
><input
id="latitudeOutput"
@ -2555,14 +2564,42 @@
type="range"
min="0"
max="100"
step="1"
step="0.1"
style="width: 10.3em"
/><i>S</i>
</label>
</div>
<div>
<label data-tip="Set precipitation - water amount clouds can bring. Defines rivers and biomes generation">
<i data-locked="0" id="lock_longitude" class="icon-lock-open"></i>
<label data-tip="Set a West-East map shift, set to 50 to make map center lie on Prime meridian">
<i>Longitudes:</i>
<input
id="longitudeInput"
data-stored="longitude"
type="number"
min="0"
max="100"
value="50"
step="0.1"
/>
<br /><i>W</i
><input
id="longitudeOutput"
data-stored="longitude"
type="range"
min="0"
max="100"
step="0.1"
style="width: 10.3em"
/><i>E</i>
</label>
</div>
<div>
<label
data-tip="Set precipitation - water amount clouds can bring. Defines rivers and biomes generation. Keep around 100% for default generation"
>
<i data-locked="0" id="lock_prec" class="icon-lock-open"></i>
<i>Precipitation:</i>
<input id="precInput" data-stored="prec" type="number" />%
@ -2637,8 +2674,10 @@
<text x="-15" y="190">60°</text>
<text x="-15" y="204">90°</text>
</g>
<circle id="globeOutline" cx="100" cy="100" r="100" />
<line id="globeEquator" x1="1" x2="199" y1="100" y2="100" />
<circle id="globeGradient" cx="100" cy="100" r="100" fill="url(#temperatureGradient)" stroke="none" />
<line id="globePrimeMeridian" x1="100" x2="100" y1="0" y2="200" />
<line id="globeEquator" x1="1" x2="200" y1="100" y2="100" />
<circle id="globeOutline" cx="100" cy="100" r="100" fill="none" />
<path id="globeGraticule" />
<path id="globeArea" />
</svg>
@ -2648,6 +2687,14 @@
</button>
</div>
</div>
<div style="margin-top: 0.3em">
<i>Presets:</i>
<button id="wcWholeWorld" data-tip="Click to set map size to cover the whole world">Whole world</button>
<button id="wcNorthern" data-tip="Click to set map size to cover the Northern latitudes">Northern</button>
<button id="wcTropical" data-tip="Click to set map size to cover the Tropical latitudes">Tropical</button>
<button id="wcSouthern" data-tip="Click to set map size to cover the Southern latitudes">Southern</button>
</div>
</div>
<div id="labelEditor" class="dialog" style="display: none">
@ -7894,18 +7941,19 @@
</symbol>
</g>
<g id="rose" stroke-width="1">
<g id="sL" stroke="#3f3f3f">
<g id="defs-compass-rose" stroke-width="1.1">
<g id="rose-coord-line" stroke="#3f3f3f">
<line id="sL1" x1="0" y1="-20000" x2="0" y2="20000" />
<line id="sL2" x1="-20000" y1="0" x2="20000" y2="0" />
</g>
<use href="#sL" transform="rotate(45)" />
<use href="#sL" transform="rotate(22.5)" />
<use href="#sL" transform="rotate(-22.5)" />
<use href="#sL" transform="rotate(11.25)" />
<use href="#sL" transform="rotate(-11.25)" />
<use href="#sL" transform="rotate(56.25)" />
<use href="#sL" transform="rotate(-56.25)" />
<use href="#rose-coord-line" transform="rotate(45)" />
<use href="#rose-coord-line" transform="rotate(22.5)" />
<use href="#rose-coord-line" transform="rotate(-22.5)" />
<use href="#rose-coord-line" transform="rotate(11.25)" />
<use href="#rose-coord-line" transform="rotate(-11.25)" />
<use href="#rose-coord-line" transform="rotate(56.25)" />
<use href="#rose-coord-line" transform="rotate(-56.25)" />
<g stroke-width="8" stroke-opacity="1" shape-rendering="geometricprecision">
<circle r="9" stroke="#000000" fill="#1b1b1b" />
<circle r="75" stroke="#008000" fill="#ffffff" fill-opacity=".1" />
@ -8136,7 +8184,7 @@
<script src="config/heightmap-templates.js"></script>
<script src="config/precreated-heightmaps.js"></script>
<script src="modules/heightmap-generator.js?v=1.88.00"></script>
<script src="modules/ocean-layers.js?v=1.96.00"></script>
<script src="modules/ocean-layers.js?v=1.98.04"></script>
<script src="modules/river-generator.js?v=1.89.13"></script>
<script src="modules/lakes.js"></script>
<script src="modules/biomes.js"></script>
@ -8158,15 +8206,15 @@
<script src="modules/ui/measurers.js?v=1.96.00"></script>
<script src="modules/ui/stylePresets.js?v=1.96.00"></script>
<script src="modules/ui/general.js?v=1.96.00"></script>
<script src="modules/ui/options.js?v=1.97.14"></script>
<script src="main.js?v=1.97.11"></script>
<script src="modules/ui/general.js?v=1.98.01"></script>
<script src="modules/ui/options.js?v=1.98.04"></script>
<script src="main.js?v=1.98.01"></script>
<script defer src="modules/relief-icons.js"></script>
<script defer src="modules/ui/style.js?v=1.96.00"></script>
<script defer src="modules/ui/editors.js?v=1.97.12"></script>
<script defer src="modules/ui/tools.js?v=1.97.12"></script>
<script defer src="modules/ui/world-configurator.js?v=1.98.00"></script>
<script defer src="modules/ui/world-configurator.js?v=1.98.01"></script>
<script defer src="modules/ui/heightmap-editor.js?v=1.96.00"></script>
<script defer src="modules/ui/provinces-editor.js?v=1.96.00"></script>
<script defer src="modules/ui/biomes-editor.js?v=1.91.05"></script>
@ -8204,10 +8252,10 @@
<script defer src="modules/coa-renderer.js?v=1.94.00"></script>
<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?v=1.96.00"></script>
<script defer src="modules/io/load.js?v=1.97.04"></script>
<script defer src="modules/io/save.js?v=1.98.01"></script>
<script defer src="modules/io/load.js?v=1.98.01"></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.98.05"></script>
<!-- Web Components -->
<script defer src="components/fill-box.js"></script>