Ticket #5150: cb4410b4d5707db91073a46f39a93d3bbb25cc41.diff

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

@@ -665 +665 @@
 // The city is a circle segment of this maximum size
 g_Map.log("Computing city grid");
 var gridCenter = new Vector2D(0, fractionToTiles(0.3)).rotate(-riverAngle).add(mapCenter).round();
-var gridMaxAngle = scaleByMapSize(Math.PI / 3, Math.PI);
+var gridMaxAngle = Math.min(scaleByMapSize(1/3, 1), 2/3) * Math.PI;
 var gridStartAngle = -Math.PI / 2 -gridMaxAngle / 2 + riverAngle;
 var gridRadius = y => hillRadius + 18 * y;
 
@@ -976 +976 @@
 var areaRoads = [];
 for (let roadStart of roadStartLocations)
 {
-    if (areaRoads.length >= scaleByMapSize(2, 4))
+    if (areaRoads.length >= scaleByMapSize(2, 5))
         break;
 
     let closestPoint = areaCityPaths.getClosestPointTo(roadStart);
@@ -987 +987 @@
             new PathPlacer(
                 Vector2D.add(closestPoint, new Vector2D(0, 3/4 * mapSize).rotate(closestPoint.angleTo(roadStart))),
                 roadStart,
-                4,
+                scaleByMapSize(5, 3),
                 0.1,
                 5,
                 0.5,

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js

@@ -619 +619 @@
 
             // Placement
             if (wallEle.templateName && g_Map.inMapBounds(place) && constraint.allows(place.clone().floor()))
-                entities.push(g_Map.placeEntityPassable(wallEle.templateName, playerId, place, placeAngle + wallEle.angle));
+            {
+                let entity = g_Map.placeEntityPassable(wallEle.templateName, playerId, place, placeAngle + wallEle.angle);
+                if (entity)
+                    entities.push(entity);
+            }
 
             // Prepare for the next wall element
             actualAngle += addAngle;
@@ -634 +638 @@
         let place = Vector2D.average([position, target]);
         let placeAngle = actualAngle + addAngle / 2;
         if (g_Map.inMapBounds(place) && constraint.allows(place.clone().floor()))
-            entities.push(g_Map.placeEntityPassable(wallEle.templateName, playerId, place, placeAngle + wallEle.angle));
+        {
+            let entity = g_Map.placeEntityPassable(wallEle.templateName, playerId, place, placeAngle + wallEle.angle);
+            if (entity)
+                entities.push(entity);
+        }
     }
 
     return entities;