Ticket #4294: retry_simplegroups_v1.patch

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

@@ -364 +364 @@
   [new SimpleObject(aLillies, 1,2, 0,1)]
  ],
  [
-  scaleByMapSize(800, 12800),
-  scaleByMapSize(800, 12800)
+  scaleByMapSize(750, 1500),
+  scaleByMapSize(750, 1500)
  ],
  stayClasses(clShallow, 0)
 );
@@ -405 +405 @@
   [new SimpleObject(oFish, 2,3, 0,2)]
  ],
  [
-  25 * numPlayers
+  scaleByMapSize(10, 50)
  ],
- avoidClasses(clLand, 2, clRiver, 1)
+ avoidClasses(clLand, 2, clRiver, 1, clFood, 12)
 );
 
 RMS.SetProgress(85);

binaries/data/mods/public/maps/random/rmgen/placer.js

@@ -527 +527 @@
         var objs = element.place(this.x, this.z, player, this.avoidSelf, constraint);
 
         if (objs === undefined)
-            return false;
+            return undefined;
 
         resultObjs = resultObjs.concat(objs);
     }
@@ -543 +543 @@
             this.tileClass.add(Math.floor(obj.position.x/CELL_SIZE), Math.floor(obj.position.z/CELL_SIZE));
     }
 
-    return true;
+    return resultObjs;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -574 +574 @@
 
     var resultObjs = placer.place(this.x, this.z, player, this.avoidSelf, constraint);
     if (resultObjs === undefined)
-        return false;
+        return undefined;
 
     // Add placed objects to map
     for (let obj of resultObjs)
@@ -586 +586 @@
             this.tileClass.add(Math.floor(obj.position.x/CELL_SIZE), Math.floor(obj.position.z/CELL_SIZE));
     }
 
-    return true;
+    return resultObjs;
 };

binaries/data/mods/public/maps/random/rmgen/utilityfunctions.js

@@ -98 +98 @@
     {
         var MIN_TREES = 1000 * numMultiplier;
         var MAX_TREES = 6000 * numMultiplier;
-        var P_FOREST = 0.52;
+        var P_FOREST = 0.75;
     }
     else
     {
         var MIN_TREES = 500 * numMultiplier;
         var MAX_TREES = 3000 * numMultiplier;
-        var P_FOREST = 0.7;
+        var P_FOREST = 0.85;
     }
     var totalTrees = scaleByMapSize(MIN_TREES, MAX_TREES);
     var numForest = totalTrees * P_FOREST;