diff --git a/binaries/data/mods/public/maps/random/continent.js b/binaries/data/mods/public/maps/random/continent.js index b270249ecc..b4ed5a4673 100644 --- a/binaries/data/mods/public/maps/random/continent.js +++ b/binaries/data/mods/public/maps/random/continent.js @@ -313,13 +313,14 @@ var types = [ [[tForestFloor1, tMainTerrain, pForest2], [tForestFloor1, pForest2]] ]; // some variation + if (random_terrain != 6) { var size = numForest / (scaleByMapSize(3,6) * numPlayers); var num = floor(size / types.length); for (var i = 0; i < types.length; ++i) { - placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / (num * floor(scaleByMapSize(2,5))), 0.5); + placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / num, 0.5); painter = new LayeredPainter( types[i], // terrains [2] // widths @@ -327,12 +328,13 @@ if (random_terrain != 6) createAreas( placer, [painter, paintClass(clForest)], - [avoidClasses(clPlayer, 20, clForest, 10, clHill, 0, clBaseResource,2), stayClasses(clLand, 4)], + [avoidClasses(clPlayer, 20, clForest, 15, clHill, 0, clBaseResource,2), stayClasses(clLand, 4)], num ); } } + RMS.SetProgress(50); // create dirt patches log("Creating dirt patches..."); @@ -481,7 +483,7 @@ for (var i = 0; i < types.length; ++i) true, clForest ); createObjectGroups(group, 0, - [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 7)], + [avoidClasses(clWater, 1, clForest, 7, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 7)], num ); } diff --git a/binaries/data/mods/public/maps/random/lake.js b/binaries/data/mods/public/maps/random/lake.js index 0781494653..c97eae888d 100644 --- a/binaries/data/mods/public/maps/random/lake.js +++ b/binaries/data/mods/public/maps/random/lake.js @@ -328,7 +328,7 @@ if (random_terrain != 6) var num = floor(size / types.length); for (var i = 0; i < types.length; ++i) { - placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / (num * floor(scaleByMapSize(2,5))), 0.5); + placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / num, 0.5); painter = new LayeredPainter( types[i], // terrains [2] // widths @@ -336,7 +336,7 @@ if (random_terrain != 6) createAreas( placer, [painter, paintClass(clForest)], - avoidClasses(clPlayer, 20, clForest, 10, clHill, 0, clWater, 2), + avoidClasses(clPlayer, 20, clForest, 17, clHill, 0, clWater, 2), num ); } @@ -489,7 +489,7 @@ for (var i = 0; i < types.length; ++i) true, clForest ); createObjectGroups(group, 0, - avoidClasses(clWater, 5, clForest, 1, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1), + avoidClasses(clWater, 5, clForest, 7, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1), num ); } diff --git a/binaries/data/mods/public/maps/random/lorraine_plain.js b/binaries/data/mods/public/maps/random/lorraine_plain.js index 57484d0bea..cf79dfc339 100644 --- a/binaries/data/mods/public/maps/random/lorraine_plain.js +++ b/binaries/data/mods/public/maps/random/lorraine_plain.js @@ -41,6 +41,7 @@ const aBushSmall = "actor|props/flora/bush_medit_sm.xml"; const pForestB = [tGrassDForest + TERRAIN_SEPARATOR + oBeech, tGrassDForest]; const pForestO = [tGrassPForest + TERRAIN_SEPARATOR + oOak, tGrassPForest]; +const pForestR = [tGrassDForest + TERRAIN_SEPARATOR + oBeech, tGrassDForest, tGrassDForest + TERRAIN_SEPARATOR + oOak, tGrassDForest, tGrassDForest, tGrassDForest]; const BUILDING_ANGlE = -PI/4; // initialize map @@ -274,7 +275,7 @@ passageMaker(floor(fractionToTiles(0.2)), floor(fractionToTiles(0.25)), floor(fr passageMaker(floor(fractionToTiles(0.2)), floor(fractionToTiles(0.75)), floor(fractionToTiles(0.8)), floor(fractionToTiles(0.75)), scaleByMapSize(4,8), -2, -2, 2, clShallow, undefined, -4); paintTerrainBasedOnHeight(-5, 1, 1, tWater); -paintTerrainBasedOnHeight(1, 2, 1, tShore) +paintTerrainBasedOnHeight(1, 2, 1, pForestR) paintTileClassBasedOnHeight(-6, 0.5, 1, clWater) @@ -312,7 +313,7 @@ var size = numForest / (scaleByMapSize(3,6) * numPlayers); var num = floor(size / types.length); for (var i = 0; i < types.length; ++i) { - placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / (num * floor(scaleByMapSize(2,5))), 0.5); + placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / num, 0.5); painter = new LayeredPainter( types[i], // terrains [2] // widths @@ -320,7 +321,7 @@ for (var i = 0; i < types.length; ++i) createAreas( placer, [painter, paintClass(clForest)], - avoidClasses(clPlayer, 15, clWater, 3, clForest, 8, clHill, 1), + avoidClasses(clPlayer, 15, clWater, 3, clForest, 16, clHill, 1), num ); } @@ -461,7 +462,7 @@ for (var i = 0; i < types.length; ++i) true, clForest ); createObjectGroups(group, 0, - avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clMetal, 1, clRock, 1), + avoidClasses(clWater, 1, clForest, 7, clHill, 1, clPlayer, 5, clMetal, 1, clRock, 1), num ); } diff --git a/binaries/data/mods/public/maps/random/mainland.js b/binaries/data/mods/public/maps/random/mainland.js index c05f34cd34..26f2c7c3f0 100644 --- a/binaries/data/mods/public/maps/random/mainland.js +++ b/binaries/data/mods/public/maps/random/mainland.js @@ -276,7 +276,7 @@ if (random_terrain != 6) var num = floor(size / types.length); for (var i = 0; i < types.length; ++i) { - placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / (num * floor(scaleByMapSize(2,5))), 0.5); + placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / num, 0.5); painter = new LayeredPainter( types[i], // terrains [2] // widths diff --git a/binaries/data/mods/public/maps/random/unknown_land.js b/binaries/data/mods/public/maps/random/unknown_land.js index 232e3b7c4f..9a3a87d634 100644 --- a/binaries/data/mods/public/maps/random/unknown_land.js +++ b/binaries/data/mods/public/maps/random/unknown_land.js @@ -1610,7 +1610,7 @@ if (random_terrain != 6) var num = floor(size / types.length); for (var i = 0; i < types.length; ++i) { - placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / (num * floor(scaleByMapSize(2,5))), 0.5); + placer = new ChainPlacer(1, floor(scaleByMapSize(3, 5)), numForest / num, 0.5); painter = new LayeredPainter( types[i], // terrains [2] // widths @@ -1775,7 +1775,7 @@ for (var i = 0; i < types.length; ++i) true, clForest ); createObjectGroups(group, 0, - [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 0, clMetal, 1, clRock, 1), stayClasses(clLand, 4)], + [avoidClasses(clWater, 1, clForest, 7, clHill, 1, clPlayer, 0, clMetal, 1, clRock, 1), stayClasses(clLand, 4)], num ); }