real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Prevent collisions of straggler trees with mines. Reviewed by FeXoR on 2016-10-29.

Browse Source 
This was SVN commit r18953.
This commit is contained in:
elexis 2016-11-16 13:57:04 +00:00
parent 827ee03cc0
commit d999fc4be5
42 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/maps/random/aegean_sea.js
View File

@ -425,7 +425,7 @@ RMS.SetProgress(90);
// create straggler trees
var types = [oDatePalm, oSDatePalm, oCarob, oFanPalm, oPoplar, oCypress]; // some variation
createStragglerTrees(types, avoidClasses(clForest, 0, clWater, 2, clPlayer, 8, clMetal, 1, clHill, 1));
createStragglerTrees(types, avoidClasses(clForest, 1, clWater, 2, clPlayer, 12, clMetal, 6, clHill, 1));
log("Creating straggler island trees...");
g_numStragglerTrees *= 10;

2
binaries/data/mods/public/maps/random/alpine_lakes.js
View File

@ -412,7 +412,7 @@ RMS.SetProgress(85);
// create straggler trees
var types = [oPine];
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 3, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 3, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6));
random_var = randInt(1,3);

2
binaries/data/mods/public/maps/random/alpine_valley.js
View File

@ -607,7 +607,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clForest, 1, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1),
avoidClasses(clForest, 1, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6),
num
);
}

2
binaries/data/mods/public/maps/random/anatolian_plateau.js
View File

@ -356,7 +356,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clForest, 1, clHill, 1, clPlayer, 13, clMetal, 1, clRock, 1),
avoidClasses(clForest, 1, clHill, 1, clPlayer, 13, clMetal, 6, clRock, 6),
num
);
}

2
binaries/data/mods/public/maps/random/archipelago.js
View File

@ -341,7 +341,7 @@ RMS.SetProgress(85);
log("Creating straggler trees...");
var types = [oTree1, oTree2, oTree4, oTree3]; // some variation
createStragglerTrees(types, [avoidClasses(clForest, 7, clHill, 1, clPlayer, 3, clMetal, 1, clRock, 1), stayClasses(clLand, 7)]);
createStragglerTrees(types, [avoidClasses(clForest, 7, clHill, 1, clPlayer, 3, clMetal, 6, clRock, 6), stayClasses(clLand, 7)]);
setWaterWaviness(4.0);
setWaterType("ocean");

2
binaries/data/mods/public/maps/random/atlas_mountains.js
View File

@ -317,7 +317,7 @@ RMS.SetProgress(80);
// create straggler trees
var types = [oCarob, oAleppoPine]; // some variation
createStragglerTrees(types, avoidClasses(clForest, 1, clHill, 1, clPlayer, 10, clMetal, 1, clRock, 1, clTreasure, 1));
createStragglerTrees(types, avoidClasses(clForest, 1, clHill, 1, clPlayer, 10, clMetal, 6, clRock, 6, clTreasure, 4));
// create hill trees
log("Creating hill trees...");

2
binaries/data/mods/public/maps/random/cantabrian_highlands.js
View File

@ -342,7 +342,7 @@ RMS.SetProgress(85);
log("Creating metal mines...");
var types = [oOak, oOakLarge, oPine, oApple]; // some variation
createStragglerTrees(types, avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 6, clRock, 6));
RMS.SetProgress(90);
setSkySet("cirrus");

2
binaries/data/mods/public/maps/random/canyon.js
View File

@ -504,7 +504,7 @@ RMS.SetProgress(85);
// create straggler trees
log("Creating straggler trees...");
var types = [oTree1, oTree2, oTree4, oTree3]; // some variation
createStragglerTrees(types, [avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1, clHill2, 1), stayClasses(clLand, 3)]);
createStragglerTrees(types, [avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 6, clRock, 6, clHill2, 1), stayClasses(clLand, 3)]);
// create treasures

2
binaries/data/mods/public/maps/random/continent.js
View File

