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

restoring inappropriate fix (#785)

Browse source 
* restoring inappropriate fix

* removing culture cell data on import
This commit is contained in:
Mészáros Anna Veronika 2022-05-01 20:42:59 +02:00 • committed by GitHub
parent 97369a1928
commit a99c0be623
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/ui/cultures-editor.js
View file

@ -417,16 +417,7 @@ function editCultures() {
tip(`Names for ${cBurgs.length} burgs are regenerated`, false, "success"); tip(`Names for ${cBurgs.length} burgs are regenerated`, false, "success");
} }
function cultureRemove() { function removeCultureModel(culture) {
if (customization === 4) return;
const culture = +this.parentNode.dataset.id;
alertMessage.innerHTML = "Are you sure you want to remove the culture? <br>This action cannot be reverted";
$("#alert").dialog({
resizable: false,
title: "Remove culture",
buttons: {
Remove: function () {
cults.select("#culture" + culture).remove(); cults.select("#culture" + culture).remove();
debug.select("#cultureCenter" + culture).remove(); debug.select("#cultureCenter" + culture).remove();
@ -444,6 +435,19 @@ function editCultures() {
if (c.origin === culture) c.origin = origin; if (c.origin === culture) c.origin = origin;
}); });
refreshCulturesEditor(); refreshCulturesEditor();
}
function cultureRemove() {
if (customization === 4) return;
const culture = +this.parentNode.dataset.id;
alertMessage.innerHTML = "Are you sure you want to remove the culture? <br>This action cannot be reverted";
$("#alert").dialog({
resizable: false,
title: "Remove culture",
buttons: {
Remove: function () {
removeCultureModel(culture);
$(this).dialog("close"); $(this).dialog("close");
}, },
Cancel: function () { Cancel: function () {
@ -894,14 +898,13 @@ function editCultures() {
const shapes = Object.keys(COA.shields.types) const shapes = Object.keys(COA.shields.types)
.map(type => Object.keys(COA.shields[type])) .map(type => Object.keys(COA.shields[type]))
.flat(); .flat();
const populated = pack.cells.pop.map((c, i) => c? i: null).filter(c => c);
const populated = pack.cells.pop.map((c, i) => (c ? i : null)).filter(c => c); cultures.forEach((item) => {if (item.i) item.removed = true});
for (const c of csv.iterator((a, b) => +a[0] > +b[0])) { for (const c of csv.iterator((a, b) => +a[0] > +b[0])) {
let current; let current;
if (+c.id < cultures.length) { if (+c.id < cultures.length) {
current = cultures[c.id]; current = cultures[c.id];
current.removed = false;
const ratio = current.urban / (current.rural + current.urban); const ratio = current.urban / (current.rural + current.urban);
applyPopulationChange(current.rural, current.urban, c.population * (1 - ratio), c.population * ratio, +c.id); applyPopulationChange(current.rural, current.urban, c.population * (1 - ratio), c.population * ratio, +c.id);
} else { } else {
@ -909,6 +912,7 @@ function editCultures() {
cultures.push(current); cultures.push(current);
} }
current.removed = false;
current.name = c.culture; current.name = c.culture;
current.code = abbreviate( current.code = abbreviate(
current.name, current.name,
@ -930,9 +934,7 @@ function editCultures() {
current.base = nameBaseIndex === -1 ? 0 : nameBaseIndex; current.base = nameBaseIndex === -1 ? 0 : nameBaseIndex;
} }
const validId = cultures.filter(c => !c.removed).map(c => c.i); cultures.filter(c => c.removed).forEach(c => removeCultureModel(c.i))
cultures.forEach(item => (item.origin = validId.includes(item.origin) ? item.origin : 0));
cultures[0].origin = null;
drawCultures(); drawCultures();
refreshCulturesEditor(); refreshCulturesEditor();