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

v. 0.58.15b

Browse source
This commit is contained in:
Azgaar 2018-08-11 16:43:24 +03:00
parent bb37137f21
commit 9a1311b50e
3 changed files with 117 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.css
View file

@ -516,7 +516,7 @@ p {
} }
#customizeOptions { #customizeOptions {
margin: 2px 0; margin: 2px 0 6px 0;
} }
#tooltip { #tooltip {

16
index.html
View file

@ -31,8 +31,8 @@
<script src="libs/quantize.min.js" defer></script> <script src="libs/quantize.min.js" defer></script>
<script src="libs/d3-hexbin.v0.2.min.js" defer></script> <script src="libs/d3-hexbin.v0.2.min.js" defer></script>
<script src="libs/jquery.ui.touch-punch.min.js" defer></script> <script src="libs/jquery.ui.touch-punch.min.js" defer></script>
<link rel="stylesheet" type="text/css" href="index.css?version=0.58.13b"/> <link rel="stylesheet" type="text/css" href="index.css?version=0.58.15b"/>
<link rel="stylesheet" type="text/css" href="icons.css?version=0.58.13b"/> <link rel="stylesheet" type="text/css" href="icons.css?version=0.58.15b"/>
<link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/> <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
</head> </head>
<body> <body>
@ -502,7 +502,7 @@
<div> <div>
<button onmouseover="tip('Edit the current Heightmap')" id="fromHeightmap">Edit</button> <button onmouseover="tip('Edit the current Heightmap')" id="fromHeightmap">Edit</button>
<button onmouseover="tip('Remove all data and start from scratch')" id="fromScratch">Clear all</button> <button onmouseover="tip('Remove all data and start from scratch')" id="fromScratch">Clear all</button>
<button class="buttonoff" onmouseover="tip('Finalize the Heightmap. Not allowed if landmass area is insufficient')" id="getMap" disabled="disabled">Complete</button> <button class="buttonoff" onmouseover="tip('Finalize the Heightmap. Not allowed if landmass area is insufficient')" id="getMap">Complete</button>
</div> </div>
<div id="customizationMenu" class="hidden"> <div id="customizationMenu" class="hidden">
<div id="customizeTools"> <div id="customizeTools">
@ -516,9 +516,9 @@
<input id="renderOcean" class="checkbox" type="checkbox"> <input id="renderOcean" class="checkbox" type="checkbox">
<label for="renderOcean" onmouseover="tip('Render cells below sea level')" class="checkbox-label">Render ocean cells</label> <label for="renderOcean" onmouseover="tip('Render cells below sea level')" class="checkbox-label">Render ocean cells</label>
<input id="changeHeights" class="checkbox" type="checkbox"> <input id="changeHeights" class="checkbox" type="checkbox">
<label for="changeHeights" onmouseover="tip('Allow system to change custom heights if reasonable')" class="checkbox-label">Change heights</label> <label for="changeHeights" onmouseover="tip('Allow system to change custom heights and add lakes in depressed cells')" class="checkbox-label">Change heights</label>
</div> </div>
<label onmouseover="tip('Number of Land cells and landmass/ocean ratio')">Landmass: <span id="landmassCounter">0</span></label><hr> <label onmouseover="tip('Number of Land cells and landmass/ocean ratio')">Land cells: <span id="landmassCounter">0</span></label><hr>
</div> </div>
</div> </div>
<div id="addFeature"> <div id="addFeature">
@ -680,7 +680,7 @@
<div id="burgEditor" class="dialog" style="display: none"> <div id="burgEditor" class="dialog" style="display: none">
<button id="burgGroup" onmouseover="tip('Change Burg Group')" class="icon-tags"></button> <button id="burgGroup" onmouseover="tip('Change Burg Group')" class="icon-tags"></button>
<div id="burgGroupSection" style="display: none"> <div id="burgGroupSection" style="display: none">
<select id="burgSelectGroup" onmouseover="tip('Select a Group for this Burg')" style="width: 117px;"></select> <select id="burgSelectGroup" onmouseover="tip('Select a Group for this Burg. Will not affect burg function (capital status etc.)')" style="width: 117px;"></select>
<input id="burgInputGroup" placeholder="type new Group name" onmouseover="tip('Create new Group for the Burg')" style="display: none; width: 113px;"/> <input id="burgInputGroup" placeholder="type new Group name" onmouseover="tip('Create new Group for the Burg')" style="display: none; width: 113px;"/>
<i id="burgAddGroup" onmouseover="tip('Create new Group for the Burg')" class="icon-plus pointer"></i> <i id="burgAddGroup" onmouseover="tip('Create new Group for the Burg')" class="icon-plus pointer"></i>
<i id="burgRemoveGroup" onmouseover="tip('Remove selected Burg Group')" class="icon-trash pointer"></i> <i id="burgRemoveGroup" onmouseover="tip('Remove selected Burg Group')" class="icon-trash pointer"></i>
@ -748,7 +748,7 @@
<button id="burgToggleCapital" onmouseover="tip('Mark the Burg as country capital. Neutral burg cannot be a capital')" class="icon-star"></button> <button id="burgToggleCapital" onmouseover="tip('Mark the Burg as country capital. Neutral burg cannot be a capital')" class="icon-star"></button>
<button id="burgTogglePort" onmouseover="tip('Mark the Burg as port (toggle anchor icon)')" class="icon-anchor"></button> <button id="burgTogglePort" onmouseover="tip('Mark the Burg as port (toggle anchor icon)')" class="icon-anchor"></button>
<i onmouseover="tip('Set Burg population')" class="icon-users"></i> <i onmouseover="tip('Set Burg population')" class="icon-users"></i>
<input id="burgPopulation" onmouseover="tip('Set Burg population (in population points)')" type="number" value="1" min="0" step="1" style="width: 40px;"></select> <input id="burgPopulation" onmouseover="tip('Set Burg population (in population points)')" type="number" value="1" min="0" step="1" style="width: 50px;"></select>
<output id="burgPopulationFriendly" onmouseover="tip('Burg population (in people)')">1000</output> <output id="burgPopulationFriendly" onmouseover="tip('Burg population (in people)')">1000</output>
</div> </div>
@ -1110,5 +1110,5 @@
<input type="file" accept=".txt" id="namesbaseToLoad"> <input type="file" accept=".txt" id="namesbaseToLoad">
</div> </div>
<script src="script.js?version=0.58.13b"></script> <script src="script.js?version=0.58.15b"></script>
</body> </body>

