diff --git a/main.js b/main.js index 4138ed74..434fdba5 100644 --- a/main.js +++ b/main.js @@ -158,7 +158,6 @@ let customization = 0; let biomesData = applyDefaultBiomesSystem(); let nameBases = Names.getNameBases(); // cultures-related data -const zoneTypes = ["Invasion", "Rebels", "Proselytism", "Crusade", "Disease", "Disaster"]; let color = d3.scaleSequential(d3.interpolateSpectral); // default color scheme const lineGen = d3.line().curve(d3.curveBasis); // d3 line generator with default curve interpolation @@ -2057,14 +2056,6 @@ function addZones(number = 1) { TIME && console.timeEnd("addZones"); } -// Update zone types -function updateZoneType(zoneId, newType) { - const zone = document.getElementById(zoneId); - if (zone) { - zone.dataset.type = newType; - } -} - // show map stats on generation complete function showStatistics() { const heightmap = byId("templateInput").value; diff --git a/modules/load.js b/modules/load.js index 73a3982d..9934ecc0 100644 --- a/modules/load.js +++ b/modules/load.js @@ -884,6 +884,10 @@ function parseLoadedData(data) { // v1.73 moved the hatching patterns out of the user's SVG document.getElementById("hatching")?.remove(); } + + if (version < 1.731) { + // v1.731 added type to zones + } })(); void (function checkDataIntegrity() { diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js index bc58c17f..8476123e 100644 --- a/modules/ui/zones-editor.js +++ b/modules/ui/zones-editor.js @@ -30,8 +30,6 @@ function editZones() { document.getElementById("zonesManuallyApply").addEventListener("click", applyZonesManualAssignent); document.getElementById("zonesManuallyCancel").addEventListener("click", cancelZonesManualAssignent); document.getElementById("zonesAdd").addEventListener("click", addZonesLayer); - document.getElementById("zonesEditTypes").addEventListener("click", addZonesDialog); - document.getElementById("zonesNewTypeButton").addEventListener("click", addZonesType); document.getElementById("zonesExport").addEventListener("click", downloadZonesData); document.getElementById("zonesRemove").addEventListener("click", toggleEraseMode); @@ -54,14 +52,6 @@ function editZones() { if (el.classList.contains("zoneName")) zone.attr("data-description", el.value); else if (el.classList.contains("zoneType")) zone.attr("data-type", el.value); }); - - function refreshZonesEditor() { - updateSVG(); - zonesEditorAddLines(); - } - - function updateSVG() { - const value = document.getElementById("zonesFilterType").value; // update type filter with a list of used types function updateFilters() { @@ -92,7 +82,6 @@ function editZones() { const rural = d3.sum(c.map(i => pack.cells.pop[i])) * populationRate; const urban = d3.sum(c.map(i => pack.cells.burg[i]).map(b => pack.burgs[b].population)) * populationRate * urbanization; const population = rural + urban; - const zoneTypeList = getZoneTypesList(this.id, this.dataset.type); const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}. Click to change`; const inactive = zoneEl.style.display === "none"; const focused = defs.select("#fog #focus" + zoneEl.id).size(); @@ -108,7 +97,6 @@ function editZones() {
- ${zoneTypeList} @@ -139,6 +127,8 @@ function editZones() { $("#zonesEditor").dialog({width: fitContent()}); } + function filterZonesByType() {} + function zoneHighlightOn(event) { const zone = event.target.dataset.id; zones.select("#" + zone).style("outline", "1px solid red"); @@ -375,11 +365,6 @@ function editZones() { zonesEditorAddLines(); } } - - function toggleFilterTable() { - this.classList.toggle("pressed"); - zonesEditorAddLines(); - } function addZonesLayer() { const id = getNextId("zone"); @@ -487,66 +472,6 @@ function editZones() { } } - function zonesTypesAddLines() { - const zoneTypeListBody = document.getElementById("zonesTypesBodySection"); - - let lines = ""; - zoneTypes.forEach(function(z, i) { - let count=0; // Amount of zones per type - zones.selectAll("g").each(function() { if (this.dataset.type === z) count++; }); - - lines += `