dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't place chicken inside civic centers and unify chicken placement code. Reviewed by FeXoR, fixes #3836.

Browse source 
This was SVN commit r18816.
This commit is contained in:
elexis 2016-10-09 15:07:48 +00:00
parent 1f8c75db08
commit 5f1736cbd4
47 changed files with 112 additions and 655 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
binaries/data/mods/public/maps/random/aegean_sea.js
View file

@ -23,7 +23,6 @@ const tSeaDepths = "medit_sea_depths";
// gaia entities
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -135,26 +134,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

18
binaries/data/mods/public/maps/random/alpine_lakes.js
View file

@ -29,7 +29,6 @@ if (random_var == 1)
// gaia entities
var oPine = "gaia/flora_tree_pine";
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oDeer = "gaia/fauna_deer";
var oFish = "gaia/fauna_fish";
var oRabbit = "gaia/fauna_rabbit";
@ -68,7 +67,6 @@ else
// gaia entities
var oPine = "gaia/flora_tree_pine_w";
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oDeer = "gaia/fauna_deer";
var oFish = "gaia/fauna_fish";
var oRabbit = "gaia/fauna_rabbit";
@ -170,26 +168,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

18
binaries/data/mods/public/maps/random/alpine_valley.js
View file

@ -23,7 +23,6 @@ if (random_terrain == 1)
// gaia entities
var oPine = "gaia/flora_tree_pine";
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oDeer = "gaia/fauna_deer";
var oRabbit = "gaia/fauna_rabbit";
var oStoneLarge = "gaia/geology_stonemine_alpine_quarry";
@ -56,7 +55,6 @@ else
// gaia entities
var oPine = "gaia/flora_tree_pine_w";
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oDeer = "gaia/fauna_deer";
var oRabbit = "gaia/fauna_rabbit";
var oStoneLarge = "gaia/geology_stonemine_alpine_quarry";
@ -157,26 +155,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/anatolian_plateau.js
View file

@ -17,7 +17,6 @@ const tWater = "desert_sand_wet";
const oPoplar = "gaia/flora_tree_poplar_lombardy";
const oBush = "gaia/flora_bush_temperate";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oRabbid = "gaia/fauna_rabbit";
const oSheep = "gaia/fauna_sheep";
const oStoneLarge = "gaia/geology_stonemine_medit_quarry";
@ -106,26 +105,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/archipelago.js
View file

@ -28,7 +28,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -126,26 +125,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

15
binaries/data/mods/public/maps/random/ardennes_forest.js
View file

@ -186,19 +186,8 @@ for (var i=0; i < numPlayers; i++)
createArea(placer, painter, null);
// Create starter 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(oPig, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
placeDefaultChicken(fx, fz, clBaseResource, undefined, oPig);
// Create starter berry bushes
var bbAngle = randFloat(0, TWO_PI);
var bbDist = 12;

17
binaries/data/mods/public/maps/random/atlas_mountains.js
View file

@ -19,7 +19,6 @@ const tWater = "medit_sand";
const oCarob = "gaia/flora_tree_carob";
const oAleppoPine = "gaia/flora_tree_aleppo_pine";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -119,26 +118,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/cantabrian_highlands.js
View file

@ -25,7 +25,6 @@ const oApple = "gaia/flora_tree_apple";
const oPine = "gaia/flora_tree_pine";
const oAleppoPine = "gaia/flora_tree_aleppo_pine";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -143,26 +142,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': false });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/canyon.js
View file

@ -26,7 +26,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -155,26 +154,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/continent.js
View file

@ -26,7 +26,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -152,26 +151,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/corinthian_isthmus.js
View file

@ -20,7 +20,6 @@ const tWater = "medit_sand_wet";
// gaia entities
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -182,26 +181,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/corsica.js
View file

