Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into refactor-path-detection

This commit is contained in:
Azgaar 2024-09-09 22:11:10 +02:00
commit 3f863a5ca3
7 changed files with 169 additions and 89 deletions

View file

@ -1062,6 +1062,13 @@
<option value="pointyHex">Hex grid (pointy)</option>
<option value="flatHex">Hex grid (flat)</option>
<option value="square">Square grid</option>
<option value="square45deg">Square 45 degrees grid</option>
<option value="squareTruncated">Truncated square grid</option>
<option value="squareTetrakis">Tetrakis square grid</option>
<option value="triangleHorizontal">Triangle grid (horizontal)</option>
<option value="triangleVertical">Triangle grid (vertical)</option>
<option value="trihexagonal">Trihexagonal grid</option>
<option value="rhombille">Rhombille grid</option>
</select>
</td>
</tr>
@ -1074,6 +1081,9 @@
id="styleGridSizeFriendly"
data-tip="Distance between grid cell centers (in map scale)"
></output>
<a href="https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Scale-and-distance#grids" target="_blank">
<span data-tip="Open wiki article scale and distance to know about grid scale" class="icon-info-circled pointer"></span>
</a>
</td>
</tr>
@ -1509,7 +1519,9 @@
<td></td>
</tr>
<tr data-tip="Map seed number. Seed produces the same map only if canvas size and options are the same">
<tr
data-tip="Map seed number. Press 'Enter' to apply. Seed produces the same map only if canvas size and options are the same"
>
<td>
<i
data-tip="Show seed history to apply a previous seed"
@ -1575,7 +1587,7 @@
<tr data-tip="Define current year and era name">
<td>
<i data-locked="0" id="lock_era" class="icon-lock-open"></i>
<i data-locked="0" id="lock_year" data-ids="year,era" class="icon-lock-open"></i>
</td>
<td>Year and era</td>
<td>
@ -3491,7 +3503,8 @@
<button id="burgEditEmblem" data-tip="Edit emblem" class="icon-shield-alt"></button>
<button id="burgTogglePreview" data-tip="Toggle preview" class="icon-map"></button>
<button id="burgRelocate" data-tip="Relocate burg" class="icon-target"></button>
<button id="burgLocate" data-tip="Zoom map and center view in the burg" class="icon-target"></button>
<button id="burgRelocate" data-tip="Relocate burg. Click on map to move the burg" class="icon-map-pin"></button>
<button id="burglLegend" data-tip="Edit free text notes (legend) for this burg" class="icon-edit"></button>
<button id="burgLock" class="icon-lock-open" onmouseover="showElementLockTip(event)"></button>
<button
@ -5703,12 +5716,13 @@
</p>
<p><b>Latitude:</b> <span id="infoLat"></span></p>
<p><b>Longitude:</b> <span id="infoLon"></span></p>
<p><b>Geozone:</b> <span id="infoGeozone"></span></p>
<p><b>Area:</b> <span id="infoArea">0</span></p>
<p><b>Type:</b> <span id="infoFeature">n/a</span></p>
<p><b>Precipitation:</b> <span id="infoPrec">0</span></p>
<p><b>River:</b> <span id="infoRiver">no</span></p>
<p><b>Population:</b> <span id="infoPopulation">0</span></p>
<p><b>Elevation:</b> <span id="infoEvelation">0</span></p>
<p><b>Elevation:</b> <span id="infoElevation">0</span></p>
<p><b>Depth:</b> <span id="infoDepth">0</span></p>
<p><b>Temperature:</b> <span id="infoTemp">0</span></p>
<p><b>Biome:</b> <span id="infoBiome">n/a</span></p>
@ -7820,6 +7834,27 @@
<pattern id="pattern_flatHex" width="43.4" height="25" patternUnits="userSpaceOnUse" fill="none">
<path d="M 43.4,0 36.2,12.5 43.4,25 M 21.7,12.5 H 36.2 Z M 0,0 H 14.5 L 21.7,12.5 14.5,25 H 0" />
</pattern>
<pattern id="pattern_square45deg" width="35.355" height="35.355" patternUnits="userSpaceOnUse" fill="none">
<path d="M 0 0 L 35.355 35.355 M 0 35.355 L 35.355 0" />
</pattern>
<pattern id="pattern_squareTruncated" width="25" height="25" patternUnits="userSpaceOnUse" fill="none">
<path d="M 8.33 25 L 0 16.66 V 8.33 L 8.33 0 16.66 0 25 8.33 M 16.66 25 L 25 16.66 L 25 8.33 M 8.33 25 L 16.66 25" />
</pattern>
<pattern id="pattern_squareTetrakis" width="25" height="25" patternUnits="userSpaceOnUse" fill="none">
<path d="M 25 0 L 0 0 0 25 M 0 0 L 25 25 M 0 25 L 25 0 M 12.5 0 L 12.5 25 M 0 12.5 L 25 12.5 M 0 25 L 25 25 L 25 0" />
</pattern>
<pattern id="pattern_triangleHorizontal" width="41.76" height="72.33" patternUnits="userSpaceOnUse" fill="none">
<path d="M 41.76 36.165 H 0 L 20.88 0 41.76 36.165 20.88 72.33 0 36.165 M 0 0 H 72.33 M 0 72.33 L 41.76 72.33" />
</pattern>
<pattern id="pattern_triangleVertical" width="72.33" height="41.76" patternUnits="userSpaceOnUse" fill="none">
<path d="M 36.165 0 L 0 20.88 36.165 41.76 72.33 20.88 36.165 0 V 41.76 M 0 0 V 72.33 M 72.33 0 L 72.33 41.76">
</pattern>
<pattern id="pattern_trihexagonal" width="25" height="43.4" patternUnits="userSpaceOnUse" fill="none">
<path d="M 25 10.85 H 0 L 18.85 43.4 25 32.55 H 0 L 18.85 0 25 10.85" />
</pattern>
<pattern id="pattern_rhombille" width="82.5" height="50" patternUnits="userSpaceOnUse" fill="none">
<path d="M 13.8 50 L 0 25 13.8 0 H 41.2 L 27.5 25 41.2 50 55 25 41.2 0 68.8 0 82.5 25 68.8 50 M 0 25 H 27.5 M 55 25 H 82.5 M 13.8 50 H 41.2 L 68.8 50" />
</pattern>
</g>
<g id="defs-hatching">
@ -7984,7 +8019,7 @@
<script src="libs/indexedDB.js?v=1.99.00"></script>
<script src="utils/shorthands.js?v=1.99.00"></script>
<script src="utils/commonUtils.js?v=1.99.00"></script>
<script src="utils/commonUtils.js?v=1.103.0"></script>
<script src="utils/arrayUtils.js?v=1.99.00"></script>
<script src="utils/functionUtils.js?v=1.99.00"></script>
<script src="utils/colorUtils.js?v=1.99.00"></script>
@ -8053,7 +8088,7 @@
<script defer src="modules/ui/rivers-editor.js?v=1.99.00"></script>
<script defer src="modules/ui/rivers-creator.js?v=1.99.00"></script>
<script defer src="modules/ui/relief-editor.js?v=1.99.00"></script>
<script defer src="modules/ui/burg-editor.js?v=1.100.00"></script>
<script defer src="modules/ui/burg-editor.js?v=1.102.00"></script>
<script defer src="modules/ui/units-editor.js?v=1.104.0"></script>
<script defer src="modules/ui/notes-editor.js?v=1.99.06"></script>
<script defer src="modules/ui/ai-generator.js?v=1.99.09"></script>