diff --git a/.DS_Store b/.DS_Store index f07b95e6..73fd2b61 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js index 663993d5..07601977 100644 --- a/modules/burgs-and-states.js +++ b/modules/burgs-and-states.js @@ -2,11 +2,11 @@ import {TIME} from "/src/config/logging"; import {findCell} from "/src/utils/graphUtils"; import {layerIsOn} from "./ui/layers"; import {getColors, getRandomColor, getMixedColor} from "/src/utils/colorUtils"; -import {getMiddlePoint} from "@/utils/lineUtils"; +import {getMiddlePoint} from "/src/utils/lineUtils"; import {rn, minmax} from "/src/utils/numberUtils"; -import {rand, P, each, gauss, ra, rw, generateSeed} from "@/utils/probabilityUtils"; -import {round, splitInTwo} from "@/utils/stringUtils"; -import {trimVowels, getAdjective} from "@/utils/languageUtils"; +import {rand, P, each, gauss, ra, rw, generateSeed} from "/src/utils/probabilityUtils"; +import {round, splitInTwo} from "/src/utils/stringUtils"; +import {trimVowels, getAdjective} from "/src/utils/languageUtils"; window.BurgsAndStates = (function () { const generate = function () { diff --git a/modules/coa-generator.js b/modules/coa-generator.js index 106b0b4c..7ce88e4d 100644 --- a/modules/coa-generator.js +++ b/modules/coa-generator.js @@ -1,4 +1,4 @@ -import {P, rw} from "@/utils/probabilityUtils"; +import {P, rw} from "/src/utils/probabilityUtils"; window.COA = (function () { const tinctures = { diff --git a/modules/cultures-generator.js b/modules/cultures-generator.js index 2d79229e..ef72d8fc 100644 --- a/modules/cultures-generator.js +++ b/modules/cultures-generator.js @@ -1,8 +1,8 @@ import {TIME} from "/src/config/logging"; import {getColors} from "/src/utils/colorUtils"; import {rn, minmax} from "/src/utils/numberUtils"; -import {rand, P, rw, biased} from "@/utils/probabilityUtils"; -import {abbreviate} from "@/utils/languageUtils"; +import {rand, P, rw, biased} from "/src/utils/probabilityUtils"; +import {abbreviate} from "/src/utils/languageUtils"; window.Cultures = (function () { let cells; diff --git a/modules/dynamic/auto-update.js b/modules/dynamic/auto-update.js index cb73e4ee..52627212 100644 --- a/modules/dynamic/auto-update.js +++ b/modules/dynamic/auto-update.js @@ -1,7 +1,7 @@ import {findCell} from "/src/utils/graphUtils"; import {rn} from "/src/utils/numberUtils"; -import {rand, P, rw} from "@/utils/probabilityUtils"; -import {parseTransform} from "@/utils/stringUtils"; +import {rand, P, rw} from "/src/utils/probabilityUtils"; +import {parseTransform} from "/src/utils/stringUtils"; // update old .map version to the current one export function resolveVersionConflicts(version) { diff --git a/modules/dynamic/editors/cultures-editor.js b/modules/dynamic/editors/cultures-editor.js index 43d0daba..9de7766d 100644 --- a/modules/dynamic/editors/cultures-editor.js +++ b/modules/dynamic/editors/cultures-editor.js @@ -3,10 +3,10 @@ import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils"; import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; import {byId} from "/src/utils/shorthands"; import {rn} from "/src/utils/numberUtils"; -import {capitalize} from "@/utils/stringUtils"; -import {si} from "@/utils/unitUtils"; -import {abbreviate} from "@/utils/languageUtils"; -import {debounce} from "@/utils/functionUtils"; +import {capitalize} from "/src/utils/stringUtils"; +import {si} from "/src/utils/unitUtils"; +import {abbreviate} from "/src/utils/languageUtils"; +import {debounce} from "/src/utils/functionUtils"; const $body = insertEditorHtml(); addListeners(); diff --git a/modules/dynamic/editors/religions-editor.js b/modules/dynamic/editors/religions-editor.js index 4891f546..f6a10c6a 100644 --- a/modules/dynamic/editors/religions-editor.js +++ b/modules/dynamic/editors/religions-editor.js @@ -3,9 +3,9 @@ import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils"; import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; import {byId} from "/src/utils/shorthands"; import {rn} from "/src/utils/numberUtils"; -import {si} from "@/utils/unitUtils"; -import {abbreviate} from "@/utils/languageUtils"; -import {debounce} from "@/utils/functionUtils"; +import {si} from "/src/utils/unitUtils"; +import {abbreviate} from "/src/utils/languageUtils"; +import {debounce} from "/src/utils/functionUtils"; const $body = insertEditorHtml(); addListeners(); diff --git a/modules/dynamic/editors/states-editor.js b/modules/dynamic/editors/states-editor.js index dd7ee4a1..50d2aaca 100644 --- a/modules/dynamic/editors/states-editor.js +++ b/modules/dynamic/editors/states-editor.js @@ -4,9 +4,9 @@ import {byId} from "/src/utils/shorthands"; import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; import {getRandomColor, getMixedColor} from "/src/utils/colorUtils"; import {rn} from "/src/utils/numberUtils"; -import {rand, P} from "@/utils/probabilityUtils"; -import {si} from "@/utils/unitUtils"; -import {getAdjective} from "@/utils/languageUtils"; +import {rand, P} from "/src/utils/probabilityUtils"; +import {si} from "/src/utils/unitUtils"; +import {getAdjective} from "/src/utils/languageUtils"; const $body = insertEditorHtml(); addListeners(); diff --git a/modules/dynamic/heightmap-selection.js b/modules/dynamic/heightmap-selection.js index 7bcb93dc..3e747751 100644 --- a/modules/dynamic/heightmap-selection.js +++ b/modules/dynamic/heightmap-selection.js @@ -1,6 +1,6 @@ import {shouldRegenerateGrid, generateGrid} from "/src/utils/graphUtils"; import {byId} from "/src/utils/shorthands"; -import {generateSeed} from "@/utils/probabilityUtils"; +import {generateSeed} from "/src/utils/probabilityUtils"; const initialSeed = generateSeed(); let graph = getGraph(grid); diff --git a/modules/dynamic/hierarchy-tree.js b/modules/dynamic/hierarchy-tree.js index 04eda6b6..94b74a85 100644 --- a/modules/dynamic/hierarchy-tree.js +++ b/modules/dynamic/hierarchy-tree.js @@ -1,6 +1,6 @@ import {byId} from "/src/utils/shorthands"; import {tip} from "/src/scripts/tooltips"; -import {capitalize} from "@/utils/stringUtils"; +import {capitalize} from "/src/utils/stringUtils"; appendStyleSheet(); insertHtml(); diff --git a/modules/dynamic/overview/charts-overview.js b/modules/dynamic/overview/charts-overview.js index eee2f532..49a3756d 100644 --- a/modules/dynamic/overview/charts-overview.js +++ b/modules/dynamic/overview/charts-overview.js @@ -2,9 +2,9 @@ import {isWater} from "/src/utils/graphUtils"; import {tip} from "/src/scripts/tooltips"; import {byId} from "/src/utils/shorthands"; import {rn} from "/src/utils/numberUtils"; -import {capitalize} from "@/utils/stringUtils"; -import {si, convertTemperature} from "@/utils/unitUtils"; -import {rollups} from "@/utils/functionUtils"; +import {capitalize} from "/src/utils/stringUtils"; +import {si, convertTemperature} from "/src/utils/unitUtils"; +import {rollups} from "/src/utils/functionUtils"; const entitiesMap = { states: { diff --git a/modules/dynamic/supporters.js b/modules/dynamic/supporters.js index 387473fc..4a609d84 100644 --- a/modules/dynamic/supporters.js +++ b/modules/dynamic/supporters.js @@ -1,4 +1,4 @@ -import {capitalize} from "@/utils/stringUtils"; +import {capitalize} from "/src/utils/stringUtils"; const capitalize = text => text.charAt(0).toUpperCase() + text.slice(1); diff --git a/modules/heightmap-generator.js b/modules/heightmap-generator.js index c14bde4d..806cebaa 100644 --- a/modules/heightmap-generator.js +++ b/modules/heightmap-generator.js @@ -2,7 +2,7 @@ import {TIME} from "/src/config/logging"; import {createTypedArray} from "/src/utils/arrayUtils"; import {findGridCell} from "/src/utils/graphUtils"; import {byId} from "/src/utils/shorthands"; -import {rand, P, getNumberInRange} from "@/utils/probabilityUtils"; +import {rand, P, getNumberInRange} from "/src/utils/probabilityUtils"; window.HeightmapGenerator = (function () { let grid = null; diff --git a/modules/io/export.js b/modules/io/export.js index 0487f6c8..028ddaec 100644 --- a/modules/io/export.js +++ b/modules/io/export.js @@ -1,9 +1,9 @@ import {getGridPolygon} from "/src/utils/graphUtils"; import {unique} from "/src/utils/arrayUtils"; import {tip} from "/src/scripts/tooltips"; -import {getCoordinates} from "@/utils/coordinateUtils"; +import {getCoordinates} from "/src/utils/coordinateUtils"; import {rn} from "/src/utils/numberUtils"; -import {getBase64} from "@/utils/functionUtils"; +import {getBase64} from "/src/utils/functionUtils"; // download map as SVG async function saveSVG() { diff --git a/modules/io/load.js b/modules/io/load.js index 0e61a9b8..d430886b 100644 --- a/modules/io/load.js +++ b/modules/io/load.js @@ -2,10 +2,10 @@ import {restoreDefaultEvents} from "/src/scripts/events"; import {calculateVoronoi, findCell} from "/src/utils/graphUtils"; import {last} from "/src/utils/arrayUtils"; import {tip} from "/src/scripts/tooltips"; -import {parseError} from "@/utils/errorUtils"; +import {parseError} from "/src/utils/errorUtils"; import {rn, minmax} from "/src/utils/numberUtils"; -import {link} from "@/utils/linkUtils"; -import {ldb} from "@/scripts/indexedDB"; +import {link} from "/src/utils/linkUtils"; +import {ldb} from "/src/scripts/indexedDB"; function quickLoad() { ldb.get("lastMap", blob => { diff --git a/modules/io/save.js b/modules/io/save.js index 7f3a4178..8bec8945 100644 --- a/modules/io/save.js +++ b/modules/io/save.js @@ -1,7 +1,7 @@ import {tip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {ldb} from "@/scripts/indexedDB"; -import {ra} from "@/utils/probabilityUtils"; +import {ldb} from "/src/scripts/indexedDB"; +import {ra} from "/src/utils/probabilityUtils"; // functions to save project as .map file diff --git a/modules/markers-generator.js b/modules/markers-generator.js index 3b98f2d1..d40acdca 100644 --- a/modules/markers-generator.js +++ b/modules/markers-generator.js @@ -2,10 +2,10 @@ import {TIME} from "/src/config/logging"; import {getFriendlyHeight} from "./ui/general"; import {last} from "/src/utils/arrayUtils"; import {rn} from "/src/utils/numberUtils"; -import {rand, P, gauss, ra, rw} from "@/utils/probabilityUtils"; -import {capitalize} from "@/utils/stringUtils"; -import {convertTemperature} from "@/utils/unitUtils"; -import {getAdjective, list} from "@/utils/languageUtils"; +import {rand, P, gauss, ra, rw} from "/src/utils/probabilityUtils"; +import {capitalize} from "/src/utils/stringUtils"; +import {convertTemperature} from "/src/utils/unitUtils"; +import {getAdjective, list} from "/src/utils/languageUtils"; window.Markers = (function () { let config = []; diff --git a/modules/military-generator.js b/modules/military-generator.js index 21012be7..68bea42e 100644 --- a/modules/military-generator.js +++ b/modules/military-generator.js @@ -1,8 +1,8 @@ import {TIME} from "/src/config/logging"; import {rn, minmax} from "/src/utils/numberUtils"; -import {rand, gauss, ra} from "@/utils/probabilityUtils"; -import {si} from "@/utils/unitUtils"; -import {nth} from "@/utils/languageUtils"; +import {rand, gauss, ra} from "/src/utils/probabilityUtils"; +import {si} from "/src/utils/unitUtils"; +import {nth} from "/src/utils/languageUtils"; window.Military = (function () { const generate = function () { diff --git a/modules/names-generator.js b/modules/names-generator.js index cc99f94f..8327a629 100644 --- a/modules/names-generator.js +++ b/modules/names-generator.js @@ -1,9 +1,9 @@ import {last} from "/src/utils/arrayUtils"; import {locked} from "/src/scripts/options/lock"; import {tip} from "/src/scripts/tooltips"; -import {rand, P, ra} from "@/utils/probabilityUtils"; -import {capitalize} from "@/utils/stringUtils"; -import {vowel} from "@/utils/languageUtils"; +import {rand, P, ra} from "/src/utils/probabilityUtils"; +import {capitalize} from "/src/utils/stringUtils"; +import {vowel} from "/src/utils/languageUtils"; window.Names = (function () { let chains = []; diff --git a/modules/ocean-layers.js b/modules/ocean-layers.js index 22a1398e..5ff3ca42 100644 --- a/modules/ocean-layers.js +++ b/modules/ocean-layers.js @@ -1,8 +1,8 @@ -import {TIME} from "@/config/logging"; -import {clipPoly} from "@/utils/lineUtils"; -import {rn} from "@/utils/numberUtils"; -import {P} from "@/utils/probabilityUtils"; -import {round} from "@/utils/stringUtils"; +import {TIME} from "/src/config/logging"; +import {clipPoly} from "/src/utils/lineUtils"; +import {rn} from "/src/utils/numberUtils"; +import {P} from "/src/utils/probabilityUtils"; +import {round} from "/src/utils/stringUtils"; window.OceanLayers = (function () { let cells, vertices, pointsN, used; diff --git a/modules/relief-icons.js b/modules/relief-icons.js index 2eea3633..87602126 100644 --- a/modules/relief-icons.js +++ b/modules/relief-icons.js @@ -1,6 +1,6 @@ import {getPackPolygon} from "/src/utils/graphUtils"; import {rn, minmax} from "/src/utils/numberUtils"; -import {rand} from "@/utils/probabilityUtils"; +import {rand} from "/src/utils/probabilityUtils"; window.ReliefIcons = (function () { const ReliefIcons = function () { diff --git a/modules/religions-generator.js b/modules/religions-generator.js index 16a72185..c48e3408 100644 --- a/modules/religions-generator.js +++ b/modules/religions-generator.js @@ -3,8 +3,8 @@ import {findAll} from "/src/utils/graphUtils"; import {unique} from "/src/utils/arrayUtils"; import {getRandomColor, getMixedColor} from "/src/utils/colorUtils"; import {rn} from "/src/utils/numberUtils"; -import {rand, P, ra, rw, biased} from "@/utils/probabilityUtils"; -import {trimVowels, getAdjective, abbreviate} from "@/utils/languageUtils"; +import {rand, P, ra, rw, biased} from "/src/utils/probabilityUtils"; +import {trimVowels, getAdjective, abbreviate} from "/src/utils/languageUtils"; window.Religions = (function () { // name generation approach and relative chance to be selected diff --git a/modules/river-generator.js b/modules/river-generator.js index 72e0126c..7471b992 100644 --- a/modules/river-generator.js +++ b/modules/river-generator.js @@ -1,7 +1,7 @@ import {TIME} from "/src/config/logging"; import {last} from "/src/utils/arrayUtils"; import {rn} from "/src/utils/numberUtils"; -import {round} from "@/utils/stringUtils"; +import {round} from "/src/utils/stringUtils"; window.Rivers = (function () { const generate = function (allowErosion = true) { diff --git a/modules/routes-generator.js b/modules/routes-generator.js index 2dfed844..113ea0c1 100644 --- a/modules/routes-generator.js +++ b/modules/routes-generator.js @@ -1,7 +1,7 @@ import {TIME} from "/src/config/logging"; import {findCell} from "/src/utils/graphUtils"; import {last} from "/src/utils/arrayUtils"; -import {round} from "@/utils/stringUtils"; +import {round} from "/src/utils/stringUtils"; window.Routes = (function () { const getRoads = function () { diff --git a/modules/submap.js b/modules/submap.js index 7045669d..684d25ee 100644 --- a/modules/submap.js +++ b/modules/submap.js @@ -1,5 +1,5 @@ import {findCell} from "/src/utils/graphUtils"; -import {getMiddlePoint} from "@/utils/lineUtils"; +import {getMiddlePoint} from "/src/utils/lineUtils"; import {rn} from "/src/utils/numberUtils"; window.Submap = (function () { diff --git a/modules/ui/3d.js b/modules/ui/3d.js index 6360dced..1c1d5e69 100644 --- a/modules/ui/3d.js +++ b/modules/ui/3d.js @@ -1,6 +1,6 @@ import {tip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {throttle} from "@/utils/functionUtils"; +import {throttle} from "/src/utils/functionUtils"; window.ThreeD = (function () { const options = { diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js index 769c5100..54457da7 100644 --- a/modules/ui/battle-screen.js +++ b/modules/ui/battle-screen.js @@ -1,10 +1,10 @@ import {last} from "/src/utils/arrayUtils"; import {tip} from "/src/scripts/tooltips"; -import {wiki} from "@/utils/linkUtils"; +import {wiki} from "/src/utils/linkUtils"; import {rn, minmax} from "/src/utils/numberUtils"; -import {rand, P, Pint} from "@/utils/probabilityUtils"; -import {capitalize} from "@/utils/stringUtils"; -import {getAdjective, list} from "@/utils/languageUtils"; +import {rand, P, Pint} from "/src/utils/probabilityUtils"; +import {capitalize} from "/src/utils/stringUtils"; +import {getAdjective, list} from "/src/utils/languageUtils"; export class Battle { constructor(attacker, defender) { diff --git a/modules/ui/biomes-editor.js b/modules/ui/biomes-editor.js index 8fcbbb8a..a594143e 100644 --- a/modules/ui/biomes-editor.js +++ b/modules/ui/biomes-editor.js @@ -2,9 +2,9 @@ import {restoreDefaultEvents} from "/src/scripts/events"; import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils"; import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; import {getRandomColor} from "/src/utils/colorUtils"; -import {openURL} from "@/utils/linkUtils"; +import {openURL} from "/src/utils/linkUtils"; import {rn} from "/src/utils/numberUtils"; -import {si} from "@/utils/unitUtils"; +import {si} from "/src/utils/unitUtils"; export function editBiomes() { if (customization) return; diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js index a005fa0c..4411a38d 100644 --- a/modules/ui/burg-editor.js +++ b/modules/ui/burg-editor.js @@ -1,9 +1,9 @@ import {findCell} from "/src/utils/graphUtils"; import {tip, clearMainTip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {prompt} from "@/scripts/prompt"; -import {rand} from "@/utils/probabilityUtils"; -import {parseTransform} from "@/utils/stringUtils"; +import {prompt} from "/src/scripts/prompt"; +import {rand} from "/src/utils/probabilityUtils"; +import {parseTransform} from "/src/utils/stringUtils"; export function editBurg(id) { if (customization) return; diff --git a/modules/ui/burgs-overview.js b/modules/ui/burgs-overview.js index ae41d670..346e74b8 100644 --- a/modules/ui/burgs-overview.js +++ b/modules/ui/burgs-overview.js @@ -1,9 +1,9 @@ import {restoreDefaultEvents} from "/src/scripts/events"; import {findCell} from "/src/utils/graphUtils"; import {tip, clearMainTip} from "/src/scripts/tooltips"; -import {getCoordinates} from "@/utils/coordinateUtils"; +import {getCoordinates} from "/src/utils/coordinateUtils"; import {rn} from "/src/utils/numberUtils"; -import {si, siToInteger} from "@/utils/unitUtils"; +import {si, siToInteger} from "/src/utils/unitUtils"; export function overviewBurgs() { if (customization) return; diff --git a/modules/ui/coastline-editor.js b/modules/ui/coastline-editor.js index 62a02c26..81a6ef61 100644 --- a/modules/ui/coastline-editor.js +++ b/modules/ui/coastline-editor.js @@ -1,9 +1,9 @@ import {getPackPolygon} from "/src/utils/graphUtils"; import {tip} from "/src/scripts/tooltips"; -import {clipPoly} from "@/utils/lineUtils"; +import {clipPoly} from "/src/utils/lineUtils"; import {rn} from "/src/utils/numberUtils"; -import {round} from "@/utils/stringUtils"; -import {si} from "@/utils/unitUtils"; +import {round} from "/src/utils/stringUtils"; +import {si} from "/src/utils/unitUtils"; export function editCoastline(node = d3.event.target) { if (customization) return; diff --git a/modules/ui/editors.js b/modules/ui/editors.js index 0f91396d..6d05834f 100644 --- a/modules/ui/editors.js +++ b/modules/ui/editors.js @@ -3,7 +3,7 @@ import {findCell} from "/src/utils/graphUtils"; import {byId} from "/src/utils/shorthands"; import {tip} from "/src/scripts/tooltips"; import {rn, minmax, normalize} from "/src/utils/numberUtils"; -import {parseTransform} from "@/utils/stringUtils"; +import {parseTransform} from "/src/utils/stringUtils"; // clear elSelected variable export function unselect() { diff --git a/modules/ui/emblems-editor.js b/modules/ui/emblems-editor.js index c938b1ed..0158d3a1 100644 --- a/modules/ui/emblems-editor.js +++ b/modules/ui/emblems-editor.js @@ -1,8 +1,8 @@ import {clearMainTip} from "/src/scripts/tooltips"; import {tip} from "/src/scripts/tooltips"; -import {openURL} from "@/utils/linkUtils"; +import {openURL} from "/src/utils/linkUtils"; import {rn} from "/src/utils/numberUtils"; -import {parseTransform} from "@/utils/stringUtils"; +import {parseTransform} from "/src/utils/stringUtils"; export function editEmblem(type, id, el) { if (customization) return; diff --git a/modules/ui/general.js b/modules/ui/general.js index c253a688..0b203253 100644 --- a/modules/ui/general.js +++ b/modules/ui/general.js @@ -1,8 +1,8 @@ import {findCell, findGridCell} from "/src/utils/graphUtils"; import {rn} from "/src/utils/numberUtils"; -import {link} from "@/utils/linkUtils"; -import {getCoordinates, toDMS} from "@/utils/coordinateUtils"; -import {si} from "@/utils/unitUtils"; +import {link} from "/src/utils/linkUtils"; +import {getCoordinates, toDMS} from "/src/utils/coordinateUtils"; +import {si} from "/src/utils/unitUtils"; // fit full-screen map if window is resized window.addEventListener("resize", function (e) { diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js index d2f01bd8..f29bc0ac 100644 --- a/modules/ui/heightmap-editor.js +++ b/modules/ui/heightmap-editor.js @@ -4,9 +4,9 @@ import {last, createTypedArray} from "/src/utils/arrayUtils"; import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; import {byId} from "/src/utils/shorthands"; import {rn, minmax, lim} from "/src/utils/numberUtils"; -import {link} from "@/utils/linkUtils"; -import {prompt} from "@/scripts/prompt"; -import {throttle} from "@/utils/functionUtils"; +import {link} from "/src/utils/linkUtils"; +import {prompt} from "/src/scripts/prompt"; +import {throttle} from "/src/utils/functionUtils"; export function editHeightmap(options) { const {mode, tool} = options || {}; diff --git a/modules/ui/ice-editor.js b/modules/ui/ice-editor.js index ccfc0d51..13ff3f66 100644 --- a/modules/ui/ice-editor.js +++ b/modules/ui/ice-editor.js @@ -1,8 +1,8 @@ import {findGridCell, getGridPolygon} from "/src/utils/graphUtils"; import {tip, clearMainTip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {ra} from "@/utils/probabilityUtils"; -import {parseTransform} from "@/utils/stringUtils"; +import {ra} from "/src/utils/probabilityUtils"; +import {parseTransform} from "/src/utils/stringUtils"; export function editIce() { if (customization) return; diff --git a/modules/ui/labels-editor.js b/modules/ui/labels-editor.js index 16c008c9..435f0e38 100644 --- a/modules/ui/labels-editor.js +++ b/modules/ui/labels-editor.js @@ -1,7 +1,6 @@ import {findCell} from "/src/utils/graphUtils"; import {tip, showMainTip} from "/src/scripts/tooltips"; -import {round, parseTransform} from "@/utils/stringUtils"; -import {parseTransform} from "@/utils/stringUtils"; +import {round, parseTransform} from "/src/utils/stringUtils"; export function editLabel() { if (customization) return; diff --git a/modules/ui/lakes-editor.js b/modules/ui/lakes-editor.js index af0ce844..0127a901 100644 --- a/modules/ui/lakes-editor.js +++ b/modules/ui/lakes-editor.js @@ -1,9 +1,9 @@ import {getPackPolygon} from "/src/utils/graphUtils"; import {tip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {rand} from "@/utils/probabilityUtils"; -import {round} from "@/utils/stringUtils"; -import {si} from "@/utils/unitUtils"; +import {rand} from "/src/utils/probabilityUtils"; +import {round} from "/src/utils/stringUtils"; +import {si} from "/src/utils/unitUtils"; export function editLake() { if (customization) return; diff --git a/modules/ui/layers.js b/modules/ui/layers.js index 7652753f..18e26121 100644 --- a/modules/ui/layers.js +++ b/modules/ui/layers.js @@ -5,13 +5,13 @@ import {last} from "/src/utils/arrayUtils"; import {stored, store} from "/src/utils/shorthands"; import {tip} from "/src/scripts/tooltips"; import {byId} from "/src/utils/shorthands"; -import {clipPoly} from "@/utils/lineUtils"; +import {clipPoly} from "/src/utils/lineUtils"; import {rn, minmax, normalize} from "/src/utils/numberUtils"; -import {isCtrlClick} from "@/utils/keyboardUtils"; -import {prompt} from "@/scripts/prompt"; -import {rand, P} from "@/utils/probabilityUtils"; -import {convertTemperature} from "@/utils/unitUtils"; -import {getBase64} from "@/utils/functionUtils"; +import {isCtrlClick} from "/src/utils/keyboardUtils"; +import {prompt} from "/src/scripts/prompt"; +import {rand, P} from "/src/utils/probabilityUtils"; +import {convertTemperature} from "/src/utils/unitUtils"; +import {getBase64} from "/src/utils/functionUtils"; let presets = {}; restoreCustomPresets(); // run on-load diff --git a/modules/ui/military-overview.js b/modules/ui/military-overview.js index 452b6cff..199a0858 100644 --- a/modules/ui/military-overview.js +++ b/modules/ui/military-overview.js @@ -1,8 +1,8 @@ import {tip} from "/src/scripts/tooltips"; -import {wiki} from "@/utils/linkUtils"; +import {wiki} from "/src/utils/linkUtils"; import {rn} from "/src/utils/numberUtils"; -import {capitalize} from "@/utils/stringUtils"; -import {si} from "@/utils/unitUtils"; +import {capitalize} from "/src/utils/stringUtils"; +import {si} from "/src/utils/unitUtils"; export function overviewMilitary() { if (customization) return; diff --git a/modules/ui/namesbase-editor.js b/modules/ui/namesbase-editor.js index 7e3ee07f..1fce3c1b 100644 --- a/modules/ui/namesbase-editor.js +++ b/modules/ui/namesbase-editor.js @@ -1,6 +1,6 @@ import {unique} from "/src/utils/arrayUtils"; import {tip} from "/src/scripts/tooltips"; -import {openURL} from "@/utils/linkUtils"; +import {openURL} from "/src/utils/linkUtils"; import {rn} from "/src/utils/numberUtils"; export function editNamesbase() { diff --git a/modules/ui/options.js b/modules/ui/options.js index f957e973..d34dc235 100644 --- a/modules/ui/options.js +++ b/modules/ui/options.js @@ -4,7 +4,7 @@ import {lock, locked} from "/src/scripts/options/lock"; import {tip, clearMainTip} from "/src/scripts/tooltips"; import {byId, stored} from "/src/utils/shorthands"; import {rn, minmax} from "/src/utils/numberUtils"; -import {rand, P, gauss} from "@/utils/probabilityUtils"; +import {rand, P, gauss} from "/src/utils/probabilityUtils"; $("#optionsContainer").draggable({handle: ".drag-trigger", snap: "svg", snapMode: "both"}); $("#exitCustomization").draggable({handle: "div"}); diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js index 6d16f7d0..b50b7304 100644 --- a/modules/ui/provinces-editor.js +++ b/modules/ui/provinces-editor.js @@ -4,9 +4,9 @@ import {unique} from "/src/utils/arrayUtils"; import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; import {getRandomColor} from "/src/utils/colorUtils"; import {rn} from "/src/utils/numberUtils"; -import {rand, P} from "@/utils/probabilityUtils"; -import {parseTransform} from "@/utils/stringUtils"; -import {si} from "@/utils/unitUtils"; +import {rand, P} from "/src/utils/probabilityUtils"; +import {parseTransform} from "/src/utils/stringUtils"; +import {si} from "/src/utils/unitUtils"; export function editProvinces() { if (customization) return; diff --git a/modules/ui/regiment-editor.js b/modules/ui/regiment-editor.js index a0378140..bd5a7223 100644 --- a/modules/ui/regiment-editor.js +++ b/modules/ui/regiment-editor.js @@ -3,7 +3,7 @@ import {findCell} from "/src/utils/graphUtils"; import {last} from "/src/utils/arrayUtils"; import {tip, clearMainTip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {capitalize} from "@/utils/stringUtils"; +import {capitalize} from "/src/utils/stringUtils"; export function editRegiment(selector) { if (customization) return; diff --git a/modules/ui/regiments-overview.js b/modules/ui/regiments-overview.js index 59a0ff8b..8dc02bfe 100644 --- a/modules/ui/regiments-overview.js +++ b/modules/ui/regiments-overview.js @@ -2,8 +2,8 @@ import {findCell} from "/src/utils/graphUtils"; import {last} from "/src/utils/arrayUtils"; import {tip, clearMainTip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {capitalize} from "@/utils/stringUtils"; -import {si} from "@/utils/unitUtils"; +import {capitalize} from "/src/utils/stringUtils"; +import {si} from "/src/utils/unitUtils"; export function overviewRegiments(state) { if (customization) return; diff --git a/modules/ui/rivers-editor.js b/modules/ui/rivers-editor.js index 3bcc953f..005c2bc8 100644 --- a/modules/ui/rivers-editor.js +++ b/modules/ui/rivers-editor.js @@ -1,8 +1,8 @@ import {findCell, getPackPolygon} from "/src/utils/graphUtils"; import {tip, clearMainTip} from "/src/scripts/tooltips"; -import {getSegmentId} from "@/utils/lineUtils"; +import {getSegmentId} from "/src/utils/lineUtils"; import {rn} from "/src/utils/numberUtils"; -import {rand} from "@/utils/probabilityUtils"; +import {rand} from "/src/utils/probabilityUtils"; export function editRiver(id) { if (customization) return; diff --git a/modules/ui/routes-editor.js b/modules/ui/routes-editor.js index c06f6fb9..f70cd029 100644 --- a/modules/ui/routes-editor.js +++ b/modules/ui/routes-editor.js @@ -1,8 +1,8 @@ import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; -import {getSegmentId} from "@/utils/lineUtils"; +import {getSegmentId} from "/src/utils/lineUtils"; import {rn} from "/src/utils/numberUtils"; -import {getNextId} from "@/utils/nodeUtils"; -import {round} from "@/utils/stringUtils"; +import {getNextId} from "/src/utils/nodeUtils"; +import {round} from "/src/utils/stringUtils"; export function editRoute(onClick) { if (customization) return; diff --git a/modules/ui/style.js b/modules/ui/style.js index d9957091..3b1aad53 100644 --- a/modules/ui/style.js +++ b/modules/ui/style.js @@ -1,7 +1,7 @@ import {tip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {parseTransform} from "@/utils/stringUtils"; -import {getBase64} from "@/utils/functionUtils"; +import {parseTransform} from "/src/utils/stringUtils"; +import {getBase64} from "/src/utils/functionUtils"; // add available filters to lists { diff --git a/modules/ui/stylePresets.js b/modules/ui/stylePresets.js index 2f91c5e2..1d2bcc5b 100644 --- a/modules/ui/stylePresets.js +++ b/modules/ui/stylePresets.js @@ -1,5 +1,5 @@ import {tip} from "/src/scripts/tooltips"; -import {isJsonValid} from "@/utils/stringUtils"; +import {isJsonValid} from "/src/utils/stringUtils"; const systemPresets = [ "default", diff --git a/modules/ui/submap.js b/modules/ui/submap.js index b5059f1e..c3a8d351 100644 --- a/modules/ui/submap.js +++ b/modules/ui/submap.js @@ -1,8 +1,8 @@ import {byId} from "/src/utils/shorthands"; import {clearMainTip} from "/src/scripts/tooltips"; -import {parseError} from "@/utils/errorUtils"; +import {parseError} from "/src/utils/errorUtils"; import {rn, minmax} from "/src/utils/numberUtils"; -import {debounce} from "@/utils/functionUtils"; +import {debounce} from "/src/utils/functionUtils"; window.UISubmap = (function () { byId("submapPointsInput").addEventListener("input", function () { diff --git a/modules/ui/temperature-graph.js b/modules/ui/temperature-graph.js index 6fae24a6..713b42e1 100644 --- a/modules/ui/temperature-graph.js +++ b/modules/ui/temperature-graph.js @@ -1,7 +1,7 @@ import {tip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {round} from "@/utils/stringUtils"; -import {convertTemperature} from "@/utils/unitUtils"; +import {round} from "/src/utils/stringUtils"; +import {convertTemperature} from "/src/utils/unitUtils"; export function showBurgTemperatureGraph(id) { const b = pack.burgs[id]; diff --git a/modules/ui/tools.js b/modules/ui/tools.js index 8046fc37..a56ba3ed 100644 --- a/modules/ui/tools.js +++ b/modules/ui/tools.js @@ -3,10 +3,10 @@ import {findCell} from "/src/utils/graphUtils"; import {last} from "/src/utils/arrayUtils"; import {tip, clearMainTip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {isCtrlClick} from "@/utils/keyboardUtils"; -import {prompt} from "@/scripts/prompt"; -import {getNextId} from "@/utils/nodeUtils"; -import {P, generateSeed} from "@/utils/probabilityUtils"; +import {isCtrlClick} from "/src/utils/keyboardUtils"; +import {prompt} from "/src/scripts/prompt"; +import {getNextId} from "/src/utils/nodeUtils"; +import {P, generateSeed} from "/src/utils/probabilityUtils"; toolsContent.addEventListener("click", function (event) { if (customization) return tip("Please exit the customization mode first", false, "warning"); diff --git a/modules/ui/units-editor.js b/modules/ui/units-editor.js index db08ee8b..886f8ef0 100644 --- a/modules/ui/units-editor.js +++ b/modules/ui/units-editor.js @@ -1,7 +1,7 @@ import {restoreDefaultEvents} from "/src/scripts/events"; import {findCell} from "/src/utils/graphUtils"; import {tip} from "/src/scripts/tooltips"; -import {prompt} from "@/scripts/prompt"; +import {prompt} from "/src/scripts/prompt"; export function editUnits() { closeDialogs("#unitsEditor, .stable"); diff --git a/modules/ui/world-configurator.js b/modules/ui/world-configurator.js index 0dfbe703..0fb0baf6 100644 --- a/modules/ui/world-configurator.js +++ b/modules/ui/world-configurator.js @@ -1,6 +1,6 @@ import {tip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {round, parseTransform} from "@/utils/stringUtils"; +import {round, parseTransform} from "/src/utils/stringUtils"; export function editWorld() { if (customization) return; diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js index 81051aba..0fd9d023 100644 --- a/modules/ui/zones-editor.js +++ b/modules/ui/zones-editor.js @@ -3,8 +3,8 @@ import {findAll, findCell, getPackPolygon} from "/src/utils/graphUtils"; import {unique} from "/src/utils/arrayUtils"; import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips"; import {rn} from "/src/utils/numberUtils"; -import {getNextId} from "@/utils/nodeUtils"; -import {si} from "@/utils/unitUtils"; +import {getNextId} from "/src/utils/nodeUtils"; +import {si} from "/src/utils/unitUtils"; export function editZones() { closeDialogs(); diff --git a/modules/zoom.js b/modules/zoom.js index 7573eeee..4e7f2b73 100644 --- a/modules/zoom.js +++ b/modules/zoom.js @@ -1,4 +1,4 @@ -import {debounce} from "@/utils/functionUtils"; +import {debounce} from "/src/utils/functionUtils"; // temporary expose to global window.scale = 1; diff --git a/src/main.ts b/src/main.ts index 1622d64b..302b1b9a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,8 @@ // Azgaar (azgaar.fmg@yandex.com). Minsk, 2017-2022. MIT License // https://github.com/Azgaar/Fantasy-Map-Generator +console.log("Hello World"); + import {invokeActiveZooming} from "../modules/activeZooming"; import {applyPreset, drawBorders, drawRivers, drawStates} from "../modules/ui/layers"; import {applyMapSize, applyStoredOptions, randomizeOptions} from "../modules/ui/options"; @@ -21,12 +23,13 @@ import { isLand, shouldRegenerateGrid } from "./utils/graphUtils"; -import {parseError} from "@/utils/errorUtils"; +import {parseError} from "./utils/errorUtils"; import {rn, minmax, normalize} from "./utils/numberUtils"; import {createTypedArray} from "./utils/arrayUtils"; -import {clipPoly} from "@/utils/lineUtils"; -import {rand, P, gauss, ra, rw, generateSeed} from "@/utils/probabilityUtils"; -import {getAdjective} from "@/utils/languageUtils"; +import {clipPoly} from "./utils/lineUtils"; +import {rand, P, gauss, ra, rw, generateSeed} from "./utils/probabilityUtils"; +import {getAdjective} from "./utils/languageUtils"; +import {debounce} from "./utils/functionUtils"; import {byId} from "./utils/shorthands"; import "./components"; diff --git a/src/modules/legend.ts b/src/modules/legend.ts index 7bc21d6c..d5d3aa89 100644 --- a/src/modules/legend.ts +++ b/src/modules/legend.ts @@ -1,5 +1,5 @@ import {rn} from "../utils/numberUtils"; -import {parseTransform} from "@/utils/stringUtils"; +import {parseTransform} from "/src/utils/stringUtils"; export function drawLegend(name: string, data: unknown[]) { legend.selectAll("*").remove(); // fully redraw every time diff --git a/src/modules/measurers.js b/src/modules/measurers.js index 8f637123..4a883c57 100644 --- a/src/modules/measurers.js +++ b/src/modules/measurers.js @@ -1,9 +1,9 @@ import {findCell} from "/src/utils/graphUtils"; import {last} from "/src/utils/arrayUtils"; -import {getSegmentId} from "@/utils/lineUtils"; +import {getSegmentId} from "/src/utils/lineUtils"; import {rn} from "/src/utils/numberUtils"; -import {round, parseTransform} from "@/utils/stringUtils"; -import {si} from "@/utils/unitUtils"; +import {round, parseTransform} from "/src/utils/stringUtils"; +import {si} from "/src/utils/unitUtils"; export class Rulers { constructor() { diff --git a/src/scripts/events.ts b/src/scripts/events.ts index 31402f66..420efa86 100644 --- a/src/scripts/events.ts +++ b/src/scripts/events.ts @@ -1,8 +1,8 @@ import {dragLegendBox} from "../modules/legend"; import {findCell, findGridCell} from "../utils/graphUtils"; import {tip, showMainTip} from "./tooltips"; -import {si, convertTemperature} from "@/utils/unitUtils"; -import {debounce} from "@/utils/functionUtils"; +import {si, convertTemperature} from "/src/utils/unitUtils"; +import {debounce} from "/src/utils/functionUtils"; export function restoreDefaultEvents() { Zoom.setZoomBehavior(); diff --git a/src/scripts/prompt.ts b/src/scripts/prompt.ts index 387d5f43..0a4030ca 100644 --- a/src/scripts/prompt.ts +++ b/src/scripts/prompt.ts @@ -1,4 +1,4 @@ -import {ERROR} from "@/config/logging"; +import {ERROR} from "/src/config/logging"; // prompt replacer (prompt does not work in Electron) const $prompt: HTMLElement = document.getElementById("prompt")!; diff --git a/src/utils/arrayUtils.ts b/src/utils/arrayUtils.ts index 3937842c..bc88e7f5 100644 --- a/src/utils/arrayUtils.ts +++ b/src/utils/arrayUtils.ts @@ -1,4 +1,4 @@ -import {UINT8_MAX, UINT16_MAX, UINT32_MAX} from "@/constants"; +import {UINT8_MAX, UINT16_MAX, UINT32_MAX} from "/src/constants"; export function last(array: T[]) { return array[array.length - 1]; diff --git a/src/utils/languageUtils.ts b/src/utils/languageUtils.ts index 322a81ac..6a93b9ed 100644 --- a/src/utils/languageUtils.ts +++ b/src/utils/languageUtils.ts @@ -1,4 +1,4 @@ -import {P} from "@/utils/probabilityUtils"; +import {P} from "/src/utils/probabilityUtils"; // chars that serve as vowels const VOWELS = `aeiouyɑ'əøɛœæɶɒɨɪɔɐʊɤɯаоиеёэыуюяàèìòùỳẁȁȅȉȍȕáéíóúýẃőűâêîôûŷŵäëïöüÿẅãẽĩõũỹąęįǫųāēīōūȳăĕĭŏŭǎěǐǒǔȧėȯẏẇạẹịọụỵẉḛḭṵṳ`; diff --git a/src/utils/probabilityUtils.ts b/src/utils/probabilityUtils.ts index c9e2c284..0613a539 100644 --- a/src/utils/probabilityUtils.ts +++ b/src/utils/probabilityUtils.ts @@ -1,4 +1,4 @@ -import {ERROR} from "@/config/logging"; +import {ERROR} from "/src/config/logging"; import {minmax, rn} from "./numberUtils"; const d3 = window.d3; diff --git a/src/utils/stringUtils.ts b/src/utils/stringUtils.ts index ffbf3b3b..d703755b 100644 --- a/src/utils/stringUtils.ts +++ b/src/utils/stringUtils.ts @@ -1,4 +1,4 @@ -import {rn} from "@/utils/numberUtils"; +import {rn} from "/src/utils/numberUtils"; // round numbers in string to d decimals export function round(str: string, d = 1) { diff --git a/tsconfig.json b/tsconfig.json index 2a89fcd4..26af30b9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,11 +14,11 @@ "noUnusedLocals": true, "noUnusedParameters": true, "noImplicitReturns": true, - "skipLibCheck": true, - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "skipLibCheck": true + // "baseUrl": ".", + // "paths": { + // "@/*": ["./src/*"] + // } }, - "include": ["src", "utils", "modules"] + "include": ["src"] } diff --git a/versioning.js b/versioning.js index bf19a4e5..372bb471 100644 --- a/versioning.js +++ b/versioning.js @@ -3,6 +3,8 @@ // version and caching control const version = "1.87.04"; // generator version, update each time +console.log(`version: ${version}`); + { document.title += " v" + version; const loadingScreenVersion = document.getElementById("version"); diff --git a/vite.config.js b/vite.config.js index b8a9242d..e97c9c1f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -2,11 +2,24 @@ import {defineConfig} from "vite"; import {fileURLToPath} from "url"; import path from "path"; +const pathName = path.dirname(fileURLToPath(import.meta.url)); +const resolved = path.resolve(pathName, "./src"); + export default defineConfig({ - base: "/Fantasy-Map-Generator/", + // base: "/Fantasy-Map-Generator/", resolve: { - alias: { - "@": path.resolve(path.dirname(fileURLToPath(import.meta.url)), "/src") - } + alias: [ + // "@": "./src" + // "@": path.resolve(path.dirname(fileURLToPath(import.meta.url)), "./src") + // "@": path.resolve(path.dirname(fileURLToPath(import.meta.url)), "/src") + { + find: "@", + replacement: path.resolve(pathName, "./src"), + customResolver: request => { + console.log(request); + return request; + } + } + ] } });