From 2ff3001b08ff376a7da8a353cd08b2036fb59864 Mon Sep 17 00:00:00 2001 From: Matei Date: Tue, 8 Aug 2006 04:15:09 +0000 Subject: [PATCH] # Updated Cantabrian Highlands RMS to add territories. This was SVN commit r4207. --- .../maps/random/cantabrian_highlands.js | 26 +++++++++++++++---- .../maps/scenarios/cantabrian_generated.pmp | 2 +- .../maps/scenarios/cantabrian_generated.xml | 4 +-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/binaries/data/mods/official/maps/random/cantabrian_highlands.js b/binaries/data/mods/official/maps/random/cantabrian_highlands.js index 0fc4077442..f9b841b116 100644 --- a/binaries/data/mods/official/maps/random/cantabrian_highlands.js +++ b/binaries/data/mods/official/maps/random/cantabrian_highlands.js @@ -56,6 +56,7 @@ clPlayer = createTileClass(); clHill = createTileClass(); clForest = createTileClass(); clWater = createTileClass(); +clSettlement = createTileClass(); clDirt = createTileClass(); clRock = createTileClass(); clFood = createTileClass(); @@ -134,6 +135,13 @@ for(i=1; i<=NUM_PLAYERS; i++) { ); createObjectGroup(group, i); + // Create the Settlement under the TC + group = new SimpleGroup( + [new SimpleObject("special_settlement", 1,1, 0,0)], + true, null, ix, iy + ); + createObjectGroup(group, 0); + // create berry bushes bbAngle = randFloat()*2*PI; bbDist = 9; @@ -258,11 +266,19 @@ createObjectGroups(group, 0, 3 * NUM_PLAYERS, 100 ); +// create settlements +println("Creating settlements..."); +group = new SimpleGroup([new SimpleObject("special_settlement", 1,1, 0,0)], true, clSettlement); +createObjectGroups(group, 0, + avoidClasses(clWater, 0, clForest, 0, clPlayer, 15, clHill, 0, clRock, 5, clSettlement, 35), + 2 * NUM_PLAYERS, 50 +); + // create small decorative rocks println("Creating large decorative rocks..."); group = new SimpleGroup([new SimpleObject(oRockMedium, 1,3, 0,1)], true); createObjectGroups(group, 0, - avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0, clSettlement, 3), SIZE*SIZE/1000, 50 ); @@ -271,7 +287,7 @@ println("Creating large decorative rocks..."); group = new SimpleGroup([new SimpleObject(oRockLarge, 1,2, 0,1), new SimpleObject(oRockMedium, 1,3, 0,2)], true); createObjectGroups(group, 0, - avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), + avoidClasses(clForest, 0, clPlayer, 0, clHill, 0, clSettlement, 5), SIZE*SIZE/2000, 50 ); @@ -279,7 +295,7 @@ createObjectGroups(group, 0, println("Creating deer..."); group = new SimpleGroup([new SimpleObject(oDeer, 5,7, 0,4)], true, clFood); createObjectGroups(group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0, clFood, 20), + avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0, clFood, 20, clSettlement, 5), 3 * NUM_PLAYERS, 50 ); @@ -287,7 +303,7 @@ createObjectGroups(group, 0, println("Creating sheep..."); group = new SimpleGroup([new SimpleObject(oSheep, 2,3, 0,2)], true, clFood); createObjectGroups(group, 0, - avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0, clFood, 20), + avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0, clFood, 20, clSettlement, 5), 3 * NUM_PLAYERS, 50 ); @@ -295,7 +311,7 @@ createObjectGroups(group, 0, println("Creating straggler trees..."); group = new SimpleGroup([new SimpleObject(oTree, 1,1, 0,0)], true); createObjectGroups(group, 0, - avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1), + avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clSettlement, 2), SIZE*SIZE/1100 ); diff --git a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp index a219db5d37..de12240af7 100644 --- a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp +++ b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61823c2bc92a1fa01f51e0ba70632bedcf5238af1e6545be5a118f6c812dfc38 +oid sha256:cf73e5c4070a7a685bac4f626d4a897229d208b87a7a499efb4019994d3e9b4a size 433730 diff --git a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml index 0677c2d779..aca0dd82b7 100644 --- a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml +++ b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d326228fa27def17a3e23b790ca957f00ef622f32ab7c91f9a65c9c8b41232cb -size 1170748 +oid sha256:37ceea8b754540e0d5edf1977497fb0d31560452efef1a0858dfd569271661be +size 1161059