@ -366,7 +366,7 @@ RMS.SetProgress(85);
// create straggler trees
log("Creating straggler trees...");
var types = [oTree1, oTree2, oTree4, oTree3]; // some variation
createStragglerTrees(types, [avoidClasses(clForest, 7, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 7)]);
createStragglerTrees(types, [avoidClasses(clForest, 7, clHill, 1, clPlayer, 9, clMetal, 6, clRock, 6), stayClasses(clLand, 7)]);
setWaterWaviness(1.0);
setWaterType("ocean");

2
binaries/data/mods/public/maps/random/corinthian_isthmus.js
View File

@ -371,7 +371,7 @@ RMS.SetProgress(90);
// create straggler trees
log("Creating straggler trees...");
var types = [oDatePalm, oSDatePalm, oCarob, oFanPalm, oPoplar, oCypress]; // some variation
createStragglerTrees(types, avoidClasses(clForest, 0, clWater, 2, clPlayer, 8, clMetal, 1, clHill, 1));
createStragglerTrees(types, avoidClasses(clForest, 1, clWater, 2, clPlayer, 8, clMetal, 6, clHill, 1));
// Set environment
setSkySet("sunny");

14
binaries/data/mods/public/maps/random/cycladic_archipelago.js
View File

@ -356,7 +356,7 @@ RMS.SetProgress(42);
log("Creating stone mines...");
group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock);
createObjectGroupsByAreas(group, 0,
[avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clRock, 1)],
[avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clRock, 6)],
scaleByMapSize(4,16), 200, areas
);
RMS.SetProgress(46);
@ -372,7 +372,7 @@ RMS.SetProgress(50);
log("Creating metal mines...");
group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,4)], true, clMetal);
createObjectGroupsByAreas(group, 0,
[avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clMetal, 2, clRock, 1)],
[avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clMetal, 6, clRock, 6)],
scaleByMapSize(4,16), 200, areas
);
RMS.SetProgress(54);
@ -412,7 +412,7 @@ for (let tree of [oCarob, oBeech, oLombardyPoplar, oLombardyPoplar, oPine])
createObjectGroupsByAreas(
new SimpleGroup([new SimpleObject(tree, 1,1, 0,1)], true, clForest),
0,
avoidClasses(clWater, 2, clForest, 2, clCity, 3, clBaseResource, 1, clRock, 1, clMetal, 1, clPlayer, 1, clHill, 1),
avoidClasses(clWater, 2, clForest, 2, clCity, 3, clBaseResource, 1, clRock, 6, clMetal, 6, clPlayer, 1, clHill, 1),
scaleByMapSize(2, 38), 50, areas
);
RMS.SetProgress(66);
@ -423,7 +423,7 @@ group = new SimpleGroup(
true
);
createObjectGroupsByAreas(group, 0,
avoidClasses(clWater, 2, clForest, 2, clCity, 3, clBaseResource, 1, clRock, 1, clMetal, 1, clPlayer, 1, clHill, 1),
avoidClasses(clWater, 2, clForest, 2, clCity, 3, clBaseResource, 1, clRock, 6, clMetal, 6, clPlayer, 1, clHill, 1),
scaleByMapSize(5, 75), 50, areas
);
RMS.SetProgress(70);
@ -434,7 +434,7 @@ group = new SimpleGroup(
true
);
createObjectGroupsByAreas(group, 0,
avoidClasses(clWater, 2, clForest, 1, clCity, 0, clBaseResource, 1, clRock, 1, clMetal, 1, clPlayer, 1, clHill, 1),
avoidClasses(clWater, 2, clForest, 1, clCity, 0, clBaseResource, 1, clRock, 6, clMetal, 6, clPlayer, 1, clHill, 1),
scaleByMapSize(5, 75), 50, areas
);
RMS.SetProgress(74);
@ -456,7 +456,7 @@ group = new SimpleGroup(
true, clFood
);
createObjectGroups(group, 0,
avoidClasses(clWater, 5, clForest, 1, clHill, 1, clCity, 10, clMetal, 2, clRock, 2, clFood, 8),
avoidClasses(clWater, 5, clForest, 1, clHill, 1, clCity, 10, clMetal, 6, clRock, 2, clFood, 8),
3 * numPlayers, 50
);
RMS.SetProgress(82);
@ -464,7 +464,7 @@ RMS.SetProgress(82);
log("Creating berry bushes...");
group = new SimpleGroup([new SimpleObject(oBerryBush, 5,7, 0,3)], true, clFood);
createObjectGroups(group, 0,
avoidClasses(clWater, 2, clForest, 1, clHill, 1, clCity, 10, clMetal, 2, clRock, 2, clFood, 8),
avoidClasses(clWater, 2, clForest, 1, clHill, 1, clCity, 10, clMetal, 6, clRock, 2, clFood, 8),
1.5 * numPlayers, 100
);
RMS.SetProgress(86);

