Index: binaries/data/mods/public/maps/random/hyrcanian_shores.js
===================================================================
--- binaries/data/mods/public/maps/random/hyrcanian_shores.js   (revision 20453)
+++ binaries/data/mods/public/maps/random/hyrcanian_shores.js   (working copy)
@@ -52,88 +52,37 @@ var clFood = createTileClass();
 var clBaseResource = createTileClass();
 var clSea = createTileClass();
 var clHighlands = createTileClass();
 var clFlatlands = createTileClass();

-var playerIDs = sortAllPlayers();
-
-for (var i = 0; i < numPlayers; i++)
-{
-   var id = playerIDs[i];
-   log("Creating base for player " + id + "...");
-
-   var radius = scaleByMapSize(15,25);
-   var cliffRadius = 2;
-   var elevation = 20;
-
-   // get the x and z in tiles
-   var fx = fractionToTiles((i + 1) / (numPlayers + 1));
-   var fz = fractionToTiles(0.4 + 0.2 * (i % 2));
-   var ix = round(fx);
-   var iz = round(fz);
-
-   addCivicCenterAreaToClass(ix, iz, clPlayer);
-
-   // create the city patch
-   var cityRadius = radius/3;
-   var placer = new ClumpPlacer(PI*cityRadius*cityRadius, 0.6, 0.3, 10, ix, iz);
-   var painter = new LayeredPainter([tRoadWild, tRoad], [1]);
-   createArea(placer, painter, null);
-
-   placeCivDefaultEntities(fx, fz, id);
-
-   placeDefaultChicken(fx, fz, clBaseResource);
-
-   // create berry bushes
-   var bbAngle = randFloat(0, TWO_PI);
-   var bbDist = 12;
-   var bbX = round(fx + bbDist * cos(bbAngle));
-   var bbZ = round(fz + bbDist * sin(bbAngle));
-   var group = new SimpleGroup(
-       [new SimpleObject(oBerryBush, 5,5, 0,3)],
-       true, clBaseResource, bbX, bbZ
-   );
-   createObjectGroup(group, 0);
-
-   // create metal mine
-   var mAngle = bbAngle;
-   while(abs(mAngle - bbAngle) < PI/3)
-       mAngle = randFloat(0, TWO_PI);
-
-   var mDist = 12;
-   var mX = round(fx + mDist * cos(mAngle));
-   var mZ = round(fz + mDist * sin(mAngle));
-   group = new SimpleGroup(
-       [new SimpleObject(oMetalLarge, 1,1, 0,0)],
-       true, clBaseResource, mX, mZ
-   );
-   createObjectGroup(group, 0);
-
-   // create stone mines
-   mAngle += randFloat(PI/8, PI/4);
-   mX = round(fx + mDist * cos(mAngle));
-   mZ = round(fz + mDist * sin(mAngle));
-   group = new SimpleGroup(
-       [new SimpleObject(oStoneLarge, 1,1, 0,2)],
-       true, clBaseResource, mX, mZ
-   );
-   createObjectGroup(group, 0);
-
-   // create starting trees
-   var num = 2;
-   var tAngle = randFloat(-PI/3, 4*PI/3);
-   var tDist = randFloat(11, 13);
-   var tX = round(fx + tDist * cos(tAngle));
-   var tZ = round(fz + tDist * sin(tAngle));
-   group = new SimpleGroup(
-       [new SimpleObject(oOak, num, num, 0,5)],
-       false, clBaseResource, tX, tZ
-   );
-   createObjectGroup(group, 0, avoidClasses(clBaseResource,2));
-
-   placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius);
-}
+placeDefaultPlayerBases({
+   "playerPlacement": playerPlacementLine(true, 0.5, 0.2),
+   "playerTileClass": clPlayer,
+   "baseResourceClass": clBaseResource,
+   "cityPatch": {
+       "innerTerrain": tRoadWild,
+       "outerTerrain": tRoad
+   },
+   "chicken": {
+   },
+   "berries": {
+       "template": oBerryBush
+   },
+   "mines": {
+       "types": [
+           { "template": oMetalLarge },
+           { "template": oStoneLarge }
+       ]
+   },
+   "trees": {
+       "template": oOak,
+       "radiusFactor": 1/30
+   },
+   "decoratives": {
+       "template": aGrassShort
+   }
+});
 RMS.SetProgress(10);

 paintRiver({
    "parallel": true,
    "startX": 0,