diff --git a/modules/ui/general.js b/modules/ui/general.js index 04d64459..083643a1 100644 --- a/modules/ui/general.js +++ b/modules/ui/general.js @@ -2,7 +2,7 @@ "use strict"; // fit full-screen map if window is resized -$(window).resize(function(e) { +$(window).resize(function (e) { if (localStorage.getItem("mapWidth") && localStorage.getItem("mapHeight")) return; mapWidthInput.value = window.innerWidth; mapHeightInput.value = window.innerHeight; @@ -28,12 +28,12 @@ document.getElementById("exitCustomization").addEventListener("mousemove", showD function tip(tip = "Tip is undefined", main, type, time) { tooltip.innerHTML = tip; tooltip.style.background = "linear-gradient(0.1turn, #ffffff00, #5e5c5c80, #ffffff00)"; - if (type === "error") tooltip.style.background = "linear-gradient(0.1turn, #ffffff00, #e11d1dcc, #ffffff00)"; else - if (type === "warn") tooltip.style.background = "linear-gradient(0.1turn, #ffffff00, #be5d08cc, #ffffff00)"; else - if (type === "success") tooltip.style.background = "linear-gradient(0.1turn, #ffffff00, #127912cc, #ffffff00)"; + if (type === "error") tooltip.style.background = "linear-gradient(0.1turn, #ffffff00, #e11d1dcc, #ffffff00)"; + else if (type === "warn") tooltip.style.background = "linear-gradient(0.1turn, #ffffff00, #be5d08cc, #ffffff00)"; + else if (type === "success") tooltip.style.background = "linear-gradient(0.1turn, #ffffff00, #127912cc, #ffffff00)"; if (main) tooltip.dataset.main = tip; // set main tip - if (time) setTimeout(() => tooltip.dataset.main = "", time); // clear main in some time + if (time) setTimeout(() => (tooltip.dataset.main = ""), time); // clear main in some time } function showMainTip() { @@ -62,7 +62,8 @@ function mouseMove() { if (i === undefined) return; showNotes(d3.event, i); const g = findGridCell(point[0], point[1]); // grid cell id - if (tooltip.dataset.main) showMainTip(); else showMapTooltip(point, d3.event, i, g); + if (tooltip.dataset.main) showMainTip(); + else showMapTooltip(point, d3.event, i, g); if (cellInfo.offsetParent) updateCellInfo(point, i, g); } @@ -70,8 +71,8 @@ function mouseMove() { function showNotes(e, i) { if (notesEditor.offsetParent) return; let id = e.target.id || e.target.parentNode.id || e.target.parentNode.parentNode.id; - if (e.target.parentNode.parentNode.id === "burgLabels") id = "burg" + e.target.dataset.id; else - if (e.target.parentNode.parentNode.id === "burgIcons") id = "burg" + e.target.dataset.id; + if (e.target.parentNode.parentNode.id === "burgLabels") id = "burg" + e.target.dataset.id; + else if (e.target.parentNode.parentNode.id === "burgIcons") id = "burg" + e.target.dataset.id; const note = notes.find(note => note.id === id); if (note !== undefined && note.legend !== "") { @@ -102,9 +103,7 @@ function showMapTooltip(point, e, i, g) { if (group === "emblems" && e.target.tagName === "use") { const parent = e.target.parentNode; - const [g, type] = parent.id === "burgEmblems" ? [pack.burgs, "burg"] : - parent.id === "provinceEmblems" ? [pack.provinces, "province"] : - [pack.states, "state"]; + const [g, type] = parent.id === "burgEmblems" ? [pack.burgs, "burg"] : parent.id === "provinceEmblems" ? [pack.provinces, "province"] : [pack.states, "state"]; const i = +e.target.dataset.i; if (event.shiftKey) highlightEmblemElement(type, g[i]); @@ -124,8 +123,14 @@ function showMapTooltip(point, e, i, g) { if (riversOverview.offsetParent) highlightEditorLine(riversOverview, river, 5000); return; } - if (group === "routes") {tip("Click to edit the Route"); return;} - if (group === "terrain") {tip("Click to edit the Relief Icon"); return;} + if (group === "routes") { + tip("Click to edit the Route"); + return; + } + if (group === "terrain") { + tip("Click to edit the Relief Icon"); + return; + } if (subgroup === "burgLabels" || subgroup === "burgIcons") { const burg = +path[path.length - 10].dataset.id; const b = pack.burgs[burg]; @@ -134,52 +139,87 @@ function showMapTooltip(point, e, i, g) { if (burgsOverview.offsetParent) highlightEditorLine(burgsOverview, burg, 5000); return; } - if (group === "labels") {tip("Click to edit the Label"); return;} - if (group === "markers") {tip("Click to edit the Marker"); return;} + if (group === "labels") { + tip("Click to edit the Label"); + return; + } + if (group === "markers") { + tip("Click to edit the Marker"); + return; + } if (group === "ruler") { const tag = e.target.tagName; const className = e.target.getAttribute("class"); - if (tag === "circle" && className === "edge") {tip("Drag to adjust. Hold Ctrl and drag to add a point. Click to remove the point"); return;} - if (tag === "circle" && className === "control") {tip("Drag to adjust. Hold Shifta and drag to keep axial direction. Click to remove the point"); return;} - if (tag === "circle") {tip("Drag to adjust the measurer"); return;} - if (tag === "polyline") {tip("Click on drag to add a control point"); return;} - if (tag === "path") {tip("Drag to move the measurer"); return;} - if (tag === "text") {tip("Drag to move, click to remove the measurer"); return;} + if (tag === "circle" && className === "edge") { + tip("Drag to adjust. Hold Ctrl and drag to add a point. Click to remove the point"); + return; + } + if (tag === "circle" && className === "control") { + tip("Drag to adjust. Hold Shifta and drag to keep axial direction. Click to remove the point"); + return; + } + if (tag === "circle") { + tip("Drag to adjust the measurer"); + return; + } + if (tag === "polyline") { + tip("Click on drag to add a control point"); + return; + } + if (tag === "path") { + tip("Drag to move the measurer"); + return; + } + if (tag === "text") { + tip("Drag to move, click to remove the measurer"); + return; + } + } + if (subgroup === "burgIcons") { + tip("Click to edit the Burg"); + return; + } + if (subgroup === "burgLabels") { + tip("Click to edit the Burg"); + return; } - if (subgroup === "burgIcons") {tip("Click to edit the Burg"); return;} - if (subgroup === "burgLabels") {tip("Click to edit the Burg"); return;} if (group === "lakes" && !land) { const lakeId = +e.target.dataset.f; const name = pack.features[lakeId]?.name; const fullName = subgroup === "freshwater" ? name : name + " " + subgroup; - tip(`${fullName} lake. Click to edit`); return; + tip(`${fullName} lake. Click to edit`); + return; + } + if (group === "coastline") { + tip("Click to edit the coastline"); + return; } - if (group === "coastline") {tip("Click to edit the coastline"); return;} if (group === "zones") { - const zone = path[path.length-8]; + const zone = path[path.length - 8]; tip(zone.dataset.description); if (zonesEditor.offsetParent) highlightEditorLine(zonesEditor, zone.id, 5000); return; } - if (group === "ice") {tip("Click to edit the Ice"); return;} + if (group === "ice") { + tip("Click to edit the Ice"); + return; + } // covering elements - if (layerIsOn("togglePrec") && land) tip("Annual Precipitation: "+ getFriendlyPrecipitation(i)); else - if (layerIsOn("togglePopulation")) tip(getPopulationTip(i)); else - if (layerIsOn("toggleTemp")) tip("Temperature: " + convertTemperature(grid.cells.temp[g])); else - if (layerIsOn("toggleBiomes") && pack.cells.biome[i]) { - const biome = pack.cells.biome[i] + if (layerIsOn("togglePrec") && land) tip("Annual Precipitation: " + getFriendlyPrecipitation(i)); + else if (layerIsOn("togglePopulation")) tip(getPopulationTip(i)); + else if (layerIsOn("toggleTemp")) tip("Temperature: " + convertTemperature(grid.cells.temp[g])); + else if (layerIsOn("toggleBiomes") && pack.cells.biome[i]) { + const biome = pack.cells.biome[i]; tip("Biome: " + biomesData.name[biome]); if (biomesEditor.offsetParent) highlightEditorLine(biomesEditor, biome); - } else - if (layerIsOn("toggleReligions") && pack.cells.religion[i]) { + } else if (layerIsOn("toggleReligions") && pack.cells.religion[i]) { const religion = pack.cells.religion[i]; const r = pack.religions[religion]; const type = r.type === "Cult" || r.type == "Heresy" ? r.type : r.type + " religion"; tip(type + ": " + r.name); if (religionsEditor.offsetParent) highlightEditorLine(religionsEditor, religion); - } else - if (pack.cells.state[i] && (layerIsOn("toggleProvinces") || layerIsOn("toggleStates"))) { + } else if (pack.cells.state[i] && (layerIsOn("toggleProvinces") || layerIsOn("toggleStates"))) { const state = pack.cells.state[i]; const stateName = pack.states[state].fullName; const province = pack.cells.province[i]; @@ -189,27 +229,28 @@ function showMapTooltip(point, e, i, g) { if (diplomacyEditor.offsetParent) highlightEditorLine(diplomacyEditor, state); if (militaryOverview.offsetParent) highlightEditorLine(militaryOverview, state); if (provincesEditor.offsetParent) highlightEditorLine(provincesEditor, province); - } else - if (layerIsOn("toggleCultures") && pack.cells.culture[i]) { + } else if (layerIsOn("toggleCultures") && pack.cells.culture[i]) { const culture = pack.cells.culture[i]; tip("Culture: " + pack.cultures[culture].name); if (culturesEditor.offsetParent) highlightEditorLine(culturesEditor, culture); - } else - if (layerIsOn("toggleHeight")) tip("Height: " + getFriendlyHeight(point)); + } else if (layerIsOn("toggleHeight")) tip("Height: " + getFriendlyHeight(point)); } function highlightEditorLine(editor, id, timeout = 15000) { Array.from(editor.getElementsByClassName("states hovered")).forEach(el => el.classList.remove("hovered")); // clear all hovered const hovered = Array.from(editor.querySelectorAll("div")).find(el => el.dataset.id == id); if (hovered) hovered.classList.add("hovered"); // add hovered class - if (timeout) setTimeout(() => {hovered && hovered.classList.remove("hovered")}, timeout); + if (timeout) + setTimeout(() => { + hovered && hovered.classList.remove("hovered"); + }, timeout); } // get cell info on mouse move function updateCellInfo(point, i, g) { const cells = pack.cells; - const x = infoX.innerHTML = rn(point[0]); - const y = infoY.innerHTML = rn(point[1]); + const x = (infoX.innerHTML = rn(point[0])); + const y = (infoY.innerHTML = rn(point[1])); const f = cells.f[i]; infoLat.innerHTML = toDMS(mapCoordinates.latN - (y / graphHeight) * mapCoordinates.latT, "lat"); infoLon.innerHTML = toDMS(mapCoordinates.lonW + (x / graphWidth) * mapCoordinates.lonT, "lon"); @@ -222,7 +263,7 @@ function updateCellInfo(point, i, g) { infoTemp.innerHTML = convertTemperature(grid.cells.temp[g]); infoPrec.innerHTML = cells.h[i] >= 20 ? getFriendlyPrecipitation(i) : "n/a"; infoRiver.innerHTML = cells.h[i] >= 20 && cells.r[i] ? getRiverInfo(cells.r[i]) : "no"; - infoState.innerHTML = cells.h[i] >= 20 ? cells.state[i] ? `${pack.states[cells.state[i]].fullName} (${cells.state[i]})` : "neutral lands (0)" : "no"; + infoState.innerHTML = cells.h[i] >= 20 ? (cells.state[i] ? `${pack.states[cells.state[i]].fullName} (${cells.state[i]})` : "neutral lands (0)") : "no"; infoProvince.innerHTML = cells.province[i] ? `${pack.provinces[cells.province[i]].fullName} (${cells.province[i]})` : "no"; infoCulture.innerHTML = cells.culture[i] ? `${pack.cultures[cells.culture[i]].name} (${cells.culture[i]})` : "no"; infoReligion.innerHTML = cells.religion[i] ? `${pack.religions[cells.religion[i]].name} (${cells.religion[i]})` : "no"; @@ -238,7 +279,7 @@ function toDMS(coord, c) { const minutesNotTruncated = (Math.abs(coord) - degrees) * 60; const minutes = Math.floor(minutesNotTruncated); const seconds = Math.floor((minutesNotTruncated - minutes) * 60); - const cardinal = c === "lat" ? coord >= 0 ? "N" : "S" : coord >= 0 ? "E" : "W"; + const cardinal = c === "lat" ? (coord >= 0 ? "N" : "S") : coord >= 0 ? "E" : "W"; return degrees + "° " + minutes + "′ " + seconds + "″ " + cardinal; } @@ -252,9 +293,15 @@ function getElevation(f, h) { // get water depth function getDepth(f, h, p) { if (f.land) return "0 " + heightUnit.value; // land: 0 - if (!f.border) return getHeight(h, "abs"); // lake: pack abs height + + // lake: difference between surface and bottom const gridH = grid.cells.h[findGridCell(p[0], p[1])]; - return getHeight(gridH, "abs"); // ocean: grig height + if (f.type === "lake") { + const depth = gridH === 19 ? f.height / 2 : gridH; + return getHeight(depth, "abs"); + } + + return getHeight(gridH, "abs"); // ocean: grid height } // get user-friendly (real-world) height value from map data @@ -268,12 +315,13 @@ function getFriendlyHeight(p) { function getHeight(h, abs) { const unit = heightUnit.value; let unitRatio = 3.281; // default calculations are in feet - if (unit === "m") unitRatio = 1; // if meter + if (unit === "m") unitRatio = 1; + // if meter else if (unit === "f") unitRatio = 0.5468; // if fathom let height = -990; if (h >= 20) height = Math.pow(h - 18, +heightExponentInput.value); - else if (h < 20 && h > 0) height = (h - 20) / h * 50; + else if (h < 20 && h > 0) height = ((h - 20) / h) * 50; if (abs) height = Math.abs(height); return rn(height * unitRatio) + " " + unit; @@ -299,49 +347,67 @@ function getCellPopulation(i) { // get user-friendly (real-world) population value from map data function getFriendlyPopulation(i) { const [rural, urban] = getCellPopulation(i); - return `${si(rural+urban)} (${si(rural)} rural, urban ${si(urban)})`; + return `${si(rural + urban)} (${si(rural)} rural, urban ${si(urban)})`; } function getPopulationTip(i) { const [rural, urban] = getCellPopulation(i); - return `Cell population: ${si(rural+urban)}; Rural: ${si(rural)}; Urban: ${si(urban)}`; + return `Cell population: ${si(rural + urban)}; Rural: ${si(rural)}; Urban: ${si(urban)}`; } function highlightEmblemElement(type, el) { - const i = el.i, cells = pack.cells; - const animation = d3.transition().duration(1000).ease(d3.easeSinIn); + const i = el.i, + cells = pack.cells; + const animation = d3.transition().duration(1000).ease(d3.easeSinIn); - if (type === "burg") { - const {x, y} = el; - debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 0) - .attr("fill", "none").attr("stroke", "#d0240f").attr("stroke-width", 1).attr("opacity", 1) - .transition(animation).attr("r", 20).attr("opacity", .1).attr("stroke-width", 0).remove(); - return; - } + if (type === "burg") { + const {x, y} = el; + debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 0).attr("fill", "none").attr("stroke", "#d0240f").attr("stroke-width", 1).attr("opacity", 1).transition(animation).attr("r", 20).attr("opacity", 0.1).attr("stroke-width", 0).remove(); + return; + } - const [x, y] = el.pole || pack.cells.p[el.center]; - const obj = type === "state" ? cells.state : cells.province; - const borderCells = cells.i.filter(id => obj[id] === i && cells.c[id].some(n => obj[n] !== i)); - const data = Array.from(borderCells).filter((c, i) => !(i%2)).map(i => cells.p[i]).map(i => [i[0], i[1], Math.hypot(i[0]-x, i[1]-y)]); + const [x, y] = el.pole || pack.cells.p[el.center]; + const obj = type === "state" ? cells.state : cells.province; + const borderCells = cells.i.filter(id => obj[id] === i && cells.c[id].some(n => obj[n] !== i)); + const data = Array.from(borderCells) + .filter((c, i) => !(i % 2)) + .map(i => cells.p[i]) + .map(i => [i[0], i[1], Math.hypot(i[0] - x, i[1] - y)]); - debug.selectAll("line").data(data).enter().append("line") - .attr("x1", x).attr("y1", y).attr("x2", d => d[0]).attr("y2", d => d[1]) - .attr("stroke", "#d0240f").attr("stroke-width", .5).attr("opacity", .2) - .attr("stroke-dashoffset", d => d[2]).attr("stroke-dasharray", d => d[2]) - .transition(animation).attr("stroke-dashoffset", 0).attr("opacity", 1) - .transition(animation).delay(1000).attr("stroke-dashoffset", d => d[2]).attr("opacity", 0).remove(); + debug + .selectAll("line") + .data(data) + .enter() + .append("line") + .attr("x1", x) + .attr("y1", y) + .attr("x2", d => d[0]) + .attr("y2", d => d[1]) + .attr("stroke", "#d0240f") + .attr("stroke-width", 0.5) + .attr("opacity", 0.2) + .attr("stroke-dashoffset", d => d[2]) + .attr("stroke-dasharray", d => d[2]) + .transition(animation) + .attr("stroke-dashoffset", 0) + .attr("opacity", 1) + .transition(animation) + .delay(1000) + .attr("stroke-dashoffset", d => d[2]) + .attr("opacity", 0) + .remove(); } // assign lock behavior -document.querySelectorAll("[data-locked]").forEach(function(e) { - e.addEventListener("mouseover", function(event) { +document.querySelectorAll("[data-locked]").forEach(function (e) { + e.addEventListener("mouseover", function (event) { if (this.className === "icon-lock") tip("Click to unlock the option and allow it to be randomized on new map generation"); else tip("Click to lock the option and always use the current value on new map generation"); event.stopPropagation(); }); - e.addEventListener("click", function() { - const id = (this.id).slice(5); + e.addEventListener("click", function () { + const id = this.id.slice(5); if (this.className === "icon-lock") unlock(id); else lock(id); }); @@ -349,10 +415,10 @@ document.querySelectorAll("[data-locked]").forEach(function(e) { // lock option function lock(id) { - const input = document.querySelector("[data-stored='"+id+"']"); + const input = document.querySelector("[data-stored='" + id + "']"); if (input) localStorage.setItem(id, input.value); const el = document.getElementById("lock_" + id); - if(!el) return; + if (!el) return; el.dataset.locked = 1; el.className = "icon-lock"; } @@ -361,7 +427,7 @@ function lock(id) { function unlock(id) { localStorage.removeItem(id); const el = document.getElementById("lock_" + id); - if(!el) return; + if (!el) return; el.dataset.locked = 0; el.className = "icon-lock-open"; } @@ -403,7 +469,7 @@ function applyOption(select, id, name = id) { // show info about the generator in a popup function showInfo() { const Discord = link("https://discordapp.com/invite/X7E84HU", "Discord"); - const Reddit = link("https://www.reddit.com/r/FantasyMapGenerator", "Reddit") + const Reddit = link("https://www.reddit.com/r/FantasyMapGenerator", "Reddit"); const Patreon = link("https://www.patreon.com/azgaar", "Patreon"); const Trello = link("https://trello.com/b/7x832DG4/fantasy-map-generator", "Trello"); const Armoria = link("https://azgaar.github.io/Armoria", "Armoria"); @@ -433,8 +499,15 @@ function showInfo() {