Ticket #4152: heightmapFix2016-12-5.patch

binaries/data/mods/public/maps/random/heightmap/heightmap.js

@@ -107 +107 @@
  * @param {array} [entityList=[g_Gaia.stoneLarge, g_Gaia.metalLarge]] - Entity/actor strings to be placed with placeObject()
  * @param {integer} [maxTries=1000] - How often random player distributions are rolled to be compared
  * @param {boolean} [isCircular=g_MapSettings.CircularMap] - If the map is circular or rectangular
+ * @return {array} [placements] Array of points where entities were placed
  */
 function distributeEntitiesByHeight(heightRange, avoidPoints, minDistance = 30, entityList = [g_Gaia.stoneLarge, g_Gaia.metalLarge], maxTries = 1000, heightmap = g_Map.height, isCircular = g_MapSettings.CircularMap)
 {
-    let placements = deepcopy(avoidPoints);
-    let validTiles = [];
+    let validPoints = [];
     let 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[0].length - minDistance; ++y)
-            if (heightmap[x][y] > heightRange.min && heightmap[x][y] < heightRange.max) // Has the right height
-                if (!isCircular || r - getDistance(x, y, r, r) >= minDistance) // Is far enough away from map border
-                    validTiles.push({ "x": x, "y": y });
+        {
+            if (heightmap[x][y] < heightRange.min || heightmap[x][y] > heightRange.max)
+                continue; // Out of height range
+            if (isCircular && r - getDistance(x + 0.5, y + 0.5, r, r) < minDistance)
+                continue; // Too close to map border
 
+            // Avoid avoidPoints by minDistance
+            let isValid = true;
+            for (let i = 0; i < avoidPoints.length; ++i)
+            {
+                if (getDistance(x + 0.5, y + 0.5, avoidPoints[i].x, avoidPoints[i].y) < minDistance)
+                {
+                    isValid = false;
+                    break;
+                }
+            }
+            if (isValid)
+                validPoints.push({ "x": x + 0.5, "y": y + 0.5 });
+        }
+    }
+
+    let placements = [];
+    // Early return if no valid poins found
+    if (!validPoints.length)
+    {
+        log("No placement points found for the given arguments: " +  new Error().stack);
+        return placements;
+    }
+
     for (let tries = 0; tries < maxTries; ++tries)
     {
-        let tile = validTiles[randInt(validTiles.length)];
+        
+        let checkPointIndex = randInt(validPoints.length);
+        let checkPoint = validPoints[checkPointIndex];
         let isValid = true;
         for (let p = 0; p < placements.length; ++p)
         {
-            if (getDistance(placements[p].x, placements[p].y, tile.x, tile.y) < minDistance)
+            if (getDistance(placements[p].x, placements[p].y, checkPoint.x, checkPoint.y) < minDistance)
             {
                 isValid = false;
                 break;
@@ -133 +161 @@
         }
         if (isValid)
         {
-            placeObject(tile.x, tile.y, entityList[randInt(entityList.length)], 0, randFloat(0, 2*PI));
-            placements.push(tile);
+            placeObject(checkPoint.x, checkPoint.y, entityList[randInt(entityList.length)], 0, randFloat(0, 2*PI));
+            placements.push(checkPoint);
         }
+
+        validPoints.splice(checkPointIndex);
+        if (!validPoints.length) // No more valid points left
+            break;
     }
+
+    if (!placements.length)
+        log("Nothing was placed: " +  new Error().stack);
+
+    return placements;
 }
 
 /**