Azgaar's
Fantasy Map Generator
- v. 0.9b
+ v. 1.0
LOADING...
Displayed layers:
-
-
- Texture -
- Heightmap -
- Biomes -
- Cells -
- Grid -
- Coordinates -
- Compass Rose -
- Rivers -
- Relief -
- Cultures -
- States -
- Borders -
- Routes -
- Temperature -
- Population -
- Precipitation -
- Labels -
- Icons -
- Markers +
- Texture +
- Heightmap +
- Biomes +
- Cells +
- Grid +
- Coordinates +
- Wind Rose +
- Rivers +
- Relief +
- Religions +
- Cultures +
- States +
- Provinces +
- Zones +
- Borders +
- Routes +
- Temperature +
- Population +
- Precipitation +
- Labels +
- Icons +
- Markers
- Rulers
- Scale Bar
User Interface:
@@ -1253,10 +1642,10 @@
@@ -1325,6 +1719,8 @@
+
+
@@ -1346,14 +1742,16 @@
@@ -1400,10 +1798,10 @@
Type: n/a
Precip: 0
- Population: 0 + Population: 0
Precip: 0
- Population: 0 + Population: 0
Height: 0
Temperature: 0
Biome: n/a
State: n/a
+ Province: n/a
Culture: n/a
+ Religion: n/a
Burg: n/a
Temperature: 0
Biome: n/a
State: n/a
+ Province: n/a
Culture: n/a
+ Religion: n/a
Burg: n/a
Fantasy Map Generator is a free open source tool which procedurally generates fantasy maps. You may use auto-generated maps as they are, edit them or even create a new map from scratch. Check out the quick start tutorial and project wiki for guidance.
-Join our Reddit Community if you have questions, need help, have a suggestion or want to share a created map. You may support the project on Patreon.
+Join our Discord server and Reddit community to ask questions, get help and share created maps. You may support the project on Patreon.
The project is under active development. For older versions see the changelog. To track the development progress see the devboard. Please report bugs here. You can also contact me directly via email.
A special thanks to all supporters!
-Supporters: Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Doug Churchman, Daniel Eric Crosby, DerGeisterbГär, 魏, Marcus Hellyrr and many others!
+Supporters: Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI and many others!
@@ -1434,52 +1832,63 @@
-
-
@@ -1549,7 +1956,7 @@
+
-
+
@@ -1561,6 +1968,7 @@
-
Mode:
+ Mode:
+
+ Set:
+
-
Size:
+ Size:
-
Radius:
+ Radius:
-
Spacing:
+ Spacing:
-
-
-
-
-
-
-
-
-
+
@@ -1710,6 +2168,7 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -1882,11 +2341,14 @@
Radius:
+ Radius:
-
Hill
-
- y:x:
- h:
- n:
+
+ Hill
+
+
+ y:
+ x:
+ h:
+ n:
@@ -1938,11 +2400,11 @@
+
-
-
@@ -1956,17 +2418,19 @@
Biome
- Habitability
- Cells
- Area
- Population
+ Biome
+ Habitability
+ Cells
+ Area
+ Population
+
-
@@ -1975,15 +2439,16 @@
+
-
+
+
-
-
@@ -1998,51 +2463,113 @@
State
- Capital
- Culture
- Type
- Expan.
- Cells
- Burgs
- Area
- Population
+ State
+ Form
+ Capital
+ Culture
+ Type
+ Expan.
+ Cells
+ Burgs
+ Area
+ Population
+
-
+
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
-
+
+
+
+
+
+
+
+ Province
+ Form
+ Capital
+ State
+ Area
+ Population
+
+
+
+ Provinces: 0
+ Mean area: 0
+ Mean population: 0
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ State:
+
+ + + +
+
+
+
+
+
+
+ State
+ Relations
+
+
+
+
+
+
+
+
-
-
+
Burg
- State
- Culture
+ Burg
+ State
+ Culture
Population
Type
State:
@@ -2069,11 +2596,11 @@
@@ -2087,20 +2614,25 @@
@@ -2140,22 +2672,95 @@
Culture
- Cells
- Expan.
+ Cells
+ Expan.
Type
- Area
- Population
+ Area
+ Population
Namesbase
+
-
+
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ Description
+ Cells
+ Area
+ Population
+
+
+
+ Zones: 0
+ Cells: 0
+ Area: 0
+ Population: 0
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+ + + + +
Select object:
-
+
Object name:
-
+
Legend:
- +
- +
-
-
-
-
+
+
+
+
+
+
+
@@ -2168,7 +2773,7 @@
+
+
+
+ Religion
+ Type
+ Form
+ Supreme Deity
+ Area
+ Population
+
+
+
+ Religions: 0
+ Land Area: 0
+ Population: 0
+
+
+
+
+
+
+
+
+ + +
+
+
+ + +
Distance unit:
- 1 map pixel =
-
-
- mi
+
+
+
Area unit:
-
+
@@ -2196,7 +2802,7 @@
-
Height unit:
-
-
-
+ ${l} `;
+ });
+
+ const el = g.append("text").attr("id", "stateLabel"+id)
+ .append("textPath").attr("xlink:href", "#textPath_stateLabel"+id)
+ .attr("startOffset", "50%").attr("font-size", ratio+"%").node();
+
+ el.insertAdjacentHTML("afterbegin", spans.join(""));
+ if (lines.length < 2) return;
+
+ // check whether multilined label is generally inside the strate. If no, replace with short name label
+ const cs = pack.cells.state, b = el.parentNode.getBBox();
+ const c1 = () => +cs[findCell(b.x, b.y)] === id;
+ const c2 = () => +cs[findCell(b.x + b.width / 2, b.y)] === id;
+ const c3 = () => +cs[findCell(b.x + b.width, b.y)] === id;
+ const c4 = () => +cs[findCell(b.x + b.width, b.y + b.height)] === id;
+ const c5 = () => +cs[findCell(b.x + b.width / 2, b.y + b.height)] === id;
+ const c6 = () => +cs[findCell(b.x, b.y + b.height)] === id;
+ if (c1() + c2() + c3() + c4() + c5() + c6() > 3) return; // generally inside
+
+ // use one-line name
+ const name = pathLength > s.fullName.length * 1.8 ? s.fullName : s.name;
+ example.text(name);
+ const left = example.node().getBBox().width / -2; // x offset
+ el.innerHTML = `${name} `;
+ ratio = Math.max(Math.min(rn(pathLength / name.length * 60), 130), 40);
+ el.setAttribute("font-size", ratio+"%");
});
+
+ example.remove();
}()
console.timeEnd("drawStateLabels");
}
- return {generate, expandStates, normalizeStates, drawBurgs, specifyBurgs, drawStateLabels};
+ // calculate states data like area, population etc.
+ const collectStatistics = function() {
+ console.time("collectStatistics");
+ const cells = pack.cells, states = pack.states;
+ states.forEach(s => {
+ s.cells = s.area = s.burgs = s.rural = s.urban = 0;
+ s.neighbors = new Set();
+ });
+
+ for (const i of cells.i) {
+ if (cells.h[i] < 20) continue;
+ const s = cells.state[i];
+
+ // check for neighboring states
+ cells.c[i].filter(c => cells.h[c] >= 20 && cells.state[c] !== s).forEach(c => states[s].neighbors.add(cells.state[c]));
+
+ // collect stats
+ states[s].cells += 1;
+ states[s].area += cells.area[i];
+ states[s].rural += cells.pop[i];
+ if (cells.burg[i]) {
+ states[s].urban += pack.burgs[cells.burg[i]].population;
+ states[s].burgs++;
+ }
+ }
+
+ console.timeEnd("collectStatistics");
+ }
+
+ const assignColors = function() {
+ console.time("assignColors");
+ const colors = ["#66c2a5", "#fc8d62", "#8da0cb", "#e78ac3", "#a6d854", "#ffd92f"]; // d3.schemeSet2;
+
+ // assin basic color using greedy coloring algorithm
+ pack.states.forEach(s => {
+ if (!s.i || s.removed) return;
+ const neibs = Array.from(s.neighbors);
+ s.color = colors.find(c => neibs.every(n => pack.states[n].color !== c));
+ if (!s.color) s.color = getRandomColor();
+ colors.push(colors.shift());
+ });
+
+ // randomize each already used color a bit
+ colors.forEach(c => {
+ const sameColored = pack.states.filter(s => s.color === c);
+ sameColored.forEach((s, d) => {
+ if (!d) return;
+ s.color = getMixedColor(s.color);
+ });
+ });
+
+ console.timeEnd("assignColors");
+ }
+
+ // generate Diplomatic Relationships
+ const generateDiplomacy = function() {
+ console.time("generateDiplomacy");
+ const cells = pack.cells, states = pack.states;
+ const valid = states.filter(s => s.i && !states.removed);
+ if (valid.length < 2) return;
+
+ const neibs = {"Ally":1, "Sympathy":2, "Neutral":1, "Suspicion":10, "Rival":9}; // relations to neighbors
+ const neibsOfNeibs = {"Ally":10, "Sympathy":8, "Neutral":5, "Suspicion":1}; // relations to neighbors of neighbors
+ const far = {"Sympathy":1, "Neutral":12, "Suspicion":2, "Unknown":6}; // relations to other
+ const navals = {"Neutral":1, "Suspicion":2, "Rival":1, "Unknown":1}; // relations of naval powers
+
+ valid.forEach(s => s.diplomacy = new Array(states.length).fill("x")); // clear all relationships
+ const chronicle = states[0].diplomacy = [];
+ const areaMean = d3.mean(valid.map(s => s.area)); // avarage state area
+
+ // generic relations
+ for (let f=1; f < states.length; f++) {
+ if (states[f].removed) continue;
+
+ if (states[f].diplomacy.includes("Vassal")) {
+ // Vassals copy relations from their Suzerains
+ const suzerain = states[f].diplomacy.indexOf("Vassal");
+
+ for (let i=1; i < states.length; i++) {
+ if (i === f || i === suzerain) continue;
+ states[f].diplomacy[i] = states[suzerain].diplomacy[i];
+ if (states[suzerain].diplomacy[i] === "Suzerain") states[f].diplomacy[i] = "Ally";
+ for (let e=1; e < states.length; e++) {
+ if (e === f || e === suzerain) continue;
+ if (states[e].diplomacy[suzerain] === "Suzerain" || states[e].diplomacy[suzerain] === "Vassal") continue;
+ states[e].diplomacy[f] = states[e].diplomacy[suzerain];
+ }
+ }
+ continue;
+ }
+
+ for (let t=f+1; t < states.length; t++) {
+ if (states[t].removed) continue;
+
+ if (states[t].diplomacy.includes("Vassal")) {
+ const suzerain = states[t].diplomacy.indexOf("Vassal");
+ states[f].diplomacy[t] = states[f].diplomacy[suzerain];
+ continue;
+ };
+
+ const naval = states[f].type === "Naval" && states[t].type === "Naval" && cells.f[states[f].center] !== cells.f[states[t].center];
+ const neib = naval ? false : states[f].neighbors.has(t);
+ const neibOfNeib = naval || neib ? false : [...states[f].neighbors].map(n => [...states[n].neighbors]).join().includes(t);
+
+ let status = naval ? rw(navals) : neib ? rw(neibs) : neibOfNeib ? rw(neibsOfNeibs) : rw(far);
+
+ // add Vassal
+ if (neib && Math.random() < .8 && states[f].area > areaMean && states[t].area < areaMean && states[f].area / states[t].area > 2) status = "Vassal";
+ states[f].diplomacy[t] = status === "Vassal" ? "Suzerain" : status;
+ states[t].diplomacy[f] = status;
+ }
+ }
+
+ // declare wars
+ for (let attacker=1; attacker < states.length; attacker++) {
+ const ad = states[attacker].diplomacy; // attacker relations;
+ if (states[attacker].removed) continue;
+ if (!ad.includes("Rival")) continue; // no rivals to attack
+ if (ad.includes("Vassal")) continue; // not independent
+ if (ad.includes("Enemy")) continue; // already at war
+
+ // random independent rival
+ const defender = ra(ad.map((r, d) => r === "Rival" && !states[d].diplomacy.includes("Vassal") ? d : 0).filter(d => d));
+ let ap = states[attacker].area * states[attacker].expansionism, dp = states[defender].area * states[defender].expansionism;
+ if (ap < dp * gauss(1.6, .8, 0, 10, 2)) continue; // defender is too strong
+ const an = states[attacker].name, dn = states[defender].name; // names
+ const attackers = [attacker], defenders = [defender]; // attackers and defenders array
+ const dd = states[defender].diplomacy; // defender relations;
+
+ // start a war
+ const war = [`${an}-${trimVowels(dn)}ian War`,`${an} declared a war on its rival ${dn}`];
+
+ // attacker vassals join the war
+ ad.forEach((r, d) => {if (r === "Suzerain") {
+ attackers.push(d);
+ war.push(`${an}'s vassal ${states[d].name} joined the war on attackers side`);
+ }});
+
+ // defender vassals join the war
+ dd.forEach((r, d) => {if (r === "Suzerain") {
+ defenders.push(d);
+ war.push(`${dn}'s vassal ${states[d].name} joined the war on defenders side`);
+ }});
+
+ ap = d3.sum(attackers.map(a => states[a].area * states[a].expansionism)); // attackers joined power
+ dp = d3.sum(defenders.map(d => states[d].area * states[d].expansionism)); // defender joined power
+
+ // defender allies join
+ dd.forEach((r, d) => {
+ if (r !== "Ally" || states[d].diplomacy.includes("Vassal")) return;
+ if (states[d].diplomacy[attacker] !== "Rival" && ap / dp > (2 * gauss(1.6, .8, 0, 10, 2))) {
+ const reason = states[d].diplomacy.includes("Enemy") ? `Being already at war,` : `Frightened by ${an},`;
+ war.push(`${reason} ${states[d].name} severed the defense pact with ${dn}`);
+ dd[d] = states[d].diplomacy[defender] = "Suspicion";
+ return;
+ }
+ defenders.push(d);
+ dp += states[d].area * states[d].expansionism;
+ war.push(`${dn}'s ally ${states[d].name} joined the war on defenders side`);
+
+ // ally vassals join
+ states[d].diplomacy.map((r, d) => r === "Suzerain" ? d : 0).filter(d => d).forEach(v => {
+ defenders.push(v);
+ dp += states[v].area * states[v].expansionism;
+ war.push(`${states[d].name}'s vassal ${states[v].name} joined the war on defenders side`);
+ });
+ });
+
+ // attacker allies join if the defender is their rival or joined power > defenders power and defender is not an ally
+ ad.forEach((r, d) => {
+ if (r !== "Ally" || states[d].diplomacy.includes("Vassal") || defenders.includes(d)) return;
+ const name = states[d].name;
+ if (states[d].diplomacy[defender] !== "Rival" && (Math.random() < .2 || ap <= dp * 1.2)) {war.push(`${an}'s ally ${name} avoided entering the war`); return;}
+ const allies = states[d].diplomacy.map((r, d) => r === "Ally" ? d : 0).filter(d => d);
+ if (allies.some(ally => defenders.includes(ally))) {war.push(`${an}'s ally ${name} did not join the war as its allies are in war on both sides`); return;};
+
+ attackers.push(d);
+ ap += states[d].area * states[d].expansionism;
+ war.push(`${an}'s ally ${name} joined the war on attackers side`);
+
+ // ally vassals join
+ states[d].diplomacy.map((r, d) => r === "Suzerain" ? d : 0).filter(d => d).forEach(v => {
+ attackers.push(v);
+ dp += states[v].area * states[v].expansionism;
+ war.push(`${states[d].name}'s vassal ${states[v].name} joined the war on attackers side`);
+ });
+ });
+
+ // change relations to Enemy for all participants
+ attackers.forEach(a => defenders.forEach(d => states[a].diplomacy[d] = states[d].diplomacy[a] = "Enemy"));
+ chronicle.push(war); // add a record to diplomatical history
+ }
+
+ console.timeEnd("generateDiplomacy");
+ //console.table(states.map(s => s.diplomacy));
+ }
+
+ // select a forms for listed or all valid states
+ const defineStateForms = function(list) {
+ console.time("defineStateForms");
+ const states = pack.states.filter(s => s.i && !s.removed);
+ if (states.length < 1) return;
+
+ const generic = {Monarchy:25, Republic:2, Union:1, Theocracy:2};
+ const naval = {Monarchy:25, Republic:8, Union:3, Theocracy:1};
+ const genericArray = [], navalArray = []; // turn weighted array into simple array
+ for (const t in generic) {for (let j=0; j < generic[t]; j++) {genericArray.push(t);}}
+ for (const t in naval) {for (let j=0; j < naval[t]; j++) {navalArray.push(t);}}
+
+ const median = d3.median(pack.states.map(s => s.area));
+ const empireMin = states.map(s => s.area).sort((a, b) => b - a)[Math.max(Math.ceil(states.length ** .4) - 2, 0)];
+ const expTiers = pack.states.map(s => {
+ let tier = Math.min(Math.floor(s.area / median * 2.6), 4);
+ if (tier === 4 && s.area < empireMin) tier = 3;
+ return tier;
+ });
+
+ const monarchy = ["Duchy", "Grand Duchy", "Principality", "Kingdom", "Empire"]; // per expansionism tier
+ const republic = {Republic:70, Federation:2, Oligarchy:2, Tetrarchy:1, Triumvirate:1, Diarchy:1, "Trade Company":3}; // weighted random
+ const union = {Union:3, League:4, Confederation:1, "United Kingdom":1, "United Republic":1, "United Provinces":2, Commonwealth:1, Heptarchy:1}; // weighted random
+
+ for (const s of states) {
+ if (list && !list.includes(s.i)) continue;
+ s.form = s.type === "Naval" ? ra(navalArray) : ra(genericArray);
+ s.formName = selectForm(s);
+ s.fullName = getFullName(s);
+ }
+
+ function selectForm(s) {
+ const base = pack.cultures[s.culture].base;
+ if (s.type === "Nomadic" && Math.random() < .3) return "Horde"; // some nomadic states
+
+ if (s.form === "Monarchy") {
+ const form = monarchy[expTiers[s.i]];
+ // Default name depend on exponent tier, some culture bases have special names for tiers
+ if (form === "Duchy" && s.neighbors.size > 1 && rand(6) < s.neighbors.size && s.diplomacy.includes("Vassal")) return "Marches"; // some vassal dutchies on borderland
+ if (Math.random() < .3 && s.diplomacy.includes("Vassal")) return "Protectorate"; // some vassals
+
+ if (base === 16 && (form === "Empire" || form === "Kingdom")) return "Sultanate"; // Turkic
+ if (base === 5 && (form === "Empire" || form === "Kingdom")) return "Tsardom"; // Ruthenian
+ if (base === 31 && (form === "Empire" || form === "Kingdom")) return "Khaganate"; // Mongolian
+ if ([18, 17].includes(base) && form === "Empire") return "Caliphate"; // Arabic, Berber
+ if (base === 18 && (form === "Grand Duchy" || form === "Duchy")) return "Emirate"; // Arabic
+ if (base === 7 && (form === "Grand Duchy" || form === "Duchy")) return "Despotate"; // Greek
+ if (base === 31 && (form === "Grand Duchy" || form === "Duchy")) return "Ulus"; // Mongolian
+ if (base === 16 && (form === "Grand Duchy" || form === "Duchy")) return "Beylik"; // Turkic
+ if (base === 24 && (form === "Grand Duchy" || form === "Duchy")) return "Satrapy"; // Iranian
+ return form;
+ }
+
+ if (s.form === "Republic") {
+ // Default name is from weighted array, special case for small states with only 1 burg
+ if (expTiers[s.i] < 2 && s.burgs === 1) {
+ if (trimVowels(s.name) === trimVowels(pack.burgs[s.capital].name)) {
+ s.name = pack.burgs[s.capital].name;
+ return "Free City";
+ }
+ if (Math.random() < .3) return "City-state";
+ }
+ return rw(republic);
+ }
+
+ if (s.form === "Union") return rw(union);
+
+ if (s.form === "Theocracy") {
+ // Default name is "Theocracy", some culture bases have special names
+ if ([0, 1, 2, 3, 4, 6, 8, 9, 13, 15, 20].includes(base)) return "Diocese"; // Euporean
+ if ([7, 5].includes(base)) return "Eparchy"; // Greek, Ruthenian
+ if ([21, 16].includes(base)) return "Imamah"; // Nigerian, Turkish
+ if ([18, 17, 28].includes(base)) return "Caliphate"; // Arabic, Berber, Swahili
+ return "Theocracy";
+ }
+ }
+
+ console.timeEnd("defineStateForms");
+ }
+
+ const getFullName = function(s) {
+ if (!s.formName) return s.name;
+ if (!s.name && s.formName) return "The " + s.formName;
+ // state forms requiring Adjective + Name, all other forms use scheme Form + Of + Name
+ const adj = ["Empire", "Sultanate", "Khaganate", "Caliphate", "Despotate", "Theocracy", "Oligarchy", "Union", "Confederation", "Trade Company", "League", "Tetrarchy", "Triumvirate", "Diarchy", "Horde"];
+ return adj.includes(s.formName) ? getAdjective(s.name) + " " + s.formName : s.formName + " of " + s.name;
+ }
+
+ const generateProvinces = function(regenerate) {
+ console.time("generateProvinces");
+ const localSeed = regenerate ? Math.floor(Math.random() * 1e9).toString() : seed;
+ Math.seedrandom(localSeed);
+
+ const cells = pack.cells, states = pack.states, burgs = pack.burgs;
+ const provinces = pack.provinces = [0];
+ cells.province = new Uint16Array(cells.i.length); // cell state
+ const percentage = +provincesInput.value;
+ if (states.length < 2 || !percentage) return; // no provinces
+ const max = gauss(400, 50, 300, 500) / percentage ** .5; // max growth in 300-30 range
+
+ const forms = {
+ Monarchy:{County:11, Earldom:3, Shire:1, Landgrave:1, Margrave:1, Barony:1},
+ Republic:{Province:6, Department:2, Governorate:2, State:1, Canton:1, Prefecture:1},
+ Theocracy:{Parish:5, Deanery:3, Province:2, Council:1, District:1},
+ Union:{Province:2, State:1, Canton:1, Republic:1, County:1},
+ Wild:{Territory:6, Land:3, Province:1, Region:1}
+ }
+
+ // generate provinces for a selected burgs
+ Math.seedrandom(localSeed);
+ states.forEach(s => {
+ s.provinces = [];
+ if (!s.i || s.removed) return;
+ const stateBurgs = burgs.filter(b => b.state === s.i && !b.removed).sort((a, b) => b.population * gauss(1, .2, .5, 1.5, 3) - a.population);
+ if (stateBurgs.length < 2) return; // at least 2 provinces are required
+ const provincesNumber = Math.max(Math.ceil(stateBurgs.length * percentage / 100), 2);
+ const form = Object.assign({}, forms[s.form]);
+
+ for (let i=0; i < provincesNumber; i++) {
+ const province = provinces.length;
+ s.provinces.push(province);
+ const center = stateBurgs[i].cell;
+ const burg = stateBurgs[i].i;
+ const c = stateBurgs[i].culture;
+ const name = Math.random() < .5 ? Names.getState(Names.getCultureShort(c), c) : stateBurgs[i].name;
+ const formName = rw(form);
+ form[formName] += 5;
+ const fullName = name + " " + formName;
+ const color = getMixedColor(s.color);
+ provinces.push({i:province, state:s.i, center, burg, name, formName, fullName, color});
+ }
+ });
+
+ // expand generated provinces
+ const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p});
+ const cost = [];
+ provinces.forEach(function(p) {
+ if (!p.i || p.removed) return;
+ cells.province[p.center] = p.i;
+ queue.queue({e:p.center, p:0, province:p.i, state:p.state});
+ cost[p.center] = 1;
+ //debug.append("circle").attr("cx", cells.p[p.center][0]).attr("cy", cells.p[p.center][1]).attr("r", .3).attr("fill", "red");
+ });
+
+ while (queue.length) {
+ const next = queue.dequeue(), n = next.e, p = next.p, province = next.province, state = next.state;
+ cells.c[n].forEach(function(e) {
+ const land = cells.h[e] >= 20;
+ if (!land && !cells.t[e]) return; // cannot pass deep ocean
+ if (land && cells.state[e] !== state) return;
+ const evevation = cells.h[e] >= 70 ? 100 : cells.h[e] >= 50 ? 30 : cells.h[e] >= 20 ? 10 : 100;
+ const totalCost = p + evevation;
+
+ if (totalCost > max) return;
+ if (!cost[e] || totalCost < cost[e]) {
+ if (land) cells.province[e] = province; // assign province to a cell
+ cost[e] = totalCost;
+ queue.queue({e, p:totalCost, province, state});
+ }
+ });
+ }
+
+ // justify provinces shapes a bit
+ for (const i of cells.i) {
+ if (cells.burg[i]) continue; // do not overwrite burgs
+ const neibs = cells.c[i].filter(c => cells.state[c] === cells.state[i]).map(c => cells.province[c]);
+ const adversaries = neibs.filter(c => c !== cells.province[i]);
+ if (adversaries.length < 2) continue;
+ const buddies = neibs.filter(c => c === cells.province[i]).length;
+ if (buddies.length > 2) continue;
+ const competitors = adversaries.map(p => adversaries.reduce((s, v) => v === p ? s+1 : s, 0));
+ const max = d3.max(competitors);
+ if (buddies >= max) continue;
+ cells.province[i] = adversaries[competitors.indexOf(max)];
+ //debug.append("circle").attr("cx", cells.p[i][0]).attr("cy", cells.p[i][1]).attr("r", .5);
+ }
+
+ // add "wild" provinces if some cells don't have a province assigned
+ const noProvince = Array.from(cells.i).filter(i => cells.state[i] && !cells.province[i]); // cells without province assigned
+ states.forEach(s => {
+ if (!s.provinces.length) return;
+ let stateNoProvince = noProvince.filter(i => cells.state[i] === s.i && !cells.province[i]);
+ while (stateNoProvince.length) {
+ // add new province
+ const province = provinces.length;
+ const burgCell = stateNoProvince.find(i => cells.burg[i]);
+ const center = burgCell ? burgCell : stateNoProvince[0];
+ const burg = burgCell ? cells.burg[burgCell] : 0;
+ cells.province[center] = province;
+ //debug.append("circle").attr("cx", cells.p[center][0]).attr("cy", cells.p[center][1]).attr("r", .3).attr("fill", "blue");
+
+ // expand province
+ const cost = []; cost[center] = 1;
+ queue.queue({e:center, p:0});
+ while (queue.length) {
+ const next = queue.dequeue(), n = next.e, p = next.p;
+
+ // debug.append("circle").attr("cx", cells.p[n][0]).attr("cy", cells.p[n][1]).attr("r", .5);
+ // debug.append("text").attr("x", cells.p[n][0]).attr("y", cells.p[n][1]).text(p).attr("font-size", 2).attr("fill", "white");
+
+ cells.c[n].forEach(function(e) {
+ if (cells.province[e]) return;
+ const land = cells.h[e] >= 20;
+ if (cells.state[e] && cells.state[e] !== s.i) return;
+ const ter = land ? cells.state[e] === s.i ? 3 : 20 : cells.t[e] ? 10 : 30;
+ const totalCost = p + ter;
+
+ if (totalCost > max) return;
+ if (!cost[e] || totalCost < cost[e]) {
+ if (land && cells.state[e] === s.i) cells.province[e] = province; // assign province to a cell
+ cost[e] = totalCost;
+ queue.queue({e, p:totalCost});
+ }
+ });
+ }
+
+ // generate "wild" province name
+ const c = cells.culture[center];
+ const name = burgCell && Math.random() < .5 ? burgs[burg].name : Names.getState(Names.getCultureShort(c), c);
+ const f = pack.features[cells.f[center]];
+ const provCells = stateNoProvince.filter(i => cells.province[i] === province);
+ const singleIsle = provCells.length === f.cells && !provCells.find(i => cells.f[i] !== f.i);
+ const isleGroup = !singleIsle && !provCells.find(i => pack.features[cells.f[i]].group !== "isle");
+ const colony = !singleIsle && !isleGroup && Math.random() < .5 && !isPassable(s.center, center);
+ const formName = singleIsle ? "Island" : isleGroup ? "Islands" : colony ? "Colony" : rw(forms["Wild"]);
+ const fullName = name + " " + formName;
+ const color = getMixedColor(s.color);
+ provinces.push({i:province, state:s.i, center, burg, name, formName, fullName, color});
+ s.provinces.push(province);
+
+ // check if there is a land way within the same state between two cells
+ function isPassable(from, to) {
+ if (cells.f[from] !== cells.f[to]) return false; // on different islands
+ const queue = [from], used = new Uint8Array(cells.i.length), state = cells.state[from];
+ while (queue.length) {
+ const current = queue.pop();
+ if (current === to) return true; // way is found
+ cells.c[current].forEach(c => {
+ if (used[c] || cells.h[c] < 20 || cells.state[c] !== state) return;
+ queue.push(c);
+ used[c] = 1;
+ });
+ }
+ return false; // way is not found
+ }
+
+ // re-check
+ stateNoProvince = noProvince.filter(i => cells.state[i] === s.i && !cells.province[i]);
+ }
+ });
+
+ //if (s.i == 1) debug.append("circle").attr("cx", cells.p[n][0]).attr("cy", cells.p[n][1]).attr("r", .5);
+ //debug.append("text").attr("x", cells.p[n][0]).attr("y", cells.p[n][1]).text(s.i).attr("font-size", 3);
+
+ // debug.selectAll(".text").data(cells.i).enter().append("text")
+ // .attr("x", d => cells.p[d][0]).attr("y", d => cells.p[d][1])
+ // .text(d => cells.province[d] ? cells.province[d] : null).attr("font-size", 3);
+
+ console.timeEnd("generateProvinces");
+ }
+
+ return {generate, expandStates, normalizeStates, assignColors,
+ drawBurgs, specifyBurgs, drawStateLabels, collectStatistics,
+ generateDiplomacy, defineStateForms, getFullName, generateProvinces};
})));
diff --git a/modules/cultures-generator.js b/modules/cultures-generator.js
index b5addfbd..683ff68c 100644
--- a/modules/cultures-generator.js
+++ b/modules/cultures-generator.js
@@ -9,29 +9,29 @@
const generate = function() {
console.time('generateCultures');
cells = pack.cells;
- cells.culture = new Int8Array(cells.i.length); // cell cultures
+ cells.culture = new Uint16Array(cells.i.length); // cell cultures
let count = +culturesInput.value;
const populated = cells.i.filter(i => cells.s[i]).sort((a, b) => cells.s[b] - cells.s[a]); // cells sorted by population
if (populated.length < count * 25) {
count = Math.floor(populated.length / 50);
if (!count) {
- console.error(`There is no populated cells. Cannot generate cultures`);
+ console.warn(`There are no populated cells. Cannot generate cultures`);
pack.cultures = [{name:"Wildlands", i:0, base:1}];
alertMessage.innerHTML = `
The climate is harsh and people cannot live in this world.
No cultures, states and burgs will be created.
- Please consider changing the World Configurator settings`; + Please consider changing climate settings in the World Configurator`; $("#alert").dialog({resizable: false, title: "Extreme climate warning", buttons: {Ok: function() {$(this).dialog("close");}} }); return; } else { - console.error(`Not enought populated cells (${populated.length}). Will generate only ${count} cultures`); + console.warn(`Not enought populated cells (${populated.length}). Will generate only ${count} cultures`); alertMessage.innerHTML = ` - There is only ${populated.length} populated cells and it's insufficient livable area.
- Only ${count} out of ${culturesInput.value} requiested cultures will be generated.
- Please consider changing the World Configurator settings`; + There are only ${populated.length} populated cells and it's insufficient livable area.
+ Only ${count} out of ${culturesInput.value} requested cultures will be generated.
+ Please consider changing climate settings in the World Configurator`; $("#alert").dialog({resizable: false, title: "Extreme climate warning", buttons: {Ok: function() {$(this).dialog("close");}} }); @@ -82,11 +82,12 @@ return center; } + // set culture type based on culture center position function defineCultureType(i) { if (cells.h[i] > 50) return "Highland"; // no penalty for hills and moutains, high for other elevations - const f = cells.f[cells.haven[i]]; - if (pack.features[f].type === "lake" && pack.features[f].cells > 5) return "Lake" // low water cross penalty and high for non-along-coastline growth - if (cells.harbor[i] === 1) return "Naval"; // low water cross penalty and high for non-along-coastline growth + const f = pack.features[cells.f[cells.haven[i]]]; // feature + if (f.type === "lake" && f.cells > 5) return "Lake" // low water cross penalty and high for non-along-coastline growth + if ((f.cells < 10 && cells.harbor[i]) || (cells.harbor[i] === 1 && Math.random() < .5)) return "Naval"; // low water cross penalty and high for non-along-coastline growth if (cells.r[i] && cells.fl[i] > 100) return "River"; // no River cross penalty, penalty for non-River growth const b = cells.biome[i]; if (b === 4 || b === 1 || b === 2) return "Nomadic"; // high penalty in forest biomes and near coastline @@ -99,9 +100,9 @@ if (type === "Lake") base = .8; else if (type === "Naval") base = 1.5; else if (type === "River") base = .9; else - if (type === "Nomadic") base = 1.8; else + if (type === "Nomadic") base = 1.5; else if (type === "Hunting") base = .7; else - if (type === "Highland") base = .5; + if (type === "Highland") base = 1.2; return rn((Math.random() * powerInput.value / 2 + 1) * base, 1); } @@ -164,7 +165,7 @@ cells.c[n].forEach(function(e) { const biome = cells.biome[e]; const biomeCost = getBiomeCost(c, biome, type); - const biomeChangeCost = biome === cells.biome[n] ? 0 : 5 * Math.abs(biome - cells.biome[n]); // penalty on biome change + const biomeChangeCost = biome === cells.biome[n] ? 0 : 20; // penalty on biome change const heightCost = getHeightCost(e, cells.h[e], type); const riverCost = getRiverCost(cells.r[e], e, type); const typeCost = getTypeCost(cells.t[e], type); @@ -188,25 +189,28 @@ } function getBiomeCost(c, biome, type) { - if (cells.biome[pack.cultures[c].center] === biome) return biomesData.cost[biome] / 2; // tiny penalty for native biome + if (cells.biome[pack.cultures[c].center] === biome) return 10; // tiny penalty for native biome if (type === "Hunting") return biomesData.cost[biome] * 5; // non-native biome penalty for hunters if (type === "Nomadic" && biome > 4 && biome < 10) return biomesData.cost[biome] * 10; // forest biome penalty for nomads return biomesData.cost[biome] * 2; // general non-native biome penalty } function getHeightCost(i, h, type) { - if ((type === "Naval" || type === "Lake") && h < 20) return cells.area[i]; // low sea crossing penalty for Navals - if (type === "Nomadic" && h < 20) return cells.area[i] * 50; // giant sea crossing penalty for Navals - if (h < 20) return cells.area[i] * 5; // general sea crossing penalty - if (type === "Highland" && h < 50) return 30; // penalty for highlanders on lowlands + const f = pack.features[cells.f[i]], a = cells.area[i]; + if (type === "Lake" && f.type === "lake") return 10; // no lake crossing penalty for Lake cultures + if (type === "Naval" && h < 20) return a * 2; // low sea/lake crossing penalty for Naval cultures + if (type === "Nomadic" && h < 20) return a * 50; // giant sea/lake crossing penalty for Nomads + if (h < 20) return a * 6; // general sea/lake crossing penalty + if (type === "Highland" && h < 44) return 3000; // giant penalty for highlanders on lowlands + if (type === "Highland" && h < 62) return 200; // giant penalty for highlanders on lowhills if (type === "Highland") return 0; // no penalty for highlanders on highlands - if (h >= 70) return 100; // general mountains crossing penalty - if (h >= 50) return 30; // general hills crossing penalty + if (h >= 67) return 200; // general mountains crossing penalty + if (h >= 44) return 30; // general hills crossing penalty return 0; } function getRiverCost(r, i, type) { - if (type === "River") return r ? 0 : 50; // penalty for river cultures + if (type === "River") return r ? 0 : 100; // penalty for river cultures if (!r) return 0; // no penalty for others if there is no river return Math.min(Math.max(cells.fl[i] / 10, 20), 100) // river penalty from 20 to 100 based on flux } diff --git a/modules/names-generator.js b/modules/names-generator.js index e1a90ba4..8c13ca2f 100644 --- a/modules/names-generator.js +++ b/modules/names-generator.js @@ -45,14 +45,14 @@ const data = chains[base]; if (!data || data[" "] === undefined) { - tip("Namesbase " + base + " is incorrect. Please checl in namesbase editor", false, "error"); + tip("Namesbase " + base + " is incorrect. Please check in namesbase editor", false, "error"); console.error("nameBase " + base + " is incorrect!"); return "ERROR"; } if (!min) min = nameBases[base].min; if (!max) max = nameBases[base].max; - if (!dupl) dupl = nameBases[base].d; + if (dupl !== "") dupl = nameBases[base].d; if (!multi) multi = nameBases[base].m; let v = data[" "], cur = v[rand(v.length-1)], w = ""; @@ -82,12 +82,14 @@ if (r.slice(-1) === " ") return r + c.toUpperCase(); if (c === "a" && d[i+1] === "e") return r; // "ae" => "e" if (c === " " && i+1 === d.length) return r; - // remove consonant before 2 consonants - if (i+2 < d.length && !vowel(c) && !vowel(d[i+1]) && !vowel(d[i+2])) return r; + if (i+2 < d.length && !vowel(c) && !vowel(d[i+1]) && !vowel(d[i+2])) return r; // remove consonant before 2 consonants if (i+2 < d.length && c === d[i+1] && c === d[i+2]) return r; // remove tree same letters in a row return r + c; }, ""); + // join the word if any part has only 1 letter + if (name.split(" ").some(part => part.length < 2)) name = name.split(" ").map((p,i) => i ? p.toLowerCase() : p).join(""); + if (name.length < 2) name = nameBase[base][rand(nameBase[base].length-1)]; // rare case when no name generated return name; } @@ -99,6 +101,15 @@ return getBase(base, min, max, dupl, multi); } + // generate short name for culture + const getCultureShort = function(culture) { + if (culture === undefined) {console.error("Please define a culture"); return;} + const base = pack.cultures[culture].base; + const min = nameBases[base].min-1; + const max = Math.max(nameBases[base].max-2, min); + return getBase(base, min, max, "", 0); + } + // generate state name based on capital or random name and culture-specific suffix const getState = function(name, culture) { if (name === undefined) {console.error("Please define a base name"); return;} @@ -145,8 +156,9 @@ const s1 = suffix.charAt(0); if (name.slice(-1) === s1) name = name.slice(0, -1); // remove name last letter if it's a suffix first letter if (vowel(s1) === vowel(name.slice(-1)) && vowel(s1) === vowel(name.slice(-2,-1))) name = name.slice(0, -1); // remove name last char if 2 last chars are the same type as suffix's 1st + if (name.slice(-1) === s1) name = name.slice(0, -1); // remove name last letter if it's a suffix first letter return name + suffix; } - return {getBase, getCulture, getState, updateChain, updateChains}; + return {getBase, getCulture, getCultureShort, getState, updateChain, updateChains}; }))); diff --git a/modules/relief-icons.js b/modules/relief-icons.js index 72e4dd1d..2ad4404f 100644 --- a/modules/relief-icons.js +++ b/modules/relief-icons.js @@ -36,7 +36,7 @@ let h = rn((4 + Math.random()) * size, 2); const icon = getBiomeIcon(i, biomesData.icons[b]); if (icon === "#relief-grass-1") h *= 1.3; - relief.push({t: icon, c: i, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); + relief.push({i: icon, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); } } @@ -46,7 +46,7 @@ for (const [cx, cy] of poissonDiscSampler(e[0], e[1], e[2], e[3], radius)) { if (!d3.polygonContains(polygon, [cx, cy])) continue; - relief.push({t: icon, c: i, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); + relief.push({i: icon, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); } } @@ -54,9 +54,8 @@ const temp = grid.cells.temp[pack.cells.g[i]]; const type = h > 70 && temp < 0 ? "mountSnow" : h > 70 ? "mount" : "hill"; const size = h > 70 ? (h - 45) * mod : Math.min(Math.max((h - 40) * mod, 3), 6); - return ["#relief-" + type + "-" + getIcon(type), size]; + return [getIcon(type), size]; } - } // sort relief icons by y+size @@ -65,22 +64,24 @@ // append relief icons at once using pure js void function renderRelief() { let reliefHTML = ""; - for (const r of relief) {reliefHTML += ``;} + for (const r of relief) { + reliefHTML += ``; + } terrain.html(reliefHTML); }() console.timeEnd('drawRelief'); } - + function getBiomeIcon(i, b) { let type = b[Math.floor(Math.random() * b.length)]; const temp = grid.cells.temp[pack.cells.g[i]]; if (type === "conifer" && temp < 0) type = "coniferSnow"; - return "#relief-" + type + "-" + getIcon(type); + return getIcon(type); } - function getIcon(type) { - switch (type) { + function getVariant(type) { + switch(type) { case "mount": return rand(2,7); case "mountSnow": return rand(1,6); case "hill": return rand(2,5); @@ -92,7 +93,25 @@ default: return 2; } } - + + function getOldIcon(type) { + switch(type) { + case "mountSnow": return "mount"; + case "vulcan": return "mount"; + case "coniferSnow": return "conifer"; + case "cactus": return "dune"; + case "deadTree": return "dune"; + default: return type; + } + } + + function getIcon(type) { + if (styleReliefSet.value === "simple") return "#relief-" + getOldIcon(type) + "-1"; + if (styleReliefSet.value === "colored") return "#relief-" + type + "-" + getVariant(type); + if (styleReliefSet.value === "gray") return "#relief-" + type + "-" + getVariant(type) + "-bw"; + return "#relief-" + getOldIcon(type) + "-1"; // simple + } + return ReliefIcons; }))); \ No newline at end of file diff --git a/modules/religions-generator.js b/modules/religions-generator.js new file mode 100644 index 00000000..24c0327d --- /dev/null +++ b/modules/religions-generator.js @@ -0,0 +1,310 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global.Religions = factory()); +}(this, (function () {'use strict'; + + // name generation approach and relative chance to be selected + const approach = {"Number":1, "Being":3, "Adjective":5, "Color + Animal":5, + "Adjective + Animal":5, "Adjective + Being":5, "Adjective + Genitive":1, + "Color + Being":3, "Color + Genitive":3, "Being + of + Genitive":2, "Being + of the + Genitive":1, + "Animal + of + Genitive":1, "Adjective + Being + of + Genitive":2, "Adjective + Animal + of + Genitive":2}; + + // turn weighted array into simple array + const approaches = []; + for (const a in approach) { + for (let j=0; j < approach[a]; j++) { + approaches.push(a); + } + } + + const base = { + number: ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"], + being: ["God", "Goddess", "Lord", "Lady", "Deity", "Creator", "Maker", "Overlord", "Ruler", "Chief", "Master", "Spirit", "Ancestor", "Father", "Forebear", "Forefather", "Mother", "Brother", "Sister", "Elder", "Numen", "Ancient", "Virgin", "Giver", "Council", "Guardian", "Reaper"], + animal: ["Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Cobra", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Viper", "Vulture", "Walrus", "Wolf", "Wolverine", "Worm", "Camel", "Falcon", "Hound", "Ox", "Serpent"], + adjective: ["New", "Good", "High", "Old", "Great", "Big", "Young", "Major", "Strong", "Happy", "Last", "Main", "Huge", "Far", "Beautiful", "Wild", "Fair", "Prime", "Crazy", "Ancient", "Golden", "Proud", "Secret", "Lucky", "Sad", "Silent", "Latter", "Severe", "Fat", "Holy", "Pure", "Aggressive", "Honest", "Giant", "Mad", "Pregnant", "Distant", "Lost", "Broken", "Blind", "Friendly", "Unknown", "Sleeping", "Slumbering", "Loud", "Hungry", "Wise", "Worried", "Sacred", "Magical", "Superior", "Patient", "Dead", "Deadly", "Peaceful", "Grateful", "Frozen", "Evil", "Scary", "Burning", "Divine", "Bloody", "Dying", "Waking", "Brutal", "Unhappy", "Calm", "Cruel", "Favorable", "Blond", "Explicit", "Disturbing", "Devastating", "Brave", "Sunny", "Troubled", "Flying", "Sustainable", "Marine", "Fatal", "Inherent", "Selected", "Naval", "Cheerful", "Almighty", "Benevolent", "Eternal", "Immutable", "Infallible"], + genitive: ["Day", "Life", "Death", "Night", "Home", "Fog", "Snow", "Winter", "Summer", "Cold", "Springs", "Gates", "Nature", "Thunder", "Lightning", "War", "Ice", "Frost", "Fire", "Doom", "Fate", "Pain", "Heaven", "Justice", "Light", "Love", "Time", "Victory"], + theGenitive: ["World", "Word", "South", "West", "North", "East", "Sun", "Moon", "Peak", "Fall", "Dawn", "Eclipse", "Abyss", "Blood", "Tree", "Earth", "Harvest", "Rainbow", "Sea", "Sky", "Stars", "Storm", "Underworld", "Wild"], + color: ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"] + }; + + const forms = { + Folk:{"Shamanism":2, "Animism":2, "Ancestor worship":1, "Polytheism":2}, + Organized:{"Polytheism":5, "Dualism":1, "Monotheism":4, "Non-theism":1}, + Cult:{"Cult":1, "Dark Cult":1}, + Heresy:{"Heresy":1} + }; + + const methods = {"Random + type":3, "Random + ism":1, "Supreme + ism":5, "Faith of + Supreme":3, "Place + ism":1, "Culture + ism":1, "Place + ian + type":6, "Culture + type":4}; + + const types = { + "Shamanism":{"Beliefs":3, "Shamanism":2, "Spirits":1}, + "Animism":{"Spirits":1, "Beliefs":1}, + "Ancestor worship":{"Beliefs":1, "Forefathers":2, "Ancestors":2}, + "Polytheism":{"Deities":3, "Faith":1, "Gods":1, "Pantheon":1}, + + "Dualism":{"Religion":3, "Faith":1, "Cult":1}, + "Monotheism":{"Religion":1, "Church":1}, + "Non-theism":{"Beliefs":3, "Spirits":1}, + + "Cult":{"Cult":4, "Sect":4, "Worship":1, "Orden":1, "Coterie":1, "Arcanum":1}, + "Dark Cult":{"Cult":2, "Sect":2, "Occultism":1, "Idols":1, "Coven":1, "Circle":1, "Blasphemy":1}, + + "Heresy":{"Heresy":3, "Sect":2, "Schism":1, "Dissenters":1, "Circle":1, "Brotherhood":1, "Society":1, "Iconoclasm":1, "Dissent":1, "Apostates":1} + }; + + const generate = function() { + console.time('generateReligions'); + const cells = pack.cells, states = pack.states, cultures = pack.cultures; + const religions = pack.religions = []; + cells.religion = new Uint16Array(cells.culture); // cell religion; initially based on culture + + // add folk religions + pack.cultures.forEach(c => { + if (!c.i) {religions.push({i: 0, name: "No religion"}); return;} + const form = rw(forms.Folk); + const name = c.name + " " + rw(types[form]); + const deity = form === "Animism" ? null : getDeityName(c.i); + const color = `url(#hatch${rand(8,13)})`; + religions.push({i: c.i, name, color, culture: c.i, type:"Folk", form, deity}); + }); + + if (religionsInput.value == 0 || pack.cultures.length < 2) return; + + const sorted = cells.i.filter(i => cells.s[i] > 2).sort((a, b) => cells.s[b] - cells.s[a]); // filtered and sorted array of indexes + const religionsTree = d3.quadtree(); + const spacing = (graphWidth + graphHeight) / 6 / religionsInput.value; // base min distance between towns + const cultsCount = Math.floor(rand(10, 40) / 100 * religionsInput.value); + const count = +religionsInput.value - cultsCount + religions.length; + + // generate organized religions + for (let i=0; religions.length < count && i < 1000; i++) { + let center = sorted[biased(0, sorted.length-1, 5)]; // religion center + const form = rw(forms.Organized); + const state = cells.state[center]; + const culture = cells.culture[center]; + + const deity = form === "Non-theism" ? null : getDeityName(culture); + const [name, expansion] = getReligionName(form, deity, center); + + if (expansion === "state" && state && Math.random() > .5) center = states[state].center; + if (expansion === "culture" && culture && Math.random() > .5) center = cultures[culture].center; + if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]); + const x = cells.p[center][0], y = cells.p[center][1]; + + const s = spacing * gauss(1, .3, .2, 2, 2); // randomize to make the placement not uniform + if (religionsTree.find(x, y, s) !== undefined) continue; // to close to existing religion + + const expansionism = rand(3, 8); + const color = `url(#hatch${rand(0,5)})`; + religions.push({i: religions.length, name, color, culture, type:"Organized", form, deity, expansion, expansionism, center}); + religionsTree.add([x, y]); + //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "blue"); + } + + // generate cults + for (let i=0; religions.length < count + cultsCount && i < 1000; i++) { + const form = rw(forms.Cult); + let center = sorted[biased(0, sorted.length-1, 1)]; // religion center + if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]); + const x = cells.p[center][0], y = cells.p[center][1]; + + const s = spacing * gauss(2, .3, 1, 3, 2); // randomize to make the placement not uniform + if (religionsTree.find(x, y, s) !== undefined) continue; // to close to existing religion + + const culture = cells.culture[center]; + const deity = getDeityName(culture); + const name = getCultName(form, center); + const expansionism = gauss(1.1, .5, 0, 5); + religions.push({i: religions.length, name, color: "url(#hatch7)", culture, type:"Cult", form, deity, expansion:"global", expansionism, center}); + religionsTree.add([x, y]); + //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "red"); + } + + expandReligions(); + + // generate heresies + religions.filter(r => r.type === "Organized").forEach(r => { + if (r.expansionism < 3) return; + const count = gauss(0, 1, 0, 3); + for (let i=0; i < count; i++) { + let center = ra(cells.i.filter(i => cells.religion[i] === r.i && cells.c[i].some(c => cells.religion[c] !== r.i))); + if (!center) continue; + if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]); + const x = cells.p[center][0], y = cells.p[center][1]; + if (religionsTree.find(x, y, spacing / 10) !== undefined) continue; // to close to other + + const culture = cells.culture[center]; + const name = getCultName("Heresy", center); + const expansionism = gauss(1.2, .5, 0, 5); + religions.push({i: religions.length, name, color:"url(#hatch6)", culture, type:"Heresy", form:"Heresy", deity: r.deity, expansion:"global", expansionism, center}); + religionsTree.add([x, y]); + //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "green"); + } + }); + + expandHeresies(); + + console.timeEnd('generateReligions'); + } + + const add = function(center) { + const cells = pack.cells, religions = pack.religions; + const r = cells.religion[center]; + const i = religions.length; + const culture = cells.culture[center]; + const color = getRandomColor(); + + const type = religions[r].type === "Organized" ? rw({Organized:4, Cult:1, Heresy:2}) : rw({Organized:5, Cult:2}); + const form = rw(forms[type]); + const deity = form === "Heresy" ? religions[r].deity : form === "Non-theism" ? null : getDeityName(culture); + + let name, expansion; + if (type === "Organized") [name, expansion] = getReligionName(form, deity, center) + else {name = getCultName(form, center); expansion = "global";} + + religions.push({i, name, color, culture, type, form, deity, expansion, expansionism:0, center, area: 0, rural: 0, urban: 0}); + } + + // growth algorithm to assign cells to religions + const expandReligions = function() { + console.time("expandReligions"); + const cells = pack.cells, religions = pack.religions; + const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p}); + const cost = []; + + religions.filter(r => r.type === "Organized" || r.type === "Cult").forEach(r => { + cells.religion[r.center] = r.i; + queue.queue({e:r.center, p:0, r:r.i}); + cost[r.center] = 1; + }); + + const neutral = cells.i.length / 5000 * 200 * gauss(1, .3, .2, 2, 2) * neutralInput.value; // limit cost for organized religions growth + + while (queue.length) { + const next = queue.dequeue(), n = next.e, p = next.p, r = next.r; + const expansion = religions[r].expansion; + + cells.c[n].forEach(function(e) { + const cultureCost = expansion === "culture" ? religions[r].culture == cells.culture[e] ? 0 : 20000 : 10; + const stateCost = expansion === "state" ? cells.state[religions[r].center] == cells.state[e] ? 0 : 20000 : 10; + const biomeCost = cells.road[e] ? 0 : biomesData.cost[cells.biome[e]]; + const heightCost = Math.max(cells.h[e], 20) - 20; + const waterCost = cells.h[e] < 20 ? cells.road[e] ? 50 : 1000 : 0; + const totalCost = p + (cultureCost + stateCost + biomeCost + heightCost + waterCost) / religions[r].expansionism; + + if (totalCost > neutral) return; + + if (!cost[e] || totalCost < cost[e]) { + if (cells.h[e] >= 20 && cells.culture[e]) cells.religion[e] = r; // assign religion to cell + cost[e] = totalCost; + queue.queue({e, p:totalCost, r}); + } + }); + } + //debug.selectAll(".text").data(cost).enter().append("text").attr("x", (d, e) => cells.p[e][0]-1).attr("y", (d, e) => cells.p[e][1]-1).text(d => d ? rn(d) : "").attr("font-size", 2); + console.timeEnd("expandReligions"); + } + + // growth algorithm to assign cells to heresies + const expandHeresies = function() { + console.time("expandHeresies"); + const cells = pack.cells, religions = pack.religions; + const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p}); + const cost = []; + + religions.filter(r => r.form === "Heresy").forEach(r => { + const b = cells.religion[r.center]; // "base" religion id + cells.religion[r.center] = r.i; // heresy id + queue.queue({e:r.center, p:0, r:r.i, b}); + cost[r.center] = 1; + }); + + const neutral = cells.i.length / 5000 * 500 * neutralInput.value; // limit cost for heresies growth + + while (queue.length) { + const next = queue.dequeue(), n = next.e, p = next.p, r = next.r, b = next.b; + + cells.c[n].forEach(function(e) { + const religionCost = cells.religion[e] === b ? 0 : 2000; + const biomeCost = cells.road[e] ? 0 : biomesData.cost[cells.biome[e]]; + const heightCost = Math.max(cells.h[e], 20) - 20; + const waterCost = cells.h[e] < 20 ? cells.road[e] ? 50 : 1000 : 0; + const totalCost = p + (religionCost + biomeCost + heightCost + waterCost) / Math.max(religions[r].expansionism, .1); + + if (totalCost > neutral) return; + + if (!cost[e] || totalCost < cost[e]) { + if (cells.h[e] >= 20 && cells.culture[e]) cells.religion[e] = r; // assign religion to cell + cost[e] = totalCost; + queue.queue({e, p:totalCost, r}); + } + }); + } + //debug.selectAll(".text").data(cost).enter().append("text").attr("x", (d, e) => cells.p[e][0]-1).attr("y", (d, e) => cells.p[e][1]-1).text(d => d ? rn(d) : "").attr("font-size", 2); + console.timeEnd("expandHeresies"); + } + + // get supreme deity name + const getDeityName = function(culture) { + if (culture === undefined) {console.error("Please define a culture"); return;} + const meaning = generateMeaning(); + const cultureName = Names.getCulture(culture, null, null, "", .8); + return cultureName + ", The " + meaning; + } + + function generateMeaning() { + const a = ra(approaches); // select generation approach + if (a === "Number") return ra(base.number); + if (a === "Being") return ra(base.being); + if (a === "Adjective") return ra(base.adjective); + if (a === "Color + Animal") return ra(base.color) + " " + ra(base.animal); + if (a === "Adjective + Animal") return ra(base.adjective) + " " + ra(base.animal); + if (a === "Adjective + Being") return ra(base.adjective) + " " + ra(base.being); + if (a === "Adjective + Genitive") return ra(base.adjective) + " " + ra(base.genitive); + if (a === "Color + Being") return ra(base.color) + " " + ra(base.being); + if (a === "Color + Genitive") return ra(base.color) + " " + ra(base.genitive); + if (a === "Being + of + Genitive") return ra(base.being) + " of " + ra(base.genitive); + if (a === "Being + of the + Genitive") return ra(base.being) + " of the " + ra(base.theGenitive); + if (a === "Animal + of + Genitive") return ra(base.animal) + " of " + ra(base.genitive); + if (a === "Adjective + Being + of + Genitive") return ra(base.adjective) + " " + ra(base.being) + " of " + ra(base.genitive); + if (a === "Adjective + Animal + of + Genitive") return ra(base.adjective) + " " + ra(base.animal) + " of " + ra(base.genitive); + } + + function getReligionName(form, deity, center) { + const cells = pack.cells; + const random = function() {return Names.getCulture(cells.culture[center], null, null, "", 0);} + const type = function() {return rw(types[form]);} + const supreme = function() {return deity.split(/[ ,]+/)[0];} + const place = function(adj) { + const base = cells.burg[center] ? pack.burgs[cells.burg[center]].name : pack.states[cells.state[center]].name; + let name = trimVowels(base.split(/[ ,]+/)[0]); + return adj ? getAdjective(name) : name; + } + const culture = function() {return pack.cultures[cells.culture[center]].name;} + + const m = rw(methods); + if (m === "Random + type") return [random() + " " + type(), "global"]; + if (m === "Random + ism") return [trimVowels(random()) + "ism", "global"]; + if (m === "Supreme + ism" && deity) return [trimVowels(supreme()) + "ism", "global"]; + if (m === "Faith of + Supreme" && deity) return ["Faith of " + supreme(), "global"]; + if (m === "Place + ism") return [place() + "ism", "global"]; + if (m === "Culture + ism") return [trimVowels(culture()) + "ism", "culture"]; + if (m === "Place + ian + type") return [place("adj") + " " + type(), "state"]; + if (m === "Culture + type") return [culture() + " " + type(), "culture"]; + return [trimVowels(random()) + "ism", "global"]; // else + } + + function getCultName(form, center) { + const cells = pack.cells; + const type = function() {return rw(types[form]);} + const random = function() {return trimVowels(Names.getCulture(cells.culture[center], null, null, "", 0).split(/[ ,]+/)[0]);} + const burg = function() {return trimVowels(pack.burgs[cells.burg[center]].name.split(/[ ,]+/)[0]);} + if (cells.burg[center]) return burg() + "ian " + type(); + if (Math.random() > .5) return random() + "ian " + type(); + return type() + " of the " + generateMeaning(); + }; + + return {generate, add, getDeityName, expandReligions}; + +}))); \ No newline at end of file diff --git a/modules/routes-generator.js b/modules/routes-generator.js index 783943ca..fc4b931b 100644 --- a/modules/routes-generator.js +++ b/modules/routes-generator.js @@ -148,6 +148,7 @@ const regenerate = function() { routes.selectAll("path").remove(); pack.cells.road = new Uint16Array(pack.cells.i.length); + pack.cells.crossroad = new Uint16Array(pack.cells.i.length); const main = getRoads(); const small = getTrails(); const ocean = getSearoutes(); @@ -203,8 +204,8 @@ if (segment.length) { segment.push(current); path.push(segment); - if (segment[0] !== end) cells.road[segment[0]] += score; // crossroad - if (current !== start) cells.road[current] += score; // crossroad + if (segment[0] !== end) {cells.road[segment[0]] += score; cells.crossroad[segment[0]] += score;} + if (current !== start) {cells.road[current] += score; cells.crossroad[current] += score;} } segment = []; prev = current; diff --git a/modules/save-and-load.js b/modules/save-and-load.js index f82cd044..746160d6 100644 --- a/modules/save-and-load.js +++ b/modules/save-and-load.js @@ -12,7 +12,19 @@ function saveAsImage(type) { const clone = d3.select("#fantasyMap"); if (type === "svg") clone.select("#viewbox").attr("transform", null); // reset transform to show whole map - if (layerIsOn("texture") && type === "png") clone.select("#texture").remove(); // no texture for png + + // remove unused elements + if (!clone.select("#terrain").selectAll("use").size()) clone.select("#defs-relief").remove(); + if (!clone.select("#prec").selectAll("circle").size()) clone.select("#prec").remove(); + const removeEmptyGroups = function() { + let empty = 0; + clone.selectAll("g").each(function() { + if (!this.hasChildNodes() || this.style.display === "none") {empty++; this.remove();} + if (this.hasAttribute("display") && this.style.display === "inline") this.removeAttribute("display"); + }); + return empty; + } + while(removeEmptyGroups()) {removeEmptyGroups();} // for each g element get inline style const emptyG = clone.append("g").node(); @@ -73,9 +85,13 @@ function saveAsImage(type) { link.href = url; document.body.appendChild(link); link.click(); + tip(`${link.download} is saved. Open "Downloads" screen (crtl + J) to check`, true, "warning"); } - window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000); + window.setTimeout(function() { + window.URL.revokeObjectURL(url); + clearMainTip(); + }, 3000); console.timeEnd("saveAsImage"); }); } @@ -84,14 +100,16 @@ function saveAsImage(type) { function getFontsToLoad() { const webSafe = ["Georgia", "Times+New+Roman", "Comic+Sans+MS", "Lucida+Sans+Unicode", "Courier+New", "Verdana", "Arial", "Impact"]; - const fontsInUse = []; // to store fonts currently in use + const fontsInUse = new Set(); // to store fonts currently in use labels.selectAll("g").each(function() { const font = this.dataset.font; if (!font) return; if (webSafe.includes(font)) return; // do not fetch web-safe fonts - if (!fontsInUse.includes(font)) fontsInUse.push(font); + fontsInUse.add(font); }); - return "https://fonts.googleapis.com/css?family=" + fontsInUse.join("|"); + const legendFont = legend.attr("data-font"); + if (!webSafe.includes(legendFont)) fontsInUse.add(); + return "https://fonts.googleapis.com/css?family=" + [...fontsInUse].join("|"); } // code from Kaiido's answer https://stackoverflow.com/questions/42402584/how-to-use-google-fonts-in-canvas-when-drawing-dom-objects-in-svg @@ -135,15 +153,16 @@ function GFontToDataURI(url) { // Save in .map format function saveMap() { - if (customization) {tip("Map cannot be saved when is in edit mode, please exit the mode and re-try", false, "error"); return;} + if (customization) {tip("Map cannot be saved when is in edit mode, please exit the mode and retry", false, "error"); return;} console.time("saveMap"); + closeDialogs(); const date = new Date(); const dateString = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate(); const license = "File can be loaded in azgaar.github.io/Fantasy-Map-Generator"; const params = [version, license, dateString, seed, graphWidth, graphHeight].join("|"); - const options = [distanceUnit.value, distanceScale.value, areaUnit.value, heightUnit.value, heightExponent.value, temperatureScale.value, + const options = [distanceUnitInput.value, distanceScaleInput.value, areaUnit.value, heightUnit.value, heightExponentInput.value, temperatureScale.value, barSize.value, barLabel.value, barBackOpacity.value, barBackColor.value, barPosX.value, barPosY.value, populationRate.value, urbanization.value, - equatorOutput.value, equidistanceOutput.value, temperatureEquatorOutput.value, temperaturePoleOutput.value, precOutput.value, JSON.stringify(winds)].join("|"); + mapSizeOutput.value, latitudeOutput.value, temperatureEquatorOutput.value, temperaturePoleOutput.value, precOutput.value, JSON.stringify(winds)].join("|"); const coords = JSON.stringify(mapCoordinates); const biomes = [biomesData.color, biomesData.habitability, biomesData.name].join("|"); const notesData = JSON.stringify(notes); @@ -159,12 +178,16 @@ function saveMap() { const cultures = JSON.stringify(pack.cultures); const states = JSON.stringify(pack.states); const burgs = JSON.stringify(pack.burgs); + const religions = JSON.stringify(pack.religions); + const provinces = JSON.stringify(pack.provinces); + // data format as below const data = [params, options, coords, biomes, notesData, svg_xml, gridGeneral, grid.cells.h, grid.cells.prec, grid.cells.f, grid.cells.t, grid.cells.temp, features, cultures, states, burgs, pack.cells.biome, pack.cells.burg, pack.cells.conf, pack.cells.culture, pack.cells.fl, - pack.cells.pop, pack.cells.r, pack.cells.road, pack.cells.s, pack.cells.state].join("\r\n"); + pack.cells.pop, pack.cells.r, pack.cells.road, pack.cells.s, pack.cells.state, + pack.cells.religion, pack.cells.province, pack.cells.crossroad, religions, provinces].join("\r\n"); const dataBlob = new Blob([data], {type: "text/plain"}); const dataURL = window.URL.createObjectURL(dataBlob); const link = document.createElement("a"); @@ -172,12 +195,16 @@ function saveMap() { link.href = dataURL; document.body.appendChild(link); link.click(); + tip(`${link.download} is saved. Open "Downloads" screen (crtl + J) to check`, true, "warning"); // restore initial values svg.attr("width", svgWidth).attr("height", svgHeight); zoom.transform(svg, transform); - window.setTimeout(function() {window.URL.revokeObjectURL(dataURL);}, 2000); + window.setTimeout(function() { + window.URL.revokeObjectURL(dataURL); + clearMainTip(); + }, 3000); console.timeEnd("saveMap"); } @@ -202,11 +229,11 @@ function uploadFile(file, callback) {
Please keep using an ${archive}`; } else { load = true; - message = `The map version (${mapVersion}) does not match the Generator version (${version}). The map will be auto-updated. -
In case of issues please keep using an ${archive} of the Generator`; + message = `The map version (${mapVersion}) does not match the Generator version (${version}). +
The map will be auto-updated. In case of issues please keep using an ${archive} of the Generator`; } alertMessage.innerHTML = message; - $("#alert").dialog({title: "Version conflict", buttons: { + $("#alert").dialog({title: "Version conflict", width: 380, buttons: { OK: function() {$(this).dialog("close"); if (load) parseLoadedData(data);} }}); }; @@ -218,6 +245,7 @@ function uploadFile(file, callback) { function parseLoadedData(data) { closeDialogs(); const reliefIcons = document.getElementById("defs-relief").innerHTML; // save relief icons + const hatching = document.getElementById("hatching").cloneNode(true); // save hatching void function parseParameters() { const params = data[0].split("|"); @@ -228,22 +256,22 @@ function parseLoadedData(data) { void function parseOptions() { const options = data[1].split("|"); - if (options[0]) distanceUnit.value = distanceUnitOutput.innerHTML = options[0]; - if (options[1]) distanceScale.value = distanceScaleSlider.value = options[1]; + if (options[0]) applyOption(distanceUnitInput, options[0]); + if (options[1]) distanceScaleInput.value = distanceScaleOutput.value = options[1]; if (options[2]) areaUnit.value = options[2]; - if (options[3]) heightUnit.value= options[3]; - if (options[4]) heightExponent.value = heightExponentSlider.value = options[4]; + if (options[3]) applyOption(heightUnit, options[3]); + if (options[4]) heightExponentInput.value = heightExponentOutput.value = options[4]; if (options[5]) temperatureScale.value = options[5]; - if (options[6]) barSize.value = barSizeSlider.value = options[6]; + if (options[6]) barSize.value = barSizeOutput.value = options[6]; if (options[7] !== undefined) barLabel.value = options[7]; if (options[8] !== undefined) barBackOpacity.value = options[8]; if (options[9]) barBackColor.value = options[9]; if (options[10]) barPosX.value = options[10]; if (options[11]) barPosY.value = options[11]; - if (options[12]) populationRate.value = populationRateSlider.value = options[12]; - if (options[13]) urbanization.value = urbanizationSlider.value = options[13]; - if (options[14]) equatorInput.value = equatorOutput.value = options[14]; - if (options[15]) equidistanceInput.value = equidistanceOutput.value = options[15]; + if (options[12]) populationRate.value = populationRateOutput.value = options[12]; + if (options[13]) urbanization.value = urbanizationOutput.value = options[13]; + if (options[14]) mapSizeInput.value = mapSizeOutput.value = Math.max(Math.min(options[14], 100), 1); + if (options[15]) latitudeInput.value = latitudeOutput.value = Math.max(Math.min(options[15], 100), 0); if (options[16]) temperatureEquatorInput.value = temperatureEquatorOutput.value = options[16]; if (options[17]) temperaturePoleInput.value = temperaturePoleOutput.value = options[17]; if (options[18]) precInput.value = precOutput.value = options[18]; @@ -255,14 +283,18 @@ function parseLoadedData(data) { if (data[4]) notes = JSON.parse(data[4]); const biomes = data[3].split("|"); - const name = biomes[2].split(","); - if (name.length !== biomesData.name.length) { - console.error("Biomes data is not correct and will not be loaded"); - return; - } + biomesData = applyDefaultBiomesSystem(); biomesData.color = biomes[0].split(","); biomesData.habitability = biomes[1].split(",").map(h => +h); - biomesData.name = name; + biomesData.name = biomes[2].split(","); + + // push custom biomes if any + for (let i=biomesData.i.length; i < biomesData.name.length; i++) { + biomesData.i.push(biomesData.i.length); + biomesData.iconsDensity.push(0); + biomesData.icons.push([]); + biomesData.cost.push(50); + } }() void function replaceSVG() { @@ -275,6 +307,7 @@ function parseLoadedData(data) { defs = svg.select("#deftemp"); viewbox = svg.select("#viewbox"); scaleBar = svg.select("#scaleBar"); + legend = svg.select("#legend"); ocean = viewbox.select("#ocean"); oceanLayers = ocean.select("#oceanLayers"); oceanPattern = ocean.select("#oceanPattern"); @@ -289,11 +322,16 @@ function parseLoadedData(data) { compass = viewbox.select("#compass"); rivers = viewbox.select("#rivers"); terrain = viewbox.select("#terrain"); + relig = viewbox.select("#relig"); cults = viewbox.select("#cults"); regions = viewbox.select("#regions"); statesBody = regions.select("#statesBody"); statesHalo = regions.select("#statesHalo"); + provs = viewbox.select("#provs"); + zones = viewbox.select("#zones"); borders = viewbox.select("#borders"); + stateBorders = borders.select("#stateBorders"); + provinceBorders = borders.select("#provinceBorders"); routes = viewbox.select("#routes"); roads = routes.select("#roads"); trails = routes.select("#trails"); @@ -308,6 +346,7 @@ function parseLoadedData(data) { anchors = icons.select("#anchors"); markers = viewbox.select("#markers"); ruler = viewbox.select("#ruler"); + fogging = viewbox.select("#fogging"); debug = viewbox.select("#debug"); freshwater = lakes.select("#freshwater"); salt = lakes.select("#salt"); @@ -332,17 +371,23 @@ function parseLoadedData(data) { pack.cultures = JSON.parse(data[13]); pack.states = JSON.parse(data[14]); pack.burgs = JSON.parse(data[15]); + pack.religions = data[29] ? JSON.parse(data[29]) : [{i: 0, name: "No religion"}]; + pack.provinces = data[30] ? JSON.parse(data[30]) : [0]; - pack.cells.biome = Uint8Array.from(data[16].split(",")); - pack.cells.burg = Uint16Array.from(data[17].split(",")); - pack.cells.conf = Uint8Array.from(data[18].split(",")); - pack.cells.culture = Uint8Array.from(data[19].split(",")); - pack.cells.fl = Uint16Array.from(data[20].split(",")); - pack.cells.pop = Uint16Array.from(data[21].split(",")); - pack.cells.r = Uint16Array.from(data[22].split(",")); - pack.cells.road = Uint16Array.from(data[23].split(",")); - pack.cells.s = Uint16Array.from(data[24].split(",")); - pack.cells.state = Uint8Array.from(data[25].split(",")); + const cells = pack.cells; + cells.biome = Uint8Array.from(data[16].split(",")); + cells.burg = Uint16Array.from(data[17].split(",")); + cells.conf = Uint8Array.from(data[18].split(",")); + cells.culture = Uint16Array.from(data[19].split(",")); + cells.fl = Uint16Array.from(data[20].split(",")); + cells.pop = Uint16Array.from(data[21].split(",")); + cells.r = Uint16Array.from(data[22].split(",")); + cells.road = Uint16Array.from(data[23].split(",")); + cells.s = Uint16Array.from(data[24].split(",")); + cells.state = Uint16Array.from(data[25].split(",")); + cells.religion = data[26] ? Uint16Array.from(data[26].split(",")) : new Uint16Array(cells.i.length); + cells.province = data[27] ? Uint16Array.from(data[27].split(",")) : new Uint16Array(cells.i.length); + cells.crossroad = data[28] ? Uint16Array.from(data[28].split(",")) : new Uint16Array(cells.i.length); }() void function restoreLayersState() { @@ -355,15 +400,18 @@ function parseLoadedData(data) { if (compass.style("display") !== "none" && compass.select("use").size()) turnButtonOn("toggleCompass"); else turnButtonOff("toggleCompass"); if (rivers.style("display") !== "none") turnButtonOn("toggleRivers"); else turnButtonOff("toggleRivers"); if (terrain.style("display") !== "none" && terrain.selectAll("*").size()) turnButtonOn("toggleRelief"); else turnButtonOff("toggleRelief"); + if (relig.selectAll("*").size()) turnButtonOn("toggleReligions"); else turnButtonOff("toggleReligions"); if (cults.selectAll("*").size()) turnButtonOn("toggleCultures"); else turnButtonOff("toggleCultures"); if (statesBody.selectAll("*").size()) turnButtonOn("toggleStates"); else turnButtonOff("toggleStates"); - if (borders.style("display") !== "none" && borders.selectAll("*").size()) turnButtonOn("toggleBorders"); else turnButtonOff("toggleBorders"); + if (provs.selectAll("*").size()) turnButtonOn("toggleProvinces"); else turnButtonOff("toggleProvinces"); + if (zones.selectAll("*").size() && zones.style("display") !== "none") turnButtonOn("toggleZones"); else turnButtonOff("toggleZones"); + if (borders.style("display") !== "none") turnButtonOn("toggleBorders"); else turnButtonOff("toggleBorders"); if (routes.style("display") !== "none" && routes.selectAll("path").size()) turnButtonOn("toggleRoutes"); else turnButtonOff("toggleRoutes"); if (temperature.selectAll("*").size()) turnButtonOn("toggleTemp"); else turnButtonOff("toggleTemp"); if (prec.selectAll("circle").size()) turnButtonOn("togglePrec"); else turnButtonOff("togglePrec"); if (labels.style("display") !== "none") turnButtonOn("toggleLabels"); else turnButtonOff("toggleLabels"); if (icons.style("display") !== "none") turnButtonOn("toggleIcons"); else turnButtonOff("toggleIcons"); - if (markers.style("display") !== "none") turnButtonOn("toggleMarkers"); else turnButtonOff("toggleMarkers"); + if (markers.selectAll("*").size() && markers.style("display") !== "none") turnButtonOn("toggleMarkers"); else turnButtonOff("toggleMarkers"); if (ruler.style("display") !== "none") turnButtonOn("toggleRulers"); else turnButtonOff("toggleRulers"); if (scaleBar.style("display") !== "none") turnButtonOn("toggleScaleBar"); else turnButtonOff("toggleScaleBar"); @@ -371,27 +419,89 @@ function parseLoadedData(data) { const populationIsOn = population.selectAll("line").size(); if (populationIsOn) drawPopulation(); if (populationIsOn) turnButtonOn("togglePopulation"); else turnButtonOff("togglePopulation"); + + getCurrentPreset(); }() void function restoreRulersEvents() { ruler.selectAll("g").call(d3.drag().on("start", dragRuler)); ruler.selectAll("text").on("click", removeParent); - ruler.selectAll("g.ruler circle").call(d3.drag().on("drag", dragRulerEdge)); ruler.selectAll("g.ruler circle").call(d3.drag().on("drag", dragRulerEdge)); ruler.selectAll("g.ruler rect").call(d3.drag().on("start", rulerCenterDrag)); - ruler.selectAll("g.opisometer circle").call(d3.drag().on("start", dragOpisometerEnd)); ruler.selectAll("g.opisometer circle").call(d3.drag().on("start", dragOpisometerEnd)); }() void function resolveVersionConflicts() { - if (parseFloat(data[0].split("|")[0]) == 0.8) { + const version = parseFloat(data[0].split("|")[0]); + if (version == 0.8) { // 0.9 has additional relief icons to be included into older maps document.getElementById("defs-relief").innerHTML = reliefIcons; + } - // 0.8.28b changed opacity slider from regions to statesBody - document.getElementById("regions").removeAttribute("opacity"); + if (version < 1) { + // 1.0 adds a new religions layer + relig = viewbox.insert("g", "#terrain").attr("id", "cults"); + Religions.generate(); + + // 1.0 adds a legend box + legend = svg.append("g").attr("id", "legend"); + legend.attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC") + .attr("font-size", 13).attr("data-size", 13).attr("data-x", 99).attr("data-y", 93) + .attr("stroke-width", 2.5).attr("stroke", "#812929").attr("stroke-dasharray", "0 4 10 4").attr("stroke-linecap", "round"); + + // 1.0 separated drawBorders fron drawStates() + stateBorders = borders.append("g").attr("id", "stateBorders"); + provinceBorders = borders.append("g").attr("id", "provinceBorders"); + borders.attr("opacity", null).attr("stroke", null).attr("stroke-width", null).attr("stroke-dasharray", null).attr("stroke-linecap", null).attr("filter", null); + stateBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt"); + provinceBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", .5).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt"); + + // 1.0 adds state relations, provinces, forms and full names + provs = viewbox.insert("g", "#borders").attr("id", "provs").attr("opacity", .6); + BurgsAndStates.collectStatistics(); + BurgsAndStates.generateDiplomacy(); + BurgsAndStates.defineStateForms(); + drawStates(); + BurgsAndStates.generateProvinces(); + drawBorders(); + if (!layerIsOn("toggleBorders")) $('#borders').fadeOut(); + if (!layerIsOn("toggleStates")) regions.attr("display", "none").selectAll("path").remove(); + + // 1.0 adds hatching + document.getElementsByTagName("defs")[0].appendChild(hatching); + + // 1.0 adds zones layer + zones = viewbox.insert("g", "#borders").attr("id", "zones").attr("display", "none"); + zones.attr("opacity", .6).attr("stroke", null).attr("stroke-width", 0).attr("stroke-dasharray", null).attr("stroke-linecap", "butt"); + addZone(); + if (!markers.selectAll("*").size()) {addMarkers(); turnButtonOn("toggleMarkers");} + + // 1.0 add fogging layer (state focus) + let fogging = viewbox.insert("g", "#ruler").attr("id", "fogging-cont").attr("mask", "url(#fog)") + .append("g").attr("id", "fogging").attr("display", "none"); + fogging.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%"); + defs.append("mask").attr("id", "fog").append("rect").attr("x", 0).attr("y", 0).attr("width", "100%") + .attr("height", "100%").attr("fill", "white"); + + // 1.0 changes states opacity bask to regions level + if (statesBody.attr("opacity")) { + regions.attr("opacity", statesBody.attr("opacity")); + statesBody.attr("opacity", null); + } + + // 1.0 changed labels to multi-lined + labels.selectAll("textPath").each(function() { + const text = this.textContent; + const shift = this.getComputedTextLength() / -1.5; + this.innerHTML = `${text} `;
+ });
+
+ // 1.0 added new biome - Wetland
+ biomesData.name.push("Wetland");
+ biomesData.color.push("#0b9131");
+ biomesData.habitability.push(12);
}
}()
diff --git a/modules/ui/biomes-editor.js b/modules/ui/biomes-editor.js
index 6b5ea8e8..ac93b78e 100644
--- a/modules/ui/biomes-editor.js
+++ b/modules/ui/biomes-editor.js
@@ -5,6 +5,8 @@ function editBiomes() {
if (!layerIsOn("toggleBiomes")) toggleBiomes();
if (layerIsOn("toggleStates")) toggleStates();
if (layerIsOn("toggleCultures")) toggleCultures();
+ if (layerIsOn("toggleReligions")) toggleReligions();
+ if (layerIsOn("toggleProvinces")) toggleProvinces();
const body = document.getElementById("biomesBody");
const animate = d3.transition().duration(2000).ease(d3.easeSinIn);
@@ -14,20 +16,35 @@ function editBiomes() {
modules.editBiomes = true;
$("#biomesEditor").dialog({
- title: "Biomes Editor", width: fitContent(), close: closeBiomesEditor,
+ title: "Biomes Editor", resizable: false, width: fitContent(), close: closeBiomesEditor,
position: {my: "right top", at: "right-10 top+10", of: "svg"}
});
// add listeners
document.getElementById("biomesEditorRefresh").addEventListener("click", refreshBiomesEditor);
+ document.getElementById("biomesLegend").addEventListener("click", toggleLegend);
document.getElementById("biomesPercentage").addEventListener("click", togglePercentageMode);
document.getElementById("biomesManually").addEventListener("click", enterBiomesCustomizationMode);
document.getElementById("biomesManuallyApply").addEventListener("click", applyBiomesChange);
- document.getElementById("biomesManuallyCancel").addEventListener("click", exitBiomesCustomizationMode);
+ document.getElementById("biomesManuallyCancel").addEventListener("click", () => exitBiomesCustomizationMode());
document.getElementById("biomesRestore").addEventListener("click", restoreInitialBiomes);
+ document.getElementById("biomesAdd").addEventListener("click", addCustomBiome);
document.getElementById("biomesRegenerateReliefIcons").addEventListener("click", regenerateIcons);
document.getElementById("biomesExport").addEventListener("click", downloadBiomesData);
+ body.addEventListener("click", function(ev) {
+ const el = ev.target, cl = el.classList;
+ if (cl.contains("zoneFill")) biomeChangeColor(el); else
+ if (cl.contains("icon-trash-empty")) removeCustomBiome(el);
+ if (customization === 6) selectBiomeOnLineClick(el);
+ });
+
+ body.addEventListener("change", function(ev) {
+ const el = ev.target, cl = el.classList;
+ if (cl.contains("biomeName")) biomeChangeName(el); else
+ if (cl.contains("biomeHabitability")) biomeChangeHabitability(el);
+ });
+
function refreshBiomesEditor() {
biomesCollectStatistics();
biomesEditorAddLines();
@@ -35,10 +52,11 @@ function editBiomes() {
function biomesCollectStatistics() {
const cells = pack.cells;
- biomesData.cells = new Uint32Array(biomesData.i.length);
- biomesData.area = new Uint32Array(biomesData.i.length);
- biomesData.rural = new Uint32Array(biomesData.i.length);
- biomesData.urban = new Uint32Array(biomesData.i.length);
+ const array = new Uint8Array(biomesData.i.length);
+ biomesData.cells = Array.from(array);
+ biomesData.area = Array.from(array);
+ biomesData.rural = Array.from(array);
+ biomesData.urban = Array.from(array);
for (const i of cells.i) {
if (cells.h[i] < 20) continue;
@@ -51,38 +69,39 @@ function editBiomes() {
}
function biomesEditorAddLines() {
- const unit = areaUnit.value === "square" ? " " + distanceUnit.value + "²" : " " + areaUnit.value;
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
const b = biomesData;
let lines = "", totalArea = 0, totalPopulation = 0;;
for (const i of b.i) {
- if (!i) continue; // ignore marine (water) biome
- const area = b.area[i] * distanceScale.value ** 2;
+ if (!i || biomesData.name[i] === "removed") continue; // ignore water and removed biomes
+ const area = b.area[i] * distanceScaleInput.value ** 2;
const rural = b.rural[i] * populationRate.value;
const urban = b.urban[i] * populationRate.value * urbanization.value;
- const population = rural + urban;
+ const population = rn(rural + urban);
const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}`;
totalArea += area;
totalPopulation += population;
lines += `
+
+
Сlick the arrow button for options. Zoom in to see the map in details
@@ -2325,20 +2932,22 @@
+
+
-
+
-
+
@@ -2347,11 +2956,14 @@
+
-
+
+
+
diff --git a/main.js b/main.js
index 2cc47efc..805f613a 100644
--- a/main.js
+++ b/main.js
@@ -7,7 +7,7 @@
// See also https://github.com/Azgaar/Fantasy-Map-Generator/issues/153
"use strict";
-const version = "0.9b"; // generator version
+const version = "1.0"; // generator version
document.title += " v " + version;
// append svg layers (in default order)
@@ -15,6 +15,7 @@ let svg = d3.select("#map");
let defs = svg.select("#deftemp");
let viewbox = svg.select("#viewbox");
let scaleBar = svg.select("#scaleBar");
+let legend = svg.append("g").attr("id", "legend");
let ocean = viewbox.append("g").attr("id", "ocean");
let oceanLayers = ocean.append("g").attr("id", "oceanLayers");
let oceanPattern = ocean.append("g").attr("id", "oceanPattern");
@@ -29,11 +30,16 @@ let coordinates = viewbox.append("g").attr("id", "coordinates");
let compass = viewbox.append("g").attr("id", "compass");
let rivers = viewbox.append("g").attr("id", "rivers");
let terrain = viewbox.append("g").attr("id", "terrain");
+let relig = viewbox.append("g").attr("id", "relig");
let cults = viewbox.append("g").attr("id", "cults");
let regions = viewbox.append("g").attr("id", "regions");
let statesBody = regions.append("g").attr("id", "statesBody");
let statesHalo = regions.append("g").attr("id", "statesHalo");
+let provs = viewbox.append("g").attr("id", "provs");
+let zones = viewbox.append("g").attr("id", "zones").attr("display", "none");
let borders = viewbox.append("g").attr("id", "borders");
+let stateBorders = borders.append("g").attr("id", "stateBorders");
+let provinceBorders = borders.append("g").attr("id", "provinceBorders");
let routes = viewbox.append("g").attr("id", "routes");
let roads = routes.append("g").attr("id", "roads");
let trails = routes.append("g").attr("id", "trails");
@@ -46,7 +52,9 @@ let labels = viewbox.append("g").attr("id", "labels");
let icons = viewbox.append("g").attr("id", "icons");
let burgIcons = icons.append("g").attr("id", "burgIcons");
let anchors = icons.append("g").attr("id", "anchors");
-let markers = viewbox.append("g").attr("id", "markers");
+let markers = viewbox.append("g").attr("id", "markers").attr("display", "none");
+let fogging = viewbox.append("g").attr("id", "fogging-cont").attr("mask", "url(#fog)")
+ .append("g").attr("id", "fogging").attr("display", "none");
let ruler = viewbox.append("g").attr("id", "ruler").attr("display", "none");
let debug = viewbox.append("g").attr("id", "debug");
@@ -69,7 +77,13 @@ anchors.append("g").attr("id", "towns");
population.append("g").attr("id", "rural");
population.append("g").attr("id", "urban");
-scaleBar.on("mousemove", function() {tip("Click to open Units Editor");}) // assign event separately as not a viewbox child
+// fogging
+fogging.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%");
+
+// assign events separately as not a viewbox child
+scaleBar.on("mousemove", function() {tip("Click to open Units Editor")});
+legend.on("mousemove", function() {tip("Drag to change the position. Click to hide the legend")})
+ .on("click", () => clearLegend());
// main data variables
let grid = {}; // initial grapg based on jittered square grid and data
@@ -80,7 +94,7 @@ let mapCoordinates = {}; // map coordinates on globe
let winds = [225, 45, 225, 315, 135, 315]; // default wind directions
let biomesData = applyDefaultBiomesSystem();
let nameBases = [], nameBase = []; // Cultures-related data
-const fonts = ["Almendra+SC", "Georgia", "Times+New+Roman", "Comic+Sans+MS", "Lucida+Sans+Unicode", "Courier+New"]; // default web-safe fonts
+const fonts = ["Almendra+SC", "Georgia", "Arial", "Times+New+Roman", "Comic+Sans+MS", "Lucida+Sans+Unicode", "Courier+New"]; // default web-safe fonts
let color = d3.scaleSequential(d3.interpolateSpectral); // default color scheme
const lineGen = d3.line().curve(d3.curveBasis); // d3 line generator with default curve interpolation
@@ -97,32 +111,41 @@ landmass.append("rect").attr("x", 0).attr("y", 0).attr("width", graphWidth).attr
oceanPattern.append("rect").attr("fill", "url(#oceanic)").attr("x", 0).attr("y", 0).attr("width", graphWidth).attr("height", graphHeight);
oceanLayers.append("rect").attr("id", "oceanBase").attr("x", 0).attr("y", 0).attr("width", graphWidth).attr("height", graphHeight);
-// equator Y position limits
-equatorOutput.min = equatorInput.min = graphHeight * -1;
-equatorOutput.max = equatorInput.max = graphHeight * 2;
-
applyDefaultNamesData(); // apply default namesbase on load
applyDefaultStyle(); // apply style on load
generate(); // generate map on load
focusOn(); // based on searchParams focus on point, cell or burg from MFCG
-addDragToUpload(); // allow map loading by drag and drop
+applyPreset(); // apply saved layers preset on load
// show message on load if required
-setTimeout(showWelcomeMessage, 8000);
+setTimeout(showWelcomeMessage, 7000);
function showWelcomeMessage() {
// Changelog dialog window
if (localStorage.getItem("version") != version) {
- const link = 'https://www.reddit.com/r/FantasyMapGenerator/comments/bynoz7/update_new_version_is_published_v_09b/'; // announcement on Reddit
+ const link = 'https://www.reddit.com/r/FantasyMapGenerator/comments/bynoz7/update_new_version_is_published_v_10/'; // announcement on Reddit
alertMessage.innerHTML = `The Fantasy Map Generator is updated up to version ${version}.
- This version is compatible with v 0.8b, but not with older .map files.
+ This version is compatible with versions 0.8b and 0.9b, but not with older .map files.
Please use an archived version to open old files.
- Main changes:
-
- Relief icons by Arzak Rubin -
- Ability to re-generate Burgs -
- Ability to re-generate States -
- Bug fixes +
- Provinces and Provinces Editor +
- Religions Layer and Religions Editor +
- Full state names (state types) +
- Multi-lined labels +
- State relations (diplomacy) +
- Custom layers (zones) +
- Places of interest (auto-added markers) +
- New color picker and hatching fill +
- Legend boxes +
- World Configurator presets +
- Improved state labels placement +
- Relief icons sets +
- Fogging +
- Custom layer presets +
- Custom biomes +
- State, province and burg COAs +
- Desktop version (see here)
Join our Reddit community and @@ -132,7 +155,7 @@ function showWelcomeMessage() {
Thanks for all supporters on Patreon!
`; $("#alert").dialog( - {resizable: false, title: "Fantasy Map Generator update", width: 330, + {resizable: false, title: "Fantasy Map Generator update", width: 310, buttons: { OK: function() { localStorage.clear(); @@ -220,16 +243,14 @@ function applyDefaultNamesData() { // apply default biomes data function applyDefaultBiomesSystem() { - const name = ["Marine","Hot desert","Cold desert","Savanna","Grassland","Tropical seasonal forest","Temperate deciduous forest","Tropical rain forest","Temperate rain forest","Taiga","Tundra","Glacier"]; - const color = ["#53679f","#fbe79f","#b5b887","#d2d082","#c8d68f","#b6d95d","#29bc56","#7dcb35","#45b348","#4b6b32","#96784b","#d5e7eb"]; - - const i = new Uint8Array(d3.range(0, name.length)); - const habitability = new Uint16Array([0,2,5,15,25,50,100,80,90,10,2,0]); - const iconsDensity = new Uint8Array([0,3,2,120,120,120,120,150,150,100,5,0]); - //const icons = [{},{dune:1},{dune:1},{acacia:1, grass:9},{grass:1},{acacia:1, palm:1},{deciduous:1},{acacia:7, palm:2, deciduous:1},{deciduous:7, swamp:3},{conifer:1},{grass:1},{}]; - const icons = [{},{dune:3, cactus:6, deadTree:1},{dune:9, deadTree:1},{acacia:1, grass:9},{grass:1},{acacia:8, palm:1},{deciduous:1},{acacia:5, palm:3, deciduous:1, swamp:2},{deciduous:5, swamp:3},{conifer:1},{grass:1},{}]; - const cost = new Uint8Array([10,200,150,60,50,70,70,80,90,80,100,255]); // biome movement cost + const name = ["Marine","Hot desert","Cold desert","Savanna","Grassland","Tropical seasonal forest","Temperate deciduous forest","Tropical rainforest","Temperate rainforest","Taiga","Tundra","Glacier","Wetland"]; + const color = ["#53679f","#fbe79f","#b5b887","#d2d082","#c8d68f","#b6d95d","#29bc56","#7dcb35","#409c43","#4b6b32","#96784b","#d5e7eb","#0b9131"]; + const habitability = [0,2,5,20,30,50,100,80,90,10,2,0,12]; + const iconsDensity = [0,3,2,120,120,120,120,150,150,100,5,0,150]; + const icons = [{},{dune:3, cactus:6, deadTree:1},{dune:9, deadTree:1},{acacia:1, grass:9},{grass:1},{acacia:8, palm:1},{deciduous:1},{acacia:5, palm:3, deciduous:1, swamp:1},{deciduous:6, swamp:1},{conifer:1},{grass:1},{},{swamp:1}]; + const cost = [10,200,150,60,50,70,70,80,90,80,100,255,150]; // biome movement cost const biomesMartix = [ + // hot ↔ cold; dry ↕ wet new Uint8Array([1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2]), new Uint8Array([3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,9,9,9,9,9,10,10]), new Uint8Array([5,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,9,9,9,9,9,10,10,10]), @@ -237,8 +258,8 @@ function applyDefaultBiomesSystem() { new Uint8Array([7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,9,9,9,9,9,9,10,10,10]) ]; - // parse icons 'weighted array' into a simple array - for (let i = 0; i < icons.length; i++) { + // parse icons weighted array into a simple array + for (let i=0; i < icons.length; i++) { const parsed = []; for (const icon in icons[i]) { for (let j = 0; j < icons[i][icon]; j++) {parsed.push(icon);} @@ -246,22 +267,24 @@ function applyDefaultBiomesSystem() { icons[i] = parsed; } - return {i, name, color, biomesMartix, habitability, iconsDensity, icons, cost}; + return {i:d3.range(0, name.length), name, color, biomesMartix, habitability, iconsDensity, icons, cost}; } // restore initial style function applyDefaultStyle() { biomes.attr("opacity", null).attr("filter", null); - borders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", .7).attr("stroke-dasharray", "1.2 1.5").attr("stroke-linecap", "butt").attr("filter", null); + stateBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt").attr("filter", null); + provinceBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", .2).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt").attr("filter", null); cells.attr("opacity", null).attr("stroke", "#808080").attr("stroke-width", .1).attr("filter", null).attr("mask", null); gridOverlay.attr("opacity", .8).attr("stroke", "#808080").attr("stroke-width", .5).attr("stroke-dasharray", null).attr("transform", null).attr("filter", null).attr("mask", null); - coordinates.attr("opacity", 1).attr("data-size", 10).attr("font-size", 10).attr("stroke", "#d4d4d4").attr("stroke-width", 1).attr("stroke-dasharray", 5).attr("filter", null).attr("mask", null); - compass.attr("opacity", .8).attr("transform", null).attr("filter", null).attr("mask", "url(#water)"); + coordinates.attr("opacity", 1).attr("data-size", 12).attr("font-size", 12).attr("stroke", "#d4d4d4").attr("stroke-width", 1).attr("stroke-dasharray", 5).attr("filter", null).attr("mask", null); + compass.attr("opacity", .8).attr("transform", null).attr("filter", null).attr("mask", "url(#water)").attr("shape-rendering", "optimizespeed"); if (!d3.select("#initial").size()) d3.select("#rose").attr("transform", "translate(80 80) scale(.25)"); coastline.attr("opacity", .5).attr("stroke", "#1f3846").attr("stroke-width", .7).attr("filter", "url(#dropShadow)"); styleCoastlineAuto.checked = true; + relig.attr("opacity", .8).attr("stroke", "#777777").attr("stroke-width", 0).attr("filter", null).attr("fill-rule", "evenodd"); cults.attr("opacity", .6).attr("stroke", "#777777").attr("stroke-width", .5).attr("filter", null).attr("fill-rule", "evenodd"); icons.selectAll("g").attr("opacity", null).attr("fill", "#ffffff").attr("stroke", "#3e3e4b").attr("filter", null).attr("mask", null); landmass.attr("opacity", 1).attr("fill", "#eef6fb").attr("filter", null); @@ -277,17 +300,18 @@ function applyDefaultStyle() { terrain.attr("opacity", null).attr("filter", null).attr("mask", null); rivers.attr("opacity", null).attr("fill", "#5d97bb").attr("filter", null); - roads.attr("opacity", .9).attr("stroke", "#d06324").attr("stroke-width", .45).attr("stroke-dasharray", "1.5").attr("stroke-linecap", "butt").attr("filter", null); + roads.attr("opacity", .9).attr("stroke", "#d06324").attr("stroke-width", .7).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt").attr("filter", null); ruler.attr("opacity", null).attr("filter", null); searoutes.attr("opacity", .8).attr("stroke", "#ffffff").attr("stroke-width", .45).attr("stroke-dasharray", "1 2").attr("stroke-linecap", "round").attr("filter", null); - - statesBody.attr("opacity", .4).attr("filter", null); - statesHalo.attr("stroke-width", 10).attr("opacity", .4); + + regions.attr("opacity", .4).attr("filter", null); + statesHalo.attr("stroke-width", 10).attr("opacity", 1); + provs.attr("opacity", .6).attr("filter", null); temperature.attr("opacity", null).attr("fill", "#000000").attr("stroke-width", 1.8).attr("fill-opacity", .3).attr("font-size", "8px").attr("stroke-dasharray", null).attr("filter", null).attr("mask", null); texture.attr("opacity", null).attr("filter", null).attr("mask", "url(#land)"); texture.select("image").attr("x", 0).attr("y", 0); - + zones.attr("opacity", .6).attr("stroke", "#333333").attr("stroke-width", 0).attr("stroke-dasharray", null).attr("stroke-linecap", "butt").attr("filter", null).attr("mask", null); trails.attr("opacity", .9).attr("stroke", "#d06324").attr("stroke-width", .25).attr("stroke-dasharray", ".8 1.6").attr("stroke-linecap", "butt").attr("filter", null); // ocean and svg default style @@ -316,6 +340,13 @@ function applyDefaultStyle() { styleHeightmapCurveInput.value = 0; if (changed) drawHeightmap(); + // legend + legend.attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", 13).attr("data-size", 13).attr("data-x", 99).attr("data-y", 93).attr("stroke-width", 2.5).attr("stroke", "#812929").attr("stroke-dasharray", "0 4 10 4").attr("stroke-linecap", "round"); + styleLegendBack.value = "#ffffff"; + styleLegendOpacity.value = styleLegendOpacityOutput.value = .8; + styleLegendColItems.value = styleLegendColItemsOutput.value = 8; + if (legend.selectAll("*").size() && window.redrawLegend) redrawLegend(); + const citiesSize = Math.max(rn(8 - regionsInput.value / 20), 3); burgLabels.select("#cities").attr("fill", "#3e3e4b").attr("opacity", 1).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", citiesSize).attr("data-size", citiesSize); burgIcons.select("#cities").attr("opacity", 1).attr("size", 1).attr("stroke-width", .24).attr("fill", "#ffffff").attr("stroke", "#3e3e4b").attr("fill-opacity", .7).attr("stroke-dasharray", "").attr("stroke-linecap", "butt"); @@ -329,6 +360,8 @@ function applyDefaultStyle() { labels.select("#states").attr("fill", "#3e3e4b").attr("opacity", 1).attr("stroke", "#3a3a3a").attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", stateLabelSize).attr("data-size", stateLabelSize).attr("filter", null); labels.select("#addedLabels").attr("fill", "#3e3e4b").attr("opacity", 1).attr("stroke", "#3a3a3a").attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", 18).attr("data-size", 18).attr("filter", null); invokeActiveZooming(); + + fogging.attr("opacity", .8).attr("fill", "#000000").attr("stroke-width", 5); } // focus on coordinates, cell or burg provided in searchParams @@ -342,7 +375,7 @@ function focusOn() { params.set("burg", params.get("seed").slice(-4)); } else { // select burg for MFCG - findBurgForMFCG(params); + findBurgForMFCG(params); return; } } @@ -463,7 +496,7 @@ function invokeActiveZooming() { const desired = +this.dataset.size; const relative = Math.max(rn((desired + desired / scale) / 2, 2), 1); this.getAttribute("font-size", relative); - const hidden = hideLabels.checked && (relative * scale < 6 || relative * scale > 100); + const hidden = hideLabels.checked && (relative * scale < 6 || relative * scale > 50); if (hidden) this.classList.add("hidden"); else this.classList.remove("hidden"); }); } @@ -497,15 +530,15 @@ function invokeActiveZooming() { } // Pull request from @evyatron -function addDragToUpload() { +void function addDragToUpload() { document.addEventListener('dragover', function(e) { - e.stopPropagation(); - e.preventDefault(); - $('#map-dragged').show(); + e.stopPropagation(); + e.preventDefault(); + $('#map-dragged').show(); }); document.addEventListener('dragleave', function(e) { - $('#map-dragged').hide(); + $('#map-dragged').hide(); }); document.addEventListener('drop', function(e) { @@ -532,9 +565,10 @@ function addDragToUpload() { $("#map-dragged > p").text("Drop to upload"); }); }); -} +}() function generate() { + const timeStart = performance.now(); console.time("TOTAL"); invokeActiveZooming(); generateSeed(); @@ -562,13 +596,17 @@ function generate() { Cultures.generate(); Cultures.expand(); BurgsAndStates.generate(); - BurgsAndStates.drawStateLabels(); - console.timeEnd("TOTAL"); + Religions.generate(); - window.setTimeout(() => { - showStatistics(); - console.groupEnd("Map " + seed); - }, 300); // wait for rendering + drawStates(); + drawBorders(); + BurgsAndStates.drawStateLabels(); + addZone(); + addMarkers(); + + console.warn(`TOTAL: ${rn((performance.now()-timeStart)/1000,2)}s`); + showStatistics(); + console.groupEnd("Map " + seed); } // generate map seed (string!) or get it from URL searchParams @@ -695,14 +733,15 @@ function openNearSeaLakes() { console.timeEnd("openLakes"); } -// calculate map position on globe based on equator position and length to poles +// calculate map position on globe function calculateMapCoordinates() { - const eqY = +document.getElementById("equatorInput").value; - const eqD = +document.getElementById("equidistanceInput").value; - const latT = graphHeight / 2 / eqD * 180; - const eqMod = eqY / graphHeight; - const latN = latT * eqMod; + const size = +document.getElementById("mapSizeOutput").value; + const latShift = +document.getElementById("latitudeOutput").value; + + const latT = size / 100 * 180; + const latN = 90 - (180 - latT) * latShift / 100; const latS = latN - latT; + const lon = Math.min(graphWidth / graphHeight * latT / 2, 180); mapCoordinates = {latT, latN, latS, lonT: lon*2, lonW: -lon, lonE: lon}; } @@ -712,23 +751,24 @@ function calculateTemperatures() { console.time('calculateTemperatures'); const cells = grid.cells; cells.temp = new Int8Array(cells.i.length); // temperature array + const tEq = +temperatureEquatorInput.value; const tPole = +temperaturePoleInput.value; - const eqY = +document.getElementById("equatorInput").value; - const eqD = +document.getElementById("equidistanceInput").value; + const tDelta = Math.abs(tEq) + Math.abs(tPole); d3.range(0, cells.i.length, grid.cellsX).forEach(function(r) { const y = grid.points[r][1]; - const initTemp = tEq - Math.abs(y - eqY) / eqD * (tEq - tPole); + const deg = mapCoordinates.latN - y / graphHeight * mapCoordinates.latT; + const initTemp = tEq - Math.abs(deg) / 90 * tDelta; for (let i = r; i < r+grid.cellsX; i++) { cells.temp[i] = initTemp - convertToFriendly(cells.h[i]); } }); - // temperature decreases by 6.5�C per 1km + // temperature decreases by 6.5 degree C per 1km function convertToFriendly(h) { if (h < 20) return 0; - const exponent = +heightExponent.value; + const exponent = +heightExponentInput.value; const height = Math.pow(h - 18, exponent); return rn(height / 1000 * 6.5); } @@ -909,7 +949,7 @@ function drawCoastline() { const used = new Uint8Array(features.length); // store conneted features const largestLand = d3.scan(features.map(f => f.land ? f.cells : 0), (a, b) => b - a); const landMask = defs.select("#land"); - const waterMask = defs.select("#water"); + const waterMask = defs.select("#water"); lineGen.curve(d3.curveBasisClosed); for (const i of cells.i) { @@ -1060,14 +1100,15 @@ function defineBiomes() { let moist = grid.cells.prec[cells.g[i]]; if (cells.r[i]) moist += Math.max(cells.fl[i] / 20, 2); const n = cells.c[i].filter(isLand).map(c => grid.cells.prec[cells.g[c]]).concat([moist]); - moist = rn(d3.mean(n)); + moist = rn(4 + d3.mean(n)); const temp = grid.cells.temp[cells.g[i]]; // flux from precipitation - cells.biome[i] = getBiomeId(moist, temp); + cells.biome[i] = getBiomeId(moist, temp, cells.h[i]); } - function getBiomeId(moisture, temperature) { + function getBiomeId(moisture, temperature, height) { if (temperature < -5) return 11; // permafrost biome - const m = Math.min((moisture + 4) / 5 | 0, 4); // moisture band from 0 to 4 + if (moisture > 40 && height < 25 || moisture > 24 && height > 24) return 12; // wetland biome + const m = Math.min(moisture / 5 | 0, 4); // moisture band from 0 to 4 const t = Math.min(Math.max(20 - temperature, 0), 25); // temparature band from 0 to 25 return biomesData.biomesMartix[m][t]; } @@ -1111,6 +1152,225 @@ function rankCells() { console.timeEnd('rankCells'); } +// add a zone as an example: rebels along one border +function addZone() { + const cells = pack.cells, states = pack.states; + const state = states.find(s => s.i && s.neighbors.size > 0 && s.neighbors.values().next().value); + if (!state) return; + + const neib = state.neighbors.values().next().value; + const data = cells.i.filter(i => cells.state[i] === state.i && cells.c[i].some(c => cells.state[c] === neib)); + + const rebels = rw({Rebels:5, Insurgents:2, Recusants:1, Mutineers:1, Rioters:1, Dissenters:1, Secessionists:1, Insurrection:2, Rebellion:1, Conspiracy:2}); + const name = getAdjective(states[neib].name) + " " + rebels; + + const zone = zones.append("g").attr("id", "zone0").attr("data-description", name).attr("data-cells", data).attr("fill", "url(#hatch3)"); + zone.selectAll("polygon").data(data).enter().append("polygon").attr("points", d => getPackPolygon(d)).attr("id", d => "zone0_"+d); +} + +// add some markers as an example +function addMarkers() { + console.time("addMarkers"); + const cells = pack.cells; + + void function addVolcanoes() { + let mounts = Array.from(cells.i).filter(i => cells.h[i] > 70).sort((a, b) => cells.h[b] - cells.h[a]); + let count = mounts.length < 10 ? 0 : Math.ceil(mounts.length / 300); + if (count) addMarker("volcano", "🌋", 52, 52, 17.5); + + while (count) { + const cell = mounts.splice(biased(0, mounts.length, 5), 1); + const x = cells.p[cell][0], y = cells.p[cell][1]; + const id = getNextId("markerElement"); + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_volcano").attr("data-id", "#marker_volcano") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + const height = getFriendlyHeight(cells.h[cell]); + const proper = Names.getCulture(cells.culture[cell]); + const name = Math.random() < .3 ? "Mount " + proper : Math.random() > .3 ? proper + " Volcano" : proper; + notes.push({id, name, legend:`Active volcano. Height: ${height}`}); + count--; + } + }() + + void function addHotSprings() { + let springs = Array.from(cells.i).filter(i => cells.h[i] > 50).sort((a, b) => cells.h[b]-cells.h[a]); + let count = springs.length < 30 ? 0 : Math.ceil(springs.length / 1000); + if (count) addMarker("hot_springs", "♨", 50, 50, 19.5); + + while (count) { + const cell = springs.splice(biased(1, springs.length, 3), 1); + const x = cells.p[cell][0], y = cells.p[cell][1]; + const id = getNextId("markerElement"); + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_hot_springs").attr("data-id", "#marker_hot_springs") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + + const proper = Names.getCulture(cells.culture[cell]); + const temp = convertTemperature(gauss(25,15,20,100)); + notes.push({id, name: proper + " Hot Springs", legend:`A hot springs area. Temperature: ${temp}`}); + count--; + } + }() + + void function addMines() { + let hills = Array.from(cells.i).filter(i => cells.h[i] > 47 && cells.burg[i]); + let count = !hills.length ? 0 : Math.ceil(hills.length / 7); + if (!count) return; + + addMarker("mine", "⚒", 50, 50, 20); + const resources = {"salt":5, "gold":2, "silver":4, "copper":2, "iron":3, "lead":1, "tin":1}; + + while (count) { + const cell = hills.splice(Math.floor(Math.random() * hills.length), 1); + const x = cells.p[cell][0], y = cells.p[cell][1]; + const id = getNextId("markerElement"); + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_mine").attr("data-id", "#marker_mine") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + const resource = rw(resources); + const burg = pack.burgs[cells.burg[cell]]; + const name = `${burg.name} - ${resource} mining town`; + const population = rn(burg.population * populationRate.value * urbanization.value); + const legend = `${burg.name} is a mining town of ${population} people just nearby the ${resource} mine`; + notes.push({id, name, legend}); + count--; + } + }() + + void function addBridges() { + const meanRoad = d3.mean(cells.road.filter(r => r)); + const meanFlux = d3.mean(cells.fl.filter(fl => fl)); + + let bridges = Array.from(cells.i) + .filter(i => cells.burg[i] && cells.h[i] >= 20 && cells.r[i] && cells.fl[i] > meanFlux && cells.road[i] > meanRoad) + .sort((a, b) => (cells.road[b] + cells.fl[b] / 10) - (cells.road[a] + cells.fl[a] / 10)); + + let count = !bridges.length ? 0 : Math.ceil(bridges.length / 12); + if (count) addMarker("bridge", "🌉", 50, 50, 16.5); + + while (count) { + const cell = bridges.splice(0, 1); + const x = cells.p[cell][0], y = cells.p[cell][1]; + const id = getNextId("markerElement"); + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_bridge").attr("data-id", "#marker_bridge") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + + const burg = pack.burgs[cells.burg[cell]]; + const river = Names.getCulture(cells.culture[cell]); // river name + const name = Math.random() < .2 ? river : burg.name; + notes.push({id, name:`${name} Bridge`, legend:`A stone bridge over the ${river} River near ${burg.name}`}); + count--; + } + }() + + void function addInns() { + const maxRoad = d3.max(cells.road) * .9; + let taverns = Array.from(cells.i).filter(i => cells.crossroad[i] && cells.h[i] >= 20 && cells.road[i] > maxRoad); + if (!taverns.length) return; + addMarker("inn", "🍻", 50, 50, 17.5); + + const color = ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"]; + const animal = ["Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Wolf", "Wolverine", "Camel", "Falcon", "Hound", "Ox"]; + const adj = ["New", "Good", "High", "Old", "Great", "Big", "Major", "Happy", "Main", "Huge", "Far", "Beautiful", "Fair", "Prime", "Ancient", "Golden", "Proud", "Lucky", "Fat", "Honest", "Giant", "Distant", "Friendly", "Loud", "Hungry", "Magical", "Superior", "Peaceful", "Frozen", "Divine", "Favorable", "Brave", "Sunny", "Flying"]; + + + for (let i=0; i < taverns.length && i < 4; i++) { + const cell = taverns.splice(Math.floor(Math.random() * taverns.length), 1); + const x = cells.p[cell][0], y = cells.p[cell][1]; + const id = getNextId("markerElement"); + + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_inn").attr("data-id", "#marker_inn") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + + const type = Math.random() > .7 ? "inn" : "tavern"; + const name = Math.random() < .5 ? ra(color) + " " + ra(animal) : Math.random() < .6 ? ra(adj) + " " + ra(animal) : ra(adj) + " " + capitalize(type); + notes.push({id, name: "The " + name, legend:`A big and famous roadside ${type}`}); + } + }() + + void function addLighthouses() { + const lands = cells.i.filter(i => cells.harbor[i] > 6 && cells.c[i].some(c => cells.h[c] < 20 && cells.road[c])); + const lighthouses = Array.from(lands).map(i => [i, cells.v[i][cells.c[i].findIndex(c => cells.h[c] < 20 && cells.road[c])]]); + if (lighthouses.length) addMarker("lighthouse", "🚨", 50, 50, 16); + + for (let i=0; i < lighthouses.length && i < 4; i++) { + const cell = lighthouses[i][0], vertex = lighthouses[i][1]; + const x = pack.vertices.p[vertex][0], y = pack.vertices.p[vertex][1]; + const id = getNextId("markerElement"); + + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_lighthouse").attr("data-id", "#marker_lighthouse") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + + const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]); + notes.push({id, name: getAdjective(proper) + " Lighthouse" + name, legend:`A lighthouse to keep the navigation safe`}); + } + }() + + void function addWaterfalls() { + const waterfalls = cells.i.filter(i => cells.r[i] && cells.h[i] > 70); + if (waterfalls.length) addMarker("waterfall", "⟱", 50, 54, 16.5); + + for (let i=0; i < waterfalls.length && i < 3; i++) { + const cell = waterfalls[i]; + const x = cells.p[cell][0], y = cells.p[cell][1]; + const id = getNextId("markerElement"); + + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_waterfall").attr("data-id", "#marker_waterfall") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + + const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]); + notes.push({id, name: getAdjective(proper) + " Waterfall" + name, legend:`An extremely beautiful waterfall`}); + } + }() + + void function addBattlefields() { + let battlefields = Array.from(cells.i).filter(i => cells.pop[i] > 2 && cells.h[i] < 50 && cells.h[i] > 25); + let count = battlefields.length < 100 ? 0 : Math.ceil(battlefields.length / 500); + const era = Names.getCulture(0, 3, 7, "", 0) + " Era"; + if (count) addMarker("battlefield", "⚔", 50, 50, 20); + + while (count) { + const cell = battlefields.splice(Math.floor(Math.random() * battlefields.length), 1); + const x = cells.p[cell][0], y = cells.p[cell][1]; + const id = getNextId("markerElement"); + markers.append("use").attr("id", id) + .attr("xlink:href", "#marker_battlefield").attr("data-id", "#marker_battlefield") + .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30) + .attr("data-size", 1).attr("width", 30).attr("height", 30); + + const name = Names.getCulture(cells.culture[cell]) + " Battlefield"; + const date = new Date(rand(100, 1000),rand(12),rand(31)).toLocaleDateString("en", {year:'numeric', month:'long', day:'numeric'}) + " " + era; + notes.push({id, name, legend:`A historical battlefield spot. \r\nDate: ${date}`}); + count--; + } + }() + + function addMarker(id, icon, x, y, size) { + const markers = svg.select("#defs-markers"); + if (markers.select("#marker_"+id).size()) return; + + const symbol = markers.append("symbol").attr("id", "marker_"+id).attr("viewBox", "0 0 30 30"); + symbol.append("path").attr("d", "M6,19 l9,10 L24,19").attr("fill", "#000000").attr("stroke", "none"); + symbol.append("circle").attr("cx", 15).attr("cy", 15).attr("r", 10).attr("fill", "#ffffff").attr("stroke", "#000000").attr("stroke-width", 1); + symbol.append("text").attr("x", x+"%").attr("y", y+"%").attr("fill", "#000000").attr("stroke", "#3200ff").attr("stroke-width", 0) + .attr("font-size", size+"px").attr("dominant-baseline", "central").text(icon); + } + + console.timeEnd("addMarkers"); +} + // show map stats on generation complete function showStatistics() { const template = templateInput.value; @@ -1121,7 +1381,9 @@ function showStatistics() { Points: ${grid.points.length} Cells: ${pack.cells.i.length} States: ${pack.states.length-1} - Burgs: ${pack.burgs.length-1}`; + Provinces: ${pack.provinces.length-1} + Burgs: ${pack.burgs.length-1} + Religions: ${pack.religions.length-1}`; mapHistory.push({seed, width:graphWidth, height:graphHeight, template, created: Date.now()}); console.log(stats); } @@ -1138,6 +1400,8 @@ const regenerateMap = debounce(function() { // Clear the map function undraw() { - viewbox.selectAll("path, circle, polygon, line, text, use, #ruler > g").remove(); + viewbox.selectAll("path, circle, polygon, line, text, use, #zones > g, #ruler > g").remove(); defs.selectAll("path, clipPath").remove(); + notes = []; + unfog(); } diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js index 244a0693..365e0c7d 100644 --- a/modules/burgs-and-states.js +++ b/modules/burgs-and-states.js @@ -5,11 +5,11 @@ }(this, (function () { 'use strict'; const generate = function() { - console.time("generateBurgsAndStates"); const cells = pack.cells, cultures = pack.cultures, n = cells.i.length; cells.burg = new Uint16Array(n); // cell burg cells.road = new Uint16Array(n); // cell road power + cells.crossroad = new Uint16Array(n); // cell crossroad power const burgs = pack.burgs = placeCapitals(); pack.states = createStates(); @@ -18,11 +18,17 @@ placeTowns(); const townRoutes = Routes.getTrails(); specifyBurgs(); - + const oceanRoutes = Routes.getSearoutes(); expandStates(); normalizeStates(); + collectStatistics(); + assignColors(); + + generateDiplomacy(); + defineStateForms(); + generateProvinces(); Routes.draw(capitalRoutes, townRoutes, oceanRoutes); drawBurgs(); @@ -37,18 +43,14 @@ if (sorted.length < count * 10) { count = Math.floor(sorted.length / 10); - if (!count) { - console.error(`There is no populated cells. Cannot generate states`); - return burgs; - } else { - console.error(`Not enought populated cells (${sorted.length}). Will generate only ${count} states`); - } + if (!count) {console.warn(`There is no populated cells. Cannot generate states`); return burgs;} + else {console.warn(`Not enought populated cells (${sorted.length}). Will generate only ${count} states`);} } let burgsTree = d3.quadtree(); let spacing = (graphWidth + graphHeight) / 2 / count; // min distance between capitals - for (let i = 0; burgs.length <= count; i++) { + for (let i=0; burgs.length <= count; i++) { const cell = sorted[i], x = cells.p[cell][0], y = cells.p[cell][1]; if (burgsTree.find(x, y, spacing) === undefined) { @@ -57,7 +59,7 @@ } if (i === sorted.length - 1) { - console.error("Cannot place capitals with current spacing. Trying again with reduced spacing"); + console.warn("Cannot place capitals with current spacing. Trying again with reduced spacing"); burgsTree = d3.quadtree(); i = -1, burgs = [0], spacing /= 1.2; } @@ -80,18 +82,16 @@ // burgs data b.i = b.state = i; b.culture = cells.culture[b.cell]; - const base = cultures[b.culture].base; - const min = nameBases[base].min-1; - const max = Math.max(nameBases[base].max-2, min); - b.name = Names.getCulture(b.culture, min, max, "", 0); + b.name = Names.getCultureShort(b.culture); b.feature = cells.f[b.cell]; b.capital = true; // states data - const expansionism = rn(Math.random() * powerInput.value / 2 + 1, 1); - const basename = b.name.length < 9 && b.cell%5 === 0 ? b.name : Names.getCulture(b.culture, min, 6, "", 0); + const expansionism = rn(Math.random() * powerInput.value + 1, 1); + const basename = b.name.length < 9 && b.cell%5 === 0 ? b.name : Names.getCultureShort(b.culture); const name = Names.getState(basename, b.culture); - const type = cultures[b.culture].type; + const nomadic = [1, 2, 3, 4].includes(cells.biome[b.cell]); + const type = nomadic ? "Nomadic" : cultures[b.culture].type === "Nomadic" ? "Generic" : cultures[b.culture].type; states.push({i, color: colors[i-1], name, expansionism, capital: i, type, center: b.cell, culture: b.culture}); cells.burg[b.cell] = i; }); @@ -103,38 +103,43 @@ // place secondary settlements based on geo and economical evaluation function placeTowns() { console.time('placeTowns'); - const score = new Int16Array(cells.s.map(s => s * Math.random())); // cell score for towns placement + const score = new Int16Array(cells.s.map(s => s * gauss(1,3,0,20,3))); // cell score for towns placement const sorted = cells.i.filter(i => score[i] > 0 && cells.culture[i]).sort((a, b) => score[b] - score[a]); // filtered and sorted array of indexes - let burgsCount = manorsInput.value == 1000 ? rn(sorted.length / 10 / densityInput.value ** .8) : +manorsInput.value; - burgsCount += burgs.length; - const spacing = (graphWidth + graphHeight) * 9 / burgsCount; // base min distance between towns - const burgsTree = burgs[0]; + const desiredNumber = manorsInput.value == 1000 ? rn(sorted.length / 8 / densityInput.value ** .8) : manorsInput.valueAsNumber; + const burgsNumber = Math.min(desiredNumber, sorted.length); + let burgsAdded = 0; - for (let i = 0; burgs.length < burgsCount && i < sorted.length; i++) { - const id = sorted[i], x = cells.p[id][0], y = cells.p[id][1]; - const s = spacing * Math.random() + 0.5; // randomize to make the placement not uniform - if (burgsTree.find(x, y, s) !== undefined) continue; // to close to existing burg - const burg = burgs.length; - const culture = cells.culture[id]; - const name = Names.getCulture(culture); - const feature = cells.f[id]; - burgs.push({cell: id, x, y, state: 0, i: burg, culture, name, capital: false, feature}); - burgsTree.add([x, y]); - cells.burg[id] = burg; + const burgsTree = burgs[0]; + let spacing = (graphWidth + graphHeight) / 150 / (burgsNumber ** .7 / 66); // min distance between towns + + while (burgsAdded < burgsNumber) { + for (let i=0; burgsAdded < burgsNumber && i < sorted.length; i++) { + const cell = sorted[i], x = cells.p[cell][0], y = cells.p[cell][1]; + const s = spacing * gauss(1, .3, .2, 2, 2); // randomize to make the placement not uniform + if (cells.burg[cell] || burgsTree.find(x, y, s) !== undefined) continue; // to close to existing burg + const burg = burgs.length; + const culture = cells.culture[cell]; + const name = Names.getCulture(culture); + burgs.push({cell, x, y, state: 0, i: burg, culture, name, capital: false, feature:cells.f[cell]}); + burgsTree.add([x, y]); + cells.burg[cell] = burg; + burgsAdded++; + } + spacing *= .5; } - if (burgs.length < burgsCount) console.error(`Cannot place all burgs. Requested ${burgsCount}, placed ${burgs.length-1}`); + if (manorsInput.value != 1000 && burgsAdded < desiredNumber) { + console.error(`Cannot place all burgs. Requested ${desiredNumber}, placed ${burgsAdded}`); + } //const min = d3.min(score.filter(s => s)), max = d3.max(score); //terrs.selectAll("polygon").data(sorted).enter().append("polygon").attr("points", d => getPackPolygon(d)).attr("fill", d => color(1 - normalize(score[d], min, max))); //labels.selectAll("text").data(sorted).enter().append("text").attr("x", d => cells.p[d][0]).attr("y", d => cells.p[d][1]).text(d => score[d]).attr("font-size", 2); burgs[0] = {name:undefined}; - console.timeEnd('placeTowns'); + console.timeEnd('placeTowns'); } - - console.timeEnd("generateBurgsAndStates"); } // define burg coordinates and define details @@ -151,17 +156,20 @@ b.port = port ? cells.f[cells.haven[i]] : 0; // port is defined by feature id it lays on // define burg population (keep urbanization at about 10% rate) - b.population = rn(Math.max((cells.s[i] + cells.road[i]) / 3 + b.i / 1000 + i % 100 / 1000, .1), 3); + b.population = rn(Math.max((cells.s[i] + cells.road[i]) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3); if (b.capital) b.population = rn(b.population * 1.3, 3); // increase capital population if (port) { - b.population = rn(b.population * 1.3, 3); // increase port population + b.population *= b.population * 1.3; // increase port population const e = cells.v[i].filter(v => vertices.c[v].some(c => c === cells.haven[i])); // vertices of common edge b.x = rn((vertices.p[e[0]][0] + vertices.p[e[1]][0]) / 2, 2); b.y = rn((vertices.p[e[0]][1] + vertices.p[e[1]][1]) / 2, 2); continue; } + // add random factor + b.population = rn(b.population * gauss(2,3,.6,20,3), 3); + // shift burgs on rivers semi-randomly and just a bit if (cells.r[i]) { const shift = Math.min(cells.fl[i]/150, 1); @@ -241,7 +249,7 @@ console.time("expandStates"); const cells = pack.cells, states = pack.states, cultures = pack.cultures, burgs = pack.burgs; - cells.state = new Uint8Array(cells.i.length); // cell state + cells.state = new Uint16Array(cells.i.length); // cell state const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p}); const cost = []; states.filter(s => s.i && !s.removed).forEach(function(s) { @@ -257,21 +265,17 @@ const type = states[s].type; cells.c[n].forEach(function(e) { - const biome = cells.biome[e]; - const cultureCost = states[s].culture === cells.culture[e] ? 10 : 100; - const biomeCost = getBiomeCost(cells.road[e], b, biome, type); - const heightCost = getHeightCost(cells.h[e], type); + const cultureCost = states[s].culture === cells.culture[e] ? -9 : 700; + const biomeCost = getBiomeCost(cells.road[e], b, cells.biome[e], type); + const heightCost = getHeightCost(pack.features[cells.f[e]], cells.h[e], type); const riverCost = getRiverCost(cells.r[e], e, type); const typeCost = getTypeCost(cells.t[e], type); - const totalCost = p + (cultureCost + biomeCost + heightCost + riverCost + typeCost) / states[s].expansionism; + const totalCost = p + (10 + cultureCost + biomeCost + heightCost + riverCost + typeCost) / states[s].expansionism; if (totalCost > neutral) return; if (!cost[e] || totalCost < cost[e]) { - if (cells.h[e] >= 20) { - cells.state[e] = s; // assign state to cell - if (cells.burg[e]) burgs[cells.burg[e]].state = s; - } + if (cells.h[e] >= 20) cells.state[e] = s; // assign state to cell cost[e] = totalCost; queue.queue({e, p:totalCost, s, b}); @@ -280,10 +284,10 @@ //debug.append("polyline").attr("points", points).attr("marker-mid", "url(#arrow)").attr("opacity", .6); } }); - } //debug.selectAll(".text").data(cost).enter().append("text").attr("x", (d, e) => cells.p[e][0]-1).attr("y", (d, e) => cells.p[e][1]-1).text(d => d ? rn(d) : "").attr("font-size", 2); + burgs.filter(b => b.i && !b.removed).forEach(b => b.state = cells.state[b.cell]); // assign state to burgs function getBiomeCost(r, b, biome, type) { if (r > 5) return 0; // no penalty if there is a road; @@ -293,19 +297,20 @@ return biomesData.cost[biome]; // general non-native biome penalty } - function getHeightCost(h, type) { - if ((type === "Naval" || type === "Lake") && h < 20) return 200; // low sea crossing penalty for Navals - if (type === "Nomadic" && h < 20) return 10000; // giant sea crossing penalty for Navals + function getHeightCost(f, h, type) { + 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 (type === "Highland" && h < 50) return 30; // penalty for highlanders on lowlands + 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 >= 70) return 100; // general mountains crossing penalty - if (h >= 50) return 30; // general hills crossing penalty + if (h >= 67) return 2200; // general mountains crossing penalty + if (h >= 44) return 300; // general hills crossing penalty return 0; } function getRiverCost(r, i, type) { - if (type === "River") return r ? 0 : 50; // penalty for river cultures + if (type === "River") return r ? 0 : 100; // penalty for river cultures if (!r) return 0; // no penalty for others if there is no river return Math.min(Math.max(cells.fl[i] / 10, 20), 100) // river penalty from 20 to 100 based on flux } @@ -322,44 +327,41 @@ const normalizeStates = function() { console.time("normalizeStates"); - const cells = pack.cells; - const burgs = pack.burgs; + const cells = pack.cells, burgs = pack.burgs; for (const i of cells.i) { - if (cells.h[i] < 20) continue; - const adversaries = cells.c[i].filter(c => cells.h[c] >= 20 && cells.state[c] !== cells.state[i]); - const buddies = cells.c[i].filter(c => cells.h[c] >= 20 && cells.state[c] === cells.state[i]); - if (adversaries.length <= buddies.length) continue; + if (cells.h[i] < 20 || cells.burg[i]) continue; // do not overwrite burgs if (cells.c[i].some(c => burgs[cells.burg[c]].capital)) continue; // do not overwrite near capital - if (burgs[cells.burg[i]].capital) continue; // do not overwrite capital - const newState = cells.state[adversaries[0]]; - cells.state[i] = newState; - if (cells.burg[i]) burgs[cells.burg[i]].state = newState; + const neibs = cells.c[i].filter(c => cells.h[c] >= 20); + const adversaries = neibs.filter(c => cells.state[c] !== cells.state[i]); + if (adversaries.length < 2) continue; + const buddies = neibs.filter(c => cells.state[c] === cells.state[i]); + if (buddies.length > 2) continue; + if (adversaries.length <= buddies.length) continue; + cells.state[i] = cells.state[adversaries[0]]; + //debug.append("circle").attr("cx", cells.p[i][0]).attr("cy", cells.p[i][1]).attr("r", .5).attr("fill", "red"); } console.timeEnd("normalizeStates"); } - // calculate and draw curved state labels - const drawStateLabels = function() { + // calculate and draw curved state labels for a list of states + const drawStateLabels = function(list) { console.time("drawStateLabels"); const cells = pack.cells, features = pack.features, states = pack.states; const paths = []; // text paths lineGen.curve(d3.curveBundle.beta(1)); for (const s of states) { - if (!s.i || s.removed) continue; + if (!s.i || s.removed || (list && !list.includes(s.i))) continue; const used = []; - const hull = getHull(s.center, s.i); + const visualCenter = findCell(s.pole[0], s.pole[1]); + const start = cells.state[visualCenter] === s.i ? visualCenter : s.center; + const hull = getHull(start, s.i, s.cells / 10); const points = [...hull].map(v => pack.vertices.p[v]); - - //const poly = polylabel([points], 1.0); // pole of inaccessibility - //debug.append("circle").attr("r", 3).attr("cx", poly[0]).attr("cy", poly[1]); - const delaunay = Delaunator.from(points); const voronoi = Voronoi(delaunay, points, points.length); - const c = voronoi.vertices; - const chain = connectCenters(c, s.i); - const relaxed = chain.map(i => c.p[i]).filter((p, i) => i%8 === 0 || i+1 === chain.length); + const chain = connectCenters(voronoi.vertices, s.pole[1]); + const relaxed = chain.map(i => voronoi.vertices.p[i]).filter((p, i) => i%15 === 0 || i+1 === chain.length); paths.push([s.i, relaxed]); // if (s.i == 13) debug.selectAll(".circle").data(points).enter().append("circle").attr("cx", d => d[0]).attr("cy", d => d[1]).attr("r", .5).attr("fill", "red"); @@ -367,19 +369,19 @@ // if (s.i == 13) debug.append("path").attr("d", round(lineGen(relaxed))).attr("fill", "none").attr("stroke", "blue").attr("stroke-width", .5); // if (s.i == 13) debug.selectAll(".circle").data(chain).enter().append("circle").attr("cx", d => c.p[d][0]).attr("cy", d => c.p[d][1]).attr("r", 1); - function getHull(start, state) { + function getHull(start, state, maxLake) { const queue = [start], hull = new Set(); while (queue.length) { const q = queue.pop(); const nQ = cells.c[q].filter(c => cells.state[c] === state); + cells.c[q].forEach(function(c, d) { - if (features[cells.f[c]].type === "lake" && features[cells.f[c]].cells < 10) return; // ignore small lakes - if (cells.b[c]) {hull.add(cells.v[q][d]); return;} - if (cells.state[c] !== state) {hull.add(cells.v[q][d]); return;} + const passableLake = features[cells.f[c]].type === "lake" && features[cells.f[c]].cells < maxLake; + if (cells.b[c] || (cells.state[c] !== state && !passableLake)) {hull.add(cells.v[q][d]); return;} const nC = cells.c[c].filter(n => cells.state[n] === state); const intersected = intersect(nQ, nC).length - if (hull.size > 20 && !intersected) {hull.add(cells.v[q][d]); return;} + if (hull.size > 20 && !intersected && !passableLake) {hull.add(cells.v[q][d]); return;} if (used[c]) return; used[c] = 1; queue.push(c); @@ -389,25 +391,28 @@ return hull; } - function connectCenters(c, state) { + function connectCenters(c, y) { // check if vertex is inside the area const inside = c.p.map(function(p) { if (p[0] <= 0 || p[1] <= 0 || p[0] >= graphWidth || p[1] >= graphHeight) return false; // out of the screen return used[findCell(p[0], p[1])]; }); - //if (state == 13) debug.selectAll(".circle").data(c.p).enter().append("circle").attr("cx", d => d[0]).attr("cy", d => d[1]).attr("r", .5).attr("fill", (d, i) => inside[i] ? "green" : "blue"); - - const sorted = d3.range(c.p.length).filter(i => inside[i]).sort((a, b) => c.p[a][0] - c.p[b][0]); - const left = sorted[0] || 0, right = sorted.pop() || 0; + + const pointsInside = d3.range(c.p.length).filter(i => inside[i]); + if (!pointsInside.length) return [0]; + const h = c.p.length < 200 ? 0 : c.p.length < 600 ? .5 : 1; // power of horyzontality shift + const end = pointsInside[d3.scan(pointsInside, (a, b) => (c.p[a][0] - c.p[b][0]) + (Math.abs(c.p[a][1] - y) - Math.abs(c.p[b][1] - y)) * h)]; // left point + const start = pointsInside[d3.scan(pointsInside, (a, b) => (c.p[b][0] - c.p[a][0]) - (Math.abs(c.p[b][1] - y) - Math.abs(c.p[a][1] - y)) * h)]; // right point + //debug.append("line").attr("x1", c.p[start][0]).attr("y1", c.p[start][1]).attr("x2", c.p[end][0]).attr("y2", c.p[end][1]).attr("stroke", "#00dd00"); // connect leftmost and rightmost points with shortest path const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p}); const cost = [], from = []; - queue.queue({e: right, p: 0}); - + queue.queue({e: start, p: 0}); + while (queue.length) { const next = queue.dequeue(), n = next.e, p = next.p; - if (n === left) break; + if (n === end) break; for (const v of c.v[n]) { if (v === -1) continue; @@ -420,9 +425,9 @@ } // restore path - const chain = [left]; - let cur = left; - while (cur !== right) { + const chain = [end]; + let cur = end; + while (cur !== start) { cur = from[cur]; if (inside[cur]) chain.push(cur); } @@ -432,56 +437,556 @@ } void function drawLabels() { - const g = labels.select("#states"), p = defs.select("#textPaths"); - g.selectAll("text").remove(); - p.selectAll("path[id*='stateLabel']").remove(); + const g = labels.select("#states"), t = defs.select("#textPaths"); - const data = paths.map(p => [round(lineGen(p[1])), "stateLabel"+p[0], states[p[0]].name, p[1]]); - p.selectAll(".path").data(data).enter().append("path").attr("d", d => d[0]).attr("id", d => "textPath_"+d[1]); + if (!list) { + g.selectAll("text").remove(); + t.selectAll("path[id*='stateLabel']").remove(); + } - g.selectAll("text").data(data).enter() - .append("text").attr("id", d => d[1]) - .append("textPath").attr("xlink:href", d => "#textPath_"+d[1]) - .attr("startOffset", "50%").text(d => d[2]); + const example = g.append("text").attr("x", 0).attr("x", 0).text("Average"); + const letterLength = example.node().getComputedTextLength() / 7; // average length of 1 letter - // resize label based on its length - g.selectAll("text").each(function(e) { - const textPath = document.getElementById("textPath_"+e[1]) - const pathLength = textPath.getTotalLength(); + paths.forEach(p => { + const id = p[0]; + const s = states[p[0]]; - // if area is too small to get a path and length is 0 - if (pathLength === 0) { - const x = e[3][0][0], y = e[3][0][1]; - textPath.setAttribute("d", `M${x-50},${y}h${100}`); - this.firstChild.setAttribute("font-size", "60%"); - return; + if (list) { + t.select("#textPath_stateLabel"+id).remove(); + g.select("#stateLabel"+id).remove(); } - const copy = g.append("text").text(this.textContent); - const textLength = copy.node().getComputedTextLength(); - copy.remove(); + const path = p[1].length > 1 ? lineGen(p[1]) : `M${p[1][0][0]-50},${p[1][0][1]}h${100}`; + const textPath = t.append("path").attr("d", path).attr("id", "textPath_stateLabel"+id); + const pathLength = p[1].length > 1 ? textPath.node().getTotalLength() / letterLength : 0; // path length in letters - const size = Math.max(Math.min(rn(pathLength / textLength * 60), 175), 60); - this.firstChild.setAttribute("font-size", size+"%"); + let lines = [], ratio = 100; - // prolongate textPath to not trim labels - if (pathLength < 100) { - const mod = 25 / pathLength; - const points = e[3]; + if (pathLength < s.name.length) { + // only short name will fit + lines = splitInTwo(s.name); + ratio = Math.max(Math.min(rn(pathLength / lines[0].length * 60), 150), 50); + } else if (pathLength > s.fullName.length * 2.5) { + // full name will fit in one line + lines = [s.fullName]; + ratio = Math.max(Math.min(rn(pathLength / lines[0].length * 70), 170), 70); + } else { + // try miltilined label + lines = splitInTwo(s.fullName); + ratio = Math.max(Math.min(rn(pathLength / lines[0].length * 60), 150), 70); + } + + // prolongate path if it's too short + if (pathLength && pathLength < lines[0].length) { + const points = p[1]; const f = points[0], l = points[points.length-1]; const dx = l[0] - f[0], dy = l[1] - f[1]; + const mod = Math.abs(letterLength * lines[0].length / dx) / 2; points[0] = [rn(f[0] - dx * mod), rn(f[1] - dy * mod)]; points[points.length-1] = [rn(l[0] + dx * mod), rn(l[1] + dy * mod)]; - textPath.setAttribute("d", round(lineGen(points))); - //debug.append("path").attr("d", round(lineGen(points))).attr("fill", "none").attr("stroke", "red"); + textPath.attr("d", round(lineGen(points))); } - + + example.attr("font-size", ratio+"%"); + const top = (lines.length - 1) / -2; // y offset + const spans = lines.map((l, d) => { + example.text(l); + const left = example.node().getBBox().width / -2; // x offset + return `No cultures, states and burgs will be created.
- Please consider changing the World Configurator settings`; + Please consider changing climate settings in the World Configurator`; $("#alert").dialog({resizable: false, title: "Extreme climate warning", buttons: {Ok: function() {$(this).dialog("close");}} }); return; } else { - console.error(`Not enought populated cells (${populated.length}). Will generate only ${count} cultures`); + console.warn(`Not enought populated cells (${populated.length}). Will generate only ${count} cultures`); alertMessage.innerHTML = ` - There is only ${populated.length} populated cells and it's insufficient livable area.
- Only ${count} out of ${culturesInput.value} requiested cultures will be generated.
- Please consider changing the World Configurator settings`; + There are only ${populated.length} populated cells and it's insufficient livable area.
+ Only ${count} out of ${culturesInput.value} requested cultures will be generated.
+ Please consider changing climate settings in the World Configurator`; $("#alert").dialog({resizable: false, title: "Extreme climate warning", buttons: {Ok: function() {$(this).dialog("close");}} }); @@ -82,11 +82,12 @@ return center; } + // set culture type based on culture center position function defineCultureType(i) { if (cells.h[i] > 50) return "Highland"; // no penalty for hills and moutains, high for other elevations - const f = cells.f[cells.haven[i]]; - if (pack.features[f].type === "lake" && pack.features[f].cells > 5) return "Lake" // low water cross penalty and high for non-along-coastline growth - if (cells.harbor[i] === 1) return "Naval"; // low water cross penalty and high for non-along-coastline growth + const f = pack.features[cells.f[cells.haven[i]]]; // feature + if (f.type === "lake" && f.cells > 5) return "Lake" // low water cross penalty and high for non-along-coastline growth + if ((f.cells < 10 && cells.harbor[i]) || (cells.harbor[i] === 1 && Math.random() < .5)) return "Naval"; // low water cross penalty and high for non-along-coastline growth if (cells.r[i] && cells.fl[i] > 100) return "River"; // no River cross penalty, penalty for non-River growth const b = cells.biome[i]; if (b === 4 || b === 1 || b === 2) return "Nomadic"; // high penalty in forest biomes and near coastline @@ -99,9 +100,9 @@ if (type === "Lake") base = .8; else if (type === "Naval") base = 1.5; else if (type === "River") base = .9; else - if (type === "Nomadic") base = 1.8; else + if (type === "Nomadic") base = 1.5; else if (type === "Hunting") base = .7; else - if (type === "Highland") base = .5; + if (type === "Highland") base = 1.2; return rn((Math.random() * powerInput.value / 2 + 1) * base, 1); } @@ -164,7 +165,7 @@ cells.c[n].forEach(function(e) { const biome = cells.biome[e]; const biomeCost = getBiomeCost(c, biome, type); - const biomeChangeCost = biome === cells.biome[n] ? 0 : 5 * Math.abs(biome - cells.biome[n]); // penalty on biome change + const biomeChangeCost = biome === cells.biome[n] ? 0 : 20; // penalty on biome change const heightCost = getHeightCost(e, cells.h[e], type); const riverCost = getRiverCost(cells.r[e], e, type); const typeCost = getTypeCost(cells.t[e], type); @@ -188,25 +189,28 @@ } function getBiomeCost(c, biome, type) { - if (cells.biome[pack.cultures[c].center] === biome) return biomesData.cost[biome] / 2; // tiny penalty for native biome + if (cells.biome[pack.cultures[c].center] === biome) return 10; // tiny penalty for native biome if (type === "Hunting") return biomesData.cost[biome] * 5; // non-native biome penalty for hunters if (type === "Nomadic" && biome > 4 && biome < 10) return biomesData.cost[biome] * 10; // forest biome penalty for nomads return biomesData.cost[biome] * 2; // general non-native biome penalty } function getHeightCost(i, h, type) { - if ((type === "Naval" || type === "Lake") && h < 20) return cells.area[i]; // low sea crossing penalty for Navals - if (type === "Nomadic" && h < 20) return cells.area[i] * 50; // giant sea crossing penalty for Navals - if (h < 20) return cells.area[i] * 5; // general sea crossing penalty - if (type === "Highland" && h < 50) return 30; // penalty for highlanders on lowlands + const f = pack.features[cells.f[i]], a = cells.area[i]; + if (type === "Lake" && f.type === "lake") return 10; // no lake crossing penalty for Lake cultures + if (type === "Naval" && h < 20) return a * 2; // low sea/lake crossing penalty for Naval cultures + if (type === "Nomadic" && h < 20) return a * 50; // giant sea/lake crossing penalty for Nomads + if (h < 20) return a * 6; // general sea/lake crossing penalty + if (type === "Highland" && h < 44) return 3000; // giant penalty for highlanders on lowlands + if (type === "Highland" && h < 62) return 200; // giant penalty for highlanders on lowhills if (type === "Highland") return 0; // no penalty for highlanders on highlands - if (h >= 70) return 100; // general mountains crossing penalty - if (h >= 50) return 30; // general hills crossing penalty + if (h >= 67) return 200; // general mountains crossing penalty + if (h >= 44) return 30; // general hills crossing penalty return 0; } function getRiverCost(r, i, type) { - if (type === "River") return r ? 0 : 50; // penalty for river cultures + if (type === "River") return r ? 0 : 100; // penalty for river cultures if (!r) return 0; // no penalty for others if there is no river return Math.min(Math.max(cells.fl[i] / 10, 20), 100) // river penalty from 20 to 100 based on flux } diff --git a/modules/names-generator.js b/modules/names-generator.js index e1a90ba4..8c13ca2f 100644 --- a/modules/names-generator.js +++ b/modules/names-generator.js @@ -45,14 +45,14 @@ const data = chains[base]; if (!data || data[" "] === undefined) { - tip("Namesbase " + base + " is incorrect. Please checl in namesbase editor", false, "error"); + tip("Namesbase " + base + " is incorrect. Please check in namesbase editor", false, "error"); console.error("nameBase " + base + " is incorrect!"); return "ERROR"; } if (!min) min = nameBases[base].min; if (!max) max = nameBases[base].max; - if (!dupl) dupl = nameBases[base].d; + if (dupl !== "") dupl = nameBases[base].d; if (!multi) multi = nameBases[base].m; let v = data[" "], cur = v[rand(v.length-1)], w = ""; @@ -82,12 +82,14 @@ if (r.slice(-1) === " ") return r + c.toUpperCase(); if (c === "a" && d[i+1] === "e") return r; // "ae" => "e" if (c === " " && i+1 === d.length) return r; - // remove consonant before 2 consonants - if (i+2 < d.length && !vowel(c) && !vowel(d[i+1]) && !vowel(d[i+2])) return r; + if (i+2 < d.length && !vowel(c) && !vowel(d[i+1]) && !vowel(d[i+2])) return r; // remove consonant before 2 consonants if (i+2 < d.length && c === d[i+1] && c === d[i+2]) return r; // remove tree same letters in a row return r + c; }, ""); + // join the word if any part has only 1 letter + if (name.split(" ").some(part => part.length < 2)) name = name.split(" ").map((p,i) => i ? p.toLowerCase() : p).join(""); + if (name.length < 2) name = nameBase[base][rand(nameBase[base].length-1)]; // rare case when no name generated return name; } @@ -99,6 +101,15 @@ return getBase(base, min, max, dupl, multi); } + // generate short name for culture + const getCultureShort = function(culture) { + if (culture === undefined) {console.error("Please define a culture"); return;} + const base = pack.cultures[culture].base; + const min = nameBases[base].min-1; + const max = Math.max(nameBases[base].max-2, min); + return getBase(base, min, max, "", 0); + } + // generate state name based on capital or random name and culture-specific suffix const getState = function(name, culture) { if (name === undefined) {console.error("Please define a base name"); return;} @@ -145,8 +156,9 @@ const s1 = suffix.charAt(0); if (name.slice(-1) === s1) name = name.slice(0, -1); // remove name last letter if it's a suffix first letter if (vowel(s1) === vowel(name.slice(-1)) && vowel(s1) === vowel(name.slice(-2,-1))) name = name.slice(0, -1); // remove name last char if 2 last chars are the same type as suffix's 1st + if (name.slice(-1) === s1) name = name.slice(0, -1); // remove name last letter if it's a suffix first letter return name + suffix; } - return {getBase, getCulture, getState, updateChain, updateChains}; + return {getBase, getCulture, getCultureShort, getState, updateChain, updateChains}; }))); diff --git a/modules/relief-icons.js b/modules/relief-icons.js index 72e4dd1d..2ad4404f 100644 --- a/modules/relief-icons.js +++ b/modules/relief-icons.js @@ -36,7 +36,7 @@ let h = rn((4 + Math.random()) * size, 2); const icon = getBiomeIcon(i, biomesData.icons[b]); if (icon === "#relief-grass-1") h *= 1.3; - relief.push({t: icon, c: i, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); + relief.push({i: icon, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); } } @@ -46,7 +46,7 @@ for (const [cx, cy] of poissonDiscSampler(e[0], e[1], e[2], e[3], radius)) { if (!d3.polygonContains(polygon, [cx, cy])) continue; - relief.push({t: icon, c: i, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); + relief.push({i: icon, x: rn(cx-h, 2), y: rn(cy-h, 2), s: h*2}); } } @@ -54,9 +54,8 @@ const temp = grid.cells.temp[pack.cells.g[i]]; const type = h > 70 && temp < 0 ? "mountSnow" : h > 70 ? "mount" : "hill"; const size = h > 70 ? (h - 45) * mod : Math.min(Math.max((h - 40) * mod, 3), 6); - return ["#relief-" + type + "-" + getIcon(type), size]; + return [getIcon(type), size]; } - } // sort relief icons by y+size @@ -65,22 +64,24 @@ // append relief icons at once using pure js void function renderRelief() { let reliefHTML = ""; - for (const r of relief) {reliefHTML += ``;} + for (const r of relief) { + reliefHTML += ``; + } terrain.html(reliefHTML); }() console.timeEnd('drawRelief'); } - + function getBiomeIcon(i, b) { let type = b[Math.floor(Math.random() * b.length)]; const temp = grid.cells.temp[pack.cells.g[i]]; if (type === "conifer" && temp < 0) type = "coniferSnow"; - return "#relief-" + type + "-" + getIcon(type); + return getIcon(type); } - function getIcon(type) { - switch (type) { + function getVariant(type) { + switch(type) { case "mount": return rand(2,7); case "mountSnow": return rand(1,6); case "hill": return rand(2,5); @@ -92,7 +93,25 @@ default: return 2; } } - + + function getOldIcon(type) { + switch(type) { + case "mountSnow": return "mount"; + case "vulcan": return "mount"; + case "coniferSnow": return "conifer"; + case "cactus": return "dune"; + case "deadTree": return "dune"; + default: return type; + } + } + + function getIcon(type) { + if (styleReliefSet.value === "simple") return "#relief-" + getOldIcon(type) + "-1"; + if (styleReliefSet.value === "colored") return "#relief-" + type + "-" + getVariant(type); + if (styleReliefSet.value === "gray") return "#relief-" + type + "-" + getVariant(type) + "-bw"; + return "#relief-" + getOldIcon(type) + "-1"; // simple + } + return ReliefIcons; }))); \ No newline at end of file diff --git a/modules/religions-generator.js b/modules/religions-generator.js new file mode 100644 index 00000000..24c0327d --- /dev/null +++ b/modules/religions-generator.js @@ -0,0 +1,310 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global.Religions = factory()); +}(this, (function () {'use strict'; + + // name generation approach and relative chance to be selected + const approach = {"Number":1, "Being":3, "Adjective":5, "Color + Animal":5, + "Adjective + Animal":5, "Adjective + Being":5, "Adjective + Genitive":1, + "Color + Being":3, "Color + Genitive":3, "Being + of + Genitive":2, "Being + of the + Genitive":1, + "Animal + of + Genitive":1, "Adjective + Being + of + Genitive":2, "Adjective + Animal + of + Genitive":2}; + + // turn weighted array into simple array + const approaches = []; + for (const a in approach) { + for (let j=0; j < approach[a]; j++) { + approaches.push(a); + } + } + + const base = { + number: ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"], + being: ["God", "Goddess", "Lord", "Lady", "Deity", "Creator", "Maker", "Overlord", "Ruler", "Chief", "Master", "Spirit", "Ancestor", "Father", "Forebear", "Forefather", "Mother", "Brother", "Sister", "Elder", "Numen", "Ancient", "Virgin", "Giver", "Council", "Guardian", "Reaper"], + animal: ["Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Cobra", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Viper", "Vulture", "Walrus", "Wolf", "Wolverine", "Worm", "Camel", "Falcon", "Hound", "Ox", "Serpent"], + adjective: ["New", "Good", "High", "Old", "Great", "Big", "Young", "Major", "Strong", "Happy", "Last", "Main", "Huge", "Far", "Beautiful", "Wild", "Fair", "Prime", "Crazy", "Ancient", "Golden", "Proud", "Secret", "Lucky", "Sad", "Silent", "Latter", "Severe", "Fat", "Holy", "Pure", "Aggressive", "Honest", "Giant", "Mad", "Pregnant", "Distant", "Lost", "Broken", "Blind", "Friendly", "Unknown", "Sleeping", "Slumbering", "Loud", "Hungry", "Wise", "Worried", "Sacred", "Magical", "Superior", "Patient", "Dead", "Deadly", "Peaceful", "Grateful", "Frozen", "Evil", "Scary", "Burning", "Divine", "Bloody", "Dying", "Waking", "Brutal", "Unhappy", "Calm", "Cruel", "Favorable", "Blond", "Explicit", "Disturbing", "Devastating", "Brave", "Sunny", "Troubled", "Flying", "Sustainable", "Marine", "Fatal", "Inherent", "Selected", "Naval", "Cheerful", "Almighty", "Benevolent", "Eternal", "Immutable", "Infallible"], + genitive: ["Day", "Life", "Death", "Night", "Home", "Fog", "Snow", "Winter", "Summer", "Cold", "Springs", "Gates", "Nature", "Thunder", "Lightning", "War", "Ice", "Frost", "Fire", "Doom", "Fate", "Pain", "Heaven", "Justice", "Light", "Love", "Time", "Victory"], + theGenitive: ["World", "Word", "South", "West", "North", "East", "Sun", "Moon", "Peak", "Fall", "Dawn", "Eclipse", "Abyss", "Blood", "Tree", "Earth", "Harvest", "Rainbow", "Sea", "Sky", "Stars", "Storm", "Underworld", "Wild"], + color: ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"] + }; + + const forms = { + Folk:{"Shamanism":2, "Animism":2, "Ancestor worship":1, "Polytheism":2}, + Organized:{"Polytheism":5, "Dualism":1, "Monotheism":4, "Non-theism":1}, + Cult:{"Cult":1, "Dark Cult":1}, + Heresy:{"Heresy":1} + }; + + const methods = {"Random + type":3, "Random + ism":1, "Supreme + ism":5, "Faith of + Supreme":3, "Place + ism":1, "Culture + ism":1, "Place + ian + type":6, "Culture + type":4}; + + const types = { + "Shamanism":{"Beliefs":3, "Shamanism":2, "Spirits":1}, + "Animism":{"Spirits":1, "Beliefs":1}, + "Ancestor worship":{"Beliefs":1, "Forefathers":2, "Ancestors":2}, + "Polytheism":{"Deities":3, "Faith":1, "Gods":1, "Pantheon":1}, + + "Dualism":{"Religion":3, "Faith":1, "Cult":1}, + "Monotheism":{"Religion":1, "Church":1}, + "Non-theism":{"Beliefs":3, "Spirits":1}, + + "Cult":{"Cult":4, "Sect":4, "Worship":1, "Orden":1, "Coterie":1, "Arcanum":1}, + "Dark Cult":{"Cult":2, "Sect":2, "Occultism":1, "Idols":1, "Coven":1, "Circle":1, "Blasphemy":1}, + + "Heresy":{"Heresy":3, "Sect":2, "Schism":1, "Dissenters":1, "Circle":1, "Brotherhood":1, "Society":1, "Iconoclasm":1, "Dissent":1, "Apostates":1} + }; + + const generate = function() { + console.time('generateReligions'); + const cells = pack.cells, states = pack.states, cultures = pack.cultures; + const religions = pack.religions = []; + cells.religion = new Uint16Array(cells.culture); // cell religion; initially based on culture + + // add folk religions + pack.cultures.forEach(c => { + if (!c.i) {religions.push({i: 0, name: "No religion"}); return;} + const form = rw(forms.Folk); + const name = c.name + " " + rw(types[form]); + const deity = form === "Animism" ? null : getDeityName(c.i); + const color = `url(#hatch${rand(8,13)})`; + religions.push({i: c.i, name, color, culture: c.i, type:"Folk", form, deity}); + }); + + if (religionsInput.value == 0 || pack.cultures.length < 2) return; + + const sorted = cells.i.filter(i => cells.s[i] > 2).sort((a, b) => cells.s[b] - cells.s[a]); // filtered and sorted array of indexes + const religionsTree = d3.quadtree(); + const spacing = (graphWidth + graphHeight) / 6 / religionsInput.value; // base min distance between towns + const cultsCount = Math.floor(rand(10, 40) / 100 * religionsInput.value); + const count = +religionsInput.value - cultsCount + religions.length; + + // generate organized religions + for (let i=0; religions.length < count && i < 1000; i++) { + let center = sorted[biased(0, sorted.length-1, 5)]; // religion center + const form = rw(forms.Organized); + const state = cells.state[center]; + const culture = cells.culture[center]; + + const deity = form === "Non-theism" ? null : getDeityName(culture); + const [name, expansion] = getReligionName(form, deity, center); + + if (expansion === "state" && state && Math.random() > .5) center = states[state].center; + if (expansion === "culture" && culture && Math.random() > .5) center = cultures[culture].center; + if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]); + const x = cells.p[center][0], y = cells.p[center][1]; + + const s = spacing * gauss(1, .3, .2, 2, 2); // randomize to make the placement not uniform + if (religionsTree.find(x, y, s) !== undefined) continue; // to close to existing religion + + const expansionism = rand(3, 8); + const color = `url(#hatch${rand(0,5)})`; + religions.push({i: religions.length, name, color, culture, type:"Organized", form, deity, expansion, expansionism, center}); + religionsTree.add([x, y]); + //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "blue"); + } + + // generate cults + for (let i=0; religions.length < count + cultsCount && i < 1000; i++) { + const form = rw(forms.Cult); + let center = sorted[biased(0, sorted.length-1, 1)]; // religion center + if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]); + const x = cells.p[center][0], y = cells.p[center][1]; + + const s = spacing * gauss(2, .3, 1, 3, 2); // randomize to make the placement not uniform + if (religionsTree.find(x, y, s) !== undefined) continue; // to close to existing religion + + const culture = cells.culture[center]; + const deity = getDeityName(culture); + const name = getCultName(form, center); + const expansionism = gauss(1.1, .5, 0, 5); + religions.push({i: religions.length, name, color: "url(#hatch7)", culture, type:"Cult", form, deity, expansion:"global", expansionism, center}); + religionsTree.add([x, y]); + //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "red"); + } + + expandReligions(); + + // generate heresies + religions.filter(r => r.type === "Organized").forEach(r => { + if (r.expansionism < 3) return; + const count = gauss(0, 1, 0, 3); + for (let i=0; i < count; i++) { + let center = ra(cells.i.filter(i => cells.religion[i] === r.i && cells.c[i].some(c => cells.religion[c] !== r.i))); + if (!center) continue; + if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]); + const x = cells.p[center][0], y = cells.p[center][1]; + if (religionsTree.find(x, y, spacing / 10) !== undefined) continue; // to close to other + + const culture = cells.culture[center]; + const name = getCultName("Heresy", center); + const expansionism = gauss(1.2, .5, 0, 5); + religions.push({i: religions.length, name, color:"url(#hatch6)", culture, type:"Heresy", form:"Heresy", deity: r.deity, expansion:"global", expansionism, center}); + religionsTree.add([x, y]); + //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "green"); + } + }); + + expandHeresies(); + + console.timeEnd('generateReligions'); + } + + const add = function(center) { + const cells = pack.cells, religions = pack.religions; + const r = cells.religion[center]; + const i = religions.length; + const culture = cells.culture[center]; + const color = getRandomColor(); + + const type = religions[r].type === "Organized" ? rw({Organized:4, Cult:1, Heresy:2}) : rw({Organized:5, Cult:2}); + const form = rw(forms[type]); + const deity = form === "Heresy" ? religions[r].deity : form === "Non-theism" ? null : getDeityName(culture); + + let name, expansion; + if (type === "Organized") [name, expansion] = getReligionName(form, deity, center) + else {name = getCultName(form, center); expansion = "global";} + + religions.push({i, name, color, culture, type, form, deity, expansion, expansionism:0, center, area: 0, rural: 0, urban: 0}); + } + + // growth algorithm to assign cells to religions + const expandReligions = function() { + console.time("expandReligions"); + const cells = pack.cells, religions = pack.religions; + const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p}); + const cost = []; + + religions.filter(r => r.type === "Organized" || r.type === "Cult").forEach(r => { + cells.religion[r.center] = r.i; + queue.queue({e:r.center, p:0, r:r.i}); + cost[r.center] = 1; + }); + + const neutral = cells.i.length / 5000 * 200 * gauss(1, .3, .2, 2, 2) * neutralInput.value; // limit cost for organized religions growth + + while (queue.length) { + const next = queue.dequeue(), n = next.e, p = next.p, r = next.r; + const expansion = religions[r].expansion; + + cells.c[n].forEach(function(e) { + const cultureCost = expansion === "culture" ? religions[r].culture == cells.culture[e] ? 0 : 20000 : 10; + const stateCost = expansion === "state" ? cells.state[religions[r].center] == cells.state[e] ? 0 : 20000 : 10; + const biomeCost = cells.road[e] ? 0 : biomesData.cost[cells.biome[e]]; + const heightCost = Math.max(cells.h[e], 20) - 20; + const waterCost = cells.h[e] < 20 ? cells.road[e] ? 50 : 1000 : 0; + const totalCost = p + (cultureCost + stateCost + biomeCost + heightCost + waterCost) / religions[r].expansionism; + + if (totalCost > neutral) return; + + if (!cost[e] || totalCost < cost[e]) { + if (cells.h[e] >= 20 && cells.culture[e]) cells.religion[e] = r; // assign religion to cell + cost[e] = totalCost; + queue.queue({e, p:totalCost, r}); + } + }); + } + //debug.selectAll(".text").data(cost).enter().append("text").attr("x", (d, e) => cells.p[e][0]-1).attr("y", (d, e) => cells.p[e][1]-1).text(d => d ? rn(d) : "").attr("font-size", 2); + console.timeEnd("expandReligions"); + } + + // growth algorithm to assign cells to heresies + const expandHeresies = function() { + console.time("expandHeresies"); + const cells = pack.cells, religions = pack.religions; + const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p}); + const cost = []; + + religions.filter(r => r.form === "Heresy").forEach(r => { + const b = cells.religion[r.center]; // "base" religion id + cells.religion[r.center] = r.i; // heresy id + queue.queue({e:r.center, p:0, r:r.i, b}); + cost[r.center] = 1; + }); + + const neutral = cells.i.length / 5000 * 500 * neutralInput.value; // limit cost for heresies growth + + while (queue.length) { + const next = queue.dequeue(), n = next.e, p = next.p, r = next.r, b = next.b; + + cells.c[n].forEach(function(e) { + const religionCost = cells.religion[e] === b ? 0 : 2000; + const biomeCost = cells.road[e] ? 0 : biomesData.cost[cells.biome[e]]; + const heightCost = Math.max(cells.h[e], 20) - 20; + const waterCost = cells.h[e] < 20 ? cells.road[e] ? 50 : 1000 : 0; + const totalCost = p + (religionCost + biomeCost + heightCost + waterCost) / Math.max(religions[r].expansionism, .1); + + if (totalCost > neutral) return; + + if (!cost[e] || totalCost < cost[e]) { + if (cells.h[e] >= 20 && cells.culture[e]) cells.religion[e] = r; // assign religion to cell + cost[e] = totalCost; + queue.queue({e, p:totalCost, r}); + } + }); + } + //debug.selectAll(".text").data(cost).enter().append("text").attr("x", (d, e) => cells.p[e][0]-1).attr("y", (d, e) => cells.p[e][1]-1).text(d => d ? rn(d) : "").attr("font-size", 2); + console.timeEnd("expandHeresies"); + } + + // get supreme deity name + const getDeityName = function(culture) { + if (culture === undefined) {console.error("Please define a culture"); return;} + const meaning = generateMeaning(); + const cultureName = Names.getCulture(culture, null, null, "", .8); + return cultureName + ", The " + meaning; + } + + function generateMeaning() { + const a = ra(approaches); // select generation approach + if (a === "Number") return ra(base.number); + if (a === "Being") return ra(base.being); + if (a === "Adjective") return ra(base.adjective); + if (a === "Color + Animal") return ra(base.color) + " " + ra(base.animal); + if (a === "Adjective + Animal") return ra(base.adjective) + " " + ra(base.animal); + if (a === "Adjective + Being") return ra(base.adjective) + " " + ra(base.being); + if (a === "Adjective + Genitive") return ra(base.adjective) + " " + ra(base.genitive); + if (a === "Color + Being") return ra(base.color) + " " + ra(base.being); + if (a === "Color + Genitive") return ra(base.color) + " " + ra(base.genitive); + if (a === "Being + of + Genitive") return ra(base.being) + " of " + ra(base.genitive); + if (a === "Being + of the + Genitive") return ra(base.being) + " of the " + ra(base.theGenitive); + if (a === "Animal + of + Genitive") return ra(base.animal) + " of " + ra(base.genitive); + if (a === "Adjective + Being + of + Genitive") return ra(base.adjective) + " " + ra(base.being) + " of " + ra(base.genitive); + if (a === "Adjective + Animal + of + Genitive") return ra(base.adjective) + " " + ra(base.animal) + " of " + ra(base.genitive); + } + + function getReligionName(form, deity, center) { + const cells = pack.cells; + const random = function() {return Names.getCulture(cells.culture[center], null, null, "", 0);} + const type = function() {return rw(types[form]);} + const supreme = function() {return deity.split(/[ ,]+/)[0];} + const place = function(adj) { + const base = cells.burg[center] ? pack.burgs[cells.burg[center]].name : pack.states[cells.state[center]].name; + let name = trimVowels(base.split(/[ ,]+/)[0]); + return adj ? getAdjective(name) : name; + } + const culture = function() {return pack.cultures[cells.culture[center]].name;} + + const m = rw(methods); + if (m === "Random + type") return [random() + " " + type(), "global"]; + if (m === "Random + ism") return [trimVowels(random()) + "ism", "global"]; + if (m === "Supreme + ism" && deity) return [trimVowels(supreme()) + "ism", "global"]; + if (m === "Faith of + Supreme" && deity) return ["Faith of " + supreme(), "global"]; + if (m === "Place + ism") return [place() + "ism", "global"]; + if (m === "Culture + ism") return [trimVowels(culture()) + "ism", "culture"]; + if (m === "Place + ian + type") return [place("adj") + " " + type(), "state"]; + if (m === "Culture + type") return [culture() + " " + type(), "culture"]; + return [trimVowels(random()) + "ism", "global"]; // else + } + + function getCultName(form, center) { + const cells = pack.cells; + const type = function() {return rw(types[form]);} + const random = function() {return trimVowels(Names.getCulture(cells.culture[center], null, null, "", 0).split(/[ ,]+/)[0]);} + const burg = function() {return trimVowels(pack.burgs[cells.burg[center]].name.split(/[ ,]+/)[0]);} + if (cells.burg[center]) return burg() + "ian " + type(); + if (Math.random() > .5) return random() + "ian " + type(); + return type() + " of the " + generateMeaning(); + }; + + return {generate, add, getDeityName, expandReligions}; + +}))); \ No newline at end of file diff --git a/modules/routes-generator.js b/modules/routes-generator.js index 783943ca..fc4b931b 100644 --- a/modules/routes-generator.js +++ b/modules/routes-generator.js @@ -148,6 +148,7 @@ const regenerate = function() { routes.selectAll("path").remove(); pack.cells.road = new Uint16Array(pack.cells.i.length); + pack.cells.crossroad = new Uint16Array(pack.cells.i.length); const main = getRoads(); const small = getTrails(); const ocean = getSearoutes(); @@ -203,8 +204,8 @@ if (segment.length) { segment.push(current); path.push(segment); - if (segment[0] !== end) cells.road[segment[0]] += score; // crossroad - if (current !== start) cells.road[current] += score; // crossroad + if (segment[0] !== end) {cells.road[segment[0]] += score; cells.crossroad[segment[0]] += score;} + if (current !== start) {cells.road[current] += score; cells.crossroad[current] += score;} } segment = []; prev = current; diff --git a/modules/save-and-load.js b/modules/save-and-load.js index f82cd044..746160d6 100644 --- a/modules/save-and-load.js +++ b/modules/save-and-load.js @@ -12,7 +12,19 @@ function saveAsImage(type) { const clone = d3.select("#fantasyMap"); if (type === "svg") clone.select("#viewbox").attr("transform", null); // reset transform to show whole map - if (layerIsOn("texture") && type === "png") clone.select("#texture").remove(); // no texture for png + + // remove unused elements + if (!clone.select("#terrain").selectAll("use").size()) clone.select("#defs-relief").remove(); + if (!clone.select("#prec").selectAll("circle").size()) clone.select("#prec").remove(); + const removeEmptyGroups = function() { + let empty = 0; + clone.selectAll("g").each(function() { + if (!this.hasChildNodes() || this.style.display === "none") {empty++; this.remove();} + if (this.hasAttribute("display") && this.style.display === "inline") this.removeAttribute("display"); + }); + return empty; + } + while(removeEmptyGroups()) {removeEmptyGroups();} // for each g element get inline style const emptyG = clone.append("g").node(); @@ -73,9 +85,13 @@ function saveAsImage(type) { link.href = url; document.body.appendChild(link); link.click(); + tip(`${link.download} is saved. Open "Downloads" screen (crtl + J) to check`, true, "warning"); } - window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000); + window.setTimeout(function() { + window.URL.revokeObjectURL(url); + clearMainTip(); + }, 3000); console.timeEnd("saveAsImage"); }); } @@ -84,14 +100,16 @@ function saveAsImage(type) { function getFontsToLoad() { const webSafe = ["Georgia", "Times+New+Roman", "Comic+Sans+MS", "Lucida+Sans+Unicode", "Courier+New", "Verdana", "Arial", "Impact"]; - const fontsInUse = []; // to store fonts currently in use + const fontsInUse = new Set(); // to store fonts currently in use labels.selectAll("g").each(function() { const font = this.dataset.font; if (!font) return; if (webSafe.includes(font)) return; // do not fetch web-safe fonts - if (!fontsInUse.includes(font)) fontsInUse.push(font); + fontsInUse.add(font); }); - return "https://fonts.googleapis.com/css?family=" + fontsInUse.join("|"); + const legendFont = legend.attr("data-font"); + if (!webSafe.includes(legendFont)) fontsInUse.add(); + return "https://fonts.googleapis.com/css?family=" + [...fontsInUse].join("|"); } // code from Kaiido's answer https://stackoverflow.com/questions/42402584/how-to-use-google-fonts-in-canvas-when-drawing-dom-objects-in-svg @@ -135,15 +153,16 @@ function GFontToDataURI(url) { // Save in .map format function saveMap() { - if (customization) {tip("Map cannot be saved when is in edit mode, please exit the mode and re-try", false, "error"); return;} + if (customization) {tip("Map cannot be saved when is in edit mode, please exit the mode and retry", false, "error"); return;} console.time("saveMap"); + closeDialogs(); const date = new Date(); const dateString = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate(); const license = "File can be loaded in azgaar.github.io/Fantasy-Map-Generator"; const params = [version, license, dateString, seed, graphWidth, graphHeight].join("|"); - const options = [distanceUnit.value, distanceScale.value, areaUnit.value, heightUnit.value, heightExponent.value, temperatureScale.value, + const options = [distanceUnitInput.value, distanceScaleInput.value, areaUnit.value, heightUnit.value, heightExponentInput.value, temperatureScale.value, barSize.value, barLabel.value, barBackOpacity.value, barBackColor.value, barPosX.value, barPosY.value, populationRate.value, urbanization.value, - equatorOutput.value, equidistanceOutput.value, temperatureEquatorOutput.value, temperaturePoleOutput.value, precOutput.value, JSON.stringify(winds)].join("|"); + mapSizeOutput.value, latitudeOutput.value, temperatureEquatorOutput.value, temperaturePoleOutput.value, precOutput.value, JSON.stringify(winds)].join("|"); const coords = JSON.stringify(mapCoordinates); const biomes = [biomesData.color, biomesData.habitability, biomesData.name].join("|"); const notesData = JSON.stringify(notes); @@ -159,12 +178,16 @@ function saveMap() { const cultures = JSON.stringify(pack.cultures); const states = JSON.stringify(pack.states); const burgs = JSON.stringify(pack.burgs); + const religions = JSON.stringify(pack.religions); + const provinces = JSON.stringify(pack.provinces); + // data format as below const data = [params, options, coords, biomes, notesData, svg_xml, gridGeneral, grid.cells.h, grid.cells.prec, grid.cells.f, grid.cells.t, grid.cells.temp, features, cultures, states, burgs, pack.cells.biome, pack.cells.burg, pack.cells.conf, pack.cells.culture, pack.cells.fl, - pack.cells.pop, pack.cells.r, pack.cells.road, pack.cells.s, pack.cells.state].join("\r\n"); + pack.cells.pop, pack.cells.r, pack.cells.road, pack.cells.s, pack.cells.state, + pack.cells.religion, pack.cells.province, pack.cells.crossroad, religions, provinces].join("\r\n"); const dataBlob = new Blob([data], {type: "text/plain"}); const dataURL = window.URL.createObjectURL(dataBlob); const link = document.createElement("a"); @@ -172,12 +195,16 @@ function saveMap() { link.href = dataURL; document.body.appendChild(link); link.click(); + tip(`${link.download} is saved. Open "Downloads" screen (crtl + J) to check`, true, "warning"); // restore initial values svg.attr("width", svgWidth).attr("height", svgHeight); zoom.transform(svg, transform); - window.setTimeout(function() {window.URL.revokeObjectURL(dataURL);}, 2000); + window.setTimeout(function() { + window.URL.revokeObjectURL(dataURL); + clearMainTip(); + }, 3000); console.timeEnd("saveMap"); } @@ -202,11 +229,11 @@ function uploadFile(file, callback) {
Please keep using an ${archive}`; } else { load = true; - message = `The map version (${mapVersion}) does not match the Generator version (${version}). The map will be auto-updated. -
In case of issues please keep using an ${archive} of the Generator`; + message = `The map version (${mapVersion}) does not match the Generator version (${version}). +
The map will be auto-updated. In case of issues please keep using an ${archive} of the Generator`; } alertMessage.innerHTML = message; - $("#alert").dialog({title: "Version conflict", buttons: { + $("#alert").dialog({title: "Version conflict", width: 380, buttons: { OK: function() {$(this).dialog("close"); if (load) parseLoadedData(data);} }}); }; @@ -218,6 +245,7 @@ function uploadFile(file, callback) { function parseLoadedData(data) { closeDialogs(); const reliefIcons = document.getElementById("defs-relief").innerHTML; // save relief icons + const hatching = document.getElementById("hatching").cloneNode(true); // save hatching void function parseParameters() { const params = data[0].split("|"); @@ -228,22 +256,22 @@ function parseLoadedData(data) { void function parseOptions() { const options = data[1].split("|"); - if (options[0]) distanceUnit.value = distanceUnitOutput.innerHTML = options[0]; - if (options[1]) distanceScale.value = distanceScaleSlider.value = options[1]; + if (options[0]) applyOption(distanceUnitInput, options[0]); + if (options[1]) distanceScaleInput.value = distanceScaleOutput.value = options[1]; if (options[2]) areaUnit.value = options[2]; - if (options[3]) heightUnit.value= options[3]; - if (options[4]) heightExponent.value = heightExponentSlider.value = options[4]; + if (options[3]) applyOption(heightUnit, options[3]); + if (options[4]) heightExponentInput.value = heightExponentOutput.value = options[4]; if (options[5]) temperatureScale.value = options[5]; - if (options[6]) barSize.value = barSizeSlider.value = options[6]; + if (options[6]) barSize.value = barSizeOutput.value = options[6]; if (options[7] !== undefined) barLabel.value = options[7]; if (options[8] !== undefined) barBackOpacity.value = options[8]; if (options[9]) barBackColor.value = options[9]; if (options[10]) barPosX.value = options[10]; if (options[11]) barPosY.value = options[11]; - if (options[12]) populationRate.value = populationRateSlider.value = options[12]; - if (options[13]) urbanization.value = urbanizationSlider.value = options[13]; - if (options[14]) equatorInput.value = equatorOutput.value = options[14]; - if (options[15]) equidistanceInput.value = equidistanceOutput.value = options[15]; + if (options[12]) populationRate.value = populationRateOutput.value = options[12]; + if (options[13]) urbanization.value = urbanizationOutput.value = options[13]; + if (options[14]) mapSizeInput.value = mapSizeOutput.value = Math.max(Math.min(options[14], 100), 1); + if (options[15]) latitudeInput.value = latitudeOutput.value = Math.max(Math.min(options[15], 100), 0); if (options[16]) temperatureEquatorInput.value = temperatureEquatorOutput.value = options[16]; if (options[17]) temperaturePoleInput.value = temperaturePoleOutput.value = options[17]; if (options[18]) precInput.value = precOutput.value = options[18]; @@ -255,14 +283,18 @@ function parseLoadedData(data) { if (data[4]) notes = JSON.parse(data[4]); const biomes = data[3].split("|"); - const name = biomes[2].split(","); - if (name.length !== biomesData.name.length) { - console.error("Biomes data is not correct and will not be loaded"); - return; - } + biomesData = applyDefaultBiomesSystem(); biomesData.color = biomes[0].split(","); biomesData.habitability = biomes[1].split(",").map(h => +h); - biomesData.name = name; + biomesData.name = biomes[2].split(","); + + // push custom biomes if any + for (let i=biomesData.i.length; i < biomesData.name.length; i++) { + biomesData.i.push(biomesData.i.length); + biomesData.iconsDensity.push(0); + biomesData.icons.push([]); + biomesData.cost.push(50); + } }() void function replaceSVG() { @@ -275,6 +307,7 @@ function parseLoadedData(data) { defs = svg.select("#deftemp"); viewbox = svg.select("#viewbox"); scaleBar = svg.select("#scaleBar"); + legend = svg.select("#legend"); ocean = viewbox.select("#ocean"); oceanLayers = ocean.select("#oceanLayers"); oceanPattern = ocean.select("#oceanPattern"); @@ -289,11 +322,16 @@ function parseLoadedData(data) { compass = viewbox.select("#compass"); rivers = viewbox.select("#rivers"); terrain = viewbox.select("#terrain"); + relig = viewbox.select("#relig"); cults = viewbox.select("#cults"); regions = viewbox.select("#regions"); statesBody = regions.select("#statesBody"); statesHalo = regions.select("#statesHalo"); + provs = viewbox.select("#provs"); + zones = viewbox.select("#zones"); borders = viewbox.select("#borders"); + stateBorders = borders.select("#stateBorders"); + provinceBorders = borders.select("#provinceBorders"); routes = viewbox.select("#routes"); roads = routes.select("#roads"); trails = routes.select("#trails"); @@ -308,6 +346,7 @@ function parseLoadedData(data) { anchors = icons.select("#anchors"); markers = viewbox.select("#markers"); ruler = viewbox.select("#ruler"); + fogging = viewbox.select("#fogging"); debug = viewbox.select("#debug"); freshwater = lakes.select("#freshwater"); salt = lakes.select("#salt"); @@ -332,17 +371,23 @@ function parseLoadedData(data) { pack.cultures = JSON.parse(data[13]); pack.states = JSON.parse(data[14]); pack.burgs = JSON.parse(data[15]); + pack.religions = data[29] ? JSON.parse(data[29]) : [{i: 0, name: "No religion"}]; + pack.provinces = data[30] ? JSON.parse(data[30]) : [0]; - pack.cells.biome = Uint8Array.from(data[16].split(",")); - pack.cells.burg = Uint16Array.from(data[17].split(",")); - pack.cells.conf = Uint8Array.from(data[18].split(",")); - pack.cells.culture = Uint8Array.from(data[19].split(",")); - pack.cells.fl = Uint16Array.from(data[20].split(",")); - pack.cells.pop = Uint16Array.from(data[21].split(",")); - pack.cells.r = Uint16Array.from(data[22].split(",")); - pack.cells.road = Uint16Array.from(data[23].split(",")); - pack.cells.s = Uint16Array.from(data[24].split(",")); - pack.cells.state = Uint8Array.from(data[25].split(",")); + const cells = pack.cells; + cells.biome = Uint8Array.from(data[16].split(",")); + cells.burg = Uint16Array.from(data[17].split(",")); + cells.conf = Uint8Array.from(data[18].split(",")); + cells.culture = Uint16Array.from(data[19].split(",")); + cells.fl = Uint16Array.from(data[20].split(",")); + cells.pop = Uint16Array.from(data[21].split(",")); + cells.r = Uint16Array.from(data[22].split(",")); + cells.road = Uint16Array.from(data[23].split(",")); + cells.s = Uint16Array.from(data[24].split(",")); + cells.state = Uint16Array.from(data[25].split(",")); + cells.religion = data[26] ? Uint16Array.from(data[26].split(",")) : new Uint16Array(cells.i.length); + cells.province = data[27] ? Uint16Array.from(data[27].split(",")) : new Uint16Array(cells.i.length); + cells.crossroad = data[28] ? Uint16Array.from(data[28].split(",")) : new Uint16Array(cells.i.length); }() void function restoreLayersState() { @@ -355,15 +400,18 @@ function parseLoadedData(data) { if (compass.style("display") !== "none" && compass.select("use").size()) turnButtonOn("toggleCompass"); else turnButtonOff("toggleCompass"); if (rivers.style("display") !== "none") turnButtonOn("toggleRivers"); else turnButtonOff("toggleRivers"); if (terrain.style("display") !== "none" && terrain.selectAll("*").size()) turnButtonOn("toggleRelief"); else turnButtonOff("toggleRelief"); + if (relig.selectAll("*").size()) turnButtonOn("toggleReligions"); else turnButtonOff("toggleReligions"); if (cults.selectAll("*").size()) turnButtonOn("toggleCultures"); else turnButtonOff("toggleCultures"); if (statesBody.selectAll("*").size()) turnButtonOn("toggleStates"); else turnButtonOff("toggleStates"); - if (borders.style("display") !== "none" && borders.selectAll("*").size()) turnButtonOn("toggleBorders"); else turnButtonOff("toggleBorders"); + if (provs.selectAll("*").size()) turnButtonOn("toggleProvinces"); else turnButtonOff("toggleProvinces"); + if (zones.selectAll("*").size() && zones.style("display") !== "none") turnButtonOn("toggleZones"); else turnButtonOff("toggleZones"); + if (borders.style("display") !== "none") turnButtonOn("toggleBorders"); else turnButtonOff("toggleBorders"); if (routes.style("display") !== "none" && routes.selectAll("path").size()) turnButtonOn("toggleRoutes"); else turnButtonOff("toggleRoutes"); if (temperature.selectAll("*").size()) turnButtonOn("toggleTemp"); else turnButtonOff("toggleTemp"); if (prec.selectAll("circle").size()) turnButtonOn("togglePrec"); else turnButtonOff("togglePrec"); if (labels.style("display") !== "none") turnButtonOn("toggleLabels"); else turnButtonOff("toggleLabels"); if (icons.style("display") !== "none") turnButtonOn("toggleIcons"); else turnButtonOff("toggleIcons"); - if (markers.style("display") !== "none") turnButtonOn("toggleMarkers"); else turnButtonOff("toggleMarkers"); + if (markers.selectAll("*").size() && markers.style("display") !== "none") turnButtonOn("toggleMarkers"); else turnButtonOff("toggleMarkers"); if (ruler.style("display") !== "none") turnButtonOn("toggleRulers"); else turnButtonOff("toggleRulers"); if (scaleBar.style("display") !== "none") turnButtonOn("toggleScaleBar"); else turnButtonOff("toggleScaleBar"); @@ -371,27 +419,89 @@ function parseLoadedData(data) { const populationIsOn = population.selectAll("line").size(); if (populationIsOn) drawPopulation(); if (populationIsOn) turnButtonOn("togglePopulation"); else turnButtonOff("togglePopulation"); + + getCurrentPreset(); }() void function restoreRulersEvents() { ruler.selectAll("g").call(d3.drag().on("start", dragRuler)); ruler.selectAll("text").on("click", removeParent); - ruler.selectAll("g.ruler circle").call(d3.drag().on("drag", dragRulerEdge)); ruler.selectAll("g.ruler circle").call(d3.drag().on("drag", dragRulerEdge)); ruler.selectAll("g.ruler rect").call(d3.drag().on("start", rulerCenterDrag)); - ruler.selectAll("g.opisometer circle").call(d3.drag().on("start", dragOpisometerEnd)); ruler.selectAll("g.opisometer circle").call(d3.drag().on("start", dragOpisometerEnd)); }() void function resolveVersionConflicts() { - if (parseFloat(data[0].split("|")[0]) == 0.8) { + const version = parseFloat(data[0].split("|")[0]); + if (version == 0.8) { // 0.9 has additional relief icons to be included into older maps document.getElementById("defs-relief").innerHTML = reliefIcons; + } - // 0.8.28b changed opacity slider from regions to statesBody - document.getElementById("regions").removeAttribute("opacity"); + if (version < 1) { + // 1.0 adds a new religions layer + relig = viewbox.insert("g", "#terrain").attr("id", "cults"); + Religions.generate(); + + // 1.0 adds a legend box + legend = svg.append("g").attr("id", "legend"); + legend.attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC") + .attr("font-size", 13).attr("data-size", 13).attr("data-x", 99).attr("data-y", 93) + .attr("stroke-width", 2.5).attr("stroke", "#812929").attr("stroke-dasharray", "0 4 10 4").attr("stroke-linecap", "round"); + + // 1.0 separated drawBorders fron drawStates() + stateBorders = borders.append("g").attr("id", "stateBorders"); + provinceBorders = borders.append("g").attr("id", "provinceBorders"); + borders.attr("opacity", null).attr("stroke", null).attr("stroke-width", null).attr("stroke-dasharray", null).attr("stroke-linecap", null).attr("filter", null); + stateBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt"); + provinceBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", .5).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt"); + + // 1.0 adds state relations, provinces, forms and full names + provs = viewbox.insert("g", "#borders").attr("id", "provs").attr("opacity", .6); + BurgsAndStates.collectStatistics(); + BurgsAndStates.generateDiplomacy(); + BurgsAndStates.defineStateForms(); + drawStates(); + BurgsAndStates.generateProvinces(); + drawBorders(); + if (!layerIsOn("toggleBorders")) $('#borders').fadeOut(); + if (!layerIsOn("toggleStates")) regions.attr("display", "none").selectAll("path").remove(); + + // 1.0 adds hatching + document.getElementsByTagName("defs")[0].appendChild(hatching); + + // 1.0 adds zones layer + zones = viewbox.insert("g", "#borders").attr("id", "zones").attr("display", "none"); + zones.attr("opacity", .6).attr("stroke", null).attr("stroke-width", 0).attr("stroke-dasharray", null).attr("stroke-linecap", "butt"); + addZone(); + if (!markers.selectAll("*").size()) {addMarkers(); turnButtonOn("toggleMarkers");} + + // 1.0 add fogging layer (state focus) + let fogging = viewbox.insert("g", "#ruler").attr("id", "fogging-cont").attr("mask", "url(#fog)") + .append("g").attr("id", "fogging").attr("display", "none"); + fogging.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%"); + defs.append("mask").attr("id", "fog").append("rect").attr("x", 0).attr("y", 0).attr("width", "100%") + .attr("height", "100%").attr("fill", "white"); + + // 1.0 changes states opacity bask to regions level + if (statesBody.attr("opacity")) { + regions.attr("opacity", statesBody.attr("opacity")); + statesBody.attr("opacity", null); + } + + // 1.0 changed labels to multi-lined + labels.selectAll("textPath").each(function() { + const text = this.textContent; + const shift = this.getComputedTextLength() / -1.5; + this.innerHTML = `
-
+
- %
-
-
-
`;
}
body.innerHTML = lines;
// update footer
- biomesFooterBiomes.innerHTML = b.i.length - 1;
+ biomesFooterBiomes.innerHTML = body.querySelectorAll(":scope > div").length;
biomesFooterCells.innerHTML = pack.cells.h.filter(h => h >= 20).length;
biomesFooterArea.innerHTML = si(totalArea) + unit;
biomesFooterPopulation.innerHTML = si(totalPopulation);
@@ -92,10 +111,6 @@ function editBiomes() {
// add listeners
body.querySelectorAll("div.biomes").forEach(el => el.addEventListener("mouseenter", ev => biomeHighlightOn(ev)));
body.querySelectorAll("div.biomes").forEach(el => el.addEventListener("mouseleave", ev => biomeHighlightOff(ev)));
- body.querySelectorAll("div.biomes").forEach(el => el.addEventListener("click", selectBiomeOnLineClick));
- body.querySelectorAll("div > input[type='color']").forEach(el => el.addEventListener("input", biomeChangeColor));
- body.querySelectorAll("div > input.biomeName").forEach(el => el.addEventListener("input", biomeChangeName));
- body.querySelectorAll("div > input.biomeHabitability").forEach(el => el.addEventListener("change", biomeChangeHabitability));
if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
applySorting(biomesHeader);
@@ -115,32 +130,46 @@ function editBiomes() {
biomes.select("#biome"+biome).transition().attr("stroke-width", .7).attr("stroke", color);
}
- function biomeChangeColor() {
- const biome = +this.parentNode.dataset.id;
- biomesData.color[biome] = this.value;
- biomes.select("#biome"+biome).attr("fill", this.value).attr("stroke", this.value);
+ function biomeChangeColor(el) {
+ const currentFill = el.getAttribute("fill");
+ const biome = +el.parentNode.parentNode.dataset.id;
+
+ const callback = function(fill) {
+ el.setAttribute("fill", fill);
+ biomesData.color[biome] = fill;
+ biomes.select("#biome"+biome).attr("fill", fill).attr("stroke", fill);
+ }
+
+ openPicker(currentFill, callback);
}
- function biomeChangeName() {
- const biome = +this.parentNode.dataset.id;
- this.parentNode.dataset.name = this.value;
- biomesData.name[biome] = this.value;
+ function biomeChangeName(el) {
+ const biome = +el.parentNode.dataset.id;
+ el.parentNode.dataset.name = el.value;
+ biomesData.name[biome] = el.value;
}
- function biomeChangeHabitability() {
- const biome = +this.parentNode.dataset.id;
- const failed = isNaN(+this.value) || +this.value < 0 || +this.value > 9999;
+ function biomeChangeHabitability(el) {
+ const biome = +el.parentNode.dataset.id;
+ const failed = isNaN(+el.value) || +el.value < 0 || +el.value > 9999;
if (failed) {
- this.value = biomesData.habitability[biome];
+ el.value = biomesData.habitability[biome];
tip("Please provide a valid number in range 0-9999", false, "error");
return;
}
- biomesData.habitability[biome] = +this.value;
- this.parentNode.dataset.habitability = this.value;
+ biomesData.habitability[biome] = +el.value;
+ el.parentNode.dataset.habitability = el.value;
recalculatePopulation();
refreshBiomesEditor();
}
+ function toggleLegend() {
+ if (legend.selectAll("*").size()) {clearLegend(); return;}; // hide legend
+ const d = biomesData;
+ const data = Array.from(d.i).filter(i => d.cells[i]).sort((a, b) => d.area[b] - d.area[a]).map(i => [i, d.color[i], d.name[i]]);
+ drawLegend("Biomes", data);
+ }
+
function togglePercentageMode() {
if (body.dataset.type === "absolute") {
body.dataset.type = "percentage";
@@ -159,13 +188,55 @@ function editBiomes() {
}
}
+ function addCustomBiome() {
+ const b = biomesData, i = biomesData.i.length;
+ b.i.push(i);
+ b.color.push(getRandomColor());
+ b.habitability.push(50);
+ b.name.push("Custom");
+ b.iconsDensity.push(0);
+ b.icons.push([]);
+ b.cost.push(50);
+
+ b.rural.push(0);
+ b.urban.push(0);
+ b.cells.push(0);
+ b.area.push(0);
+
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
+ const line = `${b.cells[i]}
-
- ${si(area) + unit}
-
- ${si(population)}
+ %
+
+
+ ${b.cells[i]}
+
+ ${si(area) + unit}
+
+ ${si(population)}
+ ${i>12 && !b.cells[i] ? '' : ''}
+
+
+ %
+
+
+
`;
+
+ body.insertAdjacentHTML("beforeend", line);
+ biomesFooterBiomes.innerHTML = body.querySelectorAll(":scope > div").length;
+ $("#biomesEditor").dialog({width: fitContent()});
+ }
+
+ function removeCustomBiome(el) {
+ const biome = +el.parentNode.dataset.id;
+ el.parentNode.remove();
+ biomesData.name[biome] = "removed";
+ biomesFooterBiomes.innerHTML = +biomesFooterBiomes.innerHTML - 1;
+ }
+
function regenerateIcons() {
ReliefIcons();
if (!layerIsOn("toggleRelief")) toggleRelief();
}
function downloadBiomesData() {
- const unit = areaUnit.value === "square" ? distanceUnit.value + "2" : areaUnit.value;
+ const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
let data = "Id,Biome,Color,Habitability,Cells,Area "+unit+",Population\n"; // headers
body.querySelectorAll(":scope > div").forEach(function(el) {
@@ -185,31 +256,34 @@ function editBiomes() {
link.download = "biomes_data" + Date.now() + ".csv";
link.href = url;
link.click();
- window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
+ window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
}
function enterBiomesCustomizationMode() {
if (!layerIsOn("toggleBiomes")) toggleBiomes();
customization = 6;
biomes.append("g").attr("id", "temp");
- body.querySelectorAll("div > *").forEach(e => e.disabled = true);
document.querySelectorAll("#biomesBottom > button").forEach(el => el.style.display = "none");
document.querySelectorAll("#biomesBottom > div").forEach(el => el.style.display = "block");
body.querySelector("div.biomes").classList.add("selected");
+ biomesEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
+ biomesFooter.style.display = "none";
+ $("#biomesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
+
tip("Click on biome to select, drag the circle to change biome", true);
- viewbox.style("cursor", "crosshair").call(d3.drag()
- .on("drag", dragBiomeBrush))
+ viewbox.style("cursor", "crosshair")
.on("click", selectBiomeOnMapClick)
+ .call(d3.drag().on("start", dragBiomeBrush))
.on("touchmove mousemove", moveBiomeBrush);
}
- function selectBiomeOnLineClick() {
- if (customization !== 6) return;
+ function selectBiomeOnLineClick(line) {
const selected = body.querySelector("div.selected");
if (selected) selected.classList.remove("selected");
- this.classList.add("selected");
+ line.classList.add("selected");
}
function selectBiomeOnMapClick() {
@@ -225,13 +299,17 @@ function editBiomes() {
}
function dragBiomeBrush() {
- const p = d3.mouse(this);
const r = +biomesManuallyBrush.value;
- moveCircle(p[0], p[1], r);
-
- const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
- const selection = found.filter(isLand);
- if (selection) changeBiomeForSelection(selection);
+
+ d3.event.on("drag", () => {
+ if (!d3.event.dx && !d3.event.dy) return;
+ const p = d3.mouse(this);
+ moveCircle(p[0], p[1], r);
+
+ const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
+ const selection = found.filter(isLand);
+ if (selection) changeBiomeForSelection(selection);
+ });
}
// change region within selection
@@ -275,17 +353,23 @@ function editBiomes() {
exitBiomesCustomizationMode();
}
- function exitBiomesCustomizationMode() {
+ function exitBiomesCustomizationMode(close) {
customization = 0;
biomes.select("#temp").remove();
removeCircle();
+
document.querySelectorAll("#biomesBottom > button").forEach(el => el.style.display = "inline-block");
document.querySelectorAll("#biomesBottom > div").forEach(el => el.style.display = "none");
- body.querySelectorAll("div > *").forEach(e => e.disabled = false);
+
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
+ biomesEditor.querySelectorAll(".hide").forEach(el => el.classList.remove("hidden"));
+ biomesFooter.style.display = "block";
+ if (!close) $("#biomesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
+
restoreDefaultEvents();
clearMainTip();
const selected = document.querySelector("#biomesBody > div.selected");
- if (selected) selected.classList.remove("selected");
+ if (selected) selected.classList.remove("selected");
}
function restoreInitialBiomes() {
@@ -297,7 +381,6 @@ function editBiomes() {
}
function closeBiomesEditor() {
- //biomes.on("mousemove", null).on("mouseleave", null);
- exitBiomesCustomizationMode();
+ exitBiomesCustomizationMode("close");
}
}
diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js
index 100535b4..7eadf7bc 100644
--- a/modules/ui/burg-editor.js
+++ b/modules/ui/burg-editor.js
@@ -38,6 +38,7 @@ function editBurg() {
document.getElementById("burgNameReRandom").addEventListener("click", generateNameRandom);
document.getElementById("burgSeeInMFCG").addEventListener("click", openInMFCG);
+ document.getElementById("burgOpenCOA").addEventListener("click", openInIAHG);
document.getElementById("burgRelocate").addEventListener("click", toggleRelocateBurg);
document.getElementById("burglLegend").addEventListener("click", editBurgLegend);
document.getElementById("burgRemove").addEventListener("click", removeSelectedBurg);
@@ -233,6 +234,12 @@ function editBurg() {
window.open(url, '_blank');
}
+ function openInIAHG() {
+ const id = elSelected.attr("data-id");
+ const url = `https://ironarachne.com/heraldry/${seed}-b${id}`;
+ window.open(url, '_blank');
+ }
+
function toggleRelocateBurg() {
const toggler = document.getElementById("toggleCells");
document.getElementById("burgRelocate").classList.toggle("pressed");
@@ -299,7 +306,7 @@ function editBurg() {
function editBurgLegend() {
const id = elSelected.attr("data-id");
const name = elSelected.text();
- editLegends("burg"+id, name);
+ editNotes("burg"+id, name);
}
function removeSelectedBurg() {
diff --git a/modules/ui/burgs-editor.js b/modules/ui/burgs-editor.js
index 14c75a50..ffb45cb7 100644
--- a/modules/ui/burgs-editor.js
+++ b/modules/ui/burgs-editor.js
@@ -8,11 +8,13 @@ function editBurgs() {
const body = document.getElementById("burgsBody");
updateFilter();
burgsEditorAddLines();
+ $("#burgsEditor").dialog();
if (modules.editBurgs) return;
modules.editBurgs = true;
- $("#burgsEditor").dialog({title: "Burgs Editor", width: fitContent(), close: exitAddBurgMode,
+ $("#burgsEditor").dialog({
+ title: "Burgs Editor", resizable: false, width: fitContent(), close: exitAddBurgMode,
position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}
});
@@ -64,7 +66,7 @@ function editBurgs() {
let lines = "", totalPopulation = 0;
for (const b of filtered) {
- const population = rn(b.population * populationRate.value * urbanization.value);
+ const population = b.population * populationRate.value * urbanization.value;
totalPopulation += population;
const type = b.capital && b.port ? "a-capital-port" : b.capital ? "c-capital" : b.port ? "p-port" : "z-burg";
const state = pack.states[b.state].name;
@@ -76,7 +78,7 @@ function editBurgs() {
${state}
-
+
${b.cells[i]}
+
+ 0 ${unit}
+
+ 0
+
+
@@ -88,7 +90,7 @@ function editBurgs() {
// update footer
burgsFooterBurgs.innerHTML = filtered.length;
- burgsFooterPopulation.innerHTML = filtered.length ? rn(totalPopulation / filtered.length) : 0;
+ burgsFooterPopulation.innerHTML = filtered.length ? si(totalPopulation / filtered.length) : 0;
// add listeners
body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseenter", ev => burgHighlightOn(ev)));
@@ -102,7 +104,6 @@ function editBurgs() {
body.querySelectorAll("div > span.icon-trash-empty").forEach(el => el.addEventListener("click", triggerBurgRemove));
applySorting(burgsHeader);
- $("#burgsEditor").dialog();
}
function getCultureOptions(culture) {
@@ -147,16 +148,17 @@ function editBurgs() {
function changeBurgPopulation() {
const burg = +this.parentNode.dataset.id;
if (this.value == "" || isNaN(+this.value)) {
- tip("Please provide a valid number", false, "error");
- this.value = pack.burgs[burg].population * populationRate.value * urbanization.value;
+ tip("Please provide an integer number", false, "error");
+ this.value = si(pack.burgs[burg].population * populationRate.value * urbanization.value);
return;
}
pack.burgs[burg].population = this.value / populationRate.value / urbanization.value;
this.parentNode.dataset.population = this.value;
+ this.value = si(this.value);
const population = [];
- body.querySelectorAll(":scope > div").forEach(el => population.push(+el.dataset.population));
- pack.burgsFooterPopulation.innerHTML = rn(d3.mean(population));
+ body.querySelectorAll(":scope > div").forEach(el => population.push(+getInteger(el.dataset.population)));
+ burgsFooterPopulation.innerHTML = si(d3.mean(population));
}
function toggleCapitalStatus() {
@@ -286,14 +288,14 @@ function editBurgs() {
if (!data.length) {tip("Cannot parse the list, please check the file format", false, "error"); return;}
let change = [];
- let message = `Burgs will be renamed as below. Please confirm`;
- message += `
`;
+ console.log(alertMessage.innerHTML)
+ console.log(message)
+ alertMessage.innerHTML = message;
+ console.log(alertMessage.innerHTML)
+
+ $("#alert").dialog({title: "Relations matrix", width: fitContent(), position: {my: "center", at: "center", of: "svg"}, buttons: {}});
+ }
+
+ function downloadDiplomacyData() {
+ const states = pack.states.filter(s => s.i && !s.removed);
+ const valid = states.map(s => s.i);
+
+ let data = "," + states.map(s => s.name).join(",") + "\n"; // headers
+ states.forEach(s => {
+ const rels = s.diplomacy.filter((v, i) => valid.includes(i));
+ data += s.name + "," + rels.join(",") + "\n";
+ });
+
+ const dataBlob = new Blob([data], {type: "text/plain"});
+ const url = window.URL.createObjectURL(dataBlob);
+ const link = document.createElement("a");
+ document.body.appendChild(link);
+ link.download = "state_relations_data" + Date.now() + ".csv";
+ link.href = url;
+ link.click();
+ window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
+ }
+
+ function closeDiplomacyEditor() {
+ restoreDefaultEvents();
+ clearMainTip();
+ const selected = body.querySelector("div.Self");
+ if (selected) selected.classList.remove("Self");
+ if (layerIsOn("toggleStates")) drawStates(); else toggleStates();
+ debug.selectAll(".highlight").remove();
+ }
+}
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index 99d85bd4..bf5037fb 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -10,6 +10,7 @@ function restoreDefaultEvents() {
.on(".drag", null)
.on("click", clicked)
.on("touchmove mousemove", moved);
+ legend.call(d3.drag().on("start", dragLegendBox));
}
// on viewbox click event - run function based on target
@@ -19,7 +20,7 @@ function clicked() {
const parent = el.parentElement, grand = parent.parentElement;
if (parent.id === "rivers") editRiver(); else
if (grand.id === "routes") editRoute(); else
- if (el.tagName === "textPath" && grand.parentNode.id === "labels") editLabel(); else
+ if (el.tagName === "tspan" && grand.parentNode.parentNode.id === "labels") editLabel(); else
if (grand.id === "burgLabels") editBurg(); else
if (grand.id === "burgIcons") editBurg(); else
if (parent.id === "terrain") editReliefIcon(); else
@@ -65,63 +66,37 @@ function fitContent() {
return !window.chrome ? "-moz-max-content" : "fit-content";
}
-// DOM elements sorting on header click
-$(".sortable").on("click", function() {
- const el = $(this);
- // remove sorting for all siblings except of clicked element
- el.siblings().removeClass("icon-sort-name-up icon-sort-name-down icon-sort-number-up icon-sort-number-down");
- const type = el.hasClass("alphabetically") ? "name" : "number";
- let state = "no";
- if (el.is("[class*='down']")) state = "asc";
- if (el.is("[class*='up']")) state = "desc";
- const sortby = el.attr("data-sortby");
- const list = el.parent().next(); // get list container element (e.g. "countriesBody")
- const lines = list.children("div"); // get list elements
- if (state === "no" || state === "asc") { // sort desc
- el.removeClass("icon-sort-" + type + "-down");
- el.addClass("icon-sort-" + type + "-up");
- lines.sort(function(a, b) {
- let an = a.getAttribute("data-" + sortby);
- if (an === "bottom") {return 1;}
- let bn = b.getAttribute("data-" + sortby);
- if (bn === "bottom") {return -1;}
- if (type === "number") {an = +an; bn = +bn;}
- if (an > bn) {return 1;}
- if (an < bn) {return -1;}
- return 0;
- });
- }
- if (state === "desc") { // sort asc
- el.removeClass("icon-sort-" + type + "-up");
- el.addClass("icon-sort-" + type + "-down");
- lines.sort(function(a, b) {
- let an = a.getAttribute("data-" + sortby);
- if (an === "bottom") {return 1;}
- let bn = b.getAttribute("data-" + sortby);
- if (bn === "bottom") {return -1;}
- if (type === "number") {an = +an; bn = +bn;}
- if (an < bn) {return 1;}
- if (an > bn) {return -1;}
- return 0;
- });
- }
- lines.detach().appendTo(list);
+// apply sorting behaviour for lines on Editor header click
+document.querySelectorAll(".sortable").forEach(function(e) {
+ e.addEventListener("click", function(e) {sortLines(this);});
});
+function sortLines(header) {
+ const type = header.classList.contains("alphabetically") ? "name" : "number";
+ let order = header.className.includes("-down") ? "-up" : "-down";
+ if (!header.className.includes("icon-sort") && type === "name") order = "-up";
+
+ const headers = header.parentNode;
+ headers.querySelectorAll("div.sortable").forEach(e => {
+ e.classList.forEach(c => {if(c.includes("icon-sort")) e.classList.remove(c);});
+ });
+ header.classList.add("icon-sort-" + type + order);
+ applySorting(headers);
+}
+
function applySorting(headers) {
- const header = headers.querySelector("[class*='icon-sort']");
+ const header = headers.querySelector("div[class*='icon-sort']");
if (!header) return;
const sortby = header.dataset.sortby;
- const type = header.classList.contains("alphabetically") ? "name" : "number";
- const desc = headers.querySelector("[class*='-down']") ? -1 : 1;
+ const name = header.classList.contains("alphabetically");
+ const desc = header.className.includes("-down") ? -1 : 1;
const list = headers.nextElementSibling;
const lines = Array.from(list.children);
- lines.sort(function(a, b) {
- let an = a.getAttribute("data-" + sortby);
- let bn = b.getAttribute("data-" + sortby);
- if (type === "number") {an = +an; bn = +bn;}
- return (an - bn) * desc;
+ lines.sort((a, b) => {
+ const an = name ? a.dataset[sortby] : +a.dataset[sortby];
+ const bn = name ? b.dataset[sortby] : +b.dataset[sortby];
+ return (an > bn ? 1 : an < bn ? -1 : 0) * desc;
}).forEach(line => list.appendChild(line));
}
@@ -187,4 +162,250 @@ function removeBurg(id) {
pack.burgs[id].removed = true;
const cell = pack.burgs[id].cell;
pack.cells.burg[cell] = 0;
+}
+
+// draw legend box
+function drawLegend(name, data) {
+ legend.selectAll("*").remove(); // fully redraw every time
+ legend.attr("data", data.join("|")); // store data
+
+ const itemsInCol = +styleLegendColItems.value;
+ const fontSize = +legend.attr("font-size");
+ const backClr = styleLegendBack.value;
+ const opacity = +styleLegendOpacity.value;
+
+ const lineHeight = Math.round(fontSize * 1.7);
+ const colorBoxSize = Math.round(fontSize / 1.7);
+ const colOffset = fontSize;
+ const vOffset = fontSize / 2;
+
+ // append items
+ const boxes = legend.append("g").attr("stroke-width", .5).attr("stroke", "#111111").attr("stroke-dasharray", "none");
+ const labels = legend.append("g").attr("fill", "#000000").attr("stroke", "none");
+
+ const columns = Math.ceil(data.length / itemsInCol);
+ for (let column=0, i=0; column < columns; column++) {
+ const linesInColumn = Math.ceil(data.length / columns);
+ const offset = column ? colOffset * 2 + legend.node().getBBox().width : colOffset;
+
+ for (let l=0; l < linesInColumn && data[i]; l++, i++) {
+ boxes.append("rect").attr("fill", data[i][1])
+ .attr("x", offset).attr("y", lineHeight + l*lineHeight + vOffset)
+ .attr("width", colorBoxSize).attr("height", colorBoxSize);
+
+ labels.append("text").text(data[i][2])
+ .attr("x", offset + colorBoxSize * 1.6).attr("y", fontSize/1.6 + lineHeight + l*lineHeight + vOffset);
+ }
+ }
+
+ // append label
+ const offset = colOffset + legend.node().getBBox().width / 2;
+ labels.append("text")
+ .attr("text-anchor", "middle").attr("font-weight", "bold").attr("font-size", "1.2em")
+ .attr("id", "legendLabel").text(name).attr("x", offset).attr("y", fontSize * 1.1 + vOffset / 2);
+
+ // append box
+ const bbox = legend.node().getBBox();
+ const width = bbox.width + colOffset * 2;
+ const height = bbox.height + colOffset / 2 + vOffset;
+
+ legend.insert("rect", ":first-child").attr("x", 0).attr("y", 0).attr("width", width).attr("height", height)
+ .attr("fill", backClr).attr("fill-opacity", opacity);
+
+ fitLegendBox();
+}
+
+// fit Legend box to map size
+function fitLegendBox() {
+ if (!legend.selectAll("*").size()) return;
+ const px = isNaN(+legend.attr("data-x")) ? 99 : legend.attr("data-x") / 100;
+ const py = isNaN(+legend.attr("data-y")) ? 93 : legend.attr("data-y") / 100;
+ const bbox = legend.node().getBBox();
+ const x = rn(svgWidth * px - bbox.width), y = rn(svgHeight * py - bbox.height);
+ legend.attr("transform", `translate(${x},${y})`);
+}
+
+// draw legend with the same data, but using different settings
+function redrawLegend() {
+ const name = legend.select("#legendLabel").text();
+ const data = legend.attr("data").split("|").map(l => l.split(","));
+ drawLegend(name, data);
+}
+
+function dragLegendBox() {
+ const tr = parseTransform(this.getAttribute("transform"));
+ const x = +tr[0] - d3.event.x, y = +tr[1] - d3.event.y;
+ const bbox = legend.node().getBBox();
+
+ d3.event.on("drag", function() {
+ const px = rn((x + d3.event.x + bbox.width) / svgWidth * 100, 2);
+ const py = rn((y + d3.event.y + bbox.height) / svgHeight * 100, 2);
+ const transform = `translate(${(x + d3.event.x)},${(y + d3.event.y)})`;
+ legend.attr("transform", transform).attr("data-x", px).attr("data-y", py);
+ });
+}
+
+function clearLegend() {
+ legend.selectAll("*").remove();
+ legend.attr("data", null);
+}
+
+// draw color (fill) picker
+function createPicker() {
+ const contaiter = d3.select("body").append("svg").attr("id", "pickerContainer").attr("width", "100%").attr("height", "100%");
+ const curtain = contaiter.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%").attr("opacity", .2);
+ curtain.on("click", () => contaiter.style("display", "none")).on("mousemove", () => tip("Click to close the picker"));
+ const picker = contaiter.append("g").attr("id", "picker").call(d3.drag().on("start", dragPicker));
+
+ const controls = picker.append("g").attr("id", "pickerControls");
+ const h = controls.append("g");
+ h.append("text").attr("x", 4).attr("y", 14).text("H:");
+ h.append("line").attr("x1", 18).attr("y1", 10).attr("x2", 107).attr("y2", 10);
+ h.append("circle").attr("cx", 75).attr("cy", 10).attr("r", 5).attr("id", "pickerH");
+ h.on("mousemove", () => tip("Set palette hue"));
+
+ const s = controls.append("g");
+ s.append("text").attr("x", 113).attr("y", 14).text("S:");
+ s.append("line").attr("x1", 124).attr("y1", 10).attr("x2", 206).attr("y2", 10)
+ s.append("circle").attr("cx", 181.4).attr("cy", 10).attr("r", 5).attr("id", "pickerS");
+ s.on("mousemove", () => tip("Set palette saturation"));
+
+ const l = controls.append("g");
+ l.append("text").attr("x", 213).attr("y", 14).text("L:");
+ l.append("line").attr("x1", 226).attr("y1", 10).attr("x2", 306).attr("y2", 10);
+ l.append("circle").attr("cx", 282).attr("cy", 10).attr("r", 5).attr("id", "pickerL");
+ l.on("mousemove", () => tip("Set palette lightness"));
+
+ controls.selectAll("line").on("click", clickPickerControl);
+ controls.selectAll("circle").call(d3.drag().on("start", dragPickerControl));
+
+ const colors = picker.append("g").attr("id", "pickerColors").attr("stroke", "#333333");
+ const hatches = picker.append("g").attr("id", "pickerHatches").attr("stroke", "#333333");
+ const hatching = d3.selectAll("g#hatching > pattern");
+ const number = hatching.size();
+
+ const clr = d3.range(number).map(i => d3.hsl(i/number*360, .7, .7).hex());
+ clr.forEach(function(d, i) {
+ colors.append("rect").attr("id", "picker_" + d).attr("fill", d).attr("class", i?"":"selected")
+ .attr("x", i*22+4).attr("y", 20).attr("width", 16).attr("height", 16);
+ });
+
+ hatching.each(function(d, i) {
+ hatches.append("rect").attr("id", "picker_" + this.id).attr("fill", "url(#" + this.id + ")")
+ .attr("x", i*22+4).attr("y", 41).attr("width", 16).attr("height", 16);
+ });
+
+ colors.selectAll("rect").on("click", pickerFillClicked).on("mousemove", () => tip("Click to fill with the color"));
+ hatches.selectAll("rect").on("click", pickerFillClicked).on("mousemove", () => tip("Click to fill with the hatching"));
+
+ // append box
+ const bbox = picker.node().getBBox();
+ const width = bbox.width + 8;
+ const height = bbox.height + 9;
+ const pos = () => tip("Drag to change the picker position");
+ picker.insert("rect", ":first-child").attr("x", 0).attr("y", 0).attr("width", width).attr("height", height).attr("fill", "#ffffff").on("mousemove", pos);
+ picker.insert("text", ":first-child").attr("x", 12).attr("y", -10).attr("id", "pickerLabel").text("Color Picker").on("mousemove", pos);
+ picker.insert("rect", ":first-child").attr("x", 0).attr("y", -30).attr("width", width).attr("height", 30).attr("id", "pickerHeader").on("mousemove", pos);
+ picker.attr("transform", `translate(${(svgWidth-width)/2},${(svgHeight-height)/2})`);
+}
+
+function updateSelectedRect(fill) {
+ document.getElementById("picker").querySelector("rect.selected").classList.remove("selected");
+ document.getElementById("picker").querySelector("rect[fill='"+fill+"']").classList.add("selected");
+}
+
+function updatePickerColors() {
+ const colors = d3.select("#picker > #pickerColors").selectAll("rect");
+ const number = colors.size();
+
+ const h = getPickerControl(pickerH, 360);
+ const s = getPickerControl(pickerS, 1);
+ const l = getPickerControl(pickerL, 1);
+
+ colors.each(function(d, i) {
+ const clr = d3.hsl(i/number*180+h, s, l).hex();
+ this.setAttribute("id", "picker_" + clr);
+ this.setAttribute("fill", clr);
+ });
+}
+
+function openPicker(fill, callback) {
+ const picker = d3.select("#picker");
+ if (!picker.size()) createPicker();
+ d3.select("#pickerContainer").style("display", "block");
+
+ if (fill[0] === "#") {
+ const hsl = d3.hsl(fill);
+ if (!isNaN(hsl.h)) setPickerControl(pickerH, hsl.h, 360);
+ if (!isNaN(hsl.s)) setPickerControl(pickerS, hsl.s, 1);
+ if (!isNaN(hsl.l)) setPickerControl(pickerL, hsl.l, 1);
+ updatePickerColors();
+ }
+
+ updateSelectedRect(fill);
+
+ openPicker.updateFill = function() {
+ const selected = document.getElementById("picker").querySelector("rect.selected");
+ if (!selected) return;
+ callback(selected.getAttribute("fill"));
+ }
+}
+
+function setPickerControl(control, value, max) {
+ const min = +control.previousSibling.getAttribute("x1");
+ const delta = +control.previousSibling.getAttribute("x2") - min;
+ const percent = value / max;
+ control.setAttribute("cx", min + delta * percent);
+}
+
+function getPickerControl(control, max) {
+ const min = +control.previousSibling.getAttribute("x1");
+ const delta = +control.previousSibling.getAttribute("x2") - min;
+ const current = +control.getAttribute("cx") - min;
+ return current / delta * max;
+}
+
+function dragPicker() {
+ const tr = parseTransform(this.getAttribute("transform"));
+ const x = +tr[0] - d3.event.x, y = +tr[1] - d3.event.y;
+ const picker = d3.select("#picker");
+ const bbox = picker.node().getBBox();
+
+ d3.event.on("drag", function() {
+ const px = rn((x + d3.event.x + bbox.width) / svgWidth * 100, 2);
+ const py = rn((y + d3.event.y + bbox.height) / svgHeight * 100, 2);
+ const transform = `translate(${(x + d3.event.x)},${(y + d3.event.y)})`;
+ picker.attr("transform", transform).attr("data-x", px).attr("data-y", py);
+ });
+}
+
+function pickerFillClicked() {
+ updateSelectedRect(this.getAttribute("fill"));
+ openPicker.updateFill();
+}
+
+function clickPickerControl() {
+ const min = this.getScreenCTM().e;
+ this.nextSibling.setAttribute("cx", d3.event.x - min);
+ updatePickerColors();
+ openPicker.updateFill();
+}
+
+function dragPickerControl() {
+ const min = +this.previousSibling.getAttribute("x1");
+ const max = +this.previousSibling.getAttribute("x2");
+
+ d3.event.on("drag", function() {
+ const x = Math.max(Math.min(d3.event.x, max), min);
+ this.setAttribute("cx", x);
+ updatePickerColors();
+ openPicker.updateFill();
+ });
+}
+
+// remove all fogging
+function unfog() {
+ defs.select("#fog").selectAll("path").remove();
+ fogging.selectAll("path").remove();
+ fogging.attr("display", "none");
}
\ No newline at end of file
diff --git a/modules/ui/general.js b/modules/ui/general.js
index 7b549922..a3971675 100644
--- a/modules/ui/general.js
+++ b/modules/ui/general.js
@@ -46,27 +46,27 @@ function moved() {
const point = d3.mouse(this);
const i = findCell(point[0], point[1]); // pack ell id
if (i === undefined) return;
- showLegend(d3.event, i);
+ showNotes(d3.event, i);
const g = findGridCell(point[0], point[1]); // grid cell id
if (tooltip.dataset.main) showMainTip(); else showMapTooltip(d3.event, i, g);
if (toolsContent.style.display === "block" && cellInfo.style.display === "block") updateCellInfo(point, i, g);
}
-// show legend on hover (if any)
-function showLegend(e, i) {
- let id = e.target.id || e.target.parentNode.id;
+// show note box on hover (if any)
+function showNotes(e, i) {
+ let id = e.target.id || e.target.parentNode.id || e.target.parentNode.parentNode.id;
if (e.target.parentNode.parentNode.id === "burgLabels") id = "burg" + e.target.dataset.id; else
if (e.target.parentNode.parentNode.id === "burgIcons") id = "burg" + e.target.dataset.id;
const note = notes.find(note => note.id === id);
if (note !== undefined && note.legend !== "") {
- document.getElementById("legend").style.display = "block";
- document.getElementById("legendHeader").innerHTML = note.name;
- document.getElementById("legendBody").innerHTML = note.legend;
+ document.getElementById("notes").style.display = "block";
+ document.getElementById("notesHeader").innerHTML = note.name;
+ document.getElementById("notesBody").innerHTML = note.legend;
} else {
- document.getElementById("legend").style.display = "none";
- document.getElementById("legendHeader").innerHTML = "";
- document.getElementById("legendBody").innerHTML = "";
+ document.getElementById("notes").style.display = "none";
+ document.getElementById("notesHeader").innerHTML = "";
+ document.getElementById("notesBody").innerHTML = "";
}
}
@@ -97,13 +97,24 @@ function showMapTooltip(e, i, g) {
if (subgroup === "burgLabels") {tip("Click to edit the Burg"); return;}
if (subgroup === "freshwater" && !land) {tip("Freshwater lake"); return;}
if (subgroup === "salt" && !land) {tip("Salt lake"); return;}
+ if (group === "zones") {tip(path[path.length-8].dataset.description); return;}
// covering elements
if (layerIsOn("togglePrec") && land) tip("Annual Precipitation: "+ getFriendlyPrecipitation(i)); else
if (layerIsOn("togglePopulation")) tip("Population: "+ getFriendlyPopulation(i)); else
if (layerIsOn("toggleTemp")) tip("Temperature: " + convertTemperature(grid.cells.temp[g])); else
if (layerIsOn("toggleBiomes") && pack.cells.biome[i]) tip("Biome: " + biomesData.name[pack.cells.biome[i]]); else
- if (layerIsOn("toggleStates") && pack.cells.state[i]) tip("State: " + pack.states[pack.cells.state[i]].name); else
+ if (layerIsOn("toggleReligions") && pack.cells.religion[i]) {
+ const religion = pack.religions[pack.cells.religion[i]];
+ const type = religion.type === "Cult" || religion.type == "Heresy" ? religion.type : religion.type + " religion";
+ tip(type + ": " + religion.name);
+ } else
+ if (pack.cells.state[i] && (layerIsOn("toggleProvinces") || layerIsOn("toggleStates"))) {
+ const state = pack.states[pack.cells.state[i]].fullName;
+ const province = pack.cells.province[i];
+ const prov = province ? pack.provinces[province].fullName + ", " : "";
+ tip(prov + state);
+ } else
if (layerIsOn("toggleCultures") && pack.cells.culture[i]) tip("Culture: " + pack.cultures[pack.cells.culture[i]].name); else
if (layerIsOn("toggleHeight")) tip("Height: " + getFriendlyHeight(pack.cells.h[i]));
}
@@ -114,13 +125,15 @@ function updateCellInfo(point, i, g) {
infoX.innerHTML = rn(point[0]);
infoY.innerHTML = rn(point[1]);
infoCell.innerHTML = i;
- const unit = areaUnit.value === "square" ? " " + distanceUnit.value + "²" : " " + areaUnit.value;
- infoArea.innerHTML = cells.area[i] ? si(cells.area[i] * distanceScale.value ** 2) + unit : "n/a";
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
+ infoArea.innerHTML = cells.area[i] ? si(cells.area[i] * distanceScaleInput.value ** 2) + unit : "n/a";
infoHeight.innerHTML = getFriendlyHeight(cells.h[i]) + " (" + cells.h[i] + ")";
infoTemp.innerHTML = convertTemperature(grid.cells.temp[g]);
- infoPrec.innerHTML = pack.cells.h[i] >= 20 ? getFriendlyPrecipitation(i) : "n/a";
- infoState.innerHTML = ifDefined(cells.state[i]) !== "no" ? pack.states[cells.state[i]].name + " (" + cells.state[i] + ")" : "n/a";
- infoCulture.innerHTML = ifDefined(cells.culture[i]) !== "no" ? pack.cultures[cells.culture[i]].name + " (" + cells.culture[i] + ")" : "n/a";
+ infoPrec.innerHTML = cells.h[i] >= 20 ? getFriendlyPrecipitation(i) : "n/a";
+ infoState.innerHTML = cells.h[i] >= 20 ? cells.state[i] ? `${pack.states[cells.state[i]].fullName} (${cells.state[i]})` : "neutral lands (0)" : "no";
+ infoProvince.innerHTML = cells.province[i] ? `${pack.provinces[cells.province[i]].fullName} (${cells.province[i]})` : "no";
+ infoCulture.innerHTML = cells.culture[i] ? `${pack.cultures[cells.culture[i]].name} (${cells.culture[i]})` : "no";
+ infoReligion.innerHTML = cells.religion[i] ? `${pack.religions[cells.religion[i]].name} (${cells.religion[i]})` : "no";
infoPopulation.innerHTML = getFriendlyPopulation(i);
infoBurg.innerHTML = cells.burg[i] ? pack.burgs[cells.burg[i]].name + " (" + cells.burg[i] + ")" : "no";
const f = cells.f[i];
@@ -128,13 +141,6 @@ function updateCellInfo(point, i, g) {
infoBiome.innerHTML = biomesData.name[cells.biome[i]];
}
-// return value (v) if defined with number of decimals (d), else return "no" or attribute (r)
-function ifDefined(v, r = "no", d) {
- if (v === null || v === undefined) return r;
- if (d) return v.toFixed(d);
- return v;
-}
-
// get user-friendly (real-world) height value from map data
function getFriendlyHeight(h) {
const unit = heightUnit.value;
@@ -143,7 +149,7 @@ function getFriendlyHeight(h) {
else if (unit === "f") unitRatio = 0.5468; // if fathom
let height = -990;
- if (h >= 20) height = Math.pow(h - 18, +heightExponent.value);
+ if (h >= 20) height = Math.pow(h - 18, +heightExponentInput.value);
else if (h < 20 && h > 0) height = (h - 20) / h * 50;
return rn(height * unitRatio) + " " + unit;
@@ -162,7 +168,7 @@ function getFriendlyPopulation(i) {
return si(rural+urban);
}
-// assign lock behavior
+// assign lock behavior
document.querySelectorAll("[data-locked]").forEach(function(e) {
e.addEventListener("mouseover", function(event) {
if (this.className === "icon-lock") tip("Click to unlock the option and allow it to be randomized on new map generation");
@@ -180,13 +186,13 @@ document.querySelectorAll("[data-locked]").forEach(function(e) {
// lock option
function lock(id) {
const input = document.querySelector("[data-stored='"+id+"']");
- if (input) localStorage.setItem(id, input.value);
+ if (input) localStorage.setItem(id, input.value);
const el = document.getElementById("lock_" + id);
if(!el) return;
el.dataset.locked = 1;
el.className = "icon-lock";
}
-
+
// unlock option
function unlock(id) {
localStorage.removeItem(id);
@@ -202,12 +208,24 @@ function locked(id) {
return lockEl.dataset.locked == 1;
}
+// check if option is stored in localStorage
+function stored(option) {
+ return localStorage.getItem(option);
+}
+
+// apply drop-down menu option. If the value is not in options, add it
+function applyOption(select, option) {
+ const custom = !Array.from(select.options).some(o => o.value == option);
+ if (custom) select.options.add(new Option(option, option));
+ select.value = option;
+}
+
// Hotkeys, see github.com/Azgaar/Fantasy-Map-Generator/wiki/Hotkeys
document.addEventListener("keydown", function(event) {
const active = document.activeElement.tagName;
if (active === "INPUT" || active === "SELECT" || active === "TEXTAREA") return; // don't trigger if user inputs a text
const key = event.keyCode, ctrl = event.ctrlKey, shift = event.shiftKey;
- if (key === 118) regenerateMap(); // "F7" for new map
+ if (key === 118) regeneratePrompt(); // "F7" for new map
else if (key === 27) {closeDialogs(); hideOptions();} // Escape to close all dialogs
else if (key === 9) {toggleOptions(event); event.preventDefault();} // Tab to toggle options
else if (ctrl && key === 80) saveAsImage("png"); // Ctrl + "P" to save as PNG
@@ -220,6 +238,7 @@ document.addEventListener("keydown", function(event) {
else if (shift && key === 66) console.table(pack.burgs); // Shift + "B" to log burgs data
else if (shift && key === 83) console.table(pack.states); // Shift + "S" to log states data
else if (shift && key === 67) console.table(pack.cultures); // Shift + "C" to log cultures data
+ else if (shift && key === 82) console.table(pack.religions); // Shift + "R" to log religions data
else if (shift && key === 70) console.table(pack.features); // Shift + "F" to log features data
else if (key === 88) toggleTexture(); // "X" to toggle Texture layer
@@ -230,10 +249,13 @@ document.addEventListener("keydown", function(event) {
else if (key === 79) toggleCoordinates(); // "O" to toggle Coordinates layer
else if (key === 87) toggleCompass(); // "W" to toggle Compass Rose layer
else if (key === 86) toggleRivers(); // "V" to toggle Rivers layer
- else if (key === 82) toggleRelief(); // "R" to toggle Relief icons layer
+ else if (key === 70) toggleRelief(); // "F" to toggle Relief icons layer
else if (key === 67) toggleCultures(); // "C" to toggle Cultures layer
else if (key === 83) toggleStates(); // "S" to toggle States layer
+ else if (key === 78) toggleProvinces(); // "N" to toggle Provinces layer
+ else if (key === 90) toggleZones(); // "Z" to toggle Zones
else if (key === 68) toggleBorders(); // "D" to toggle Borders layer
+ else if (key === 82) toggleReligions(); // "R" to toggle Religions layer
else if (key === 85) toggleRoutes(); // "U" to toggle Routes layer
else if (key === 84) toggleTemp(); // "T" to toggle Temperature layer
else if (key === 80) togglePopulation(); // "P" to toggle Population layer
@@ -248,8 +270,7 @@ document.addEventListener("keydown", function(event) {
else if (key === 39) zoom.translateBy(svg, -10, 0); // Right to scroll map right
else if (key === 38) zoom.translateBy(svg, 0, 10); // Up to scroll map up
else if (key === 40) zoom.translateBy(svg, 0, -10); // Up to scroll map up
- else if (key === 107) zoom.scaleBy(svg, 1.2); // Numpad Plus to zoom map up
- else if (key === 109) zoom.scaleBy(svg, 0.8); // Numpad Minus to zoom map out
+ else if (key === 107 || key === 109) pressNumpadSign(key); // Numpad Plus/Minus to zoom map or change brush size
else if (key === 48 || key === 96) resetZoom(1000); // 0 to reset zoom
else if (key === 49 || key === 97) zoom.scaleTo(svg, 1); // 1 to zoom to 1
else if (key === 50 || key === 98) zoom.scaleTo(svg, 2); // 2 to zoom to 2
@@ -263,4 +284,35 @@ document.addEventListener("keydown", function(event) {
else if (ctrl && key === 90) undo.click(); // Ctrl + "Z" to undo
else if (ctrl && key === 89) redo.click(); // Ctrl + "Y" to redo
+
+ else if (ctrl) pressControl(); // Control to toggle mode
});
+
+function pressNumpadSign(key) {
+ // if brush sliders are displayed, decrease brush size
+ let brush = null;
+ const d = key === 107 ? 1 : -1;
+
+ if (brushRadius.offsetParent) brush = document.getElementById("brushRadius"); else
+ if (biomesManuallyBrush.offsetParent) brush = document.getElementById("biomesManuallyBrush"); else
+ if (statesManuallyBrush.offsetParent) brush = document.getElementById("statesManuallyBrush"); else
+ if (provincesManuallyBrush.offsetParent) brush = document.getElementById("provincesManuallyBrush"); else
+ if (culturesManuallyBrush.offsetParent) brush = document.getElementById("culturesManuallyBrush"); else
+ if (zonesBrush.offsetParent) brush = document.getElementById("zonesBrush"); else
+ if (religionsManuallyBrush.offsetParent) brush = document.getElementById("religionsManuallyBrush");
+
+ if (brush) {
+ const value = Math.max(Math.min(+brush.value + d, +brush.max), +brush.min);
+ brush.value = document.getElementById(brush.id+"Number").value = value;
+ return;
+ }
+
+ const scaleBy = key === 107 ? 1.2 : .8;
+ zoom.scaleBy(svg, scaleBy); // if no, zoom map
+}
+
+function pressControl() {
+ if (zonesRemove.offsetParent) {
+ zonesRemove.classList.contains("pressed") ? zonesRemove.classList.remove("pressed") : zonesRemove.classList.add("pressed");
+ }
+}
\ No newline at end of file
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index b8d2c2ff..c8f3035a 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -6,11 +6,12 @@ function editHeightmap() {
alertMessage.innerHTML = `${l} `;
+ }).join("");
+
+ el.innerHTML = inner;
+ example.remove();
+
+ if (elSelected.attr("id").slice(0,10) === "stateLabel") tip("Use States Editor to change an actual state name, not just a label", false, "warning");
}
function generateRandomName() {
@@ -282,12 +299,21 @@ function editLabel() {
function changeRelativeSize() {
elSelected.select("textPath").attr("font-size", this.value + "%");
tip("Label relative size: " + this.value + "%");
+ changeText();
+ }
+
+ function editLabelAlign() {
+ const bbox = elSelected.node().getBBox();
+ const c = [bbox.x + bbox.width / 2, bbox.y + bbox.height / 2];
+ const path = defs.select("#textPath_" + elSelected.attr("id"));
+ path.attr("d", `M${c[0]-bbox.width},${c[1]}h${bbox.width*2}`);
+ drawControlPointsAndLine();
}
function editLabelLegend() {
const id = elSelected.attr("id");
const name = elSelected.text();
- editLegends(id, name);
+ editNotes(id, name);
}
function removeLabel() {
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index 35bf8cda..fa27d66b 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -13,34 +13,83 @@ function restoreLayers() {
if (layerIsOn("togglePopulation")) drawPopulation();
if (layerIsOn("toggleBiomes")) drawBiomes();
if (layerIsOn("toggleRelief")) ReliefIcons();
- if (layerIsOn("toggleStates") || layerIsOn("toggleBorders")) drawStatesWithBorders();
if (layerIsOn("toggleCultures")) drawCultures();
+ if (layerIsOn("toggleProvinces")) drawProvinces();
+ if (layerIsOn("toggleReligions")) drawReligions();
+
+ // states are getting rendered each time, if it's not required than layers should be hidden
+ if (!layerIsOn("toggleBorders")) $('#borders').fadeOut();
+ if (!layerIsOn("toggleStates")) regions.attr("display", "none").selectAll("path").remove();
+}
+
+// layers to be turned on; changable by user
+let presets = {
+ "political": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
+ "cultural": ["toggleBorders", "toggleCultures", "toggleIcons", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
+ "religions": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleReligions", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
+ "provinces": ["toggleBorders", "toggleIcons", "toggleProvinces", "toggleRivers", "toggleScaleBar"],
+ "biomes": ["toggleBiomes", "toggleRivers", "toggleScaleBar"],
+ "heightmap": ["toggleHeight", "toggleRivers", "toggleScaleBar"],
+ "poi": ["toggleBorders", "toggleHeight", "toggleIcons", "toggleMarkers", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
+ "landmass": ["toggleScaleBar"]
}
restoreLayers(); // run on-load
+restoreCustomPresets(); // run on-load
+
+function restoreCustomPresets() {
+ const storedPresets = JSON.parse(localStorage.getItem("presets"));
+ if (!storedPresets) return;
+
+ for (const preset in storedPresets) {
+ if (presets[preset]) continue;
+ layersPreset.add(new Option(preset, preset));
+ }
+ presets = storedPresets;
+}
+
+function applyPreset() {
+ const selected = localStorage.getItem("preset");
+ if (selected) changePreset(selected);
+}
// toggle layers on preset change
function changePreset(preset) {
- const layers = getLayers(preset); // layers to be turned on
- const ignore = ["toggleTexture", "toggleScaleBar"]; // never toggle this layers
-
+ const layers = presets[preset]; // layers to be turned on
document.getElementById("mapLayers").querySelectorAll("li").forEach(function(e) {
- if (ignore.includes(e.id)) return; // ignore
if (layers.includes(e.id) && !layerIsOn(e.id)) e.click(); // turn on
else if (!layers.includes(e.id) && layerIsOn(e.id)) e.click(); // turn off
});
layersPreset.value = preset;
+ localStorage.setItem("preset", preset);
}
-// retrun list of layers to be turned on
-function getLayers(preset) {
- switch(preset) {
- case "political": return ["toggleStates", "toggleRivers", "toggleBorders", "toggleRoutes", "toggleLabels", "toggleIcons"];
- case "cultural": return ["toggleCultures", "toggleRivers", "toggleBorders", "toggleRoutes", "toggleLabels", "toggleIcons"];
- case "heightmap": return ["toggleHeight", "toggleRivers"];
- case "biomes": return ["toggleBiomes", "toggleRivers"];
- case "landmass": return [];
+function savePreset() {
+ // don't allow if layers should already esist as a preset
+ if (layersPreset.value !== "custom") {
+ tip(`Current layers are already saved as a "${layersPreset.selectedOptions[0].label}" preset`, false, "error");
+ return;
}
+
+ // add new preset
+ const preset = prompt("Please provide a preset name"); // preset name
+ if (!preset) return;
+ presets[preset] = Array.from(document.getElementById("mapLayers").querySelectorAll("li:not(.buttonoff)")).map(node => node.id).sort();
+ layersPreset.add(new Option(preset, preset, false, true));
+ localStorage.setItem("presets", JSON.stringify(presets));
+ localStorage.setItem("preset", preset);
+}
+
+function getCurrentPreset() {
+ const layers = Array.from(document.getElementById("mapLayers").querySelectorAll("li:not(.buttonoff)")).map(node => node.id).sort();
+
+ for (const preset in presets) {
+ if (JSON.stringify(presets[preset]) !== JSON.stringify(layers)) continue;
+ layersPreset.value = preset;
+ return;
+ }
+
+ layersPreset.value = "custom";
}
function toggleHeight() {
@@ -79,7 +128,7 @@ function drawHeightmap() {
if (h > currentLayer) currentLayer += skip;
if (currentLayer > 100) break; // no layers possible with height > 100
if (h < currentLayer) continue;
- if (used[i]) continue; // already marked
+ if (used[i]) continue; // already marked
const onborder = cells.c[i].some(n => cells.h[n] < h);
if (!onborder) continue;
const vertex = cells.v[i].find(v => vertices.c[v].some(i => cells.h[i] < h));
@@ -271,8 +320,7 @@ function drawBiomes() {
paths.forEach(function(d, i) {
if (d.length < 10) return;
- const color = biomesData.color[i];
- biomes.append("path").attr("d", d).attr("fill", color).attr("stroke", color).attr("id", "biome"+i);
+ biomes.append("path").attr("d", d).attr("fill", biomesData.color[i]).attr("stroke", biomesData.color[i]).attr("id", "biome"+i);
});
// connect vertices to chain
@@ -403,8 +451,8 @@ function drawCultures() {
paths[c] += "M" + points.join("L") + "Z";
}
- const data = paths.map((p, i) => [p, i, cultures[i].color]).filter(d => d[0].length > 10);
- cults.selectAll("path").data(data).enter().append("path").attr("d", d => d[0]).attr("fill", d => d[2]).attr("id", d => "culture"+d[1]);
+ const data = paths.map((p, i) => [p, i]).filter(d => d[0].length > 10);
+ cults.selectAll("path").data(data).enter().append("path").attr("d", d => d[0]).attr("fill", d => cultures[d[1]].color).attr("id", d => "culture"+d[1]);
// connect vertices to chain
function connectVertices(start, t) {
@@ -428,31 +476,87 @@ function drawCultures() {
console.timeEnd("drawCultures");
}
+function toggleReligions() {
+ if (!relig.selectAll("path").size()) {
+ turnButtonOn("toggleReligions");
+ drawReligions();
+ } else {
+ relig.selectAll("path").remove();
+ turnButtonOff("toggleReligions");
+ }
+}
+
+function drawReligions() {
+ console.time("drawReligions");
+
+ relig.selectAll("path").remove();
+ const cells = pack.cells, vertices = pack.vertices, religions = pack.religions, n = cells.i.length;
+ const used = new Uint8Array(cells.i.length);
+ const paths = new Array(religions.length).fill("");
+
+ for (const i of cells.i) {
+ if (!cells.religion[i]) continue;
+ if (used[i]) continue;
+ used[i] = 1;
+ const r = cells.religion[i];
+ const onborder = cells.c[i].some(n => cells.religion[n] !== r);
+ if (!onborder) continue;
+ const vertex = cells.v[i].find(v => vertices.c[v].some(i => cells.religion[i] !== r));
+ const chain = connectVertices(vertex, r);
+ if (chain.length < 3) continue;
+ const points = chain.map(v => vertices.p[v]);
+ paths[r] += "M" + points.join("L") + "Z";
+ }
+
+ const data = paths.map((p, i) => [p, i]).filter(d => d[0].length > 10);
+ relig.selectAll("path").data(data).enter().append("path").attr("d", d => d[0]).attr("fill", d => religions[d[1]].color).attr("id", d => "religion"+d[1]);
+
+ // connect vertices to chain
+ function connectVertices(start, t) {
+ const chain = []; // vertices chain to form a path
+ for (let i=0, current = start; i === 0 || current !== start && i < 20000; i++) {
+ const prev = chain[chain.length - 1]; // previous vertex in chain
+ chain.push(current); // add current vertex to sequence
+ const c = vertices.c[current]; // cells adjacent to vertex
+ c.filter(c => cells.religion[c] === t).forEach(c => used[c] = 1);
+ const c0 = c[0] >= n || cells.religion[c[0]] !== t;
+ const c1 = c[1] >= n || cells.religion[c[1]] !== t;
+ const c2 = c[2] >= n || cells.religion[c[2]] !== t;
+ const v = vertices.v[current]; // neighboring vertices
+ if (v[0] !== prev && c0 !== c1) current = v[0];
+ else if (v[1] !== prev && c1 !== c2) current = v[1];
+ else if (v[2] !== prev && c0 !== c2) current = v[2];
+ if (current === chain[chain.length - 1]) {console.error("Next vertex is not found"); break;}
+ }
+ return chain;
+ }
+ console.timeEnd("drawReligions");
+}
+
function toggleStates() {
if (!layerIsOn("toggleStates")) {
turnButtonOn("toggleStates");
regions.attr("display", null);
- drawStatesWithBorders();
+ drawStates();
} else {
regions.attr("display", "none").selectAll("path").remove();
turnButtonOff("toggleStates");
}
}
-function drawStatesWithBorders() {
- console.time("drawStatesWithBorders");
+// draw states
+function drawStates() {
+ console.time("drawStates");
regions.selectAll("path").remove();
- borders.selectAll("path").remove();
const cells = pack.cells, vertices = pack.vertices, states = pack.states, n = cells.i.length;
const used = new Uint8Array(cells.i.length);
+ const vArray = new Array(states.length); // store vertices array
const body = new Array(states.length).fill(""); // store path around each state
const gap = new Array(states.length).fill(""); // store path along water for each state to fill the gaps
- const border = new Array(states.length).fill(""); // store path along land for all states to render borders
for (const i of cells.i) {
if (!cells.state[i] || used[i]) continue;
- used[i] = 1;
const s = cells.state[i];
const onborder = cells.c[i].some(n => cells.state[n] !== s);
if (!onborder) continue;
@@ -461,17 +565,19 @@ function drawStatesWithBorders() {
const vertex = cells.v[i].find(v => vertices.c[v].some(i => cells.state[i] === borderWith));
const chain = connectVertices(vertex, s, borderWith);
if (chain.length < 3) continue;
- body[s] += "M" + chain.map(v => vertices.p[v[0]]).join("L");
+ const points = chain.map(v => vertices.p[v[0]]);
+ if (!vArray[s]) vArray[s] = [];
+ vArray[s].push(points);
+ body[s] += "M" + points.join("L");
gap[s] += "M" + vertices.p[chain[0][0]] + chain.reduce((r,v,i,d) => !i ? r : !v[2] ? r + "L" + vertices.p[v[0]] : d[i+1] && !d[i+1][2] ? r + "M" + vertices.p[v[0]] : r, "");
- border[s] += "M" + vertices.p[chain[0][0]] + chain.reduce((r,v,i,d) => !i ? r : v[2] && s > v[1] ? r + "L" + vertices.p[v[0]] : d[i+1] && d[i+1][2] && s > d[i+1][1] ? r + "M" + vertices.p[v[0]] : r, "");
-
- // debug.append("circle").attr("r", 2).attr("cx", cells.p[i][0]).attr("cy", cells.p[i][1]).attr("fill", "blue");
- // const p = chain.map(v => vertices.p[v[0]])
- // debug.selectAll(".circle").data(p).enter().append("circle").attr("cx", d => d[0]).attr("cy", d => d[1]).attr("r", 1).attr("fill", "red");
- // const poly = polylabel([p], 1.0); // pole of inaccessibility
- // debug.append("circle").attr("r", 2).attr("cx", poly[0]).attr("cy", poly[1]).attr("fill", "green");
}
+ // find state visual center
+ vArray.forEach((ar, i) => {
+ const sorted = ar.sort((a, b) => b.length - a.length); // sort by points number
+ states[i].pole = polylabel(sorted, 1.0); // pole of inaccessibility
+ });
+
const bodyData = body.map((p, i) => [p.length > 10 ? p : null, i, states[i].color]).filter(d => d[0]);
statesBody.selectAll("path").data(bodyData).enter().append("path").attr("d", d => d[0]).attr("fill", d => d[2]).attr("stroke", "none").attr("id", d => "state"+d[1]);
const gapData = gap.map((p, i) => [p.length > 10 ? p : null, i, states[i].color]).filter(d => d[0]);
@@ -479,10 +585,9 @@ function drawStatesWithBorders() {
defs.select("#statePaths").selectAll("clipPath").remove();
defs.select("#statePaths").selectAll("clipPath").data(bodyData).enter().append("clipPath").attr("id", d => "state-clip"+d[1]).append("use").attr("href", d => "#state"+d[1]);
- statesHalo.selectAll(".path").data(bodyData).enter().append("path").attr("d", d => d[0]).attr("stroke", d => d3.color(d[2]).darker().hex()).attr("id", d => "state-border"+d[1]).attr("clip-path", d => "url(#state-clip"+d[1]+")");
-
- const borderData = border.map((p, i) => [p.length > 10 ? p : null, i]).filter(d => d[0]);
- borders.selectAll("path").data(borderData).enter().append("path").attr("d", d => d[0]).attr("id", d => "border"+d[1]);
+ statesHalo.selectAll(".path").data(bodyData).enter().append("path")
+ .attr("d", d => d[0]).attr("stroke", d => d3.color(d[2]) ? d3.color(d[2]).darker().hex() : "#666666")
+ .attr("id", d => "state-border"+d[1]).attr("clip-path", d => "url(#state-clip"+d[1]+")");
// connect vertices to chain
function connectVertices(start, t, state) {
@@ -507,7 +612,106 @@ function drawStatesWithBorders() {
chain.push([start, state, land]); // add starting vertex to sequence to close the path
return chain;
}
- console.timeEnd("drawStatesWithBorders");
+ invokeActiveZooming();
+ console.timeEnd("drawStates");
+}
+
+// draw state and province borders
+function drawBorders() {
+ console.time("drawBorders");
+ borders.selectAll("path").remove();
+
+ const cells = pack.cells, vertices = pack.vertices, n = cells.i.length;
+ const sPath = [], pPath = [];
+ const sUsed = new Array(pack.states.length).fill("").map(a => []);
+ const pUsed = new Array(pack.provinces.length).fill("").map(a => []);
+
+ for (let i=0; i < cells.i.length; i++) {
+ if (!cells.state[i]) continue;
+ const p = cells.province[i];
+ const s = cells.state[i];
+
+ // if cell is on province border
+ const provToCell = cells.c[i].find(n => cells.state[n] === s && p > cells.province[n] && pUsed[p][n] !== cells.province[n]);
+ if (provToCell) {
+ const provTo = cells.province[provToCell];
+ pUsed[p][provToCell] = provTo;
+ const vertex = cells.v[i].find(v => vertices.c[v].some(i => cells.province[i] === provTo));
+ const chain = connectVertices(vertex, p, cells.province, provTo, pUsed);
+
+ if (chain.length > 1) {
+ pPath.push("M" + chain.map(c => vertices.p[c]).join(" "));
+ i--;
+ continue;
+ }
+ }
+
+ // if cell is on state border
+ const stateToCell = cells.c[i].find(n => cells.h[n] >= 20 && s > cells.state[n] && sUsed[s][n] !== cells.state[n]);
+ if (stateToCell !== undefined) {
+ const stateTo = cells.state[stateToCell];
+ sUsed[s][stateToCell] = stateTo;
+ const vertex = cells.v[i].find(v => vertices.c[v].some(i => cells.h[i] >= 20 && cells.state[i] === stateTo));
+ const chain = connectVertices(vertex, s, cells.state, stateTo, sUsed);
+
+ if (chain.length > 1) {
+ sPath.push("M" + chain.map(c => vertices.p[c]).join(" "));
+ i--;
+ continue;
+ }
+ }
+ }
+
+ stateBorders.append("path").attr("d", sPath.join(" "));
+ provinceBorders.append("path").attr("d", pPath.join(" "));
+
+ // connect vertices to chain
+ function connectVertices(current, f, array, t, used) {
+ let chain = [];
+ const checkCell = c => c >= n || array[c] !== f;
+ const checkVertex = v => vertices.c[v].some(c => array[c] === f) && vertices.c[v].some(c => array[c] === t && cells.h[c] >= 20);
+
+ // find starting vertex
+ for (let i=0; i < 1000; i++) {
+ if (i === 999) console.error("Find starting vertex: limit is reached", current, f, t);
+ const p = chain[chain.length-2] || -1; // previous vertex
+ const v = vertices.v[current], c = vertices.c[current];
+
+ const v0 = checkCell(c[0]) !== checkCell(c[1]) && checkVertex(v[0]);
+ const v1 = checkCell(c[1]) !== checkCell(c[2]) && checkVertex(v[1]);
+ const v2 = checkCell(c[0]) !== checkCell(c[2]) && checkVertex(v[2]);
+ if (v0 + v1 + v2 === 1) break;
+ current = v0 && p !== v[0] ? v[0] : v1 && p !== v[1] ? v[1] : v[2];
+
+ if (current === chain[0]) break;
+ if (current === p) return [];
+ chain.push(current);
+ }
+
+ chain = [current]; // vertices chain to form a path
+ // find path
+ for (let i=0; i < 1000; i++) {
+ if (i === 999) console.error("Find path: limit is reached", current, f, t);
+ const p = chain[chain.length-2] || -1; // previous vertex
+ const v = vertices.v[current], c = vertices.c[current];
+ c.filter(c => array[c] === t).forEach(c => used[f][c] = t);
+
+ const v0 = checkCell(c[0]) !== checkCell(c[1]) && checkVertex(v[0]);
+ const v1 = checkCell(c[1]) !== checkCell(c[2]) && checkVertex(v[1]);
+ const v2 = checkCell(c[0]) !== checkCell(c[2]) && checkVertex(v[2]);
+ current = v0 && p !== v[0] ? v[0] : v1 && p !== v[1] ? v[1] : v[2];
+
+ if (current === p) break;
+ if (current === chain[chain.length-1]) break;
+ if (chain.length > 1 && v0 + v1 + v2 < 2) break;
+ chain.push(current);
+ if (current === chain[0]) break;
+ }
+
+ return chain;
+ }
+
+ console.timeEnd("drawBorders");
}
function toggleBorders() {
@@ -520,6 +724,89 @@ function toggleBorders() {
}
}
+function toggleProvinces() {
+ if (!layerIsOn("toggleProvinces")) {
+ turnButtonOn("toggleProvinces");
+ drawProvinces();
+ } else {
+ provs.selectAll("*").remove();
+ turnButtonOff("toggleProvinces");
+ }
+}
+
+function drawProvinces() {
+ console.time("drawProvinces");
+ const labelsOn = provs.attr("data-labels") == 1;
+ provs.selectAll("*").remove();
+
+ const cells = pack.cells, vertices = pack.vertices, provinces = pack.provinces, n = cells.i.length;
+ const used = new Uint8Array(cells.i.length);
+ const vArray = new Array(provinces.length); // store vertices array
+ const body = new Array(provinces.length).fill(""); // store path around each province
+ const gap = new Array(provinces.length).fill(""); // store path along water for each province to fill the gaps
+
+ for (const i of cells.i) {
+ if (!cells.province[i] || used[i]) continue;
+ const p = cells.province[i];
+ const onborder = cells.c[i].some(n => cells.province[n] !== p);
+ if (!onborder) continue;
+
+ const borderWith = cells.c[i].map(c => cells.province[c]).find(n => n !== p);
+ const vertex = cells.v[i].find(v => vertices.c[v].some(i => cells.province[i] === borderWith));
+ const chain = connectVertices(vertex, p, borderWith);
+ if (chain.length < 3) continue;
+ const points = chain.map(v => vertices.p[v[0]]);
+ if (!vArray[p]) vArray[p] = [];
+ vArray[p].push(points);
+ body[p] += "M" + points.join("L");
+ gap[p] += "M" + vertices.p[chain[0][0]] + chain.reduce((r,v,i,d) => !i ? r : !v[2] ? r + "L" + vertices.p[v[0]] : d[i+1] && !d[i+1][2] ? r + "M" + vertices.p[v[0]] : r, "");
+ }
+
+ // find state visual center
+ vArray.forEach((ar, i) => {
+ const sorted = ar.sort((a, b) => b.length - a.length); // sort by points number
+ provinces[i].pole = polylabel(sorted, 1.0); // pole of inaccessibility
+ });
+
+ const g = provs.append("g").attr("id", "provincesBody");
+ const bodyData = body.map((p, i) => [p.length > 10 ? p : null, i, provinces[i].color]).filter(d => d[0]);
+ g.selectAll("path").data(bodyData).enter().append("path").attr("d", d => d[0]).attr("fill", d => d[2]).attr("stroke", "none").attr("id", d => "province"+d[1]);
+ const gapData = gap.map((p, i) => [p.length > 10 ? p : null, i, provinces[i].color]).filter(d => d[0]);
+ g.selectAll(".path").data(gapData).enter().append("path").attr("d", d => d[0]).attr("fill", "none").attr("stroke", d => d[2]).attr("id", d => "province-gap"+d[1]);
+
+ const labels = provs.append("g").attr("id", "provinceLabels");
+ labels.style("display", `${labelsOn ? "block" : "none"}`);
+ const labelData = provinces.filter(p => p.i && !p.removed);
+ labels.selectAll(".path").data(labelData).enter().append("text")
+ .attr("x", d => d.pole[0]).attr("y", d => d.pole[1])
+ .attr("id", d => "provinceLabel"+d.i).text(d => d.name);
+
+ // connect vertices to chain
+ function connectVertices(start, t, province) {
+ const chain = []; // vertices chain to form a path
+ let land = vertices.c[start].some(c => cells.h[c] >= 20 && cells.province[c] !== t);
+ function check(i) {province = cells.province[i]; land = cells.h[i] >= 20;}
+
+ for (let i=0, current = start; i === 0 || current !== start && i < 20000; i++) {
+ const prev = chain[chain.length - 1] ? chain[chain.length - 1][0] : -1; // previous vertex in chain
+ chain.push([current, province, land]); // add current vertex to sequence
+ const c = vertices.c[current]; // cells adjacent to vertex
+ c.filter(c => cells.province[c] === t).forEach(c => used[c] = 1);
+ const c0 = c[0] >= n || cells.province[c[0]] !== t;
+ const c1 = c[1] >= n || cells.province[c[1]] !== t;
+ const c2 = c[2] >= n || cells.province[c[2]] !== t;
+ const v = vertices.v[current]; // neighboring vertices
+ if (v[0] !== prev && c0 !== c1) {current = v[0]; check(c0 ? c[0] : c[1]);} else
+ if (v[1] !== prev && c1 !== c2) {current = v[1]; check(c1 ? c[1] : c[2]);} else
+ if (v[2] !== prev && c0 !== c2) {current = v[2]; check(c2 ? c[2] : c[0]);}
+ if (current === chain[chain.length-1][0]) {console.error("Next vertex is not found"); break;}
+ }
+ chain.push([start, province, land]); // add starting vertex to sequence to close the path
+ return chain;
+ }
+ console.timeEnd("drawProvinces");
+}
+
function toggleGrid() {
if (!gridOverlay.selectAll("*").size()) {
turnButtonOn("toggleGrid");
@@ -592,49 +879,32 @@ function toggleCoordinates() {
function drawCoordinates() {
if (!layerIsOn("toggleCoordinates")) return;
coordinates.selectAll("*").remove(); // remove every time
- const eqY = +document.getElementById("equatorOutput").value;
- const eqD = +document.getElementById("equidistanceOutput").value;
- const merX = svgWidth / 2; // x of zero meridian
const steps = [.5, 1, 2, 5, 10, 15, 30]; // possible steps
- const goal = merX / eqD / scale ** 0.4 * 12;
+ const goal = mapCoordinates.lonT / scale / 10;
const step = steps.reduce((p, c) => Math.abs(c - goal) < Math.abs(p - goal) ? c : p);
- const p = getViewPoint(2 + scale, 2 + scale); // on border point on viexBox
- const desired = +coordinates.attr("data-size")
- const size = Math.max(desired + 1 - scale, 2);
- coordinates.attr("font-size", size);
- // map coordinates extent
- const extent = getViewBoxExtent();
- const latS = mapCoordinates.latS + (1 - extent[1][1] / svgHeight) * mapCoordinates.latT;
- const latN = mapCoordinates.latN - (extent[0][1] / svgHeight) * mapCoordinates.latT;
- const lonW = mapCoordinates.lonW + (extent[0][0] / svgWidth) * mapCoordinates.lonT;
- const lonE = mapCoordinates.lonE - (1 - extent[1][0] / svgWidth) * mapCoordinates.lonT;
+ const desired = +coordinates.attr("data-size"); // desired label size
+ coordinates.attr("font-size", Math.max(rn(desired / scale ** .8, 2), .1)); // actual label size
+ const graticule = d3.geoGraticule().extent([[mapCoordinates.lonW, mapCoordinates.latN], [mapCoordinates.lonE, mapCoordinates.latS]])
+ .stepMajor([400, 400]).stepMinor([step, step]);
+ const projection = d3.geoEquirectangular().fitSize([graphWidth, graphHeight], graticule());
- const grid = coordinates.append("g").attr("id", "coordinateGrid");
- const lalitude = coordinates.append("g").attr("id", "lalitude");
- const longitude = coordinates.append("g").attr("id", "longitude");
+ const grid = coordinates.append("g").attr("id", "coordinateGrid");
+ const labels = coordinates.append("g").attr("id", "coordinateLabels");
- // rander lalitude lines
- d3.range(nextStep(latS), nextStep(latN)+0.01, step).forEach(function(l) {
- const c = eqY - l / 90 * eqD;
- const lat = l < 0 ? Math.abs(l) + "°S" : l + "°N";
- grid.append("line").attr("x1", 0).attr("x2", svgWidth).attr("y1", c).attr("y2", c).attr("l", l);
- const nearBorder = c - size <= extent[0][1] || c + size / 2 >= extent[1][1];
- if (nearBorder || !Number.isInteger(l)) return;
- lalitude.append("text").attr("x", p.x).attr("y", c).text(lat);
+ const p = getViewPoint(scale + desired + 2, scale + desired / 2); // on border point on viexBox
+ const data = graticule.lines().map(d => {
+ const lat = d.coordinates[0][1] === d.coordinates[1][1]; // check if line is latitude or longitude
+ const c = d.coordinates[0], pos = projection(c); // map coordinates
+ const [x, y] = lat ? [rn(p.x, 2), rn(pos[1], 2)] : [rn(pos[0], 2), rn(p.y, 2)]; // labels position
+ const v = lat ? c[1] : c[0]; // label
+ const text = !v ? v : Number.isInteger(v) ? lat ? c[1] < 0 ? -c[1] + "°S" : c[1] + "°N" : c[0] < 0 ? -c[0] + "°W" : c[0] + "°E" : "";
+ return {lat, x, y, text};
});
- // rander longitude lines
- d3.range(nextStep(lonW), nextStep(lonE)+0.01, step).forEach(function(l) {
- const c = merX + l / 90 * eqD;
- const lon = l < 0 ? Math.abs(l) + "°W" : l + "°E";
- grid.append("line").attr("x1", c).attr("x2", c).attr("y1", 0).attr("y2", svgHeight).attr("l", l);
- const nearBorder = c - size * 1.5 <= extent[0][0] || c + size >= extent[1][0];
- if (nearBorder || !Number.isInteger(l)) return;
- longitude.append("text").attr("x", c).attr("y", p.y).text(lon);
- });
-
- function nextStep(v) {return (v / step | 0) * step;}
+ const d = round(d3.geoPath(projection)(graticule()));
+ grid.append("path").attr("d", d).attr("vector-effect", "non-scaling-stroke");
+ labels.selectAll('text').data(data).enter().append("text").attr("x", d => d.x).attr("y", d => d.y).text(d => d.text);
}
// conver svg point into viewBox point
@@ -677,9 +947,8 @@ function toggleTexture() {
turnButtonOn("toggleTexture");
// append default texture image selected by default. Don't append on load to not harm performance
if (!texture.selectAll("*").size()) {
- const link = getAbsolutePath(styleTextureInput.value);
texture.append("image").attr("x", 0).attr("y", 0).attr("width", graphWidth).attr("height", graphHeight)
- .attr('xlink:href', link).attr('preserveAspectRatio', "xMidYMid slice");
+ .attr('xlink:href', getDefaultTexture()).attr('preserveAspectRatio', "xMidYMid slice");
}
$('#texture').fadeIn();
zoom.scaleBy(svg, 1.00001); // enforce browser re-draw
@@ -723,6 +992,7 @@ function toggleLabels() {
if (!layerIsOn("toggleLabels")) {
turnButtonOn("toggleLabels");
$('#labels').fadeIn();
+ invokeActiveZooming();
} else {
turnButtonOff("toggleLabels");
$('#labels').fadeOut();
@@ -759,6 +1029,16 @@ function toggleScaleBar() {
}
}
+function toggleZones() {
+ if (!layerIsOn("toggleZones")) {
+ turnButtonOn("toggleZones");
+ $('#zones').fadeIn();
+ } else {
+ turnButtonOff("toggleZones");
+ $('#zones').fadeOut();
+ }
+}
+
function layerIsOn(el) {
const buttonoff = document.getElementById(el).classList.contains("buttonoff");
return !buttonoff;
@@ -766,23 +1046,22 @@ function layerIsOn(el) {
function turnButtonOff(el) {
document.getElementById(el).classList.add("buttonoff");
- layersPreset.value = "custom";
+ getCurrentPreset();
}
function turnButtonOn(el) {
document.getElementById(el).classList.remove("buttonoff");
- layersPreset.value = "custom";
+ getCurrentPreset();
}
// move layers on mapLayers dragging (jquery sortable)
-$("#mapLayers").sortable({items: "li:not(.solid)", cancel: ".solid", update: moveLayer});
+$("#mapLayers").sortable({items: "li:not(.solid)", containment: "parent", cancel: ".solid", update: moveLayer});
function moveLayer(event, ui) {
const el = getLayer(ui.item.attr("id"));
- if (el) {
- const prev = getLayer(ui.item.prev().attr("id"));
- const next = getLayer(ui.item.next().attr("id"));
- if (prev) el.insertAfter(prev); else if (next) el.insertBefore(next);
- }
+ if (!el) return;
+ const prev = getLayer(ui.item.prev().attr("id"));
+ const next = getLayer(ui.item.next().attr("id"));
+ if (prev) el.insertAfter(prev); else if (next) el.insertBefore(next);
}
// define connection between option layer buttons and actual svg groups to move the element
@@ -797,6 +1076,7 @@ function getLayer(id) {
if (id === "toggleRelief") return $("#terrain");
if (id === "toggleCultures") return $("#cults");
if (id === "toggleStates") return $("#regions");
+ if (id === "toggleProvinces") return $("#provs");
if (id === "toggleBorders") return $("#borders");
if (id === "toggleRoutes") return $("#routes");
if (id === "toggleTemp") return $("#temperature");
diff --git a/modules/ui/markers-editor.js b/modules/ui/markers-editor.js
index a58de40f..853c280d 100644
--- a/modules/ui/markers-editor.js
+++ b/modules/ui/markers-editor.js
@@ -181,6 +181,8 @@ function editMarker() {
["1F3AA", "🎪", "Tent"],
["1F3E8", "🏨", "Hotel"],
["1F4B0", "💰", "Money bag"],
+ ["1F6A8", "🚨", "Revolving Light"],
+ ["1F309", "🌉", "Bridge at Night"],
["1F4A8", "💨", "Dashing away"],
["1F334", "🌴", "Palm"],
["1F335", "🌵", "Cactus"],
@@ -217,6 +219,7 @@ function editMarker() {
["1F352", "🍒", "Cherries"],
["1F36F", "🍯", "Honey pot"],
["1F37A", "🍺", "Beer"],
+ ["1F37B", "🍻", "Beers"],
["1F377", "🍷", "Wine glass"],
["1F3BB", "🎻", "Violin"],
["1F3B8", "🎸", "Guitar"],
@@ -248,6 +251,7 @@ function editMarker() {
["2317", "⌗", "Hash"],
["2318", "⌘", "POI"],
["2307", "⌇", "Wavy"],
+ ["27F1", "⟱", "Downwards Quadruple"],
["21E6", "⇦", "Left arrow"],
["21E7", "⇧", "Top arrow"],
["21E8", "⇨", "Right arrow"],
@@ -442,7 +446,7 @@ function editMarker() {
function editMarkerLegend() {
const id = elSelected.attr("id");
- editLegends(id, id);
+ editNotes(id, id);
}
function toggleAddMarker() {
diff --git a/modules/ui/measurers.js b/modules/ui/measurers.js
index a8bf8648..188f8e06 100644
--- a/modules/ui/measurers.js
+++ b/modules/ui/measurers.js
@@ -5,7 +5,7 @@
function addRuler(x1, y1, x2, y2) {
const cx = rn((x1 + x2) / 2, 2), cy = rn((y1 + y2) / 2, 2);
const size = rn(1 / scale ** .3 * 2, 1);
- const dash = rn(30 / distanceScale.value, 2);
+ const dash = rn(30 / distanceScaleInput.value, 2);
// body
const rulerNew = ruler.append("g").attr("class", "ruler").call(d3.drag().on("start", dragRuler));
@@ -18,7 +18,7 @@ function addRuler(x1, y1, x2, y2) {
const angle = Math.atan2(y2 - y1, x2 - x1) * 180 / Math.PI;
const rotate = `rotate(${angle} ${cx} ${cy})`;
const dist = rn(Math.hypot(x1 - x2, y1 - y2));
- const label = rn(dist * distanceScale.value) + " " + distanceUnit.value;
+ const label = rn(dist * distanceScaleInput.value) + " " + distanceUnitInput.value;
rulerNew.append("rect").attr("x", cx - size * 1.5).attr("y", cy - size * 1.5).attr("width", size * 3).attr("height", size * 3).attr("transform", rotate).attr("stroke-width", .5 * size).call(d3.drag().on("start", rulerCenterDrag));
rulerNew.append("text").attr("x", cx).attr("y", cy).attr("dx", ".3em").attr("dy", "-.3em").attr("transform", rotate).attr("font-size", 10 * size).text(label).on("click", removeParent);
}
@@ -46,7 +46,7 @@ function dragRulerEdge() {
const cx = rn((x + x0) / 2, 2), cy = rn((y + y0) / 2, 2);
const dist = Math.hypot(x0 - x, y0 - y);
- const label = rn(dist * distanceScale.value) + " " + distanceUnit.value;
+ const label = rn(dist * distanceScaleInput.value) + " " + distanceUnitInput.value;
const atan = x0 > x ? Math.atan2(y0 - y, x0 - x) : Math.atan2(y - y0, x - x0);
const angle = rn(atan * 180 / Math.PI, 3);
const rotate = `rotate(${angle} ${cx} ${cy})`;
@@ -76,7 +76,7 @@ function rulerCenterDrag() {
// change first part
let dist = rn(Math.hypot(x1 - x, y1 - y));
- let label = rn(dist * distanceScale.value) + " " + distanceUnit.value;
+ let label = rn(dist * distanceScaleInput.value) + " " + distanceUnitInput.value;
let atan = x1 > x ? Math.atan2(y1 - y, x1 - x) : Math.atan2(y - y1, x - x1);
xc1 = rn((x + x1) / 2, 2), yc1 = rn((y + y1) / 2, 2);
r1 = `rotate(${rn(atan * 180 / Math.PI, 3)} ${xc1} ${yc1})`;
@@ -86,7 +86,7 @@ function rulerCenterDrag() {
// change second (new) part
dist = rn(Math.hypot(x2 - x, y2 - y));
- label = rn(dist * distanceScale.value) + " " + distanceUnit.value;
+ label = rn(dist * distanceScaleInput.value) + " " + distanceUnitInput.value;
atan = x2 > x ? Math.atan2(y2 - y, x2 - x) : Math.atan2(y - y2, x - x2);
xc2 = rn((x + x2) / 2, 2), yc2 = rn((y + y2) / 2, 2);
r2 = `rotate(${rn(atan * 180 / Math.PI, 3)} ${xc2} ${yc2})`;
@@ -110,7 +110,7 @@ function rulerCenterDrag() {
function drawOpisometer() {
lineGen.curve(d3.curveBasis);
const size = rn(1 / scale ** .3 * 2, 1);
- const dash = rn(30 / distanceScale.value, 2);
+ const dash = rn(30 / distanceScaleInput.value, 2);
const p0 = d3.mouse(this);
const points = [[p0[0], p0[1]]];
let length = 0;
@@ -131,7 +131,7 @@ function drawOpisometer() {
curve.attr("d", path);
curveGray.attr("d", path);
length = curve.node().getTotalLength();
- const label = rn(length * distanceScale.value) + " " + distanceUnit.value;
+ const label = rn(length * distanceScaleInput.value) + " " + distanceUnitInput.value;
text.attr("x", p[0]).attr("y", p[1]).text(label);
});
@@ -176,7 +176,7 @@ function dragOpisometerEnd() {
curve.attr("d", path);
curveGray.attr("d", path);
length = curve.node().getTotalLength();
- const label = rn(length * distanceScale.value) + " " + distanceUnit.value;
+ const label = rn(length * distanceScaleInput.value) + " " + distanceUnitInput.value;
text.text(label);
});
@@ -215,20 +215,20 @@ function drawPlanimeter() {
addPlanimeter.classList.remove("pressed");
const polygonArea = rn(Math.abs(d3.polygonArea(points)));
- const unit = areaUnit.value === "square" ? " " + distanceUnit.value + "²" : " " + areaUnit.value;
- const area = si(polygonArea * distanceScale.value ** 2) + " " + unit;
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
+ const area = si(polygonArea * distanceScaleInput.value ** 2) + " " + unit;
const c = polylabel([points], 1.0); // pole of inaccessibility
text.attr("x", c[0]).attr("y", c[1]).text(area);
});
}
-// draw default scale bar
+// draw scale bar
function drawScaleBar() {
if (scaleBar.style("display") === "none") return; // no need to re-draw hidden element
scaleBar.selectAll("*").remove(); // fully redraw every time
- const dScale = distanceScale.value;
- const unit = distanceUnit.value;
+ const dScale = distanceScaleInput.value;
+ const unit = distanceUnitInput.value;
// calculate size
const init = 100; // actual length in pixels if scale, dScale and size = 1;
@@ -269,8 +269,8 @@ function drawScaleBar() {
// fit ScaleBar to map size
function fitScaleBar() {
if (!scaleBar.select("rect").size()) return;
- const px = isNaN(+barPosX.value) ? 100 : barPosX.value / 100;
- const py = isNaN(+barPosY.value) ? 100 : barPosY.value / 100;
+ const px = isNaN(+barPosX.value) ? 99 : barPosX.value / 100;
+ const py = isNaN(+barPosY.value) ? 99 : barPosY.value / 100;
const bbox = scaleBar.select("rect").node().getBBox();
const x = rn(svgWidth * px - bbox.width + 10), y = rn(svgHeight * py - bbox.height + 20);
scaleBar.attr("transform", `translate(${x},${y})`);
diff --git a/modules/ui/namesbase-editor.js b/modules/ui/namesbase-editor.js
index ba4fbbc8..c226c3a2 100644
--- a/modules/ui/namesbase-editor.js
+++ b/modules/ui/namesbase-editor.js
@@ -163,7 +163,7 @@ function editNamesbase() {
nameBases = [], nameBase = [];
data.forEach(d => {
const e = d.split("|");
- nameBases.push({name:e[0], min:e[1], max:e[2], d:e[3], m:d[4]});
+ nameBases.push({name:e[0], min:e[1], max:e[2], d:e[3], m:e[4]});
nameBase.push(e[5].split(","));
});
diff --git a/modules/ui/legends-editor.js b/modules/ui/notes-editor.js
similarity index 65%
rename from modules/ui/legends-editor.js
rename to modules/ui/notes-editor.js
index a514ea35..654d77de 100644
--- a/modules/ui/legends-editor.js
+++ b/modules/ui/notes-editor.js
@@ -1,7 +1,7 @@
"use strict";
-function editLegends(id, name) {
+function editNotes(id, name) {
// update list of objects
- const select = document.getElementById("legendSelect");
+ const select = document.getElementById("notesSelect");
for (let i = select.options.length; i < notes.length; i++) {
select.options.add(new Option(notes[i].id, notes[i].id));
}
@@ -16,54 +16,59 @@ function editLegends(id, name) {
select.options.add(new Option(id, id));
}
select.value = id;
- legendName.value = note.name;
- legendText.value = note.legend;
+ notesName.value = note.name;
+ notesText.value = note.legend;
+ } else {
+ if (!notes.length) {
+ const value = "There are no added notes. Click on element (e.g. label) and add a free text note";
+ document.getElementById("notesText").value = value;
+ }
}
// open a dialog
- $("#legendEditor").dialog({
- title: "Legends Editor", minWidth: Math.min(svgWidth, 400),
+ $("#notesEditor").dialog({
+ title: "Notes Editor", minWidth: Math.min(svgWidth, 400),
position: {my: "center", at: "center", of: "svg"}
});
- if (modules.editLegends) return;
- modules.editLegends = true;
+ if (modules.editNotes) return;
+ modules.editNotes = true;
// add listeners
- document.getElementById("legendSelect").addEventListener("change", changeObject);
- document.getElementById("legendName").addEventListener("input", changeName);
- document.getElementById("legendText").addEventListener("input", changeText);
- document.getElementById("legendFocus").addEventListener("click", validateHighlightElement);
- document.getElementById("legendDownload").addEventListener("click", downloadLegends);
- document.getElementById("legendUpload").addEventListener("click", () => legendsToLoad.click());
+ document.getElementById("notesSelect").addEventListener("change", changeObject);
+ document.getElementById("notesName").addEventListener("input", changeName);
+ document.getElementById("notesText").addEventListener("input", changeText);
+ document.getElementById("notesFocus").addEventListener("click", validateHighlightElement);
+ document.getElementById("notesDownload").addEventListener("click", downloadLegends);
+ document.getElementById("notesUpload").addEventListener("click", () => legendsToLoad.click());
document.getElementById("legendsToLoad").addEventListener("change", uploadLegends);
- document.getElementById("legendRemove").addEventListener("click", triggerLegendRemove);
+ document.getElementById("notesRemove").addEventListener("click", triggernotesRemove);
function changeObject() {
const note = notes.find(note => note.id === this.value);
- legendName.value = note.name;
- legendText.value = note.legend;
+ notesName.value = note.name;
+ notesText.value = note.legend;
}
function changeName() {
- const id = document.getElementById("legendSelect").value;
+ const id = document.getElementById("notesSelect").value;
const note = notes.find(note => note.id === id);
note.name = this.value;
}
function changeText() {
- const id = document.getElementById("legendSelect").value;
+ const id = document.getElementById("notesSelect").value;
const note = notes.find(note => note.id === id);
note.legend = this.value;
}
function validateHighlightElement() {
- const select = document.getElementById("legendSelect");
+ const select = document.getElementById("notesSelect");
const element = document.getElementById(select.value);
// if element is not found
if (element === null) {
- alertMessage.innerHTML = "Related element is not found. Would you like to remove the note (legend item)?";
+ alertMessage.innerHTML = "Related element is not found. Would you like to remove the note?";
$("#alert").dialog({resizable: false, title: "Element not found",
buttons: {
Remove: function() {$(this).dialog("close"); removeLegend();},
@@ -103,7 +108,7 @@ function editLegends(id, name) {
const dataBlob = new Blob([legendString],{type:"text/plain"});
const url = window.URL.createObjectURL(dataBlob);
const link = document.createElement("a");
- link.download = "legends" + Date.now() + ".txt";
+ link.download = "notes" + Date.now() + ".txt";
link.href = url;
link.click();
}
@@ -116,8 +121,8 @@ function editLegends(id, name) {
const dataLoaded = fileLoadedEvent.target.result;
if (dataLoaded) {
notes = JSON.parse(dataLoaded);
- document.getElementById("legendSelect").options.length = 0;
- editLegends(notes[0].id, notes[0].name);
+ document.getElementById("notesSelect").options.length = 0;
+ editNotes(notes[0].id, notes[0].name);
} else {
tip("Cannot load a file. Please check the data format", false, "error")
}
@@ -125,9 +130,9 @@ function editLegends(id, name) {
fileReader.readAsText(fileToLoad, "UTF-8");
}
- function triggerLegendRemove() {
- alertMessage.innerHTML = "Are you sure you want to remove the selected legend?";
- $("#alert").dialog({resizable: false, title: "Remove legend element",
+ function triggernotesRemove() {
+ alertMessage.innerHTML = "Are you sure you want to remove the selected note?";
+ $("#alert").dialog({resizable: false, title: "Remove note",
buttons: {
Remove: function() {$(this).dialog("close"); removeLegend();},
Keep: function() {$(this).dialog("close");}
@@ -136,12 +141,12 @@ function editLegends(id, name) {
}
function removeLegend() {
- const select = document.getElementById("legendSelect");
+ const select = document.getElementById("notesSelect");
const index = notes.findIndex(n => n.id === select.value);
notes.splice(index, 1);
select.options.length = 0;
- if (!notes.length) {$("#legendEditor").dialog("close"); return;}
- editLegends(notes[0].id, notes[0].name);
+ if (!notes.length) {$("#notesEditor").dialog("close"); return;}
+ editNotes(notes[0].id, notes[0].name);
}
}
\ No newline at end of file
diff --git a/modules/ui/options.js b/modules/ui/options.js
index edb3fefb..2462eb49 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -67,8 +67,8 @@ options.querySelector("div.tab").addEventListener("click", function(event) {
if (id === "styleTab") styleContent.style.display = "block"; else
if (id === "optionsTab") optionsContent.style.display = "block"; else
- if (id === "toolsTab" && !customization) toolsContent.style.display = "block"; else
- if (id === "toolsTab" && customization) customizationMenu.style.display = "block"; else
+ if (id === "toolsTab" && (!customization || customization === 10)) toolsContent.style.display = "block"; else
+ if (id === "toolsTab" && customization && customization !== 10) customizationMenu.style.display = "block"; else
if (id === "aboutTab") aboutContent.style.display = "block";
});
@@ -90,7 +90,7 @@ function collapse(e) {
styleElementSelect.addEventListener("change", selectStyleElement);
function selectStyleElement() {
const sel = styleElementSelect.value;
- let el = viewbox.select("#"+sel);
+ let el = d3.select("#"+sel);
styleElements.querySelectorAll("tbody").forEach(e => e.style.display = "none"); // hide all sections
const off = el.style("display") === "none" || !el.selectAll("*").size(); // check if layer is off
@@ -102,14 +102,14 @@ function selectStyleElement() {
// active group element
const group = styleGroupSelect.value;
if (sel == "ocean") el = oceanLayers.select("rect");
- else if (sel == "routes" || sel == "labels" || sel == "lakes" || sel == "anchors" || sel == "burgIcons") {
+ else if (sel == "routes" || sel == "labels" || sel == "lakes" || sel == "anchors" || sel == "burgIcons" || sel == "borders") {
el = d3.select("#"+sel).select("g#"+group).size()
? d3.select("#"+sel).select("g#"+group)
: d3.select("#"+sel).select("g");
}
- if (sel !== "landmass") {
- // opacity
+ if (sel !== "landmass" && sel !== "legend") {
+ // opacity
styleOpacity.style.display = "block";
styleOpacityInput.value = styleOpacityOutput.value = el.attr("opacity") || 1;
@@ -120,28 +120,34 @@ function selectStyleElement() {
}
// fill
- if (sel === "rivers" || sel === "lakes" || sel === "landmass" || sel === "prec") {
+ if (sel === "rivers" || sel === "lakes" || sel === "landmass" || sel === "prec" || sel === "fogging") {
styleFill.style.display = "block";
styleFillInput.value = styleFillOutput.value = el.attr("fill");
}
// stroke color and width
- if (sel === "routes" || sel === "lakes" || sel === "borders" || sel === "cults" || sel === "cells" || sel === "gridOverlay" || sel === "coastline" || sel === "prec" || sel === "icons" || sel === "coordinates") {
+ if (sel === "routes" || sel === "lakes" || sel === "borders" || sel === "relig" || sel === "cults" || sel === "cells" || sel === "gridOverlay" || sel === "coastline" || sel === "prec" || sel === "icons" || sel === "coordinates"|| sel === "zones") {
styleStroke.style.display = "block";
styleStrokeInput.value = styleStrokeOutput.value = el.attr("stroke");
styleStrokeWidth.style.display = "block";
styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr("stroke-width") || "";
}
+ // stroke width
+ if (sel === "fogging") {
+ styleStrokeWidth.style.display = "block";
+ styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr("stroke-width") || "";
+ }
+
// stroke dash
- if (sel === "routes" || sel === "borders" || sel === "gridOverlay" || sel === "temperature" || sel === "population" || sel === "coordinates") {
+ if (sel === "routes" || sel === "borders" || sel === "gridOverlay" || sel === "temperature" || sel === "legend" || sel === "population" || sel === "coordinates"|| sel === "zones") {
styleStrokeDash.style.display = "block";
styleStrokeDasharrayInput.value = el.attr("stroke-dasharray") || "";
styleStrokeLinecapInput.value = el.attr("stroke-linecap") || "inherit";
}
// clipping
- if (sel === "cells" || sel === "gridOverlay" || sel === "coordinates" || sel === "compass" || sel === "terrain" || sel === "temperature" || sel === "routes" || sel === "texture" || sel === "biomes") {
+ if (sel === "cells" || sel === "gridOverlay" || sel === "coordinates" || sel === "compass" || sel === "terrain" || sel === "temperature" || sel === "routes" || sel === "texture" || sel === "biomes"|| sel === "zones") {
styleClipping.style.display = "block";
styleClippingInput.value = el.attr("mask") || "";
}
@@ -167,7 +173,7 @@ function selectStyleElement() {
if (sel === "gridOverlay") styleGrid.style.display = "block";
if (sel === "terrain") styleRelief.style.display = "block";
if (sel === "texture") styleTexture.style.display = "block";
- if (sel === "routes" || sel === "labels" || sel == "anchors" || sel == "burgIcons" || sel === "lakes") styleGroup.style.display = "block";
+ if (sel === "routes" || sel === "labels" || sel == "anchors" || sel == "burgIcons" || sel === "lakes" || sel === "borders") styleGroup.style.display = "block";
if (sel === "markers") styleMarkers.style.display = "block";
if (sel === "population") {
@@ -178,7 +184,7 @@ function selectStyleElement() {
styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr("stroke-width") || "";
}
- if (sel === "statesBody") {
+ if (sel === "regions") {
styleStates.style.display = "block";
styleStatesHaloWidth.value = styleStatesHaloWidthOutput.value = statesHalo.attr("stroke-width");
styleStatesHaloOpacity.value = styleStatesHaloOpacityOutput.value = statesHalo.attr("opacity");
@@ -226,6 +232,22 @@ function selectStyleElement() {
styleIconSizeInput.value = el.attr("size") || 2;
}
+ if (sel === "legend") {
+ styleStroke.style.display = "block";
+ styleStrokeWidth.style.display = "block";
+ loadDefaultFonts();
+ styleFont.style.display = "block";
+ styleSize.style.display = "block";
+ styleLegend.style.display = "block";
+
+ styleStrokeInput.value = styleStrokeOutput.value = el.attr("stroke") || "#111111";
+ styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr("stroke-width") || .5;
+ styleSelectFont.value = fonts.indexOf(el.attr("data-font"));
+ styleInputFont.style.display = "none";
+ styleInputFont.value = "";
+ styleFontSize.value = el.attr("data-size");
+ }
+
if (sel === "ocean") {
styleOcean.style.display = "block";
styleOceanBack.value = styleOceanBackOutput.value = svg.attr("background-color");
@@ -253,7 +275,7 @@ function selectStyleElement() {
// update group options
styleGroupSelect.options.length = 0; // remove all options
- if (sel === "routes" || sel === "labels" || sel === "lakes" || sel === "anchors" || sel === "burgIcons") {
+ if (sel === "routes" || sel === "labels" || sel === "lakes" || sel === "anchors" || sel === "burgIcons" || sel === "borders") {
document.getElementById(sel).querySelectorAll("g").forEach(el => {
if (el.id === "burgLabels") return;
const count = el.childElementCount;
@@ -308,7 +330,9 @@ styleFilterInput.addEventListener("change", function() {
});
styleTextureInput.addEventListener("change", function() {
- texture.select("image").attr("xlink:href", getAbsolutePath(this.value));
+ if (this.value === "none") texture.select("image").attr("xlink:href", ""); else
+ if (this.value === "default") texture.select("image").attr("xlink:href", getDefaultTexture()); else
+ setBase64Texture(this.value);
});
styleTextureShiftX.addEventListener("input", function() {
@@ -335,7 +359,7 @@ styleGridSize.addEventListener("input", function() {
function calculateFriendlyGridSize() {
const size = styleGridSize.value * Math.cos(30 * Math.PI / 180) * 2;;
- const friendly = "(" + rn(size * distanceScale.value) + " " + distanceUnit.value + ")";
+ const friendly = "(" + rn(size * distanceScaleInput.value) + " " + distanceUnitInput.value + ")";
styleGridSizeFriendly.value = friendly;
}
@@ -367,6 +391,11 @@ outlineLayersInput.addEventListener("change", function() {
OceanLayers();
});
+styleReliefSet.addEventListener("change", function() {
+ ReliefIcons();
+ if (!layerIsOn("toggleRelief")) toggleRelief();
+});
+
styleReliefSizeInput.addEventListener("input", function() {
styleReliefSizeOutput.value = this.value;
const size = +this.value;
@@ -386,6 +415,7 @@ styleReliefSizeInput.addEventListener("input", function() {
styleReliefDensityInput.addEventListener("input", function() {
styleReliefDensityOutput.value = rn(this.value * 100) + "%";
ReliefIcons();
+ if (!layerIsOn("toggleRelief")) toggleRelief();
});
styleTemperatureFillOpacityInput.addEventListener("input", function() {
@@ -426,11 +456,26 @@ function shiftCompass() {
d3.select("#rose").attr("transform", tr);
}
+styleLegendColItems.addEventListener("input", function() {
+ styleLegendColItemsOutput.value = this.value;
+ redrawLegend();
+});
+
+styleLegendBack.addEventListener("input", function() {
+ legend.select("rect").attr("fill", this.value)
+});
+
+styleLegendOpacity.addEventListener("input", function() {
+ styleLegendOpacityOutput.value = this.value;
+ legend.select("rect").attr("fill-opacity", this.value)
+});
+
styleSelectFont.addEventListener("change", changeFont);
function changeFont() {
const value = styleSelectFont.value;
const font = fonts[value].split(':')[0].replace(/\+/g, " ");
getEl().attr("font-family", font).attr("data-font", fonts[value]);
+ if (styleElementSelect.value === "legend") redrawLegend();
}
styleFontAdd.addEventListener("click", function() {
@@ -471,8 +516,13 @@ styleFontMinus.addEventListener("click", function() {
});
function changeFontSize(size) {
- getEl().attr("data-size", size).attr("font-size", rn((size + (size / scale)) / 2, 2));
+ const legend = styleElementSelect.value === "legend";
+ const coords = styleElementSelect.value === "coordinates";
+
+ const desSize = legend ? size : coords ? rn(size / scale ** .8, 2) : rn(size + (size / scale));
+ getEl().attr("data-size", size).attr("font-size", desSize);
styleFontSize.value = size;
+ if (legend) redrawLegend();
}
styleRadiusInput.addEventListener("change", function() {
@@ -568,7 +618,7 @@ function textureProvideURL() {
opt.text = name.slice(0, 20);
styleTextureInput.add(opt);
styleTextureInput.value = textureURL.value;
- texture.select("image").attr('xlink:href', textureURL.value);
+ setBase64Texture(textureURL.value);
zoom.scaleBy(svg, 1.00001); // enforce browser re-draw
$(this).dialog("close");
},
@@ -577,6 +627,20 @@ function textureProvideURL() {
});
}
+function setBase64Texture(url) {
+ var xhr = new XMLHttpRequest();
+ xhr.onload = function() {
+ var reader = new FileReader();
+ reader.onloadend = function() {
+ texture.select("image").attr("xlink:href", reader.result);
+ }
+ reader.readAsDataURL(xhr.response);
+ };
+ xhr.open('GET', url);
+ xhr.responseType = 'blob';
+ xhr.send();
+};
+
function fetchTextureURL(url) {
console.log("Provided URL is", url);
const img = new Image();
@@ -610,11 +674,14 @@ optionsContent.addEventListener("input", function(event) {
else if (id === "culturesInput") culturesOutput.value = value;
else if (id === "culturesOutput") culturesInput.value = value;
else if (id === "regionsInput" || id === "regionsOutput") changeStatesNumber(value);
- else if (id === "powerInput") powerOutput.value = value;
+ else if (id === "provincesInput") provincesOutput.value = value;
+ else if (id === "provincesOutput") provincesOutput.value = value;
+ else if (id === "provincesOutput") powerOutput.value = value;
else if (id === "powerOutput") powerInput.value = value;
else if (id === "neutralInput") neutralOutput.value = value;
else if (id === "neutralOutput") neutralInput.value = value;
else if (id === "manorsInput") changeBurgsNumberSlider(value);
+ else if (id === "religionsInput") religionsOutput.value = value;
else if (id === "uiSizeInput" || id === "uiSizeOutput") changeUIsize(value);
else if (id === "tooltipSizeInput" || id === "tooltipSizeOutput") changeTooltipSize(value);
else if (id === "transparencyInput") changeDialogsTransparency(value);
@@ -655,6 +722,7 @@ function changeMapSize() {
oceanPattern.select("rect").attr("x", 0).attr("y", 0).attr("width", width).attr("height", height);
oceanLayers.select("rect").attr("x", 0).attr("y", 0).attr("width", width).attr("height", height);
fitScaleBar();
+ fitLegendBox();
}
// just apply map size that was already set, apply graph size!
@@ -764,66 +832,67 @@ function changeDialogsTransparency(value) {
}
function changeZoomExtent(value) {
- const min = +zoomExtentMin.value;
- zoom.scaleExtent([min, +zoomExtentMax.value]);
- zoom.scaleTo(svg, +value);
+ const min = Math.max(+zoomExtentMin.value, .01), max = Math.min(+zoomExtentMax.value, 200);
+ zoom.scaleExtent([min, max]);
+ const scale = Math.max(Math.min(+value, 200), .01);
+ zoom.scaleTo(svg, scale);
}
// control sroted options
function applyStoredOptions() {
- for(let i=0; i < localStorage.length; i++){
+ if (!localStorage.getItem("mapWidth") || !localStorage.getItem("mapHeight")) {
+ mapWidthInput.value = window.innerWidth;
+ mapHeightInput.value = window.innerHeight;
+ }
+
+ if (localStorage.getItem("distanceUnit")) applyOption(distanceUnitInput, localStorage.getItem("distanceUnit"));
+ if (localStorage.getItem("heightUnit")) applyOption(heightUnit, localStorage.getItem("heightUnit"));
+
+ for (let i=0; i < localStorage.length; i++) {
const stored = localStorage.key(i), value = localStorage.getItem(stored);
- const input = document.getElementById(stored+"Input");
+ const input = document.getElementById(stored+"Input") || document.getElementById(stored);
const output = document.getElementById(stored+"Output");
if (input) input.value = value;
if (output) output.value = value;
lock(stored);
}
- if (!localStorage.getItem("mapWidth") || !localStorage.getItem("mapHeight")) {
- mapWidthInput.value = window.innerWidth;
- mapHeightInput.value = window.innerHeight;
- }
-
if (localStorage.getItem("winds")) winds = localStorage.getItem("winds").split(",").map(w => +w);
-
- changeDialogsTransparency(localStorage.getItem("transparency") || 30);
+
+ changeDialogsTransparency(localStorage.getItem("transparency") || 15);
if (localStorage.getItem("uiSize")) changeUIsize(localStorage.getItem("uiSize"));
if (localStorage.getItem("tooltipSize")) changeTooltipSize(localStorage.getItem("tooltipSize"));
if (localStorage.getItem("regions")) changeStatesNumber(localStorage.getItem("regions"));
-
- if (localStorage.getItem("equator")) {
- const eqY = +equatorInput.value;
- equidistanceOutput.min = equidistanceInput.min = Math.max(+mapHeightInput.value - eqY, eqY);
- equidistanceOutput.max = equidistanceInput.max = equidistanceOutput.min * 10;
- }
}
-// randomize options if randomization is allowed in option
+// randomize options if randomization is allowed (not locked)
function randomizeOptions() {
Math.seedrandom(seed); // reset seed to initial one
- if (!locked("regions")) regionsInput.value = regionsOutput.value = rand(12, 17);
+
+ // 'Options' settings
+ if (!locked("regions")) regionsInput.value = regionsOutput.value = gauss(15, 3, 2, 30);
+ if (!locked("provinces")) provincesInput.value = provincesOutput.value = gauss(40, 20, 20, 100);
if (!locked("manors")) {manorsInput.value = 1000; manorsOutput.value = "auto";}
- if (!locked("power")) powerInput.value = powerOutput.value = rand(0, 4);
- if (!locked("neutral")) neutralInput.value = neutralOutput.value = rn(0.8 + Math.random(), 1);
- if (!locked("cultures")) culturesInput.value = culturesOutput.value = rand(10, 15);
+ if (!locked("religions")) religionsInput.value = religionsOutput.value = gauss(6, 2, 3, 20);
+ if (!locked("power")) powerInput.value = powerOutput.value = gauss(3, 2, 0, 10);
+ if (!locked("neutral")) neutralInput.value = neutralOutput.value = rn(1 + Math.random(), 1);
+ if (!locked("cultures")) culturesInput.value = culturesOutput.value = gauss(12, 3, 5, 30);
+
+ // 'Configure World' settings
if (!locked("prec")) precInput.value = precOutput.value = gauss(100, 40, 0, 500);
const tMax = +temperatureEquatorOutput.max, tMin = +temperatureEquatorOutput.min; // temperature extremes
if (!locked("temperatureEquator")) temperatureEquatorOutput.value = temperatureEquatorInput.value = rand(tMax-6, tMax);
if (!locked("temperaturePole")) temperaturePoleOutput.value = temperaturePoleInput.value = rand(tMin, tMin+10);
- if (!locked("equator") && !locked("equidistance")) randomizeWorldSize();
-}
+ if (!locked("mapSize")) mapSizeOutput.value = mapSizeInput.value = gauss(50, 20, 15, 100);
+ if (!locked("latitude")) latitudeOutput.value = latitudeInput.value = gauss(50, 20, 15, 100);
-// define world size
-function randomizeWorldSize() {
- const eq = document.getElementById("equatorInput");
- const eqDI = document.getElementById("equidistanceInput");
- const eqDO = document.getElementById("equidistanceOutput");
-
- const eqY = equatorOutput.value = eq.value = rand(+eq.min, +eq.max); // equator Y
- eqDO.min = eqDI.min = Math.max(graphHeight - eqY, eqY);
- eqDO.max = eqDI.max = eqDO.min * 10;
- eqDO.value = eqDI.value = rand(rn(eqDO.min * 1.2), rn(eqDO.min * 4)); // distance from equator to poles
+ // 'Units Editor' settings
+ const US = navigator.language === "en-US";
+ const UK = navigator.language === "en-GB";
+ if (!locked("distanceScale")) distanceScaleOutput.value = distanceScaleInput.value = gauss(3, 1, 1, 5);
+ if (!stored("distanceUnit")) distanceUnitInput.value = distanceUnitOutput.value = US || UK ? "mi" : "km";
+ if (!stored("heightUnit")) heightUnit.value = US || UK ? "ft" : "m";
+ if (!stored("temperatureScale")) temperatureScale.value = US ? "°F" : "°C";
}
// remove all saved data from LocalStorage and reload the page
@@ -832,9 +901,7 @@ function restoreDefaultOptions() {
location.reload();
}
-
// FONTS
-
// fetch default fonts if not done before
function loadDefaultFonts() {
if (!$('link[href="fonts.css"]').length) {
diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js
new file mode 100644
index 00000000..501234a8
--- /dev/null
+++ b/modules/ui/provinces-editor.js
@@ -0,0 +1,521 @@
+"use strict";
+function editProvinces() {
+ if (customization) return;
+ closeDialogs("#provincesEditor, .stable");
+ if (!layerIsOn("toggleProvinces")) toggleProvinces();
+ if (!layerIsOn("toggleBorders")) toggleBorders();
+ if (layerIsOn("toggleStates")) toggleStates();
+ if (layerIsOn("toggleCultures")) toggleCultures();
+
+ const body = document.getElementById("provincesBodySection");
+ refreshProvincesEditor();
+
+ if (modules.editProvinces) return;
+ modules.editProvinces = true;
+
+ $("#provincesEditor").dialog({
+ title: "Provinces Editor", resizable: false, width: fitContent(), close: closeProvincesEditor,
+ position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}
+ });
+
+ // add listeners
+ document.getElementById("provincesEditorRefresh").addEventListener("click", refreshProvincesEditor);
+ document.getElementById("provincesFilterState").addEventListener("change", provincesEditorAddLines);
+ document.getElementById("provincesPercentage").addEventListener("click", togglePercentageMode);
+ document.getElementById("provincesToggleLabels").addEventListener("click", toggleLabels);
+ document.getElementById("provincesExport").addEventListener("click", downloadProvincesData);
+ document.getElementById("provincesRemoveAll").addEventListener("click", removeAllProvinces);
+ document.getElementById("provincesManually").addEventListener("click", enterProvincesManualAssignent);
+ document.getElementById("provincesManuallyApply").addEventListener("click", applyProvincesManualAssignent);
+ document.getElementById("provincesManuallyCancel").addEventListener("click", () => exitProvincesManualAssignment());
+ document.getElementById("provincesAdd").addEventListener("click", enterAddProvinceMode);
+
+ body.addEventListener("click", function(ev) {
+ if (customization) return;
+ const el = ev.target, cl = el.classList, line = el.parentNode, p = +line.dataset.id;
+ if (cl.contains("zoneFill")) changeFill(el); else
+ if (cl.contains("icon-fleur")) provinceOpenCOA(p); else
+ if (cl.contains("icon-star-empty")) capitalZoomIn(p); else
+ if (cl.contains("icon-pin")) focusOn(p, cl); else
+ if (cl.contains("icon-trash-empty")) removeProvince(p);
+ if (cl.contains("hoverButton") && cl.contains("stateName")) regenerateName(p, line); else
+ if (cl.contains("hoverButton") && cl.contains("stateForm")) regenerateForm(p, line);
+ });
+
+ body.addEventListener("input", function(ev) {
+ const el = ev.target, cl = el.classList, line = el.parentNode, p = +line.dataset.id;
+ if (cl.contains("stateName")) changeName(p, line, el.value); else
+ if (cl.contains("stateForm")) changeForm(p, line, el.value); else
+ if (cl.contains("cultureBase")) changeCapital(p, line, el.value);
+ });
+
+ function refreshProvincesEditor() {
+ collectStatistics();
+ updateFilter();
+ provincesEditorAddLines();
+ }
+
+ function collectStatistics() {
+ const cells = pack.cells, provinces = pack.provinces;
+ provinces.forEach(p => {
+ if (!p.i) return;
+ p.area = p.rural = p.urban = 0;
+ p.burgs = [];
+ });
+
+ for (const i of cells.i) {
+ const p = cells.province[i];
+ if (!p) continue;
+
+ provinces[p].area += cells.area[i];
+ provinces[p].rural += cells.pop[i];
+ if (!cells.burg[i]) continue;
+ provinces[p].urban += pack.burgs[cells.burg[i]].population;
+ provinces[p].burgs.push(cells.burg[i]);
+ }
+ }
+
+ function updateFilter() {
+ const stateFilter = document.getElementById("provincesFilterState");
+ const selectedState = stateFilter.value || 1;
+ stateFilter.options.length = 0; // remove all options
+ stateFilter.options.add(new Option(`all`, -1, false, selectedState == -1));
+ const statesSorted = pack.states.filter(s => s.i && !s.removed).sort((a, b) => (a.name > b.name) ? 1 : -1);
+ statesSorted.forEach(s => stateFilter.options.add(new Option(s.name, s.i, false, s.i == selectedState)));
+ }
+
+ // add line for each state
+ function provincesEditorAddLines() {
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
+ const selectedState = +document.getElementById("provincesFilterState").value;
+ let filtered = pack.provinces.filter(p => p.i && !p.removed); // all valid burgs
+ if (selectedState != -1) filtered = filtered.filter(p => p.state === selectedState); // filtered by state
+ body.innerHTML = "";
+ let lines = "", totalArea = 0, totalPopulation = 0;
+
+ for (const p of filtered) {
+ const area = p.area * (distanceScaleInput.value ** 2);
+ totalArea += area;
+ const rural = p.rural * populationRate.value;
+ const urban = p.urban * populationRate.value * urbanization.value;
+ const population = rn(rural + urban);
+ const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}`;
+ totalPopulation += population;
+
+ const stateName = pack.states[p.state].name;
+ const capital = p.burg ? pack.burgs[p.burg].name : '';
+ const focused = defs.select("#fog #focusProvince"+p.i).size();
+ lines += `
Are you sure you want to proceed?` + $("#alert").dialog({resizable: false, title: "Regenerate element", + buttons: { + Proceed: function() {processFeatureRegeneration(button); $(this).dialog("close");}, + Cancel: function() {$(this).dialog("close");} + }, + create: function() { + const pane = $(this).dialog("widget").find(".ui-dialog-buttonpane"); + $('').prependTo(pane); + }, + close: function() { + const box = $(this).dialog("widget").find(".checkbox")[0]; + if (!box) return; + if (box.checked) sessionStorage.setItem("regenerateFeatureDontAsk", true); + } + }); + } // Click to Add buttons if (button === "addLabel") toggleAddLabel(); else @@ -32,6 +50,18 @@ toolsContent.addEventListener("click", function(event) { if (button === "addMarker") toggleAddMarker(); }); +function processFeatureRegeneration(button) { + if (button === "regenerateStateLabels") {BurgsAndStates.drawStateLabels(); if (!layerIsOn("toggleLabels")) toggleLabels();} else + if (button === "regenerateReliefIcons") {ReliefIcons(); if (!layerIsOn("toggleRelief")) toggleRelief();} else + if (button === "regenerateRoutes") {Routes.regenerate(); if (!layerIsOn("toggleRoutes")) toggleRoutes();} else + if (button === "regenerateRivers") regenerateRivers(); else + if (button === "regeneratePopulation") recalculatePopulation(); else + if (button === "regenerateBurgs") regenerateBurgs(); else + if (button === "regenerateStates") regenerateStates(); else + if (button === "regenerateProvinces") regenerateProvinces(); else + if (button === "regenerateReligions") regenerateReligions(); +} + function regenerateRivers() { const heights = new Uint8Array(pack.cells.h); Rivers.generate(); @@ -45,9 +75,10 @@ function recalculatePopulation() { if (!b.i || b.removed) return; const i = b.cell; - b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i]) / 3 + b.i / 1000 + i % 100 / 1000, .1), 3); - if (b.capital) b.population = rn(b.population * 1.3, 3); // increase capital population - if (b.port) b.population = rn(b.population * 1.3, 3); // increase port population + b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i]) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3); + if (b.capital) b.population = b.population * 1.3; // increase capital population + if (b.port) b.population = b.population * 1.3; // increase port population + b.population = rn(b.population * gauss(2,3,.6,20,3), 3); }); } @@ -62,14 +93,14 @@ function regenerateBurgs() { const score = new Int16Array(cells.s.map(s => s * Math.random())); // cell score for capitals placement const sorted = cells.i.filter(i => score[i] > 0 && cells.culture[i]).sort((a, b) => score[b] - score[a]); // filtered and sorted array of indexes const burgsCount = manorsInput.value == 1000 ? rn(sorted.length / 10 / densityInput.value ** .8) + states.length : +manorsInput.value + states.length; - const spacing = (graphWidth + graphHeight) * 9 / burgsCount; // base min distance between towns + const spacing = (graphWidth + graphHeight) / 200 / (burgsCount / 500); // base min distance between towns for (let i=0; i < sorted.length && burgs.length < burgsCount; i++) { const id = burgs.length; const cell = sorted[i]; const x = cells.p[cell][0], y = cells.p[cell][1]; - const s = spacing * Math.random() + 0.5; // randomize to make the placement not uniform + const s = spacing * gauss(1, .3, .2, 2, 2); // randomize to make the placement not uniform if (burgsTree.find(x, y, s) !== undefined) continue; // to close to existing burg const state = cells.state[cell]; @@ -96,28 +127,29 @@ function regenerateBurgs() { BurgsAndStates.drawBurgs(); Routes.regenerate(); - document.getElementById("statesBodySection").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsBody").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsFilterState").options.length = 0; - document.getElementById("burgsFilterCulture").options.length = 0; + if (document.getElementById("burgsEditorRefresh").offsetParent) burgsEditorRefresh.click(); + if (document.getElementById("statesEditorRefresh").offsetParent) statesEditorRefresh.click(); } function regenerateStates() { + Math.seedrandom(Math.floor(Math.random() * 1e9)); // new random seed const burgs = pack.burgs.filter(b => b.i && !b.removed), states = pack.states.filter(s => s.i && !s.removed); + // burgs sorted by a bit randomized population: + const sorted = burgs.map(b => [b.i, b.population * Math.random()]).sort((a, b) => b[1] - a[1]).map(b => b[0]); const capitalsTree = d3.quadtree(); let spacing = (graphWidth + graphHeight) / 2 / states.length; // min distance between capitals // turn all old capitals into towns - states.forEach(s => { - moveBurgToGroup(s.capital, "towns"); - s.capital = 0; + burgs.filter(b => b.capital).forEach(b => { + moveBurgToGroup(b.i, "towns"); + b.capital = false; }); states.forEach(s => { let newCapital = 0, x = 0, y = 0; - while (!newCapital) { - newCapital = burgs[biased(1, burgs.length-1, 3)]; + for (let i=0; i < sorted.length && !newCapital; i++) { + newCapital = burgs[sorted[i]]; x = newCapital.x, y = newCapital.y; if (capitalsTree.find(x, y, spacing) !== undefined) { spacing -= 1; @@ -127,23 +159,44 @@ function regenerateStates() { } capitalsTree.add([x, y]); + newCapital.capital = true; s.capital = newCapital.i; s.center = newCapital.cell; s.culture = newCapital.culture; - s.expansionism = rn(Math.random() * powerInput.value / 2 + 1, 1); + s.expansionism = rn(Math.random() * powerInput.value + 1, 1); const basename = newCapital.name.length < 9 && newCapital.cell%5 === 0 ? newCapital.name : Names.getCulture(s.culture, 3, 6, "", 0); s.name = Names.getState(basename, s.culture); + const nomadic = [1, 2, 3, 4].includes(pack.cells.biome[newCapital.cell]); + s.type = nomadic ? "Nomadic" : pack.cultures[s.culture].type === "Nomadic" ? "Generic" : pack.cultures[s.culture].type; moveBurgToGroup(newCapital.i, "cities"); - - document.getElementById("statesBodySection").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsBody").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsFilterState").options.length = 0; - document.getElementById("burgsFilterCulture").options.length = 0; }); + unfog(); BurgsAndStates.expandStates(); - if (!layerIsOn("toggleStates")) toggleStates(); else drawStatesWithBorders(); + BurgsAndStates.normalizeStates(); + BurgsAndStates.collectStatistics(); + BurgsAndStates.assignColors(); + BurgsAndStates.generateDiplomacy(); + BurgsAndStates.defineStateForms(); + BurgsAndStates.generateProvinces(true); + if (!layerIsOn("toggleStates")) toggleStates(); else drawStates(); + if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders(); BurgsAndStates.drawStateLabels(); + + if (document.getElementById("burgsEditorRefresh").offsetParent) burgsEditorRefresh.click(); + if (document.getElementById("statesEditorRefresh").offsetParent) statesEditorRefresh.click(); +} + +function regenerateProvinces() { + unfog(); + BurgsAndStates.generateProvinces(true); + drawBorders(); + if (layerIsOn("toggleProvinces")) drawProvinces(); +} + +function regenerateReligions() { + Religions.generate(); + if (!layerIsOn("toggleReligions")) toggleReligions(); else drawReligions(); } function unpressClickToAddButton() { @@ -179,12 +232,18 @@ function addLabelOnClick() { .attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC") .attr("font-size", 18).attr("data-size", 18).attr("filter", null); - group.append("text").attr("id", id) - .append("textPath").attr("xlink:href", "#textPath_"+id).text(name) - .attr("startOffset", "50%").attr("font-size", "100%"); + const example = group.append("text").attr("x", 0).attr("x", 0).text(name); + const width = example.node().getBBox().width; + const x = width / -2; // x offset; + example.remove(); - defs.select("#textPaths").append("path").attr("id", "textPath_"+id) - .attr("d", `M${point[0]-60},${point[1]} h${120}`); + group.append("text").attr("id", id) + .append("textPath").attr("xlink:href", "#textPath_"+id).attr("startOffset", "50%").attr("font-size", "100%") + .append("tspan").attr("x", x).text(name); + + defs.select("#textPaths") + .append("path").attr("id", "textPath_"+id) + .attr("d", `M${point[0]-width},${point[1]} h${width*2}`); if (d3.event.shiftKey === false) unpressClickToAddButton(); } diff --git a/modules/ui/units-editor.js b/modules/ui/units-editor.js index 63961327..ae848a57 100644 --- a/modules/ui/units-editor.js +++ b/modules/ui/units-editor.js @@ -12,31 +12,34 @@ function editUnits() { }); // add listeners - document.getElementById("distanceUnit").addEventListener("change", changeDistanceUnit); - document.getElementById("distanceScaleSlider").addEventListener("input", changeDistanceScale); - document.getElementById("distanceScale").addEventListener("change", changeDistanceScale); - document.getElementById("distanceScale").addEventListener("mouseenter", hideDistanceUnitOutput); - document.getElementById("distanceScale").addEventListener("mouseleave", showDistanceUnitOutput); + document.getElementById("distanceUnitInput").addEventListener("change", changeDistanceUnit); + document.getElementById("distanceScaleOutput").addEventListener("input", changeDistanceScale); + document.getElementById("distanceScaleInput").addEventListener("change", changeDistanceScale); + document.getElementById("distanceScaleInput").addEventListener("mouseenter", hideDistanceUnitOutput); + document.getElementById("distanceScaleInput").addEventListener("mouseleave", showDistanceUnitOutput); + document.getElementById("areaUnit").addEventListener("change", () => lock("areaUnit")); document.getElementById("heightUnit").addEventListener("change", changeHeightUnit); - document.getElementById("heightExponent").addEventListener("input", changeHeightExponent); - document.getElementById("heightExponentSlider").addEventListener("input", changeHeightExponent); - document.getElementById("temperatureScale").addEventListener("change", () => {if (layerIsOn("toggleTemp")) drawTemp()}); - document.getElementById("barSizeSlider").addEventListener("input", changeScaleBarSize); + document.getElementById("heightExponentInput").addEventListener("input", changeHeightExponent); + document.getElementById("heightExponentOutput").addEventListener("input", changeHeightExponent); + document.getElementById("temperatureScale").addEventListener("change", changeTemperatureScale); + document.getElementById("barSizeOutput").addEventListener("input", changeScaleBarSize); document.getElementById("barSize").addEventListener("input", changeScaleBarSize); - document.getElementById("barLabel").addEventListener("input", drawScaleBar); - document.getElementById("barPosX").addEventListener("input", fitScaleBar); - document.getElementById("barPosY").addEventListener("input", fitScaleBar); - document.getElementById("barBackOpacity").addEventListener("input", function() {scaleBar.select("rect").attr("opacity", this.value)}); - document.getElementById("barBackColor").addEventListener("input", function() {scaleBar.select("rect").attr("fill", this.value)}); - document.getElementById("populationRateSlider").addEventListener("input", changePopulationRate); + document.getElementById("barLabel").addEventListener("input", changeScaleBarLabel); + document.getElementById("barPosX").addEventListener("input", changeScaleBarPosition); + document.getElementById("barPosY").addEventListener("input", changeScaleBarPosition); + document.getElementById("barBackOpacity").addEventListener("input", changeScaleBarOpacity); + document.getElementById("barBackColor").addEventListener("input", changeScaleBarColor); + + document.getElementById("populationRateOutput").addEventListener("input", changePopulationRate); document.getElementById("populationRate").addEventListener("change", changePopulationRate); - document.getElementById("urbanizationSlider").addEventListener("input", changeUrbanizationRate); + document.getElementById("urbanizationOutput").addEventListener("input", changeUrbanizationRate); document.getElementById("urbanization").addEventListener("change", changeUrbanizationRate); document.getElementById("addLinearRuler").addEventListener("click", addAdditionalRuler); document.getElementById("addOpisometer").addEventListener("click", toggleOpisometerMode); document.getElementById("addPlanimeter").addEventListener("click", togglePlanimeterMode); document.getElementById("removeRulers").addEventListener("click", removeAllRulers); + document.getElementById("unitsRestore").addEventListener("click", restoreDefaultUnits); function changeDistanceUnit() { if (this.value === "custom_name") { @@ -46,6 +49,7 @@ function editUnits() { } document.getElementById("distanceUnitOutput").innerHTML = this.value; + lock("distanceUnit"); drawScaleBar(); calculateFriendlyGridSize(); } @@ -54,13 +58,15 @@ function editUnits() { const scale = +this.value; if (!scale || isNaN(scale) || scale < 0) { tip("Distance scale should be a positive number", false, "error"); - this.value = document.getElementById("distanceScale").dataset.value; + this.value = document.getElementById("distanceScaleInput").dataset.value; return; } - document.getElementById("distanceScaleSlider").value = scale; - document.getElementById("distanceScale").value = scale; - document.getElementById("distanceScale").dataset.value = scale; + document.getElementById("distanceScaleOutput").value = scale; + document.getElementById("distanceScaleInput").value = scale; + document.getElementById("distanceScaleInput").dataset.value = scale; + lock("distanceScale"); + drawScaleBar(); calculateFriendlyGridSize(); } @@ -69,23 +75,54 @@ function editUnits() { function showDistanceUnitOutput() {document.getElementById("distanceUnitOutput").style.opacity = 1;} function changeHeightUnit() { - if (this.value !== "custom_name") return; - const custom = prompt("Provide a custom name for height unit"); - if (custom) this.options.add(new Option(custom, custom, false, true)); - else this.value = "ft"; + if (this.value === "custom_name") { + const custom = prompt("Provide a custom name for height unit"); + if (custom) this.options.add(new Option(custom, custom, false, true)); + else this.value = "ft"; + } + + lock("heightUnit"); } function changeHeightExponent() { - document.getElementById("heightExponent").value = this.value; - document.getElementById("heightExponentSlider").value = this.value; + document.getElementById("heightExponentInput").value = this.value; + document.getElementById("heightExponentOutput").value = this.value; calculateTemperatures(); if (layerIsOn("toggleTemp")) drawTemp(); + lock("heightExponent"); + } + + function changeTemperatureScale() { + lock("temperatureScale"); + if (layerIsOn("toggleTemp")) drawTemp(); } function changeScaleBarSize() { document.getElementById("barSize").value = this.value; - document.getElementById("barSizeSlider").value = this.value; + document.getElementById("barSizeOutput").value = this.value; drawScaleBar(); + lock("barSize"); + } + + function changeScaleBarPosition() { + lock("barPosX"); + lock("barPosY"); + fitScaleBar(); + } + + function changeScaleBarLabel() { + lock("barLabel"); + drawScaleBar(); + } + + function changeScaleBarOpacity() { + scaleBar.select("rect").attr("opacity", this.value); + lock("barBackOpacity"); + } + + function changeScaleBarColor() { + scaleBar.select("rect").attr("fill", this.value); + lock("barBackColor"); } function changePopulationRate() { @@ -96,9 +133,10 @@ function editUnits() { return; } - document.getElementById("populationRateSlider").value = rate; + document.getElementById("populationRateOutput").value = rate; document.getElementById("populationRate").value = rate; document.getElementById("populationRate").dataset.value = rate; + lock("populationRate"); } function changeUrbanizationRate() { @@ -109,15 +147,67 @@ function editUnits() { return; } - document.getElementById("urbanizationSlider").value = rate; + document.getElementById("urbanizationOutput").value = rate; document.getElementById("urbanization").value = rate; document.getElementById("urbanization").dataset.value = rate; + lock("urbanization"); + } + + function restoreDefaultUnits() { + // distanceScale + document.getElementById("distanceScaleOutput").value = 3; + document.getElementById("distanceScaleInput").value = 3; + document.getElementById("distanceScaleInput").dataset.value = 3; + unlock("distanceScale"); + + // units + const US = navigator.language === "en-US"; + const UK = navigator.language === "en-GB"; + distanceUnitInput.value = distanceUnitOutput.value = US || UK ? "mi" : "km"; + heightUnit.value = US || UK ? "ft" : "m"; + temperatureScale.value = US ? "°F" : "°C"; + areaUnit.value = "square"; + localStorage.removeItem("distanceUnit"); + localStorage.removeItem("heightUnit"); + localStorage.removeItem("temperatureScale"); + localStorage.removeItem("areaUnit"); + calculateFriendlyGridSize(); + + // height exponent + heightExponentInput.value = heightExponentOutput.value = 1.8; + localStorage.removeItem("heightExponent"); + calculateTemperatures(); + + // scale bar + barSizeOutput.value = barSize.value = 2; + barLabel.value = ""; + barBackOpacity.value = .2; + barBackColor.value = "#ffffff"; + barPosX.value = barPosY.value = 99; + + localStorage.removeItem("barSize"); + localStorage.removeItem("barLabel"); + localStorage.removeItem("barBackOpacity"); + localStorage.removeItem("barBackColor"); + localStorage.removeItem("barPosX"); + localStorage.removeItem("barPosY"); + drawScaleBar(); + + // population + populationRateOutput.value = populationRate.value = 1000; + urbanizationOutput.value = urbanization.value = 1000; + localStorage.removeItem("populationRate"); + localStorage.removeItem("urbanization"); } function addAdditionalRuler() { if (!layerIsOn("toggleRulers")) toggleRulers(); - const y = rn(Math.random() * graphHeight * .5 + graphHeight * .25); - addRuler(graphWidth * .2, y, graphWidth * .8, y); + const x = graphWidth/2, y = graphHeight/2; + const pt = document.getElementById('map').createSVGPoint(); + pt.x = x, pt.y = y; + const p = pt.matrixTransform(viewbox.node().getScreenCTM().inverse()); + const dx = rn(graphWidth / 4 / scale), dy = rand(dx / 2, dx * 2) - rand(dx / 2, dx * 2); + addRuler(p.x - dx, p.y + dy, p.x + dx, p.y + dy); } function toggleOpisometerMode() { diff --git a/modules/ui/world-configurator.js b/modules/ui/world-configurator.js index d9195b56..86f7446b 100644 --- a/modules/ui/world-configurator.js +++ b/modules/ui/world-configurator.js @@ -1,6 +1,21 @@ function editWorld() { if (customization) return; - $("#worldConfigurator").dialog({title: "Configure World", width: 440}); + $("#worldConfigurator").dialog({title: "Configure World", resizable: false, width: 460, + buttons: { + "Whole World": () => applyPreset(100, 50), + "Northern": () => applyPreset(33, 25), + "Tropical": () => applyPreset(33, 50), + "Southern": () => applyPreset(33, 75), + "Restore Winds": restoreDefaultWinds + }, open: function() { + const buttons = $(this).dialog("widget").find(".ui-dialog-buttonset > button") + buttons[0].addEventListener("mousemove", () => tip("Click to set map size to cover the whole World")); + buttons[1].addEventListener("mousemove", () => tip("Click to set map size to cover the Northern latitudes")); + buttons[2].addEventListener("mousemove", () => tip("Click to set map size to cover the Tropical latitudes")); + buttons[3].addEventListener("mousemove", () => tip("Click to set map size to cover the Southern latitudes")); + buttons[4].addEventListener("mousemove", () => tip("Click to restore default wind directions")); + }, + }); const globe = d3.select("#globe"); const clr = d3.scaleSequential(d3.interpolateSpectral); @@ -16,7 +31,6 @@ function editWorld() { document.getElementById("worldControls").addEventListener("input", (e) => updateWorld(e.target)); globe.select("#globeWindArrows").on("click", changeWind); - globe.select("#restoreWind").on("click", restoreDefaultWinds); globe.select("#globeGraticule").attr("d", round(path(d3.geoGraticule()()))); // globe graticule updateWindDirections(); @@ -44,30 +58,26 @@ function editWorld() { } function updateGlobePosition() { - const eqY = +document.getElementById("equatorOutput").value; - const equidistance = document.getElementById("equidistanceOutput"); - equidistance.min = equidistanceInput.min = Math.max(graphHeight - eqY, eqY); - equidistance.max = equidistanceInput.max = equidistance.min * 10; - const eqD = +equidistance.value; + const size = +document.getElementById("mapSizeOutput").value; + const eqD = graphHeight / 2 * 100 / size; + calculateMapCoordinates(); const mc = mapCoordinates; // shortcut - - const scale = +distanceScale.value, unit = distanceUnit.value; + const scale = +distanceScaleInput.value, unit = distanceUnitInput.value; + const meridian = toKilometer(eqD * 2 * scale); document.getElementById("mapSize").innerHTML = `${graphWidth}x${graphHeight}`; document.getElementById("mapSizeFriendly").innerHTML = `${rn(graphWidth * scale)}x${rn(graphHeight * scale)} ${unit}`; document.getElementById("meridianLength").innerHTML = rn(eqD * 2); document.getElementById("meridianLengthFriendly").innerHTML = `${rn(eqD * 2 * scale)} ${unit}`; - document.getElementById("meridianLengthEarth").innerHTML = toKilometer(eqD * 2 * scale); + document.getElementById("meridianLengthEarth").innerHTML = meridian ? " = " + rn(meridian / 200) + "%🌏" : ""; document.getElementById("mapCoordinates").innerHTML = `${lat(mc.latN)} ${Math.abs(rn(mc.lonW))}°W; ${lat(mc.latS)} ${rn(mc.lonE)}°E`; function toKilometer(v) { - let kilometers; // value converted to kilometers - if (unit === "km") kilometers = v; - else if (unit === "mi") kilometers = v * 1.60934; - else if (unit === "lg") kilometers = v * 5.556; - else if (unit === "vr") kilometers = v * 1.0668; - else return ""; // do not show as distanceUnit is custom - return " = " + rn(kilometers / 200) + "%🌏"; // % + Earth icon + if (unit === "km") return v; + else if (unit === "mi") return v * 1.60934; + else if (unit === "lg") return v * 5.556; + else if (unit === "vr") return v * 1.0668; + return 0; // 0 if distanceUnitInput is a custom unit } function lat(lat) {return lat > 0 ? Math.abs(rn(lat)) + "°N" : Math.abs(rn(lat)) + "°S";} // parse latitude value @@ -75,7 +85,7 @@ function editWorld() { globe.select("#globeArea").attr("d", round(path(area.outline()))); // map area } - function updateGlobeTemperature() { + function updateGlobeTemperature() { const tEq = +document.getElementById("temperatureEquatorOutput").value; document.getElementById("temperatureEquatorF").innerHTML = rn(tEq * 9/5 + 32); const tPole = +document.getElementById("temperaturePoleOutput").value; @@ -113,4 +123,11 @@ function editWorld() { if (update) updateWorld(); } + function applyPreset(size, lat) { + document.getElementById("mapSizeInput").value = document.getElementById("mapSizeOutput").value = size; + document.getElementById("latitudeInput").value = document.getElementById("latitudeOutput").value = lat; + lock("mapSize"); + lock("latitude"); + updateWorld(); + } } \ No newline at end of file diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js new file mode 100644 index 00000000..97a396f5 --- /dev/null +++ b/modules/ui/zones-editor.js @@ -0,0 +1,364 @@ +"use strict"; +function editZones() { + closeDialogs(); + if (!layerIsOn("toggleZones")) toggleZones(); + const body = document.getElementById("zonesBodySection"); + zonesEditorAddLines(); + + if (modules.editZones) return; + modules.editZones = true; + + $("#zonesEditor").dialog({ + title: "Zones Editor", resizable: false, width: fitContent(), close: () => exitZonesManualAssignment("close"), + position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"} + }); + + // add listeners + document.getElementById("zonesLegend").addEventListener("click", toggleLegend); + document.getElementById("zonesPercentage").addEventListener("click", togglePercentageMode); + document.getElementById("zonesManually").addEventListener("click", enterZonesManualAssignent); + document.getElementById("zonesManuallyApply").addEventListener("click", applyZonesManualAssignent); + document.getElementById("zonesManuallyCancel").addEventListener("click", cancelZonesManualAssignent); + document.getElementById("zonesAdd").addEventListener("click", addZonesLayer); + document.getElementById("zonesExport").addEventListener("click", downloadZonesData); + document.getElementById("zonesRemove").addEventListener("click", toggleEraseMode); + + body.addEventListener("click", function(ev) { + const el = ev.target, cl = el.classList, zone = el.parentNode.dataset.id; + if (cl.contains("icon-trash-empty")) {zoneRemove(zone); return;} + if (cl.contains("icon-eye")) {toggleVisibility(el); return;} + if (cl.contains("icon-pin")) {focusOnZone(zone, cl); return;} + if (cl.contains("zoneFill")) {changeFill(el); return;} + if (customization) selectZone(el); + }); + + body.addEventListener("input", function(ev) { + const el = ev.target, zone = el.parentNode.dataset.id; + if (el.classList.contains("religionName")) zones.select("#"+zone).attr("data-description", el.value); + }); + + // add line for each zone + function zonesEditorAddLines() { + const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value; + let lines = ""; + + zones.selectAll("g").each(function() { + const c = this.dataset.cells ? this.dataset.cells.split(",").map(c => +c) : []; + const description = this.dataset.description; + const fill = this.getAttribute("fill"); + const area = d3.sum(c.map(i => pack.cells.area[i])) * (distanceScaleInput.value ** 2); + const rural = d3.sum(c.map(i => pack.cells.pop[i])) * populationRate.value; + const urban = d3.sum(c.map(i => pack.cells.burg[i]).map(b => pack.burgs[b].population)) * populationRate.value * urbanization.value; + const population = rural + urban; + const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}`; + const inactive = this.style.display === "none"; + const focused = defs.select("#fog #focus"+this.id).size(); + + lines += `
| Id | Current name | New Name |
|---|
| Id | Current name | New Name |
|---|---|---|
| ${i} | ${pack.burgs[i].name} | ${v} |
| ${i+1} | ${pack.burgs[i+1].name} | ${v} |
-
+
-
-
`;
continue;
@@ -87,20 +89,20 @@ function editCultures() {
lines += `${c.cells}
-
-
+
+ ${c.cells}
+
+
-
- ${si(area) + unit}
-
- ${si(population)}
-
+
+ ${si(area) + unit}
+
+ ${si(population)}
+
-
+
-
-
`;
}
body.innerHTML = lines;
@@ -117,7 +119,7 @@ function editCultures() {
body.querySelectorAll("div.cultures").forEach(el => el.addEventListener("mouseenter", ev => cultureHighlightOn(ev)));
body.querySelectorAll("div.cultures").forEach(el => el.addEventListener("mouseleave", ev => cultureHighlightOff(ev)));
body.querySelectorAll("div.states").forEach(el => el.addEventListener("click", selectCultureOnLineClick));
- body.querySelectorAll("div > input[type='color']").forEach(el => el.addEventListener("input", cultureChangeColor));
+ body.querySelectorAll("rect.zoneFill").forEach(el => el.addEventListener("click", cultureChangeColor));
body.querySelectorAll("div > input.cultureName").forEach(el => el.addEventListener("input", cultureChangeName));
body.querySelectorAll("div > input.statePower").forEach(el => el.addEventListener("input", cultureChangeExpansionism));
body.querySelectorAll("div > select.cultureType").forEach(el => el.addEventListener("change", cultureChangeType));
@@ -144,31 +146,40 @@ function editCultures() {
}
function cultureHighlightOn(event) {
- if (customization === 4) return;
+ if (!layerIsOn("toggleCultures")) return;
+ if (customization) return;
const culture = +event.target.dataset.id;
- const color = d3.interpolateLab(pack.cultures[culture].color, "#ff0000")(.8)
- cults.select("#culture"+culture).raise().transition(animate).attr("stroke-width", 3).attr("stroke", color);
- debug.select("#cultureCenter"+culture).raise().transition(animate).attr("r", 8);
+ const animate = d3.transition().duration(2000).ease(d3.easeSinIn);
+ cults.select("#culture"+culture).raise().transition(animate).attr("stroke-width", 2.5).attr("stroke", "#d0240f");
+ debug.select("#cultureCenter"+culture).raise().transition(animate).attr("r", 8).attr("stroke", "#d0240f");
}
function cultureHighlightOff(event) {
- if (customization === 4) return;
+ if (!layerIsOn("toggleCultures")) return;
const culture = +event.target.dataset.id;
- cults.select("#culture"+culture).transition().attr("stroke-width", .7).attr("stroke", pack.cultures[culture].color);
- debug.select("#cultureCenter"+culture).transition().attr("r", 6);
+ cults.select("#culture"+culture).transition().attr("stroke-width", null).attr("stroke", null);
+ debug.select("#cultureCenter"+culture).transition().attr("r", 6).attr("stroke", null);
}
function cultureChangeColor() {
- const culture = +this.parentNode.dataset.id;
- pack.cultures[culture].color = this.value;
- cults.select("#culture"+culture).attr("fill", this.value).attr("stroke", this.value);
- debug.select("#cultureCenter"+culture).attr("fill", this.value);
+ const el = this;
+ const currentFill = el.getAttribute("fill");
+ const culture = +el.parentNode.parentNode.dataset.id;
+
+ const callback = function(fill) {
+ el.setAttribute("fill", fill);
+ pack.cultures[culture].color = fill;
+ cults.select("#culture"+culture).attr("fill", fill).attr("stroke", fill);
+ debug.select("#cultureCenter"+culture).attr("fill", fill);
+ }
+
+ openPicker(currentFill, callback);
}
function cultureChangeName() {
const culture = +this.parentNode.dataset.id;
this.parentNode.dataset.name = this.value;
- pack.cultures[culture].name = this.value;
+ pack.cultures[culture].name = this.value;
}
function cultureChangeExpansionism() {
@@ -218,7 +229,8 @@ function editCultures() {
function drawCultureCenters() {
const tooltip = 'Drag to move the culture center (ancestral home)';
debug.select("#cultureCenters").remove();
- const cultureCenters = debug.append("g").attr("id", "cultureCenters");
+ const cultureCenters = debug.append("g").attr("id", "cultureCenters")
+ .attr("stroke-width", 2).attr("stroke", "#444444").style("cursor", "move");
const data = pack.cultures.filter(c => c.i && !c.removed);
cultureCenters.selectAll("circle").data(data).enter().append("circle")
@@ -241,7 +253,13 @@ function editCultures() {
recalculateCultures();
});
}
-
+
+ function toggleLegend() {
+ if (legend.selectAll("*").size()) {clearLegend(); return;}; // hide legend
+ const data = pack.cultures.filter(c => c.i && !c.removed && c.cells).sort((a, b) => b.area - a.area).map(c => [c.i, c.color, c.name]);
+ drawLegend("Cultures", data);
+ }
+
function togglePercentageMode() {
if (body.dataset.type === "absolute") {
body.dataset.type = "percentage";
@@ -261,8 +279,10 @@ function editCultures() {
}
// re-calculate cultures
- function recalculateCultures() {
- pack.cells.culture = new Int8Array(pack.cells.i.length);
+ function recalculateCultures(must) {
+ if (!must && !culturesAutoChange.checked) return;
+
+ pack.cells.culture = new Uint16Array(pack.cells.i.length);
pack.cultures.forEach(function(c) {
if (!c.i || c.removed) return;
pack.cells.culture[c.center] = c.i;
@@ -274,27 +294,32 @@ function editCultures() {
}
function enterCultureManualAssignent() {
- if (!layerIsOn("toggleCultures")) toggleCultures();
+ if (!layerIsOn("toggleCultures")) toggleCultures();
customization = 4;
cults.append("g").attr("id", "temp");
- document.querySelectorAll("#culturesBottom > button").forEach(el => el.style.display = "none");
- document.getElementById("culturesManuallyButtons").style.display = "inline-block";
+ document.querySelectorAll("#culturesBottom > *").forEach(el => el.style.display = "none");
+ document.getElementById("culturesManuallyButtons").style.display = "inline-block";
debug.select("#cultureCenters").style("display", "none");
+ culturesEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
+ culturesFooter.style.display = "none";
+ culturesHeader.querySelector("div[data-sortby='base']").style.marginLeft = "21px";
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
+ $("#culturesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
+
tip("Click on culture to select, drag the circle to change culture", true);
- viewbox.style("cursor", "crosshair").call(d3.drag()
- .on("drag", dragCultureBrush))
+ viewbox.style("cursor", "crosshair")
.on("click", selectCultureOnMapClick)
+ .call(d3.drag().on("start", dragCultureBrush))
.on("touchmove mousemove", moveCultureBrush);
- body.querySelectorAll("div > *").forEach(e => e.disabled = true);
body.querySelector("div").classList.add("selected");
}
function selectCultureOnLineClick(i) {
if (customization !== 4) return;
body.querySelector("div.selected").classList.remove("selected");
- this.classList.add("selected");
+ this.classList.add("selected");
}
function selectCultureOnMapClick() {
@@ -310,13 +335,17 @@ function editCultures() {
}
function dragCultureBrush() {
- const p = d3.mouse(this);
const r = +culturesManuallyBrush.value;
- moveCircle(p[0], p[1], r);
- const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
- const selection = found.filter(isLand);
- if (selection) changeCultureForSelection(selection);
+ d3.event.on("drag", () => {
+ if (!d3.event.dx && !d3.event.dy) return;
+ const p = d3.mouse(this);
+ moveCircle(p[0], p[1], r);
+
+ const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
+ const selection = found.filter(isLand);
+ if (selection) changeCultureForSelection(selection);
+ });
}
// change culture within selection
@@ -325,7 +354,7 @@ function editCultures() {
const selected = body.querySelector("div.selected");
const cultureNew = +selected.dataset.id;
- const color = pack.cultures[cultureNew].color;
+ const color = pack.cultures[cultureNew].color || "#ffffff";
selection.forEach(function(i) {
const exists = temp.select("polygon[data-cell='"+i+"']");
@@ -361,13 +390,19 @@ function editCultures() {
exitCulturesManualAssignment();
}
- function exitCulturesManualAssignment() {
+ function exitCulturesManualAssignment(close) {
customization = 0;
cults.select("#temp").remove();
removeCircle();
- document.querySelectorAll("#culturesBottom > button").forEach(el => el.style.display = "inline-block");
+ document.querySelectorAll("#culturesBottom > *").forEach(el => el.style.display = "inline-block");
document.getElementById("culturesManuallyButtons").style.display = "none";
- body.querySelectorAll("div > *").forEach(e => e.disabled = false);
+
+ culturesEditor.querySelectorAll(".hide").forEach(el => el.classList.remove("hidden"));
+ culturesFooter.style.display = "block";
+ culturesHeader.querySelector("div[data-sortby='base']").style.marginLeft = "2px";
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
+ if(!close) $("#culturesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
+
debug.select("#cultureCenters").style("display", null);
restoreDefaultEvents();
clearMainTip();
@@ -375,7 +410,32 @@ function editCultures() {
if (selected) selected.classList.remove("selected");
}
+ function enterAddCulturesMode() {
+ if (this.classList.contains("pressed")) {exitAddCultureMode(); return;};
+ customization = 9;
+ this.classList.add("pressed");
+ tip("Click on the map to add a new culture", true);
+ viewbox.style("cursor", "crosshair").on("click", addCulture);
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
+ }
+
+ function exitAddCultureMode() {
+ customization = 0;
+ restoreDefaultEvents();
+ clearMainTip();
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
+ if (culturesAdd.classList.contains("pressed")) culturesAdd.classList.remove("pressed");
+ }
+
function addCulture() {
+ const point = d3.mouse(this);
+ const center = findCell(point[0], point[1]);
+ if (pack.cells.h[center] < 20) {tip("You cannot place culture center into the water. Please click on a land cell", false, "error"); return;}
+ const occupied = pack.cultures.some(c => !c.removed && c.center === center);
+ if (occupied) {tip("This cell is already a culture center. Please select a different cell", false, "error"); return;}
+
+ if (d3.event.shiftKey === false) exitAddCultureMode();
+
const defaultCultures = Cultures.getDefault();
let culture, base, name;
if (pack.cultures.length < defaultCultures.length) {
@@ -391,15 +451,13 @@ function editCultures() {
}
const i = pack.cultures.length;
const color = d3.color(d3.scaleSequential(d3.interpolateRainbow)(Math.random())).hex();
- const land = pack.cells.i.filter(isLand);
- const center = land[Math.floor(Math.random() * land.length - 1)];
pack.cultures.push({name, color, base, center, i, expansionism:1, type:"Generic", cells:0, area:0, rural:0, urban:0});
drawCultureCenters();
culturesEditorAddLines();
}
function downloadCulturesData() {
- const unit = areaUnit.value === "square" ? distanceUnit.value + "2" : areaUnit.value;
+ const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
let data = "Id,Culture,Color,Cells,Expansionism,Type,Area "+unit+",Population,Namesbase\n"; // headers
body.querySelectorAll(":scope > div").forEach(function(el) {
@@ -427,7 +485,8 @@ function editCultures() {
function closeCulturesEditor() {
debug.select("#cultureCenters").remove();
- exitCulturesManualAssignment();
+ exitCulturesManualAssignment("close");
+ exitAddCultureMode()
}
}
\ No newline at end of file
diff --git a/modules/ui/diplomacy-editor.js b/modules/ui/diplomacy-editor.js
new file mode 100644
index 00000000..2b42b9a8
--- /dev/null
+++ b/modules/ui/diplomacy-editor.js
@@ -0,0 +1,252 @@
+"use strict";
+function editDiplomacy() {
+ if (customization) return;
+ if (pack.states.filter(s => s.i && !s.removed).length < 2) {
+ tip("There should be at least 2 states to edit the diplomacy", false, "Error");
+ return;
+ }
+
+ closeDialogs("#diplomacyEditor, .stable");
+ if (!layerIsOn("toggleStates")) toggleStates();
+ if (!layerIsOn("toggleBorders")) toggleBorders();
+ if (layerIsOn("toggleProvinces")) toggleProvinces();
+ if (layerIsOn("toggleCultures")) toggleCultures();
+ if (layerIsOn("toggleBiomes")) toggleBiomes();
+ if (layerIsOn("toggleReligions")) toggleReligions();
+
+ const body = document.getElementById("diplomacyBodySection");
+ const statuses = ["Ally", "Sympathy", "Neutral", "Suspicion", "Enemy", "Unknown", "Rival", "Vassal", "Suzerain"];
+ const colors = ["#00b300", "#d4f8aa", "#edeee8", "#f3c7c4", "#e64b40", "#a9a9a9", "#ad5a1f", "#87CEFA", "#00008B"];
+ refreshDiplomacyEditor();
+
+ tip("Click on a state to see its diplomatical relations", false, "warning");
+ viewbox.style("cursor", "crosshair").on("click", selectStateOnMapClick);
+
+ if (modules.editDiplomacy) return;
+ modules.editDiplomacy = true;
+
+ $("#diplomacyEditor").dialog({
+ title: "Diplomacy Editor", resizable: false, width: fitContent(), close: closeDiplomacyEditor,
+ position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}
+ });
+
+ // add listeners
+ document.getElementById("diplomacyEditorRefresh").addEventListener("click", refreshDiplomacyEditor);
+ document.getElementById("diplomacyRegenerate").addEventListener("click", regenerateRelations);
+ document.getElementById("diplomacyMatrix").addEventListener("click", showRelationsMatrix);
+ document.getElementById("diplomacyHistory").addEventListener("click", showRelationsHistory);
+ document.getElementById("diplomacyExport").addEventListener("click", downloadDiplomacyData);
+
+ function refreshDiplomacyEditor() {
+ diplomacyEditorAddLines();
+ showStateRelations();
+ }
+
+ // add line for each state
+ function diplomacyEditorAddLines() {
+ const states = pack.states;
+ const selectedLine = body.querySelector("div.Self");
+ const sel = selectedLine ? +selectedLine.dataset.id : states.find(s => s.i && !s.removed).i;
+
+ let lines = `${c.cells}
-
-
-
-
- ${si(area) + unit}
-
- ${si(population)}
-
+
+ ${c.cells}
+
+
+
+
+ ${si(area) + unit}
+
+ ${si(population)}
+
-
+
+
`;
+
+ for (const s of states) {
+ if (!s.i || s.removed || s.i === sel) continue;
+ const color = colors[statuses.indexOf(s.diplomacy[sel])];
+
+ lines += `${states[sel].fullName}
+
+
`;
+ }
+ body.innerHTML = lines;
+
+ // add listeners
+ body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseenter", ev => stateHighlightOn(ev)));
+ body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseleave", ev => stateHighlightOff(ev)));
+ body.querySelectorAll("div.states").forEach(el => el.addEventListener("click", selectStateOnLineClick));
+ body.querySelectorAll("div > select.diplomacyRelations").forEach(el => el.addEventListener("click", ev => ev.stopPropagation()));
+ body.querySelectorAll("div > select.diplomacyRelations").forEach(el => el.addEventListener("change", diplomacyChangeRelations));
+
+ applySorting(diplomacyHeader);
+ $("#diplomacyEditor").dialog();
+ }
+
+ function stateHighlightOn(event) {
+ if (!layerIsOn("toggleStates")) return;
+ const state = +event.target.dataset.id;
+ if (customization || !state) return;
+ const path = regions.select("#state"+state).attr("d");
+ debug.append("path").attr("class", "highlight").attr("d", path)
+ .attr("fill", "none").attr("stroke", "red").attr("stroke-width", 1).attr("opacity", 1)
+ .attr("filter", "url(#blur1)").call(transition);
+ }
+
+ function transition(path) {
+ const duration = (path.node().getTotalLength() + 5000) / 2;
+ path.transition().duration(duration).attrTween("stroke-dasharray", tweenDash);
+ }
+
+ function tweenDash() {
+ const l = this.getTotalLength();
+ const i = d3.interpolateString("0," + l, l + "," + l);
+ return t => i(t);
+ }
+
+ function removePath(path) {
+ path.transition().duration(1000).attr("opacity", 0).remove();
+ }
+
+ function stateHighlightOff() {
+ debug.selectAll(".highlight").each(function(el) {
+ d3.select(this).call(removePath);
+ });
+ }
+
+ function getRelations(relations) {
+ let options = "";
+ statuses.forEach(s => options += ``);
+ return options;
+ }
+
+ function showStateRelations() {
+ const selectedLine = body.querySelector("div.Self");
+ const sel = selectedLine ? +selectedLine.dataset.id : pack.states.find(s => s.i && !s.removed).i;
+ if (!sel) return;
+ if (!layerIsOn("toggleStates")) toggleStates();
+
+ statesBody.selectAll("path").each(function() {
+ if (this.id.slice(0, 9) === "state-gap") return; // exclude state gap element
+ const id = +this.id.slice(5); // state id
+ const index = statuses.indexOf(pack.states[id].diplomacy[sel]); // status index
+ const clr = index !== -1 ? colors[index] : "#4682b4"; // Self (bluish)
+ this.setAttribute("fill", clr);
+ statesBody.select("#state-gap"+id).attr("stroke", clr);
+ statesHalo.select("#state-border"+id).attr("stroke", d3.color(clr).darker().hex());
+ });
+ }
+
+ function selectStateOnLineClick() {
+ if (this.classList.contains("Self")) return;
+ body.querySelector("div.Self").classList.remove("Self");
+ this.classList.add("Self");
+ refreshDiplomacyEditor();
+ }
+
+ function selectStateOnMapClick() {
+ const point = d3.mouse(this);
+ const i = findCell(point[0], point[1]);
+ const state = pack.cells.state[i];
+ if (!state) return;
+ const selectedLine = body.querySelector("div.Self");
+ if (+selectedLine.dataset.id === state) return;
+
+ selectedLine.classList.remove("Self");
+ body.querySelector("div[data-id='"+state+"']").classList.add("Self");
+ refreshDiplomacyEditor();
+ }
+
+ function diplomacyChangeRelations() {
+ const states = pack.states;
+ const selectedLine = body.querySelector("div.Self");
+ const sel = selectedLine ? +selectedLine.dataset.id : states.find(s => s.i && !s.removed).i;
+ if (!sel) return;
+ const state = +this.parentNode.dataset.id;
+ const rel = this.value, oldRel = states[state].diplomacy[sel];
+ states[state].diplomacy[sel] = rel;
+ this.parentNode.dataset.relations = rel;
+
+ const statusTo = rel === "Vassal" ? "Suzerain" : rel === "Suzerain" ? "Vassal" : rel;
+ states[sel].diplomacy[state] = statusTo;
+
+ // update relation history
+ const change = [`Relations change`, `${states[sel].name}-${trimVowels(states[state].name)}ian relations changed to ${rel}`];
+ const vassal = [`Vassalization`, `${states[state].name} became a vassal of ${states[sel].name}`];
+ const vassalized = [`Vassalization`, `${states[state].name} vassalized ${states[sel].name}`];
+ const war = [`War declaration`, `${states[sel].name} declared a war on its enemy ${states[state].name}`];
+ const peace = [`War termination`, `${states[sel].name} and ${states[state].name} agreed to cease fire and signed a peace treaty`];
+ peace.push(rel === "Vassal" ? vassal[1] : rel === "Suzerain" ? vassalized[1] : change[1]);
+
+ if (oldRel === "Enemy") states[0].diplomacy.push(peace);
+ else states[0].diplomacy.push(rel === "Vassal" ? vassal : rel === "Suzerain" ? vassalized : rel === "Enemy" ? war : change);
+
+ const color = colors[statuses.indexOf(rel)];
+ this.parentNode.querySelector("input.stateColor").value = color;
+ showStateRelations();
+ }
+
+ function regenerateRelations() {
+ BurgsAndStates.generateDiplomacy();
+ refreshDiplomacyEditor();
+ }
+
+ function showRelationsHistory() {
+ const chronicle = pack.states[0].diplomacy;
+ if (!chronicle.length) {tip("Relations history is blank", false, "error"); return;}
+
+ let message = `${s.fullName}
+
+
+ `;
+ chronicle.forEach(e => {
+ message += `
`;
+ });
+ alertMessage.innerHTML = message + ``;
+
+ $("#alert").dialog({title: "Relations history", position: {my: "center", at: "center", of: "svg"},
+ buttons: {
+ Clear: function() {pack.states[0].diplomacy = []; $(this).dialog("close");},
+ Close: function() {$(this).dialog("close");}
+ }
+ });
+ }
+
+ function showRelationsMatrix() {
+ const states = pack.states.filter(s => s.i && !s.removed);
+ const valid = states.map(s => s.i);
+
+ let message = ``;
+ e.forEach((l, i) => message += `${l}
`);
+ message += `| `; + message += states.map(s => ` | ${s.name} | `).join("") + `
|---|---|
| ${s.name} | ` + s.diplomacy.filter((v, i) => valid.includes(i)).map(r => `${r} | `).join("") + "
Heightmap is a core element on which all other data (rivers, burgs, states etc) is based. So the best edit approach is to erase the secondary data and let the system automatically regenerate it on edit completion.
-You can also keep all the data as is, but you won't be able to change the coastline.
+You can also keep all the data, but you won't be able to change the coastline.
If you need to change the coastline and keep the data, you may try the risk edit option. - The secondary data will be kept with burgs placed on water being removed, - but the landmass change can cause unexpected data fluctuation and errors.
`; + The data will be restored as much as possible, but the coastline change can cause unexpected fluctuations and errors. + +Check out wiki for guidance.
`; $("#alert").dialog({resizable: false, title: "Edit Heightmap", width: 300, buttons: { @@ -40,7 +41,9 @@ function editHeightmap() { document.getElementById("templateRedo").addEventListener("click", () => restoreHistory(edits.n+1)); function enterHeightmapEditMode(type) { - editHeightmap.layers = getLayersState(); + editHeightmap.layers = Array.from(mapLayers.querySelectorAll("li:not(.buttonoff)")).map(node => node.id); // store layers preset + editHeightmap.layers.forEach(l => document.getElementById(l).click()); // turn off all layers + customization = 1; closeDialogs(); tip('Heightmap edit mode is active. Click on "Exit Customization" to finalize the heightmap', true); @@ -74,15 +77,6 @@ function editHeightmap() { viewbox.on("touchmove mousemove", moveCursor); } - function getLayersState() { - const layers = []; - mapLayers.querySelectorAll("li").forEach(l => { - if (l.id === "toggleScaleBar") return; - if (!l.classList.contains("buttonoff")) {layers.push(l.id); l.click();} - }); - return layers; - } - function moveCursor() { const p = d3.mouse(this), cell = findGridCell(p[0], p[1]); heightmapInfoX.innerHTML = rn(p[0]); @@ -108,6 +102,7 @@ function editHeightmap() { customization = 0; customizationMenu.style.display = "none"; toolsContent.style.display = "block"; + layersPreset.disabled = false; restoreDefaultEvents(); clearMainTip(); closeDialogs(); @@ -121,11 +116,14 @@ function editHeightmap() { else if (mode === "keep") restoreKeptData(); else if (mode === "risk") restoreRiskedData(); + // restore initial layers terrs.selectAll("*").remove(); turnButtonOff("toggleHeight"); - changePreset("landmass"); - editHeightmap.layers.forEach(l => document.getElementById(l).click()); - layersPreset.disabled = false; + document.getElementById("mapLayers").querySelectorAll("li").forEach(function(e) { + if (editHeightmap.layers.includes(e.id) && !layerIsOn(e.id)) e.click(); // turn on + else if (!editHeightmap.layers.includes(e.id) && layerIsOn(e.id)) e.click(); // turn off + }); + getCurrentPreset(); } function regenerateErasedData() { @@ -158,7 +156,12 @@ function editHeightmap() { Cultures.generate(); Cultures.expand(); BurgsAndStates.generate(); + Religions.generate(); + drawStates(); + drawBorders(); BurgsAndStates.drawStateLabels(); + addZone(); + addMarkers(); console.timeEnd("regenerateErasedData"); console.groupEnd("Edit Heightmap"); } @@ -180,14 +183,17 @@ function editHeightmap() { const l = grid.cells.i.length; const biome = new Uint8Array(l); const conf = new Uint8Array(l); - const culture = new Int8Array(l); const fl = new Uint16Array(l); const pop = new Uint16Array(l); const r = new Uint16Array(l); const road = new Uint16Array(l); + const crossroad = new Uint16Array(l); const s = new Uint16Array(l); - const state = new Uint8Array(l); - const burg = new Uint8Array(l); + const burg = new Uint16Array(l); + const state = new Uint16Array(l); + const province = new Uint16Array(l); + const culture = new Uint16Array(l); + const religion = new Uint16Array(l); for (const i of pack.cells.i) { const g = pack.cells.g[i]; @@ -198,9 +204,12 @@ function editHeightmap() { pop[g] = pack.cells.pop[i]; r[g] = pack.cells.r[i]; road[g] = pack.cells.road[i]; + crossroad[g] = pack.cells.crossroad[i]; s[g] = pack.cells.s[i]; state[g] = pack.cells.state[i]; + province[g] = pack.cells.province[i]; burg[g] = pack.cells.burg[i]; + religion[g] = pack.cells.religion[i]; } // do not allow to remove land with burgs @@ -224,12 +233,15 @@ function editHeightmap() { // assign saved pack data from grid back to pack const n = pack.cells.i.length; - pack.cells.burg = new Uint16Array(n); - pack.cells.culture = new Int8Array(n); pack.cells.pop = new Uint16Array(n); pack.cells.road = new Uint16Array(n); + pack.cells.crossroad = new Uint16Array(n); pack.cells.s = new Uint16Array(n); - pack.cells.state = new Uint8Array(n); + pack.cells.burg = new Uint16Array(n); + pack.cells.state = new Uint16Array(n); + pack.cells.province = new Uint16Array(n); + pack.cells.culture = new Uint16Array(n); + pack.cells.religion = new Uint16Array(n); if (!change) { pack.cells.r = new Uint16Array(n); @@ -255,12 +267,15 @@ function editHeightmap() { pack.cells.culture[i] = culture[g]; pack.cells.pop[i] = pop[g]; pack.cells.road[i] = road[g]; + pack.cells.crossroad[i] = crossroad[g]; pack.cells.s[i] = s[g]; pack.cells.state[i] = state[g]; + pack.cells.province[i] = province[g]; + pack.cells.religion[i] = religion[g]; } for (const b of pack.burgs) { - if (!b.i) continue; + if (!b.i || b.removed) continue; b.cell = findCell(b.x, b.y); b.feature = pack.cells.f[b.cell]; pack.cells.burg[b.cell] = b.i; @@ -268,6 +283,26 @@ function editHeightmap() { if (b.capital) pack.states[b.state].center = b.cell; } + for (const p of pack.provinces) { + if (!p.i || p.removed) continue; + const provCells = pack.cells.i.filter(i => pack.cells.province[i] === p.i); + if (!provCells.length) { + const state = p.state; + const stateProvs = pack.states[state].provinces; + if (stateProvs.includes(p.i)) pack.states[state].provinces.splice(stateProvs.indexOf(p), 1); + + p.removed = true; + continue; + } + + if (p.burg && !pack.burgs[p.burg].removed) p.center = pack.burgs[p.burg].cell; + else {p.center = provCells[0]; p.burg = pack.cells.burg[p.center];} + } + + BurgsAndStates.drawStateLabels(); + drawStates(); + drawBorders(); + console.timeEnd("restoreRiskedData"); console.groupEnd("Edit Heightmap"); } @@ -417,9 +452,11 @@ function editHeightmap() { d3.event.on("drag", () => { const p = d3.mouse(this); moveCircle(p[0], p[1], r, "#333"); + if (~~d3.event.sourceEvent.timeStamp % 5 != 0) return; // slow down the edit + const inRadius = findGridAll(p[0], p[1], r); const selection = changeOnlyLand.checked ? inRadius.filter(i => grid.cells.h[i] >= 20) : inRadius; - if (selection && selection.length) changeHeightForSelection(selection, start); + if (selection && selection.length) changeHeightForSelection(selection, start); }); d3.event.on("end", updateHeightmap); @@ -497,6 +534,8 @@ function editHeightmap() { function openTemplateEditor() { if ($("#templateEditor").is(":visible")) return; + const body = document.getElementById("templateBody"); + $("#templateEditor").dialog({ title: "Template Editor", minHeight: "auto", width: "fit-content", resizable: false, position: {my: "right top", at: "right-10 top+10", of: "svg"} @@ -505,21 +544,40 @@ function editHeightmap() { if (modules.openTemplateEditor) return; modules.openTemplateEditor = true; - $("#templateBody").sortable({items: "div:not(.elType)"}); + $("#templateBody").sortable({items: "div", handle: ".icon-resize-vertical", containment: "parent", axis: "y"}); // add listeners + body.addEventListener("click", function(ev) { + const el = ev.target; + if (el.classList.contains("icon-check")) { + el.classList.remove("icon-check"); + el.classList.add("icon-check-empty"); + el.parentElement.style.opacity = .5; + body.dataset.changed = 1; + return; + } + if (el.classList.contains("icon-check-empty")) { + el.classList.add("icon-check"); + el.classList.remove("icon-check-empty"); + el.parentElement.style.opacity = 1; + return; + } + if (el.classList.contains("icon-trash-empty")) { + el.parentElement.remove(); return; + } + }); + document.getElementById("templateTools").addEventListener("click", e => addStepOnClick(e)); - document.getElementById("templateSelect").addEventListener("change", e => selectTemplate(e)); - document.getElementById("templateRun").addEventListener("click", executeTemplate); - document.getElementById("templateSave").addEventListener("click", downloadTemplate); - document.getElementById("templateLoad").addEventListener("click", e => templateToLoad.click()); - document.getElementById("templateToLoad").addEventListener("change", uploadTemplate); + document.getElementById("templateSelect").addEventListener("change", e => selectTemplate(e)); + document.getElementById("templateRun").addEventListener("click", executeTemplate); + document.getElementById("templateSave").addEventListener("click", downloadTemplate); + document.getElementById("templateLoad").addEventListener("click", e => templateToLoad.click()); + document.getElementById("templateToLoad").addEventListener("change", uploadTemplate); function addStepOnClick(e) { if (e.target.tagName !== "BUTTON") return; const type = e.target.id.replace("template", ""); - const body = document.getElementById("templateBody"); - body.setAttribute("data-changed", 1); + document.getElementById("templateBody").dataset.changed = 1; addStep(type); } @@ -540,19 +598,22 @@ function editHeightmap() { } function getStepHTML(type, count, arg3, arg4, arg5) { - const Trash = ``; + const Trash = ``; + const Hide = ``; + const Reorder = ``; + const common = `${Hide}
`;
if (type === "Hill" || type === "Pit" || type === "Range" || type === "Trough") return blob;
- if (type === "Strait") return `${type}
${Trash}${Reorder}`;
+
const TempY = `y:`;
const TempX = `x:`;
const Height = `h:`;
const Count = `n:`;
- const Type = `${type}
`;
- const blob = `${Type}${Trash}${TempY}${TempX}${Height}${Count}
`;
+ const blob = `${common}${TempY}${TempX}${Height}${Count}${Type}${Trash}d:w:
`;
- if (type === "Add") return `${Type}${Trash}to:v:
`;
- if (type === "Multiply") return `${Type}${Trash}to:v:
`;
- if (type === "Smooth") return `${Type}${Trash}f:
`;
+ if (type === "Strait") return `${common}d:w:`;
+ if (type === "Add") return `${common}to:v:`;
+ if (type === "Multiply") return `${common}to:v:`;
+ if (type === "Smooth") return `${common}f:`;
}
function setRange(event) {
@@ -569,7 +630,7 @@ function editHeightmap() {
const body = document.getElementById("templateBody");
const steps = body.querySelectorAll("div").length;
const changed = +body.getAttribute("data-changed");
- const template = e.target.value;
+ const template = e.target.value;
if (!steps || !changed) {changeTemplate(template); return;}
alertMessage.innerHTML = "Are you sure you want to select a different template? All changes will be lost.";
@@ -722,6 +783,7 @@ function editHeightmap() {
grid.cells.h = new Uint8Array(grid.cells.i.length); // clean all heights
for (const s of steps) {
+ if (s.style.opacity == .5) continue;
const type = s.getAttribute("data-type");
const elCount = s.querySelector(".templateCount") || "";
const elHeight = s.querySelector(".templateHeight") || "";
@@ -752,12 +814,13 @@ function editHeightmap() {
function downloadTemplate() {
const body = document.getElementById("templateBody");
- body.setAttribute("data-changed", 0);
+ body.dataset.changed = 0;
const steps = body.querySelectorAll("#templateBody > div");
if (!steps.length) return;
let stepsData = "";
for (const s of steps) {
+ if (s.style.opacity == .5) continue;
const type = s.getAttribute("data-type");
const elCount = s.querySelector(".templateCount");
const count = elCount ? elCount.value : "0";
diff --git a/modules/ui/labels-editor.js b/modules/ui/labels-editor.js
index 8213d95f..fc5c9907 100644
--- a/modules/ui/labels-editor.js
+++ b/modules/ui/labels-editor.js
@@ -1,23 +1,24 @@
"use strict";
function editLabel() {
if (customization) return;
- closeDialogs(".stable");
+ closeDialogs();
if (!layerIsOn("toggleLabels")) toggleLabels();
- const node = d3.event.target;
- elSelected = d3.select(node.parentNode).call(d3.drag().on("start", dragLabel)).classed("draggable", true);
+ const tspan = d3.event.target;
+ const textPath = tspan.parentNode;
+ const text = textPath.parentNode;
+ elSelected = d3.select(text).call(d3.drag().on("start", dragLabel)).classed("draggable", true);
viewbox.on("touchmove mousemove", showEditorTips);
$("#labelEditor").dialog({
- title: "Edit Label: " + node.innerHTML, resizable: false,
- position: {my: "center top+10", at: "bottom", of: node, collision: "fit"},
+ title: "Edit Label", resizable: false,
+ position: {my: "center top+10", at: "bottom", of: text, collision: "fit"},
close: closeLabelEditor
});
- debug.append("g").attr("id", "controlPoints").attr("transform", elSelected.attr("transform"));
drawControlPointsAndLine();
- selectLabelGroup(node);
- updateValues(node);
+ selectLabelGroup(text);
+ updateValues(textPath);
if (modules.editLabel) return;
modules.editLabel = true;
@@ -40,20 +41,21 @@ function editLabel() {
document.getElementById("labelStartOffset").addEventListener("input", changeStartOffset);
document.getElementById("labelRelativeSize").addEventListener("input", changeRelativeSize);
+ document.getElementById("labelAlign").addEventListener("click", editLabelAlign);
document.getElementById("labelLegend").addEventListener("click", editLabelLegend);
document.getElementById("labelRemoveSingle").addEventListener("click", removeLabel);
function showEditorTips() {
showMainTip();
- if (d3.event.target.parentNode.id === elSelected.attr("id")) tip("Drag to shift the label"); else
+ if (d3.event.target.parentNode.parentNode.id === elSelected.attr("id")) tip("Drag to shift the label"); else
if (d3.event.target.parentNode.id === "controlPoints") {
if (d3.event.target.tagName === "circle") tip("Drag to move, click to delete the control point");
if (d3.event.target.tagName === "path") tip("Click to add a control point");
}
}
- function selectLabelGroup(node) {
- const group = node.parentNode.parentNode.id;
+ function selectLabelGroup(text) {
+ const group = text.parentNode.id;
const select = document.getElementById("labelGroupSelect");
select.options.length = 0; // remove all options
@@ -63,23 +65,26 @@ function editLabel() {
});
}
- function updateValues(node) {
- document.getElementById("labelText").value = node.innerHTML;
- document.getElementById("labelStartOffset").value = parseFloat(node.getAttribute("startOffset"));
- document.getElementById("labelRelativeSize").value = parseFloat(node.getAttribute("font-size"));
+ function updateValues(textPath) {
+ document.getElementById("labelText").value = [...textPath.querySelectorAll("tspan")].map(tspan => tspan.textContent).join("|");
+ document.getElementById("labelStartOffset").value = parseFloat(textPath.getAttribute("startOffset"));
+ document.getElementById("labelRelativeSize").value = parseFloat(textPath.getAttribute("font-size"));
}
function drawControlPointsAndLine() {
+ debug.select("#controlPoints").remove();
+ debug.append("g").attr("id", "controlPoints").attr("transform", elSelected.attr("transform"));
const path = document.getElementById("textPath_" + elSelected.attr("id"));
debug.select("#controlPoints").append("path").attr("d", path.getAttribute("d")).on("click", addInterimControlPoint);
const l = path.getTotalLength();
- const increment = l / Math.max(Math.ceil(l / 100), 2);
+ if (!l) return;
+ const increment = l / Math.max(Math.ceil(l / 200), 2);
for (let i=0; i <= l; i += increment) {addControlPoint(path.getPointAtLength(i));}
}
function addControlPoint(point) {
debug.select("#controlPoints").append("circle")
- .attr("cx", point.x).attr("cy", point.y).attr("r", 1)
+ .attr("cx", point.x).attr("cy", point.y).attr("r", 2.5).attr("stroke-width", .8)
.call(d3.drag().on("drag", dragControlPoint))
.on("click", clickControlPoint);
}
@@ -103,7 +108,7 @@ function editLabel() {
}
function clickControlPoint() {
- this.remove();
+ this.remove();
redrawLabelPath();
}
@@ -127,7 +132,7 @@ function editLabel() {
const before = ":nth-child(" + (index + 2) + ")";
debug.select("#controlPoints").insert("circle", before)
- .attr("cx", point[0]).attr("cy", point[1]).attr("r", 1)
+ .attr("cx", point[0]).attr("cy", point[1]).attr("r", 2.5).attr("stroke-width", .8)
.call(d3.drag().on("drag", dragControlPoint))
.on("click", clickControlPoint);
@@ -240,12 +245,24 @@ function editLabel() {
}
function changeText() {
- const text = document.getElementById("labelText").value;
- elSelected.select("textPath").text(text);
- if (elSelected.attr("id").slice(0,10) === "stateLabel") {
- const id = +elSelected.attr("id").slice(10);
- pack.states[id].name = text;
- }
+ const input = document.getElementById("labelText").value;
+ const el = elSelected.select("textPath").node();
+ const example = d3.select(elSelected.node().parentNode)
+ .append("text").attr("x", 0).attr("x", 0)
+ .attr("font-size", el.getAttribute("font-size")).node();
+
+ const lines = input.split("|");
+ const top = (lines.length - 1) / -2; // y offset
+ const inner = lines.map((l, d) => {
+ example.innerHTML = l;
+ const left = example.getBBox().width / -2; // x offset
+ return `
+
+
+
+
+
+
+
+
+
+
+
`;
+ }
+ body.innerHTML = lines;
+
+ // update footer
+ provincesFooterNumber.innerHTML = filtered.length;
+ provincesFooterArea.innerHTML = filtered.length ? si(totalArea / filtered.length) + unit : 0 + unit;
+ provincesFooterPopulation.innerHTML = filtered.length ? si(totalPopulation / filtered.length) : 0;
+ provincesFooterArea.dataset.area = totalArea;
+ provincesFooterPopulation.dataset.population = totalPopulation;
+
+ body.querySelectorAll("div.states").forEach(el => {
+ el.addEventListener("click", selectProvinceOnLineClick);
+ el.addEventListener("mouseenter", ev => provinceHighlightOn(ev));
+ el.addEventListener("mouseleave", ev => provinceHighlightOff(ev));
+ });
+
+ if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
+ applySorting(provincesHeader);
+ $("#provincesEditor").dialog({width: fitContent()});
+ }
+
+ function getCapitalOptions(burgs, capital) {
+ let options = "";
+ burgs.forEach(b => options += ``);
+ return options;
+ }
+
+ function provinceHighlightOn(event) {
+ if (!customization) event.target.querySelectorAll(".hoverButton").forEach(el => el.classList.remove("placeholder"));
+ if (!layerIsOn("toggleProvinces")) return;
+ if (customization) return;
+ const province = +event.target.dataset.id;
+ const animate = d3.transition().duration(2000).ease(d3.easeSinIn);
+ provs.select("#province"+province).raise().transition(animate).attr("stroke-width", 2.5).attr("stroke", "#d0240f");
+ }
+
+ function provinceHighlightOff(event) {
+ if (!customization) event.target.querySelectorAll(".hoverButton").forEach(el => el.classList.add("placeholder"));
+ if (!layerIsOn("toggleProvinces")) return;
+ const province = +event.target.dataset.id;
+ provs.select("#province"+province).transition().attr("stroke-width", null).attr("stroke", null);
+ }
+
+ function changeFill(el) {
+ const currentFill = el.getAttribute("fill");
+ const p = +el.parentNode.parentNode.dataset.id;
+
+ const callback = function(fill) {
+ el.setAttribute("fill", fill);
+ pack.provinces[p].color = fill;
+ const g = provs.select("#provincesBody");
+ g.select("#province"+p).attr("fill", fill);
+ g.select("#province-gap"+p).attr("stroke", fill);
+ }
+
+ openPicker(currentFill, callback);
+ }
+
+ function provinceOpenCOA(p) {
+ const url = `https://ironarachne.com/heraldry/${seed}-p${p}`;
+ window.open(url, '_blank');
+ }
+
+ function capitalZoomIn(p) {
+ const capital = pack.provinces[p].burg;
+ const l = burgLabels.select("[data-id='" + capital + "']");
+ const x = +l.attr("x"), y = +l.attr("y");
+ zoomTo(x, y, 8, 2000);
+ }
+
+ function focusOn(p, cl) {
+ const inactive = cl.contains("inactive");
+ cl.toggle("inactive");
+
+ if (inactive) {
+ if (defs.select("#fog #focusProvince"+p).size()) return;
+ fogging.attr("display", "block");
+ const path = provs.select("#province"+p).attr("d");
+ defs.select("#fog").append("path").attr("d", path).attr("fill", "black").attr("id", "focusProvince"+p);
+ fogging.append("path").attr("d", path).attr("id", "focusProvinceHalo"+p)
+ .attr("fill", "none").attr("stroke", pack.provinces[p].color).attr("filter", "url(#blur5)");
+ } else unfocus(p);
+ }
+
+ function unfocus(p) {
+ defs.select("#focusProvince"+p).remove();
+ fogging.select("#focusProvinceHalo"+p).remove();
+ if (!defs.selectAll("#fog path").size()) fogging.attr("display", "none"); // all items are de-focused
+ }
+
+ function removeProvince(p) {
+ pack.cells.province.forEach((province, i) => {if(province === p) pack.cells.province[i] = 0;});
+ const state = pack.provinces[p].state;
+ if (pack.states[state].provinces.includes(p)) pack.states[state].provinces.splice(pack.states[state].provinces.indexOf(p), 1);
+ pack.provinces[p].removed = true;
+ unfocus(p);
+
+ const g = provs.select("#provincesBody");
+ g.select("#province"+p).remove();
+ g.select("#province-gap"+p).remove();
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ refreshProvincesEditor();
+ }
+
+ function changeName(p, line, value) {
+ pack.provinces[p].name = line.querySelector(".stateName").value = line.dataset.name = value;
+ pack.provinces[p].fullName = value + " " + pack.provinces[p].formName;
+ provs.select("#provinceLabel"+p).text(value);
+ }
+
+ function regenerateName(p, line) {
+ const c = pack.cells.culture[pack.provinces[p].center];
+ const name = Names.getState(Names.getCultureShort(c), c);
+ changeName(p, line, name);
+ }
+
+ function changeForm(p, line, value) {
+ pack.provinces[p].formName = line.querySelector(".stateForm").value = line.dataset.form = value;
+ pack.provinces[p].fullName = pack.provinces[p].name + " " + value;
+ }
+
+ function regenerateForm(p, line) {
+ const forms = ["County", "Earldom", "Shire", "Landgrave", 'Margrave', "Barony", "Province",
+ "Department", "Governorate", "State", "Canton", "Prefecture", "Parish", "Deanery",
+ "Council", "District", "Republic", "Territory", "Land", "Region"];
+ changeForm(p, line, ra(forms));
+ }
+
+ function changeCapital(p, line, value) {
+ line.dataset.capital = pack.burgs[+value].name;
+ pack.provinces[p].center = pack.burgs[+value].cell;
+ pack.provinces[p].burg = +value;
+ }
+
+ function togglePercentageMode() {
+ if (body.dataset.type === "absolute") {
+ body.dataset.type = "percentage";
+ const totalArea = +provincesFooterArea.dataset.area;
+ const totalPopulation = +provincesFooterPopulation.dataset.population;
+
+ body.querySelectorAll(":scope > div").forEach(function(el) {
+ el.querySelector(".biomeArea").innerHTML = rn(+el.dataset.area / totalArea * 100) + "%";
+ el.querySelector(".culturePopulation").innerHTML = rn(+el.dataset.population / totalPopulation * 100) + "%";
+ });
+ } else {
+ body.dataset.type = "absolute";
+ provincesEditorAddLines();
+ }
+ }
+
+ function toggleLabels() {
+ const hidden = provs.select("#provinceLabels").style("display") === "none";
+ provs.select("#provinceLabels").style("display", `${hidden ? "block" : "none"}`);
+ provs.attr("data-labels", +hidden);
+ }
+
+ function enterProvincesManualAssignent() {
+ if (!layerIsOn("toggleProvinces")) toggleProvinces();
+ if (!layerIsOn("toggleBorders")) toggleBorders();
+
+ customization = 11;
+ provs.select("g#provincesBody").append("g").attr("id", "temp");
+ provs.select("g#provincesBody").append("g").attr("id", "centers")
+ .attr("fill", "none").attr("stroke", "#ff0000").attr("stroke-width", 1);
+
+ document.querySelectorAll("#provincesBottom > *").forEach(el => el.style.display = "none");
+ document.getElementById("provincesManuallyButtons").style.display = "inline-block";
+
+ provincesEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
+ provincesFooter.style.display = "none";
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
+ $("#provincesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
+
+ tip("Click on a province to select, drag the circle to change province", true);
+ viewbox.style("cursor", "crosshair")
+ .on("click", selectProvinceOnMapClick)
+ .call(d3.drag().on("start", dragBrush))
+ .on("touchmove mousemove", moveBrush);
+
+ body.querySelector("div").classList.add("selected");
+ }
+
+ function selectProvinceOnLineClick() {
+ if (customization !== 11) return;
+ if (this.parentNode.id !== "provincesBodySection") return;
+ body.querySelector("div.selected").classList.remove("selected");
+ this.classList.add("selected");
+ }
+
+ function selectProvinceOnMapClick() {
+ const point = d3.mouse(this);
+ const i = findCell(point[0], point[1]);
+ if (pack.cells.h[i] < 20 || !pack.cells.state[i]) return;
+
+ const assigned = provs.select("g#temp").select("polygon[data-cell='"+i+"']");
+ const province = assigned.size() ? +assigned.attr("data-province") : pack.cells.province[i];
+
+ const editorLine = body.querySelector("div[data-id='"+province+"']");
+ if (!editorLine) {tip("You cannot select a province if it is not in the Editor list", false, "error"); return;}
+
+ body.querySelector("div.selected").classList.remove("selected");
+ editorLine.classList.add("selected");
+ }
+
+ function dragBrush() {
+ const r = +provincesManuallyBrush.value;
+
+ d3.event.on("drag", () => {
+ if (!d3.event.dx && !d3.event.dy) return;
+ const p = d3.mouse(this);
+ moveCircle(p[0], p[1], r);
+
+ const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
+ const selection = found.filter(isLand);
+ if (selection) changeForSelection(selection);
+ });
+ }
+
+ // change province within selection
+ function changeForSelection(selection) {
+ const temp = provs.select("#temp"), centers = provs.select("#centers");
+ const selected = body.querySelector("div.selected");
+
+ const provinceNew = +selected.dataset.id;
+ const state = pack.provinces[provinceNew].state;
+ const fill = pack.provinces[provinceNew].color || "#ffffff";
+ const stroke = d3.color(fill).darker(.2).hex();
+
+ selection.forEach(i => {
+ if (!pack.cells.state[i] || pack.cells.state[i] !== state) return;
+ const exists = temp.select("polygon[data-cell='"+i+"']");
+ const provinceOld = exists.size() ? +exists.attr("data-province") : pack.cells.province[i];
+ if (provinceNew === provinceOld) return;
+ if (i === pack.provinces[provinceOld].center) {
+ const center = centers.select("polygon[data-center='"+i+"']");
+ if (!center.size()) centers.append("polygon").attr("data-center", i).attr("points", getPackPolygon(i));
+ tip("Province center cannot be assigned to a different region. Please remove the province first", false, "error");
+ return;
+ }
+
+ // change of append new element
+ if (exists.size()) exists.attr("data-province", provinceNew).attr("fill", fill).attr("stroke", stroke);
+ else temp.append("polygon").attr("points", getPackPolygon(i))
+ .attr("data-cell", i).attr("data-province", provinceNew)
+ .attr("fill", fill).attr("stroke", stroke);
+ });
+ }
+
+ function moveBrush() {
+ showMainTip();
+ const point = d3.mouse(this);
+ const radius = +provincesManuallyBrush.value;
+ moveCircle(point[0], point[1], radius);
+ }
+
+ function applyProvincesManualAssignent() {
+ provs.select("#temp").selectAll("polygon").each(function() {
+ const i = +this.dataset.cell;
+ pack.cells.province[i] = +this.dataset.province;;
+ });
+
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ if (!layerIsOn("toggleProvinces")) toggleProvinces(); else drawProvinces();
+ exitProvincesManualAssignment();
+ refreshProvincesEditor();
+ }
+
+ function exitProvincesManualAssignment(close) {
+ customization = 0;
+ provs.select("#temp").remove();
+ provs.select("#centers").remove();
+ removeCircle();
+
+ document.querySelectorAll("#provincesBottom > *").forEach(el => el.style.display = "inline-block");
+ document.getElementById("provincesManuallyButtons").style.display = "none";
+
+ provincesEditor.querySelectorAll(".hide:not(.show)").forEach(el => el.classList.remove("hidden"));
+ provincesFooter.style.display = "block";
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
+ if(!close) $("#provincesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
+
+ restoreDefaultEvents();
+ clearMainTip();
+ const selected = body.querySelector("div.selected");
+ if (selected) selected.classList.remove("selected");
+ }
+
+ function enterAddProvinceMode() {
+ if (this.classList.contains("pressed")) {exitAddProvinceMode(); return;};
+ customization = 12;
+ this.classList.add("pressed");
+ tip("Click on the map to place a new province center", true);
+ viewbox.style("cursor", "crosshair").on("click", addProvince);
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
+ }
+
+ function addProvince() {
+ const cells = pack.cells, provinces = pack.provinces;
+ const point = d3.mouse(this);
+ const center = findCell(point[0], point[1]);
+ if (cells.h[center] < 20) {tip("You cannot place province into the water. Please click on a land cell", false, "error"); return;}
+ const oldProvince = cells.province[center];
+ if (oldProvince && provinces[oldProvince].center === center) {tip("The cell is already a center of a different province. Select other cell", false, "error"); return;}
+ const state = cells.state[center];
+ if (!state) {tip("You cannot create a province in neutral lands> Please assign this land to a state first", false, "error"); return;}
+
+ if (d3.event.shiftKey === false) exitAddProvinceMode();
+
+ const province = provinces.length;
+ pack.states[state].provinces.push(province);
+ const burg = cells.burg[center];
+ const c = cells.culture[center];
+ const name = burg ? pack.burgs[burg].name : Names.getState(Names.getCultureShort(c), c);
+ const formName = oldProvince ? provinces[oldProvince].formName : "Province";
+ const fullName = name + " " + formName;
+ const stateColor = pack.states[state].color, rndColor = getRandomColor();
+ const color = stateColor[0] === "#" ? d3.color(d3.interpolate(stateColor, rndColor)(.2)).hex() : rndColor;
+ provinces.push({i:province, state, center, burg, name, formName, fullName, color});
+
+ cells.province[center] = province;
+ cells.c[center].forEach(c => {
+ if (cells.h[c] < 20 || cells.state[c] !== state) return;
+ if (provinces.find(p => !p.removed && p.center === c)) return;
+ cells.province[c] = province;
+ });
+
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ if (!layerIsOn("toggleProvinces")) toggleProvinces(); else drawProvinces();
+ collectStatistics();
+ document.getElementById("provincesFilterState").value = state;
+ provincesEditorAddLines();
+ }
+
+ function exitAddProvinceMode() {
+ customization = 0;
+ restoreDefaultEvents();
+ clearMainTip();
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
+ if (provincesAdd.classList.contains("pressed")) provincesAdd.classList.remove("pressed");
+ }
+
+ function downloadProvincesData() {
+ const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
+ let data = "Id,Province,Form,State,Color,Capital,Area "+unit+",Population\n"; // headers
+
+ body.querySelectorAll(":scope > div").forEach(function(el) {
+ data += el.dataset.id + ",";
+ data += el.dataset.name + ",";
+ data += el.dataset.form + ",";
+ data += el.dataset.state + ",";
+ data += el.dataset.color + ",";
+ data += el.dataset.capital + ",";
+ data += el.dataset.area + ",";
+ data += el.dataset.population + "\n";
+ });
+
+ const dataBlob = new Blob([data], {type: "text/plain"});
+ const url = window.URL.createObjectURL(dataBlob);
+ const link = document.createElement("a");
+ document.body.appendChild(link);
+ link.download = "provinces_data" + Date.now() + ".csv";
+ link.href = url;
+ link.click();
+ window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
+ }
+
+ function removeAllProvinces() {
+ alertMessage.innerHTML = `Are you sure you want to remove all provinces?`;
+ $("#alert").dialog({resizable: false, title: "Remove all provinces",
+ buttons: {
+ Remove: function() {
+ $(this).dialog("close");
+ pack.provinces.filter(p => p.i).forEach(p => {
+ p.removed = true;
+ unfocus(p.i);
+ });
+ pack.cells.i.forEach(i => pack.cells.province[i] = 0);
+ pack.states.filter(s => s.i && !s.removed).forEach(s => s.provinces = []);
+
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ provs.select("#provincesBody").remove();
+ turnButtonOff("toggleProvinces");
+
+ provincesEditorAddLines();
+ },
+ Cancel: function() {$(this).dialog("close");}
+ }
+ });
+ }
+
+ function closeProvincesEditor() {
+ if (customization === 11) exitProvincesManualAssignment("close");
+ if (customization === 12) exitAddStateMode();
+ }
+
+}
+
diff --git a/modules/ui/relief-editor.js b/modules/ui/relief-editor.js
index 52d7c7f5..c53e8751 100644
--- a/modules/ui/relief-editor.js
+++ b/modules/ui/relief-editor.js
@@ -12,8 +12,8 @@ function editReliefIcon() {
updateReliefSizeInput();
$("#reliefEditor").dialog({
- title: "Edit Relief Icons", resizable: false,
- position: {my: "center top+40", at: "top", of: d3.event, collision: "fit"},
+ title: "Edit Relief Icons", resizable: false, width: 294,
+ position: {my: "left top", at: "left+10 top+10", of: "#map"},
close: closeReliefEditor
});
@@ -27,6 +27,7 @@ function editReliefIcon() {
document.getElementById("reliefSize").addEventListener("input", changeIconSize);
document.getElementById("reliefSizeNumber").addEventListener("input", changeIconSize);
+ document.getElementById("reliefEditorSet").addEventListener("change", changeIconsSet);
reliefIconsDiv.querySelectorAll("svg").forEach(el => el.addEventListener("click", changeIcon));
document.getElementById("reliefCopy").addEventListener("click", copyIcon);
@@ -53,8 +54,13 @@ function editReliefIcon() {
function updateReliefIconSelected() {
const type = elSelected.attr("data-type");
+ const button = reliefIconsDiv.querySelector("svg[data-type='"+type+"']");
+
reliefIconsDiv.querySelectorAll("svg.pressed").forEach(b => b.classList.remove("pressed"));
- reliefIconsDiv.querySelector("svg[data-type='"+type+"']").classList.add("pressed");
+ button.classList.add("pressed");
+ reliefIconsDiv.querySelectorAll("div").forEach(b => b.style.display = "none");
+ button.parentNode.style.display = "block";
+ reliefEditorSet.value = button.parentNode.dataset.type;
}
function updateReliefSizeInput() {
@@ -196,6 +202,12 @@ function editReliefIcon() {
elSelected.attr("x", x-shift).attr("y", y-shift);
}
+ function changeIconsSet() {
+ const set = reliefEditorSet.value;
+ reliefIconsDiv.querySelectorAll("div").forEach(b => b.style.display = "none");
+ reliefIconsDiv.querySelector("div[data-type='" + set + "']").style.display = "block";
+ }
+
function changeIcon() {
if (this.classList.contains("pressed")) return;
diff --git a/modules/ui/religions-editor.js b/modules/ui/religions-editor.js
new file mode 100644
index 00000000..a0587fb1
--- /dev/null
+++ b/modules/ui/religions-editor.js
@@ -0,0 +1,423 @@
+"use strict";
+function editReligions() {
+ if (customization) return;
+ closeDialogs("#religionsEditor, .stable");
+ if (!layerIsOn("toggleReligions")) toggleReligions();
+ if (layerIsOn("toggleCultures")) toggleCultures();
+ if (layerIsOn("toggleStates")) toggleStates();
+ if (layerIsOn("toggleBiomes")) toggleBiomes();
+ if (layerIsOn("toggleProvinces")) toggleProvinces();
+
+ const body = document.getElementById("religionsBody");
+ const animate = d3.transition().duration(1500).ease(d3.easeSinIn);
+ drawReligionCenters();
+ refreshReligionsEditor();
+
+ if (modules.editReligions) return;
+ modules.editReligions = true;
+
+ $("#religionsEditor").dialog({
+ title: "Religions Editor", resizable: false, width: fitContent(), close: closeReligionsEditor,
+ position: {my: "right top", at: "right-10 top+10", of: "svg"}
+ });
+
+ // add listeners
+ document.getElementById("religionsEditorRefresh").addEventListener("click", refreshReligionsEditor);
+ document.getElementById("religionsLegend").addEventListener("click", toggleLegend);
+ document.getElementById("religionsPercentage").addEventListener("click", togglePercentageMode);
+ document.getElementById("religionsManually").addEventListener("click", enterReligionsManualAssignent);
+ document.getElementById("religionsManuallyApply").addEventListener("click", applyReligionsManualAssignent);
+ document.getElementById("religionsManuallyCancel").addEventListener("click", () => exitReligionsManualAssignment());
+ document.getElementById("religionsAdd").addEventListener("click", enterAddReligionMode);
+ document.getElementById("religionsExport").addEventListener("click", downloadReligionsData);
+
+ function refreshReligionsEditor() {
+ religionsCollectStatistics();
+ religionsEditorAddLines();
+ }
+
+ function religionsCollectStatistics() {
+ const cells = pack.cells, religions = pack.religions;
+ religions.forEach(r => r.area = r.rural = r.urban = 0);
+
+ for (const i of cells.i) {
+ if (cells.h[i] < 20) continue;
+ const r = cells.religion[i];
+ religions[r].area += cells.area[i];
+ religions[r].rural += cells.pop[i];
+ if (cells.burg[i]) religions[r].urban += pack.burgs[cells.burg[i]].population;
+ }
+ }
+
+ // add line for each religion
+ function religionsEditorAddLines() {
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
+ let lines = "", totalArea = 0, totalPopulation = 0;
+
+ for (const r of pack.religions) {
+ if (r.removed) continue;
+ const area = r.area * (distanceScaleInput.value ** 2);
+ const rural = r.rural * populationRate.value;
+ const urban = r.urban * populationRate.value * urbanization.value;
+ const population = rn(rural + urban);
+ const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}`;
+ totalArea += area;
+ totalPopulation += population;
+
+ if (r.i) {
+ lines += `${si(area) + unit}
+
+ ${si(population)}
+
+
+
+
+
+
+
+
+
+
+
`;
+ } else {
+ // No religion (neutral) line
+ lines += `${si(area) + unit}
+
+ ${si(population)}
+
+
+
+
+
+
+
+
+
+
`;
+ }
+ }
+ body.innerHTML = lines;
+
+ // update footer
+ religionsFooterNumber.innerHTML = pack.religions.filter(r => r.i && !r.removed).length;
+ religionsFooterArea.innerHTML = si(totalArea) + unit;
+ religionsFooterPopulation.innerHTML = si(totalPopulation);
+ religionsFooterArea.dataset.area = totalArea;
+ religionsFooterPopulation.dataset.population = totalPopulation;
+
+ // add listeners
+ body.querySelectorAll("div.religions").forEach(el => el.addEventListener("mouseenter", ev => religionHighlightOn(ev)));
+ body.querySelectorAll("div.religions").forEach(el => el.addEventListener("mouseleave", ev => religionHighlightOff(ev)));
+ body.querySelectorAll("div.states").forEach(el => el.addEventListener("click", selectReligionOnLineClick));
+ body.querySelectorAll("rect.zoneFill").forEach(el => el.addEventListener("click", religionChangeColor));
+ body.querySelectorAll("div > input.religionName").forEach(el => el.addEventListener("input", religionChangeName));
+ body.querySelectorAll("div > select.religionType").forEach(el => el.addEventListener("change", religionChangeType));
+ body.querySelectorAll("div > select.religionForm").forEach(el => el.addEventListener("change", religionChangeForm));
+ body.querySelectorAll("div > span.icon-arrows-cw").forEach(el => el.addEventListener("click", regenerateDeity));
+ body.querySelectorAll("div > span.icon-trash-empty").forEach(el => el.addEventListener("click", religionRemove));
+
+ if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
+ applySorting(religionsHeader);
+ $("#religionsEditor").dialog();
+ }
+
+ function getTypeOptions(type) {
+ let options = "";
+ const types = ["Folk", "Organized", "Cult", "Heresy"];
+ types.forEach(t => options += ``);
+ return options;
+ }
+
+ function religionHighlightOn(event) {
+ if (!layerIsOn("toggleReligions")) return;
+ if (customization) return;
+ const religion = +event.target.dataset.id;
+ relig.select("#religion"+religion).raise().transition(animate).attr("stroke-width", 2.5).attr("stroke", "#c13119");
+ debug.select("#cultureCenter"+religion).raise().transition(animate).attr("r", 8).attr("stroke", "#c13119");
+ }
+
+ function religionHighlightOff(event) {
+ if (!layerIsOn("toggleReligions")) return;
+ const religion = +event.target.dataset.id;
+ relig.select("#religion"+religion).transition().attr("stroke-width", null).attr("stroke", null);
+ debug.select("#cultureCenter"+religion).transition().attr("r", 6).attr("stroke", null);
+ }
+
+ function religionChangeColor() {
+ const el = this;
+ const currentFill = el.getAttribute("fill");
+ const religion = +el.parentNode.parentNode.dataset.id;
+
+ const callback = function(fill) {
+ el.setAttribute("fill", fill);
+ pack.religions[religion].color = fill;
+ relig.select("#religion"+religion).attr("fill", fill);
+ debug.select("#cultureCenter"+religion).attr("fill", fill);
+ }
+
+ openPicker(currentFill, callback);
+ }
+
+ function religionChangeName() {
+ const religion = +this.parentNode.dataset.id;
+ this.parentNode.dataset.name = this.value;
+ pack.religions[religion].name = this.value;
+ }
+
+ function religionChangeType() {
+ const religion = +this.parentNode.dataset.id;
+ this.parentNode.dataset.type = this.value;
+ pack.religions[religion].type = this.value;
+ }
+
+ function religionChangeForm() {
+ const religion = +this.parentNode.dataset.id;
+ this.parentNode.dataset.form = this.value;
+ pack.religions[religion].form = this.value;
+ }
+
+ function regenerateDeity() {
+ const religion = +this.parentNode.dataset.id;
+ const culture = pack.religions[religion].culture;
+ const deity = Religions.getDeityName(culture);
+ this.parentNode.dataset.deity = deity;
+ pack.religions[religion].deity = deity;
+ this.nextElementSibling.value = deity;
+ }
+
+ function religionRemove() {
+ if (customization) return;
+ const religion = +this.parentNode.dataset.id;
+ relig.select("#religion"+religion).remove();
+ debug.select("#cultureCenter"+religion).remove();
+
+ pack.cells.religion.forEach((r, i) => {if(r === religion) pack.cells.religion[i] = 0;});
+ pack.religions[religion].removed = true;
+
+ refreshReligionsEditor();
+ }
+
+ function drawReligionCenters() {
+ const tooltip = "Drag to move the religion center";
+ debug.select("#religionCenters").remove();
+ const religionCenters = debug.append("g").attr("id", "religionCenters")
+ .attr("stroke-width", 2).attr("stroke", "#444444").style("cursor", "move");
+
+ const data = pack.religions.filter(r => r.center && !r.removed);
+ religionCenters.selectAll("circle").data(data).enter().append("circle")
+ .attr("id", d => "cultureCenter"+d.i).attr("data-id", d => d.i)
+ .attr("r", 6).attr("fill", d => pack.religions[d.i].color)
+ .attr("cx", d => pack.cells.p[d.center][0]).attr("cy", d => pack.cells.p[d.center][1])
+ .on("mouseenter", d => {tip(tooltip, true); body.querySelector(`div[data-id='${d.i}']`).classList.add("selected"); religionHighlightOn(event);})
+ .on("mouseleave", d => {tip('', true); body.querySelector(`div[data-id='${d.i}']`).classList.remove("selected"); religionHighlightOff(event);})
+ .call(d3.drag().on("start", religionCenterDrag));
+ }
+
+ function religionCenterDrag() {
+ const el = d3.select(this);
+ const r = +this.dataset.id;
+ d3.event.on("drag", () => {
+ el.attr("cx", d3.event.x).attr("cy", d3.event.y);
+ const cell = findCell(d3.event.x, d3.event.y);
+ if (pack.cells.h[cell] < 20) return; // ignore dragging on water
+ pack.religions[r].center = cell;
+ });
+ }
+
+ function toggleLegend() {
+ if (legend.selectAll("*").size()) {clearLegend(); return;}; // hide legend
+ const data = pack.religions.filter(r => r.i && !r.removed && r.area).sort((a, b) => b.area - a.area).map(r => [r.i, r.color, r.name]);
+ drawLegend("Religions", data);
+ }
+
+ function togglePercentageMode() {
+ if (body.dataset.type === "absolute") {
+ body.dataset.type = "percentage";
+ const totalArea = +religionsFooterArea.dataset.area;
+ const totalPopulation = +religionsFooterPopulation.dataset.population;
+
+ body.querySelectorAll(":scope > div").forEach(function(el) {
+ el.querySelector(".biomeArea").innerHTML = rn(+el.dataset.area / totalArea * 100) + "%";
+ el.querySelector(".culturePopulation").innerHTML = rn(+el.dataset.population / totalPopulation * 100) + "%";
+ });
+ } else {
+ body.dataset.type = "absolute";
+ religionsEditorAddLines();
+ }
+ }
+
+ function enterReligionsManualAssignent() {
+ if (!layerIsOn("toggleReligions")) toggleReligions();
+ customization = 7;
+ relig.append("g").attr("id", "temp");
+ document.querySelectorAll("#religionsBottom > button").forEach(el => el.style.display = "none");
+ document.getElementById("religionsManuallyButtons").style.display = "inline-block";
+ debug.select("#religionCenters").style("display", "none");
+
+ religionsEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
+ religionsFooter.style.display = "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"}});
+
+ tip("Click on religion to select, drag the circle to change religion", true);
+ viewbox.style("cursor", "crosshair")
+ .on("click", selectReligionOnMapClick)
+ .call(d3.drag().on("start", dragReligionBrush))
+ .on("touchmove mousemove", moveReligionBrush);
+
+ body.querySelector("div").classList.add("selected");
+ }
+
+ function selectReligionOnLineClick(i) {
+ if (customization !== 7) return;
+ body.querySelector("div.selected").classList.remove("selected");
+ this.classList.add("selected");
+ }
+
+ function selectReligionOnMapClick() {
+ const point = d3.mouse(this);
+ const i = findCell(point[0], point[1]);
+ if (pack.cells.h[i] < 20) return;
+
+ const assigned = relig.select("#temp").select("polygon[data-cell='"+i+"']");
+ const religion = assigned.size() ? +assigned.attr("data-religion") : pack.cells.religion[i];
+
+ body.querySelector("div.selected").classList.remove("selected");
+ body.querySelector("div[data-id='"+religion+"']").classList.add("selected");
+ }
+
+ function dragReligionBrush() {
+ const r = +religionsManuallyBrushNumber.value;
+
+ d3.event.on("drag", () => {
+ if (!d3.event.dx && !d3.event.dy) return;
+ const p = d3.mouse(this);
+ moveCircle(p[0], p[1], r);
+
+ const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
+ const selection = found.filter(isLand);
+ if (selection) changeReligionForSelection(selection);
+ });
+ }
+
+ // change religion within selection
+ function changeReligionForSelection(selection) {
+ const temp = relig.select("#temp");
+ const selected = body.querySelector("div.selected");
+ const r = +selected.dataset.id; // religionNew
+ const color = pack.religions[r].color || "#ffffff";
+
+ selection.forEach(function(i) {
+ const exists = temp.select("polygon[data-cell='"+i+"']");
+ const religionOld = exists.size() ? +exists.attr("data-religion") : pack.cells.religion[i];
+ if (r === religionOld) return;
+
+ // change of append new element
+ if (exists.size()) exists.attr("data-religion", r).attr("fill", color);
+ else temp.append("polygon").attr("data-cell", i).attr("data-religion", r).attr("points", getPackPolygon(i)).attr("fill", color);
+ });
+ }
+
+ function moveReligionBrush() {
+ showMainTip();
+ const point = d3.mouse(this);
+ const radius = +religionsManuallyBrushNumber.value;
+ moveCircle(point[0], point[1], radius);
+ }
+
+ function applyReligionsManualAssignent() {
+ const changed = relig.select("#temp").selectAll("polygon");
+ changed.each(function() {
+ const i = +this.dataset.cell;
+ const r = +this.dataset.religion;
+ pack.cells.religion[i] = r;
+ });
+
+ if (changed.size()) {
+ drawReligions();
+ refreshReligionsEditor();
+ }
+ exitReligionsManualAssignment();
+ }
+
+ function exitReligionsManualAssignment(close) {
+ customization = 0;
+ relig.select("#temp").remove();
+ removeCircle();
+ document.querySelectorAll("#religionsBottom > button").forEach(el => el.style.display = "inline-block");
+ document.getElementById("religionsManuallyButtons").style.display = "none";
+
+ religionsEditor.querySelectorAll(".hide").forEach(el => el.classList.remove("hidden"));
+ religionsFooter.style.display = "block";
+ 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"}});
+
+ debug.select("#religionCenters").style("display", null);
+ restoreDefaultEvents();
+ clearMainTip();
+ const selected = body.querySelector("div.selected");
+ if (selected) selected.classList.remove("selected");
+ }
+
+ function enterAddReligionMode() {
+ if (this.classList.contains("pressed")) {exitAddReligionMode(); return;};
+ customization = 8;
+ this.classList.add("pressed");
+ tip("Click on the map to add a new religion", true);
+ viewbox.style("cursor", "crosshair").on("click", addReligion);
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
+ }
+
+ function exitAddReligionMode() {
+ customization = 0;
+ restoreDefaultEvents();
+ clearMainTip();
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
+ if (religionsAdd.classList.contains("pressed")) religionsAdd.classList.remove("pressed");
+ }
+
+ function addReligion() {
+ const point = d3.mouse(this);
+ const center = findCell(point[0], point[1]);
+ if (pack.cells.h[center] < 20) {tip("You cannot place religion center into the water. Please click on a land cell", false, "error"); return;}
+ const occupied = pack.religions.some(r => !r.removed && r.center === center);
+ if (occupied) {tip("This cell is already a religion center. Please select a different cell", false, "error"); return;}
+
+ if (d3.event.shiftKey === false) exitAddReligionMode();
+
+ Religions.add(center);
+ drawReligionCenters();
+ religionsEditorAddLines();
+ }
+
+ function downloadReligionsData() {
+ const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
+ let data = "Id,Religion,Color,Type,Form,Deity,Area "+unit+",Population\n"; // headers
+
+ body.querySelectorAll(":scope > div").forEach(function(el) {
+ data += el.dataset.id + ",";
+ data += el.dataset.name + ",";
+ data += el.dataset.color + ",";
+ data += el.dataset.type + ",";
+ data += el.dataset.form + ",";
+ data += el.dataset.deity.replace(",", " -") + ",";
+ data += el.dataset.area + ",";
+ data += el.dataset.population + "\n";
+ });
+
+ const dataBlob = new Blob([data], {type: "text/plain"});
+ const url = window.URL.createObjectURL(dataBlob);
+ const link = document.createElement("a");
+ document.body.appendChild(link);
+ link.download = "religions_data" + Date.now() + ".csv";
+ link.href = url;
+ link.click();
+ window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
+ }
+
+ function closeReligionsEditor() {
+ debug.select("#religionCenters").remove();
+ exitReligionsManualAssignment("close");
+ exitAddReligionMode();
+ }
+
+}
\ No newline at end of file
diff --git a/modules/ui/rivers-editor.js b/modules/ui/rivers-editor.js
index f1e67451..5d9a3e60 100644
--- a/modules/ui/rivers-editor.js
+++ b/modules/ui/rivers-editor.js
@@ -68,7 +68,7 @@ function editRiver() {
function drawControlPoints(node) {
const l = node.getTotalLength() / 2;
- const segments = Math.ceil(l / 5);
+ const segments = Math.ceil(l / 8);
const increment = rn(l / segments * 1e5);
for (let i=increment*segments, c=i; i >= 0; i -= increment, c += increment) {
const p1 = node.getPointAtLength(i / 1e5);
@@ -80,7 +80,7 @@ function editRiver() {
function addControlPoint(point) {
debug.select("#controlPoints").append("circle")
- .attr("cx", point[0]).attr("cy", point[1]).attr("r", .5)
+ .attr("cx", point[0]).attr("cy", point[1]).attr("r", .8)
.call(d3.drag().on("drag", dragControlPoint))
.on("click", clickControlPoint);
}
@@ -106,7 +106,7 @@ function editRiver() {
function updateRiverLength(l = elSelected.node().getTotalLength() / 2) {
const tr = parseTransform(elSelected.attr("transform"));
- riverLength.innerHTML = rn(l * tr[5] * distanceScale.value) + " " + distanceUnit.value;
+ riverLength.innerHTML = rn(l * tr[5] * distanceScaleInput.value) + " " + distanceUnitInput.value;
}
function clickControlPoint() {
@@ -134,7 +134,7 @@ function editRiver() {
const before = ":nth-child(" + (index + 1) + ")";
debug.select("#controlPoints").insert("circle", before)
- .attr("cx", point[0]).attr("cy", point[1]).attr("r", .5)
+ .attr("cx", point[0]).attr("cy", point[1]).attr("r", .8)
.call(d3.drag().on("drag", dragControlPoint))
.on("click", clickControlPoint);
@@ -250,7 +250,7 @@ function editRiver() {
function editRiverLegend() {
const id = elSelected.attr("id");
- editLegends(id, id);
+ editNotes(id, id);
}
function removeRiver() {
diff --git a/modules/ui/routes-editor.js b/modules/ui/routes-editor.js
index 8f9b11fe..28c2cca2 100644
--- a/modules/ui/routes-editor.js
+++ b/modules/ui/routes-editor.js
@@ -44,14 +44,14 @@ function editRoute(onClick) {
function drawControlPoints(node) {
const l = node.getTotalLength();
- const increment = l / Math.ceil(l / 5);
+ const increment = l / Math.ceil(l / 8);
for (let i=0; i <= l; i += increment) {addControlPoint(node.getPointAtLength(i));}
- routeLength.innerHTML = rn(l * distanceScale.value) + " " + distanceUnit.value;
+ routeLength.innerHTML = rn(l * distanceScaleInput.value) + " " + distanceUnitInput.value;
}
function addControlPoint(point) {
debug.select("#controlPoints").append("circle")
- .attr("cx", point.x).attr("cy", point.y).attr("r", .5)
+ .attr("cx", point.x).attr("cy", point.y).attr("r", .8)
.call(d3.drag().on("drag", dragControlPoint))
.on("click", clickControlPoint);
}
@@ -76,7 +76,7 @@ function editRoute(onClick) {
const before = ":nth-child(" + (index + 1) + ")";
debug.select("#controlPoints").insert("circle", before)
- .attr("cx", point[0]).attr("cy", point[1]).attr("r", .5)
+ .attr("cx", point[0]).attr("cy", point[1]).attr("r", .8)
.call(d3.drag().on("drag", dragControlPoint))
.on("click", clickControlPoint);
@@ -98,7 +98,7 @@ function editRoute(onClick) {
elSelected.attr("d", round(lineGen(points)));
const l = elSelected.node().getTotalLength();
- routeLength.innerHTML = rn(l * distanceScale.value) + " " + distanceUnit.value;
+ routeLength.innerHTML = rn(l * distanceScaleInput.value) + " " + distanceUnitInput.value;
}
function showGroupSection() {
@@ -256,7 +256,7 @@ function editRoute(onClick) {
function editRouteLegend() {
const id = elSelected.attr("id");
- editLegends(id, id);
+ editNotes(id, id);
}
function removeRoute() {
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index 6d363940..624716d9 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -6,6 +6,8 @@ function editStates() {
if (!layerIsOn("toggleBorders")) toggleBorders();
if (layerIsOn("toggleCultures")) toggleCultures();
if (layerIsOn("toggleBiomes")) toggleBiomes();
+ if (layerIsOn("toggleReligions")) toggleReligions();
+ if (layerIsOn("toggleTexture")) toggleTexture();
const body = document.getElementById("statesBodySection");
refreshStatesEditor();
@@ -14,109 +16,120 @@ function editStates() {
modules.editStates = true;
$("#statesEditor").dialog({
- title: "States Editor", width: fitContent(), close: closeStatesEditor,
+ title: "States Editor", resizable: false, width: fitContent(), close: closeStatesEditor,
position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}
});
// add listeners
document.getElementById("statesEditorRefresh").addEventListener("click", refreshStatesEditor);
+ document.getElementById("statesLegend").addEventListener("click", toggleLegend);
document.getElementById("statesPercentage").addEventListener("click", togglePercentageMode);
- document.getElementById("regenerateStateNames").addEventListener("click", regenerateNames);
document.getElementById("statesRegenerate").addEventListener("click", openRegenerationMenu);
document.getElementById("statesRegenerateBack").addEventListener("click", exitRegenerationMenu);
- document.getElementById("statesRecalculate").addEventListener("click", recalculateStates);
- document.getElementById("statesJustify").addEventListener("click", justifyStates);
+ document.getElementById("statesRecalculate").addEventListener("click", () => recalculateStates(true));
document.getElementById("statesRandomize").addEventListener("click", randomizeStatesExpansion);
- document.getElementById("statesNeutral").addEventListener("input", recalculateStates);
- document.getElementById("statesNeutralNumber").addEventListener("click", recalculateStates);
+ document.getElementById("statesNeutral").addEventListener("input", () => recalculateStates(false));
+ document.getElementById("statesNeutralNumber").addEventListener("change", () => recalculateStates(false));
document.getElementById("statesManually").addEventListener("click", enterStatesManualAssignent);
document.getElementById("statesManuallyApply").addEventListener("click", applyStatesManualAssignent);
- document.getElementById("statesManuallyCancel").addEventListener("click", exitStatesManualAssignment);
+ document.getElementById("statesManuallyCancel").addEventListener("click", () => exitStatesManualAssignment());
document.getElementById("statesAdd").addEventListener("click", enterAddStateMode);
document.getElementById("statesExport").addEventListener("click", downloadStatesData);
+ body.addEventListener("click", function(ev) {
+ const el = ev.target, cl = el.classList, line = el.parentNode, state = +line.dataset.id;
+ if (cl.contains("zoneFill")) stateChangeFill(el); else
+ if (cl.contains("icon-fleur")) stateOpenCOA(state); else
+ if (cl.contains("icon-star-empty")) stateCapitalZoomIn(state); else
+ if (cl.contains("icon-pin")) focusOnState(state, cl); else
+ if (cl.contains("icon-trash-empty")) stateRemove(state); else
+ if (cl.contains("hoverButton") && cl.contains("stateName")) regenerateName(state, line); else
+ if (cl.contains("hoverButton") && cl.contains("stateForm")) regenerateForm(state, line);
+ });
+
+ body.addEventListener("input", function(ev) {
+ const el = ev.target, cl = el.classList, line = el.parentNode, state = +line.dataset.id;
+ if (cl.contains("stateName")) stateChangeName(state, line, el.value); else
+ if (cl.contains("stateForm")) stateChangeForm(state, line, el.value); else
+ if (cl.contains("stateCapital")) stateChangeCapitalName(state, line, el.value); else
+ if (cl.contains("cultureType")) stateChangeType(state, line, el.value); else
+ if (cl.contains("stateCulture")) stateChangeCulture(state, line, el.value); else
+ if (cl.contains("statePower")) stateChangeExpansionism(state, line, el.value);
+ });
+
function refreshStatesEditor() {
- statesCollectStatistics();
+ BurgsAndStates.collectStatistics();
statesEditorAddLines();
}
- function statesCollectStatistics() {
- const cells = pack.cells, states = pack.states;
- states.forEach(s => s.cells = s.area = s.burgs = s.rural = s.urban = 0);
-
- for (const i of cells.i) {
- if (cells.h[i] < 20) continue;
- const s = cells.state[i];
- states[s].cells += 1;
- states[s].area += cells.area[i];
- states[s].rural += cells.pop[i];
- if (cells.burg[i]) {
- states[s].urban += pack.burgs[cells.burg[i]].population;
- states[s].burgs++;
- }
- }
- }
-
// add line for each state
function statesEditorAddLines() {
- const unit = areaUnit.value === "square" ? " " + distanceUnit.value + "²" : " " + areaUnit.value;
- const hidden = statesRegenerateButtons.style.display === "block" ? "visible" : "hidden"; // show/hide regenerate columns
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
+ const hidden = statesRegenerateButtons.style.display === "block" ? "" : "hidden"; // show/hide regenerate columns
let lines = "", totalArea = 0, totalPopulation = 0, totalBurgs = 0;
for (const s of pack.states) {
if (s.removed) continue;
- const area = s.area * (distanceScale.value ** 2);
+ const area = s.area * (distanceScaleInput.value ** 2);
const rural = s.rural * populationRate.value;
const urban = s.urban * populationRate.value * urbanization.value;
- const population = rural + urban;
+ const population = rn(rural + urban);
const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}`;
totalArea += area;
totalPopulation += population;
totalBurgs += s.burgs;
+ const focused = defs.select("#fog #focusState"+s.i).size();
if (!s.i) {
// Neutral line
lines += `${si(area) + unit}
+
+ ${si(population)}
+
-
+ data-population=${population} data-burgs=${s.burgs} data-color="" data-form="" data-capital="" data-culture="" data-type="" data-expansionism="">
+
-
-
-
-
-
-
-
-
`;
continue;
}
const capital = pack.burgs[s.capital].name;
- lines += `${s.cells}
-
- ${s.burgs}
-
- ${si(area) + unit}
-
- ${si(population)}
+
+
+
+
+
+
+
+
+
+ ${s.cells}
+
+ ${s.burgs}
+
+ ${si(area) + unit}
+
+ ${si(population)}
-
+
-
-
-
-
-
-
-
-
`;
}
body.innerHTML = lines;
@@ -130,18 +143,11 @@ function editStates() {
statesFooterArea.dataset.area = totalArea;
statesFooterPopulation.dataset.population = totalPopulation;
- // add listeners
- body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseenter", ev => stateHighlightOn(ev)));
- body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseleave", ev => stateHighlightOff(ev)));
- body.querySelectorAll("div.states").forEach(el => el.addEventListener("click", selectStateOnLineClick));
- body.querySelectorAll("div > input.stateColor").forEach(el => el.addEventListener("input", stateChangeColor));
- body.querySelectorAll("div > input.stateName").forEach(el => el.addEventListener("input", stateChangeName));
- body.querySelectorAll("div > input.stateCapital").forEach(el => el.addEventListener("input", stateChangeCapitalName));
- body.querySelectorAll("div > span.icon-star-empty").forEach(el => el.addEventListener("click", stateCapitalZoomIn));
- body.querySelectorAll("div > select.stateCulture").forEach(el => el.addEventListener("change", stateChangeCulture));
- body.querySelectorAll("div > select.cultureType").forEach(el => el.addEventListener("input", stateChangeType));
- body.querySelectorAll("div > input.statePower").forEach(el => el.addEventListener("input", stateChangeExpansionism));
- body.querySelectorAll("div > span.icon-trash-empty").forEach(el => el.addEventListener("click", stateRemove));
+ body.querySelectorAll("div.states").forEach(el => {
+ el.addEventListener("click", selectStateOnLineClick);
+ el.addEventListener("mouseenter", ev => stateHighlightOn(ev));
+ el.addEventListener("mouseleave", ev => stateHighlightOff(ev));
+ });
if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
applySorting(statesHeader);
@@ -162,10 +168,11 @@ function editStates() {
}
function stateHighlightOn(event) {
+ if (!customization) event.target.querySelectorAll(".hoverButton").forEach(el => el.classList.remove("placeholder"));
if (!layerIsOn("toggleStates")) return;
const state = +event.target.dataset.id;
if (customization || !state) return;
- const path = regions.select("#state"+state).attr("d");
+ const path = statesBody.select("#state"+state).attr("d");
debug.append("path").attr("class", "highlight").attr("d", path)
.attr("fill", "none").attr("stroke", "red").attr("stroke-width", 1).attr("opacity", 1)
.attr("filter", "url(#blur1)").call(transition);
@@ -187,83 +194,179 @@ function editStates() {
}
function stateHighlightOff() {
+ event.target.querySelectorAll(".hoverButton").forEach(el => el.classList.add("placeholder"));
debug.selectAll(".highlight").each(function(el) {
d3.select(this).call(removePath);
});
}
- function stateChangeColor() {
- const state = +this.parentNode.dataset.id;
- pack.states[state].color = this.value;
- regions.select("#state"+state).attr("fill", this.value);
- regions.select("#state-gap"+state).attr("stroke", this.value);
- regions.select("#state-border"+state).attr("stroke", d3.color(this.value).darker().hex());
+ function stateChangeFill(el) {
+ const currentFill = el.getAttribute("fill");
+ const state = +el.parentNode.parentNode.dataset.id;
+
+ const callback = function(fill) {
+ el.setAttribute("fill", fill);
+ pack.states[state].color = fill;
+ statesBody.select("#state"+state).attr("fill", fill);
+ statesBody.select("#state-gap"+state).attr("stroke", fill);
+ const halo = d3.color(fill) ? d3.color(fill).darker().hex() : "#666666";
+ statesHalo.select("#state-border"+state).attr("stroke", halo);
+ }
+
+ openPicker(currentFill, callback);
}
- function stateChangeName() {
- const state = +this.parentNode.dataset.id;
- this.parentNode.dataset.name = this.value;
- pack.states[state].name = this.value;
- document.querySelector("#stateLabel"+state+" > textPath").textContent = this.value;
+ function stateChangeName(state, line, value) {
+ const oldName = pack.states[state].name;
+ pack.states[state].name = line.dataset.name = value;
+ pack.states[state].fullName = BurgsAndStates.getFullName(pack.states[state]);
+ changeLabel(state, oldName, value);
}
- function stateChangeCapitalName() {
- const state = +this.parentNode.dataset.id;
- this.parentNode.dataset.capital = this.value;
+ function regenerateName(state, line) {
+ const culture = pack.states[state].culture;
+ const oldName = pack.states[state].name;
+ const newName = Names.getState(Names.getCultureShort(culture), culture);
+ pack.states[state].name = line.dataset.name = line.querySelector(".stateName").value = newName;
+ pack.states[state].fullName = BurgsAndStates.getFullName(pack.states[state]);
+ changeLabel(state, oldName, newName);
+ }
+
+ function stateChangeForm(state, line, value) {
+ const oldForm = pack.states[state].formName;
+ pack.states[state].formName = line.dataset.form = value;
+ pack.states[state].fullName = BurgsAndStates.getFullName(pack.states[state]);
+ changeLabel(state, oldForm, value, true);
+ }
+
+ function regenerateForm(state, line) {
+ const oldForm = pack.states[state].formName;
+ let newForm = oldForm;
+
+ for (let i=0; newForm === oldForm && i < 50; i++) {
+ BurgsAndStates.defineStateForms([state]);
+ newForm = pack.states[state].formName;
+ }
+
+ line.dataset.form = line.querySelector(".stateForm").value = newForm;
+ changeLabel(state, oldForm, newForm, true);
+ }
+
+ function changeLabel(state, oldName, newName, form) {
+ const label = document.getElementById("stateLabel"+state);
+ if (!label) return;
+
+ const tspan = Array.from(label.querySelectorAll('tspan'));
+ const tspanAdj = !form && oldName && newName && pack.states[state].formName ? tspan.find(el => el.textContent.includes(getAdjective(oldName))) : null;
+ const tspanName = tspanAdj || !oldName || !newName ? null : tspan.find(el => el.textContent.includes(oldName));
+
+ if (tspanAdj) {
+ tspanAdj.textContent = tspanAdj.textContent.replace(getAdjective(oldName), getAdjective(newName));
+ const l = tspanAdj.getComputedTextLength();
+ tspanAdj.setAttribute("x", l / -2);
+ } if (tspanName) {
+ tspanName.textContent = tspanName.textContent.replace(oldName, newName);
+ const l = tspanName.getComputedTextLength();
+ tspanName.setAttribute("x", l / -2);
+ } else {
+ BurgsAndStates.drawStateLabels([state]);
+ }
+
+ tip("State label is automatically changed. To make a custom change click on a label and edit the text there", false, "warn");
+ }
+
+ function stateChangeCapitalName(state, line, value) {
+ line.dataset.capital = value;
const capital = pack.states[state].capital;
if (!capital) return;
- pack.burgs[capital].name = this.value;
- document.querySelector("#burgLabel"+capital).textContent = this.value;
+ pack.burgs[capital].name = value;
+ document.querySelector("#burgLabel"+capital).textContent = value;
}
- function stateCapitalZoomIn() {
- const state = +this.parentNode.dataset.id;
+ function stateOpenCOA(state) {
+ const url = `https://ironarachne.com/heraldry/${seed}-s${state}`;
+ window.open(url, '_blank');
+ }
+
+ function stateCapitalZoomIn(state) {
const capital = pack.states[state].capital;
const l = burgLabels.select("[data-id='" + capital + "']");
const x = +l.attr("x"), y = +l.attr("y");
zoomTo(x, y, 8, 2000);
}
- function stateChangeCulture() {
- const state = +this.parentNode.dataset.id;
- const v = +this.value;
- this.parentNode.dataset.base = pack.states[state].culture = v;
+ function stateChangeCulture(state, line, value) {
+ line.dataset.base = pack.states[state].culture = +value;
}
- function stateChangeType() {
- const state = +this.parentNode.dataset.id;
- this.parentNode.dataset.type = this.value;
- pack.states[state].type = this.value;
+ function stateChangeType(state, line, value) {
+ line.dataset.type = pack.states[state].type = value;
recalculateStates();
}
- function stateChangeExpansionism() {
- const state = +this.parentNode.dataset.id;
- this.parentNode.dataset.expansionism = this.value;
- pack.states[state].expansionism = +this.value;
+ function stateChangeExpansionism(state, line, value) {
+ line.dataset.expansionism = pack.states[state].expansionism = value;
recalculateStates();
}
- function stateRemove() {
+ function focusOnState(state, cl) {
if (customization) return;
- const state = +this.parentNode.dataset.id;
- regions.select("#state"+state).remove();
- regions.select("#state-gap"+state).remove();
- regions.select("#state-border"+state).remove();
- document.querySelector("#stateLabel"+state+" > textPath").remove();
+
+ const inactive = cl.contains("inactive");
+ cl.toggle("inactive");
+
+ if (inactive) {
+ if (defs.select("#fog #focusState"+state).size()) return;
+ fogging.attr("display", "block");
+ const path = statesBody.select("#state"+state).attr("d");
+ defs.select("#fog").append("path").attr("d", path).attr("fill", "black").attr("id", "focusState"+state);
+ fogging.append("path").attr("d", path).attr("id", "focusStateHalo"+state)
+ .attr("fill", "none").attr("stroke", pack.states[state].color).attr("filter", "url(#blur5)");
+ } else unfocus(state);
+ }
+
+ function unfocus(s) {
+ defs.select("#focusState"+s).remove();
+ fogging.select("#focusStateHalo"+s).remove();
+ if (!defs.selectAll("#fog path").size()) fogging.attr("display", "none"); // all items are de-focused
+ }
+
+ function stateRemove(state) {
+ if (customization) return;
+ statesBody.select("#state"+state).remove();
+ statesBody.select("#state-gap"+state).remove();
+ statesHalo.select("#state-border"+state).remove();
+ unfocus(state);
+ const label = document.querySelector("#stateLabel"+state);
+ if (label) label.remove();
pack.burgs.forEach(b => {if(b.state === state) b.state = 0;});
pack.cells.state.forEach((s, i) => {if(s === state) pack.cells.state[i] = 0;});
pack.states[state].removed = true;
-
+
+ // remove provinces
+ pack.states[state].provinces.forEach(p => {
+ pack.provinces[p].removed = true;
+ pack.cells.province.forEach((pr, i) => {if(pr === p) pack.cells.province[i] = 0;});
+ });
+
const capital = pack.states[state].capital;
pack.burgs[capital].capital = false;
pack.burgs[capital].state = 0;
moveBurgToGroup(capital, "towns");
-
- if (!layerIsOn("toggleStates")) toggleStates(); else drawStatesWithBorders();
+
+ debug.selectAll(".highlight").remove();
+ if (!layerIsOn("toggleStates")) toggleStates(); else drawStates();
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ if (layerIsOn("toggleProvinces")) drawProvinces();
refreshStatesEditor();
}
+ function toggleLegend() {
+ if (legend.selectAll("*").size()) {clearLegend(); return;}; // hide legend
+ const data = pack.states.filter(s => s.i && !s.removed && s.cells).sort((a, b) => b.area - a.area).map(s => [s.i, s.color, s.name]);
+ drawLegend("States", data);
+ }
+
function togglePercentageMode() {
if (body.dataset.type === "absolute") {
body.dataset.type = "percentage";
@@ -284,75 +387,68 @@ function editStates() {
}
}
- function regenerateNames() {
- body.querySelectorAll(":scope > div").forEach(function(el) {
- const state = +el.dataset.id;
- if (!state) return;
- const culture = pack.states[state].culture;
- const name = Names.getState(Names.getCulture(culture, 4, 7, ""), culture);
- el.querySelector(".stateName").value = name;
- pack.states[state].name = el.dataset.name = name;
- labels.select("#stateLabel"+state+" > textPath").text(name);
- });
- if (adjustLabels.checked) BurgsAndStates.drawStateLabels();
- }
-
function openRegenerationMenu() {
statesBottom.querySelectorAll(":scope > button").forEach(el => el.style.display = "none");
statesRegenerateButtons.style.display = "block";
- statesEditor.querySelectorAll(".hidden").forEach(el => {el.classList.remove("hidden"); el.classList.add("visible");});
- $("#statesEditor").dialog({position: {my: "right top", at: "right top", of: $("#statesEditor").parent(), collision: "fit"}});
+
+ statesEditor.querySelectorAll(".show").forEach(el => el.classList.remove("hidden"));
+ $("#statesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
}
- function recalculateStates() {
+ function recalculateStates(must) {
+ if (!must && !statesAutoChange.checked) return;
+
BurgsAndStates.expandStates();
- if (!layerIsOn("toggleStates")) toggleStates(); else drawStatesWithBorders();
- if (adjustLabels.checked) BurgsAndStates.drawStateLabels();
- refreshStatesEditor();
- }
-
- function justifyStates() {
- BurgsAndStates.normalizeStates();
- if (!layerIsOn("toggleStates")) toggleStates(); else drawStatesWithBorders();
+ BurgsAndStates.generateProvinces();
+ if (!layerIsOn("toggleStates")) toggleStates(); else drawStates();
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ if (layerIsOn("toggleProvinces")) drawProvinces();
if (adjustLabels.checked) BurgsAndStates.drawStateLabels();
refreshStatesEditor();
}
function randomizeStatesExpansion() {
- pack.states.slice(1).forEach(s => {
+ pack.states.forEach(s => {
+ if (!s.i || s.removed) return;
const expansionism = rn(Math.random() * 4 + 1, 1);
s.expansionism = expansionism;
body.querySelector("div.states[data-id='"+s.i+"'] > input.statePower").value = expansionism;
});
- recalculateStates();
+ recalculateStates(true, true);
}
function exitRegenerationMenu() {
statesBottom.querySelectorAll(":scope > button").forEach(el => el.style.display = "inline-block");
statesRegenerateButtons.style.display = "none";
- statesEditor.querySelectorAll(".visible").forEach(el => {el.classList.remove("visible"); el.classList.add("hidden");});
+ statesEditor.querySelectorAll(".show").forEach(el => el.classList.add("hidden"));
+ $("#statesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
}
function enterStatesManualAssignent() {
if (!layerIsOn("toggleStates")) toggleStates();
customization = 2;
- regions.append("g").attr("id", "temp");
+ statesBody.append("g").attr("id", "temp");
document.querySelectorAll("#statesBottom > button").forEach(el => el.style.display = "none");
document.getElementById("statesManuallyButtons").style.display = "inline-block";
document.getElementById("statesHalo").style.display = "none";
+ statesEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
+ statesFooter.style.display = "none";
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
+ $("#statesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
+
tip("Click on state to select, drag the circle to change state", true);
- viewbox.style("cursor", "crosshair").call(d3.drag()
- .on("drag", dragStateBrush))
+ viewbox.style("cursor", "crosshair")
.on("click", selectStateOnMapClick)
+ .call(d3.drag().on("start", dragStateBrush))
.on("touchmove mousemove", moveStateBrush);
- body.querySelectorAll("div > *").forEach(e => e.disabled = true);
body.querySelector("div").classList.add("selected");
}
- function selectStateOnLineClick(i) {
+ function selectStateOnLineClick() {
if (customization !== 2) return;
+ if (this.parentNode.id !== "statesBodySection") return;
body.querySelector("div.selected").classList.remove("selected");
this.classList.add("selected");
}
@@ -362,7 +458,7 @@ function editStates() {
const i = findCell(point[0], point[1]);
if (pack.cells.h[i] < 20) return;
- const assigned = regions.select("#temp").select("polygon[data-cell='"+i+"']");
+ const assigned = statesBody.select("#temp").select("polygon[data-cell='"+i+"']");
const state = assigned.size() ? +assigned.attr("data-state") : pack.cells.state[i];
body.querySelector("div.selected").classList.remove("selected");
@@ -370,18 +466,22 @@ function editStates() {
}
function dragStateBrush() {
- const p = d3.mouse(this);
const r = +statesManuallyBrush.value;
- moveCircle(p[0], p[1], r);
- const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
- const selection = found.filter(isLand);
- if (selection) changeStateForSelection(selection);
+ d3.event.on("drag", () => {
+ if (!d3.event.dx && !d3.event.dy) return;
+ const p = d3.mouse(this);
+ moveCircle(p[0], p[1], r);
+
+ const found = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
+ const selection = found.filter(isLand);
+ if (selection) changeStateForSelection(selection);
+ });
}
// change state within selection
function changeStateForSelection(selection) {
- const temp = regions.select("#temp");
+ const temp = statesBody.select("#temp");
const selected = body.querySelector("div.selected");
const stateNew = +selected.dataset.id;
@@ -407,44 +507,113 @@ function editStates() {
}
function applyStatesManualAssignent() {
- const cells = pack.cells;
- const changed = regions.select("#temp").selectAll("polygon");
- changed.each(function() {
+ const cells = pack.cells, affectedStates = [], affectedProvinces = [];
+
+ statesBody.select("#temp").selectAll("polygon").each(function() {
const i = +this.dataset.cell;
const c = +this.dataset.state;
+ affectedStates.push(cells.state[i], c);
+ affectedProvinces.push(cells.province[i]);
cells.state[i] = c;
if (cells.burg[i]) pack.burgs[cells.burg[i]].state = c;
});
- if (changed.size()) {
+ if (affectedStates.length) {
refreshStatesEditor();
- if (!layerIsOn("toggleStates")) toggleStates(); else drawStatesWithBorders();
- if (adjustLabels.checked) BurgsAndStates.drawStateLabels();
+ if (!layerIsOn("toggleStates")) toggleStates(); else drawStates();
+ if (adjustLabels.checked) BurgsAndStates.drawStateLabels([...new Set(affectedStates)]);
+ adjustProvinces([...new Set(affectedProvinces)]);
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ if (layerIsOn("toggleProvinces")) drawProvinces();
}
exitStatesManualAssignment();
}
+
+ function adjustProvinces(affectedProvinces) {
+ const cells = pack.cells, provinces = pack.provinces, states = pack.states;
+ const form = {"Zone":1, "Area":1, "Territory":2, "Province":1};
+
+ affectedProvinces.forEach(p => {
+ // do nothing if neutral lands are captured
+ if (!p) return;
+
+ // remove province from state provinces list
+ const old = provinces[p].state;
+ if (states[old].provinces.includes(p)) states[old].provinces.splice(states[old].provinces.indexOf(p), 1);
+
+ // find states owning at least 1 province cell
+ const provCells = cells.i.filter(i => cells.province[i] === p);
+ const provStates = [...new Set(provCells.map(i => cells.state[i]))];
+
+ // assign province its center owner; if center is neutral, remove province
+ const owner = cells.state[provinces[p].center];
+ if (owner) {
+ const name = provinces[p].name;
+
+ // if province is historical part of abouther state province, unite with old province
+ const part = states[owner].provinces.find(n => name.includes(provinces[n].name));
+ if (part) {
+ provinces[p].removed = true;
+ provCells.filter(i => cells.state[i] === owner).forEach(i => cells.province[i] = part);
+ } else {
+ provinces[p].state = owner;
+ states[owner].provinces.push(p);
+ provinces[p].color = getMixedColor(states[owner].color);
+ }
+ } else {
+ provinces[p].removed = true;
+ provCells.filter(i => !cells.state[i]).forEach(i => cells.province[i] = 0);
+ }
+
+ // create new provinces for non-main part
+ provStates.filter(s => s && s !== owner).forEach(s => createProvince(p, s, provCells.filter(i => cells.state[i] === s)));
+ });
+
+ function createProvince(initProv, state, provCells) {
+ const province = provinces.length;
+ provCells.forEach(i => cells.province[i] = province);
+
+ const burgCell = provCells.find(i => cells.burg[i]);
+ const center = burgCell ? burgCell : provCells[0];
+ const burg = burgCell ? cells.burg[burgCell] : 0;
+
+ const name = burgCell && Math.random() < .7
+ ? getAdjective(pack.burgs[burg].name)
+ : getAdjective(states[state].name) + " " + provinces[initProv].name.split(" ").slice(-1)[0];
+ const formName = name.split(" ").length > 1 ? provinces[initProv].formName : rw(form);
+ const fullName = name + " " + formName;
+ const color = getMixedColor(states[state].color);
+ provinces.push({i:province, state, center, burg, name, formName, fullName, color});
+ }
+
+ }
- function exitStatesManualAssignment() {
+ function exitStatesManualAssignment(close) {
customization = 0;
- regions.select("#temp").remove();
+ statesBody.select("#temp").remove();
removeCircle();
document.querySelectorAll("#statesBottom > button").forEach(el => el.style.display = "inline-block");
document.getElementById("statesManuallyButtons").style.display = "none";
document.getElementById("statesHalo").style.display = "block";
- body.querySelectorAll("div > *").forEach(e => e.disabled = false);
+
+ statesEditor.querySelectorAll(".hide:not(.show)").forEach(el => el.classList.remove("hidden"));
+ statesFooter.style.display = "block";
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
+ if(!close) $("#statesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
+
restoreDefaultEvents();
clearMainTip();
const selected = body.querySelector("div.selected");
if (selected) selected.classList.remove("selected");
}
-
+
function enterAddStateMode() {
if (this.classList.contains("pressed")) {exitAddStateMode(); return;};
customization = 3;
this.classList.add("pressed");
tip("Click on the map to create a new capital or promote an existing burg", true);
viewbox.style("cursor", "crosshair").on("click", addState);
- body.querySelectorAll("div > *").forEach(e => e.disabled = true);
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
}
function addState() {
@@ -460,35 +629,47 @@ function editStates() {
pack.burgs[burg].state = pack.states.length;
moveBurgToGroup(burg, "cities");
- exitAddStateMode();
+ if (d3.event.shiftKey === false) exitAddStateMode();
+
+ const i = pack.states.length;
const culture = pack.cells.culture[center];
const basename = center%5 === 0 ? pack.burgs[burg].name : Names.getCulture(culture);
const name = Names.getState(basename, culture);
const color = d3.color(d3.scaleSequential(d3.interpolateRainbow)(Math.random())).hex();
+ const diplomacy = pack.states.map(s => s.i ? "Neutral" : "x")
+ diplomacy.push("x");
+ pack.states.forEach(s => {if (s.i) {s.diplomacy.push("Neutral");}});
+ const provinces = [];
+
+ const affected = [pack.states.length, pack.cells.state[center]];
pack.cells.state[center] = pack.states.length;
pack.cells.c[center].forEach(c => {
if (pack.cells.h[c] < 20) return;
if (pack.cells.burg[c]) return;
+ affected.push(pack.cells.state[c]);
pack.cells.state[c] = pack.states.length;
});
- pack.states.push({i:pack.states.length, name, color, expansionism:.5, capital:burg, type:"Generic", center, culture});
+ pack.states.push({i, name, diplomacy, provinces, color, expansionism:.5, capital:burg, type:"Generic", center, culture});
+ BurgsAndStates.collectStatistics();
+ BurgsAndStates.defineStateForms([i]);
- if (!layerIsOn("toggleStates")) toggleStates(); else drawStatesWithBorders();
- if (adjustLabels.checked) BurgsAndStates.drawStateLabels();
- refreshStatesEditor();
+ if (!layerIsOn("toggleStates")) toggleStates(); else drawStates();
+ if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+ BurgsAndStates.drawStateLabels(affected);
+ statesEditorAddLines();
}
function exitAddStateMode() {
customization = 0;
restoreDefaultEvents();
clearMainTip();
- body.querySelectorAll("div > *").forEach(e => e.disabled = false);
+ body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
if (statesAdd.classList.contains("pressed")) statesAdd.classList.remove("pressed");
}
function downloadStatesData() {
- const unit = areaUnit.value === "square" ? distanceUnit.value + "2" : areaUnit.value;
+ const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
let data = "Id,State,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area "+unit+",Population\n"; // headers
body.querySelectorAll(":scope > div").forEach(function(el) {
@@ -512,11 +693,12 @@ function editStates() {
link.download = "states_data" + Date.now() + ".csv";
link.href = url;
link.click();
- window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
+ window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
}
function closeStatesEditor() {
- if (customization === 2) exitStatesManualAssignment();
+ if (customization === 2) exitStatesManualAssignment("close");
if (customization === 3) exitAddStateMode();
+ debug.selectAll(".highlight").remove();
}
}
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index b9b8cde4..0684113e 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -10,19 +10,37 @@ toolsContent.addEventListener("click", function(event) {
if (button === "editHeightmapButton") editHeightmap(); else
if (button === "editBiomesButton") editBiomes(); else
if (button === "editStatesButton") editStates(); else
+ if (button === "editProvincesButton") editProvinces(); else
+ if (button === "editDiplomacyButton") editDiplomacy(); else
if (button === "editCulturesButton") editCultures(); else
+ if (button === "editReligions") editReligions(); else
if (button === "editNamesBaseButton") editNamesbase(); else
if (button === "editBurgsButton") editBurgs(); else
- if (button === "editUnitsButton") editUnits();
+ if (button === "editUnitsButton") editUnits(); else
+ if (button === "editNotesButton") editNotes(); else
+ if (button === "editZonesButton") editZones();
// Click to Regenerate buttons
- if (button === "regenerateStateLabels") {BurgsAndStates.drawStateLabels(); if (!layerIsOn("toggleLabels")) toggleLabels();} else
- if (button === "regenerateReliefIcons") {ReliefIcons(); if (!layerIsOn("toggleRelief")) toggleRelief();} else
- if (button === "regenerateRoutes") {Routes.regenerate(); if (!layerIsOn("toggleRoutes")) toggleRoutes();} else
- if (button === "regenerateRivers") regenerateRivers(); else
- if (button === "regeneratePopulation") recalculatePopulation(); else
- if (button === "regenerateBurgs") regenerateBurgs(); else
- if (button === "regenerateStates") regenerateStates();
+ if (event.target.parentNode.id === "regenerateFeature") {
+ if (sessionStorage.getItem("regenerateFeatureDontAsk")) {processFeatureRegeneration(button); return;}
+
+ alertMessage.innerHTML = `Regeneration will remove all the custom changes for the element.${s.cells}
-
- ${s.burgs}
-
- ${si(area) + unit}
-
- ${si(population)}
-
+
+
+
+
+
+
+
+
+
+
+
+ ${s.cells}
+
+ ${s.burgs}
+
+ ${si(area) + unit}
+
+ ${si(population)}
+
+
Are you sure you want to proceed?` + $("#alert").dialog({resizable: false, title: "Regenerate element", + buttons: { + Proceed: function() {processFeatureRegeneration(button); $(this).dialog("close");}, + Cancel: function() {$(this).dialog("close");} + }, + create: function() { + const pane = $(this).dialog("widget").find(".ui-dialog-buttonpane"); + $('').prependTo(pane); + }, + close: function() { + const box = $(this).dialog("widget").find(".checkbox")[0]; + if (!box) return; + if (box.checked) sessionStorage.setItem("regenerateFeatureDontAsk", true); + } + }); + } // Click to Add buttons if (button === "addLabel") toggleAddLabel(); else @@ -32,6 +50,18 @@ toolsContent.addEventListener("click", function(event) { if (button === "addMarker") toggleAddMarker(); }); +function processFeatureRegeneration(button) { + if (button === "regenerateStateLabels") {BurgsAndStates.drawStateLabels(); if (!layerIsOn("toggleLabels")) toggleLabels();} else + if (button === "regenerateReliefIcons") {ReliefIcons(); if (!layerIsOn("toggleRelief")) toggleRelief();} else + if (button === "regenerateRoutes") {Routes.regenerate(); if (!layerIsOn("toggleRoutes")) toggleRoutes();} else + if (button === "regenerateRivers") regenerateRivers(); else + if (button === "regeneratePopulation") recalculatePopulation(); else + if (button === "regenerateBurgs") regenerateBurgs(); else + if (button === "regenerateStates") regenerateStates(); else + if (button === "regenerateProvinces") regenerateProvinces(); else + if (button === "regenerateReligions") regenerateReligions(); +} + function regenerateRivers() { const heights = new Uint8Array(pack.cells.h); Rivers.generate(); @@ -45,9 +75,10 @@ function recalculatePopulation() { if (!b.i || b.removed) return; const i = b.cell; - b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i]) / 3 + b.i / 1000 + i % 100 / 1000, .1), 3); - if (b.capital) b.population = rn(b.population * 1.3, 3); // increase capital population - if (b.port) b.population = rn(b.population * 1.3, 3); // increase port population + b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i]) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3); + if (b.capital) b.population = b.population * 1.3; // increase capital population + if (b.port) b.population = b.population * 1.3; // increase port population + b.population = rn(b.population * gauss(2,3,.6,20,3), 3); }); } @@ -62,14 +93,14 @@ function regenerateBurgs() { const score = new Int16Array(cells.s.map(s => s * Math.random())); // cell score for capitals placement const sorted = cells.i.filter(i => score[i] > 0 && cells.culture[i]).sort((a, b) => score[b] - score[a]); // filtered and sorted array of indexes const burgsCount = manorsInput.value == 1000 ? rn(sorted.length / 10 / densityInput.value ** .8) + states.length : +manorsInput.value + states.length; - const spacing = (graphWidth + graphHeight) * 9 / burgsCount; // base min distance between towns + const spacing = (graphWidth + graphHeight) / 200 / (burgsCount / 500); // base min distance between towns for (let i=0; i < sorted.length && burgs.length < burgsCount; i++) { const id = burgs.length; const cell = sorted[i]; const x = cells.p[cell][0], y = cells.p[cell][1]; - const s = spacing * Math.random() + 0.5; // randomize to make the placement not uniform + const s = spacing * gauss(1, .3, .2, 2, 2); // randomize to make the placement not uniform if (burgsTree.find(x, y, s) !== undefined) continue; // to close to existing burg const state = cells.state[cell]; @@ -96,28 +127,29 @@ function regenerateBurgs() { BurgsAndStates.drawBurgs(); Routes.regenerate(); - document.getElementById("statesBodySection").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsBody").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsFilterState").options.length = 0; - document.getElementById("burgsFilterCulture").options.length = 0; + if (document.getElementById("burgsEditorRefresh").offsetParent) burgsEditorRefresh.click(); + if (document.getElementById("statesEditorRefresh").offsetParent) statesEditorRefresh.click(); } function regenerateStates() { + Math.seedrandom(Math.floor(Math.random() * 1e9)); // new random seed const burgs = pack.burgs.filter(b => b.i && !b.removed), states = pack.states.filter(s => s.i && !s.removed); + // burgs sorted by a bit randomized population: + const sorted = burgs.map(b => [b.i, b.population * Math.random()]).sort((a, b) => b[1] - a[1]).map(b => b[0]); const capitalsTree = d3.quadtree(); let spacing = (graphWidth + graphHeight) / 2 / states.length; // min distance between capitals // turn all old capitals into towns - states.forEach(s => { - moveBurgToGroup(s.capital, "towns"); - s.capital = 0; + burgs.filter(b => b.capital).forEach(b => { + moveBurgToGroup(b.i, "towns"); + b.capital = false; }); states.forEach(s => { let newCapital = 0, x = 0, y = 0; - while (!newCapital) { - newCapital = burgs[biased(1, burgs.length-1, 3)]; + for (let i=0; i < sorted.length && !newCapital; i++) { + newCapital = burgs[sorted[i]]; x = newCapital.x, y = newCapital.y; if (capitalsTree.find(x, y, spacing) !== undefined) { spacing -= 1; @@ -127,23 +159,44 @@ function regenerateStates() { } capitalsTree.add([x, y]); + newCapital.capital = true; s.capital = newCapital.i; s.center = newCapital.cell; s.culture = newCapital.culture; - s.expansionism = rn(Math.random() * powerInput.value / 2 + 1, 1); + s.expansionism = rn(Math.random() * powerInput.value + 1, 1); const basename = newCapital.name.length < 9 && newCapital.cell%5 === 0 ? newCapital.name : Names.getCulture(s.culture, 3, 6, "", 0); s.name = Names.getState(basename, s.culture); + const nomadic = [1, 2, 3, 4].includes(pack.cells.biome[newCapital.cell]); + s.type = nomadic ? "Nomadic" : pack.cultures[s.culture].type === "Nomadic" ? "Generic" : pack.cultures[s.culture].type; moveBurgToGroup(newCapital.i, "cities"); - - document.getElementById("statesBodySection").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsBody").innerHTML = "Please refresh the editor!"; - document.getElementById("burgsFilterState").options.length = 0; - document.getElementById("burgsFilterCulture").options.length = 0; }); + unfog(); BurgsAndStates.expandStates(); - if (!layerIsOn("toggleStates")) toggleStates(); else drawStatesWithBorders(); + BurgsAndStates.normalizeStates(); + BurgsAndStates.collectStatistics(); + BurgsAndStates.assignColors(); + BurgsAndStates.generateDiplomacy(); + BurgsAndStates.defineStateForms(); + BurgsAndStates.generateProvinces(true); + if (!layerIsOn("toggleStates")) toggleStates(); else drawStates(); + if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders(); BurgsAndStates.drawStateLabels(); + + if (document.getElementById("burgsEditorRefresh").offsetParent) burgsEditorRefresh.click(); + if (document.getElementById("statesEditorRefresh").offsetParent) statesEditorRefresh.click(); +} + +function regenerateProvinces() { + unfog(); + BurgsAndStates.generateProvinces(true); + drawBorders(); + if (layerIsOn("toggleProvinces")) drawProvinces(); +} + +function regenerateReligions() { + Religions.generate(); + if (!layerIsOn("toggleReligions")) toggleReligions(); else drawReligions(); } function unpressClickToAddButton() { @@ -179,12 +232,18 @@ function addLabelOnClick() { .attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC") .attr("font-size", 18).attr("data-size", 18).attr("filter", null); - group.append("text").attr("id", id) - .append("textPath").attr("xlink:href", "#textPath_"+id).text(name) - .attr("startOffset", "50%").attr("font-size", "100%"); + const example = group.append("text").attr("x", 0).attr("x", 0).text(name); + const width = example.node().getBBox().width; + const x = width / -2; // x offset; + example.remove(); - defs.select("#textPaths").append("path").attr("id", "textPath_"+id) - .attr("d", `M${point[0]-60},${point[1]} h${120}`); + group.append("text").attr("id", id) + .append("textPath").attr("xlink:href", "#textPath_"+id).attr("startOffset", "50%").attr("font-size", "100%") + .append("tspan").attr("x", x).text(name); + + defs.select("#textPaths") + .append("path").attr("id", "textPath_"+id) + .attr("d", `M${point[0]-width},${point[1]} h${width*2}`); if (d3.event.shiftKey === false) unpressClickToAddButton(); } diff --git a/modules/ui/units-editor.js b/modules/ui/units-editor.js index 63961327..ae848a57 100644 --- a/modules/ui/units-editor.js +++ b/modules/ui/units-editor.js @@ -12,31 +12,34 @@ function editUnits() { }); // add listeners - document.getElementById("distanceUnit").addEventListener("change", changeDistanceUnit); - document.getElementById("distanceScaleSlider").addEventListener("input", changeDistanceScale); - document.getElementById("distanceScale").addEventListener("change", changeDistanceScale); - document.getElementById("distanceScale").addEventListener("mouseenter", hideDistanceUnitOutput); - document.getElementById("distanceScale").addEventListener("mouseleave", showDistanceUnitOutput); + document.getElementById("distanceUnitInput").addEventListener("change", changeDistanceUnit); + document.getElementById("distanceScaleOutput").addEventListener("input", changeDistanceScale); + document.getElementById("distanceScaleInput").addEventListener("change", changeDistanceScale); + document.getElementById("distanceScaleInput").addEventListener("mouseenter", hideDistanceUnitOutput); + document.getElementById("distanceScaleInput").addEventListener("mouseleave", showDistanceUnitOutput); + document.getElementById("areaUnit").addEventListener("change", () => lock("areaUnit")); document.getElementById("heightUnit").addEventListener("change", changeHeightUnit); - document.getElementById("heightExponent").addEventListener("input", changeHeightExponent); - document.getElementById("heightExponentSlider").addEventListener("input", changeHeightExponent); - document.getElementById("temperatureScale").addEventListener("change", () => {if (layerIsOn("toggleTemp")) drawTemp()}); - document.getElementById("barSizeSlider").addEventListener("input", changeScaleBarSize); + document.getElementById("heightExponentInput").addEventListener("input", changeHeightExponent); + document.getElementById("heightExponentOutput").addEventListener("input", changeHeightExponent); + document.getElementById("temperatureScale").addEventListener("change", changeTemperatureScale); + document.getElementById("barSizeOutput").addEventListener("input", changeScaleBarSize); document.getElementById("barSize").addEventListener("input", changeScaleBarSize); - document.getElementById("barLabel").addEventListener("input", drawScaleBar); - document.getElementById("barPosX").addEventListener("input", fitScaleBar); - document.getElementById("barPosY").addEventListener("input", fitScaleBar); - document.getElementById("barBackOpacity").addEventListener("input", function() {scaleBar.select("rect").attr("opacity", this.value)}); - document.getElementById("barBackColor").addEventListener("input", function() {scaleBar.select("rect").attr("fill", this.value)}); - document.getElementById("populationRateSlider").addEventListener("input", changePopulationRate); + document.getElementById("barLabel").addEventListener("input", changeScaleBarLabel); + document.getElementById("barPosX").addEventListener("input", changeScaleBarPosition); + document.getElementById("barPosY").addEventListener("input", changeScaleBarPosition); + document.getElementById("barBackOpacity").addEventListener("input", changeScaleBarOpacity); + document.getElementById("barBackColor").addEventListener("input", changeScaleBarColor); + + document.getElementById("populationRateOutput").addEventListener("input", changePopulationRate); document.getElementById("populationRate").addEventListener("change", changePopulationRate); - document.getElementById("urbanizationSlider").addEventListener("input", changeUrbanizationRate); + document.getElementById("urbanizationOutput").addEventListener("input", changeUrbanizationRate); document.getElementById("urbanization").addEventListener("change", changeUrbanizationRate); document.getElementById("addLinearRuler").addEventListener("click", addAdditionalRuler); document.getElementById("addOpisometer").addEventListener("click", toggleOpisometerMode); document.getElementById("addPlanimeter").addEventListener("click", togglePlanimeterMode); document.getElementById("removeRulers").addEventListener("click", removeAllRulers); + document.getElementById("unitsRestore").addEventListener("click", restoreDefaultUnits); function changeDistanceUnit() { if (this.value === "custom_name") { @@ -46,6 +49,7 @@ function editUnits() { } document.getElementById("distanceUnitOutput").innerHTML = this.value; + lock("distanceUnit"); drawScaleBar(); calculateFriendlyGridSize(); } @@ -54,13 +58,15 @@ function editUnits() { const scale = +this.value; if (!scale || isNaN(scale) || scale < 0) { tip("Distance scale should be a positive number", false, "error"); - this.value = document.getElementById("distanceScale").dataset.value; + this.value = document.getElementById("distanceScaleInput").dataset.value; return; } - document.getElementById("distanceScaleSlider").value = scale; - document.getElementById("distanceScale").value = scale; - document.getElementById("distanceScale").dataset.value = scale; + document.getElementById("distanceScaleOutput").value = scale; + document.getElementById("distanceScaleInput").value = scale; + document.getElementById("distanceScaleInput").dataset.value = scale; + lock("distanceScale"); + drawScaleBar(); calculateFriendlyGridSize(); } @@ -69,23 +75,54 @@ function editUnits() { function showDistanceUnitOutput() {document.getElementById("distanceUnitOutput").style.opacity = 1;} function changeHeightUnit() { - if (this.value !== "custom_name") return; - const custom = prompt("Provide a custom name for height unit"); - if (custom) this.options.add(new Option(custom, custom, false, true)); - else this.value = "ft"; + if (this.value === "custom_name") { + const custom = prompt("Provide a custom name for height unit"); + if (custom) this.options.add(new Option(custom, custom, false, true)); + else this.value = "ft"; + } + + lock("heightUnit"); } function changeHeightExponent() { - document.getElementById("heightExponent").value = this.value; - document.getElementById("heightExponentSlider").value = this.value; + document.getElementById("heightExponentInput").value = this.value; + document.getElementById("heightExponentOutput").value = this.value; calculateTemperatures(); if (layerIsOn("toggleTemp")) drawTemp(); + lock("heightExponent"); + } + + function changeTemperatureScale() { + lock("temperatureScale"); + if (layerIsOn("toggleTemp")) drawTemp(); } function changeScaleBarSize() { document.getElementById("barSize").value = this.value; - document.getElementById("barSizeSlider").value = this.value; + document.getElementById("barSizeOutput").value = this.value; drawScaleBar(); + lock("barSize"); + } + + function changeScaleBarPosition() { + lock("barPosX"); + lock("barPosY"); + fitScaleBar(); + } + + function changeScaleBarLabel() { + lock("barLabel"); + drawScaleBar(); + } + + function changeScaleBarOpacity() { + scaleBar.select("rect").attr("opacity", this.value); + lock("barBackOpacity"); + } + + function changeScaleBarColor() { + scaleBar.select("rect").attr("fill", this.value); + lock("barBackColor"); } function changePopulationRate() { @@ -96,9 +133,10 @@ function editUnits() { return; } - document.getElementById("populationRateSlider").value = rate; + document.getElementById("populationRateOutput").value = rate; document.getElementById("populationRate").value = rate; document.getElementById("populationRate").dataset.value = rate; + lock("populationRate"); } function changeUrbanizationRate() { @@ -109,15 +147,67 @@ function editUnits() { return; } - document.getElementById("urbanizationSlider").value = rate; + document.getElementById("urbanizationOutput").value = rate; document.getElementById("urbanization").value = rate; document.getElementById("urbanization").dataset.value = rate; + lock("urbanization"); + } + + function restoreDefaultUnits() { + // distanceScale + document.getElementById("distanceScaleOutput").value = 3; + document.getElementById("distanceScaleInput").value = 3; + document.getElementById("distanceScaleInput").dataset.value = 3; + unlock("distanceScale"); + + // units + const US = navigator.language === "en-US"; + const UK = navigator.language === "en-GB"; + distanceUnitInput.value = distanceUnitOutput.value = US || UK ? "mi" : "km"; + heightUnit.value = US || UK ? "ft" : "m"; + temperatureScale.value = US ? "°F" : "°C"; + areaUnit.value = "square"; + localStorage.removeItem("distanceUnit"); + localStorage.removeItem("heightUnit"); + localStorage.removeItem("temperatureScale"); + localStorage.removeItem("areaUnit"); + calculateFriendlyGridSize(); + + // height exponent + heightExponentInput.value = heightExponentOutput.value = 1.8; + localStorage.removeItem("heightExponent"); + calculateTemperatures(); + + // scale bar + barSizeOutput.value = barSize.value = 2; + barLabel.value = ""; + barBackOpacity.value = .2; + barBackColor.value = "#ffffff"; + barPosX.value = barPosY.value = 99; + + localStorage.removeItem("barSize"); + localStorage.removeItem("barLabel"); + localStorage.removeItem("barBackOpacity"); + localStorage.removeItem("barBackColor"); + localStorage.removeItem("barPosX"); + localStorage.removeItem("barPosY"); + drawScaleBar(); + + // population + populationRateOutput.value = populationRate.value = 1000; + urbanizationOutput.value = urbanization.value = 1000; + localStorage.removeItem("populationRate"); + localStorage.removeItem("urbanization"); } function addAdditionalRuler() { if (!layerIsOn("toggleRulers")) toggleRulers(); - const y = rn(Math.random() * graphHeight * .5 + graphHeight * .25); - addRuler(graphWidth * .2, y, graphWidth * .8, y); + const x = graphWidth/2, y = graphHeight/2; + const pt = document.getElementById('map').createSVGPoint(); + pt.x = x, pt.y = y; + const p = pt.matrixTransform(viewbox.node().getScreenCTM().inverse()); + const dx = rn(graphWidth / 4 / scale), dy = rand(dx / 2, dx * 2) - rand(dx / 2, dx * 2); + addRuler(p.x - dx, p.y + dy, p.x + dx, p.y + dy); } function toggleOpisometerMode() { diff --git a/modules/ui/world-configurator.js b/modules/ui/world-configurator.js index d9195b56..86f7446b 100644 --- a/modules/ui/world-configurator.js +++ b/modules/ui/world-configurator.js @@ -1,6 +1,21 @@ function editWorld() { if (customization) return; - $("#worldConfigurator").dialog({title: "Configure World", width: 440}); + $("#worldConfigurator").dialog({title: "Configure World", resizable: false, width: 460, + buttons: { + "Whole World": () => applyPreset(100, 50), + "Northern": () => applyPreset(33, 25), + "Tropical": () => applyPreset(33, 50), + "Southern": () => applyPreset(33, 75), + "Restore Winds": restoreDefaultWinds + }, open: function() { + const buttons = $(this).dialog("widget").find(".ui-dialog-buttonset > button") + buttons[0].addEventListener("mousemove", () => tip("Click to set map size to cover the whole World")); + buttons[1].addEventListener("mousemove", () => tip("Click to set map size to cover the Northern latitudes")); + buttons[2].addEventListener("mousemove", () => tip("Click to set map size to cover the Tropical latitudes")); + buttons[3].addEventListener("mousemove", () => tip("Click to set map size to cover the Southern latitudes")); + buttons[4].addEventListener("mousemove", () => tip("Click to restore default wind directions")); + }, + }); const globe = d3.select("#globe"); const clr = d3.scaleSequential(d3.interpolateSpectral); @@ -16,7 +31,6 @@ function editWorld() { document.getElementById("worldControls").addEventListener("input", (e) => updateWorld(e.target)); globe.select("#globeWindArrows").on("click", changeWind); - globe.select("#restoreWind").on("click", restoreDefaultWinds); globe.select("#globeGraticule").attr("d", round(path(d3.geoGraticule()()))); // globe graticule updateWindDirections(); @@ -44,30 +58,26 @@ function editWorld() { } function updateGlobePosition() { - const eqY = +document.getElementById("equatorOutput").value; - const equidistance = document.getElementById("equidistanceOutput"); - equidistance.min = equidistanceInput.min = Math.max(graphHeight - eqY, eqY); - equidistance.max = equidistanceInput.max = equidistance.min * 10; - const eqD = +equidistance.value; + const size = +document.getElementById("mapSizeOutput").value; + const eqD = graphHeight / 2 * 100 / size; + calculateMapCoordinates(); const mc = mapCoordinates; // shortcut - - const scale = +distanceScale.value, unit = distanceUnit.value; + const scale = +distanceScaleInput.value, unit = distanceUnitInput.value; + const meridian = toKilometer(eqD * 2 * scale); document.getElementById("mapSize").innerHTML = `${graphWidth}x${graphHeight}`; document.getElementById("mapSizeFriendly").innerHTML = `${rn(graphWidth * scale)}x${rn(graphHeight * scale)} ${unit}`; document.getElementById("meridianLength").innerHTML = rn(eqD * 2); document.getElementById("meridianLengthFriendly").innerHTML = `${rn(eqD * 2 * scale)} ${unit}`; - document.getElementById("meridianLengthEarth").innerHTML = toKilometer(eqD * 2 * scale); + document.getElementById("meridianLengthEarth").innerHTML = meridian ? " = " + rn(meridian / 200) + "%🌏" : ""; document.getElementById("mapCoordinates").innerHTML = `${lat(mc.latN)} ${Math.abs(rn(mc.lonW))}°W; ${lat(mc.latS)} ${rn(mc.lonE)}°E`; function toKilometer(v) { - let kilometers; // value converted to kilometers - if (unit === "km") kilometers = v; - else if (unit === "mi") kilometers = v * 1.60934; - else if (unit === "lg") kilometers = v * 5.556; - else if (unit === "vr") kilometers = v * 1.0668; - else return ""; // do not show as distanceUnit is custom - return " = " + rn(kilometers / 200) + "%🌏"; // % + Earth icon + if (unit === "km") return v; + else if (unit === "mi") return v * 1.60934; + else if (unit === "lg") return v * 5.556; + else if (unit === "vr") return v * 1.0668; + return 0; // 0 if distanceUnitInput is a custom unit } function lat(lat) {return lat > 0 ? Math.abs(rn(lat)) + "°N" : Math.abs(rn(lat)) + "°S";} // parse latitude value @@ -75,7 +85,7 @@ function editWorld() { globe.select("#globeArea").attr("d", round(path(area.outline()))); // map area } - function updateGlobeTemperature() { + function updateGlobeTemperature() { const tEq = +document.getElementById("temperatureEquatorOutput").value; document.getElementById("temperatureEquatorF").innerHTML = rn(tEq * 9/5 + 32); const tPole = +document.getElementById("temperaturePoleOutput").value; @@ -113,4 +123,11 @@ function editWorld() { if (update) updateWorld(); } + function applyPreset(size, lat) { + document.getElementById("mapSizeInput").value = document.getElementById("mapSizeOutput").value = size; + document.getElementById("latitudeInput").value = document.getElementById("latitudeOutput").value = lat; + lock("mapSize"); + lock("latitude"); + updateWorld(); + } } \ No newline at end of file diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js new file mode 100644 index 00000000..97a396f5 --- /dev/null +++ b/modules/ui/zones-editor.js @@ -0,0 +1,364 @@ +"use strict"; +function editZones() { + closeDialogs(); + if (!layerIsOn("toggleZones")) toggleZones(); + const body = document.getElementById("zonesBodySection"); + zonesEditorAddLines(); + + if (modules.editZones) return; + modules.editZones = true; + + $("#zonesEditor").dialog({ + title: "Zones Editor", resizable: false, width: fitContent(), close: () => exitZonesManualAssignment("close"), + position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"} + }); + + // add listeners + document.getElementById("zonesLegend").addEventListener("click", toggleLegend); + document.getElementById("zonesPercentage").addEventListener("click", togglePercentageMode); + document.getElementById("zonesManually").addEventListener("click", enterZonesManualAssignent); + document.getElementById("zonesManuallyApply").addEventListener("click", applyZonesManualAssignent); + document.getElementById("zonesManuallyCancel").addEventListener("click", cancelZonesManualAssignent); + document.getElementById("zonesAdd").addEventListener("click", addZonesLayer); + document.getElementById("zonesExport").addEventListener("click", downloadZonesData); + document.getElementById("zonesRemove").addEventListener("click", toggleEraseMode); + + body.addEventListener("click", function(ev) { + const el = ev.target, cl = el.classList, zone = el.parentNode.dataset.id; + if (cl.contains("icon-trash-empty")) {zoneRemove(zone); return;} + if (cl.contains("icon-eye")) {toggleVisibility(el); return;} + if (cl.contains("icon-pin")) {focusOnZone(zone, cl); return;} + if (cl.contains("zoneFill")) {changeFill(el); return;} + if (customization) selectZone(el); + }); + + body.addEventListener("input", function(ev) { + const el = ev.target, zone = el.parentNode.dataset.id; + if (el.classList.contains("religionName")) zones.select("#"+zone).attr("data-description", el.value); + }); + + // add line for each zone + function zonesEditorAddLines() { + const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value; + let lines = ""; + + zones.selectAll("g").each(function() { + const c = this.dataset.cells ? this.dataset.cells.split(",").map(c => +c) : []; + const description = this.dataset.description; + const fill = this.getAttribute("fill"); + const area = d3.sum(c.map(i => pack.cells.area[i])) * (distanceScaleInput.value ** 2); + const rural = d3.sum(c.map(i => pack.cells.pop[i])) * populationRate.value; + const urban = d3.sum(c.map(i => pack.cells.burg[i]).map(b => pack.burgs[b].population)) * populationRate.value * urbanization.value; + const population = rural + urban; + const populationTip = `Total population: ${si(population)}; Rural population: ${si(rural)}; Urban population: ${si(urban)}`; + const inactive = this.style.display === "none"; + const focused = defs.select("#fog #focus"+this.id).size(); + + lines += `
+
+
+
+
`;
+ });
+
+ body.innerHTML = lines;
+
+ // update footer
+ const totalArea = zonesFooterArea.dataset.area = graphWidth * graphHeight * (distanceScaleInput.value ** 2);
+ const totalPop = (d3.sum(pack.cells.pop) + d3.sum(pack.burgs.filter(b => !b.removed).map(b => b.population)) * urbanization.value) * populationRate.value;
+ zonesFooterPopulation.dataset.population = totalPop;
+ zonesFooterNumber.innerHTML = zones.selectAll("g").size();
+ zonesFooterCells.innerHTML = pack.cells.i.length;
+ zonesFooterArea.innerHTML = si(totalArea) + unit;
+ zonesFooterPopulation.innerHTML = si(totalPop);
+
+ // add listeners
+ body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseenter", ev => zoneHighlightOn(ev)));
+ body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseleave", ev => zoneHighlightOff(ev)));
+
+ if (body.dataset.type === "percentage") {body.dataset.type = "absolute"; togglePercentageMode();}
+ $("#zonesEditor").dialog();
+ }
+
+ function zoneHighlightOn(event) {
+ const zone = event.target.dataset.id;
+ zones.select("#"+zone).style("outline", "1px solid red");
+ }
+
+ function zoneHighlightOff(event) {
+ const zone = event.target.dataset.id;
+ zones.select("#"+zone).style("outline", null);
+ }
+
+ $(body).sortable({items: "div.states", handle: ".icon-resize-vertical", containment: "parent", axis: "y", update: movezone});
+ function movezone(ev, ui) {
+ const zone = $("#"+ui.item.attr("data-id"));
+ const prev = $("#"+ui.item.prev().attr("data-id"));
+ if (prev) {zone.insertAfter(prev); return;}
+ const next = $("#"+ui.item.next().attr("data-id"));
+ if (next) zone.insertBefore(next);
+ }
+
+ function enterZonesManualAssignent() {
+ if (!layerIsOn("toggleZones")) toggleZones();
+ customization = 10;
+ document.querySelectorAll("#zonesBottom > button").forEach(el => el.style.display = "none");
+ document.getElementById("zonesManuallyButtons").style.display = "inline-block";
+
+ zonesEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
+ zonesFooter.style.display = "none";
+ body.querySelectorAll("div > input, select, svg").forEach(e => e.style.pointerEvents = "none");
+ $("#zonesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
+
+ tip("Click to select a zone, drag to paint a zone", true);
+ viewbox.style("cursor", "crosshair")
+ .on("click", selectZoneOnMapClick)
+ .call(d3.drag().on("start", dragZoneBrush))
+ .on("touchmove mousemove", moveZoneBrush);
+
+ body.querySelector("div").classList.add("selected");
+ zones.selectAll("g").each(function() {this.setAttribute("data-init", this.getAttribute("data-cells"));});
+ }
+
+ function selectZone(el) {
+ body.querySelector("div.selected").classList.remove("selected");
+ el.classList.add("selected");
+ }
+
+ function selectZoneOnMapClick() {
+ if (d3.event.target.parentElement.parentElement.id !== "zones") return;
+ const zone = d3.event.target.parentElement.id;
+ const el = body.querySelector("div[data-id='" + zone + "']");
+ selectZone(el);
+ }
+
+ function dragZoneBrush() {
+ const r = +zonesBrush.value;
+
+ d3.event.on("drag", () => {
+ if (!d3.event.dx && !d3.event.dy) return;
+ const p = d3.mouse(this);
+ moveCircle(p[0], p[1], r);
+
+ const selection = r > 5 ? findAll(p[0], p[1], r) : [findCell(p[0], p[1], r)];
+ if (!selection) return;
+
+ const selected = body.querySelector("div.selected");
+ const zone = zones.select("#"+selected.dataset.id);
+ const base = zone.attr("id") + "_"; // id generic part
+ const dataCells = zone.attr("data-cells");
+ let cells = dataCells ? dataCells.split(",").map(i => +i) : [];
+
+ const erase = document.getElementById("zonesRemove").classList.contains("pressed");
+ if (erase) {
+ // remove
+ selection.forEach(i => {
+ const index = cells.indexOf(i);
+ if (index === -1) return;
+ zone.select("polygon#" + base + i).remove();
+ cells.splice(index, 1);
+ });
+ } else {
+ // add
+ selection.forEach(i => {
+ if (cells.includes(i)) return;
+ cells.push(i);
+ zone.append("polygon").attr("points", getPackPolygon(i)).attr("id", base + i);
+ });
+ }
+
+ zone.attr("data-cells", cells);
+ });
+ }
+
+ function moveZoneBrush() {
+ showMainTip();
+ const point = d3.mouse(this);
+ const radius = +zonesBrush.value;
+ moveCircle(point[0], point[1], radius);
+ }
+
+ function applyZonesManualAssignent() {
+ zones.selectAll("g").each(function() {
+ if (this.dataset.cells) return;
+ // all zone cells are removed
+ unfocus(this.id);
+ this.style.display = "block";
+ });
+
+ zonesEditorAddLines();
+ exitZonesManualAssignment();
+ }
+
+ // restore initial zone cells
+ function cancelZonesManualAssignent() {
+ zones.selectAll("g").each(function() {
+ const zone = d3.select(this);
+ const dataCells = zone.attr("data-init");
+ const cells = dataCells ? dataCells.split(",").map(i => +i) : [];
+ zone.attr("data-cells", cells);
+ zone.selectAll("*").remove();
+ const base = zone.attr("id") + "_"; // id generic part
+ zone.selectAll("*").data(cells).enter().append("polygon").attr("points", d => getPackPolygon(d)).attr("id", d => base + d);
+ });
+
+ exitZonesManualAssignment();
+ }
+
+ function exitZonesManualAssignment(close) {
+ customization = 0;
+ removeCircle();
+ document.querySelectorAll("#zonesBottom > button").forEach(el => el.style.display = "inline-block");
+ document.getElementById("zonesManuallyButtons").style.display = "none";
+
+ zonesEditor.querySelectorAll(".hide:not(.show)").forEach(el => el.classList.remove("hidden"));
+ zonesFooter.style.display = "block";
+ body.querySelectorAll("div > input, select, svg").forEach(e => e.style.pointerEvents = "all");
+ if(!close) $("#zonesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
+
+ restoreDefaultEvents();
+ clearMainTip();
+ zones.selectAll("g").each(function() {this.removeAttribute("data-init");});
+ const selected = body.querySelector("div.selected");
+ if (selected) selected.classList.remove("selected");
+ }
+
+ function changeFill(el) {
+ const fill = el.getAttribute("fill");
+ const callback = function(fill) {
+ el.setAttribute("fill", fill);
+ document.getElementById(el.parentNode.parentNode.dataset.id).setAttribute("fill", fill);
+ }
+
+ openPicker(fill, callback);
+ }
+
+ function toggleVisibility(el) {
+ const zone = zones.select("#"+el.parentNode.dataset.id);
+ const inactive = zone.style("display") === "none";
+ inactive ? zone.style("display", "block") : zone.style("display", "none");
+ el.classList.toggle("inactive");
+ }
+
+ function focusOnZone(zone, cl) {
+ const inactive = cl.contains("inactive");
+ cl.toggle("inactive");
+
+ if (inactive) {
+ if (defs.select("#fog #focus"+zone).size()) return;
+ const dataCells = zones.select("#"+zone).attr("data-cells");
+ if (!dataCells) return;
+ const data = dataCells.split(",").map(c => +c);
+ const g = defs.select("#fog").append("g").attr("fill", "black").attr("stroke", "black").attr("id", "focus"+zone);
+ g.selectAll("path").data(data).enter().append("path").attr("d", d => "M" + getPackPolygon(d) + "Z");
+ fogging.attr("display", "block");
+ } else unfocus(zone);
+ }
+
+ function unfocus(z) {
+ defs.select("#focus"+z).remove();
+ if (!defs.selectAll("#fog path").size()) fogging.attr("display", "none"); // all states are de-focused
+ }
+
+ function toggleLegend() {
+ if (legend.selectAll("*").size()) {clearLegend(); return;}; // hide legend
+ const data = [];
+
+ zones.selectAll("g").each(function() {
+ const id = this.dataset.id;
+ const description = this.dataset.description;
+ const fill = this.getAttribute("fill");
+ data.push([id, fill, description])
+ });
+
+ drawLegend("Zones", data);
+ }
+
+ function togglePercentageMode() {
+ if (body.dataset.type === "absolute") {
+ body.dataset.type = "percentage";
+ const totalCells = +zonesFooterCells.innerHTML;
+ const totalArea = +zonesFooterArea.dataset.area;
+ const totalPopulation = +zonesFooterPopulation.dataset.population;
+
+ body.querySelectorAll(":scope > div").forEach(function(el) {
+ el.querySelector(".stateCells").innerHTML = rn(+el.dataset.cells / totalCells * 100, 2) + "%";
+ el.querySelector(".biomeArea").innerHTML = rn(+el.dataset.area / totalArea * 100, 2) + "%";
+ el.querySelector(".culturePopulation").innerHTML = rn(+el.dataset.population / totalPopulation * 100, 2) + "%";
+ });
+
+ } else {
+ body.dataset.type = "absolute";
+ zonesEditorAddLines();
+ }
+ }
+
+ function addZonesLayer() {
+ const id = getNextId("zone");
+ const description = "Unknown zone";
+ const fill = "url(#hatch" + id.slice(4)%14 + ")";
+ zones.append("g").attr("id", id).attr("data-description", description).attr("data-cells", "").attr("fill", fill);
+ const unit = areaUnit.value === "square" ? " " + distanceUnitInput.value + "²" : " " + areaUnit.value;
+
+ const line = `${c.length}
+
+ ${si(area) + unit}
+
+ ${si(population)}
+
+
+
+
+
+
+
+
+
`;
+
+ body.insertAdjacentHTML("beforeend", line);
+ zonesFooterNumber.innerHTML = zones.selectAll("g").size();
+ }
+
+ function downloadZonesData() {
+ const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
+ let data = "Id,Fill,Description,Cells,Area "+unit+",Population\n"; // headers
+
+ body.querySelectorAll(":scope > div").forEach(function(el) {
+ data += el.dataset.id + ",";
+ data += el.dataset.fill + ",";
+ data += el.dataset.description + ",";
+ data += el.dataset.cells + ",";
+ data += el.dataset.area + ",";
+ data += el.dataset.population + "\n";
+ });
+
+ const dataBlob = new Blob([data], {type: "text/plain"});
+ const url = window.URL.createObjectURL(dataBlob);
+ const link = document.createElement("a");
+ document.body.appendChild(link);
+ link.download = "zones_data" + Date.now() + ".csv";
+ link.href = url;
+ link.click();
+ window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);
+ }
+
+ function toggleEraseMode() {
+ this.classList.toggle("pressed");
+ }
+
+ function zoneRemove(zone) {
+ zones.select("#"+zone).remove();
+ unfocus(zone);
+ zonesEditorAddLines();
+ }
+
+}
diff --git a/modules/utils.js b/modules/utils.js
index a9959759..55f8efe7 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -186,13 +186,24 @@ function toHEX(rgb){
// return array of standard shuffled colors
function getColors(number) {
- const c12 = d3.scaleOrdinal(d3.schemeSet3);
+ // const c12 = d3.scaleOrdinal(d3.schemeSet3);
+ const c12 = ["#dababf","#fb8072","#80b1d3","#fdb462","#b3de69","#fccde5","#c6b9c1","#bc80bd","#ccebc5","#ffed6f","#8dd3c7","#eb8de7"];
const cRB = d3.scaleSequential(d3.interpolateRainbow);
- const colors = d3.shuffle(d3.range(number).map(i => i < 12 ? c12(i) : d3.color(cRB((i-12)/(number-12))).hex()));
+ const colors = d3.shuffle(d3.range(number).map(i => i < 12 ? c12[i] : d3.color(cRB((i-12)/(number-12))).hex()));
//debug.selectAll("circle").data(colors).enter().append("circle").attr("r", 15).attr("cx", (d,i) => 60 + i * 40).attr("cy", 20).attr("fill", d => d);
return colors;
}
+function getRandomColor() {
+ return d3.color(d3.scaleSequential(d3.interpolateRainbow)(Math.random())).hex();
+}
+
+// mix a color with a random color
+function getMixedColor(color, mix = .2, bright = .3) {
+ const c = color[0] === "#" ? color : getRandomColor(); // if provided color is not hex (e.g. harching), generate random one
+ return d3.color(d3.interpolate(c, getRandomColor())(mix)).brighter(bright).hex();
+}
+
// conver temperature from °C to other scales
function convertTemperature(c) {
switch(temperatureScale.value) {
@@ -362,11 +373,71 @@ function vowel(c) {
return "aeiouy".includes(c);
}
+// remove vowels from the end of the string
+function trimVowels(string) {
+ while (string.length > 3 && vowel(last(string))) {string = string.slice(0,-1);}
+ return string;
+}
+
+// get adjective form from noun
+function getAdjective(string) {
+ // special cases for some suffixes
+ if (string.length > 8 && string.slice(-6) === "orszag") return string.slice(0, -6);
+ if (string.length > 6 && string.slice(-4) === "stan") return string.slice(0, -4);
+ if (Math.random() < .5 && string.slice(-4) === "land") return string + "ic";
+ if (string.slice(-4) === " Guo") string = string.slice(0, -4);
+
+ const end = string.slice(-1); // last letter of string
+ if (end === "a") return string += "n";
+ if (end === "i") return string += "an";
+ if (end === "o") return string = trimVowels(string) + "an";
+ if (end === "c" || end === "y" || end === "u") return string += "an";
+ if (end === "m" || end === "n") return string += "ese";
+ if (end === "q") return string += "i";
+ return trimVowels(string) + "ian";
+}
+
+// split string into 2 almost equal parts not breaking words
+function splitInTwo(str) {
+ const half = str.length / 2;
+ const ar = str.split(" ");
+ if (ar.length < 2) return ar; // only one word
+ let first = "", last = "", middle = "", rest = "";
+
+ ar.forEach((w, d) => {
+ if (d + 1 !== ar.length) w += " ";
+ rest += w;
+ if (!first || rest.length < half) first += w;
+ else if (!middle) middle = w;
+ else last += w;
+ });
+
+ if (!last) return [first, middle];
+ if (first.length < last.length) return [first + middle, last];
+ return [first, middle + last];
+}
+
// return the last element of array
function last(array) {
return array[array.length - 1];
}
+// return random value from the array
+function ra(array) {
+ return array[Math.floor(Math.random() * array.length)];
+}
+
+// return random value from weighted array {"key1":weight1, "key2":weight2}
+function rw(object) {
+ const array = [];
+ for (const key in object) {
+ for (let i=0; i < object[key]; i++) {
+ array.push(key);
+ }
+ };
+ return array[Math.floor(Math.random() * array.length)];
+}
+
// return value in range [0, 100] (height range)
function lim(v) {
return Math.max(Math.min(v, 100), 0);
@@ -428,13 +499,6 @@ function getNextId(core, i = 1) {
return core + i;
}
-function getAbsolutePath(href) {
- if (!href) return "";
- var link = document.createElement("a");
- link.href = href;
- return link.href;
-}
-
// from https://davidwalsh.name/javascript-debounce-function
function debounce(func, wait, immediate) {
var timeout;
@@ -449,4 +513,15 @@ function debounce(func, wait, immediate) {
timeout = setTimeout(later, wait);
if (callNow) func.apply(context, args);
}
-};
\ No newline at end of file
+}
+
+function getDefaultTexture() {
+ return "data:image/jpeg;base64,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gkkkoosmbdWhIFoIESRaLaFus5yAJJaEzFSTWtFICyS1ItFIUJFCQRAUEAhZJbYgqxKsEkSqtFooFtEkkgTOcxakULbVa1RJC2ySSAASQatkkJJbbVurRQUzIpCSW0hRbSAW0okhEKQqSFoM5zJne+kKBSJISLaAAtqJIq226FottkmcYULdSZRbVotskkzbqrEBC21JAAhaQ1rcmZIpBJASLbaQoBAERKsKKRAUiABCkSS6skqgKkBIFBAW20W0FJJJIJMohaQttttEkkmtaARmZAFoIEBRaLRRJAABakC2yQW0W0ZzkCkCAItuM4LrWqRLbItSRIiVbq0gLRSILaVIt1bJMyBIpES3SS60LbJAAABSBCgCl1oSZEgSQiLqlIhRSCQQpC0UiAIUEklUAQIWkQFpJAIlVaQttW0KCSQmcwiFIW222kkkk1rYEkkltkgAtpJJbQC2pBBbqSW2SAAEka1SgW3OcgUEAKDGcyTp02iSKBQkFtFtki2iipBEtqIC2yS2kEkkEtqFt1bKqSAAUgAABS6sVnIEBJm3RAUgKAEkQtqSFAkloCZlpaUEAEkSFWggkUAiVVtttpVJJIkzMoWktpbaJIC2gBJBJFUBRJLRQBSIi2rRJKQtSEiraEKt1nORQBRZIkVImc73tUggLakgq22BABbSyZFFpZICAokyLaJJbS61qkJIALRURAABQsS2iSAAAJIEKLUgUCpBLbIIgi0oIAJJVAEJISrJBbYWipFtttoEkkzMwXVkUWi2ySkLbnOda0WTJJFtBBItoAICpFFtIiVQqSICii0WTIFWABAJGc53vdoBCki1JFtAAFotkgIW2yQSZkltmcyBvpsqZka1pbbRJAAS2lkgBCgatVJJBAgLQCFIUASSipCRVVbJCAtISS0hWc5tskt0CTMVbZMlotQIltt0W0JJM5kyttskq3VkAACSa1osmZILaAQoAIAESRVurQQFIgALRRJlCpJbohQCDOc71sKEkqxLbItCRbSAFtokyhbaQIiMzMkFt1rQAqqAAKQW6EkJIAoturSRJCIgLRRSIUAiFSAKKKBJktqQCBChnObaUJJItBALdELM5F1q2haiTIIiJbS23Oc0KoACSAAWgUAEKARGZnWt20JIUUiIUWiyQhSICpJbolUZmdWxbSFIhaQqSW0AAtoskSXVSxABJKRLdCSU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";
+}
+
+function getAbsolutePath(href) {
+ if (!href) return "";
+ var link = document.createElement("a");
+ link.href = href;
+ return link.href;
+}
\ No newline at end of file
0
+
+ 0 ${unit}
+
+ 0
+
+
+
+
+