diff --git a/binaries/data/mods/public/maps/random/african_plains.js b/binaries/data/mods/public/maps/random/african_plains.js
index 348d1d23e6..c110f3a2e4 100644
--- a/binaries/data/mods/public/maps/random/african_plains.js
+++ b/binaries/data/mods/public/maps/random/african_plains.js
@@ -54,14 +54,7 @@ var clMetal = createTileClass();
 var clFood = createTileClass();
 var clBaseResource = createTileClass();
 
-// Cover the ground with the primary terrain chosen in the beginning
-for (var ix = 0; ix < mapSize; ++ix)
-	for (var iz = 0; iz < mapSize; ++iz)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-		placeTerrain(ix, iz, tPrimary);
-	}
+initTerrain(tPrimary);
 
 // Randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/alpine_lakes.js b/binaries/data/mods/public/maps/random/alpine_lakes.js
index 320cc175cd..d71efcc999 100644
--- a/binaries/data/mods/public/maps/random/alpine_lakes.js
+++ b/binaries/data/mods/public/maps/random/alpine_lakes.js
@@ -100,16 +100,7 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 
-//cover the ground with the primary terrain chosen in the beginning
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tPrimary);
-	}
-}
+initTerrain(tPrimary);
 
 // randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/alpine_valley.js b/binaries/data/mods/public/maps/random/alpine_valley.js
index ec7ccab10a..663b7a3699 100644
--- a/binaries/data/mods/public/maps/random/alpine_valley.js
+++ b/binaries/data/mods/public/maps/random/alpine_valley.js
@@ -85,14 +85,7 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 
-//cover the ground with the primary terrain chosen in the beginning
-for (var ix = 0; ix < mapSize; ix++)
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tPrimary);
-	}
+initTerrain(tPrimary);
 
 // randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/arctic_summer.js b/binaries/data/mods/public/maps/random/arctic_summer.js
index 733aa62abc..a66a1a23b9 100644
--- a/binaries/data/mods/public/maps/random/arctic_summer.js
+++ b/binaries/data/mods/public/maps/random/arctic_summer.js
@@ -54,10 +54,7 @@ var clMetal = createTileClass();
 var clFood = createTileClass();
 var clBaseResource = createTileClass();
 
-// Cover the ground with the primary terrain chosen in the beginning
-for (let ix = 0; ix < mapSize; ++ix)
-	for (let iz = 0; iz < mapSize; ++iz)
-		placeTerrain(ix, iz, tPrimary);
+initTerrain(tPrimary);
 
 // Randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/canyon.js b/binaries/data/mods/public/maps/random/canyon.js
index 8879000deb..7fb7351b31 100644
--- a/binaries/data/mods/public/maps/random/canyon.js
+++ b/binaries/data/mods/public/maps/random/canyon.js
@@ -65,15 +65,7 @@ var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 var clLand = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tMainTerrain);
-	}
-}
+initTerrain(tMainTerrain);
 
 var fx = fractionToTiles(0.5);
 var fz = fractionToTiles(0.5);
diff --git a/binaries/data/mods/public/maps/random/continent.js b/binaries/data/mods/public/maps/random/continent.js
index 554b8f72d9..1bf152215c 100644
--- a/binaries/data/mods/public/maps/random/continent.js
+++ b/binaries/data/mods/public/maps/random/continent.js
@@ -61,15 +61,7 @@ var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 var clLand = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tWater);
-	}
-}
+initTerrain(tWater);
 
 var fx = fractionToTiles(0.5);
 var fz = fractionToTiles(0.5);
diff --git a/binaries/data/mods/public/maps/random/corsica.js b/binaries/data/mods/public/maps/random/corsica.js
index 02327c4da1..cd111e8008 100644
--- a/binaries/data/mods/public/maps/random/corsica.js
+++ b/binaries/data/mods/public/maps/random/corsica.js
@@ -88,17 +88,7 @@ var clFood = createTileClass();
 var clSettlement = createTileClass();
 var clDune = createTileClass();
 
-// on every pixel of the map, set wet sand
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tVeryDeepWater);
-		//addToClass(ix,iz,clWater);
-	}
-}
+initTerrain(tVeryDeepWater);
 
 var swap = randBool();
 
diff --git a/binaries/data/mods/public/maps/random/flood.js b/binaries/data/mods/public/maps/random/flood.js
index 7736db5ea4..e57018411e 100644
--- a/binaries/data/mods/public/maps/random/flood.js
+++ b/binaries/data/mods/public/maps/random/flood.js
@@ -69,9 +69,7 @@ let clMetal = createTileClass();
 let clFood = createTileClass();
 let clBaseResource = createTileClass();
 
