1
0
forked from 0ad/0ad

Remove some redundant random map logger ellipses.

This was SVN commit r21434.
This commit is contained in:
elexis 2018-03-04 21:09:16 +00:00
parent cabc9b4a69
commit b5c43fc5f9
14 changed files with 36 additions and 36 deletions

View File

@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common");
if (randBool())
{
log("Late spring biome...");
g_Map.log("Late spring biome");
setFogThickness(0.26);
setFogFactor(0.4);
@ -43,7 +43,7 @@ if (randBool())
}
else
{
log("Winter biome...");
g_Map.log("Winter biome");
setFogFactor(0.35);
setFogThickness(0.19);

View File

@ -228,7 +228,7 @@ MountainRangeBuilder.prototype.CreateMountainRanges = function()
if (randBool())
{
log("Late spring biome...");
g_Map.log("Late spring biome");
var tPrimary = ["alpine_dirt_grass_50"];
var tForestFloor = "alpine_forrestfloor";
var tCliff = ["alpine_cliff_a", "alpine_cliff_b", "alpine_cliff_c"];
@ -256,7 +256,7 @@ if (randBool())
}
else
{
log("Winter biome...");
g_Map.log("Winter biome");
var tPrimary = ["alpine_snow_a", "alpine_snow_b"];
var tForestFloor = "alpine_forrestfloor_snow";
var tCliff = ["alpine_cliff_snow"];

View File

@ -154,7 +154,7 @@ if (!isNomad())
]),
"towers");
g_Map.log("Flatten the initial CC area...");
g_Map.log("Flatten the initial CC area");
for (let position of playerPosition)
createArea(
new ClumpPlacer(diskArea(defaultPlayerBaseRadius() * 0.8), 0.95, 0.6, Infinity, position),
@ -319,7 +319,7 @@ addElements(shuffleArray([
]));
Engine.SetProgress(65);
g_Map.log("Painting island...");
g_Map.log("Painting island");
setIslandBiome();
addElements([
@ -397,7 +397,7 @@ addElements(shuffleArray([
Engine.SetProgress(80);
g_Map.log("Adding more decoratives...");
g_Map.log("Adding more decoratives");
createObjectGroups(
new SimpleGroup(
[
@ -416,7 +416,7 @@ createObjectGroups(
20);
Engine.SetProgress(85);
g_Map.log("Creating treasures...");
g_Map.log("Creating treasures");
for (let treasure of [g_Gaia.woodTreasure, g_Gaia.foodTreasure])
createObjectGroups(
new SimpleGroup([new SimpleObject(treasure, 1, 1, 0, 2)], true),
@ -429,7 +429,7 @@ for (let treasure of [g_Gaia.woodTreasure, g_Gaia.foodTreasure])
20);
Engine.SetProgress(90);
g_Map.log("Creating shipwrecks...");
g_Map.log("Creating shipwrecks");
createObjectGroups(
new SimpleGroup([new SimpleObject(g_Gaia.shipWreck, 1, 1, 0, 1)], true),
0,

View File

@ -378,7 +378,7 @@ for (let bridgeStart of shuffleArray(areaShoreline.getPoints()))
break
}
g_Map.log("Adding smoke...");
g_Map.log("Adding smoke");
if (areasVolcano.length)
{
createObjectGroupsByAreas(

View File

@ -187,7 +187,7 @@ Engine.SetProgress(35);
if (!isNomad())
{
g_Map.log("Flattening initial CC area...");
g_Map.log("Flattening initial CC area");
let playerRadius = defaultPlayerBaseRadius() * 0.8;
for (let position of playerPosition)
createArea(

View File

@ -135,7 +135,7 @@ createArea(
new HeightConstraint(-Infinity, heightSeaGround));
Engine.SetProgress(15);
g_Map.log("Creating Nile passages...");
g_Map.log("Creating Nile passages");
const riverAngle = Math.PI * 3 / 4;
for (let i = 0; i < scaleByMapSize(8, 15); ++i)
{
@ -200,10 +200,10 @@ var playerIDs = [];
var playerPosition = [];
if (!isNomad())
{
g_Map.log("Finding player locations...");
g_Map.log("Finding player locations");
[playerIDs, playerPosition] = playerPlacementRandom(sortAllPlayers(), avoidClasses(clWater, scaleByMapSize(8, 12), clCliff, scaleByMapSize(8, 12)));
g_Map.log("Flatten the initial CC area...");
g_Map.log("Flatten the initial CC area");
for (let position of playerPosition)
createArea(
new ClumpPlacer(diskArea(defaultPlayerBaseRadius() * 0.8), 0.95, 0.6, Infinity, position),

View File

@ -130,7 +130,7 @@ if (!isNomad())
]),
true);
g_Map.log("Flatten the initial CC area...");
g_Map.log("Flatten the initial CC area");
for (let position of playerPosition)
createArea(
new ClumpPlacer(diskArea(defaultPlayerBaseRadius() * 0.8), 0.95, 0.6, Infinity, position),
@ -309,7 +309,7 @@ addElements(shuffleArray([
]));
Engine.SetProgress(80);
log("Adding reeds...");
g_Map.log("Adding reeds");
createObjectGroups(
new SimpleGroup(
[

View File

@ -170,7 +170,7 @@ if (!isNomad())
stayClasses(g_TileClasses.land, scaleByMapSize(8, 25))
]);
g_Map.log("Flatten the initial CC area and placing playerbases...");
g_Map.log("Flatten the initial CC area and placing playerbases");
for (let i = 0; i < getNumPlayers(); ++i)
{
g_Map.logger.printDuration();
@ -395,7 +395,7 @@ createArea(
Engine.SetProgress(70);
g_Map.log("Placing fish...");
g_Map.log("Placing fish");
g_Gaia.fish = "gaia/fauna_fish";
addElements([
{
@ -411,7 +411,7 @@ addElements([
]);
Engine.SetProgress(85);
g_Map.log("Placing whale...");
g_Map.log("Placing whale");
g_Gaia.fish = "gaia/fauna_whale_fin";
addElements([
{

View File

@ -147,14 +147,14 @@ if (!isNomad())
]),
true);
g_Map.log("Flatten the initial CC area...");
g_Map.log("Flatten the initial CC area");
for (let position of playerPosition)
createArea(
new ClumpPlacer(diskArea(defaultPlayerBaseRadius() * 0.8), 0.95, 0.6, Infinity, position),
new SmoothElevationPainter(ELEVATION_SET, g_Map.getHeight(position), 6));
}
log("Render lowlands...");
g_Map.log("Render lowlands");
setBiomeLowlands();
addElements([
{
@ -290,7 +290,7 @@ addElements(shuffleArray([
]));
Engine.SetProgress(60);
log("Render highlands...");
g_Map.log("Render highlands");
setBiomeHighlands();
addElements([
{
@ -401,7 +401,7 @@ addElements(shuffleArray([
]));
Engine.SetProgress(70);
log("Render eden...");
g_Map.log("Render eden");
setBiomeEden();
addElements([
{

View File

@ -146,7 +146,7 @@ var areaVesuv = createArea(
new HeightConstraint(heightLavaVesuv, Infinity));
Engine.SetProgress(46);
g_Map.log("Adding smoke...");
g_Map.log("Adding smoke");
createObjectGroupsByAreas(
new SimpleGroup(
[
@ -173,7 +173,7 @@ if (!isNomad())
]),
false);
g_Map.log("Flatten the initial CC area...");
g_Map.log("Flatten the initial CC area");
for (let position of playerPosition)
createArea(
new ClumpPlacer(diskArea(defaultPlayerBaseRadius() * 0.8), 0.95, 0.6, Infinity, position),
@ -334,7 +334,7 @@ addElements(shuffleArray([
]));
Engine.SetProgress(70);
g_Map.log("Adding gatherable stone statues...");
g_Map.log("Adding gatherable stone statues");
createObjectGroups(
new SimpleGroup(
[new SimpleObject(g_Gaia.romanStatue, 1, 1, 1, 4)],
@ -354,7 +354,7 @@ createObjectGroups(
50);
Engine.SetProgress(75);
g_Map.log("Adding stone ruins...");
g_Map.log("Adding stone ruins");
createObjectGroups(
new SimpleGroup(
[
@ -377,7 +377,7 @@ createObjectGroups(
20);
Engine.SetProgress(80);
g_Map.log("Adding shipwrecks...");
g_Map.log("Adding shipwrecks");
createObjectGroups(
new SimpleGroup(g_Decoratives.shipwrecks.map(shipwreck => new SimpleObject(shipwreck, 0, 1, 1, 20)), true, g_TileClasses.decorative),
0,
@ -389,7 +389,7 @@ createObjectGroups(
20);
Engine.SetProgress(85);
g_Map.log("Adding more statues...");
g_Map.log("Adding more statues");
createObjectGroups(
new SimpleGroup(g_Decoratives.statues.map(ruin => new SimpleObject(ruin, 0, 1, 1, 20)), true, g_TileClasses.decorative),
0,
@ -405,7 +405,7 @@ createObjectGroups(
30);
Engine.SetProgress(90);
g_Map.log("Adding skeletons...");
g_Map.log("Adding skeletons");
createObjectGroups(
new SimpleGroup(
[new SimpleObject(g_Decoratives.skeleton, 3, 10, 1, 7)],

View File

@ -74,7 +74,7 @@ createArea(
new SmoothingPainter(1, 0.1, 1));
Engine.SetProgress(25);
g_Map.log("Creating shallows...");
g_Map.log("Creating shallows");
for (let i = 0; i < scaleByMapSize(5, 12); ++i)
{
let x = fractionToTiles(randFloat(0, 1));
@ -327,7 +327,7 @@ createDecoration(
);
Engine.SetProgress(90);
g_Map.log("Placing fish...");
g_Map.log("Placing fish");
addElements([
{
"func": addFish,

View File

@ -129,7 +129,7 @@ if (!isNomad())
]),
true);
g_Map.log("Flatten the initial CC area...");
g_Map.log("Flatten the initial CC area");
for (let position of playerPosition)
createArea(
new ClumpPlacer(diskArea(defaultPlayerBaseRadius() * 0.8), 0.95, 0.6, Infinity, position),
@ -338,7 +338,7 @@ createObjectGroups(
5);
Engine.SetProgress(90);
g_Map.log("Adding dust...");
g_Map.log("Adding dust");
createObjectGroups(
new SimpleGroup([new SimpleObject(g_Decoratives.dust, 1, 1, 1, 4)], false),
0,

View File

@ -501,7 +501,7 @@ function createTributaryRivers(riverAngle, riverCount, riverWidth, heightRiverbe
// Create shallows
if (shallowTileClass)
{
g_Map.log("Creating shallows in the tributary rivers...");
g_Map.log("Creating shallows in the tributary rivers");
for (let z of [0.25, 0.75])
createPassage({
"start": new Vector2D(mapBounds.left, fractionToTiles(z)).rotateAround(riverAngle, mapCenter),

View File

@ -861,7 +861,7 @@ function placeGenericFortress(center, radius = 20, playerId = 0, style, irregula
++tries;
}
log("placeGenericFortress: Reduced overlap to " + minOverlap + " after " + tries + " tries...");
log("placeGenericFortress: Reduced overlap to " + minOverlap + " after " + tries + " tries");
// Place wall
for (let pointIndex = 0; pointIndex < bestPointDerivation.length; ++pointIndex)