mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-18 10:01:23 +01:00
feat(markers): add province information to markers, v1.108.14
- Attach province ID to markers when created (markers-generator.js) - Add migration function to populate province data for old maps (load.js) - Clean up code formatting and remove user-specific Obsidian paths - Update version to 1.108.14 - Update file hashes in index.html
This commit is contained in:
parent
9812da115a
commit
e21999a736
4 changed files with 15 additions and 17 deletions
|
|
@ -8218,7 +8218,7 @@
|
||||||
<script src="modules/routes-generator.js?v=1.106.0"></script>
|
<script src="modules/routes-generator.js?v=1.106.0"></script>
|
||||||
<script src="modules/religions-generator.js?v=1.106.0"></script>
|
<script src="modules/religions-generator.js?v=1.106.0"></script>
|
||||||
<script src="modules/military-generator.js?v=1.107.0"></script>
|
<script src="modules/military-generator.js?v=1.107.0"></script>
|
||||||
<script src="modules/markers-generator.js?v=1.107.0"></script>
|
<script src="modules/markers-generator.js?v=1.108.14"></script>
|
||||||
<script src="modules/zones-generator.js?v=1.106.0"></script>
|
<script src="modules/zones-generator.js?v=1.106.0"></script>
|
||||||
<script src="modules/coa-generator.js?v=1.99.00"></script>
|
<script src="modules/coa-generator.js?v=1.99.00"></script>
|
||||||
<script src="modules/resample.js?v=1.106.4"></script>
|
<script src="modules/resample.js?v=1.106.4"></script>
|
||||||
|
|
@ -8278,7 +8278,7 @@
|
||||||
<script defer src="libs/rgbquant.min.js"></script>
|
<script defer src="libs/rgbquant.min.js"></script>
|
||||||
<script defer src="libs/jquery.ui.touch-punch.min.js"></script>
|
<script defer src="libs/jquery.ui.touch-punch.min.js"></script>
|
||||||
<script defer src="modules/io/save.js?v=1.108.13"></script>
|
<script defer src="modules/io/save.js?v=1.108.13"></script>
|
||||||
<script defer src="modules/io/load.js?v=1.108.13"></script>
|
<script defer src="modules/io/load.js?v=1.108.14"></script>
|
||||||
<script defer src="modules/io/cloud.js?v=1.106.0"></script>
|
<script defer src="modules/io/cloud.js?v=1.106.0"></script>
|
||||||
<script defer src="modules/io/export.js?v=1.108.11"></script>
|
<script defer src="modules/io/export.js?v=1.108.11"></script>
|
||||||
<script defer src="modules/io/obsidian-bridge.js?v=1.108.13.3"></script>
|
<script defer src="modules/io/obsidian-bridge.js?v=1.108.13.3"></script>
|
||||||
|
|
|
||||||
|
|
@ -716,6 +716,9 @@ async function parseLoadedData(data, mapVersion) {
|
||||||
// sort markers by index
|
// sort markers by index
|
||||||
pack.markers.sort((a, b) => a.i - b.i);
|
pack.markers.sort((a, b) => a.i - b.i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// assign biome and province info to markers for old maps or maps without this data
|
||||||
|
if (typeof assignBiomeAndProvinceInfo !== "undefined") assignBiomeAndProvinceInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -177,20 +177,15 @@ window.Markers = (function () {
|
||||||
if (marker.cell === undefined) return;
|
if (marker.cell === undefined) return;
|
||||||
const i = last(pack.markers)?.i + 1 || 0;
|
const i = last(pack.markers)?.i + 1 || 0;
|
||||||
const [x, y] = getMarkerCoordinates(marker.cell);
|
const [x, y] = getMarkerCoordinates(marker.cell);
|
||||||
// Attach biome and province info
|
|
||||||
const biome = pack.cells.biome[marker.cell];
|
// Attach biome and province info
|
||||||
const province = pack.cells.province ? pack.cells.province[marker.cell] : undefined;
|
const biome = pack.cells.biome[marker.cell];
|
||||||
// Add Obsidian note path (customize as needed)
|
const province = pack.cells.province ? pack.cells.province[marker.cell] : undefined;
|
||||||
const obsidianNotePath = `Neblub/Orbis/Markers/${marker.type}-${marker.cell}`;
|
|
||||||
marker = {...base, x, y, ...marker, i, biome, province, obsidianNotePath};
|
marker = {...base, x, y, ...marker, i, biome, province};
|
||||||
// Utility to open Obsidian note for a marker
|
pack.markers.push(marker);
|
||||||
window.openObsidianNote = function(notePath) {
|
occupied[marker.cell] = true;
|
||||||
const uri = `obsidian://open?vault=Neblub&file=${encodeURIComponent(notePath)}`;
|
return marker;
|
||||||
window.open(uri, '_blank');
|
|
||||||
};
|
|
||||||
pack.markers.push(marker);
|
|
||||||
occupied[marker.cell] = true;
|
|
||||||
return marker;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function deleteMarker(markerId) {
|
function deleteMarker(markerId) {
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
const VERSION = "1.108.13";
|
const VERSION = "1.108.14";
|
||||||
|
|
||||||
if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
|
if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue