mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-10-14 06:58:07 +00:00
Fix clFood and constraint argument forgotton in createFood calls of 822e37f70c as reported by temple.
Fix whitespace of all createFood calls while at it. This was SVN commit r20531.
This commit is contained in:
elexis
@@ -283,42 +283,39 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3*scaleByMapSize(5,20)
|
||||
],
|
||||
[avoidClasses(clIsland, 2, clFood, 10), stayClasses(clWater, 5)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * scaleByMapSize(5, 20)
|
||||
],
|
||||
[avoidClasses(clIsland, 2, clFood, 10), stayClasses(clWater, 5)],
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oSheep, 5,7, 0,4)],
|
||||
[new SimpleObject(oGoat, 2,4, 0,3)],
|
||||
[new SimpleObject(oDeer, 2,4, 0,2)]
|
||||
],
|
||||
[
|
||||
scaleByMapSize(5,20),
|
||||
scaleByMapSize(5,20),
|
||||
scaleByMapSize(5,20)
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 8, clWater, 1, clFood, 10, clHill, 1)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oSheep, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oGoat, 2, 4, 0, 3)],
|
||||
[new SimpleObject(oDeer, 2, 4, 0, 2)]
|
||||
],
|
||||
[
|
||||
scaleByMapSize(5, 20),
|
||||
scaleByMapSize(5, 20),
|
||||
scaleByMapSize(5, 20)
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 8, clWater, 1, clFood, 10, clHill, 1),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(90);
|
||||
|
||||
|
||||
@@ -251,11 +251,11 @@ createObjectGroupsDeprecated(group, 0,
|
||||
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oHawk, 1,1, 0,3)],
|
||||
[new SimpleObject(oGazelle, 3,5, 0,3)],
|
||||
[new SimpleObject(oZebra, 3,5, 0,3)],
|
||||
[new SimpleObject(oWildebeest, 4,6, 0,3)],
|
||||
[new SimpleObject(oRhino, 1,1, 0,3)]
|
||||
[new SimpleObject(oHawk, 1, 1, 0, 3)],
|
||||
[new SimpleObject(oGazelle, 3, 5, 0, 3)],
|
||||
[new SimpleObject(oZebra, 3, 5, 0, 3)],
|
||||
[new SimpleObject(oWildebeest, 4, 6, 0, 3)],
|
||||
[new SimpleObject(oRhino, 1, 1, 0, 3)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
@@ -269,7 +269,7 @@ createFood(
|
||||
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oCrocodile, 2,3, 0,3)]
|
||||
[new SimpleObject(oCrocodile, 2, 3, 0, 3)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
@@ -279,7 +279,7 @@ createFood(
|
||||
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
@@ -289,7 +289,7 @@ createFood(
|
||||
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
15 * numPlayers
|
||||
|
||||
@@ -303,40 +303,37 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(75);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oDeer, 5,7, 0,4)],
|
||||
[new SimpleObject(oRabbit, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oDeer, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oRabbit, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
15 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 20), stayClasses(clWater, 6)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
15 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 20), stayClasses(clWater, 6)],
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -257,42 +257,41 @@ createDecoration
|
||||
);
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5,7, 0,4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 1, clHill, 1, clFood, 20), stayClasses(clLand, 3)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 1, clHill, 1, clFood, 20), stayClasses(clLand, 3)],
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(75);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 1, clHill, 1, clFood, 10), stayClasses(clLand, 3)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 1, clHill, 1, clFood, 10), stayClasses(clLand, 3)],
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(80);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
avoidClasses(clLand, 3, clPlayer, 2, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
avoidClasses(clLand, 3, clPlayer, 2, clFood, 20),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -204,28 +204,27 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(75);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oSheep, 5,7, 0,4)],
|
||||
[new SimpleObject(oDeer, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oSheep, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oDeer, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(3, 12) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(3, 12) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
log("Creating food treasures...");
|
||||
var group = new SimpleGroup(
|
||||
|
||||
@@ -283,30 +283,28 @@ createDecoration
|
||||
);
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oSheep, 2,3, 0,2)],
|
||||
[new SimpleObject(oDeer, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 0, clForest, 0, clPlayer, 1, clHill, 1, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oSheep, 2, 3, 0, 2)],
|
||||
[new SimpleObject(oDeer, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 0, clForest, 0, clPlayer, 1, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
Engine.SetProgress(80);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
Engine.SetProgress(85);
|
||||
|
||||
createStragglerTrees(
|
||||
|
||||
@@ -379,29 +379,27 @@ createObjectGroupsDeprecated(
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5,7, 0,4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 4, clHill, 1, clFood, 20, clHill2, 1), stayClasses(clLand, 3)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 4, clHill, 1, clFood, 20, clHill2, 1), stayClasses(clLand, 3)],
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 4, clHill, 1, clFood, 10, clHill2, 1), stayClasses(clLand, 3)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 4, clHill, 1, clFood, 10, clHill2, 1), stayClasses(clLand, 3)],
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -262,40 +262,37 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5,7, 0,4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20), stayClasses(clLand, 5)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20), stayClasses(clLand, 5)],
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10), stayClasses(clLand, 5)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10), stayClasses(clLand, 5)],
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
avoidClasses(clLand, 2, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
avoidClasses(clLand, 2, clFood, 20),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -255,42 +255,39 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3*scaleByMapSize(5,20)
|
||||
],
|
||||
[avoidClasses(clFood, 10), stayClasses(clWater, 5)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * scaleByMapSize(5, 20)
|
||||
],
|
||||
[avoidClasses(clFood, 10), stayClasses(clWater, 5)],
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oSheep, 5,7, 0,4)],
|
||||
[new SimpleObject(oGoat, 2,4, 0,3)],
|
||||
[new SimpleObject(oDeer, 2,4, 0,2)]
|
||||
],
|
||||
[
|
||||
scaleByMapSize(5,20),
|
||||
scaleByMapSize(5,20),
|
||||
scaleByMapSize(5,20)
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 10, clBaseResource, 6, clWater, 1, clFood, 10, clHill, 1, clRock, 6, clMetal, 6)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oSheep, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oGoat, 2, 4, 0, 3)],
|
||||
[new SimpleObject(oDeer, 2, 4, 0, 2)]
|
||||
],
|
||||
[
|
||||
scaleByMapSize(5,20),
|
||||
scaleByMapSize(5,20),
|
||||
scaleByMapSize(5,20)
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 10, clBaseResource, 6, clWater, 1, clFood, 10, clHill, 1, clRock, 6, clMetal, 6),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10, clRock, 6, clMetal, 6)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10, clRock, 6, clMetal, 6),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(90);
|
||||
|
||||
|
||||
@@ -613,8 +613,7 @@ createFood(
|
||||
scaleByMapSize(5, 10)
|
||||
],
|
||||
avoidClasses(clIsland, 2, clFood, 10, clWater, 5, clPlayer, 16, clHill, 2, clGauls, 5, clPath, 1),
|
||||
clFood
|
||||
);
|
||||
clFood);
|
||||
|
||||
log("Creating violent animals...");
|
||||
createFood(
|
||||
@@ -629,8 +628,8 @@ createFood(
|
||||
scaleByMapSize(5, 20)
|
||||
],
|
||||
avoidClasses(clIsland, 2, clFood, 10, clWater, 5, clPlayer, 24, clHill, 2, clGauls, 5, clPath, 1),
|
||||
clFood
|
||||
);
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
log("Creating fruits...");
|
||||
@@ -644,8 +643,8 @@ createFood(
|
||||
scaleByMapSize(5, 20)
|
||||
],
|
||||
avoidClasses(clWater, 5, clForest, 2, clPlayer, 16, clHill, 4, clFood, 10, clMetal, 4, clRock, 4, clGauls, 5, clPath, 1),
|
||||
clFood
|
||||
);
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(90);
|
||||
|
||||
createStragglerTrees(
|
||||
|
||||
@@ -257,40 +257,37 @@ createDecoration
|
||||
stayClasses(clShallow, 0)
|
||||
);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oDeer, 5,7, 0,4)],
|
||||
[new SimpleObject(oGoat, 2,3, 0,2)],
|
||||
[new SimpleObject(oBoar, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 1, clForest, 0, clPlayer, 20, clHill, 0, clFood, 15)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oDeer, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oGoat, 2, 3, 0, 2)],
|
||||
[new SimpleObject(oBoar, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 1, clForest, 0, clPlayer, 20, clHill, 0, clFood, 15),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[scaleByMapSize(3, 25) * numPlayers],
|
||||
[avoidClasses(clFood, 6), stayClasses(clWater, 4)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[scaleByMapSize(3, 25) * numPlayers],
|
||||
[avoidClasses(clFood, 6), stayClasses(clWater, 4)],
|
||||
clFood);
|
||||
|
||||
createStragglerTrees(
|
||||
[oBeech, oPoplar, oApple],
|
||||
|
||||
@@ -273,30 +273,28 @@ createDecoration
|
||||
);
|
||||
Engine.SetProgress(80);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oSheep, 2,3, 0,2)],
|
||||
[new SimpleObject(oDeer, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 0, clForest, 0, clPlayer, 6, clHill, 1, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oSheep, 2, 3, 0, 2)],
|
||||
[new SimpleObject(oDeer, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 0, clForest, 0, clPlayer, 6, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
Engine.SetProgress(85);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 2, clForest, 0, clPlayer, 6, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
avoidClasses(clWater, 2, clForest, 0, clPlayer, 6, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(90);
|
||||
|
||||
|
||||
@@ -351,29 +351,27 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5,7, 0,4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
createStragglerTrees(
|
||||
[oTree1, oTree2, oTree4, oTree3],
|
||||
|
||||
@@ -281,40 +281,37 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oDeer, 5,7, 0,4)],
|
||||
[new SimpleObject(oSheep, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20, clRiver, 1), stayClasses(clLand, 3)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oDeer, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSheep, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20, clRiver, 1), stayClasses(clLand, 3)],
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10, clRiver, 1), stayClasses(clLand, 3)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oBerryBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
randIntInclusive(1, 4) * numPlayers + 2
|
||||
],
|
||||
[avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10, clRiver, 1), stayClasses(clLand, 3)],
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
avoidClasses(clLand, 2, clRiver, 1)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
avoidClasses(clLand, 2, clRiver, 1),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -261,40 +261,37 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5,7, 0,4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 20), stayClasses(clWater, 6)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 20), stayClasses(clWater, 6)],
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -210,30 +210,29 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5,7, 0,4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(75);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -239,10 +239,10 @@ Engine.SetProgress(80);
|
||||
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oArcticFox, 1,2, 0,3)],
|
||||
[new SimpleObject(oWolf, 4,6, 0,4)],
|
||||
[new SimpleObject(oWalrus, 2,3, 0,2)],
|
||||
[new SimpleObject(oMuskox, 2,3, 0,2)]
|
||||
[new SimpleObject(oArcticFox, 1, 2, 0, 3)],
|
||||
[new SimpleObject(oWolf, 4, 6, 0, 4)],
|
||||
[new SimpleObject(oWalrus, 2, 3, 0, 2)],
|
||||
[new SimpleObject(oMuskox, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
@@ -255,8 +255,8 @@ createFood(
|
||||
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oWhaleFin, 1,2, 0,2)],
|
||||
[new SimpleObject(oWhaleHumpback, 1,2, 0,2)]
|
||||
[new SimpleObject(oWhaleFin, 1, 2, 0, 2)],
|
||||
[new SimpleObject(oWhaleHumpback, 1, 2, 0, 2)]
|
||||
],
|
||||
[
|
||||
scaleByMapSize(1, 6) * 3,
|
||||
@@ -267,7 +267,7 @@ createFood(
|
||||
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
100
|
||||
|
||||
@@ -303,40 +303,37 @@ createDecoration
|
||||
|
||||
Engine.SetProgress(70);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5,7, 0,4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oMainHuntableAnimal, 5, 7, 0, 4)],
|
||||
[new SimpleObject(oSecondaryHuntableAnimal, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers,
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 20),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5,7, 0,4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10)
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFruitBush, 5, 7, 0, 4)]
|
||||
],
|
||||
[
|
||||
3 * numPlayers
|
||||
],
|
||||
avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10),
|
||||
clFood);
|
||||
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 20), stayClasses(clWater, 6)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
25 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 20), stayClasses(clWater, 6)],
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
@@ -326,16 +326,15 @@ createDecoration
|
||||
Engine.SetProgress(80);
|
||||
|
||||
log("Growing fish...");
|
||||
createFood
|
||||
(
|
||||
[
|
||||
[new SimpleObject(oFish, 2,3, 0,2)]
|
||||
],
|
||||
[
|
||||
100 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 5), stayClasses(clWater, 4)]
|
||||
);
|
||||
createFood(
|
||||
[
|
||||
[new SimpleObject(oFish, 2, 3, 0, 2)]
|
||||
],
|
||||
[
|
||||
100 * numPlayers
|
||||
],
|
||||
[avoidClasses(clFood, 5), stayClasses(clWater, 4)],
|
||||
clFood);
|
||||
|
||||
Engine.SetProgress(85);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user