Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Fix caledonian meadows.

Browse Source 
Broke in 6cc6d8c156

Refs #6180

Differential Revision: https://code.wildfiregames.com/D4131
This was SVN commit r25754.
This commit is contained in:
wraitii 2021-06-09 06:35:17 +00:00
parent b8758c8941
commit 05ace86b76
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
binaries/data/mods/public/maps/random/heightmap/heightmap.js
View File

@ -235,23 +235,19 @@ function setBaseTerrainDiamondSquare(minHeight = MIN_HEIGHT, maxHeight = MAX_HEI
*/
function getPointsByHeight(heightRange, avoidPoints = [], avoidClass = undefined, minDistance = 20, maxTries = 2 * g_Map.size, heightmap = g_Map.height, isCircular = g_MapSettings.CircularMap)
{
let points = [];
let placements = clone(avoidPoints);
let validVertices = [];
let r = 0.5 * (heightmap.length - 1); // Map center x/y as well as radius
let avoidMap;
if (avoidClass)
avoidMap = avoidClass.inclusionCount;
const points = [];
const placements = clone(avoidPoints);
const validVertices = [];
const r = 0.5 * (heightmap.length - 1); // Map center x/y as well as radius
for (let x = minDistance; x < heightmap.length - minDistance; ++x)
for (let y = minDistance; y < heightmap[x].length - minDistance; ++y)
{
if (avoidClass &&
(avoidMap[Math.max(x - 1, 0)][y] > 0 ||
avoidMap[x][Math.max(y - 1, 0)] > 0 ||
avoidMap[Math.min(x + 1, avoidMap.length - 1)][y] > 0 ||
avoidMap[x][Math.min(y + 1, avoidMap[0].length - 1)] > 0))
(avoidClass.has(Math.max(x - 1, 0), y) ||
avoidClass.has(x, Math.max(y - 1, 0)) ||
avoidClass.has(Math.min(x + 1, avoidClass.size - 1), y) ||
avoidClass.has(x, Math.min(y + 1, avoidClass.size - 1))))
continue;
if (heightmap[x][y] > heightRange.min && heightmap[x][y] < heightRange.max && // Has correct height
@ -261,7 +257,7 @@ function getPointsByHeight(heightRange, avoidPoints = [], avoidClass = undefined
for (let tries = 0; tries < maxTries; ++tries)
{
let point = pickRandom(validVertices);
const point = pickRandom(validVertices);
if (placements.every(p => Math.euclidDistance2D(p.x, p.y, point.x, point.y) > Math.max(minDistance, p.dist)))
{
points.push(point);