2
binaries/data/mods/public/maps/random/english_channel.js
View File

@ -402,7 +402,7 @@ createFood
log("Creating straggler trees...");
var types = [oBeech, oPoplar, oApple]; // some variation
createStragglerTrees(types, avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 8, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 8, clMetal, 6, clRock, 6));
// Set environment
setSkySet("cirrus");

10
binaries/data/mods/public/maps/random/flood.js
View File

@ -304,7 +304,7 @@ createObjectGroups(group, 0,
createForests(
[tMainTerrain, tForestFloor1, tForestFloor2, pForest1, pForest2],
[avoidClasses(clPlayer, 25, clForest, 10, clBaseResource, 3, clMetal, 3, clRock, 3, clMountain, 2), stayClasses(clHill, 6)],
[avoidClasses(clPlayer, 25, clForest, 10, clBaseResource, 3, clMetal, 6, clRock, 3, clMountain, 2), stayClasses(clHill, 6)],
clForest,
0.7,
random_terrain
@ -312,7 +312,7 @@ createForests(
log("Creating straggeler trees...");
let types = [oTree1, oTree2, oTree4, oTree3];
createStragglerTrees(types, [avoidClasses(clBaseResource, 2, clMetal, 3, clRock, 3, clMountain, 2, clPlayer, 25), stayClasses(clHill, 6)]);
createStragglerTrees(types, [avoidClasses(clBaseResource, 2, clMetal, 6, clRock, 3, clMountain, 2, clPlayer, 25), stayClasses(clHill, 6)]);
RMS.SetProgress(65);
@ -360,7 +360,7 @@ createFood(
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
],
[3 * numPlayers, 3 * numPlayers],
[avoidClasses(clForest, 0, clPlayer, 20, clMountain, 1, clFood, 4, clRock, 4, clMetal, 4), stayClasses(clHill, 2)]
[avoidClasses(clForest, 0, clPlayer, 20, clMountain, 1, clFood, 4, clRock, 6, clMetal, 6), stayClasses(clHill, 2)]
);
RMS.SetProgress(75);
@ -370,13 +370,13 @@ createFood(
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
],
[3 * numPlayers],
[avoidClasses(clForest, 0, clPlayer, 15, clMountain, 1, clFood, 4, clRock, 4, clMetal, 4), stayClasses(clHill, 2)]
[avoidClasses(clForest, 0, clPlayer, 15, clMountain, 1, clFood, 4, clRock, 6, clMetal, 6), stayClasses(clHill, 2)]
);
RMS.SetProgress(85);
log("Creating more straggeler trees...");
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clMountain, 1, clPlayer, 30, clMetal, 3, clRock, 3));
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clMountain, 1, clPlayer, 30, clMetal, 6, clRock, 3));
log("Creating decoration...");
let planetm = random_terrain == g_BiomeTropic ? 8 : 1;

2
binaries/data/mods/public/maps/random/fortress.js
View File

@ -350,7 +350,7 @@ RMS.SetProgress(90);
log("Creating straggler trees...");
var types = [oOak, oBeech, oPine]; // some variation
createStragglerTrees(types, avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 6, clRock, 6));
RMS.SetProgress(95);
setSkySet("sunny");

