backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-16 17:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: #1174

Browse source
This commit is contained in:
Azgaar 2024-12-13 11:58:53 +01:00
parent 66d22f26c0
commit 50ee5150c1
5 changed files with 18 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

@ -8097,11 +8097,11 @@
<script defer src="modules/relief-icons.js?v=1.99.05"></script> <script defer src="modules/relief-icons.js?v=1.99.05"></script>
<script defer src="modules/ui/style.js?v=1.104.0"></script> <script defer src="modules/ui/style.js?v=1.104.0"></script>
<script defer src="modules/ui/editors.js?v=1.105.23"></script> <script defer src="modules/ui/editors.js?v=1.106.1"></script>
<script defer src="modules/ui/tools.js?v=1.106.0"></script> <script defer src="modules/ui/tools.js?v=1.106.0"></script>
<script defer src="modules/ui/world-configurator.js?v=1.105.4"></script> <script defer src="modules/ui/world-configurator.js?v=1.105.4"></script>
<script defer src="modules/ui/heightmap-editor.js?v=1.105.2"></script> <script defer src="modules/ui/heightmap-editor.js?v=1.105.2"></script>
<script defer src="modules/ui/provinces-editor.js?v=1.104.0"></script> <script defer src="modules/ui/provinces-editor.js?v=1.106.1"></script>
<script defer src="modules/ui/biomes-editor.js?v=1.99.05"></script> <script defer src="modules/ui/biomes-editor.js?v=1.99.05"></script>
<script defer src="modules/ui/namesbase-editor.js?v=1.105.11"></script> <script defer src="modules/ui/namesbase-editor.js?v=1.105.11"></script>
<script defer src="modules/ui/elevation-profile.js?v=1.99.00"></script> <script defer src="modules/ui/elevation-profile.js?v=1.99.00"></script>

36
modules/dynamic/editors/states-editor.js
View file

@ -1200,7 +1200,6 @@ function addState() {
const basename = center % 5 === 0 ? burgs[burg].name : Names.getCulture(culture); const basename = center % 5 === 0 ? burgs[burg].name : Names.getCulture(culture);
const name = Names.getState(basename, culture); const name = Names.getState(basename, culture);
const color = getRandomColor(); const color = getRandomColor();
const pole = cells.p[center];
// generate emblem // generate emblem
const cultureType = pack.cultures[culture].type; const cultureType = pack.cultures[culture].type;
@ -1250,38 +1249,21 @@ function addState() {
culture, culture,
military: [], military: [],
alert: 1, alert: 1,
coa, coa
pole
}); });
BurgsAndStates.getPoles();
BurgsAndStates.collectStatistics(); BurgsAndStates.collectStatistics();
BurgsAndStates.defineStateForms([newState]); BurgsAndStates.defineStateForms([newState]);
adjustProvinces([cells.province[center]]); adjustProvinces([cells.province[center]]);
if (layerIsOn("toggleProvinces")) toggleProvinces(); drawStateLabels([newState]);
if (!layerIsOn("toggleStates")) toggleStates();
else drawStates();
if (!layerIsOn("toggleBorders")) toggleBorders();
else drawBorders();
// add label
defs
.select("#textPaths")
.append("path")
.attr("d", `M${pole[0] - 50},${pole[1] + 6}h${100}`)
.attr("id", "textPath_stateLabel" + newState);
labels
.select("#states")
.append("text")
.attr("id", "stateLabel" + newState)
.append("textPath")
.attr("xlink:href", "#textPath_stateLabel" + newState)
.attr("startOffset", "50%")
.attr("font-size", "50%")
.append("tspan")
.attr("x", name.length * -3)
.text(name);
COArenderer.add("state", newState, coa, states[newState].pole[0], states[newState].pole[1]); COArenderer.add("state", newState, coa, states[newState].pole[0], states[newState].pole[1]);
layerIsOn("toggleProvinces") && toggleProvinces();
layerIsOn("toggleStates") ? drawStates() : toggleStates();
layerIsOn("toggleBorders") ? drawBorders() : toggleBorders();
statesEditorAddLines(); statesEditorAddLines();
} }

2
modules/ui/editors.js
View file

@ -1249,7 +1249,7 @@ function refreshAllEditors() {
// dynamically loaded editors // dynamically loaded editors
async function editStates() { async function editStates() {
if (customization) return; if (customization) return;
const Editor = await import("../dynamic/editors/states-editor.js?v=1.104.0"); const Editor = await import("../dynamic/editors/states-editor.js?v=1.106.1");
Editor.open(); Editor.open();
} }

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

@ -367,10 +367,7 @@ function editProvinces() {
function updateStatesPostRelease(oldStates, newStates) { function updateStatesPostRelease(oldStates, newStates) {
const allStates = unique([...oldStates, ...newStates]); const allStates = unique([...oldStates, ...newStates]);
layerIsOn("toggleProvinces") && toggleProvinces(); BurgsAndStates.getPoles();
layerIsOn("toggleStates") ? drawStates() : toggleStates();
layerIsOn("toggleBorders") ? drawBorders() : toggleBorders();
BurgsAndStates.collectStatistics(); BurgsAndStates.collectStatistics();
BurgsAndStates.defineStateForms(newStates); BurgsAndStates.defineStateForms(newStates);
drawStateLabels(allStates); drawStateLabels(allStates);
@ -382,6 +379,10 @@ function editProvinces() {
COArenderer.add("state", stateId, coa, ...pole); COArenderer.add("state", stateId, coa, ...pole);
}); });
layerIsOn("toggleProvinces") && toggleProvinces();
layerIsOn("toggleStates") ? drawStates() : toggleStates();
layerIsOn("toggleBorders") ? drawBorders() : toggleBorders();
unfog(); unfog();
closeDialogs(); closeDialogs();
editStates(); editStates();

2
versioning.js
View file

@ -13,7 +13,7 @@
* Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2 * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
*/ */
const VERSION = "1.106.0"; const VERSION = "1.106.1";
if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function"); if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
{ {