+
-
-
+
+
diff --git a/modules/ui/biomes-editor.js b/modules/ui/biomes-editor.js
index 3908912b..4fd8d587 100644
--- a/modules/ui/biomes-editor.js
+++ b/modules/ui/biomes-editor.js
@@ -22,6 +22,7 @@ function editBiomes() {
// add listeners
document.getElementById("biomesEditorRefresh").addEventListener("click", refreshBiomesEditor);
+ document.getElementById("biomesEditStyle").addEventListener("click", () => editStyle("biomes"));
document.getElementById("biomesLegend").addEventListener("click", toggleLegend);
document.getElementById("biomesPercentage").addEventListener("click", togglePercentageMode);
document.getElementById("biomesManually").addEventListener("click", enterBiomesCustomizationMode);
diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js
index 0511dd14..a29fc5d6 100644
--- a/modules/ui/burg-editor.js
+++ b/modules/ui/burg-editor.js
@@ -14,6 +14,8 @@ function editBurg() {
const my = elSelected.attr("id") == d3.event.target.id ? "center bottom" : "center top+10";
const at = elSelected.attr("id") == d3.event.target.id ? "top" : "bottom";
+ document.getElementById("burgEditAnchorStyle").style.display = +pack.burgs[id].port ? "inline-block" : "none";
+
$("#burgEditor").dialog({
title: "Edit Burg: " + elSelected.text(), resizable: false,
position: {my, at, of: d3.event.target, collision: "fit"},
@@ -37,6 +39,12 @@ function editBurg() {
document.getElementById("burgNameReCulture").addEventListener("click", generateNameCulture);
document.getElementById("burgNameReRandom").addEventListener("click", generateNameRandom);
+ document.getElementById("burgStyleShow").addEventListener("click", showStyleSection);
+ document.getElementById("burgStyleHide").addEventListener("click", hideStyleSection);
+ document.getElementById("burgEditLabelStyle").addEventListener("click", editGroupLabelStyle);
+ document.getElementById("burgEditIconStyle").addEventListener("click", editGroupIconStyle);
+ document.getElementById("burgEditAnchorStyle").addEventListener("click", editGroupAnchorStyle);
+
document.getElementById("burgSeeInMFCG").addEventListener("click", openInMFCG);
document.getElementById("burgOpenCOA").addEventListener("click", openInIAHG);
document.getElementById("burgRelocate").addEventListener("click", toggleRelocateBurg);
@@ -211,6 +219,31 @@ function editBurg() {
changeName();
}
+ function showStyleSection() {
+ document.querySelectorAll("#burgEditor > button").forEach(el => el.style.display = "none");
+ document.getElementById("burgStyleSection").style.display = "inline-block";
+ }
+
+ function hideStyleSection() {
+ document.querySelectorAll("#burgEditor > button").forEach(el => el.style.display = "inline-block");
+ document.getElementById("burgStyleSection").style.display = "none";
+ }
+
+ function editGroupLabelStyle() {
+ const g = elSelected.node().parentNode.id;
+ editStyle("labels", g);
+ }
+
+ function editGroupIconStyle() {
+ const g = elSelected.node().parentNode.id;
+ editStyle("burgIcons", g);
+ }
+
+ function editGroupAnchorStyle() {
+ const g = elSelected.node().parentNode.id;
+ editStyle("anchors", g);
+ }
+
function openInMFCG() {
const id = elSelected.attr("data-id");
const name = elSelected.text();
diff --git a/modules/ui/burgs-editor.js b/modules/ui/burgs-editor.js
index bfbdcfa9..6cc55dc5 100644
--- a/modules/ui/burgs-editor.js
+++ b/modules/ui/burgs-editor.js
@@ -20,7 +20,7 @@ function editBurgs() {
// add listeners
document.getElementById("burgsEditorRefresh").addEventListener("click", refreshBurgsEditor);
- document.getElementById("burgsChart").addEventListener("click", showBurgsChart);
+ document.getElementById("burgsChart").addEventListener("click", showBurgsChart);
document.getElementById("burgsFilterState").addEventListener("change", burgsEditorAddLines);
document.getElementById("burgsFilterCulture").addEventListener("change", burgsEditorAddLines);
document.getElementById("regenerateBurgNames").addEventListener("click", regenerateNames);
diff --git a/modules/ui/cultures-editor.js b/modules/ui/cultures-editor.js
index 9ad8bbcc..c1562171 100644
--- a/modules/ui/cultures-editor.js
+++ b/modules/ui/cultures-editor.js
@@ -22,6 +22,7 @@ function editCultures() {
// add listeners
document.getElementById("culturesEditorRefresh").addEventListener("click", refreshCulturesEditor);
+ document.getElementById("culturesEditStyle").addEventListener("click", () => editStyle("cults"));
document.getElementById("culturesLegend").addEventListener("click", toggleLegend);
document.getElementById("culturesPercentage").addEventListener("click", togglePercentageMode);
document.getElementById("culturesRecalculate").addEventListener("click", () => recalculateCultures(true));
diff --git a/modules/ui/diplomacy-editor.js b/modules/ui/diplomacy-editor.js
index f9fe4c62..a74dddf4 100644
--- a/modules/ui/diplomacy-editor.js
+++ b/modules/ui/diplomacy-editor.js
@@ -34,6 +34,7 @@ function editDiplomacy() {
// add listeners
document.getElementById("diplomacyEditorRefresh").addEventListener("click", refreshDiplomacyEditor);
+ document.getElementById("diplomacyEditStyle").addEventListener("click", () => editStyle("regions"));
document.getElementById("diplomacyRegenerate").addEventListener("click", regenerateRelations);
document.getElementById("diplomacyMatrix").addEventListener("click", showRelationsMatrix);
document.getElementById("diplomacyHistory").addEventListener("click", showRelationsHistory);
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 0b792be3..7f5b34ef 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -1190,4 +1190,4 @@ function getHeight(h) {
}
}
-}
+}
\ No newline at end of file
diff --git a/modules/ui/labels-editor.js b/modules/ui/labels-editor.js
index 9d39a7e5..70606b0b 100644
--- a/modules/ui/labels-editor.js
+++ b/modules/ui/labels-editor.js
@@ -34,7 +34,9 @@ function editLabel() {
document.getElementById("labelTextShow").addEventListener("click", showTextSection);
document.getElementById("labelTextHide").addEventListener("click", hideTextSection);
document.getElementById("labelText").addEventListener("input", changeText);
- document.getElementById("labelTextRandom").addEventListener("click", generateRandomName);
+ document.getElementById("labelTextRandom").addEventListener("click", generateRandomName);
+
+ document.getElementById("labelEditStyle").addEventListener("click", editGroupStyle);
document.getElementById("labelSizeShow").addEventListener("click", showSizeSection);
document.getElementById("labelSizeHide").addEventListener("click", hideSizeSection);
@@ -281,6 +283,11 @@ function editLabel() {
changeText();
}
+ function editGroupStyle() {
+ const g = elSelected.node().parentNode.id;
+ editStyle("labels", g);
+ }
+
function showSizeSection() {
document.querySelectorAll("#labelEditor > button").forEach(el => el.style.display = "none");
document.getElementById("labelSizeSection").style.display = "inline-block";
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index f9f89ab7..7390b948 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -113,11 +113,13 @@ function getCurrentPreset() {
savePresetButton.style.display = "inline-block";
}
-function toggleHeight() {
+function toggleHeight(event) {
if (!terrs.selectAll("*").size()) {
turnButtonOn("toggleHeight");
drawHeightmap();
+ if (event && event.ctrlKey) editStyle("terrs");
} else {
+ if (event && event.ctrlKey) {editStyle("terrs"); return;}
if (customization === 1) {tip("You cannot turn off the layer when heightmap is in edit mode", false, "error"); return;}
turnButtonOff("toggleHeight");
terrs.selectAll("*").remove();
@@ -208,11 +210,13 @@ function getColor(value, scheme = getColorScheme()) {
return scheme(1 - (value < 20 ? value - 5 : value) / 100);
}
-function toggleTemp() {
+function toggleTemp(event) {
if (!temperature.selectAll("*").size()) {
turnButtonOn("toggleTemp");
drawTemp();
+ if (event && event.ctrlKey) editStyle("temperature");
} else {
+ if (event && event.ctrlKey) {editStyle("temperature"); return;}
turnButtonOff("toggleTemp");
temperature.selectAll("*").remove();
}
@@ -310,11 +314,13 @@ function drawTemp() {
console.timeEnd("drawTemp");
}
-function toggleBiomes() {
+function toggleBiomes(event) {
if (!biomes.selectAll("path").size()) {
turnButtonOn("toggleBiomes");
drawBiomes();
+ if (event && event.ctrlKey) editStyle("biomes");
} else {
+ if (event && event.ctrlKey) {editStyle("biomes"); return;}
biomes.selectAll("path").remove();
turnButtonOff("toggleBiomes");
}
@@ -365,11 +371,13 @@ function drawBiomes() {
}
}
-function togglePrec() {
+function togglePrec(event) {
if (!prec.selectAll("circle").size()) {
turnButtonOn("togglePrec");
drawPrec();
+ if (event && event.ctrlKey) editStyle("prec");
} else {
+ if (event && event.ctrlKey) {editStyle("prec"); return;}
turnButtonOff("togglePrec");
const hide = d3.transition().duration(1000).ease(d3.easeSinIn);
prec.selectAll("text").attr("opacity", 1).transition(hide).attr("opacity", 0);
@@ -391,11 +399,13 @@ function drawPrec() {
.transition(show).attr("r", d => rn(Math.max(Math.sqrt(cells.prec[d] * .5), .8),2));
}
-function togglePopulation() {
+function togglePopulation(event) {
if (!population.selectAll("line").size()) {
turnButtonOn("togglePopulation");
drawPopulation();
+ if (event && event.ctrlKey) editStyle("population");
} else {
+ if (event && event.ctrlKey) {editStyle("population"); return;}
turnButtonOff("togglePopulation");
const hide = d3.transition().duration(1000).ease(d3.easeSinIn);
population.select("#rural").selectAll("line").transition(hide).attr("y2", d => d[1]).remove();
@@ -403,7 +413,7 @@ function togglePopulation() {
}
}
-function drawPopulation() {
+function drawPopulation(event) {
population.selectAll("line").remove();
const cells = pack.cells, p = cells.p, burgs = pack.burgs;
const show = d3.transition().duration(2000).ease(d3.easeSinIn);
@@ -421,11 +431,13 @@ function drawPopulation() {
.transition(show).delay(500).attr("y2", d => d[2]);
}
-function toggleCells() {
+function toggleCells(event) {
if (!cells.selectAll("path").size()) {
turnButtonOn("toggleCells");
drawCells();
+ if (event && event.ctrlKey) editStyle("cells");
} else {
+ if (event && event.ctrlKey) {editStyle("cells"); return;}
cells.selectAll("path").remove();
turnButtonOff("toggleCells");
}
@@ -440,17 +452,19 @@ function drawCells() {
cells.append("path").attr("d", path);
}
-function toggleCultures() {
+function toggleCultures(event) {
if (!cults.selectAll("path").size()) {
turnButtonOn("toggleCultures");
drawCultures();
+ if (event && event.ctrlKey) editStyle("cults");
} else {
+ if (event && event.ctrlKey) {editStyle("cults"); return;}
cults.selectAll("path").remove();
turnButtonOff("toggleCultures");
}
}
-function drawCultures() {
+function drawCultures(event) {
console.time("drawCultures");
cults.selectAll("path").remove();
@@ -497,17 +511,19 @@ function drawCultures() {
console.timeEnd("drawCultures");
}
-function toggleReligions() {
+function toggleReligions(event) {
if (!relig.selectAll("path").size()) {
turnButtonOn("toggleReligions");
drawReligions();
+ if (event && event.ctrlKey) editStyle("relig");
} else {
+ if (event && event.ctrlKey) {editStyle("relig"); return;}
relig.selectAll("path").remove();
turnButtonOff("toggleReligions");
}
}
-function drawReligions() {
+function drawReligions(event) {
console.time("drawReligions");
relig.selectAll("path").remove();
@@ -554,12 +570,14 @@ function drawReligions() {
console.timeEnd("drawReligions");
}
-function toggleStates() {
+function toggleStates(event) {
if (!layerIsOn("toggleStates")) {
turnButtonOn("toggleStates");
regions.attr("display", null);
drawStates();
+ if (event && event.ctrlKey) editStyle("regions");
} else {
+ if (event && event.ctrlKey) {editStyle("regions"); return;}
regions.attr("display", "none").selectAll("path").remove();
turnButtonOff("toggleStates");
}
@@ -735,21 +753,25 @@ function drawBorders() {
console.timeEnd("drawBorders");
}
-function toggleBorders() {
+function toggleBorders(event) {
if (!layerIsOn("toggleBorders")) {
turnButtonOn("toggleBorders");
$('#borders').fadeIn();
+ if (event && event.ctrlKey) editStyle("borders");
} else {
+ if (event && event.ctrlKey) {editStyle("borders"); return;}
turnButtonOff("toggleBorders");
$('#borders').fadeOut();
}
}
-function toggleProvinces() {
+function toggleProvinces(event) {
if (!layerIsOn("toggleProvinces")) {
turnButtonOn("toggleProvinces");
drawProvinces();
+ if (event && event.ctrlKey) editStyle("provs");
} else {
+ if (event && event.ctrlKey) {editStyle("provs"); return;}
provs.selectAll("*").remove();
turnButtonOff("toggleProvinces");
}
@@ -828,12 +850,14 @@ function drawProvinces() {
console.timeEnd("drawProvinces");
}
-function toggleGrid() {
+function toggleGrid(event) {
if (!gridOverlay.selectAll("*").size()) {
turnButtonOn("toggleGrid");
drawGrid();
calculateFriendlyGridSize();
+ if (event && event.ctrlKey) editStyle("gridOverlay");
} else {
+ if (event && event.ctrlKey) {editStyle("gridOverlay"); return;}
turnButtonOff("toggleGrid");
gridOverlay.selectAll("*").remove();
}
@@ -887,11 +911,13 @@ function drawGrid() {
console.timeEnd("drawGrid");
}
-function toggleCoordinates() {
+function toggleCoordinates(event) {
if (!coordinates.selectAll("*").size()) {
turnButtonOn("toggleCoordinates");
drawCoordinates();
+ if (event && event.ctrlKey) editStyle("coordinates");
} else {
+ if (event && event.ctrlKey) {editStyle("coordinates"); return;}
turnButtonOff("toggleCoordinates");
coordinates.selectAll("*").remove();
}
@@ -937,7 +963,7 @@ function getViewPoint(x, y) {
return pt.matrixTransform(view.getScreenCTM().inverse());
}
-function toggleCompass() {
+function toggleCompass(event) {
if (!layerIsOn("toggleCompass")) {
turnButtonOn("toggleCompass");
$('#compass').fadeIn();
@@ -949,24 +975,28 @@ function toggleCompass() {
svg.select("g#rose > g#sL > line#sL1").attr("y1", -19000).attr("y2", 19000);
svg.select("g#rose > g#sL > line#sL2").attr("x1", -19000).attr("x2", 19000);
}
+ if (event && event.ctrlKey) editStyle("compass");
} else {
+ if (event && event.ctrlKey) {editStyle("compass"); return;}
$('#compass').fadeOut();
turnButtonOff("toggleCompass");
}
}
-function toggleRelief() {
+function toggleRelief(event) {
if (!layerIsOn("toggleRelief")) {
turnButtonOn("toggleRelief");
if (!terrain.selectAll("*").size()) ReliefIcons();
$('#terrain').fadeIn();
+ if (event && event.ctrlKey) editStyle("terrain");
} else {
+ if (event && event.ctrlKey) {editStyle("terrain"); return;}
$('#terrain').fadeOut();
turnButtonOff("toggleRelief");
}
}
-function toggleTexture() {
+function toggleTexture(event) {
if (!layerIsOn("toggleTexture")) {
turnButtonOn("toggleTexture");
// append default texture image selected by default. Don't append on load to not harm performance
@@ -976,88 +1006,106 @@ function toggleTexture() {
}
$('#texture').fadeIn();
zoom.scaleBy(svg, 1.00001); // enforce browser re-draw
+ if (event && event.ctrlKey) editStyle("texture");
} else {
+ if (event && event.ctrlKey) {editStyle("texture"); return;}
$('#texture').fadeOut();
turnButtonOff("toggleTexture");
}
}
-function toggleRivers() {
+function toggleRivers(event) {
if (!layerIsOn("toggleRivers")) {
turnButtonOn("toggleRivers");
$('#rivers').fadeIn();
+ if (event && event.ctrlKey) editStyle("rivers");
} else {
+ if (event && event.ctrlKey) {editStyle("rivers"); return;}
$('#rivers').fadeOut();
turnButtonOff("toggleRivers");
}
}
-function toggleRoutes() {
+function toggleRoutes(event) {
if (!layerIsOn("toggleRoutes")) {
turnButtonOn("toggleRoutes");
$('#routes').fadeIn();
+ if (event && event.ctrlKey) editStyle("routes");
} else {
+ if (event && event.ctrlKey) {editStyle("routes"); return;}
$('#routes').fadeOut();
turnButtonOff("toggleRoutes");
}
}
-function toggleMarkers() {
+function toggleMarkers(event) {
if (!layerIsOn("toggleMarkers")) {
turnButtonOn("toggleMarkers");
$('#markers').fadeIn();
+ if (event && event.ctrlKey) editStyle("markers");
} else {
+ if (event && event.ctrlKey) {editStyle("markers"); return;}
$('#markers').fadeOut();
turnButtonOff("toggleMarkers");
}
}
-function toggleLabels() {
+function toggleLabels(event) {
if (!layerIsOn("toggleLabels")) {
turnButtonOn("toggleLabels");
labels.style("display", null)
invokeActiveZooming();
+ if (event && event.ctrlKey) editStyle("labels");
} else {
+ if (event && event.ctrlKey) {editStyle("labels"); return;}
turnButtonOff("toggleLabels");
labels.style("display", "none");
}
}
-function toggleIcons() {
+function toggleIcons(event) {
if (!layerIsOn("toggleIcons")) {
turnButtonOn("toggleIcons");
$('#icons').fadeIn();
+ if (event && event.ctrlKey) editStyle("burgIcons");
} else {
+ if (event && event.ctrlKey) {editStyle("burgIcons"); return;}
turnButtonOff("toggleIcons");
$('#icons').fadeOut();
}
}
-function toggleRulers() {
+function toggleRulers(event) {
if (!layerIsOn("toggleRulers")) {
turnButtonOn("toggleRulers");
$('#ruler').fadeIn();
+ if (event && event.ctrlKey) editStyle("ruler");
} else {
+ if (event && event.ctrlKey) {editStyle("ruler"); return;}
$('#ruler').fadeOut();
turnButtonOff("toggleRulers");
}
}
-function toggleScaleBar() {
+function toggleScaleBar(event) {
if (!layerIsOn("toggleScaleBar")) {
turnButtonOn("toggleScaleBar");
$('#scaleBar').fadeIn();
+ if (event && event.ctrlKey) editUnits();
} else {
+ if (event && event.ctrlKey) {editUnits(); return;}
$('#scaleBar').fadeOut();
turnButtonOff("toggleScaleBar");
}
}
-function toggleZones() {
+function toggleZones(event) {
if (!layerIsOn("toggleZones")) {
turnButtonOn("toggleZones");
$('#zones').fadeIn();
+ if (event && event.ctrlKey) editStyle("zones");
} else {
+ if (event && event.ctrlKey) {editStyle("zones"); return;}
turnButtonOff("toggleZones");
$('#zones').fadeOut();
}
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 67f2d8a8..9674733e 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -59,6 +59,7 @@ options.querySelector("div.tab").addEventListener("click", function(event) {
document.getElementById(id).classList.add("active");
options.querySelectorAll(".tabcontent").forEach(e => e.style.display = "none");
+ if (id === "layersTab") layersContent.style.display = "block"; else
if (id === "styleTab") styleContent.style.display = "block"; else
if (id === "optionsTab") optionsContent.style.display = "block"; else
if (id === "toolsTab") customization === 1
@@ -81,6 +82,22 @@ function collapse(e) {
}
}
+// select element to be edited
+function editStyle(element, group) {
+ showOptions();
+ styleTab.click();
+ styleElementSelect.value = element;
+ if (group) styleGroupSelect.options.add(new Option(group, group, true, true));
+ selectStyleElement();
+
+ styleElementSelect.classList.add("glow");
+ if (group) styleGroupSelect.classList.add("glow");
+ setTimeout(() => {
+ styleElementSelect.classList.remove("glow");
+ if (group) styleGroupSelect.classList.remove("glow");
+ }, 1500);
+}
+
// Toggle style sections on element select
styleElementSelect.addEventListener("change", selectStyleElement);
function selectStyleElement() {
@@ -804,6 +821,7 @@ function changeCultureSet() {
function changeStatesNumber(value) {
regionsInput.value = regionsOutput.value = value;
+ regionsOutput.style.color = +value ? null : "#b12117";
burgLabels.select("#capitals").attr("data-size", Math.max(rn(6 - value / 20), 3));
labels.select("#countries").attr("data-size", Math.max(rn(18 - value / 6), 4));
}
diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js
index b54ff395..4eb1a47b 100644
--- a/modules/ui/provinces-editor.js
+++ b/modules/ui/provinces-editor.js
@@ -20,6 +20,7 @@ function editProvinces() {
// add listeners
document.getElementById("provincesEditorRefresh").addEventListener("click", refreshProvincesEditor);
+ document.getElementById("provincesEditStyle").addEventListener("click", () => editStyle("provs"));
document.getElementById("provincesFilterState").addEventListener("change", provincesEditorAddLines);
document.getElementById("provincesPercentage").addEventListener("click", togglePercentageMode);
document.getElementById("provincesChart").addEventListener("click", showChart);
@@ -552,7 +553,7 @@ function editProvinces() {
const oldProvince = cells.province[center];
if (oldProvince && provinces[oldProvince].center === center) {tip("The cell is already a center of a different province. Select other cell", false, "error"); return;}
const state = cells.state[center];
- if (!state) {tip("You cannot create a province in neutral lands> Please assign this land to a state first", false, "error"); return;}
+ if (!state) {tip("You cannot create a province in neutral lands. Please assign this land to a state first", false, "error"); return;}
if (d3.event.shiftKey === false) exitAddProvinceMode();
@@ -640,7 +641,7 @@ function editProvinces() {
function closeProvincesEditor() {
if (customization === 11) exitProvincesManualAssignment("close");
- if (customization === 12) exitAddStateMode();
+ if (customization === 12) exitAddProvinceMode();
}
}
diff --git a/modules/ui/relief-editor.js b/modules/ui/relief-editor.js
index a361daa6..a3653aa2 100644
--- a/modules/ui/relief-editor.js
+++ b/modules/ui/relief-editor.js
@@ -30,6 +30,7 @@ function editReliefIcon() {
document.getElementById("reliefEditorSet").addEventListener("change", changeIconsSet);
reliefIconsDiv.querySelectorAll("svg").forEach(el => el.addEventListener("click", changeIcon));
+ document.getElementById("reliefEditStyle").addEventListener("click", () => editStyle("terrain"));
document.getElementById("reliefCopy").addEventListener("click", copyIcon);
document.getElementById("reliefMoveFront").addEventListener("click", () => elSelected.raise());
document.getElementById("reliefMoveBack").addEventListener("click", () => elSelected.lower());
diff --git a/modules/ui/religions-editor.js b/modules/ui/religions-editor.js
index 795e5799..ab5a5950 100644
--- a/modules/ui/religions-editor.js
+++ b/modules/ui/religions-editor.js
@@ -23,6 +23,7 @@ function editReligions() {
// add listeners
document.getElementById("religionsEditorRefresh").addEventListener("click", refreshReligionsEditor);
+ document.getElementById("religionsEditStyle").addEventListener("click", () => editStyle("relig"));
document.getElementById("religionsLegend").addEventListener("click", toggleLegend);
document.getElementById("religionsPercentage").addEventListener("click", togglePercentageMode);
document.getElementById("religionsHeirarchy").addEventListener("click", showHierarchy);
diff --git a/modules/ui/rivers-editor.js b/modules/ui/rivers-editor.js
index 5d9a3e60..f06cd9f9 100644
--- a/modules/ui/rivers-editor.js
+++ b/modules/ui/rivers-editor.js
@@ -34,6 +34,7 @@ function editRiver() {
document.getElementById("riverScale").addEventListener("input", changeScale);
document.getElementById("riverReset").addEventListener("click", resetTransformation);
+ document.getElementById("riverEditStyle").addEventListener("click", () => editStyle("rivers"));
document.getElementById("riverCopy").addEventListener("click", copyRiver);
document.getElementById("riverNew").addEventListener("click", toggleRiverCreationMode);
document.getElementById("riverLegend").addEventListener("click", editRiverLegend);
diff --git a/modules/ui/routes-editor.js b/modules/ui/routes-editor.js
index 28c2cca2..4e02d31b 100644
--- a/modules/ui/routes-editor.js
+++ b/modules/ui/routes-editor.js
@@ -30,6 +30,8 @@ function editRoute(onClick) {
document.getElementById("routeGroupName").addEventListener("change", createNewGroup);
document.getElementById("routeGroupRemove").addEventListener("click", removeRouteGroup);
document.getElementById("routeGroupsHide").addEventListener("click", hideGroupSection);
+
+ document.getElementById("routeEditStyle").addEventListener("click", editGroupStyle);
document.getElementById("routeSplit").addEventListener("click", toggleRouteSplitMode);
document.getElementById("routeLegend").addEventListener("click", editRouteLegend);
document.getElementById("routeNew").addEventListener("click", toggleRouteCreationMode);
@@ -189,7 +191,12 @@ function editRoute(onClick) {
},
Cancel: function() {$(this).dialog("close");}
}
- });
+ });
+ }
+
+ function editGroupStyle() {
+ const g = elSelected.node().parentNode.id;
+ editStyle("routes", g);
}
function toggleRouteSplitMode() {
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index 73f0f45d..f37885f6 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -22,6 +22,7 @@ function editStates() {
// add listeners
document.getElementById("statesEditorRefresh").addEventListener("click", refreshStatesEditor);
+ document.getElementById("statesEditStyle").addEventListener("click", () => editStyle("regions"));
document.getElementById("statesLegend").addEventListener("click", toggleLegend);
document.getElementById("statesPercentage").addEventListener("click", togglePercentageMode);
document.getElementById("statesChart").addEventListener("click", showStatesChart);
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index a4256988..155609af 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -135,11 +135,18 @@ function regenerateBurgs() {
function regenerateStates() {
Math.seedrandom(Math.floor(Math.random() * 1e9)); // new random seed
- const burgs = pack.burgs.filter(b => b.i && !b.removed), states = pack.states.filter(s => s.i && !s.removed);
- // burgs sorted by a bit randomized population:
+ const burgs = pack.burgs.filter(b => b.i && !b.removed);
+ if (!burgs.length) {
+ tip("No burgs to generate states. Please create burgs first", false, "error");
+ return;
+ }
+ if (burgs.length < +regionsInput.value) {
+ tip(`Not enought burgs to generate ${regionsInput.value} states. Will generate only ${burgs.length} states`, false, "warn");
+ }
+
+ // burg ids sorted by a bit randomized population:
const sorted = burgs.map(b => [b.i, b.population * Math.random()]).sort((a, b) => b[1] - a[1]).map(b => b[0]);
const capitalsTree = d3.quadtree();
- let spacing = (graphWidth + graphHeight) / 2 / states.length; // min distance between capitals
// turn all old capitals into towns
burgs.filter(b => b.capital).forEach(b => {
@@ -147,30 +154,31 @@ function regenerateStates() {
b.capital = false;
});
- states.forEach(s => {
- let newCapital = 0, x = 0, y = 0;
+ const neutral = pack.states[0].name;
+ const count = Math.min(+regionsInput.value, burgs.length);
+ let spacing = (graphWidth + graphHeight) / 2 / count; // min distance between capitals
+ pack.states = d3.range(count).map(i => {
+ if (!i) return {i, name: neutral};
- for (let i=0; i < sorted.length && !newCapital; i++) {
- newCapital = burgs[sorted[i]];
- x = newCapital.x, y = newCapital.y;
- if (capitalsTree.find(x, y, spacing) !== undefined) {
- spacing -= 1;
- if (spacing < 1) spacing = 1;
- newCapital = 0;
- }
+ let capital = null, x = 0, y = 0;
+ for (let i=0; i < sorted.length; i++) {
+ capital = burgs[sorted[i]];
+ x = capital.x, y = capital.y;
+ if (capitalsTree.find(x, y, spacing) === undefined) break;
+ spacing = Math.max(spacing - 1, 1);
}
capitalsTree.add([x, y]);
- newCapital.capital = true;
- s.capital = newCapital.i;
- s.center = newCapital.cell;
- s.culture = newCapital.culture;
- s.expansionism = rn(Math.random() * powerInput.value + 1, 1);
- const basename = newCapital.name.length < 9 && newCapital.cell%5 === 0 ? newCapital.name : Names.getCulture(s.culture, 3, 6, "", 0);
- s.name = Names.getState(basename, s.culture);
- const nomadic = [1, 2, 3, 4].includes(pack.cells.biome[newCapital.cell]);
- s.type = nomadic ? "Nomadic" : pack.cultures[s.culture].type === "Nomadic" ? "Generic" : pack.cultures[s.culture].type;
- moveBurgToGroup(newCapital.i, "cities");
+ capital.capital = true;
+ moveBurgToGroup(capital.i, "cities");
+
+ const culture = capital.culture;
+ const basename = capital.name.length < 9 && capital.cell%5 === 0 ? capital.name : Names.getCulture(culture, 3, 6, "", 0);
+ const name = Names.getState(basename, culture);
+ const nomadic = [1, 2, 3, 4].includes(pack.cells.biome[capital.cell]);
+ const type = nomadic ? "Nomadic" : pack.cultures[culture].type === "Nomadic" ? "Generic" : pack.cultures[culture].type;
+ const expansionism = rn(Math.random() * powerInput.value + 1, 1);
+ return {i, name, type, capital:capital.i, center:capital.cell, culture, expansionism};
});
unfog();
diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js
index 4f380a31..1c29a1f6 100644
--- a/modules/ui/zones-editor.js
+++ b/modules/ui/zones-editor.js
@@ -14,6 +14,7 @@ function editZones() {
});
// add listeners
+ document.getElementById("zonesEditStyle").addEventListener("click", () => editStyle("zones"));
document.getElementById("zonesLegend").addEventListener("click", toggleLegend);
document.getElementById("zonesPercentage").addEventListener("click", togglePercentageMode);
document.getElementById("zonesManually").addEventListener("click", enterZonesManualAssignent);
diff --git a/modules/utils.js b/modules/utils.js
index b5f90884..2b27deb6 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -43,12 +43,13 @@ function findGridCell(x, y) {
return Math.floor(Math.min(y / grid.spacing, grid.cellsY -1)) * grid.cellsX + Math.floor(Math.min(x / grid.spacing, grid.cellsX-1));
}
-// return array of cell indexes in radius on a regular square grid
+// return array of cell indexes in radius on a regular square grid
function findGridAll(x, y, radius) {
const c = grid.cells.c;
- let found = [findGridCell(x, y)];
let r = Math.floor(radius / grid.spacing);
- if (r > 0) found = found.concat(c[found[0]]);
+ let found = [findGridCell(x, y)];
+ if (!r || radius === 1) return found;
+ if (r > 0) found = found.concat(c[found[0]]);
if (r > 1) {
let frontier = c[found[0]];
while (r > 1) {
@@ -68,7 +69,6 @@ function findGridAll(x, y, radius) {
}
return found;
-
}
// return closest pack points quadtree datum