4
binaries/data/mods/public/maps/random/gear.js
View File

@ -473,8 +473,8 @@ createFood
// create straggler trees
var types = [oTree1, oTree2, oTree4, oTree3]; // some variation
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6));
// Export map data
ExportMap();
ExportMap();

2
binaries/data/mods/public/maps/random/guadalquivir_river.js
View File

@ -416,7 +416,7 @@ RMS.SetProgress(85);
// create straggler trees
log("Creating straggler trees...");
var types = [oPoplar, oCarob, oApple]; // some variation
createStragglerTrees(types, [avoidClasses(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, 6, clRock, 6, clRiver, 1), stayClasses(clLand, 7)]);
setSkySet("cumulus");
setWaterColor(0.2,0.312,0.522);

2
binaries/data/mods/public/maps/random/gulf_of_bothnia.js
View File

@ -491,7 +491,7 @@ RMS.SetProgress(85);
// create straggler trees
log("Creating straggler trees...");
var types = [oPine];
createStragglerTrees(types, avoidClasses(clWater, 3, clForest, 1, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 3, clForest, 1, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6));
setSkySet("stormy");
setSunRotation(randFloat(0, TWO_PI));

2
binaries/data/mods/public/maps/random/hyrcanian_shores.js
View File

@ -495,7 +495,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 10, clMetal, 1, clRock, 1, clSea, 1, clHighlands, 25),
avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 10, clMetal, 6, clRock, 6, clSea, 1, clHighlands, 25),
num
);
}

10
binaries/data/mods/public/maps/random/island_stronghold.js
View File

@ -371,7 +371,7 @@ clRock
createForests(
[tMainTerrain, tForestFloor1, tForestFloor2, pForest1, pForest2],
[avoidClasses(clPlayer, 10, clForest, 20, clHill, 10, clBaseResource, 5, clRock, 4, clMetal, 4), stayClasses(clLand, 3)],
[avoidClasses(clPlayer, 10, clForest, 20, clHill, 10, clBaseResource, 5, clRock, 6, clMetal, 6), stayClasses(clLand, 3)],
clForest,
1.0,
random_terrain
@ -387,7 +387,7 @@ let elevationPainter = new SmoothElevationPainter(ELEVATION_SET, 18, 2);
createAreas(
placer,
[painter, elevationPainter, paintClass(clHill)],
[avoidClasses(clBaseResource, 20, clHill, 15, clRock, 4, clMetal, 4), stayClasses(clLand, 0)],
[avoidClasses(clBaseResource, 20, clHill, 15, clRock, 6, clMetal, 6), stayClasses(clLand, 0)],
scaleByMapSize(4, 13)
);
for (let i = 0; i < 3; ++i)
@ -395,7 +395,7 @@ for (let i = 0; i < 3; ++i)
createStragglerTrees(
[oTree1, oTree2, oTree4, oTree3],
[avoidClasses(clForest, 10, clPlayer, 20, clMetal, 1, clRock, 1, clHill, 1),
[avoidClasses(clForest, 10, clPlayer, 20, clMetal, 6, clRock, 6, clHill, 1),
stayClasses(clLand, 4)]
);
@ -405,7 +405,7 @@ createFood(
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
],
[3 * numPlayers, 3 * numPlayers],
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clRock, 4, clMetal, 4), stayClasses(clLand, 2)]
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clRock, 6, clMetal, 6), stayClasses(clLand, 2)]
);
createFood(
@ -413,7 +413,7 @@ createFood(
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
],
[3 * numPlayers],
[avoidClasses(clForest, 0, clPlayer, 15, clHill, 1, clFood, 4, clRock, 4, clMetal, 4), stayClasses(clLand, 2)]
[avoidClasses(clForest, 0, clPlayer, 15, clHill, 1, clFood, 4, clRock, 6, clMetal, 6), stayClasses(clLand, 2)]
);
if (random_terrain == g_BiomeDesert)

2
binaries/data/mods/public/maps/random/islands.js
View File