-for (let ix = 0; ix < mapSize; ++ix)
-	for (let iz = 0; iz < mapSize; ++iz)
-		placeTerrain(ix, iz, tWater);
+initTerrain(tWater);
 
 // Randomize player order
 let playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/gear.js b/binaries/data/mods/public/maps/random/gear.js
index 6fe94ce584..e28d0919d5 100644
--- a/binaries/data/mods/public/maps/random/gear.js
+++ b/binaries/data/mods/public/maps/random/gear.js
@@ -66,9 +66,7 @@ var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 var clLand = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-	for (var iz = 0; iz < mapSize; iz++)
-		placeTerrain(ix, iz, tMainTerrain);
+initTerrain(tMainTerrain);
 
 var fx = fractionToTiles(0.5);
 var fz = fractionToTiles(0.5);
diff --git a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js
index 510779557a..263e694822 100644
--- a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js
+++ b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js
@@ -136,15 +136,7 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tPrimary);
-	}
-}
+initTerrain(tPrimary);
 
 // randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/island_stronghold.js b/binaries/data/mods/public/maps/random/island_stronghold.js
index 2b2a7257bc..ada1e1c678 100644
--- a/binaries/data/mods/public/maps/random/island_stronghold.js
+++ b/binaries/data/mods/public/maps/random/island_stronghold.js
@@ -73,9 +73,7 @@ let clFood = createTileClass();
 let clBaseResource = createTileClass();
 let clLand = createTileClass();
 
-for (let ix = 0; ix < mapSize; ++ix)
-	for (let iz = 0; iz < mapSize; ++iz)
-		placeTerrain(ix, iz, tWater);
+initTerrain(tWater);
 
 // some constants
 let radius = scaleByMapSize(15, 25);
diff --git a/binaries/data/mods/public/maps/random/lake.js b/binaries/data/mods/public/maps/random/lake.js
index d6f513a6e6..98663dfb93 100644
--- a/binaries/data/mods/public/maps/random/lake.js
+++ b/binaries/data/mods/public/maps/random/lake.js
@@ -61,15 +61,7 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tMainTerrain);
-	}
-}
+initTerrain(tMainTerrain);
 
 // randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/mainland.js b/binaries/data/mods/public/maps/random/mainland.js
index cd4ae7caec..a71f08ce67 100644
--- a/binaries/data/mods/public/maps/random/mainland.js
+++ b/binaries/data/mods/public/maps/random/mainland.js
@@ -60,15 +60,7 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tMainTerrain);
-	}
-}
+initTerrain(tMainTerrain);
 
 // randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/oasis.js b/binaries/data/mods/public/maps/random/oasis.js
index 51dff23ec7..bf6f4b954d 100644
--- a/binaries/data/mods/public/maps/random/oasis.js
+++ b/binaries/data/mods/public/maps/random/oasis.js
@@ -54,15 +54,7 @@ var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 var clDune = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tSand);
-	}
-}
+initTerrain(tSand);
 
 // randomize player order
 var playerIDs = [];
diff --git a/binaries/data/mods/public/maps/random/persian_highlands.js b/binaries/data/mods/public/maps/random/persian_highlands.js
index c72ba94ed8..18db39b757 100644
--- a/binaries/data/mods/public/maps/random/persian_highlands.js
+++ b/binaries/data/mods/public/maps/random/persian_highlands.js
@@ -69,15 +69,7 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clCP = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tDirtMain);
-	}
-}
+initTerrain(tDirtMain);
 
 var playerIDs = [];
 for (var i = 0; i < numPlayers; i++)
diff --git a/binaries/data/mods/public/maps/random/polar_sea.js b/binaries/data/mods/public/maps/random/polar_sea.js
index a0513254a9..d3adbc9a14 100644
--- a/binaries/data/mods/public/maps/random/polar_sea.js
+++ b/binaries/data/mods/public/maps/random/polar_sea.js
@@ -45,9 +45,7 @@ var clWolf = createTileClass();
 // Expected by rmgen1
 var clForest = createTileClass();
 
-for (let ix = 0; ix < mapSize; ++ix)
-	for (let iz = 0; iz < mapSize; ++iz)
-		placeTerrain(ix, iz, tPrimary);
+initTerrain(tPrimary);
 
 var playerIDs = [];
 for (let i = 0; i < numPlayers; ++i)
