Merge branch 'master' into alpha

This commit is contained in:
Azgaar 2021-02-23 22:38:44 +03:00 committed by GitHub
commit 305d355ad5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 168 additions and 1 deletions

View file

@ -74,6 +74,7 @@
ERROR && console.error("Name base is empty, default nameBases will be applied");
nameBases = Names.getNameBases();
}
cultures.forEach(c => c.base = c.base % nameBases.length);
function getRandomCultures(c) {
@ -380,6 +381,7 @@
}
});
}
TIME && console.timeEnd('expandCultures');
}

View file

@ -100,6 +100,7 @@ function showMapTooltip(point, e, i, g) {
tip(e.target.parentNode.dataset.name + ". Click to edit");
return;
}
if (group === "emblems" && e.target.tagName === "use") {
const parent = e.target.parentNode;
const [g, type] = parent.id === "burgEmblems" ? [pack.burgs, "burg"] :
@ -115,6 +116,7 @@ function showMapTooltip(point, e, i, g) {
tip(`${name} ${type} emblem. Click to edit. Hold Shift to show associated area or place`);
return;
}
if (group === "rivers") {
const river = +e.target.id.slice(5);
const r = pack.rivers.find(r => r.i === river);

View file

@ -954,7 +954,6 @@ function getProvincesVertices() {
chain.push([start, province, land]); // add starting vertex to sequence to close the path
return chain;
}
}
function toggleGrid(event) {