@ -533,7 +533,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 0, clMetal, 1, clRock, 1), stayClasses(clLand, 6)],
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 0, clMetal, 6, clRock, 6), stayClasses(clLand, 6)],
num
);
}

2
binaries/data/mods/public/maps/random/kerala.js
View File

@ -400,7 +400,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, 1, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6),
num
);
}

2
binaries/data/mods/public/maps/random/lake.js
View File

@ -377,7 +377,7 @@ RMS.SetProgress(85);
// create straggler trees
var types = [oTree1, oTree2, oTree4, oTree3]; // some variation
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6));
setWaterWaviness(4.0);
setWaterType("lake");

12
binaries/data/mods/public/maps/random/latium.js
View File

@ -452,7 +452,7 @@ RMS.SetProgress(50);
log("Creating large stone mines...");
group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clStone);
createObjectGroups(group, 0,
avoidClasses(clWater, 1, clForest, 4, clPlayer, 40, clStone, 40, clMetal, 10, clCliff, 3),
avoidClasses(clWater, 1, clForest, 4, clPlayer, 40, clStone, 60, clMetal, 10, clCliff, 3),
scaleByMapSize(4,16), 100
);
@ -475,7 +475,7 @@ for (let tree of [oCarob, oBeech, oLombardyPoplar, oLombardyPoplar, oPine])
{
group = new SimpleGroup([new SimpleObject(tree, 1,1, 0,1)], true, clForest);
createObjectGroups(group, 0,
avoidClasses(clWater, 5, clCliff, 4, clForest, 2, clPlayer, 15, clMetal, 4, clStone, 4),
avoidClasses(clWater, 5, clCliff, 4, clForest, 2, clPlayer, 15, clMetal, 6, clStone, 6),
scaleByMapSize(2, 38), 50
);
}
@ -487,7 +487,7 @@ group = new SimpleGroup(
true
);
createObjectGroups(group, 0,
avoidClasses(clWater, 5, clCliff, 4, clForest, 2, clPlayer, 15, clMetal, 4, clStone, 4),
avoidClasses(clWater, 5, clCliff, 4, clForest, 2, clPlayer, 15, clMetal, 6, clStone, 6),
scaleByMapSize(5, 75), 50
);
RMS.SetProgress(80);
@ -495,7 +495,7 @@ RMS.SetProgress(80);
log("Creating sheep...");
group = new SimpleGroup([new SimpleObject(oSheep, 2,4, 0,2)], true, clFood);
createObjectGroups(group, 0,
avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 4, clStone, 4, clFood, 8),
avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clStone, 6, clFood, 8),
3 * numPlayers, 50
);
RMS.SetProgress(85);
@ -525,7 +525,7 @@ group = new SimpleGroup(
true, clFood
);
createObjectGroups(group, 0,
avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 4, clStone, 4, clFood, 8),
avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clStone, 6, clFood, 8),
3 * numPlayers, 50
);
RMS.SetProgress(95);
@ -533,7 +533,7 @@ RMS.SetProgress(95);
log("Creating berry bushes...");
group = new SimpleGroup([new SimpleObject(oBerryBush, 5,7, 0,3)], true, clFood);
createObjectGroups(group, 0,
avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 4, clStone, 4, clFood, 8),
avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clStone, 6, clFood, 8),
1.5 * numPlayers, 100
);

2
binaries/data/mods/public/maps/random/lorraine_plain.js
View File

@ -446,7 +446,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clWater, 1, clForest, 7, clHill, 1, clPlayer, 5, clMetal, 1, clRock, 1),
avoidClasses(clWater, 1, clForest, 7, clHill, 1, clPlayer, 5, clMetal, 6, clRock, 6),
num
);
}

2
binaries/data/mods/public/maps/random/migration.js
View File

@ -456,7 +456,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 9)],
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 6, clRock, 6), stayClasses(clLand, 9)],
num
);
}

2
binaries/data/mods/public/maps/random/neareastern_badlands.js
View File