diff --git a/binaries/data/mods/public/maps/random/rivers.js b/binaries/data/mods/public/maps/random/rivers.js
index 86f13c2d7a..261d19f2f9 100644
--- a/binaries/data/mods/public/maps/random/rivers.js
+++ b/binaries/data/mods/public/maps/random/rivers.js
@@ -65,15 +65,8 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 var clShallow = createTileClass();
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tMainTerrain);
-	}
-}
+
+initTerrain(tMainTerrain);
 
 var fx = fractionToTiles(0.5);
 var fz = fractionToTiles(0.5);
diff --git a/binaries/data/mods/public/maps/random/rmgen/library.js b/binaries/data/mods/public/maps/random/rmgen/library.js
index 979de94ccb..abf1f4df8c 100644
--- a/binaries/data/mods/public/maps/random/rmgen/library.js
+++ b/binaries/data/mods/public/maps/random/rmgen/library.js
@@ -290,6 +290,11 @@ function placeTerrain(x, z, terrain)
 	g_Map.placeTerrain(x, z, createTerrain(terrain));
 }
 
+function initTerrain(tileClass)
+{
+	g_Map.initTerrain(createTerrain(tileClass));
+}
+
 function isCircularMap()
 {
 	return !!g_MapSettings.CircularMap;
diff --git a/binaries/data/mods/public/maps/random/snowflake_searocks.js b/binaries/data/mods/public/maps/random/snowflake_searocks.js
index 7f2cb99def..36a32ab87f 100644
--- a/binaries/data/mods/public/maps/random/snowflake_searocks.js
+++ b/binaries/data/mods/public/maps/random/snowflake_searocks.js
@@ -63,17 +63,7 @@ var clBaseResource = createTileClass();
 var clSettlement = createTileClass();
 var clLand = createTileClass();
 
-//Paint the whole map
-
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tWater);
-	}
-}
+initTerrain(tWater);
 
 const radius = scaleByMapSize(15,30);
 const cliffRadius = 2;
diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest.js b/binaries/data/mods/public/maps/random/survivalofthefittest.js
index 28c3ef2faf..296a956576 100644
--- a/binaries/data/mods/public/maps/random/survivalofthefittest.js
+++ b/binaries/data/mods/public/maps/random/survivalofthefittest.js
@@ -54,9 +54,7 @@ var clBaseResource = createTileClass();
 var clLand = createTileClass();
 var clWomen = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-	for (var iz = 0; iz < mapSize; iz++)
-		placeTerrain(ix, iz, tMainTerrain);
+initTerrain(tMainTerrain);
 
 var ix = Math.round(fractionToTiles(0.5));
 var iz = Math.round(fractionToTiles(0.5));
diff --git a/binaries/data/mods/public/maps/random/unknown.js b/binaries/data/mods/public/maps/random/unknown.js
index 93c1f6d4b5..0752c8ba59 100644
--- a/binaries/data/mods/public/maps/random/unknown.js
+++ b/binaries/data/mods/public/maps/random/unknown.js
@@ -66,15 +66,7 @@ var clSettlement = createTileClass();
 var clLand = createTileClass();
 var clShallow = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tWater);
-	}
-}
+initTerrain(tWater);
 
 var iberianTowers = false;
 var md = randIntInclusive(1,13);
diff --git a/binaries/data/mods/public/maps/random/unknown_land.js b/binaries/data/mods/public/maps/random/unknown_land.js
index 9dd4f64a2c..de80e3fca1 100644
--- a/binaries/data/mods/public/maps/random/unknown_land.js
+++ b/binaries/data/mods/public/maps/random/unknown_land.js
@@ -66,15 +66,7 @@ var clSettlement = createTileClass();
 var clLand = createTileClass();
 var clShallow = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tWater);
-	}
-}
+initTerrain(tWater);
 
 var md = randIntInclusive(2,13);
 var needsAdditionalWood = false;
diff --git a/binaries/data/mods/public/maps/random/unknown_nomad.js b/binaries/data/mods/public/maps/random/unknown_nomad.js
index 77e24f55b5..bf6e16acec 100644
--- a/binaries/data/mods/public/maps/random/unknown_nomad.js
+++ b/binaries/data/mods/public/maps/random/unknown_nomad.js
@@ -66,15 +66,7 @@ var clSettlement = createTileClass();
 var clLand = createTileClass();
 var clShallow = createTileClass();
 
-for (var ix = 0; ix < mapSize; ix++)
-{
-	for (var iz = 0; iz < mapSize; iz++)
-	{
-		var x = ix / (mapSize + 1.0);
-		var z = iz / (mapSize + 1.0);
-			placeTerrain(ix, iz, tWater);
-	}
-}
+initTerrain(tWater);
 
 var startAngle = randFloat(0, TWO_PI);
 var md = randIntInclusive(1,13);