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

v1.1.15

Browse source
This commit is contained in:
Azgaar 2019-10-16 23:45:48 +03:00
commit ff6ef1643e
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main.js
View file

@ -1383,7 +1383,7 @@ function addZones(number = 1) {
}
const invasion = rw({"Invasion":4, "Occupation":3, "Raid":2, "Conquest":2,
"Subjugation":1, "Foray":1, "Irruption":1, "Incursion":2, "Pillage":1, "Intervention":1});
"Subjugation":1, "Irruption":1, "Foray":1, "Incursion":2, "Pillage":1, "Intervention":1});
const name = getAdjective(invader.name) + " " + invasion;
data.push({name, type:"Invasion", cells:cellsArray, fill:"url(#hatch1)"});
}

9
modules/ui/burgs-editor.js
View file

@ -368,7 +368,11 @@ function editBurgs() {
}
function downloadBurgsData() {
<<<<<<< HEAD
let data = "Id,Burg,Province,State,Culture,Religion,Population,Longitude,Latitude,Elevation ("+heightUnit.value+"),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town\n"; // headers
=======
let data = "Id,Burg,Province,State,Culture,Religion,Population,Longitude,Latitude,Elevation ("+heightUnit.value+"),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty\n"; // headers
>>>>>>> 40f4f308142aebc86427c252046d3d53df81b1cc
const valid = pack.burgs.filter(b => b.i && !b.removed); // all valid burgs
valid.forEach(b => {
@ -393,7 +397,12 @@ function editBurgs() {
data += b.walls ? "walls," : ",";
data += b.plaza ? "plaza," : ",";
data += b.temple ? "temple," : ",";
<<<<<<< HEAD
data += b.shanty ? "shanty town\n" : "\n";
=======
data += b.shanty ? "shanty\n" : "\n";
>>>>>>> 40f4f308142aebc86427c252046d3d53df81b1cc
});
const name = getFileName("Burgs") + ".csv";