@ -395,7 +395,7 @@ for (var i = 0; i < types.length; ++i)
{
group = new SimpleGroup([new SimpleObject(types[i], 1,1, 0,0)], true);
createObjectGroups(group, 0,
avoidClasses(clForest, 0, clHill1, 1, clPlayer, 4, clMetal, 1, clRock, 1),
avoidClasses(clForest, 0, clHill1, 1, clPlayer, 4, clMetal, 6, clRock, 6),
num
);
}

4
binaries/data/mods/public/maps/random/northern_lights.js
View File

@ -287,7 +287,7 @@ log("Creating iceberg...");
// create iceberg
group = new SimpleGroup([new SimpleObject(aIceberg, 0,2, 0,4)], true, clRock);
createObjectGroups(group, 0,
[avoidClasses(clRock, 4), stayClasses(clWater, 4)],
[avoidClasses(clRock, 6), stayClasses(clWater, 4)],
scaleByMapSize(4,16), 100
);
@ -363,7 +363,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, 1, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6),
num
);
}

2
binaries/data/mods/public/maps/random/persian_highlands.js
View File

@ -421,7 +421,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1, clCP, 2),
avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 6, clRock, 6, clCP, 2),
num
);
}

2
binaries/data/mods/public/maps/random/phoenician_levant.js
View File

@ -469,7 +469,7 @@ for (var i = 0; i < types.length; ++i)
{
group = new SimpleGroup([new SimpleObject(types[i], 1,1, 0,0)], true);
createObjectGroups(group, 0,
avoidClasses(clForest, 0, clWater, 1, clPlayer, 8, clMetal, 1, clHill, 1),
avoidClasses(clForest, 0, clWater, 1, clPlayer, 8, clMetal, 6, clHill, 1),
num
);
}

2
binaries/data/mods/public/maps/random/rhine_marshlands.js
View File

@ -410,7 +410,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clForest, 1, clHill, 1, clPlayer, 13, clMetal, 1, clRock, 1, clWater, 0),
avoidClasses(clForest, 1, clHill, 1, clPlayer, 13, clMetal, 6, clRock, 6, clWater, 0),
num
);
}

2
binaries/data/mods/public/maps/random/rivers.js
View File

@ -520,7 +520,7 @@ RMS.SetProgress(85);
// create straggler trees
var types = [oTree1, oTree2, oTree4, oTree3]; // some variation
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1));
createStragglerTrees(types, avoidClasses(clWater, 5, clForest, 7, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6));
setWaterWaviness(3.0);
setWaterType("lake");

2
binaries/data/mods/public/maps/random/rmgen/utilityfunctions.js
View File

@ -238,7 +238,7 @@ function createStragglerTrees(types, constraint, tileclass)
constraint = constraint !== undefined ?
constraint :
avoidClasses(clForest, 8, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1);
avoidClasses(clForest, 8, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6);
tileclass = tileclass !== undefined ? tileclass : clForest;

4
binaries/data/mods/public/maps/random/sahel.js
View File

@ -330,7 +330,7 @@ group = new SimpleGroup(
true, clFood
);
createObjectGroups(group, 0,
avoidClasses(clWater, 3, clPlayer, 20, clFood, 12, clRock, 7, clMetal, 2),
avoidClasses(clWater, 3, clPlayer, 20, clFood, 12, clRock, 7, clMetal, 6),
randInt(1, 4) * numPlayers + 2, 50
);
@ -345,7 +345,7 @@ group = new SimpleGroup(
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clForest, 1, clPlayer, 20, clMetal, 1, clRock, 7, clWater, 1),
avoidClasses(clForest, 1, clPlayer, 20, clMetal, 6, clRock, 7, clWater, 1),
num
);

2
binaries/data/mods/public/maps/random/sahel_watering_holes.js
View File

@ -505,7 +505,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, 1, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6),
num
);
}

2
binaries/data/mods/public/maps/random/snowflake_searocks.js
View File

@ -1855,7 +1855,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 4)],
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 9, clMetal, 6, clRock, 6), stayClasses(clLand, 4)],
num
);
}

2
binaries/data/mods/public/maps/random/survivalofthefittest.js
View File

