diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index e33266d4..eeefde30 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -405,7 +405,7 @@ window.BurgsAndStates = (function () {
if (type === "Lake" && f.type === "lake") return 10; // low lake crossing penalty for Lake cultures
if (type === "Naval" && h < 20) return 300; // low sea crossing penalty for Navals
if (type === "Nomadic" && h < 20) return 10000; // giant sea crossing penalty for Nomads
- if (h < 20) return 1000; // general sea crossing penalty
+ if (h < 20) return 5000; // general sea crossing penalty
if (type === "Highland" && h < 62) return 1100; // penalty for highlanders on lowlands
if (type === "Highland") return 0; // no penalty for highlanders on highlands
if (h >= 67) return 2200; // general mountains crossing penalty
diff --git a/modules/cultures-generator.js b/modules/cultures-generator.js
index 38bd32f9..116e0f29 100644
--- a/modules/cultures-generator.js
+++ b/modules/cultures-generator.js
@@ -186,31 +186,31 @@ window.Cultures = (function () {
if (culturesSet.value === "darkFantasy") {
return [
- {name: "Castien (Elvish)", base: 33, odd: 1, sort: i => (normalizedCellScore(i) / biomeGoals(i, [6, 7, 8, 9], 10)) * temperature[i], shield: "gondor"}, // Elves
- {name: "Hagluin (Elvish)", base: 33, odd: 1, sort: i => (normalizedCellScore(i) / biomeGoals(i, [6, 7, 8, 9], 10)) * temperature[i], shield: "noldor"}, // Elves
- {name: "Lothian (Elvish)", base: 33, odd: 1, sort: i => (normalizedCellScore(i) / biomeGoals(i, [7, 8, 9, 12], 10)) * temperature[i], shield: "wedged"},
- {name: "Dunirr (Dwarven)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + (height[i]*3), shield: "ironHills"}, // Dwarfs
- {name: "Khazadur (Dwarven)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + (height[i]*4), shield: "erebor"}, // Dwarfs
- {name: "Dhommeam (Dwarven)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
- {name: "Mudtoe (Dwarven)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
- {name: "Gongrem (Dwarven)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
- {name: "Pabolk (Goblin)", base: 36, odd: 1, sort: i => temperature[i] - s[i], shield: "moriaOrc"}, // Goblin
- {name: "Lagakh (Orkish)", base: 37, odd: 1, sort: i => (height[i] * normalizedCellScore(i) * biomeGoals(i,[2,3,4], 100)), shield: "urukHai"}, // Orc
- {name: "Mogak (Orkish)", base: 37, odd: 1, sort: i => (height[i]* normalizedCellScore(i) * biomeGoals(i,[2,3,4], 100)), shield: "urukHai"}, // Orc
- {name: "Xugarf (Orkish)", base: 37, odd: 1, sort: i => ((height[i] * normalizedCellScore(i) * temperature[i]) / biomeGoals(i, [2, 10, 11],100)), shield: "moriaOrc"}, // Orc
- {name: "Zildud (Orkish)", base: 37, odd: 1, sort: i => ((height[i]* normalizedCellScore(i) * temperature[i]) / biomeGoals(i, [2, 10, 11],100)), shield: "moriaOrc"}, // Orc
- {name: "Shazgob (Orkish)", base: 37, odd: 1, sort: i => ((height[i]* normalizedCellScore(i) * temperature[i]) / biomeGoals(i, [2, 10, 11],100)), shield: "moriaOrc"}, // Orc
- {name: "Mazoga (Orkish)", base: 37, odd: 1, sort: i => ((height[i] * temperature[i]) / biomeGoals(i, [2, 10, 11],100)), shield: "moriaOrc"}, // Orc
- {name: "Gul (Orkish)", base: 37, odd: 1, sort: i => ((height[i] * temperature[i]) / biomeGoals(i, [2, 10, 11],100)), shield: "moriaOrc"}, // Orc
- {name: "Goren (Elvish}", base: 33, odd: 0.5, sort: i => (normalizedCellScore(i) / biomeGoals(i, [6, 7, 8, 9], 10)) * temperature[i], shield: "fantasy5"}, // Elves
- {name: "Ginikirr {Dwarven)", base: 35, odd: 0.8, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarven
+ {name: "Castien (Elf)", base: 33, odd: 1, sort: i => (normalizedCellScore(i) / biomeGoals(i, [6, 7, 8, 9], 10)) * temperature[i], shield: "gondor"}, // Elves
+ {name: "Hagluin (Elf)", base: 33, odd: 0.5, sort: i => (normalizedCellScore(i) / biomeGoals(i, [6, 7, 8, 9], 10)) * temperature[i], shield: "noldor"}, // Elves
+ {name: "Lothian (Elf)", base: 33, odd: 1, sort: i => (normalizedCellScore(i) / biomeGoals(i, [7, 8, 9, 12], 10)) * temperature[i], shield: "wedged"},
+ {name: "Dunirr (Dwarf)", base: 35, odd: 0.7, sort: i => normalizedCellScore(i) + (height[i]*3), shield: "ironHills"}, // Dwarfs
+ {name: "Khazadur (Dwarf)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + (height[i]*4), shield: "erebor"}, // Dwarfs
+ {name: "Dhommeam (Dwarf)", base: 35, odd: 0.2, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
+ {name: "Mudtoe (Dwarf)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
+ {name: "Gongrem (Dwarf)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
+ {name: "Pabolk (Goblin)", base: 36, odd: 2, sort: i => temperature[i] - s[i], shield: "moriaOrc"}, // Goblin
+ {name: "Lagakh (Orc)", base: 37, odd: 1, sort: i => (height[i] * normalizedCellScore(i) * biomeGoals(i,[2,3,4], 200)), shield: "urukHai"}, // Orc
+ {name: "Mogak (Orc)", base: 37, odd: 1, sort: i => (height[i]* normalizedCellScore(i) * biomeGoals(i,[2,3,4], 300)), shield: "urukHai"}, // Orc
+ {name: "Xugarf (Orc)", base: 37, odd: 1, sort: i => ((height[i] * normalizedCellScore(i) * temperature[i]) / biomeGoals(i, [2, 10, 11],300)), shield: "moriaOrc"}, // Orc
+ {name: "Zildud (Orc)", base: 37, odd: 1, sort: i => ((height[i]* normalizedCellScore(i) * temperature[i]) / biomeGoals(i, [2, 10, 11],300)), shield: "moriaOrc"}, // Orc
+ {name: "Shazgob (Orc)", base: 37, odd: 1, sort: i => ((height[i]* normalizedCellScore(i) * temperature[i]) / biomeGoals(i, [2, 10, 11],300)), shield: "moriaOrc"}, // Orc
+ {name: "Mazoga (Orc)", base: 37, odd: 1, sort: i => ((height[i] * temperature[i]) / biomeGoals(i, [2, 10, 11],100)), shield: "moriaOrc"}, // Orc
+ {name: "Gul (Orc)", base: 37, odd: 1, sort: i => ((height[i] * temperature[i]) / biomeGoals(i, [2, 10, 11],100)), shield: "moriaOrc"}, // Orc
+ {name: "Goren (Elf}", base: 33, odd: 0.5, sort: i => (normalizedCellScore(i) / biomeGoals(i, [6, 7, 8, 9], 50)) * temperature[i], shield: "fantasy5"}, // Elves
+ {name: "Ginikirr (Dwarf)", base: 35, odd: 0.8, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarf
{name: "Heenzurm (Goblin)", base: 36, odd: 1.8, sort: i => temperature[i] - s[i], shield: "moriaOrc"}, // Goblin
{name: "Yotunn (Giant)", base: 38, odd: 1.2, sort: i => tempDiff(i, -5), shield: "pavise"}, // Giant
{name: "Zakaos (Giant)", base: 38, odd: 1.0, sort: i => tempDiff(i, -5), shield: "pavise"}, // Giant
{name: "Fruthos (Human)", base: 32, odd: 1, sort: i => normalizedCellScore(i) / tempDiff(i, 10), shield: "fantasy5"},
- {name: "Rulor (Human)", base: 32, odd: 1, sort: i => normalizedCellScore(i) / tempDiff(i, 13), shield: "roman"},
- {name: "Gralcek (Human)", base: 16, odd: 1, sort: i => normalizedCellScore(i) / tempDiff(i, 16), shield: "round"},
- {name: "Llekkolk (Human)", base: 31, odd: 1, sort: i => (normalizedCellScore(i) / tempDiff(i, 5) / biomeGoals(i, [2, 4, 10], 7)) * temperature[i], shield: "easterling"}
+ {name: "Rulor (Human)", base: 32, odd: 0.5, sort: i => normalizedCellScore(i) / tempDiff(i, 13), shield: "roman"},
+ {name: "Gralcek (Human)", base: 16, odd: 0.3, sort: i => normalizedCellScore(i) / tempDiff(i, 16), shield: "round"},
+ {name: "Llekkolk (Human)", base: 31, odd: 0.2, sort: i => (normalizedCellScore(i) / tempDiff(i, 5) / biomeGoals(i, [2, 4, 10], 7)) * temperature[i], shield: "easterling"}
];
@@ -303,11 +303,11 @@ window.Cultures = (function () {
{name: "Eldar (Elfish)", base: 33, odd: 1, sort: i => (normalizedCellScore(i) / biomeGoals(i, [6, 7, 8, 9], 10)) * temperature[i], shield: "noldor"}, // Elves
{name: "Trow (Dark Elfish)", base: 34, odd: 0.9, sort: i => (normalizedCellScore(i) / biomeGoals(i, [7, 8, 9, 12], 10)) * temperature[i], shield: "hessen"}, // Dark Elves
{name: "Lothian (Dark Elfish)", base: 34, odd: 0.3, sort: i => (normalizedCellScore(i) / biomeGoals(i, [7, 8, 9, 12], 10)) * temperature[i], shield: "wedged"}, // Dark Elves
- {name: "Dunirr (Dwarven)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "ironHills"}, // Dwarfs
- {name: "Khazadur (Dwarven)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
+ {name: "Dunirr (Dwarf)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "ironHills"}, // Dwarfs
+ {name: "Khazadur (Dwarf)", base: 35, odd: 1, sort: i => normalizedCellScore(i) + height[i], shield: "erebor"}, // Dwarfs
{name: "Kobold (Goblin)", base: 36, odd: 1, sort: i => temperature[i] - s[i], shield: "moriaOrc"}, // Goblin
- {name: "Uruk (Orkish)", base: 37, odd: 1, sort: i => height[i] * temperature[i], shield: "urukHai"}, // Orc
- {name: "Ugluk (Orkish)", base: 37, odd: 1.5, sort: i => (height[i] * temperature[i]) / biomeGoals(i, [1, 2, 10, 11]), shield: "moriaOrc"}, // Orc
+ {name: "Uruk (Orc)", base: 37, odd: 1, sort: i => height[i] * temperature[i], shield: "urukHai"}, // Orc
+ {name: "Ugluk (Orc)", base: 37, odd: 1.5, sort: i => (height[i] * temperature[i]) / biomeGoals(i, [1, 2, 10, 11]), shield: "moriaOrc"}, // Orc
{name: "Yotunn (Giants)", base: 38, odd: 0.7, sort: i => tempDiff(i, -10), shield: "pavise"}, // Giant
{name: "Rake (Drakonic)", base: 39, odd: 0.7, sort: i => -s[i], shield: "fantasy2"}, // Draconic
{name: "Arago (Arachnid)", base: 40, odd: 0.7, sort: i => temperature[i] - s[i], shield: "horsehead2"}, // Arachnid
diff --git a/modules/markers-generator.js b/modules/markers-generator.js
index b60c3599..334e1737 100644
--- a/modules/markers-generator.js
+++ b/modules/markers-generator.js
@@ -9,27 +9,30 @@ window.Markers = (function () {
const isFantasy = culturesSet.includes("Fantasy");
return [
- {type: "volcanoes", icon: "🌋", multiplier: 1, fn: addVolcanoes},
- {type: "hot-springs", icon: "♨️", multiplier: 1, fn: addHotSprings},
- {type: "mines", icon: "⛏️", multiplier: 1, fn: addMines},
- {type: "bridges", icon: "🌉", multiplier: 1, fn: addBridges},
- {type: "inns", icon: "🍻", multiplier: 1, fn: addInns},
+ {type: "volcanoes", icon: "🌋", multiplier: 10, fn: addVolcanoes},
+ {type: "hot-springs", icon: "♨️", multiplier: 20, fn: addHotSprings},
+ {type: "mines", icon: "⛏️", multiplier: 5, fn: addMines},
+ {type: "bridges", icon: "🌉", multiplier: 10, fn: addBridges},
+ {type: "inns", icon: "🍻", multiplier: 20, fn: addInns},
{type: "lighthouses", icon: "🚨", multiplier: 1, fn: addLighthouses},
- {type: "waterfalls", icon: "⟱", multiplier: 1, fn: addWaterfalls},
+ {type: "waterfalls", icon: "⟱", multiplier: 3, fn: addWaterfalls},
{type: "battlefields", icon: "⚔️", multiplier: 1, fn: addBattlefields},
- {type: "dungeons", icon: "🗝️", multiplier: 1, fn: addDungeons},
- {type: "lake-monsters", icon: "🐉", multiplier: 1, fn: addLakeMonsters},
- {type: "sea-monsters", icon: "🦑", multiplier: 1, fn: addSeaMonsters},
- {type: "hill-monsters", icon: "👹", multiplier: 1, fn: addHillMonsters},
- {type: "sacred-mountains", icon: "🗻", multiplier: 1, fn: addSacredMountains},
- {type: "sacred-forests", icon: "🌳", multiplier: 1, fn: addSacredForests},
- {type: "sacred-pineries", icon: "🌲", multiplier: 1, fn: addSacredPineries},
+ {type: "dungeons", icon: "🗝️", multiplier: 20, fn: addDungeons},
+ {type: "lake-monsters", icon: "🐉", multiplier: 2, fn: addLakeMonsters},
+ {type: "sea-monsters", icon: "🦑", multiplier: 5, fn: addSeaMonsters},
+ {type: "hill-monsters", icon: "👹", multiplier: 20, fn: addHillMonsters},
+ {type: "sacred-mountains", icon: "🗻", multiplier: 5, fn: addSacredMountains},
+ {type: "sacred-forests", icon: "🌳", multiplier: 10, fn: addSacredForests},
+ {type: "sacred-pineries", icon: "🌲", multiplier: 20, fn: addSacredPineries},
{type: "sacred-palm-groves", icon: "🌴", multiplier: 1, fn: addSacredPalmGroves},
- {type: "brigands", icon: "💰", multiplier: 1, fn: addBrigands},
- {type: "pirates", icon: "🏴☠️", multiplier: 1, fn: addPirates},
- {type: "statues", icon: "🗿", multiplier: 1, fn: addStatues},
- {type: "ruines", icon: "🏺", multiplier: 1, fn: addRuines},
- {type: "portals", icon: "🌀", multiplier: +isFantasy, fn: addPortals}
+ {type: "brigands", icon: "💰", multiplier: 5, fn: addBrigands},
+ {type: "pirates", icon: "🏴☠️", multiplier: 3, fn: addPirates},
+ {type: "statues", icon: "🗿", multiplier: 5, fn: addStatues},
+ {type: "ruines", icon: "🏺", multiplier: 10, fn: addRuines},
+ {type: "spiders", icon: "🕷️", multiplier: 25, fn: addHillMonsters},
+ {type: "giant goat heard", icon: "🐐", multiplier: 25, fn: addHillMonsters},
+ {type: "citadel", icon: "🏯", multiplier: 25, fn: addSacredPineries},
+ {type: "portals", icon: "🌀", multiplier: 4, fn: addPortals}
];
}
@@ -434,7 +437,7 @@ window.Markers = (function () {
const [cell] = extractAnyElement(taverns);
const id = addMarker({cell, icon, type, px: 14});
const typeName = P(0.3) ? "inn" : "tavern";
- const isAnimalThemed = P(0.7);
+ const isAnimalThemed = P(0.85);
const animal = ra(animals);
const name = isAnimalThemed ? (P(0.6) ? ra(colors) + " " + animal : ra(adjectives) + " " + animal) : ra(adjectives) + " " + capitalize(type);
const meal = isAnimalThemed && P(0.3) ? animal : ra(courses);
@@ -857,6 +860,7 @@ window.Markers = (function () {
}
}
+
function addPortals(type, icon, multiplier) {
const {burgs} = pack;
let portals = burgs
diff --git a/modules/save.js b/modules/save.js
index 04f3e665..ef3130ab 100644
--- a/modules/save.js
+++ b/modules/save.js
@@ -117,6 +117,7 @@ function getMapData() {
markers
].join("\r\n");
TIME && console.timeEnd("createMapData");
+ debugger
return mapData;
}
@@ -126,6 +127,7 @@ function dowloadMap() {
closeDialogs("#alert");
const mapData = getMapData();
+ debugger
const blob = new Blob([mapData], {type: "text/plain"});
const URL = window.URL.createObjectURL(blob);
const link = document.createElement("a");
diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js
index 70b8968a..cf278fb2 100644
--- a/modules/ui/burg-editor.js
+++ b/modules/ui/burg-editor.js
@@ -405,19 +405,64 @@ function editBurg(id) {
function updateMFCGFrame(burg) {
const mfcgURL = getMFCGlink(burg);
+ const burgGeneratorURL = getBurgLink(burg);
document.getElementById("mfcgPreview").setAttribute("src", mfcgURL);
document.getElementById("mfcgLink").setAttribute("href", mfcgURL);
+ document.getElementById("burgGenerator").setAttribute("href", burgGeneratorURL);
+ debug
}
function getBurgSeed(burg) {
return burg.MFCG || Number(`${seed}${String(burg.i).padStart(4, 0)}`);
}
+ function getBurgLink(burg) {
+ const {cells} = pack;
+ let burgCulture = pack.cultures[burg.culture].name.split('(')[1].split(')')[0];
+
+
+ const {name, population, cell} = burg;
+ const burgSeed = getBurgSeed(burg);
+ const sizeRaw = 0.43 * Math.pow((population * populationRate) / urbanDensity, 0.385);
+ const size = minmax(Math.ceil(sizeRaw), 2, 40);
+ const people = rn(population * populationRate * urbanization);
+ const hub = +cells.road[cell] > 50;
+ const river = cells.r[cell] ? 1 : 0;
+
+ const coast = +burg.port;
+ const citadel = +burg.citadel;
+ const walls = +burg.walls;
+ const plaza = +burg.plaza;
+ const temple = +burg.temple;
+ const shanty = +burg.shanty;
+
+ const sea = coast && cells.haven[cell] ? getSeaDirections(cell) : "";
+ function getSeaDirections(i) {
+ const p1 = cells.p[i];
+ const p2 = cells.p[cells.haven[i]];
+ let deg = (Math.atan2(p2[1] - p1[1], p2[0] - p1[0]) * 180) / Math.PI - 90;
+ if (deg < 0) deg += 360;
+ const norm = rn(normalize(deg, 0, 360) * 2, 2); // 0 = south, 0.5 = west, 1 = north, 1.5 = east
+ return "&sea=" + norm;
+ }
+ let townSize = "tiny";
+ if (people > 200) townSize = 'small';
+ if (people > 900) townSize = 'medium';
+ if (people > 2_000) townSize = 'average';
+ if (people > 5_500) townSize = 'big';
+ const baseURL = "http://localhost:9090/town/";
+ const url = `${baseURL}${name}-${burgCulture}/${townSize}`;
+
+ return url;
+
+
+ }
+
function getMFCGlink(burg) {
const {cells} = pack;
const {name, population, cell} = burg;
const burgSeed = getBurgSeed(burg);
const sizeRaw = 0.43 * Math.pow((population * populationRate) / urbanDensity, 0.385);
- const size = minmax(Math.ceil(sizeRaw), 2, 40);
+ const size = minmax(Math.ceil(sizeRaw), 2, 40)*3;
const people = rn(population * populationRate * urbanization);
const hub = +cells.road[cell] > 50;