@ -34,7 +34,6 @@ var eFanPalm = "gaia/flora_tree_medit_fan_palm";
var eCypress = "gaia/flora_tree_cypress";
var eApple = "gaia/flora_tree_apple"
var eBush = "gaia/flora_bush_berry";
var eChicken = "gaia/fauna_chicken";
var eFish = "gaia/fauna_fish";
var ePig = "gaia/fauna_pig";
var eStoneMine = "gaia/geology_stonemine_medit_quarry";
@ -334,26 +333,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': false });
// 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(eChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
placeDefaultChicken(fx, fz, clBaseResource);
// create berry bushes
var bbAngle = randFloat(0, TWO_PI);
var bbDist = 11;
var bbX = round(fx + bbDist * cos(bbAngle));
var bbZ = round(fz + bbDist * sin(bbAngle));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(eBush, 5,5, 1,2)],
true, clBaseResource, bbX, bbZ
);

18
binaries/data/mods/public/maps/random/cycladic_archipelago.js
View file

@ -40,7 +40,6 @@ const oPine = "gaia/flora_tree_aleppo_pine";
const oPoplar = "gaia/flora_tree_poplar";
const oDateT = "gaia/flora_tree_cretan_date_palm_tall";
const oDateS = "gaia/flora_tree_cretan_date_palm_short";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oWhale = "gaia/fauna_whale_humpback";
@ -191,27 +190,14 @@ for (var i=0; i < numIslands; i++)
areas.push(temp);
// create animals
var group;
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));
group = new SimpleGroup(
[new SimpleObject(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
placeDefaultChicken(fx, fz, clBaseResource);
// create berry bushes
var bbAngle = randFloat(0, TWO_PI);
var bbDist = 10;
var bbX = round(fx + bbDist * cos(bbAngle));
var bbZ = round(fz + bbDist * sin(bbAngle));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

19
binaries/data/mods/public/maps/random/english_channel.js
View file

@ -24,7 +24,6 @@ const oPoplar = "gaia/flora_tree_poplar";
const oApple = "gaia/flora_tree_apple";
const oOak = "gaia/flora_tree_oak";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oGoat = "gaia/fauna_goat";
@ -142,26 +141,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// create animals
for (var j = 0; j < 2; ++j)
{
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(oChicken, 5,5, 0,3)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

15
binaries/data/mods/public/maps/random/flood.js
View file

@ -30,7 +30,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -153,19 +152,7 @@ for (let i = 0; i < numPlayers; ++i)
let painter = new LayeredPainter([tRoadWild, tRoad], [1]);
createArea(placer, painter, null);
// Create animals
for (let j = 0; j < 2; ++j)
{
let aAngle = randFloat(0, TWO_PI);
let aDist = 7;
let aX = round(fx + aDist * cos(aAngle));
let aZ = round(fz + aDist * sin(aAngle));
let group = new SimpleGroup(
[new SimpleObject(oChicken, 5, 5, 0, 2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
placeDefaultChicken(fx, fz, clBaseResource);
// Create berry bushes
let bbAngle = randFloat(0, TWO_PI);

1
binaries/data/mods/public/maps/random/fortress.js
View file

@ -20,7 +20,6 @@ const tWater = "temp_mud_a";
const oBeech = "gaia/flora_tree_euro_beech_aut";
const oOak = "gaia/flora_tree_oak_aut";
const oPine = "gaia/flora_tree_pine";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_rabbit";

17
binaries/data/mods/public/maps/random/gear.js
View file

@ -28,7 +28,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -154,26 +153,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/guadalquivir_river.js
View file

@ -21,7 +21,6 @@ const oPoplar = "gaia/flora_tree_poplar";
const oApple = "gaia/flora_tree_apple";
const oCarob = "gaia/flora_tree_carob";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -151,26 +150,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': false });
// create animals
for (var j = 0; j < 2; ++j)
{
var aAngle = randFloat(0, TWO_PI);
var aDist = 6;
var aX = round(fx + aDist * cos(aAngle));
var aZ = round(fz + aDist * sin(aAngle));
var group = new SimpleGroup(
[new SimpleObject(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
placeDefaultChicken(fx, fz, clBaseResource);
// create berry bushes
var bbAngle = randFloat(0, TWO_PI);
var bbDist = 8;
var bbX = round(fx + bbDist * cos(bbAngle));
var bbZ = round(fz + bbDist * sin(bbAngle));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

19
binaries/data/mods/public/maps/random/gulf_of_bothnia.js
View file

@ -27,7 +27,6 @@ if (random_terrain == 1)
// gaia entities
var oPine = "gaia/flora_tree_pine";
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oDeer = "gaia/fauna_deer";
var oFish = "gaia/fauna_fish";
var oRabbit = "gaia/fauna_rabbit";
@ -65,7 +64,6 @@ else if (random_terrain == 2)
// gaia entities
var oPine = "gaia/flora_tree_pine_w";
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oDeer = "gaia/fauna_deer";
var oFish = "gaia/fauna_fish";
var oRabbit = "gaia/fauna_rabbit";
@ -103,7 +101,6 @@ else
// gaia entities
var oPine = "gaia/flora_tree_pine_w";
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oDeer = "gaia/fauna_deer";
var oFish = "gaia/fauna_fish";
var oRabbit = "gaia/fauna_rabbit";
@ -208,26 +205,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/hyrcanian_shores.js
View file

@ -24,7 +24,6 @@ const oPalm = "gaia/flora_tree_cretan_date_palm_short";
const oApple = "gaia/flora_tree_apple";
const oOak = "gaia/flora_tree_oak";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oGoat = "gaia/fauna_goat";
@ -126,26 +125,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

15
binaries/data/mods/public/maps/random/island_stronghold.js
View file

@ -39,7 +39,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -198,19 +197,7 @@ for (let i = 0; i < teams.length; ++i)
{
let [playerAngle, fx, fz, ix, iz] = getPlayerTileCoordinates(p, i, fractionX, fractionZ);
// create initial chicken
for (let j = 0; j < 2; ++j)
{
let aAngle = randFloat(0, TWO_PI);
let aDist = 7;
let aX = round(fx + aDist * cos(aAngle));
let aZ = round(fz + aDist * sin(aAngle));
let group = new SimpleGroup(
[new SimpleObject(oChicken, 5, 5, 0, 2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0, [stayClasses(clLand, 5)]);
}
placeDefaultChicken(fx, fz, clBaseResource, [stayClasses(clLand, 5)]);
// create initial berry bushes
let bbAngle = randFloat(PI, PI*1.5);

17
binaries/data/mods/public/maps/random/islands.js
View file

@ -27,7 +27,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -123,26 +122,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/kerala.js
View file

@ -22,7 +22,6 @@ const oMetalLarge = "gaia/geology_metal_tropic_slabs";
const oFish = "gaia/fauna_fish";
const oDeer = "gaia/fauna_deer";
const oSheep = "gaia/fauna_tiger";
const oChicken = "gaia/fauna_chicken";
const oBush = "gaia/flora_bush_berry";
// decorative props
@ -111,26 +110,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/lake.js
View file

@ -26,7 +26,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -124,26 +123,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/latium.js
View file

@ -35,7 +35,6 @@ const oOak = "gaia/flora_tree_oak";
const oPalm = "gaia/flora_tree_medit_fan_palm";
const oPine = "gaia/flora_tree_aleppo_pine";
const oPoplar = "gaia/flora_tree_poplar";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -429,26 +428,14 @@ for (var i = 1; i <= numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
placeDefaultChicken(fx, fz, clBaseResource);
// create starting berry bushes
var bbAngle = randFloat(0, TWO_PI);
var bbDist = 9;
var bbX = round(fx + bbDist * cos(bbAngle));
var bbZ = round(fz + bbDist * sin(bbAngle));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,2)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/lorraine_plain.js
View file

@ -21,7 +21,6 @@ const tWater = "temp_mud_a";
const oBeech = "gaia/flora_tree_euro_beech";
const oOak = "gaia/flora_tree_oak";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oRabbit = "gaia/fauna_rabbit";
@ -132,26 +131,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/mainland.js
View file

@ -26,7 +26,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -130,26 +129,14 @@ for (var i = 0; i < numPlayers; i++)
var painter = new LayeredPainter([tRoadWild, tRoad], [1]);
createArea(placer, painter, null);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/migration.js
View file

@ -26,7 +26,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -131,26 +130,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': false });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/neareastern_badlands.js
View file

@ -18,7 +18,6 @@ const tWaterDeep = "desert_shore_stones_wet";
// gaia entities
const oBerryBush = "gaia/flora_bush_grapes";
const oChicken = "gaia/fauna_chicken";
const oCamel = "gaia/fauna_camel";
const oFish = "gaia/fauna_fish";
const oGazelle = "gaia/fauna_gazelle";
@ -117,26 +116,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/oasis.js
View file

@ -17,7 +17,6 @@ const tWater = "desert_sand_wet";
const ePalmShort = "gaia/flora_tree_cretan_date_palm_short";
const ePalmTall = "gaia/flora_tree_cretan_date_palm_tall";
const eBush = "gaia/flora_bush_grapes";
const eChicken = "gaia/fauna_chicken";
const eCamel = "gaia/fauna_camel";
const eGazelle = "gaia/fauna_gazelle";
const eLion = "gaia/fauna_lion";
@ -125,26 +124,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// create animals
for (var j = 0; j < 2; ++j)
{
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(eChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(eBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/persian_highlands.js
View file

@ -31,7 +31,6 @@ else //spring
// gaia entities
const oGrapesBush = "gaia/flora_bush_grapes";
const oChicken = "gaia/fauna_chicken";
const oCamel = "gaia/fauna_camel";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -136,26 +135,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oGrapesBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/phoenician_levant.js
View file

@ -18,7 +18,6 @@ const tWater = "medit_sand_wet";
// gaia entities
const oGrapeBush = "gaia/flora_bush_grapes";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oFish = "gaia/fauna_fish";
const oSheep = "gaia/fauna_sheep";
@ -118,26 +117,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oGrapeBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/pyrenean_sierra.js
View file

@ -208,7 +208,6 @@ const tShore = "alpine_shore_rocks_icy";
const oBeech = "gaia/flora_tree_euro_beech";
const oPine = "gaia/flora_tree_aleppo_pine";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oGoat = "gaia/fauna_goat";
const oFish = "gaia/fauna_fish";
@ -350,26 +349,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/rhine_marshlands.js
View file

@ -15,7 +15,6 @@ const tWater = "temp_mud_a";
const oBeech = "gaia/flora_tree_euro_beech";
const oOak = "gaia/flora_tree_oak";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oDeer = "gaia/fauna_deer";
const oHorse = "gaia/fauna_horse";
const oWolf = "gaia/fauna_wolf";
@ -112,26 +111,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/rivers.js
View file

@ -30,7 +30,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -153,26 +152,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

21
binaries/data/mods/public/maps/random/rmgen/misc.js
View file

@ -206,7 +206,28 @@ function placeCivDefaultEntities(fx, fz, playerid, kwargs = {})
}
}
function placeDefaultChicken(playerX, playerZ, tileClass, constraint = undefined, template = "gaia/fauna_chicken")
{
for (let j = 0; j < 2; ++j)
for (var tries = 0; tries < 10; ++tries)
{
let aAngle = randFloat(0, TWO_PI);
// Roman and ptolemian civic centers have a big footprint!
let aDist = 9;
let aX = round(playerX + aDist * cos(aAngle));
let aZ = round(playerZ + aDist * sin(aAngle));
let group = new SimpleGroup(
[new SimpleObject(template, 5,5, 0,2)],
true, tileClass, aX, aZ
);
if (createObjectGroup(group, 0, constraint))
break;
}
}
/////////////////////////////////////////////////////////////////////////////////////////
// paintTerrainBasedOnHeight
//

28
binaries/data/mods/public/maps/random/rmgen2/setup.js
View file

@ -204,7 +204,7 @@ function createBase(player, walls = true)
var bbDist = 10;
var bbX = round(fx + bbDist * cos(bbAngle));
var bbZ = round(fz + bbDist * sin(bbAngle));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(g_Gaia.fruitBush, 5, 5, 0, 3)],
true, g_TileClasses.baseResource, bbX, bbZ
);
@ -234,25 +234,13 @@ function createBase(player, walls = true)
);
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;
}
}
placeDefaultChicken(
fx,
fz,
g_TileClasses.baseResource,
avoidClasses(g_TileClasses.baseResource, 4),
g_Gaia.chicken
);
var hillSize = PI * g_MapInfo.mapRadius * g_MapInfo.mapRadius;

17
binaries/data/mods/public/maps/random/saharan_oases.js
View file

@ -19,7 +19,6 @@ const tSDry = "desert_plants_b";
// gaia entities
const oGrapeBush = "gaia/flora_bush_grapes";
const oChicken = "gaia/fauna_chicken";
const oCamel = "gaia/fauna_camel";
const oFish = "gaia/fauna_fish";
const oGazelle = "gaia/fauna_gazelle";
@ -118,26 +117,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oGrapeBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/sahel.js
View file

@ -14,7 +14,6 @@ const tWater = "savanna_riparian_wet";
// gaia entities
const oBaobab = "gaia/flora_tree_baobab";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oGazelle = "gaia/fauna_gazelle";
const oGiraffe = "gaia/fauna_giraffe";
const oGiraffeInfant = "gaia/fauna_giraffe_infant";
@ -119,26 +118,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/sahel_watering_holes.js
View file

@ -18,7 +18,6 @@ const tWater = "savanna_riparian_wet";
const oBaobab = "gaia/flora_tree_baobab";
const oFig = "gaia/flora_tree_fig";
const oBerryBush = "gaia/flora_bush_berry";
const oChicken = "gaia/fauna_chicken";
const oWildebeest = "gaia/fauna_wildebeest"
const oFish = "gaia/fauna_fish";
const oGazelle = "gaia/fauna_gazelle";
@ -115,26 +114,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/snowflake_searocks.js
View file

@ -26,7 +26,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -1553,26 +1552,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
placeDefaultChicken(fx, fz, clBaseResource);
// create berry bushes
var bbAngle = randFloat(0, TWO_PI);
var bbDist = 10;
var bbX = round(fx + bbDist * cos(bbAngle));
var bbZ = round(fz + bbDist * sin(bbAngle));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

1
binaries/data/mods/public/maps/random/survivalofthefittest.js
View file

@ -26,7 +26,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();

17
binaries/data/mods/public/maps/random/syria.js
View file

@ -18,7 +18,6 @@ const oTamarix = "gaia/flora_tree_tamarix";
const oPalm = "gaia/flora_tree_date_palm";
const oPine = "gaia/flora_tree_aleppo_pine";
const oBush = "gaia/flora_bush_grapes";
const oChicken = "gaia/fauna_chicken";
const oCamel = "gaia/fauna_camel";
const oGazelle = "gaia/fauna_gazelle";
const oLion = "gaia/fauna_lion";
@ -120,26 +119,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/the_nile.js
View file

@ -18,7 +18,6 @@ var tSLush = "desert_grass_a_sand";
var tSDry = "desert_plants_b";
// gaia entities
var oBerryBush = "gaia/flora_bush_berry";
var oChicken = "gaia/fauna_chicken";
var oCamel = "gaia/fauna_camel";
var oFish = "gaia/fauna_fish";
var oGazelle = "gaia/fauna_gazelle";
@ -144,26 +143,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oBerryBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/unknown.js
View file

@ -27,7 +27,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -1669,26 +1668,14 @@ for (var i = 0; i < numPlayers; i++)
else
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

17
binaries/data/mods/public/maps/random/unknown_land.js
View file

@ -27,7 +27,6 @@ const oTree3 = rBiomeE3();
const oTree4 = rBiomeE4();
const oTree5 = rBiomeE5();
const oFruitBush = rBiomeE6();
const oChicken = rBiomeE7();
const oMainHuntableAnimal = rBiomeE8();
const oFish = rBiomeE9();
const oSecondaryHuntableAnimal = rBiomeE10();
@ -1439,26 +1438,14 @@ for (var i = 0; i < numPlayers; i++)
// create starting units
placeCivDefaultEntities(fx, fz, id);
// 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(oChicken, 5,5, 0,2)],
true, clBaseResource, aX, aZ
);
createObjectGroup(group, 0);
}
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));
group = new SimpleGroup(
var group = new SimpleGroup(
[new SimpleObject(oFruitBush, 5,5, 0,3)],
true, clBaseResource, bbX, bbZ
);

1
binaries/data/mods/public/maps/random/unknown_nomad.js
View file

@ -27,7 +27,6 @@ var oApple = rBiomeE3();
var oPine = rBiomeE4();
var oAleppoPine = rBiomeE5();
var oBerryBush = rBiomeE6();
var oChicken = rBiomeE7();
var oDeer = rBiomeE8();
var oFish = rBiomeE9();
var oSheep = rBiomeE10();