Generator settings:
+| + | Onload behavior | ++ + | ++ |
| + | Interface size | ++ + | ++ + | +
| + | Tooltip size | ++ + | ++ + | +
| + | Transparency | ++ + | ++ + | +
| + | Speaker voice | ++ + | ++ 🔊 + | +
| @@ -1184,65 +1243,6 @@ |
Generator settings:
-| - | Onload behavior | -- - | -- |
| - | Interface size | -- - | -- - | -
| - | Tooltip size | -- - | -- - | -
| - | Transparency | -- - | -- - | -
| - | Speaker voice | -- - | -- 🔊 - | -
| diff --git a/modules/coa-renderer.js b/modules/coa-renderer.js index e956f322..e1a1dab9 100644 --- a/modules/coa-renderer.js +++ b/modules/coa-renderer.js @@ -1051,6 +1051,6 @@ if (layerIsOn("toggleEmblems")) trigger(id, coa); } - return {trigger, add}; + return {trigger, add, shieldPaths}; }))); diff --git a/modules/cultures-generator.js b/modules/cultures-generator.js index 3fcf8170..4e4d4e62 100644 --- a/modules/cultures-generator.js +++ b/modules/cultures-generator.js @@ -55,26 +55,10 @@ c.origin = 0; c.code = getCode(c.name); cells.culture[cell] = i+1; - if (emblemShape === "random") c.shield = getRandomShiled(); + if (emblemShape === "random") c.shield = getRandomShield(); else if (emblemShape !== "culture" && emblemShape !== "state") c.shield = emblemShape; }); - function getRandomShiled() { - const shields = { - types: {basic: 10, regional: 2, historical: 1, specific: 1, banner: 1, simple: 2, fantasy: 1, middleEarth: 0}, - basic: {heater: 12, spanish: 6, french: 1}, - regional: {horsehead: 1, horsehead2: 1, polish: 1, hessen: 1, swiss: 1}, - historical: {boeotian: 1, roman: 2, kite: 1, oldFrench: 5, renaissance: 2, baroque: 2}, - specific: {targe: 1, targe2: 0, pavise: 5, wedged: 10}, - banner: {flag: 1, pennon: 0, guidon: 0, banner: 0, dovetail: 1, gonfalon: 5, pennant: 0}, - simple: {round: 12, oval: 6, vesicaPiscis: 1, square: 1, diamond: 2, no: 0}, - fantasy: {fantasy1: 2, fantasy2: 2, fantasy3: 1, fantasy4: 1, fantasy5: 3}, - middleEarth: {noldor: 1, gondor: 1, easterling: 1, erebor: 1, ironHills: 1, urukHai: 1, moriaOrc: 1} - } - const type = rw(shields.types); - return rw(shields[type]); - } - function placeCenter(v) { let c, spacing = (graphWidth + graphHeight) / 2 / count; const sorted = [...populated].sort((a, b) => v(b) - v(a)), max = Math.floor(sorted.length / 2); @@ -161,7 +145,14 @@ const code = getCode(name); const i = pack.cultures.length; const color = d3.color(d3.scaleSequential(d3.interpolateRainbow)(Math.random())).hex(); - pack.cultures.push({name, color, base, center, i, expansionism:1, type:"Generic", cells:0, area:0, rural:0, urban:0, origin:0, code}); + + // define emblem shape + const emblemShape = document.getElementById("emblemShape").value; + let shield = culture.shield; + if (emblemShape === "random") shield = getRandomShield(); + else if (emblemShape !== "culture" && emblemShape !== "state") shield = emblemShape; + + pack.cultures.push({name, color, base, center, i, expansionism:1, type:"Generic", cells:0, area:0, rural:0, urban:0, origin:0, code, shield}); } const getDefault = function(count) { @@ -428,6 +419,22 @@ return 0; } - return {generate, add, expand, getDefault}; + const getRandomShield = function() { + const shields = { + types: {basic: 10, regional: 2, historical: 1, specific: 1, banner: 1, simple: 2, fantasy: 1, middleEarth: 0}, + basic: {heater: 12, spanish: 6, french: 1}, + regional: {horsehead: 1, horsehead2: 1, polish: 1, hessen: 1, swiss: 1}, + historical: {boeotian: 1, roman: 2, kite: 1, oldFrench: 5, renaissance: 2, baroque: 2}, + specific: {targe: 1, targe2: 0, pavise: 5, wedged: 10}, + banner: {flag: 1, pennon: 0, guidon: 0, banner: 0, dovetail: 1, gonfalon: 5, pennant: 0}, + simple: {round: 12, oval: 6, vesicaPiscis: 1, square: 1, diamond: 2, no: 0}, + fantasy: {fantasy1: 2, fantasy2: 2, fantasy3: 1, fantasy4: 1, fantasy5: 3}, + middleEarth: {noldor: 1, gondor: 1, easterling: 1, erebor: 1, ironHills: 1, urukHai: 1, moriaOrc: 1} + } + const type = rw(shields.types); + return rw(shields[type]); + } + + return {generate, add, expand, getDefault, getRandomShield}; }))); diff --git a/modules/ui/emblems-editor.js b/modules/ui/emblems-editor.js index f6806449..d39c74a1 100644 --- a/modules/ui/emblems-editor.js +++ b/modules/ui/emblems-editor.js @@ -150,7 +150,8 @@ function editEmblem(type, id, el) { function changeShape() { el.coa.shield = this.value; - document.getElementById(id).remove(); + const coaEl = document.getElementById(id); + if (coaEl) coaEl.remove(); COArenderer.trigger(id, el.coa); } diff --git a/modules/ui/options.js b/modules/ui/options.js index 50473d62..25b27ded 100644 --- a/modules/ui/options.js +++ b/modules/ui/options.js @@ -289,15 +289,44 @@ function changeCultureSet() { if (+culturesOutput.value > +max) culturesInput.value = culturesOutput.value = max; } -function changeEmblemShape(value) { +function changeEmblemShape(emblemShape) { const image = document.getElementById("emblemShapeImage"); - const shapeEl = document.getElementById(value); - if (shapeEl) { - const shape = shapeEl.querySelector("path").getAttribute("d"); - image.setAttribute("d", shape); - } else { - image.removeAttribute("d"); + const shapePath = window.COArenderer && COArenderer.shieldPaths[emblemShape]; + shapePath ? image.setAttribute("d", shapePath) : image.removeAttribute("d"); + + const specificShape = ["culture", "state", "random"].includes(emblemShape) ? null : emblemShape; + if (emblemShape === "random") pack.cultures.filter(c => !c.removed).forEach(c => c.shield = Cultures.getRandomShield()); + + const rerenderCOA = (id, coa) => { + const coaEl = document.getElementById(id); + if (coaEl) coaEl.remove(); + COArenderer.trigger(id, coa); } + + pack.states.forEach(state => { + if (!state.i || state.removed || !state.coa || state.coa === "custom") return; + const newShield = specificShape || COA.getShield(state.culture, null); + if (newShield === state.coa.shield) return; + state.coa.shield = newShield; + rerenderCOA("stateCOA" + state.i, state.coa); + }); + + pack.provinces.forEach(province => { + if (!province.i || province.removed || !province.coa || province.coa === "custom") return; + const culture = pack.cells.culture[province.center]; + const newShield = specificShape || COA.getShield(culture, province.state); + if (newShield === province.coa.shield) return; + province.coa.shield = newShield; + rerenderCOA("provinceCOA" + province.i, province.coa); + }); + + pack.burgs.forEach(burg => { + if (!burg.i || burg.removed || !burg.coa || burg.coa === "custom") return; + const newShield = specificShape || COA.getShield(burg.culture, burg.state); + if (newShield === burg.coa.shield) return; + burg.coa.shield = newShield + rerenderCOA("burgCOA" + burg.i, burg.coa); + }); } function changeStatesNumber(value) { @@ -419,7 +448,6 @@ function randomizeOptions() { // World settings generateEra(); - changeEmblemShape(emblemShape.value); // change emblem shape image } // select heightmap template pseudo-randomly |