+
+
+
+
+
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
+<<<<<<< HEAD
+=======
+
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
@@ -207,6 +226,7 @@ function overviewBurgs() {
function toggleBurgLockStatus() {
const burgId = +this.parentNode.dataset.id;
+<<<<<<< HEAD
const burg = pack.burgs[burgId];
burg.lock = !burg.lock;
@@ -221,6 +241,8 @@ function overviewBurgs() {
}
}
+=======
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
function openBurgEditor() {
const burg = +this.parentNode.dataset.id;
editBurg(burg);
@@ -413,6 +435,7 @@ function overviewBurgs() {
if (this.value === "provinces") return d.province;
};
+<<<<<<< HEAD
const mapping = {
states: getStatesData,
cultures: getCulturesData,
@@ -421,6 +444,16 @@ function overviewBurgs() {
};
const base = mapping[this.value]();
+=======
+ const base =
+ this.value === "states"
+ ? getStatesData()
+ : this.value === "cultures"
+ ? getCulturesData()
+ : this.value === "parent"
+ ? getParentData()
+ : getProvincesData();
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
burgs.forEach(b => (b.id = b.i + base.length - 1));
const data = base.concat(burgs);
@@ -452,10 +485,17 @@ function overviewBurgs() {
}
function downloadBurgsData() {
+<<<<<<< HEAD
let data = `Id,Burg,Province,Province Full Name,State,State Full Name,Culture,Religion,Population,Latitude,Longitude,Elevation (${heightUnit.value}),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town`; // headers
if (options.showMFCGMap) data += `,City Generator Link`;
data += "\n";
+=======
+ let data =
+ "Id,Burg,Province,Province Full Name,State,State Full Name,Culture,Religion,Population,Longitude,Latitude,Elevation (" +
+ heightUnit.value +
+ "),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town\n"; // headers
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
const valid = pack.burgs.filter(b => b.i && !b.removed); // all valid burgs
valid.forEach((b) => {
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index 166833b5..f3f31b20 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -295,6 +295,7 @@ function getBurgSeed(burg) {
return burg.MFCG || Number(`${seed}${String(burg.i).padStart(4, 0)}`);
}
+<<<<<<< HEAD
function getMFCGlink(burg) {
if (burg.link) return burg.link;
@@ -356,6 +357,8 @@ function getMFCGlink(burg) {
return url.toString();
}
+=======
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
// draw legend box
function drawLegend(name, data) {
legend.selectAll('*').remove(); // fully redraw every time
diff --git a/modules/ui/general.js b/modules/ui/general.js
index 4305f016..030ada19 100644
--- a/modules/ui/general.js
+++ b/modules/ui/general.js
@@ -74,8 +74,13 @@ function showElementLockTip(event) {
}
}
+<<<<<<< HEAD
const onMouseMove = debounce(handleMouseMove, 100);
function handleMouseMove() {
+=======
+const moved = debounce(mouseMove, 100);
+function mouseMove() {
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
const point = d3.mouse(this);
const i = findCell(point[0], point[1]); // pack cell id
if (i === undefined) return;
@@ -121,11 +126,15 @@ function showMapTooltip(point, e, i, g) {
if (group === "emblems" && e.target.tagName === "use") {
const parent = e.target.parentNode;
const [g, type] =
+<<<<<<< HEAD
parent.id === "burgEmblems"
? [pack.burgs, "burg"]
: parent.id === "provinceEmblems"
? [pack.provinces, "province"]
: [pack.states, "state"];
+=======
+ parent.id === "burgEmblems" ? [pack.burgs, "burg"] : parent.id === "provinceEmblems" ? [pack.provinces, "province"] : [pack.states, "state"];
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
const i = +e.target.dataset.i;
if (event.shiftKey) highlightEmblemElement(type, g[i]);
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index 06ca0ff8..5360b0da 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -443,11 +443,31 @@ function regenerateIce() {
drawIce();
}
+<<<<<<< HEAD
function regenerateMarkers() {
Markers.regenerate();
turnButtonOn("toggleMarkers");
drawMarkers();
if (document.getElementById("markersOverviewRefresh").offsetParent) markersOverviewRefresh.click();
+=======
+function regenerateMarkers(event) {
+ if (isCtrlClick(event)) prompt("Please provide markers number multiplier", {default: 1, step: 0.01, min: 0, max: 100}, v => addNumberOfMarkers(v));
+ else addNumberOfMarkers();
+
+ function addNumberOfMarkers(multiplier) {
+ pack.markers = pack.markers.filter(marker => {
+ if (marker.lock) return true;
+ document.getElementById(`marker${marker.i}`)?.remove();
+ const index = notes.findIndex(note => note.id === marker.id);
+ if (index != -1) notes.splice(index, 1);
+ return false;
+ });
+
+ Markers.regenerate(multiplier);
+ turnButtonOn("toggleMarkers");
+ drawMarkers();
+ }
+>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
}
function regenerateZones(event) {
