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

Make "Lion's Den" and "Empre" default maps.

Browse Source 
Add more animals/berries to "Ambush".
Improve placing of initial resources on all of _kali's maps.

* Increase distance from chickens to CC from `7` to `9` (to account for
roman CCs, refs #3836)
* Increase number of initial trees from `5` to `25` (ensuring players
have enough wood to build a new CC)
* Avoid resource collisions by increasing the minDistance from `2` to
`4` (when not using angles)
* Ensure that initial resources are placed (by first placing mines and
adding retry-loops for the other resources)
  Notice The loop can't be moved to `createObjectGroup` since
    * the parameters (like `mAngle`) also need to randomized again
    * we need to place initial resources in range of the actual
playerbase

This was SVN commit r17920.
This commit is contained in:
elexis 2016-03-20 19:03:43 +00:00
parent b84b9a374a
commit 91e8248273
4 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,9 +131,9 @@ addElements(shuffleArray([
g_TileClasses.rock, 10,
g_TileClasses.water, 3
],
"sizes": ["tiny"],
"sizes": ["normal"],
"mixes": ["same"],
"amounts": ["scarce"]
"amounts": ["normal"]
},
{
"func": addAnimals,
@ -142,13 +142,13 @@ addElements(shuffleArray([
g_TileClasses.forest, 2,
g_TileClasses.metal, 2,
g_TileClasses.mountain, 1,
g_TileClasses.player, 20,
g_TileClasses.player, 12,
g_TileClasses.rock, 2,
g_TileClasses.water, 3
],
"sizes": ["tiny"],
"sizes": ["small", "normal"],
"mixes": ["same"],
"amounts": ["scarce"]
"amounts": ["normal", "many"]
},
{
"func": addStragglerTrees,

2
binaries/data/mods/public/maps/random/empire.json
View File

@ -5,7 +5,7 @@
"Description" : "A neighboring province has pledged alegiance to your rule. It's up to you to command them to victory.",
"BaseTerrain" : ["medit_sea_depths"],
"BaseHeight" : 2,
"Keywords": ["demo"],
"Keywords": [],
"Preview" : "empire.png",
"CircularMap" : true
}

2
binaries/data/mods/public/maps/random/lions_den.json
View File

@ -6,7 +6,7 @@
"BaseTerrain" : ["medit_sea_depths"],
"BaseHeight" : 50,
"Preview" : "lions_den.png",
"Keywords": ["demo"],
"Keywords": [],
"CircularMap" : true
}
}

71
binaries/data/mods/public/maps/random/rmgen/setup.js
View File

@ -210,25 +210,9 @@ function createBase(player, walls)
var painter = new LayeredPainter([g_Terrains.roadWild, g_Terrains.road], [1]);
createArea(placer, painter, null);
// Custom base terrain function
// Create animals
for (var j = 0; j < 2; ++j)
{
var aAngle = randFloat(0, TWO_PI);
var aDist = 7;
var aX = round(fx + aDist * cos(aAngle));
var aZ = round(fz + aDist * sin(aAngle));
var group = new SimpleGroup(
[new SimpleObject(g_Gaia.chicken, 5, 5, 0, 2)],
true, g_TileClasses.baseResource, aX, aZ
);
createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 2));
}
// Create berry bushes
// Create initial berry bushes at random angle
var bbAngle = randFloat(0, TWO_PI);
var bbDist = 12;
var bbDist = 10;
var bbX = round(fx + bbDist * cos(bbAngle));
var bbZ = round(fz + bbDist * sin(bbAngle));
group = new SimpleGroup(
@ -237,7 +221,7 @@ function createBase(player, walls)
);
createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 2));
// Create metal mine
// Create metal mine at a different angle
var mAngle = bbAngle;
while(abs(mAngle - bbAngle) < PI / 3)
mAngle = randFloat(0, TWO_PI);
@ -251,7 +235,7 @@ function createBase(player, walls)
);
createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 2));
// Create stone mines
// Create stone mine beside metal
mAngle += randFloat(PI / 8, PI / 4);
mX = round(fx + mDist * cos(mAngle));
mZ = round(fz + mDist * sin(mAngle));
@ -261,20 +245,45 @@ function createBase(player, walls)
);
createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 2));
// Create initial chicken
for (var j = 0; j < 2; ++j)
{
for (var tries = 0; tries < 10; ++tries)
{
var aAngle = randFloat(0, TWO_PI);
var aDist = 9;
var aX = round(fx + aDist * cos(aAngle));
var aZ = round(fz + aDist * sin(aAngle));
var group = new SimpleGroup(
[new SimpleObject(g_Gaia.chicken, 5, 5, 0, 2)],
true, g_TileClasses.baseResource, aX, aZ
);
if (createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 4)))
break;
}
}
var hillSize = PI * g_MapInfo.mapRadius * g_MapInfo.mapRadius;
// Create starting trees
var num = 5;
var tAngle = randFloat(0, TWO_PI);
var tDist = randFloat(12, 13);
var tX = round(fx + tDist * cos(tAngle));
var tZ = round(fz + tDist * sin(tAngle));
var num = 25;
for (var tries = 0; tries < 10; ++tries)
{
var tAngle = randFloat(0, TWO_PI);
var tDist = randFloat(12, 13);
var tX = round(fx + tDist * cos(tAngle));
var tZ = round(fz + tDist * sin(tAngle));
group = new SimpleGroup(
[new SimpleObject(g_Gaia.tree1, num, num, 0, 3)],
false, g_TileClasses.baseResource, tX, tZ
);
group = new SimpleGroup(
[new SimpleObject(g_Gaia.tree1, num, num, 0, 3)],
false, g_TileClasses.baseResource, tX, tZ
);
createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 2));
if (createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 4)))
break;
}
// Create grass tufts
var num = hillSize / 250;
@ -288,7 +297,7 @@ function createBase(player, walls)
[new SimpleObject(g_Decoratives.grassShort, 2, 5, 0, 1, -PI / 8, PI / 8)],
false, g_TileClasses.baseResource, gX, gZ
);
createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 2));
createObjectGroup(group, 0, avoidClasses(g_TileClasses.baseResource, 4));
}
}