@ -293,7 +293,7 @@ createDecoration
// create straggler trees
log("Creating straggler trees...");
var types = [oTree1, oTree2, oTree4, oTree3]; // some variation
createStragglerTrees(types, [avoidClasses(clForest, 7, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1), stayClasses(clLand, 7)]);
createStragglerTrees(types, [avoidClasses(clForest, 7, clHill, 1, clPlayer, 9, clMetal, 6, clRock, 6), stayClasses(clLand, 7)]);
// Export map data

4
binaries/data/mods/public/maps/random/syria.js
View File

@ -369,7 +369,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1),
avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 6, clRock, 6),
num
);
}
@ -385,7 +385,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 1, clRock, 1), stayClasses(clGrass, 3)],
[avoidClasses(clForest, 1, clHill, 1, clPlayer, 1, clMetal, 6, clRock, 6), stayClasses(clGrass, 3)],
num
);
}

6
binaries/data/mods/public/maps/random/the_nile.js
View File

@ -534,7 +534,7 @@ for (var i = 0; i < types.length; ++i)
{
group = new SimpleGroup([new SimpleObject(types[i], 1,1, 0,0)], true);
createObjectGroups(group, 0,
avoidClasses(clForest, 0, clWater, 1, clPlayer, 20, clMetal, 1, clDesert, 1, clTreasure, 2, clPond, 1),
avoidClasses(clForest, 0, clWater, 1, clPlayer, 20, clMetal, 6, clDesert, 1, clTreasure, 2, clPond, 1),
num
);
}
@ -545,7 +545,7 @@ for (var i = 0; i < types.length; ++i)
{
group = new SimpleGroup([new SimpleObject(types[i], 1,1, 0,0)], true);
createObjectGroups(group, 0,
avoidClasses(clForest, 0, clWater, 1, clPlayer, 20, clMetal, 1, clTreasure, 2),
avoidClasses(clForest, 0, clWater, 1, clPlayer, 20, clMetal, 6, clTreasure, 2),
num
);
}
@ -571,7 +571,7 @@ group = new SimpleGroup(
);
createObjectGroups(
group, 0,
[avoidClasses(clWater, 4, clForest, 3, clPlayer, 20, clMetal, 2, clRock, 2, clPond, 4, clTreasure, 2), stayClasses(clDesert, 3)],
[avoidClasses(clWater, 4, clForest, 3, clPlayer, 20, clMetal, 6, clRock, 2, clPond, 4, clTreasure, 2), stayClasses(clDesert, 3)],
scaleByMapSize(5, 30), 50
);

2
binaries/data/mods/public/maps/random/unknown.js
View File

@ -1989,7 +1989,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, 1, clHill, 1, clPlayer, 0, clMetal, 6, clRock, 6), stayClasses(clLand, 4)],
num
);
}

2
binaries/data/mods/public/maps/random/unknown_land.js
View File

@ -1758,7 +1758,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
[avoidClasses(clWater, 1, clForest, 7, clHill, 1, clPlayer, 0, clMetal, 1, clRock, 1), stayClasses(clLand, 4)],
[avoidClasses(clWater, 1, clForest, 7, clHill, 1, clPlayer, 0, clMetal, 6, clRock, 6), stayClasses(clLand, 4)],
num
);
}

2
binaries/data/mods/public/maps/random/unknown_nomad.js
View File

@ -1619,7 +1619,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, 1, clHill, 1, clPlayer, 0, clMetal, 6, clRock, 6), stayClasses(clLand, 4)],
num
);
}

2
binaries/data/mods/public/maps/random/volcanic_lands.js
View File

@ -369,7 +369,7 @@ for (var i = 0; i < types.length; ++i)
true, clForest
);
createObjectGroups(group, 0,
avoidClasses(clForest, 1, clHill, 1, clPlayer, 12, clMetal, 1, clRock, 1),
avoidClasses(clForest, 1, clHill, 1, clPlayer, 12, clMetal, 6, clRock, 6),
num
);
}