From f92279bbefa4ebd5916de9c0e36ec9530aa6da52 Mon Sep 17 00:00:00 2001 From: elexis Date: Thu, 27 Oct 2016 12:20:54 +0000 Subject: [PATCH] Remove unused clWater and clRiver tile class from maps that don't have water nor rivers. Remove pointless restraint checks on clWater on oasis before the water is painted. This was SVN commit r18872. --- .../mods/public/maps/random/alpine_valley.js | 33 +++++++------- .../public/maps/random/anatolian_plateau.js | 15 +++---- .../mods/public/maps/random/archipelago.js | 5 +-- .../data/mods/public/maps/random/canyon.js | 5 +-- .../data/mods/public/maps/random/continent.js | 3 +- .../mods/public/maps/random/deep_forest.js | 4 -- .../public/maps/random/guadalquivir_river.js | 11 +++-- .../data/mods/public/maps/random/islands.js | 23 +++++----- .../data/mods/public/maps/random/mainland.js | 1 - .../data/mods/public/maps/random/migration.js | 44 +++++++++---------- .../maps/random/neareastern_badlands.js | 1 - .../mods/public/maps/random/new_rms_test.js | 1 - .../data/mods/public/maps/random/oasis.js | 6 +-- .../public/maps/random/persian_highlands.js | 9 ++-- .../public/maps/random/pyrenean_sierra.js | 6 ++- .../public/maps/random/snowflake_searocks.js | 19 ++++---- .../data/mods/public/maps/random/syria.js | 11 +++-- .../mods/public/maps/random/volcanic_lands.js | 23 +++++----- 18 files changed, 100 insertions(+), 120 deletions(-) diff --git a/binaries/data/mods/public/maps/random/alpine_valley.js b/binaries/data/mods/public/maps/random/alpine_valley.js index a8cf0c3474..12be961d2f 100644 --- a/binaries/data/mods/public/maps/random/alpine_valley.js +++ b/binaries/data/mods/public/maps/random/alpine_valley.js @@ -85,7 +85,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -460,7 +459,7 @@ painter = new SmoothElevationPainter(ELEVATION_MODIFY, 2, 2); createAreas( placer, painter, - avoidClasses(clWater, 2, clPlayer, 10), + avoidClasses(clPlayer, 10), scaleByMapSize(100, 200) ); @@ -507,7 +506,7 @@ for (var i = 0; i < types.length; ++i) createAreas( placer, [painter, paintClass(clForest)], - avoidClasses(clPlayer, 12, clForest, 10, clHill, 0, clWater, 2), + avoidClasses(clPlayer, 12, clForest, 10, clHill, 0), num ); } @@ -527,7 +526,7 @@ for (var i = 0; i < sizes.length; i++) createAreas( placer, [painter, paintClass(clDirt)], - avoidClasses(clWater, 3, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), + avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45) ); } @@ -542,7 +541,7 @@ for (var i = 0; i < sizes.length; i++) createAreas( placer, painter, - avoidClasses(clWater, 3, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), + avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45) ); } @@ -553,14 +552,14 @@ log("Creating stone mines..."); // create large stone quarries group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 1, clPlayer, 20, clRock, 10, clHill, 1), + avoidClasses(clForest, 1, clPlayer, 20, clRock, 10, clHill, 1), scaleByMapSize(4,16), 100 ); // create small stone quarries group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 1, clPlayer, 20, clRock, 10, clHill, 1), + avoidClasses(clForest, 1, clPlayer, 20, clRock, 10, clHill, 1), scaleByMapSize(4,16), 100 ); @@ -568,7 +567,7 @@ log("Creating metal mines..."); // create large metal quarries group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,4)], true, clMetal); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 1, clPlayer, 20, clMetal, 10, clRock, 5, clHill, 1), + avoidClasses(clForest, 1, clPlayer, 20, clMetal, 10, clRock, 5, clHill, 1), scaleByMapSize(4,16), 100 ); @@ -582,7 +581,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(16, 262), 50 ); @@ -595,7 +594,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(8, 131), 50 ); @@ -608,7 +607,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), + avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 3 * numPlayers, 50 ); @@ -619,7 +618,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10), + avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10), randInt(1, 4) * numPlayers + 2, 50 ); @@ -630,7 +629,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), + avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 3 * numPlayers, 50 ); @@ -648,7 +647,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(clForest, 1, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1), num ); } @@ -662,7 +661,7 @@ group = new SimpleGroup( [new SimpleObject(aGrassShort, 1,2, 0,1, -PI/8,PI/8)] ); createObjectGroups(group, 0, - avoidClasses(clWater, 2, clHill, 2, clPlayer, 2, clDirt, 0), + avoidClasses(clHill, 2, clPlayer, 2, clDirt, 0), planetm * scaleByMapSize(13, 200) ); @@ -674,7 +673,7 @@ group = new SimpleGroup( [new SimpleObject(aGrass, 2,4, 0,1.8, -PI/8,PI/8), new SimpleObject(aGrassShort, 3,6, 1.2,2.5, -PI/8,PI/8)] ); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), + avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), planetm * scaleByMapSize(13, 200) ); @@ -686,7 +685,7 @@ group = new SimpleGroup( [new SimpleObject(aBushMedium, 1,2, 0,2), new SimpleObject(aBushSmall, 2,4, 0,2)] ); createObjectGroups(group, 0, - avoidClasses(clWater, 2, clHill, 1, clPlayer, 1, clDirt, 1), + avoidClasses(clHill, 1, clPlayer, 1, clDirt, 1), planetm * scaleByMapSize(13, 200), 50 ); diff --git a/binaries/data/mods/public/maps/random/anatolian_plateau.js b/binaries/data/mods/public/maps/random/anatolian_plateau.js index 512cc78eb4..d2871aba53 100644 --- a/binaries/data/mods/public/maps/random/anatolian_plateau.js +++ b/binaries/data/mods/public/maps/random/anatolian_plateau.js @@ -45,7 +45,6 @@ var mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -289,7 +288,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 10, clHill, 0), scaleByMapSize(16, 262), 50 ); @@ -302,7 +301,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 10, clHill, 0), scaleByMapSize(8, 131), 50 ); @@ -315,7 +314,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), + avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 6 * numPlayers, 50 ); @@ -326,7 +325,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20), + avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20), randInt(1, 4) * numPlayers + 2, 50 ); @@ -339,7 +338,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), + avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 3 * numPlayers, 50 ); @@ -368,7 +367,7 @@ group = new SimpleGroup( [new SimpleObject(aGrass, 2,4, 0,1.8, -PI/8,PI/8), new SimpleObject(aGrassShort, 3,6, 1.2,2.5, -PI/8,PI/8)] ); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), + avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), scaleByMapSize(13, 200) ); @@ -380,7 +379,7 @@ group = new SimpleGroup( [new SimpleObject(aBushMedium, 1,2, 0,2), new SimpleObject(aBushSmall, 2,4, 0,2)] ); createObjectGroups(group, 0, - avoidClasses(clWater, 1, clHill, 1, clPlayer, 1, clDirt, 1), + avoidClasses(clHill, 1, clPlayer, 1, clDirt, 1), scaleByMapSize(13, 200), 50 ); diff --git a/binaries/data/mods/public/maps/random/archipelago.js b/binaries/data/mods/public/maps/random/archipelago.js index 266741e95b..f2385a9d78 100644 --- a/binaries/data/mods/public/maps/random/archipelago.js +++ b/binaries/data/mods/public/maps/random/archipelago.js @@ -62,7 +62,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -237,7 +236,7 @@ for (var i = 0; i < numPlayers; i++) } // create bumps -createBumps([avoidClasses(clWater, 2, clPlayer, 10), stayClasses(clLand, 5)]); +createBumps([avoidClasses(clPlayer, 10), stayClasses(clLand, 5)]); // create hills if (randInt(1,2) == 1) @@ -318,7 +317,7 @@ createDecoration planetm * scaleByMapSize(13, 200), planetm * scaleByMapSize(13, 200) ], - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)] + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)] ); RMS.SetProgress(70); diff --git a/binaries/data/mods/public/maps/random/canyon.js b/binaries/data/mods/public/maps/random/canyon.js index 0bb35e1721..b6ab857465 100644 --- a/binaries/data/mods/public/maps/random/canyon.js +++ b/binaries/data/mods/public/maps/random/canyon.js @@ -63,7 +63,6 @@ var clPlayer = createTileClass(); var clHill = createTileClass(); var clHill2 = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -484,7 +483,7 @@ createFood 3 * numPlayers, 3 * numPlayers ], - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 4, clHill, 1, clFood, 20, clHill2, 1), stayClasses(clLand, 3)] + [avoidClasses(clForest, 0, clPlayer, 4, clHill, 1, clFood, 20, clHill2, 1), stayClasses(clLand, 3)] ); // create fruits @@ -496,7 +495,7 @@ createFood [ 3 * numPlayers ], - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 4, clHill, 1, clFood, 10, clHill2, 1), stayClasses(clLand, 3)] + [avoidClasses(clForest, 0, clPlayer, 4, clHill, 1, clFood, 10, clHill2, 1), stayClasses(clLand, 3)] ); RMS.SetProgress(85); diff --git a/binaries/data/mods/public/maps/random/continent.js b/binaries/data/mods/public/maps/random/continent.js index abbced4127..c5516678ab 100644 --- a/binaries/data/mods/public/maps/random/continent.js +++ b/binaries/data/mods/public/maps/random/continent.js @@ -59,7 +59,6 @@ var mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -238,7 +237,7 @@ for (var i = 0; i < numPlayers; ++i) } // create bumps -createBumps([avoidClasses(clWater, 2, clPlayer, 10), stayClasses(clLand, 5)]); +createBumps([avoidClasses(clPlayer, 10), stayClasses(clLand, 5)]); // create hills if (randInt(1,2) == 1) diff --git a/binaries/data/mods/public/maps/random/deep_forest.js b/binaries/data/mods/public/maps/random/deep_forest.js index ce35a6de85..62f9dbf946 100644 --- a/binaries/data/mods/public/maps/random/deep_forest.js +++ b/binaries/data/mods/public/maps/random/deep_forest.js @@ -4,15 +4,11 @@ RMS.LoadLibrary("rmgen"); log("Initializing map..."); InitMap(); - // Setup tile classes var clPlayer = createTileClass(); var clPath = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -// var clWater = createTileClass(); -// var clRock = createTileClass(); -// var clFood = createTileClass(); var clBaseResource = createTileClass(); // Setup Templates diff --git a/binaries/data/mods/public/maps/random/guadalquivir_river.js b/binaries/data/mods/public/maps/random/guadalquivir_river.js index 038912cbee..e523227bac 100644 --- a/binaries/data/mods/public/maps/random/guadalquivir_river.js +++ b/binaries/data/mods/public/maps/random/guadalquivir_river.js @@ -56,7 +56,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -285,7 +284,7 @@ paintTerrainBasedOnHeight(1, 3, 0, tShore); paintTerrainBasedOnHeight(-8, 1, 2, tWater); // create bumps -createBumps([avoidClasses(clWater, 2, clPlayer, 20, clRiver, 1), stayClasses(clLand, 3)]); +createBumps([avoidClasses(clPlayer, 20, clRiver, 1), stayClasses(clLand, 3)]); // create forests createForests( @@ -355,7 +354,7 @@ createDecoration scaleByMapSize(13, 200), scaleByMapSize(13, 200) ], - [avoidClasses(clWater, 1, clHill, 1, clPlayer, 1, clDirt, 1, clRiver, 1), stayClasses(clLand, 6)] + [avoidClasses(clHill, 1, clPlayer, 1, clDirt, 1, clRiver, 1), stayClasses(clLand, 6)] ); // create water decoration in the shallow parts @@ -384,7 +383,7 @@ createFood 3 * numPlayers, 3 * numPlayers ], - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20, clRiver, 1), stayClasses(clLand, 3)] + [avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20, clRiver, 1), stayClasses(clLand, 3)] ); // create fruits @@ -396,7 +395,7 @@ createFood [ randInt(1, 4) * numPlayers + 2 ], - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10, clRiver, 1), stayClasses(clLand, 3)] + [avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10, clRiver, 1), stayClasses(clLand, 3)] ); // create fish @@ -417,7 +416,7 @@ RMS.SetProgress(85); // create straggler trees log("Creating straggler trees..."); var types = [oPoplar, oCarob, oApple]; // some variation -createStragglerTrees(types, [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1, clRiver, 1), stayClasses(clLand, 7)]); +createStragglerTrees(types, [avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1, clRiver, 1), stayClasses(clLand, 7)]); setSkySet("cumulus"); setWaterColor(0.443,0.412,0.322); diff --git a/binaries/data/mods/public/maps/random/islands.js b/binaries/data/mods/public/maps/random/islands.js index 102ad3644f..c3d3cffd3d 100644 --- a/binaries/data/mods/public/maps/random/islands.js +++ b/binaries/data/mods/public/maps/random/islands.js @@ -60,7 +60,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -313,7 +312,7 @@ painter = new SmoothElevationPainter(ELEVATION_MODIFY, 2, 2); createAreas( placer, painter, - [avoidClasses(clWater, 2, clPlayer, 0), stayClasses(clLand, 3)], + [avoidClasses(clPlayer, 0), stayClasses(clLand, 3)], scaleByMapSize(20, 100) ); @@ -455,7 +454,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)], scaleByMapSize(16, 262), 50 ); @@ -468,7 +467,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)], scaleByMapSize(8, 131), 50 ); @@ -481,7 +480,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 1, clFood, 20), stayClasses(clLand, 5)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 1, clFood, 20), stayClasses(clLand, 5)], 3 * numPlayers, 50 ); @@ -494,7 +493,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 1, clFood, 20), stayClasses(clLand, 5)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 1, clFood, 20), stayClasses(clLand, 5)], 3 * numPlayers, 50 ); @@ -505,7 +504,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 8, clHill, 1, clFood, 20), stayClasses(clLand, 5)], + [avoidClasses(clForest, 0, clPlayer, 8, clHill, 1, clFood, 20), stayClasses(clLand, 5)], randInt(1, 4) * numPlayers + 2, 50 ); @@ -516,7 +515,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - avoidClasses(clLand, 4, clForest, 0, clPlayer, 0, clHill, 0, clFood, 20), + avoidClasses(clLand, 4, clForest, 2, clPlayer, 2, clHill, 2, clFood, 20), 25 * numPlayers, 60 ); @@ -534,7 +533,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, 6)], + [avoidClasses(clForest, 1, clHill, 1, clPlayer, 0, clMetal, 1, clRock, 1), stayClasses(clLand, 6)], num ); } @@ -549,7 +548,7 @@ group = new SimpleGroup( [new SimpleObject(aGrassShort, 1,2, 0,1, -PI/8,PI/8)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 2, clHill, 2, clPlayer, 2, clDirt, 0), stayClasses(clLand, 6)], + [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 0), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200) ); @@ -561,7 +560,7 @@ group = new SimpleGroup( [new SimpleObject(aGrass, 2,4, 0,1.8, -PI/8,PI/8), new SimpleObject(aGrassShort, 3,6, 1.2,2.5, -PI/8,PI/8)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 3, clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 5)], + [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 5)], planetm * scaleByMapSize(13, 200) ); @@ -573,7 +572,7 @@ group = new SimpleGroup( [new SimpleObject(aBushMedium, 1,2, 0,2), new SimpleObject(aBushSmall, 2,4, 0,2)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 1, clHill, 1, clPlayer, 1, clDirt, 1), stayClasses(clLand, 6)], + [avoidClasses(clHill, 1, clPlayer, 1, clDirt, 1), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200), 50 ); diff --git a/binaries/data/mods/public/maps/random/mainland.js b/binaries/data/mods/public/maps/random/mainland.js index 9f75237892..b904c85d88 100644 --- a/binaries/data/mods/public/maps/random/mainland.js +++ b/binaries/data/mods/public/maps/random/mainland.js @@ -59,7 +59,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); diff --git a/binaries/data/mods/public/maps/random/migration.js b/binaries/data/mods/public/maps/random/migration.js index 62765dfa3b..40b4292c91 100644 --- a/binaries/data/mods/public/maps/random/migration.js +++ b/binaries/data/mods/public/maps/random/migration.js @@ -60,7 +60,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -68,7 +67,6 @@ var clFood = createTileClass(); var clBaseResource = createTileClass(); var clSettlement = createTileClass(); var clLand = createTileClass(); -var clRiver = createTileClass(); // randomize player order var playerIDs = []; @@ -259,7 +257,7 @@ painter = new SmoothElevationPainter(ELEVATION_MODIFY, 2, 2); createAreas( placer, painter, - [avoidClasses(clWater, 2, clPlayer, 10, clRiver, 1), stayClasses(clLand, 3)], + [avoidClasses(clPlayer, 10), stayClasses(clLand, 3)], scaleByMapSize(100, 200) ); @@ -328,7 +326,7 @@ for (var i = 0; i < types.length; ++i) createAreas( placer, [painter, paintClass(clForest)], - [avoidClasses(clPlayer, 6, clForest, 10, clHill, 0, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clPlayer, 6, clForest, 10, clHill, 0), stayClasses(clLand, 7)], num ); } @@ -347,7 +345,7 @@ for (var i = 0; i < sizes.length; i++) createAreas( placer, [painter, paintClass(clDirt)], - [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0), stayClasses(clLand, 7)], scaleByMapSize(15, 45) ); } @@ -362,7 +360,7 @@ for (var i = 0; i < sizes.length; i++) createAreas( placer, painter, - [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0), stayClasses(clLand, 7)], scaleByMapSize(15, 45) ); } @@ -373,14 +371,14 @@ log("Creating stone mines..."); // create large stone quarries group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); createObjectGroups(group, 0, - [avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), stayClasses(clLand, 7)], scaleByMapSize(4,16), 100 ); // create small stone quarries group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock); createObjectGroups(group, 0, - [avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), stayClasses(clLand, 7)], scaleByMapSize(4,16), 100 ); @@ -388,7 +386,7 @@ log("Creating metal mines..."); // create large metal quarries group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,4)], true, clMetal); createObjectGroups(group, 0, - [avoidClasses(clForest, 1, clPlayer, 10, clMetal, 10, clRock, 5, clHill, 1, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clForest, 1, clPlayer, 10, clMetal, 10, clRock, 5, clHill, 1), stayClasses(clLand, 7)], scaleByMapSize(4,16), 100 ); @@ -402,7 +400,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0, clRiver, 1), stayClasses(clLand, 6)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 6)], scaleByMapSize(16, 262), 50 ); @@ -415,7 +413,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0, clRiver, 1), stayClasses(clLand, 6)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 6)], scaleByMapSize(8, 131), 50 ); @@ -428,7 +426,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 7)], 3 * numPlayers, 50 ); @@ -441,7 +439,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20, clRiver, 1), stayClasses(clLand, 7)], + [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 7)], 3 * numPlayers, 50 ); @@ -452,18 +450,16 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 8, clHill, 1, clFood, 20), stayClasses(clLand, 7)], + [avoidClasses(clForest, 0, clPlayer, 8, clHill, 1, clFood, 20), stayClasses(clLand, 7)], randInt(1, 4) * numPlayers + 2, 50 ); // create fish log("Creating fish..."); -group = new SimpleGroup( - [new SimpleObject(oFish, 2,3, 0,2)], - true, clFood -); -createObjectGroups(group, 0, - avoidClasses(clLand, 2, clForest, 0, clPlayer, 0, clHill, 0, clFood, 20, clRiver, 1), +createObjectGroups( + new SimpleGroup([new SimpleObject(oFish, 2,3, 0,2)], true, clFood), + 0, + avoidClasses(clLand, 2, clPlayer, 2, clHill, 0, clFood, 20), 25 * numPlayers, 60 ); @@ -481,7 +477,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, clRiver, 1), stayClasses(clLand, 9)], + [avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 9)], num ); } @@ -497,7 +493,7 @@ group = new SimpleGroup( [new SimpleObject(aGrassShort, 1,2, 0,1, -PI/8,PI/8)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 2, clHill, 2, clPlayer, 2, clDirt, 0, clRiver, 1), stayClasses(clLand, 6)], + [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 0), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200) ); @@ -509,7 +505,7 @@ group = new SimpleGroup( [new SimpleObject(aGrass, 2,4, 0,1.8, -PI/8,PI/8), new SimpleObject(aGrassShort, 3,6, 1.2,2.5, -PI/8,PI/8)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 3, clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0, clRiver, 1), stayClasses(clLand, 6)], + [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200) ); @@ -521,7 +517,7 @@ group = new SimpleGroup( [new SimpleObject(aBushMedium, 1,2, 0,2), new SimpleObject(aBushSmall, 2,4, 0,2)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 1, clHill, 1, clPlayer, 1, clDirt, 1, clRiver, 1), stayClasses(clLand, 6)], + [avoidClasses(clHill, 1, clPlayer, 1, clDirt, 1), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200), 50 ); diff --git a/binaries/data/mods/public/maps/random/neareastern_badlands.js b/binaries/data/mods/public/maps/random/neareastern_badlands.js index e3bfd61b91..be1afb70de 100644 --- a/binaries/data/mods/public/maps/random/neareastern_badlands.js +++ b/binaries/data/mods/public/maps/random/neareastern_badlands.js @@ -57,7 +57,6 @@ var clHill1 = createTileClass(); var clHill2 = createTileClass(); var clHill3 = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clPatch = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); diff --git a/binaries/data/mods/public/maps/random/new_rms_test.js b/binaries/data/mods/public/maps/random/new_rms_test.js index bc39287066..7be40f4dc0 100644 --- a/binaries/data/mods/public/maps/random/new_rms_test.js +++ b/binaries/data/mods/public/maps/random/new_rms_test.js @@ -13,7 +13,6 @@ var clPlayer = createTileClass(); var clPath = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clRock = createTileClass(); var clFood = createTileClass(); var clBaseResource = createTileClass(); diff --git a/binaries/data/mods/public/maps/random/oasis.js b/binaries/data/mods/public/maps/random/oasis.js index b3f680d4a9..bd24ca71e1 100644 --- a/binaries/data/mods/public/maps/random/oasis.js +++ b/binaries/data/mods/public/maps/random/oasis.js @@ -212,20 +212,20 @@ log("Creating bumps..."); placer = new ClumpPlacer(scaleByMapSize(20, 50), 0.3, 0.06, 1); painter = new SmoothElevationPainter(ELEVATION_MODIFY, 4, 3); createAreas( placer, painter, - avoidClasses(clWater, 5, clPlayer, 10, clBaseResource, 6), + avoidClasses(clPlayer, 10, clBaseResource, 6), scaleByMapSize(30, 70) ); log("Creating dirt Patches..."); placer = new ClumpPlacer(80, 0.3, 0.06, 1); var terrainPainter = new TerrainPainter(tDirt); -createAreas( placer, terrainPainter, avoidClasses(clWater, 10, clPlayer, 10, clBaseResource, 6), scaleByMapSize(15, 50) ); +createAreas(placer, terrainPainter, avoidClasses(clPlayer, 10, clBaseResource, 6), scaleByMapSize(15, 50) ); log("Creating Dunes..."); placer = new ClumpPlacer(120, 0.3, 0.06, 1); var terrainPainter = new TerrainPainter(tDune); painter = new SmoothElevationPainter(ELEVATION_MODIFY, 18, 30); createAreas( placer, [terrainPainter, painter], - avoidClasses(clWater, 13, clPlayer, 10, clBaseResource, 6), + avoidClasses(clPlayer, 10, clBaseResource, 6), scaleByMapSize(15, 50) ); diff --git a/binaries/data/mods/public/maps/random/persian_highlands.js b/binaries/data/mods/public/maps/random/persian_highlands.js index 71523216f5..92445adf65 100644 --- a/binaries/data/mods/public/maps/random/persian_highlands.js +++ b/binaries/data/mods/public/maps/random/persian_highlands.js @@ -66,7 +66,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clPatch = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -279,7 +278,7 @@ for (var i = 0; i < types.length; ++i) createAreas( placer, [painter, paintClass(clForest)], - avoidClasses(clPlayer, 6, clWater, 3, clForest, 10, clHill, 1, clCP, 1), + avoidClasses(clPlayer, 6, clForest, 10, clHill, 1, clCP, 1), num ); } @@ -344,7 +343,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(16, 262), 50 ); @@ -358,7 +357,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(8, 131), 50 ); @@ -422,7 +421,7 @@ for (var i = 0; i < types.length; ++i) true, clForest ); createObjectGroups(group, 0, - avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1, clCP, 2), + avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1, clCP, 2), num ); } diff --git a/binaries/data/mods/public/maps/random/pyrenean_sierra.js b/binaries/data/mods/public/maps/random/pyrenean_sierra.js index 39b267376f..09c47417ca 100644 --- a/binaries/data/mods/public/maps/random/pyrenean_sierra.js +++ b/binaries/data/mods/public/maps/random/pyrenean_sierra.js @@ -284,11 +284,13 @@ for (var ix = 0; ix < mapSize; ix++) baseHeights.push([]); for (var iz = 0; iz < mapSize; iz++) { - if (g_Map.inMapBounds(ix,iz) && !checkIfInClass(ix,iz,clWater)) { + if (g_Map.inMapBounds(ix,iz)) + { placeTerrain(ix, iz, tGrass); setHeight(ix,iz,baseHeight +randFloat(-1,1) + scaleByMapSize(1,3)*(cos(ix/scaleByMapSize(5,30))+sin(iz/scaleByMapSize(5,30)))); baseHeights[ix].push( baseHeight +randFloat(-1,1) + scaleByMapSize(1,3)*(cos(ix/scaleByMapSize(5,30))+sin(iz/scaleByMapSize(5,30))) ); - } else + } + else baseHeights[ix].push(-100); } } diff --git a/binaries/data/mods/public/maps/random/snowflake_searocks.js b/binaries/data/mods/public/maps/random/snowflake_searocks.js index 17c983d158..aa718676d8 100644 --- a/binaries/data/mods/public/maps/random/snowflake_searocks.js +++ b/binaries/data/mods/public/maps/random/snowflake_searocks.js @@ -61,7 +61,6 @@ log(mapSize); var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -1788,7 +1787,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 4)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 4)], scaleByMapSize(16, 262), 50 ); @@ -1801,7 +1800,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 4)], + [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 4)], scaleByMapSize(8, 131), 50 ); @@ -1814,7 +1813,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 4)], + [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 4)], 3 * numPlayers, 50 ); @@ -1827,7 +1826,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 4)], + [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 4)], 3 * numPlayers, 50 ); @@ -1838,7 +1837,7 @@ group = new SimpleGroup( true, clFood ); createObjectGroups(group, 0, - [avoidClasses(clWater, 0, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 4)], + [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 4)], 3 * numPlayers, 50 ); @@ -1856,7 +1855,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, 4)], + [avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 4)], num ); } @@ -1871,7 +1870,7 @@ group = new SimpleGroup( [new SimpleObject(aGrassShort, 1,2, 0,1, -PI/8,PI/8)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 2, clHill, 2, clPlayer, 2, clDirt, 0), stayClasses(clLand, 4)], + [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 0), stayClasses(clLand, 4)], planetm * scaleByMapSize(13, 200) ); @@ -1883,7 +1882,7 @@ group = new SimpleGroup( [new SimpleObject(aGrass, 2,4, 0,1.8, -PI/8,PI/8), new SimpleObject(aGrassShort, 3,6, 1.2,2.5, -PI/8,PI/8)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 3, clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 4)], + [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 4)], planetm * scaleByMapSize(13, 200) ); @@ -1895,7 +1894,7 @@ group = new SimpleGroup( [new SimpleObject(aBushMedium, 1,2, 0,2), new SimpleObject(aBushSmall, 2,4, 0,2)] ); createObjectGroups(group, 0, - [avoidClasses(clWater, 1, clHill, 1, clPlayer, 1, clDirt, 1), stayClasses(clLand, 4)], + [avoidClasses(clHill, 1, clPlayer, 1, clDirt, 1), stayClasses(clLand, 4)], planetm * scaleByMapSize(13, 200), 50 ); diff --git a/binaries/data/mods/public/maps/random/syria.js b/binaries/data/mods/public/maps/random/syria.js index 64abc4b5e5..72172a3e82 100644 --- a/binaries/data/mods/public/maps/random/syria.js +++ b/binaries/data/mods/public/maps/random/syria.js @@ -53,7 +53,6 @@ const mapArea = mapSize*mapSize; var clPlayer = createTileClass(); var clHill = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -227,7 +226,7 @@ for (var i = 0; i < types.length; ++i) createAreas( placer, [painter, paintClass(clForest)], - avoidClasses(clPlayer, 1, clGrass, 1, clWater, 3, clForest, 10, clHill, 1), + avoidClasses(clPlayer, 1, clGrass, 1, clForest, 10, clHill, 1), num ); } @@ -303,7 +302,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(16, 262), 50 ); @@ -316,7 +315,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(50, 500), 50 ); @@ -370,7 +369,7 @@ for (var i = 0; i < types.length; ++i) true, clForest ); createObjectGroups(group, 0, - avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1), + avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1), num ); } @@ -386,7 +385,7 @@ for (var i = 0; i < types.length; ++i) true, clForest ); createObjectGroups(group, 0, - [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1), stayClasses(clGrass, 3)], + [avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1), stayClasses(clGrass, 3)], num ); } diff --git a/binaries/data/mods/public/maps/random/volcanic_lands.js b/binaries/data/mods/public/maps/random/volcanic_lands.js index 1fda552a5c..f76ba12a93 100644 --- a/binaries/data/mods/public/maps/random/volcanic_lands.js +++ b/binaries/data/mods/public/maps/random/volcanic_lands.js @@ -39,7 +39,6 @@ var clHill2 = createTileClass(); var clHill3 = createTileClass(); var clHill4 = createTileClass(); var clForest = createTileClass(); -var clWater = createTileClass(); var clDirt = createTileClass(); var clRock = createTileClass(); var clMetal = createTileClass(); @@ -225,7 +224,7 @@ elevationPainter = new SmoothElevationPainter(ELEVATION_SET, 18, 2); createAreas( placer, [terrainPainter, elevationPainter, paintClass(clHill)], - avoidClasses(clPlayer, 12, clHill, 15, clWater, 2, clBaseResource, 2), + avoidClasses(clPlayer, 12, clHill, 15, clBaseResource, 2), scaleByMapSize(2, 8) * numPlayers ); @@ -258,7 +257,7 @@ for (var i = 0; i < types.length; ++i) createAreas( placer, [painter, paintClass(clForest)], - avoidClasses(clPlayer, 12, clForest, 10, clHill, 0, clWater, 2), + avoidClasses(clPlayer, 12, clForest, 10, clHill, 0), num ); } @@ -277,7 +276,7 @@ for (var i = 0; i < sizes.length; i++) createAreas( placer, [painter, paintClass(clDirt)], - avoidClasses(clWater, 3, clForest, 0, clHill, 0, clPlayer, 12), + avoidClasses(clForest, 0, clHill, 0, clPlayer, 12), scaleByMapSize(20, 80) ); } @@ -292,7 +291,7 @@ for (var i = 0; i < sizes.length; i++) createAreas( placer, [painter, paintClass(clDirt)], - avoidClasses(clWater, 3, clForest, 0, clHill, 0, clPlayer, 12), + avoidClasses(clForest, 0, clHill, 0, clPlayer, 12), scaleByMapSize(20, 80) ); } @@ -307,7 +306,7 @@ for (var i = 0; i < sizes.length; i++) createAreas( placer, [painter, paintClass(clDirt)], - avoidClasses(clWater, 3, clForest, 0, clHill, 0, clPlayer, 12), + avoidClasses(clForest, 0, clHill, 0, clPlayer, 12), scaleByMapSize(20, 80) ); } @@ -315,21 +314,21 @@ for (var i = 0; i < sizes.length; i++) log("Creating stone mines..."); group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), + avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), scaleByMapSize(4,16), 100 ); // create small stone quarries group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), + avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), scaleByMapSize(4,16), 100 ); log("Creating metal mines..."); group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,4)], true, clMetal); createObjectGroups(group, 0, - avoidClasses(clWater, 3, clForest, 1, clPlayer, 10, clMetal, 10, clRock, 5, clHill, 1), + avoidClasses(clForest, 1, clPlayer, 10, clMetal, 10, clRock, 5, clHill, 1), scaleByMapSize(4,16), 100 ); @@ -342,7 +341,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(16, 262), 50 ); @@ -354,7 +353,7 @@ group = new SimpleGroup( ); createObjectGroups( group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(8, 131), 50 ); @@ -370,7 +369,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(clForest, 1, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1), num ); }