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

fix: add origin to religion and cultures csv download

Browse source
This commit is contained in:
Azgaar 2022-06-05 23:00:57 +03:00
parent b35fda436b
commit b416551fb5
2 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/dynamic/editors/cultures-editor.js
View file

@ -1008,13 +1008,15 @@ function addCulture() {
function downloadCulturesCsv() { function downloadCulturesCsv() {
const unit = getAreaUnit("2"); const unit = getAreaUnit("2");
const headers = `Id,Name,Color,Cells,Expansionism,Type,Area ${unit},Population,Namesbase,Emblems Shape,Origin`; const headers = `Id,Name,Color,Cells,Expansionism,Type,Area ${unit},Population,Namesbase,Emblems Shape,Origins`;
const lines = Array.from($body.querySelectorAll(":scope > div")); const lines = Array.from($body.querySelectorAll(":scope > div"));
const data = lines.map($line => { const data = lines.map($line => {
const {id, name, color, cells, expansionism, type, area, population, emblems, base} = $line.dataset; const {id, name, color, cells, expansionism, type, area, population, emblems, base} = $line.dataset;
const namesbase = nameBases[+base].name; const namesbase = nameBases[+base].name;
const {origin} = pack.cultures[+id]; const {origins} = pack.cultures[+id];
return [id, name, color, cells, expansionism, type, area, population, namesbase, emblems, origin].join(","); const originList = origins.filter(origin => origin).map(origin => pack.cultures[origin].name);
const originText = '"' + originList.join(", ") + '"';
return [id, name, color, cells, expansionism, type, area, population, namesbase, emblems, originText].join(",");
}); });
const csvData = [headers].concat(data).join("\n"); const csvData = [headers].concat(data).join("\n");

95
modules/ui/religions-editor.js
View file

@ -8,7 +8,7 @@ function editReligions() {
if (layerIsOn("toggleBiomes")) toggleBiomes(); if (layerIsOn("toggleBiomes")) toggleBiomes();
if (layerIsOn("toggleProvinces")) toggleProvinces(); if (layerIsOn("toggleProvinces")) toggleProvinces();
const body = byId("religionsBody"); const $body = byId("religionsBody");
const animate = d3.transition().duration(1500).ease(d3.easeSinIn); const animate = d3.transition().duration(1500).ease(d3.easeSinIn);
refreshReligionsEditor(); refreshReligionsEditor();
drawReligionCenters(); drawReligionCenters();
@ -35,7 +35,7 @@ function editReligions() {
byId("religionsManuallyApply").on("click", applyReligionsManualAssignent); byId("religionsManuallyApply").on("click", applyReligionsManualAssignent);
byId("religionsManuallyCancel").on("click", () => exitReligionsManualAssignment()); byId("religionsManuallyCancel").on("click", () => exitReligionsManualAssignment());
byId("religionsAdd").on("click", enterAddReligionMode); byId("religionsAdd").on("click", enterAddReligionMode);
byId("religionsExport").on("click", downloadReligionsData); byId("religionsExport").on("click", downloadReligionsCsv);
function refreshReligionsEditor() { function refreshReligionsEditor() {
religionsCollectStatistics(); religionsCollectStatistics();
@ -71,7 +71,7 @@ function editReligions() {
const rural = r.rural * populationRate; const rural = r.rural * populationRate;
const urban = r.urban * populationRate * urbanization; const urban = r.urban * populationRate * urbanization;
const population = rn(rural + urban); const population = rn(rural + urban);
if (r.i && !r.cells && body.dataset.extinct !== "show") continue; // hide extinct religions if (r.i && !r.cells && $body.dataset.extinct !== "show") continue; // hide extinct religions
const populationTip = `Believers: ${si(population)}; Rural areas: ${si(rural)}; Urban areas: ${si( const populationTip = `Believers: ${si(population)}; Rural areas: ${si(rural)}; Urban areas: ${si(
urban urban
)}. Click to change`; )}. Click to change`;
@ -142,7 +142,7 @@ function editReligions() {
</div>`; </div>`;
} }
} }
body.innerHTML = lines; $body.innerHTML = lines;
// update footer // update footer
const valid = pack.religions.filter(r => r.i && !r.removed); const valid = pack.religions.filter(r => r.i && !r.removed);
@ -156,20 +156,20 @@ function editReligions() {
religionsFooterPopulation.dataset.population = totalPopulation; religionsFooterPopulation.dataset.population = totalPopulation;
// add listeners // add listeners
body.querySelectorAll("div.religions").forEach(el => el.on("mouseenter", religionHighlightOn)); $body.querySelectorAll("div.religions").forEach(el => el.on("mouseenter", religionHighlightOn));
body.querySelectorAll("div.religions").forEach(el => el.on("mouseleave", religionHighlightOff)); $body.querySelectorAll("div.religions").forEach(el => el.on("mouseleave", religionHighlightOff));
body.querySelectorAll("div.states").forEach(el => el.on("click", selectReligionOnLineClick)); $body.querySelectorAll("div.states").forEach(el => el.on("click", selectReligionOnLineClick));
body.querySelectorAll("fill-box").forEach(el => el.on("click", religionChangeColor)); $body.querySelectorAll("fill-box").forEach(el => el.on("click", religionChangeColor));
body.querySelectorAll("div > input.religionName").forEach(el => el.on("input", religionChangeName)); $body.querySelectorAll("div > input.religionName").forEach(el => el.on("input", religionChangeName));
body.querySelectorAll("div > select.religionType").forEach(el => el.on("change", religionChangeType)); $body.querySelectorAll("div > select.religionType").forEach(el => el.on("change", religionChangeType));
body.querySelectorAll("div > input.religionForm").forEach(el => el.on("input", religionChangeForm)); $body.querySelectorAll("div > input.religionForm").forEach(el => el.on("input", religionChangeForm));
body.querySelectorAll("div > input.religionDeity").forEach(el => el.on("input", religionChangeDeity)); $body.querySelectorAll("div > input.religionDeity").forEach(el => el.on("input", religionChangeDeity));
body.querySelectorAll("div > span.icon-arrows-cw").forEach(el => el.on("click", regenerateDeity)); $body.querySelectorAll("div > span.icon-arrows-cw").forEach(el => el.on("click", regenerateDeity));
body.querySelectorAll("div > div.culturePopulation").forEach(el => el.on("click", changePopulation)); $body.querySelectorAll("div > div.culturePopulation").forEach(el => el.on("click", changePopulation));
body.querySelectorAll("div > span.icon-trash-empty").forEach(el => el.on("click", religionRemove)); $body.querySelectorAll("div > span.icon-trash-empty").forEach(el => el.on("click", religionRemove));
if (body.dataset.type === "percentage") { if ($body.dataset.type === "percentage") {
body.dataset.type = "absolute"; $body.dataset.type = "absolute";
togglePercentageMode(); togglePercentageMode();
} }
applySorting(religionsHeader); applySorting(religionsHeader);
@ -204,7 +204,7 @@ function editReligions() {
tip("Drag to other node to add parent, click to edit"); tip("Drag to other node to add parent, click to edit");
} }
const el = body.querySelector(`div[data-id='${religionId}']`); const el = $body.querySelector(`div[data-id='${religionId}']`);
if (el) el.classList.add("active"); if (el) el.classList.add("active");
if (!layerIsOn("toggleReligions")) return; if (!layerIsOn("toggleReligions")) return;
@ -233,7 +233,7 @@ function editReligions() {
tip(""); tip("");
} }
const el = body.querySelector(`div[data-id='${religionId}']`); const el = $body.querySelector(`div[data-id='${religionId}']`);
if (el) el.classList.remove("active"); if (el) el.classList.remove("active");
relig relig
@ -473,17 +473,17 @@ function editReligions() {
} }
function togglePercentageMode() { function togglePercentageMode() {
if (body.dataset.type === "absolute") { if ($body.dataset.type === "absolute") {
body.dataset.type = "percentage"; $body.dataset.type = "percentage";
const totalArea = +religionsFooterArea.dataset.area; const totalArea = +religionsFooterArea.dataset.area;
const totalPopulation = +religionsFooterPopulation.dataset.population; const totalPopulation = +religionsFooterPopulation.dataset.population;
body.querySelectorAll(":scope > div").forEach(function (el) { $body.querySelectorAll(":scope > div").forEach(function (el) {
el.querySelector(".biomeArea").innerHTML = rn((+el.dataset.area / totalArea) * 100) + "%"; el.querySelector(".biomeArea").innerHTML = rn((+el.dataset.area / totalArea) * 100) + "%";
el.querySelector(".culturePopulation").innerHTML = rn((+el.dataset.population / totalPopulation) * 100) + "%"; el.querySelector(".culturePopulation").innerHTML = rn((+el.dataset.population / totalPopulation) * 100) + "%";
}); });
} else { } else {
body.dataset.type = "absolute"; $body.dataset.type = "absolute";
religionsEditorAddLines(); religionsEditorAddLines();
} }
} }
@ -670,7 +670,7 @@ function editReligions() {
} }
function toggleExtinct() { function toggleExtinct() {
body.dataset.extinct = body.dataset.extinct !== "show" ? "show" : "hide"; $body.dataset.extinct = $body.dataset.extinct !== "show" ? "show" : "hide";
religionsEditorAddLines(); religionsEditorAddLines();
} }
@ -684,7 +684,7 @@ function editReligions() {
religionsEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden")); religionsEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
religionsFooter.style.display = "none"; religionsFooter.style.display = "none";
body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "none")); $body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "none"));
$("#religionsEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}}); $("#religionsEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
tip("Click on religion to select, drag the circle to change religion", true); tip("Click on religion to select, drag the circle to change religion", true);
@ -694,12 +694,12 @@ function editReligions() {
.call(d3.drag().on("start", dragReligionBrush)) .call(d3.drag().on("start", dragReligionBrush))
.on("touchmove mousemove", moveReligionBrush); .on("touchmove mousemove", moveReligionBrush);
body.querySelector("div").classList.add("selected"); $body.querySelector("div").classList.add("selected");
} }
function selectReligionOnLineClick(i) { function selectReligionOnLineClick(i) {
if (customization !== 7) return; if (customization !== 7) return;
body.querySelector("div.selected").classList.remove("selected"); $body.querySelector("div.selected").classList.remove("selected");
this.classList.add("selected"); this.classList.add("selected");
} }
@ -711,8 +711,8 @@ function editReligions() {
const assigned = relig.select("#temp").select("polygon[data-cell='" + i + "']"); const assigned = relig.select("#temp").select("polygon[data-cell='" + i + "']");
const religion = assigned.size() ? +assigned.attr("data-religion") : pack.cells.religion[i]; const religion = assigned.size() ? +assigned.attr("data-religion") : pack.cells.religion[i];
body.querySelector("div.selected").classList.remove("selected"); $body.querySelector("div.selected").classList.remove("selected");
body.querySelector("div[data-id='" + religion + "']").classList.add("selected"); $body.querySelector("div[data-id='" + religion + "']").classList.add("selected");
} }
function dragReligionBrush() { function dragReligionBrush() {
@ -732,7 +732,7 @@ function editReligions() {
// change religion within selection // change religion within selection
function changeReligionForSelection(selection) { function changeReligionForSelection(selection) {
const temp = relig.select("#temp"); const temp = relig.select("#temp");
const selected = body.querySelector("div.selected"); const selected = $body.querySelector("div.selected");
const r = +selected.dataset.id; // religionNew const r = +selected.dataset.id; // religionNew
const color = pack.religions[r].color || "#ffffff"; const color = pack.religions[r].color || "#ffffff";
@ -785,13 +785,13 @@ function editReligions() {
religionsEditor.querySelectorAll(".hide").forEach(el => el.classList.remove("hidden")); religionsEditor.querySelectorAll(".hide").forEach(el => el.classList.remove("hidden"));
religionsFooter.style.display = "block"; religionsFooter.style.display = "block";
body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all")); $body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all"));
if (!close) $("#religionsEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}}); if (!close) $("#religionsEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
debug.select("#religionCenters").style("display", null); debug.select("#religionCenters").style("display", null);
restoreDefaultEvents(); restoreDefaultEvents();
clearMainTip(); clearMainTip();
const selected = body.querySelector("div.selected"); const selected = $body.querySelector("div.selected");
if (selected) selected.classList.remove("selected"); if (selected) selected.classList.remove("selected");
} }
@ -804,14 +804,14 @@ function editReligions() {
this.classList.add("pressed"); this.classList.add("pressed");
tip("Click on the map to add a new religion", true); tip("Click on the map to add a new religion", true);
viewbox.style("cursor", "crosshair").on("click", addReligion); viewbox.style("cursor", "crosshair").on("click", addReligion);
body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "none")); $body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "none"));
} }
function exitAddReligionMode() { function exitAddReligionMode() {
customization = 0; customization = 0;
restoreDefaultEvents(); restoreDefaultEvents();
clearMainTip(); clearMainTip();
body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all")); $body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all"));
if (religionsAdd.classList.contains("pressed")) religionsAdd.classList.remove("pressed"); if (religionsAdd.classList.contains("pressed")) religionsAdd.classList.remove("pressed");
} }
@ -836,23 +836,22 @@ function editReligions() {
drawReligionCenters(); drawReligionCenters();
} }
function downloadReligionsData() { function downloadReligionsCsv() {
const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value; const unit = getAreaUnit("2");
let data = "Id,Religion,Color,Type,Form,Deity,Area " + unit + ",Believers\n"; // headers const headers = `Id,Name,Color,Type,Form,Supreme Deity,Area ${unit},Believers,Origins`;
const lines = Array.from($body.querySelectorAll(":scope > div"));
body.querySelectorAll(":scope > div").forEach(function (el) { const data = lines.map($line => {
data += el.dataset.id + ","; const {id, name, color, type, form, deity, area, population} = $line.dataset;
data += el.dataset.name + ","; const deityText = '"' + deity + '"';
data += el.dataset.color + ","; const {origins} = pack.religions[+id];
data += el.dataset.type + ","; const originList = (origins || []).filter(origin => origin).map(origin => pack.religions[origin].name);
data += el.dataset.form + ","; const originText = '"' + originList.join(", ") + '"';
data += el.dataset.deity.replace(",", " -") + ","; return [id, name, color, type, form, deityText, area, population, originText].join(",");
data += el.dataset.area + ",";
data += el.dataset.population + "\n";
}); });
const csvData = [headers].concat(data).join("\n");
const name = getFileName("Religions") + ".csv"; const name = getFileName("Religions") + ".csv";
downloadFile(data, name); downloadFile(csvData, name);
} }
function closeReligionsEditor() { function closeReligionsEditor() {