213
script.js
View file

@ -1235,23 +1235,28 @@ function fantasyMap() {
} }
// recalculate Voronoi Graph to pack cells // recalculate Voronoi Graph to pack cells
function reGraph() { function reGraph(noChange) {
console.time("reGraph"); console.time("reGraph");
const tempCells = [], newPoints = []; // to store new data const tempCells = [], newPoints = []; // to store new data
// get average precipitation based on graph size // get average precipitation based on graph size
const avPrec = precInput.value / 5000; const avPrec = precInput.value / 5000;
const smallLakesMax = 500;
let smallLakes = 0;
const evaporation = 2; const evaporation = 2;
cells.map(function(i) { cells.map(function(i) {
let height = Math.trunc(i.height * 100) / 100; let height = Math.trunc(i.height * 100) / 100;
const pit = i.pit;
const ctype = i.ctype; const ctype = i.ctype;
if (ctype !== -1 && ctype !== -2 && height < 0.2) return; // exclude all depp ocean points if (ctype !== -1 && ctype !== -2 && height < 0.2) return; // exclude all depp ocean points
const x = rn(i.data[0], 1), y = rn(i.data[1], 1); const x = rn(i.data[0], 1), y = rn(i.data[1], 1);
const fn = i.fn; const fn = i.fn;
const harbor = i.harbor; const harbor = i.harbor;
let lake = i.lake; let lake = i.lake;
if (!lake && i.pit > evaporation && ctype !== 2) { // mark potential cells for small lakes to add additional point there
// not for custom map if "changeHeights" is not alkowed
if (!noChange && smallLakes < smallLakesMax && !lake && pit > evaporation && ctype !== 2) {
lake = 2; lake = 2;
height = Math.trunc(height * 100 - i.pit) / 100; smallLakes++;
} }
if (height > 1) height = 1; if (height > 1) height = 1;
if (height < 0) height = 0; if (height < 0) height = 0;
@ -1260,7 +1265,7 @@ function fantasyMap() {
let copy = $.grep(newPoints, function(e) {return (e[0] == x && e[1] == y);}); let copy = $.grep(newPoints, function(e) {return (e[0] == x && e[1] == y);});
if (!copy.length) { if (!copy.length) {
newPoints.push([x, y]); newPoints.push([x, y]);
tempCells.push({index:tempCells.length, data:[x, y], height, ctype, fn, harbor, lake, region, culture}); tempCells.push({index:tempCells.length, data:[x, y], height, pit, ctype, fn, harbor, lake, region, culture});
} }
// add additional points for cells along coast // add additional points for cells along coast
if (ctype === 2 || ctype === -1) { if (ctype === 2 || ctype === -1) {
@ -1274,13 +1279,12 @@ function fantasyMap() {
copy = $.grep(newPoints, function(e) {return e[0] === x1 && e[1] === y1;}); copy = $.grep(newPoints, function(e) {return e[0] === x1 && e[1] === y1;});
if (copy.length) return; if (copy.length) return;
newPoints.push([x1, y1]); newPoints.push([x1, y1]);
tempCells.push({index:tempCells.length, data:[x1, y1], height, ctype, fn, harbor, lake, region, culture}); tempCells.push({index:tempCells.length, data:[x1, y1], height, pit, ctype, fn, harbor, lake, region, culture});
}; };
}); });
} }
if (lake === 2) { // add potential small lakes if (lake === 2) { // add potential small lakes
//debug.append("circle").attr("r", 0.3).attr("cx", x).attr("cy", y).attr("fill", "blue"); //debug.append("circle").attr("r", 0.3).attr("cx", x).attr("cy", y).attr("fill", "blue");
height = Math.trunc(height * 100 + 1) / 100;
polygons[i.index].forEach(function(e) { polygons[i.index].forEach(function(e) {
if (Math.random() > 0.8) return; if (Math.random() > 0.8) return;
let rnd = Math.random() * 0.6 + 0.8; let rnd = Math.random() * 0.6 + 0.8;
@ -1291,7 +1295,7 @@ function fantasyMap() {
if (copy.length) return; if (copy.length) return;
//debug.append("circle").attr("r", 0.2).attr("cx", x1).attr("cy", y1).attr("fill", "red"); //debug.append("circle").attr("r", 0.2).attr("cx", x1).attr("cy", y1).attr("fill", "red");
newPoints.push([x1, y1]); newPoints.push([x1, y1]);
tempCells.push({index:tempCells.length, data:[x1, y1], height, ctype, fn, region, culture}); tempCells.push({index:tempCells.length, data:[x1, y1], height, pit, ctype, fn, region, culture});
}); });
} }
}); });
@ -1389,7 +1393,7 @@ function fantasyMap() {
let landCells = 0; let landCells = 0;
cells.map(function(c) { cells.map(function(c) {
heights.push(c.height); heights.push(c.height);
if (c.height >= 0.2) {landCells++;} if (c.height >= 0.2) landCells++;
}); });
history = history.slice(0, historyStage); history = history.slice(0, historyStage);
history[historyStage] = heights; history[historyStage] = heights;
@ -1399,8 +1403,6 @@ function fantasyMap() {
var elevationAverage = rn(d3.mean(heights), 2); var elevationAverage = rn(d3.mean(heights), 2);
var landRatio = rn(landCells / cells.length * 100); var landRatio = rn(landCells / cells.length * 100);
landmassCounter.innerHTML = landCells + " (" + landRatio + "%); Average Elevation: " + elevationAverage; landmassCounter.innerHTML = landCells + " (" + landRatio + "%); Average Elevation: " + elevationAverage;
if (landCells > 100) {$("#getMap").attr("disabled", false).removeClass("buttonoff").addClass("glow");}
else {$("#getMap").attr("disabled", true).addClass("buttonoff").removeClass("glow");}
// if perspective is displayed, update it // if perspective is displayed, update it
if ($("#perspectivePanel").is(":visible")) {drawPerspective();} if ($("#perspectivePanel").is(":visible")) {drawPerspective();}
} }
@ -1822,7 +1824,12 @@ function fantasyMap() {
} }
function restoreCustomHeights() { function restoreCustomHeights() {
land.forEach(function(l) {if (l.pit) rn(l.height -= l.pit / 50, 2);}); land.forEach(function(l) {
if (l.pit) {
l.height = Math.trunc(l.height * 100 - l.pit * 2) / 100;
if (l.height < 0.2) l.height = 0.2;
}
});
} }
function flux() { function flux() {
@ -3012,15 +3019,7 @@ function fantasyMap() {
$("#burgSelectGroup").change(function() { $("#burgSelectGroup").change(function() {
const id = +elSelected.attr("data-id"); const id = +elSelected.attr("data-id");
const g = this.value; const g = this.value;
$("#burgIcons [data-id=" + id + "]").detach().appendTo($("#burgIcons > #"+g)); moveBurgToGroup(id, g);
$("#burgLabels [data-id=" + id + "]").detach().appendTo($("#burgLabels > #"+g));
// special case for port icons (anchors)
if (g === "towns" || g === "capitals") {
const el = $("#icons g[id*='anchors'] [data-id=" + id + "]");
if (!el.length) return;
const to = g === "towns" ? $("#town-anchors") : $("#capital-anchors");
el.detach().appendTo(to);
}
}); });
$("#burgInputGroup").change(function() { $("#burgInputGroup").change(function() {
@ -3215,22 +3214,14 @@ function fantasyMap() {
if (states[state] === undefined) return; if (states[state] === undefined) return;
const capital = states[manors[id].region] ? id === states[manors[id].region].capital ? 0 : 1 : 1; const capital = states[manors[id].region] ? id === states[manors[id].region].capital ? 0 : 1 : 1;
if (capital && states[state].capital !== "select") { if (capital && states[state].capital !== "select") {
// move oldCapital to burg // move oldCapital to a town group
const oldCapital = states[state].capital; const oldCapital = states[state].capital;
$("#burgIcons [data-id=" + oldCapital + "]").detach().appendTo($("#burgIcons > #towns")); moveBurgToGroup(oldCapital, "towns");
$("#burgLabels [data-id=" + oldCapital + "]").detach().appendTo($("#burgLabels > #towns"));
$("#icons #capital-anchors [data-id=" + oldCapital + "]").detach().appendTo($("#town-anchors"));
} }
states[state].capital = capital ? id : "select"; states[state].capital = capital ? id : "select";
d3.select("#burgToggleCapital").classed("pressed", capital); d3.select("#burgToggleCapital").classed("pressed", capital);
const g = capital ? "capitals" : "towns"; const g = capital ? "capitals" : "towns";
$("#burgIcons [data-id=" + id + "]").detach().appendTo($("#burgIcons > #"+g)); moveBurgToGroup(id, g);
$("#burgLabels [data-id=" + id + "]").detach().appendTo($("#burgLabels > #"+g));
const el = $("#icons g[id*='anchors'] [data-id=" + id + "]");
updateCountryEditors();
if (!el.length) return;
const to = g === "towns" ? $("#town-anchors") : $("#capital-anchors");
el.detach().appendTo(to);
}); });
$("#burgTogglePort").click(function() { $("#burgTogglePort").click(function() {
@ -3315,14 +3306,14 @@ function fantasyMap() {
} }
const x = rn(point[0], 2), y = rn(point[1], 2); const x = rn(point[0], 2), y = rn(point[1], 2);
burgIcons.select("circle[data-id='"+i+"']").attr("cx", x).attr("cy", y); burgIcons.select("circle[data-id='"+i+"']").attr("transform", null).attr("cx", x).attr("cy", y);
burgLabels.select("text[data-id='"+i+"']").attr("x", x).attr("y", y); burgLabels.select("text[data-id='"+i+"']").attr("transform", null).attr("x", x).attr("y", y);
const anchor = icons.select("use[data-id='"+i+"']"); const anchor = icons.select("use[data-id='"+i+"']");
if (anchor.size()) { if (anchor.size()) {
const size = anchor.attr("width"); const size = anchor.attr("width");
const xa = rn(x - size * 0.47, 2); const xa = rn(x - size * 0.47, 2);
const ya = rn(y - size * 0.47, 2); const ya = rn(y - size * 0.47, 2);
icons.select("use[data-id='"+i+"']").attr("x", xa).attr("y", ya); anchor.attr("transform", null).attr("x", xa).attr("y", ya);
} }
cells[index].manor = i; cells[index].manor = i;
cells[manors[i].cell].manor = undefined; cells[manors[i].cell].manor = undefined;
@ -3359,6 +3350,24 @@ function fantasyMap() {
}); });
} }
// generic function to move any burg to any group
function moveBurgToGroup(id, g) {
$("#burgLabels [data-id=" + id + "]").detach().appendTo($("#burgLabels > #"+g));
$("#burgIcons [data-id=" + id + "]").detach().appendTo($("#burgIcons > #"+g));
const rSize = $("#burgIcons > #"+g).attr("size");
$("#burgIcons [data-id=" + id + "]").attr("r", rSize);
const el = $("#icons g[id*='anchors'] [data-id=" + id + "]");
if (el.length) {
const to = g === "towns" ? $("#town-anchors") : $("#capital-anchors");
el.detach().appendTo(to);
const useSize = to.attr("size");
const x = rn(manors[id].x - useSize * 0.47, 2);
const y = rn(manors[id].y - useSize * 0.47, 2);
el.attr("x", x).attr("y", y).attr("width", useSize).attr("height", useSize);
}
updateCountryEditors();
}
// generate cultures for a new map based on options and namesbase // generate cultures for a new map based on options and namesbase
function generateCultures() { function generateCultures() {
const count = +culturesInput.value; const count = +culturesInput.value;
@ -4822,26 +4831,36 @@ function fantasyMap() {
} }
// Complete the map for the "customize" mode // Complete the map for the "customize" mode
function getMap(keepData) { function getMap() {
if (customization !== 1) {
tip('Nothing to complete! Click on "Edit" or "Clear all" to enter a heightmap customizaton mode', null, "error");
return;
}
land = $.grep(cells, function(e) {return e.height >= 0.2;});
if (land.length < 100) {
tip("Insufficient land area! Please add more land cells to complete the map", null, "error");
return;
}
exitCustomization(); exitCustomization();
console.time("TOTAL"); console.time("TOTAL");
markFeatures(); markFeatures();
// if (changeHeights.checked) reduceClosedLakes();
drawOcean(); drawOcean();
elevateLakes(); elevateLakes();
resolveDepressionsPrimary(); resolveDepressionsPrimary();
reGraph(); const noChange = !changeHeights.checked;
reGraph(noChange);
resolveDepressionsSecondary(); resolveDepressionsSecondary();
flux(); flux();
addLakes(); addLakes();
if (!changeHeights.checked) restoreCustomHeights(); if (noChange) restoreCustomHeights();
drawCoastline(); drawCoastline();
drawRelief(); drawRelief();
if (!keepData) { const keepData = states.length && manors.length;
if (keepData) {
restoreRegions();
} else {
generateCultures(); generateCultures();
manorsAndRegions(); manorsAndRegions();
} else {
restoreRegions();
} }
cleanData(); cleanData();
console.timeEnd("TOTAL"); console.timeEnd("TOTAL");
@ -6176,9 +6195,9 @@ function fantasyMap() {
generate(); generate();
return; return;
} }
if (id === "editCountries") {editCountries();} if (id === "editCountries") editCountries();
if (id === "editCultures") {editCultures();} if (id === "editCultures") editCultures();
if (id === "editScale" || id === "editScaleCountries" || id === "editScaleBurgs") {editScale();} if (id === "editScale" || id === "editScaleCountries" || id === "editScaleBurgs") editScale();
if (id === "countriesManually") { if (id === "countriesManually") {
customization = 2; customization = 2;
tip("Click to select a country, drag the circle to re-assign", true); tip("Click to select a country, drag the circle to re-assign", true);
@ -6337,7 +6356,9 @@ function fantasyMap() {
link.click(); link.click();
window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000); window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
} }
if (id === "burgNamesImport") {burgsListToLoad.click();}
if (id === "burgNamesImport") burgsListToLoad.click();
if (id === "removeCountries") { if (id === "removeCountries") {
alertMessage.innerHTML = `Are you sure you want remove all countries?`; alertMessage.innerHTML = `Are you sure you want remove all countries?`;
$("#alert").dialog({resizable: false, title: "Remove countries", $("#alert").dialog({resizable: false, title: "Remove countries",
@ -6351,8 +6372,7 @@ function fantasyMap() {
states.map(function(s) { states.map(function(s) {
const c = +s.capital; const c = +s.capital;
if (isNaN(c)) return; if (isNaN(c)) return;
$("#burgLabels [data-id=" + c + "]").detach().appendTo($("#burgLabels #towns")); moveBurgToGroup(c, "towns");
$("#burgIcons [data-id=" + c + "]").detach().appendTo($("#burgIcons #towns"));
}); });
labels.select("#countries").selectAll("text").remove(); labels.select("#countries").selectAll("text").remove();
regions.selectAll("path").remove(); regions.selectAll("path").remove();
@ -6488,9 +6508,11 @@ function fantasyMap() {
}); });
} }
if (id === "fromHeightmap") { if (id === "fromHeightmap") {
let message = "It's highly recommended to finalize a heightmap as a first step. "; const message = `Hightmap is a basic element on which secondary data (burgs, countries, cultures) is based.
message += "If you want to edit a map, it's better to clean up all the data except on heights. "; If you want to significantly change the hightmap, it may be better to clean up all the secondary data
message += "You may also keep the data, but it can cause unexpected errors"; and let the system to re-generate it based on the updated hightmap. In case of minor changes, you can keep the data.
Newly added lands will be considered as neutral. Burgs located on a removed land cells will be deleted.
Routes won't be regenerated.`
alertMessage.innerHTML = message; alertMessage.innerHTML = message;
$("#alert").dialog({resizable: false, title: "Edit Heightmap", $("#alert").dialog({resizable: false, title: "Edit Heightmap",
buttons: { buttons: {
@ -6538,9 +6560,7 @@ function fantasyMap() {
updateHeightmap(); updateHeightmap();
updateHistory(); updateHistory();
} }
if (id === "getMap") { if (id === "getMap") getMap();
if (states.length && manors.length) {getMap("keep");} else {getMap();}
}
if (id === "applyTemplate") { if (id === "applyTemplate") {
if ($("#templateEditor").is(":visible")) {return;} if ($("#templateEditor").is(":visible")) {return;}
$("#templateEditor").dialog({ $("#templateEditor").dialog({
@ -6690,9 +6710,7 @@ function fantasyMap() {
start.click(); start.click();
} }
} }
if (id === "templateComplete") { if (id === "templateComplete") getMap();
if (customization === 1 && !$("#getMap").attr("disabled")) {getMap();}
}
if (id === "convertColorsMinus") { if (id === "convertColorsMinus") {
var current = +convertColors.value - 1; var current = +convertColors.value - 1;
if (current < 4) {current = 3;} if (current < 4) {current = 3;}
@ -7327,7 +7345,8 @@ function fantasyMap() {
// Enter Heightmap Customization mode // Enter Heightmap Customization mode
function customizeHeightmap() { function customizeHeightmap() {
customization = 1; customization = 1;
tip("Heightmap customization mode is active. Click on \"Complete\" to finalize the Heightmap", true); tip('Heightmap customization mode is active. Click on "Complete" to finalize the Heightmap', true);
$("#getMap").removeClass("buttonoff").addClass("glow");
resetZoom(); resetZoom();
landmassCounter.innerHTML = "0"; landmassCounter.innerHTML = "0";
$('#grid').fadeIn(); $('#grid').fadeIn();
@ -7343,7 +7362,7 @@ function fantasyMap() {
tip("", true); tip("", true);
canvas.style.opacity = 0; canvas.style.opacity = 0;
$("#customizationMenu").slideUp(); $("#customizationMenu").slideUp();
$("#getMap").attr("disabled", true).addClass("buttonoff"); $("#getMap").addClass("buttonoff").removeClass("glow");
$("#landmass").empty(); $("#landmass").empty();
$('#grid').empty().fadeOut(); $('#grid').empty().fadeOut();
$('#toggleGrid').addClass("buttonoff"); $('#toggleGrid').addClass("buttonoff");
@ -7354,7 +7373,6 @@ function fantasyMap() {
historyStage = 0; historyStage = 0;
$("#customizeHeightmap").slideUp(); $("#customizeHeightmap").slideUp();
$("#openEditor").slideDown(); $("#openEditor").slideDown();
$("#getMap").removeClass("glow");
debug.selectAll(".circle, .tag, .line").remove(); debug.selectAll(".circle, .tag, .line").remove();
} }
@ -7536,8 +7554,7 @@ function fantasyMap() {
if (oldState === "neutral") {manors[burg].population *= (1 / urbanFactor);} if (oldState === "neutral") {manors[burg].population *= (1 / urbanFactor);}
manors[burg].population *= 2; // give capital x2 population bonus manors[burg].population *= 2; // give capital x2 population bonus
states[state].capital = burg; states[state].capital = burg;
$("#burgLabels [data-id=" + burg + "]").detach().appendTo($("#burgLabels #capitals")); moveBurgToGroup(burg, "capitals");
$("#burgIcons [data-id=" + burg + "]").detach().appendTo($("#burgIcons #capitals"));
} }
} else { } else {
// free cell -> create new burg for a capital // free cell -> create new burg for a capital
@ -7605,47 +7622,33 @@ function fantasyMap() {
}); });
// fully remove country // fully remove country
$("#countriesBody .icon-trash-empty").on("click", function() { $("#countriesBody .icon-trash-empty").on("click", function() {
var s = +(this.parentNode.id).slice(5); const s = +(this.parentNode.id).slice(5);
if (states[s].capital === "select") { alertMessage.innerHTML = `Are you sure you want to remove the country? All lands and burgs will become neutral`;
removeCountry(s);
return;
}
alertMessage.innerHTML = `Are you sure you want to remove the country?`;
$("#alert").dialog({resizable: false, title: "Remove country", buttons: { $("#alert").dialog({resizable: false, title: "Remove country", buttons: {
Remove: function() { Remove: function() {removeCountry(s); $(this).dialog("close");},
removeCountry(s);
$(this).dialog("close");
},
Cancel: function() {$(this).dialog("close");} Cancel: function() {$(this).dialog("close");}
}}); }});
}); });
function removeCountry(s) { function removeCountry(s) {
const cellsCount = states[s].cells; const cellsCount = states[s].cells;
const capital = states[s].capital; const capital = +states[s].capital;
if (!isNaN(capital)) moveBurgToGroup(capital, "towns");
states.splice(s, 1); states.splice(s, 1);
states.map(function(s, i) {s.i = i;}); states.map(function(s, i) {s.i = i;});
cells.map(function(c) { land.map(function(c) {
if (c.region === s) c.region = "neutral"; if (c.region === s) c.region = "neutral";
else if (c.region > s) c.region -= 1; else if (c.region > s) c.region -= 1;
}); });
// do only if removed state had cells // do only if removed state had cells
if (cellsCount) { if (cellsCount) {
// change capital to burg manors.map(function(b) {if (b.region === s) b.region = "neutral";});
$("#burgLabels [data-id=" + capital + "]").detach().appendTo($("#burgLabels #towns"));
$("#burgIcons [data-id=" + capital + "]").detach().appendTo($("#burgIcons #towns"));
var burgsSelection = $.grep(manors, function(e) {return (e.region === s);});
var urbanFactor = 0.9;
burgsSelection.map(function(b) {
if (b.i === capital) {b.population *= 0.5;}
b.population *= urbanFactor;
b.region = "neutral";
});
// re-calculate neutral data // re-calculate neutral data
if (states[states.length-1].capital !== "neutral") { const i = states.length;
states.push({i: states.length, color: "neutral", name: "Neutrals", capital: "neutral"}); if (states[i-1].capital !== "neutral") {
states.push({i, color: "neutral", name: "Neutrals", capital: "neutral"});
} }
recalculateStateData(states.length - 1); // re-calc data for neutrals recalculateStateData(i-1); // re-calc data for neutrals
redrawRegions(); redrawRegions();
} }
editCountries(); editCountries();
@ -7708,25 +7711,25 @@ function fantasyMap() {
var x = +l.attr("x"), y = +l.attr("y"); var x = +l.attr("x"), y = +l.attr("y");
zoomTo(x, y, 8, 1600); zoomTo(x, y, 8, 1600);
}); });
$("#burgsBody > div").hover(focusBurg, unfocus); $("#burgsBody > div").hover(focusBurg, unfocus);
$("#burgsBody > div").click(function() { $("#burgsBody > div").click(function() {
if (!$("#changeCapital").hasClass("pressed")) {return;} if (!$("#changeCapital").hasClass("pressed")) return;
var type = $(this).attr("data-type"); const s = +$("#burgsEditor").attr("data-state");
if (type.includes("capital")) {return;} const newCap = +$(this).attr("id").slice(5);
var s = +$("#burgsEditor").attr("data-state"); const oldCap = +states[s].capital;
var b = +$(this).attr("id").slice(5); if (newCap === oldCap) {
var oldCap = states[s].capital; tip("This burg is already a capital! Please select a different burg", null, "error");
manors[oldCap].population *= 0.5; return;
manors[b].population *= 2; }
states[s].capital = b;
recalculateStateData(s);
$("#labels [data-id=" + oldCap + "]").detach().appendTo($("#burgLabels #towns"));
$("#icons [data-id=" + oldCap + "]").detach().appendTo($("#burgIcons #towns"));
$("#labels [data-id=" + b + "]").detach().appendTo($("#burgLabels #capitals"));
$("#icons [data-id=" + b + "]").detach().appendTo($("#burgIcons #towns"));
updateCountryEditors();
$("#changeCapital").removeClass("pressed"); $("#changeCapital").removeClass("pressed");
states[s].capital = newCap;
if (!isNaN(oldCap)) moveBurgToGroup(oldCap, "towns");
recalculateStateData(s);
moveBurgToGroup(newCap, "capitals");
}); });
$(".burgName").on("input", function() { $(".burgName").on("input", function() {
var b = +(this.parentNode.id).slice(5); var b = +(this.parentNode.id).slice(5);
manors[b].name = this.value; manors[b].name = this.value;
@ -7858,7 +7861,7 @@ function fantasyMap() {
// open editCultures dialog // open editCultures dialog
function editCultures() { function editCultures() {
if (cults.selectAll("path").size() === 0) $("#toggleCultures").click(); if (!cults.selectAll("path").size()) $("#toggleCultures").click();
if (regions.style("display") !== "none") $("#toggleCountries").click(); if (regions.style("display") !== "none") $("#toggleCountries").click();
layoutPreset.value = "layoutCultural"; layoutPreset.value = "layoutCultural";
$("#culturesBody").empty(); $("#culturesBody").empty();
@ -7876,9 +7879,9 @@ function fantasyMap() {
}); });
manors.map(function(m) { manors.map(function(m) {
const r = m.region; const c = m.culture;
if (r === undefined || r === "removed") return; if (isNaN(c)) return;
urbPops[r] = urbPops[r] ? urbPops[r] + m.population : m.population; urbPops[c] = urbPops[c] ? urbPops[c] + m.population : m.population;
}); });
for (let c = 0; c < cultures.length; c++) { for (let c = 0; c < cultures.length; c++) {