mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-17 09:41:24 +01:00
Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into dev-economics
This commit is contained in:
commit
0fb6363f2a
2 changed files with 13 additions and 14 deletions
|
|
@ -28,7 +28,8 @@ window.BurgsAndStates = (function () {
|
|||
let count = +regionsInput.value;
|
||||
let burgs = [0];
|
||||
|
||||
const score = new Int16Array(cells.s.map((s) => s * Math.random())); // cell score for capitals placement
|
||||
const rand = () => 0.5 + Math.random() * 0.5;
|
||||
const score = new Int16Array(cells.s.map((s) => s * rand())); // 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
|
||||
|
||||
if (sorted.length < count * 10) {
|
||||
|
|
@ -45,9 +46,8 @@ window.BurgsAndStates = (function () {
|
|||
let spacing = (graphWidth + graphHeight) / 2 / count; // min distance between capitals
|
||||
|
||||
for (let i = 0; burgs.length <= count; i++) {
|
||||
const cell = sorted[i],
|
||||
x = cells.p[cell][0],
|
||||
y = cells.p[cell][1];
|
||||
const cell = sorted[i];
|
||||
const [x, y] = cells.p[cell];
|
||||
|
||||
if (burgsTree.find(x, y, spacing) === undefined) {
|
||||
burgs.push({cell, x, y});
|
||||
|
|
@ -57,7 +57,9 @@ window.BurgsAndStates = (function () {
|
|||
if (i === sorted.length - 1) {
|
||||
WARN && console.warn('Cannot place capitals with current spacing. Trying again with reduced spacing');
|
||||
burgsTree = d3.quadtree();
|
||||
(i = -1), (burgs = [0]), (spacing /= 1.2);
|
||||
i = -1;
|
||||
burgs = [0];
|
||||
spacing /= 1.2;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue