backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-17 17:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Azgaar 2022-05-17 21:13:30 +03:00
commit 159c1aa3e3
4 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/ui/general.js
View file

@ -202,10 +202,10 @@ function showMapTooltip(point, e, i, g) {
const province = pack.cells.province[i];
const prov = province ? pack.provinces[province].fullName + ", " : "";
tip(prov + stateName);
if (statesEditor?.offsetParent) highlightEditorLine(statesEditor, state);
if (diplomacyEditor?.offsetParent) highlightEditorLine(diplomacyEditor, state);
if (militaryOverview?.offsetParent) highlightEditorLine(militaryOverview, state);
if (provincesEditor?.offsetParent) highlightEditorLine(provincesEditor, province);
if (document.getElementById('statesEditor')?.offsetParent) highlightEditorLine(statesEditor, state);
if (document.getElementById('diplomacyEditor')?.offsetParent) highlightEditorLine(diplomacyEditor, state);
if (document.getElementById('militaryOverview')?.offsetParent) highlightEditorLine(militaryOverview, state);
if (document.getElementById('provincesEditor')?.offsetParent) highlightEditorLine(provincesEditor, province);
} else if (layerIsOn("toggleCultures") && pack.cells.culture[i]) {
const culture = pack.cells.culture[i];
tip("Culture: " + pack.cultures[culture].name);

15
modules/ui/namesbase-editor.js
View file

@ -20,14 +20,21 @@ function editNamesbase() {
document.getElementById("namesbaseAnalyze").addEventListener("click", analyzeNamesbase);
document.getElementById("namesbaseDefault").addEventListener("click", namesbaseRestoreDefault);
document.getElementById("namesbaseDownload").addEventListener("click", namesbaseDownload);
const uploader = document.getElementById("namesbaseToLoad");
document.getElementById("namesbaseUpload").addEventListener("click", () => {
const uploader = document.getElementById("namesbaseToLoad");
uploader.dataset.override = event.ctrlKey ? "no" : "yes";
uploader.addEventListener("change", function (event) {
uploadFile(event.target, d => namesbaseUpload(d, true));
}, { once: true });
uploader.click();
});
document.getElementById("namesbaseToLoad").addEventListener("change", function (ev) {
uploadFile(this, d => namesbaseUpload(d, ev.target.dataset.override === "yes"));
document.getElementById("namesbaseUploadExtend").addEventListener("click", () => {
uploader.addEventListener("change", function (event) {
uploadFile(event.target, d => namesbaseUpload(d, false));
}, { once: true });
uploader.click();
});
document.getElementById("namesbaseCA").addEventListener("click", () => {
openURL("https://cartographyassets.com/asset-category/specific-assets/azgaars-generator/namebases/");
});

13
modules/ui/submap.js
View file

@ -10,6 +10,12 @@ window.UISubmap = (function () {
output.style.color = getCellsDensityColor(cells);
});
document.getElementById("submapScaleInput").addEventListener("input", function (event) {
const exp = Math.pow(1.1, +event.target.value);
document.getElementById("submapScaleOutput").value = rn(exp,2);
event.stopPropagation();
});
function openSubmapMenu() {
$("#submapOptionsDialog").dialog({
title: "Create a submap",
@ -32,7 +38,9 @@ window.UISubmap = (function () {
resetZoom(0);
document.getElementById("submapAngleInput").value = 0;
document.getElementById("submapAngleOutput").value = "0°";
document.getElementById("submapAngleOutput").value = "0";
document.getElementById("submapScaleInput").value = 1;
document.getElementById("submapScaleOutput").value = 1;
document.getElementById("submapShiftX").value = 0;
document.getElementById("submapShiftY").value = 0;
document.getElementById("submapMirrorH").checked = false;
@ -64,11 +72,13 @@ window.UISubmap = (function () {
const angle = (+document.getElementById("submapAngleInput").value / 180) * Math.PI;
const shiftX = +document.getElementById("submapShiftX").value;
const shiftY = +document.getElementById("submapShiftY").value;
const ratio = +document.getElementById("submapScaleInput").value;
const mirrorH = document.getElementById("submapMirrorH").checked;
const mirrorV = document.getElementById("submapMirrorV").checked;
const [cx, cy] = [graphWidth / 2, graphHeight / 2];
const rot = alfa => (x, y) => [(x - cx) * Math.cos(alfa) - (y - cy) * Math.sin(alfa) + cx, (y - cy) * Math.cos(alfa) + (x - cx) * Math.sin(alfa) + cy];
const scale = ratio => (x, y) => [(x-cx) * ratio + cx, (y-cy) * ratio + cy];
const shift = (dx, dy) => (x, y) => [x + dx, y + dy];
const flipH = (x, y) => [-x + 2 * cx, y];
const flipV = (x, y) => [x, -y + 2 * cy];
@ -83,6 +93,7 @@ window.UISubmap = (function () {
projection = app(shift(shiftX, shiftY), projection);
inverse = app(inverse, shift(-shiftX, -shiftY));
}
if (ratio) [projection, inverse] = [app(scale(Math.pow(1.1,ratio)), projection), app(inverse, scale(Math.pow(1.1,-ratio)))];
if (mirrorH) [projection, inverse] = [app(flipH, projection), app(inverse, flipH)];
if (mirrorV) [projection, inverse] = [app(flipV, projection), app(inverse, flipV)];