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

refactor: map events

Browse source
This commit is contained in:
Azgaar 2022-07-10 02:35:30 +03:00
parent 3c850d8d46
commit ff97c9227d
32 changed files with 433 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dialogs/dialogs/biomes-editor.js
View file

@ -1,7 +1,7 @@
import * as d3 from "d3";
import {closeDialogs} from "dialogs/utils";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, showMainTip, tip} from "scripts/tooltips";
import {getRandomColor} from "utils/colorUtils";
import {findAll, findCell, getPackPolygon, isLand} from "utils/graphUtils";
@ -467,7 +467,7 @@ export function open() {
biomesFooter.style.display = "block";
if (!close) $("#biomesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
const selected = document.querySelector("#biomesBody > div.selected");
if (selected) selected.classList.remove("selected");

4
src/dialogs/dialogs/burg-editor.js
View file

@ -11,7 +11,7 @@ import {rn} from "utils/numberUtils";
import {rand} from "utils/probabilityUtils";
import {parseTransform} from "utils/stringUtils";
import {convertTemperature, getHeight, getBurgPopulation, getBurgPopulationPoints} from "utils/unitUtils";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
let isLoaded = false;
@ -484,7 +484,7 @@ export function open({id} = {}) {
}
} else {
clearMainTip();
restoreDefaultEvents();
setDefaultEventHandlers();
if (layerIsOn("toggleCells") && toggler.dataset.forced) {
toggleCells();

4
src/dialogs/dialogs/burgs-overview.js
View file

@ -4,7 +4,7 @@ import {openDialog} from "dialogs";
import {closeDialogs} from "dialogs/utils";
import {layerIsOn, toggleLayer} from "layers";
import {applySorting} from "modules/ui/editors";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, tip} from "scripts/tooltips";
import {getCoordinates} from "utils/coordinateUtils";
import {findCell} from "utils/graphUtils";
@ -312,7 +312,7 @@ export function open() {
function exitAddBurgMode() {
customization = 0;
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
if (addBurgTool.classList.contains("pressed")) addBurgTool.classList.remove("pressed");
if (addNewBurg.classList.contains("pressed")) addNewBurg.classList.remove("pressed");

6
src/dialogs/dialogs/cultures-editor.js
View file

@ -2,7 +2,7 @@ import * as d3 from "d3";
import {openDialog} from "dialogs";
import {closeDialogs} from "dialogs/utils";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, showMainTip, tip} from "scripts/tooltips";
import {debounce} from "utils/functionUtils";
import {findAll, findCell, getPackPolygon, isLand} from "utils/graphUtils";
@ -811,7 +811,7 @@ function exitCulturesManualAssignment(close) {
if (!close) $("#culturesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
debug.select("#cultureCenters").style("display", null);
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
const selected = $body.querySelector("div.selected");
if (selected) selected.classList.remove("selected");
@ -829,7 +829,7 @@ function enterAddCulturesMode() {
function exitAddCultureMode() {
customization = 0;
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
$body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all"));
if (culturesAdd.classList.contains("pressed")) culturesAdd.classList.remove("pressed");

4
src/dialogs/dialogs/diplomacy-editor.js
View file

@ -2,7 +2,7 @@ import * as d3 from "d3";
import {closeDialogs} from "dialogs/utils";
import {layerIsOn} from "layers";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, tip} from "scripts/tooltips";
import {findCell} from "utils/graphUtils";
import {applySorting} from "modules/ui/editors";
@ -455,7 +455,7 @@ export function open() {
}
function closeDiplomacyEditor() {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
const selected = body.querySelector("div.Self");
if (selected) selected.classList.remove("Self");

4
src/dialogs/dialogs/heightmap-editor.js
View file

@ -13,7 +13,7 @@ import {moveCircle, removeCircle} from "modules/ui/editors";
import {changeViewMode} from "modules/ui/options";
import {addZones} from "modules/zones";
import {aleaPRNG} from "scripts/aleaPRNG";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {undraw} from "scripts/generation";
import {prompt} from "scripts/prompt";
import {rankCells} from "scripts/rankCells";
@ -182,7 +182,7 @@ export function open(options) {
if (byId("options").querySelector(".tab > button.active").id === "toolsTab") toolsContent.style.display = "block";
layersPreset.disabled = false;
exitCustomization.style.display = "none"; // hide finalize button
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
closeDialogs();
Zoom.reset();

5
src/dialogs/dialogs/ice-editor.ts
View file

@ -11,8 +11,7 @@ import {byId} from "utils/shorthands";
import {parseTransform} from "utils/stringUtils";
// @ts-expect-error js module
import {editStyle} from "modules/style";
// @ts-expect-error js module
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
// @ts-expect-error js module
import {unselect} from "modules/ui/editors";
@ -85,7 +84,7 @@ export function open() {
tip("Click on map to create an iceberg. Hold Shift to add multiple", true);
} else {
clearMainTip();
restoreDefaultEvents();
setDefaultEventHandlers();
}
}

6
src/dialogs/dialogs/religions-editor.js
View file

@ -3,7 +3,7 @@ import * as d3 from "d3";
import {openDialog} from "dialogs";
import {closeDialogs} from "dialogs/utils";
import {applySortingByHeader} from "modules/ui/editors";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, showMainTip, tip} from "scripts/tooltips";
import {debounce} from "utils/functionUtils";
import {findAll, findCell, getPackPolygon, isLand} from "utils/graphUtils";
@ -710,7 +710,7 @@ function exitReligionsManualAssignment(close) {
if (!close) $("#religionsEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
debug.select("#religionCenters").style("display", null);
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
const $selected = $body.querySelector("div.selected");
if ($selected) $selected.classList.remove("selected");
@ -728,7 +728,7 @@ function enterAddReligionMode() {
function exitAddReligionMode() {
customization = 0;
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
$body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all"));
if (religionsAdd.classList.contains("pressed")) religionsAdd.classList.remove("pressed");

6
src/dialogs/dialogs/states-editor.js
View file

@ -3,7 +3,7 @@ import * as d3 from "d3";
import {openDialog} from "dialogs";
import {closeDialogs} from "dialogs/utils";
import {applySortingByHeader, unfog} from "modules/ui/editors";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, showMainTip, tip} from "scripts/tooltips";
import {getMixedColor, getRandomColor} from "utils/colorUtils";
import {findAll, findCell, getPackPolygon, isLand} from "utils/graphUtils";
@ -1217,7 +1217,7 @@ function exitStatesManualAssignment(close) {
if (!close)
$("#statesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
const selected = $body.querySelector("div.selected");
if (selected) selected.classList.remove("selected");
@ -1349,7 +1349,7 @@ function addState() {
function exitAddStateMode() {
customization = 0;
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
$body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all"));
if (statesAdd.classList.contains("pressed")) statesAdd.classList.remove("pressed");

16
src/dialogs/dialogs/units-editor.js
View file

@ -1,6 +1,6 @@
import * as d3 from "d3";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {findCell} from "utils/graphUtils";
import {tip} from "scripts/tooltips";
import {prompt} from "scripts/prompt";
@ -174,7 +174,7 @@ export function open() {
function toggleOpisometerMode() {
if (this.classList.contains("pressed")) {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
this.classList.remove("pressed");
} else {
@ -193,7 +193,7 @@ export function open() {
});
d3.event.on("end", function () {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
addOpisometer.classList.remove("pressed");
if (opisometer.points.length < 2) rulers.remove(opisometer.id);
@ -206,7 +206,7 @@ export function open() {
function toggleRouteOpisometerMode() {
if (this.classList.contains("pressed")) {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
this.classList.remove("pressed");
} else {
@ -235,7 +235,7 @@ export function open() {
});
d3.event.on("end", function () {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
addRouteOpisometer.classList.remove("pressed");
if (routeOpisometer.points.length < 2) {
@ -243,7 +243,7 @@ export function open() {
}
});
} else {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
addRouteOpisometer.classList.remove("pressed");
tip("Must start in a cell with a route in it", false, "error");
@ -255,7 +255,7 @@ export function open() {
function togglePlanimeterMode() {
if (this.classList.contains("pressed")) {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
this.classList.remove("pressed");
} else {
@ -274,7 +274,7 @@ export function open() {
});
d3.event.on("end", function () {
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
addPlanimeter.classList.remove("pressed");
if (planimeter.points.length < 3) rulers.remove(planimeter.id);