Paths
Table of Contentst
Differential D1387
Fix a bug in Latium and Ardennes Forest
ClosedPublic
Actions

Authored by temple on Mar 14 2018, 2:32 AM.
Details

Reviewers
elexis
Commits
rP21552: Fix a bug in Latium and Ardennes Forest
Trac Tickets
#4960
Summary
In rP20882 playerPosition was changed from fraction to tiles, however that change wasn't accounted for in the distanceToPlayers function. On Latium this caused forests to be placed where civic centers would go since they didn't think they were near them, and then often there wasn't room for starting resources (#4960). In Ardennes Forest, this caused starting areas to be a little bumpy too.
Test Plan
Perhaps these two maps could/should be rewritten. They're the only two that use playerNearness and the Noise functions.
But for now this fixes the ticket.
Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline

temple created this revision.Mar 14 2018, 2:32 AM
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues:
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|  42|  42| const aCeltLongHouse = "actor|structures/celts/longhouse.xml";
|  43|  43| 
|  44|  44| var pForest = [
|  45|    |-		tPineForestFloor+TERRAIN_SEPARATOR+oOak, tForestFloor,
|    |  45|+	tPineForestFloor+TERRAIN_SEPARATOR+oOak, tForestFloor,
|  46|  46| 		tPineForestFloor+TERRAIN_SEPARATOR+oPine, tForestFloor,
|  47|  47| 		tPineForestFloor+TERRAIN_SEPARATOR+oAleppoPine, tForestFloor,
|  48|  48| 		tForestFloor
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|  43|  43| 
|  44|  44| var pForest = [
|  45|  45| 		tPineForestFloor+TERRAIN_SEPARATOR+oOak, tForestFloor,
|  46|    |-		tPineForestFloor+TERRAIN_SEPARATOR+oPine, tForestFloor,
|    |  46|+	tPineForestFloor+TERRAIN_SEPARATOR+oPine, tForestFloor,
|  47|  47| 		tPineForestFloor+TERRAIN_SEPARATOR+oAleppoPine, tForestFloor,
|  48|  48| 		tForestFloor
|  49|  49| 		];
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|  44|  44| var pForest = [
|  45|  45| 		tPineForestFloor+TERRAIN_SEPARATOR+oOak, tForestFloor,
|  46|  46| 		tPineForestFloor+TERRAIN_SEPARATOR+oPine, tForestFloor,
|  47|    |-		tPineForestFloor+TERRAIN_SEPARATOR+oAleppoPine, tForestFloor,
|    |  47|+	tPineForestFloor+TERRAIN_SEPARATOR+oAleppoPine, tForestFloor,
|  48|  48| 		tForestFloor
|  49|  49| 		];
|  50|  50| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|  45|  45| 		tPineForestFloor+TERRAIN_SEPARATOR+oOak, tForestFloor,
|  46|  46| 		tPineForestFloor+TERRAIN_SEPARATOR+oPine, tForestFloor,
|  47|  47| 		tPineForestFloor+TERRAIN_SEPARATOR+oAleppoPine, tForestFloor,
|  48|    |-		tForestFloor
|    |  48|+	tForestFloor
|  49|  49| 		];
|  50|  50| 
|  51|  51| const heightRavineValley = 2;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 0 tabs but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|  46|  46| 		tPineForestFloor+TERRAIN_SEPARATOR+oPine, tForestFloor,
|  47|  47| 		tPineForestFloor+TERRAIN_SEPARATOR+oAleppoPine, tForestFloor,
|  48|  48| 		tForestFloor
|  49|    |-		];
|    |  49|+];
|  50|  50| 
|  51|  51| const heightRavineValley = 2;
|  52|  52| const heightLand = 30;
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 114| 114| 
| 115| 115| function playerNearness(x, z)
| 116| 116| {
| 117|    |-	var d = fractionToTiles(distanceToPlayers(x,z));
|    | 117|+	var d = fractionToTiles(distanceToPlayers(x, z));
| 118| 118| 
| 119| 119| 	if (d < 13)
| 120| 120| 		return 0;
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 287| 287| 		let position = new Vector2D(ix, iz);
| 288| 288| 		var z = iz / (mapSize + 1.0);
| 289| 289| 		var h = g_Map.getHeight(position);
| 290|    |-		var pn = playerNearness(x,z);
|    | 290|+		var pn = playerNearness(x, z);
| 291| 291| 		var n = (noise0.get(x,z) - 0.5) * 10;
| 292| 292| 		g_Map.setHeight(position, h + (n * pn));
| 293| 293| 	}
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 288| 288| 		var z = iz / (mapSize + 1.0);
| 289| 289| 		var h = g_Map.getHeight(position);
| 290| 290| 		var pn = playerNearness(x,z);
| 291|    |-		var n = (noise0.get(x,z) - 0.5) * 10;
|    | 291|+		var n = (noise0.get(x, z) - 0.5) * 10;
| 292| 292| 		g_Map.setHeight(position, h + (n * pn));
| 293| 293| 	}
| 294| 294| }
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 312| 312| 	[explorableArea]
| 313| 313| );
| 314| 314| 
| 315|    |-var num = forestTreesJoin / (scaleByMapSize(4,6) * numPlayers);
|    | 315|+var num = forestTreesJoin / (scaleByMapSize(4, 6) * numPlayers);
| 316| 316| createAreasInAreas(
| 317| 317| 	new ClumpPlacer(forestTreesJoin / num, 0.1, 0.1, Infinity),
| 318| 318| 	[
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 357| 357| 		clRock),
| 358| 358| 	0,
| 359| 359| 	[avoidClasses(clHill, 4, clForest, 2, clPlayer, 20, clRock, 10)],
| 360|    |-	scaleByMapSize(6,20), 100,
|    | 360|+	scaleByMapSize(6, 20), 100,
| 361| 361| 	[explorableArea]);
| 362| 362| 
| 363| 363| g_Map.log("Creating small stone mines");
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 364| 364| var group = new SimpleGroup([new SimpleObject(oStoneSmall, 2, 5, 1, 3)], true, clRock);
| 365| 365| createObjectGroupsByAreasDeprecated(group, 0,
| 366| 366| 	[avoidClasses(clHill, 4, clForest, 2, clPlayer, 20, clRock, 10)],
| 367|    |-	scaleByMapSize(6,20), 100,
|    | 367|+	scaleByMapSize(6, 20), 100,
| 368| 368| 	[explorableArea]
| 369| 369| );
| 370| 370| 
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 369| 369| );
| 370| 370| 
| 371| 371| g_Map.log("Creating metal mines");
| 372|    |-group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0,4), new SimpleObject(oMetalLarge, 0,1, 0,4)], true, clMetal);
|    | 372|+group = new SimpleGroup([new SimpleObject(oMetalSmall, 1, 2, 0,4), new SimpleObject(oMetalLarge, 0,1, 0,4)], true, clMetal);
| 373| 373| createObjectGroupsByAreasDeprecated(group, 0,
| 374| 374| 	[avoidClasses(clHill, 4, clForest, 2, clPlayer, 20, clMetal, 10, clRock, 5)],
| 375| 375| 	scaleByMapSize(6,20), 100,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 369| 369| );
| 370| 370| 
| 371| 371| g_Map.log("Creating metal mines");
| 372|    |-group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0,4), new SimpleObject(oMetalLarge, 0,1, 0,4)], true, clMetal);
|    | 372|+group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0, 4), new SimpleObject(oMetalLarge, 0,1, 0,4)], true, clMetal);
| 373| 373| createObjectGroupsByAreasDeprecated(group, 0,
| 374| 374| 	[avoidClasses(clHill, 4, clForest, 2, clPlayer, 20, clMetal, 10, clRock, 5)],
| 375| 375| 	scaleByMapSize(6,20), 100,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 369| 369| );
| 370| 370| 
| 371| 371| g_Map.log("Creating metal mines");
| 372|    |-group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0,4), new SimpleObject(oMetalLarge, 0,1, 0,4)], true, clMetal);
|    | 372|+group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0,4), new SimpleObject(oMetalLarge, 0, 1, 0,4)], true, clMetal);
| 373| 373| createObjectGroupsByAreasDeprecated(group, 0,
| 374| 374| 	[avoidClasses(clHill, 4, clForest, 2, clPlayer, 20, clMetal, 10, clRock, 5)],
| 375| 375| 	scaleByMapSize(6,20), 100,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 369| 369| );
| 370| 370| 
| 371| 371| g_Map.log("Creating metal mines");
| 372|    |-group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0,4), new SimpleObject(oMetalLarge, 0,1, 0,4)], true, clMetal);
|    | 372|+group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0,4), new SimpleObject(oMetalLarge, 0,1, 0, 4)], true, clMetal);
| 373| 373| createObjectGroupsByAreasDeprecated(group, 0,
| 374| 374| 	[avoidClasses(clHill, 4, clForest, 2, clPlayer, 20, clMetal, 10, clRock, 5)],
| 375| 375| 	scaleByMapSize(6,20), 100,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 372| 372| group = new SimpleGroup([new SimpleObject(oMetalSmall, 1,2, 0,4), new SimpleObject(oMetalLarge, 0,1, 0,4)], true, clMetal);
| 373| 373| createObjectGroupsByAreasDeprecated(group, 0,
| 374| 374| 	[avoidClasses(clHill, 4, clForest, 2, clPlayer, 20, clMetal, 10, clRock, 5)],
| 375|    |-	scaleByMapSize(6,20), 100,
|    | 375|+	scaleByMapSize(6, 20), 100,
| 376| 376| 	[explorableArea]
| 377| 377| );
| 378| 378| 
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 380| 380| 
| 381| 381| g_Map.log("Creating wildlife");
| 382| 382| group = new SimpleGroup(
| 383|    |-	[new SimpleObject(oDeer, 5,7, 0,4)],
|    | 383|+	[new SimpleObject(oDeer, 5, 7, 0,4)],
| 384| 384| 	true, clFood
| 385| 385| );
| 386| 386| createObjectGroupsByAreasDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 380| 380| 
| 381| 381| g_Map.log("Creating wildlife");
| 382| 382| group = new SimpleGroup(
| 383|    |-	[new SimpleObject(oDeer, 5,7, 0,4)],
|    | 383|+	[new SimpleObject(oDeer, 5,7, 0, 4)],
| 384| 384| 	true, clFood
| 385| 385| );
| 386| 386| createObjectGroupsByAreasDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 390| 390| );
| 391| 391| 
| 392| 392| group = new SimpleGroup(
| 393|    |-	[new SimpleObject(oBoar, 2,3, 0,5)],
|    | 393|+	[new SimpleObject(oBoar, 2, 3, 0,5)],
| 394| 394| 	true, clFood
| 395| 395| );
| 396| 396| createObjectGroupsByAreasDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 390| 390| );
| 391| 391| 
| 392| 392| group = new SimpleGroup(
| 393|    |-	[new SimpleObject(oBoar, 2,3, 0,5)],
|    | 393|+	[new SimpleObject(oBoar, 2,3, 0, 5)],
| 394| 394| 	true, clFood
| 395| 395| );
| 396| 396| createObjectGroupsByAreasDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 400| 400| );
| 401| 401| 
| 402| 402| group = new SimpleGroup(
| 403|    |-	[new SimpleObject(oBear, 1,1, 0,4)],
|    | 403|+	[new SimpleObject(oBear, 1, 1, 0,4)],
| 404| 404| 	false, clFood
| 405| 405| );
| 406| 406| createObjectGroupsByAreasDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 400| 400| );
| 401| 401| 
| 402| 402| group = new SimpleGroup(
| 403|    |-	[new SimpleObject(oBear, 1,1, 0,4)],
|    | 403|+	[new SimpleObject(oBear, 1,1, 0, 4)],
| 404| 404| 	false, clFood
| 405| 405| );
| 406| 406| createObjectGroupsByAreasDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 413| 413| 
| 414| 414| g_Map.log("Creating berry bush");
| 415| 415| group = new SimpleGroup(
| 416|    |-	[new SimpleObject(oBerryBush, 5,7, 0,4)],
|    | 416|+	[new SimpleObject(oBerryBush, 5, 7, 0,4)],
| 417| 417| 	true, clFood
| 418| 418| );
| 419| 419| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 413| 413| 
| 414| 414| g_Map.log("Creating berry bush");
| 415| 415| group = new SimpleGroup(
| 416|    |-	[new SimpleObject(oBerryBush, 5,7, 0,4)],
|    | 416|+	[new SimpleObject(oBerryBush, 5,7, 0, 4)],
| 417| 417| 	true, clFood
| 418| 418| );
| 419| 419| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 424| 424| g_Map.log("Creating decorative props");
| 425| 425| group = new SimpleGroup(
| 426| 426| 	[
| 427|    |-		new SimpleObject(aWoodA, 1,2, 0,1),
|    | 427|+		new SimpleObject(aWoodA, 1, 2, 0,1),
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 424| 424| g_Map.log("Creating decorative props");
| 425| 425| group = new SimpleGroup(
| 426| 426| 	[
| 427|    |-		new SimpleObject(aWoodA, 1,2, 0,1),
|    | 427|+		new SimpleObject(aWoodA, 1,2, 0, 1),
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 425| 425| group = new SimpleGroup(
| 426| 426| 	[
| 427| 427| 		new SimpleObject(aWoodA, 1,2, 0,1),
| 428|    |-		new SimpleObject(aWoodB, 1,3, 0,1),
|    | 428|+		new SimpleObject(aWoodB, 1, 3, 0,1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
| 431| 431| 		new SimpleObject(aBarrel, 0,2, 0,1)
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 425| 425| group = new SimpleGroup(
| 426| 426| 	[
| 427| 427| 		new SimpleObject(aWoodA, 1,2, 0,1),
| 428|    |-		new SimpleObject(aWoodB, 1,3, 0,1),
|    | 428|+		new SimpleObject(aWoodB, 1,3, 0, 1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
| 431| 431| 		new SimpleObject(aBarrel, 0,2, 0,1)
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 426| 426| 	[
| 427| 427| 		new SimpleObject(aWoodA, 1,2, 0,1),
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429|    |-		new SimpleObject(aWheel, 0,2, 0,1),
|    | 429|+		new SimpleObject(aWheel, 0, 2, 0,1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
| 431| 431| 		new SimpleObject(aBarrel, 0,2, 0,1)
| 432| 432| 	],
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 426| 426| 	[
| 427| 427| 		new SimpleObject(aWoodA, 1,2, 0,1),
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429|    |-		new SimpleObject(aWheel, 0,2, 0,1),
|    | 429|+		new SimpleObject(aWheel, 0,2, 0, 1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
| 431| 431| 		new SimpleObject(aBarrel, 0,2, 0,1)
| 432| 432| 	],
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 427| 427| 		new SimpleObject(aWoodA, 1,2, 0,1),
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430|    |-		new SimpleObject(aWoodLarge, 0,1, 0,1),
|    | 430|+		new SimpleObject(aWoodLarge, 0, 1, 0,1),
| 431| 431| 		new SimpleObject(aBarrel, 0,2, 0,1)
| 432| 432| 	],
| 433| 433| 	true
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 427| 427| 		new SimpleObject(aWoodA, 1,2, 0,1),
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430|    |-		new SimpleObject(aWoodLarge, 0,1, 0,1),
|    | 430|+		new SimpleObject(aWoodLarge, 0,1, 0, 1),
| 431| 431| 		new SimpleObject(aBarrel, 0,2, 0,1)
| 432| 432| 	],
| 433| 433| 	true
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
| 431|    |-		new SimpleObject(aBarrel, 0,2, 0,1)
|    | 431|+		new SimpleObject(aBarrel, 0, 2, 0,1)
| 432| 432| 	],
| 433| 433| 	true
| 434| 434| );
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 428| 428| 		new SimpleObject(aWoodB, 1,3, 0,1),
| 429| 429| 		new SimpleObject(aWheel, 0,2, 0,1),
| 430| 430| 		new SimpleObject(aWoodLarge, 0,1, 0,1),
| 431|    |-		new SimpleObject(aBarrel, 0,2, 0,1)
|    | 431|+		new SimpleObject(aBarrel, 0,2, 0, 1)
| 432| 432| 	],
| 433| 433| 	true
| 434| 434| );
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 456| 456| 
| 457| 457| g_Map.log("Creating grass tufts");
| 458| 458| group = new SimpleGroup(
| 459|    |-	[new SimpleObject(aGrassLarge, 1,2, 0,1, -Math.PI / 8, Math.PI / 8)]
|    | 459|+	[new SimpleObject(aGrassLarge, 1, 2, 0,1, -Math.PI / 8, Math.PI / 8)]
| 460| 460| );
| 461| 461| createObjectGroupsByAreasDeprecated(group, 0,
| 462| 462| 	avoidClasses(clHill, 2, clPlayer, 2),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 456| 456| 
| 457| 457| g_Map.log("Creating grass tufts");
| 458| 458| group = new SimpleGroup(
| 459|    |-	[new SimpleObject(aGrassLarge, 1,2, 0,1, -Math.PI / 8, Math.PI / 8)]
|    | 459|+	[new SimpleObject(aGrassLarge, 1,2, 0, 1, -Math.PI / 8, Math.PI / 8)]
| 460| 460| );
| 461| 461| createObjectGroupsByAreasDeprecated(group, 0,
| 462| 462| 	avoidClasses(clHill, 2, clPlayer, 2),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 466| 466| 
| 467| 467| placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clMetal, 4, clRock, 4, clHill, 4, clFood, 2));
| 468| 468| 
| 469|    |-setTerrainAmbientColor(0.44,0.51,0.56);
|    | 469|+setTerrainAmbientColor(0.44, 0.51,0.56);
| 470| 470| setUnitsAmbientColor(0.44,0.51,0.56);
| 471| 471| 
| 472| 472| g_Map.ExportMap();
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 466| 466| 
| 467| 467| placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clMetal, 4, clRock, 4, clHill, 4, clFood, 2));
| 468| 468| 
| 469|    |-setTerrainAmbientColor(0.44,0.51,0.56);
|    | 469|+setTerrainAmbientColor(0.44,0.51, 0.56);
| 470| 470| setUnitsAmbientColor(0.44,0.51,0.56);
| 471| 471| 
| 472| 472| g_Map.ExportMap();
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 467| 467| placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clMetal, 4, clRock, 4, clHill, 4, clFood, 2));
| 468| 468| 
| 469| 469| setTerrainAmbientColor(0.44,0.51,0.56);
| 470|    |-setUnitsAmbientColor(0.44,0.51,0.56);
|    | 470|+setUnitsAmbientColor(0.44, 0.51,0.56);
| 471| 471| 
| 472| 472| g_Map.ExportMap();
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/ardennes_forest.js
| 467| 467| placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clMetal, 4, clRock, 4, clHill, 4, clFood, 2));
| 468| 468| 
| 469| 469| setTerrainAmbientColor(0.44,0.51,0.56);
| 470|    |-setUnitsAmbientColor(0.44,0.51,0.56);
|    | 470|+setUnitsAmbientColor(0.44,0.51, 0.56);
| 471| 471| 
| 472| 472| g_Map.ExportMap();

binaries/data/mods/public/maps/random/ardennes_forest.js
| 103| function·distanceToPlayers(x,·z)
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'x' is already declared in the upper scope.

binaries/data/mods/public/maps/random/ardennes_forest.js
| 103| function·distanceToPlayers(x,·z)
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'z' is already declared in the upper scope.

binaries/data/mods/public/maps/random/ardennes_forest.js
| 115| function·playerNearness(x,·z)
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'x' is already declared in the upper scope.

binaries/data/mods/public/maps/random/ardennes_forest.js
| 115| function·playerNearness(x,·z)
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'z' is already declared in the upper scope.
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|  92|  92| 
|  93|  93| function playerNearness(x, z)
|  94|  94| {
|  95|    |-	var d = fractionToTiles(distanceToPlayers(x,z));
|    |  95|+	var d = fractionToTiles(distanceToPlayers(x, z));
|  96|  96| 
|  97|  97| 	if (d < 13)
|  98|  98| 		return 0;
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 147| 147| 		let h = distToWater ? heightHill * (1 - Math.abs(c - 0.5) / (0.5 - WATER_WIDTH)) : g_Map.getHeight(position);
| 148| 148| 
| 149| 149| 		// add some base noise
| 150|    |-		var baseNoise = 16*noise0.get(x,z) + 8*noise1.get(x,z) + 4*noise2.get(x,z) - (16+8+4)/2;
|    | 150|+		var baseNoise = 16*noise0.get(x, z) + 8*noise1.get(x,z) + 4*noise2.get(x,z) - (16+8+4)/2;
| 151| 151| 		if ( baseNoise < 0 )
| 152| 152| 		{
| 153| 153| 			baseNoise *= pn;
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 147| 147| 		let h = distToWater ? heightHill * (1 - Math.abs(c - 0.5) / (0.5 - WATER_WIDTH)) : g_Map.getHeight(position);
| 148| 148| 
| 149| 149| 		// add some base noise
| 150|    |-		var baseNoise = 16*noise0.get(x,z) + 8*noise1.get(x,z) + 4*noise2.get(x,z) - (16+8+4)/2;
|    | 150|+		var baseNoise = 16*noise0.get(x,z) + 8*noise1.get(x, z) + 4*noise2.get(x,z) - (16+8+4)/2;
| 151| 151| 		if ( baseNoise < 0 )
| 152| 152| 		{
| 153| 153| 			baseNoise *= pn;
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 147| 147| 		let h = distToWater ? heightHill * (1 - Math.abs(c - 0.5) / (0.5 - WATER_WIDTH)) : g_Map.getHeight(position);
| 148| 148| 
| 149| 149| 		// add some base noise
| 150|    |-		var baseNoise = 16*noise0.get(x,z) + 8*noise1.get(x,z) + 4*noise2.get(x,z) - (16+8+4)/2;
|    | 150|+		var baseNoise = 16*noise0.get(x,z) + 8*noise1.get(x,z) + 4*noise2.get(x, z) - (16+8+4)/2;
| 151| 151| 		if ( baseNoise < 0 )
| 152| 152| 		{
| 153| 153| 			baseNoise *= pn;
|    | [NORMAL] ESLintBear (space-in-parens):
|    | There should be no spaces inside this paren.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 148| 148| 
| 149| 149| 		// add some base noise
| 150| 150| 		var baseNoise = 16*noise0.get(x,z) + 8*noise1.get(x,z) + 4*noise2.get(x,z) - (16+8+4)/2;
| 151|    |-		if ( baseNoise < 0 )
|    | 151|+		if (baseNoise < 0 )
| 152| 152| 		{
| 153| 153| 			baseNoise *= pn;
| 154| 154| 			baseNoise *= Math.max(0.1, distToWater / (0.5 - WATER_WIDTH));
|    | [NORMAL] ESLintBear (space-in-parens):
|    | There should be no spaces inside this paren.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 148| 148| 
| 149| 149| 		// add some base noise
| 150| 150| 		var baseNoise = 16*noise0.get(x,z) + 8*noise1.get(x,z) + 4*noise2.get(x,z) - (16+8+4)/2;
| 151|    |-		if ( baseNoise < 0 )
|    | 151|+		if ( baseNoise < 0)
| 152| 152| 		{
| 153| 153| 			baseNoise *= pn;
| 154| 154| 			baseNoise *= Math.max(0.1, distToWater / (0.5 - WATER_WIDTH));
|    | [NORMAL] ESLintBear (space-in-parens):
|    | There should be no spaces inside this paren.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 157| 157| 		h += baseNoise;
| 158| 158| 
| 159| 159| 		// add some higher-frequency noise on land
| 160|    |-		if ( oldH > 0 )
|    | 160|+		if (oldH > 0 )
| 161| 161| 			h += (0.4 * noise2a.get(x,z) + 0.2 * noise2b.get(x,z)) * Math.min(oldH / 10, 1);
| 162| 162| 
| 163| 163| 		// create cliff noise
|    | [NORMAL] ESLintBear (space-in-parens):
|    | There should be no spaces inside this paren.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 157| 157| 		h += baseNoise;
| 158| 158| 
| 159| 159| 		// add some higher-frequency noise on land
| 160|    |-		if ( oldH > 0 )
|    | 160|+		if ( oldH > 0)
| 161| 161| 			h += (0.4 * noise2a.get(x,z) + 0.2 * noise2b.get(x,z)) * Math.min(oldH / 10, 1);
| 162| 162| 
| 163| 163| 		// create cliff noise
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 158| 158| 
| 159| 159| 		// add some higher-frequency noise on land
| 160| 160| 		if ( oldH > 0 )
| 161|    |-			h += (0.4 * noise2a.get(x,z) + 0.2 * noise2b.get(x,z)) * Math.min(oldH / 10, 1);
|    | 161|+			h += (0.4 * noise2a.get(x, z) + 0.2 * noise2b.get(x,z)) * Math.min(oldH / 10, 1);
| 162| 162| 
| 163| 163| 		// create cliff noise
| 164| 164| 		if ( h > -10 )
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 158| 158| 
| 159| 159| 		// add some higher-frequency noise on land
| 160| 160| 		if ( oldH > 0 )
| 161|    |-			h += (0.4 * noise2a.get(x,z) + 0.2 * noise2b.get(x,z)) * Math.min(oldH / 10, 1);
|    | 161|+			h += (0.4 * noise2a.get(x,z) + 0.2 * noise2b.get(x, z)) * Math.min(oldH / 10, 1);
| 162| 162| 
| 163| 163| 		// create cliff noise
| 164| 164| 		if ( h > -10 )
|    | [NORMAL] ESLintBear (space-in-parens):
|    | There should be no spaces inside this paren.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 161| 161| 			h += (0.4 * noise2a.get(x,z) + 0.2 * noise2b.get(x,z)) * Math.min(oldH / 10, 1);
| 162| 162| 
| 163| 163| 		// create cliff noise
| 164|    |-		if ( h > -10 )
|    | 164|+		if (h > -10 )
| 165| 165| 		{
| 166| 166| 			var cliffNoise = (noise3.get(x,z) + 0.5*noise4.get(x,z)) / 1.5;
| 167| 167| 			if (h < 1)
|    | [NORMAL] ESLintBear (space-in-parens):
|    | There should be no spaces inside this paren.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 161| 161| 			h += (0.4 * noise2a.get(x,z) + 0.2 * noise2b.get(x,z)) * Math.min(oldH / 10, 1);
| 162| 162| 
| 163| 163| 		// create cliff noise
| 164|    |-		if ( h > -10 )
|    | 164|+		if ( h > -10)
| 165| 165| 		{
| 166| 166| 			var cliffNoise = (noise3.get(x,z) + 0.5*noise4.get(x,z)) / 1.5;
| 167| 167| 			if (h < 1)
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 163| 163| 		// create cliff noise
| 164| 164| 		if ( h > -10 )
| 165| 165| 		{
| 166|    |-			var cliffNoise = (noise3.get(x,z) + 0.5*noise4.get(x,z)) / 1.5;
|    | 166|+			var cliffNoise = (noise3.get(x, z) + 0.5*noise4.get(x,z)) / 1.5;
| 167| 167| 			if (h < 1)
| 168| 168| 			{
| 169| 169| 				var u = 1 - 0.3*((h-1)/-10);
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 163| 163| 		// create cliff noise
| 164| 164| 		if ( h > -10 )
| 165| 165| 		{
| 166|    |-			var cliffNoise = (noise3.get(x,z) + 0.5*noise4.get(x,z)) / 1.5;
|    | 166|+			var cliffNoise = (noise3.get(x,z) + 0.5*noise4.get(x, z)) / 1.5;
| 167| 167| 			if (h < 1)
| 168| 168| 			{
| 169| 169| 				var u = 1 - 0.3*((h-1)/-10);
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 173| 173| 			if (cliffNoise > 0.6)
| 174| 174| 			{
| 175| 175| 				var u = 0.8 * (cliffNoise - 0.6);
| 176|    |-				cliffNoise += u * noise5.get(x,z);
|    | 176|+				cliffNoise += u * noise5.get(x, z);
| 177| 177| 				cliffNoise /= (1 + u);
| 178| 178| 			}
| 179| 179| 			cliffNoise -= 0.59;
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 269| 269| 		// forests
| 270| 270| 		if (g_Map.getHeight(position) < 11 && diffH < 2 && minH > 1)
| 271| 271| 		{
| 272|    |-			var forestNoise = (noise6.get(x,z) + 0.5*noise7.get(x,z)) / 1.5 * pn - 0.59;
|    | 272|+			var forestNoise = (noise6.get(x, z) + 0.5*noise7.get(x,z)) / 1.5 * pn - 0.59;
| 273| 273| 
| 274| 274| 			// Thin out trees a bit
| 275| 275| 			if (forestNoise > 0 && randBool())
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 269| 269| 		// forests
| 270| 270| 		if (g_Map.getHeight(position) < 11 && diffH < 2 && minH > 1)
| 271| 271| 		{
| 272|    |-			var forestNoise = (noise6.get(x,z) + 0.5*noise7.get(x,z)) / 1.5 * pn - 0.59;
|    | 272|+			var forestNoise = (noise6.get(x,z) + 0.5*noise7.get(x, z)) / 1.5 * pn - 0.59;
| 273| 273| 
| 274| 274| 			// Thin out trees a bit
| 275| 275| 			if (forestNoise > 0 && randBool())
|    | [NORMAL] ESLintBear (curly):
|    | Unnecessary { after 'if' condition.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 273| 273| 
| 274| 274| 			// Thin out trees a bit
| 275| 275| 			if (forestNoise > 0 && randBool())
| 276|    |-			{
|    | 276|+			
| 277| 277| 				if (minH < 11 && minH >= 4)
| 278| 278| 				{
| 279| 279| 					var typeNoise = noise10.get(x,z);
| 292| 292| 					t = pPalmForest;
| 293| 293| 					clForest.add(position);
| 294| 294| 				}
| 295|    |-			}
|    | 295|+			
| 296| 296| 		}
| 297| 297| 
| 298| 298| 		// grass variations
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 276| 276| 			{
| 277| 277| 				if (minH < 11 && minH >= 4)
| 278| 278| 				{
| 279|    |-					var typeNoise = noise10.get(x,z);
|    | 279|+					var typeNoise = noise10.get(x, z);
| 280| 280| 
| 281| 281| 					if (typeNoise < 0.43 && forestNoise < 0.05)
| 282| 282| 						t = pPoplarForest;
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 298| 298| 		// grass variations
| 299| 299| 		if (t == tGrass)
| 300| 300| 		{
| 301|    |-			var grassNoise = (noise8.get(x,z) + 0.6*noise9.get(x,z)) / 1.6;
|    | 301|+			var grassNoise = (noise8.get(x, z) + 0.6*noise9.get(x,z)) / 1.6;
| 302| 302| 			if (grassNoise < 0.3)
| 303| 303| 				t = (diffH > 1.2) ? tDirtCliff : tDirt;
| 304| 304| 			else if (grassNoise < 0.34)
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 298| 298| 		// grass variations
| 299| 299| 		if (t == tGrass)
| 300| 300| 		{
| 301|    |-			var grassNoise = (noise8.get(x,z) + 0.6*noise9.get(x,z)) / 1.6;
|    | 301|+			var grassNoise = (noise8.get(x,z) + 0.6*noise9.get(x, z)) / 1.6;
| 302| 302| 			if (grassNoise < 0.3)
| 303| 303| 				t = (diffH > 1.2) ? tDirtCliff : tDirt;
| 304| 304| 			else if (grassNoise < 0.34)
|    | [NORMAL] ESLintBear (curly):
|    | Unnecessary { after 'if' condition.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 308| 308| 					g_Map.placeEntityAnywhere(aGrassDry, 0, randomPositionOnTile(position), randomAngle());
| 309| 309| 			}
| 310| 310| 			else if (grassNoise > 0.61)
| 311|    |-			{
|    | 311|+			
| 312| 312| 				t = (diffH > 1.2 ? tGrassRock : tGrassShrubs);
| 313|    |-			}
|    | 313|+			
| 314| 314| 			else if (diffH < 0.5 && randBool(0.02))
| 315| 315| 				g_Map.placeEntityAnywhere(aGrass, 0, randomPositionOnTile(position), randomAngle());
| 316| 316| 		}
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 358| 358| 
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361|    |-	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
|    | 361|+	[new SimpleObject(aBushSmall, 0, 2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
| 362| 362| 	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 358| 358| 
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361|    |-	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
|    | 361|+	[new SimpleObject(aBushSmall, 0,2, 0, 2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
| 362| 362| 	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 358| 358| 
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361|    |-	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
|    | 361|+	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0, 2, 0,2),
| 362| 362| 	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 358| 358| 
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361|    |-	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
|    | 361|+	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0, 2),
| 362| 362| 	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 1.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361| 361| 	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
| 362|    |-	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
|    | 362|+		new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
| 365| 365| 	avoidClasses(clWater, 4, clCliff, 2),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361| 361| 	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
| 362|    |-	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
|    | 362|+	new SimpleObject(aBushMed, 0, 1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
| 365| 365| 	avoidClasses(clWater, 4, clCliff, 2),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361| 361| 	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
| 362|    |-	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
|    | 362|+	new SimpleObject(aBushMed, 0,1, 0, 2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
| 365| 365| 	avoidClasses(clWater, 4, clCliff, 2),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361| 361| 	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
| 362|    |-	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
|    | 362|+	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0, 1, 0,2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
| 365| 365| 	avoidClasses(clWater, 4, clCliff, 2),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 359| 359| g_Map.log("Creating bushes");
| 360| 360| var group = new SimpleGroup(
| 361| 361| 	[new SimpleObject(aBushSmall, 0,2, 0,2), new SimpleObject(aBushSmallDry, 0,2, 0,2),
| 362|    |-	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0,2)]
|    | 362|+	new SimpleObject(aBushMed, 0,1, 0,2), new SimpleObject(aBushMedDry, 0,1, 0, 2)]
| 363| 363| );
| 364| 364| createObjectGroupsDeprecated(group, 0,
| 365| 365| 	avoidClasses(clWater, 4, clCliff, 2),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 369| 369| 
| 370| 370| g_Map.log("Creating rocks");
| 371| 371| group = new SimpleGroup(
| 372|    |-	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
|    | 372|+	[new SimpleObject(aRockSmall, 0, 3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
| 373| 373| 	new SimpleObject(aRockLarge, 0,1, 0,2)]
| 374| 374| );
| 375| 375| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 369| 369| 
| 370| 370| g_Map.log("Creating rocks");
| 371| 371| group = new SimpleGroup(
| 372|    |-	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
|    | 372|+	[new SimpleObject(aRockSmall, 0,3, 0, 2), new SimpleObject(aRockMed, 0,2, 0,2),
| 373| 373| 	new SimpleObject(aRockLarge, 0,1, 0,2)]
| 374| 374| );
| 375| 375| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 369| 369| 
| 370| 370| g_Map.log("Creating rocks");
| 371| 371| group = new SimpleGroup(
| 372|    |-	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
|    | 372|+	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0, 2, 0,2),
| 373| 373| 	new SimpleObject(aRockLarge, 0,1, 0,2)]
| 374| 374| );
| 375| 375| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 369| 369| 
| 370| 370| g_Map.log("Creating rocks");
| 371| 371| group = new SimpleGroup(
| 372|    |-	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
|    | 372|+	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0, 2),
| 373| 373| 	new SimpleObject(aRockLarge, 0,1, 0,2)]
| 374| 374| );
| 375| 375| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 1.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 370| 370| g_Map.log("Creating rocks");
| 371| 371| group = new SimpleGroup(
| 372| 372| 	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
| 373|    |-	new SimpleObject(aRockLarge, 0,1, 0,2)]
|    | 373|+		new SimpleObject(aRockLarge, 0,1, 0,2)]
| 374| 374| );
| 375| 375| createObjectGroupsDeprecated(group, 0,
| 376| 376| 	avoidClasses(clWater, 2, clCliff, 1),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 370| 370| g_Map.log("Creating rocks");
| 371| 371| group = new SimpleGroup(
| 372| 372| 	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
| 373|    |-	new SimpleObject(aRockLarge, 0,1, 0,2)]
|    | 373|+	new SimpleObject(aRockLarge, 0, 1, 0,2)]
| 374| 374| );
| 375| 375| createObjectGroupsDeprecated(group, 0,
| 376| 376| 	avoidClasses(clWater, 2, clCliff, 1),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 370| 370| g_Map.log("Creating rocks");
| 371| 371| group = new SimpleGroup(
| 372| 372| 	[new SimpleObject(aRockSmall, 0,3, 0,2), new SimpleObject(aRockMed, 0,2, 0,2),
| 373|    |-	new SimpleObject(aRockLarge, 0,1, 0,2)]
|    | 373|+	new SimpleObject(aRockLarge, 0,1, 0, 2)]
| 374| 374| );
| 375| 375| createObjectGroupsDeprecated(group, 0,
| 376| 376| 	avoidClasses(clWater, 2, clCliff, 1),
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 382| 382| group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4, 0, 2 * Math.PI, 1), new SimpleObject(oStoneLarge, 1, 1, 0, 4, 0, 2 * Math.PI, 4)], true, clRock);
| 383| 383| createObjectGroupsDeprecated(group, 0,
| 384| 384| 	avoidClasses(clWater, 1, clForest, 4, clPlayer, 40, clRock, 60, clMetal, 10, clCliff, 3),
| 385|    |-	scaleByMapSize(4,16), 100
|    | 385|+	scaleByMapSize(4, 16), 100
| 386| 386| );
| 387| 387| 
| 388| 388| g_Map.log("Creating small stone mines");
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 386| 386| );
| 387| 387| 
| 388| 388| g_Map.log("Creating small stone mines");
| 389|    |-group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock);
|    | 389|+group = new SimpleGroup([new SimpleObject(oStoneSmall, 2, 5, 1,3)], true, clRock);
| 390| 390| createObjectGroups(group, 0,
| 391| 391| 	avoidClasses(clForest, 4, clWater, 1, clPlayer, 40, clRock, 30, clMetal, 10, clCliff, 3),
| 392| 392| 	scaleByMapSize(4,16), 100
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 386| 386| );
| 387| 387| 
| 388| 388| g_Map.log("Creating small stone mines");
| 389|    |-group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock);
|    | 389|+group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1, 3)], true, clRock);
| 390| 390| createObjectGroups(group, 0,
| 391| 391| 	avoidClasses(clForest, 4, clWater, 1, clPlayer, 40, clRock, 30, clMetal, 10, clCliff, 3),
| 392| 392| 	scaleByMapSize(4,16), 100
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 389| 389| group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock);
| 390| 390| createObjectGroups(group, 0,
| 391| 391| 	avoidClasses(clForest, 4, clWater, 1, clPlayer, 40, clRock, 30, clMetal, 10, clCliff, 3),
| 392|    |-	scaleByMapSize(4,16), 100
|    | 392|+	scaleByMapSize(4, 16), 100
| 393| 393| );
| 394| 394| g_Map.log("Creating metal mines");
| 395| 395| group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,2)], true, clMetal);
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 392| 392| 	scaleByMapSize(4,16), 100
| 393| 393| );
| 394| 394| g_Map.log("Creating metal mines");
| 395|    |-group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,2)], true, clMetal);
|    | 395|+group = new SimpleGroup([new SimpleObject(oMetalLarge, 1, 1, 0,2)], true, clMetal);
| 396| 396| createObjectGroups(group, 0,
| 397| 397| 	avoidClasses(clForest, 4, clWater, 1, clPlayer, 40, clMetal, 50, clCliff, 3),
| 398| 398| 	scaleByMapSize(4,16), 100
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 392| 392| 	scaleByMapSize(4,16), 100
| 393| 393| );
| 394| 394| g_Map.log("Creating metal mines");
| 395|    |-group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,2)], true, clMetal);
|    | 395|+group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0, 2)], true, clMetal);
| 396| 396| createObjectGroups(group, 0,
| 397| 397| 	avoidClasses(clForest, 4, clWater, 1, clPlayer, 40, clMetal, 50, clCliff, 3),
| 398| 398| 	scaleByMapSize(4,16), 100
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 395| 395| group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,2)], true, clMetal);
| 396| 396| createObjectGroups(group, 0,
| 397| 397| 	avoidClasses(clForest, 4, clWater, 1, clPlayer, 40, clMetal, 50, clCliff, 3),
| 398|    |-	scaleByMapSize(4,16), 100
|    | 398|+	scaleByMapSize(4, 16), 100
| 399| 399| );
| 400| 400| Engine.SetProgress(60);
| 401| 401| 
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 409| 409| 
| 410| 410| g_Map.log("Creating straggler cypresses");
| 411| 411| group = new SimpleGroup(
| 412|    |-	[new SimpleObject(oCypress2, 1,3, 0,3), new SimpleObject(oCypress1, 0,2, 0,2)],
|    | 412|+	[new SimpleObject(oCypress2, 1, 3, 0,3), new SimpleObject(oCypress1, 0,2, 0,2)],
| 413| 413| 	true
| 414| 414| );
| 415| 415| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 409| 409| 
| 410| 410| g_Map.log("Creating straggler cypresses");
| 411| 411| group = new SimpleGroup(
| 412|    |-	[new SimpleObject(oCypress2, 1,3, 0,3), new SimpleObject(oCypress1, 0,2, 0,2)],
|    | 412|+	[new SimpleObject(oCypress2, 1,3, 0, 3), new SimpleObject(oCypress1, 0,2, 0,2)],
| 413| 413| 	true
| 414| 414| );
| 415| 415| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 409| 409| 
| 410| 410| g_Map.log("Creating straggler cypresses");
| 411| 411| group = new SimpleGroup(
| 412|    |-	[new SimpleObject(oCypress2, 1,3, 0,3), new SimpleObject(oCypress1, 0,2, 0,2)],
|    | 412|+	[new SimpleObject(oCypress2, 1,3, 0,3), new SimpleObject(oCypress1, 0, 2, 0,2)],
| 413| 413| 	true
| 414| 414| );
| 415| 415| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 409| 409| 
| 410| 410| g_Map.log("Creating straggler cypresses");
| 411| 411| group = new SimpleGroup(
| 412|    |-	[new SimpleObject(oCypress2, 1,3, 0,3), new SimpleObject(oCypress1, 0,2, 0,2)],
|    | 412|+	[new SimpleObject(oCypress2, 1,3, 0,3), new SimpleObject(oCypress1, 0,2, 0, 2)],
| 413| 413| 	true
| 414| 414| );
| 415| 415| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 419| 419| Engine.SetProgress(80);
| 420| 420| 
| 421| 421| g_Map.log("Creating sheep");
| 422|    |-group = new SimpleGroup([new SimpleObject(oSheep, 2,4, 0,2)], true, clFood);
|    | 422|+group = new SimpleGroup([new SimpleObject(oSheep, 2, 4, 0,2)], true, clFood);
| 423| 423| createObjectGroupsDeprecated(group, 0,
| 424| 424| 	avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clRock, 6, clFood, 8),
| 425| 425| 	3 * numPlayers, 50
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 419| 419| Engine.SetProgress(80);
| 420| 420| 
| 421| 421| g_Map.log("Creating sheep");
| 422|    |-group = new SimpleGroup([new SimpleObject(oSheep, 2,4, 0,2)], true, clFood);
|    | 422|+group = new SimpleGroup([new SimpleObject(oSheep, 2,4, 0, 2)], true, clFood);
| 423| 423| createObjectGroupsDeprecated(group, 0,
| 424| 424| 	avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clRock, 6, clFood, 8),
| 425| 425| 	3 * numPlayers, 50
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 441| 441| 
| 442| 442| g_Map.log("Creating deer");
| 443| 443| group = new SimpleGroup(
| 444|    |-	[new SimpleObject(oDeer, 5,7, 0,4)],
|    | 444|+	[new SimpleObject(oDeer, 5, 7, 0,4)],
| 445| 445| 	true, clFood
| 446| 446| );
| 447| 447| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 441| 441| 
| 442| 442| g_Map.log("Creating deer");
| 443| 443| group = new SimpleGroup(
| 444|    |-	[new SimpleObject(oDeer, 5,7, 0,4)],
|    | 444|+	[new SimpleObject(oDeer, 5,7, 0, 4)],
| 445| 445| 	true, clFood
| 446| 446| );
| 447| 447| createObjectGroupsDeprecated(group, 0,
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 451| 451| Engine.SetProgress(95);
| 452| 452| 
| 453| 453| g_Map.log("Creating berry bushes");
| 454|    |-group = new SimpleGroup([new SimpleObject(oBerryBush, 5,7, 0,3)], true, clFood);
|    | 454|+group = new SimpleGroup([new SimpleObject(oBerryBush, 5, 7, 0,3)], true, clFood);
| 455| 455| createObjectGroupsDeprecated(group, 0,
| 456| 456| 	avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clRock, 6, clFood, 8),
| 457| 457| 	1.5 * numPlayers, 100
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 451| 451| Engine.SetProgress(95);
| 452| 452| 
| 453| 453| g_Map.log("Creating berry bushes");
| 454|    |-group = new SimpleGroup([new SimpleObject(oBerryBush, 5,7, 0,3)], true, clFood);
|    | 454|+group = new SimpleGroup([new SimpleObject(oBerryBush, 5,7, 0, 3)], true, clFood);
| 455| 455| createObjectGroupsDeprecated(group, 0,
| 456| 456| 	avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clRock, 6, clFood, 8),
| 457| 457| 	1.5 * numPlayers, 100
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 460| 460| placePlayersNomad(clPlayer, avoidClasses(clWater, 4, clCliff, 2, clForest, 1, clMetal, 4, clRock, 4, clFood, 2));
| 461| 461| 
| 462| 462| setSkySet("sunny");
| 463|    |-setWaterColor(0.024,0.262,0.224);
|    | 463|+setWaterColor(0.024, 0.262,0.224);
| 464| 464| setWaterTint(0.133, 0.325,0.255);
| 465| 465| setWaterWaviness(2.5);
| 466| 466| setWaterType("ocean");
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 460| 460| placePlayersNomad(clPlayer, avoidClasses(clWater, 4, clCliff, 2, clForest, 1, clMetal, 4, clRock, 4, clFood, 2));
| 461| 461| 
| 462| 462| setSkySet("sunny");
| 463|    |-setWaterColor(0.024,0.262,0.224);
|    | 463|+setWaterColor(0.024,0.262, 0.224);
| 464| 464| setWaterTint(0.133, 0.325,0.255);
| 465| 465| setWaterWaviness(2.5);
| 466| 466| setWaterType("ocean");
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/latium.js
| 461| 461| 
| 462| 462| setSkySet("sunny");
| 463| 463| setWaterColor(0.024,0.262,0.224);
| 464|    |-setWaterTint(0.133, 0.325,0.255);
|    | 464|+setWaterTint(0.133, 0.325, 0.255);
| 465| 465| setWaterWaviness(2.5);
| 466| 466| setWaterType("ocean");
| 467| 467| setWaterMurkiness(0.8);
Link to build: https://jenkins.wildfiregames.com/job/differential/243/display/redirect
Harbormaster completed remote builds in B5543: Diff 6165.Mar 14 2018, 5:11 AM
There is stll the issue mentioned in comment:2 of #4960, cliffs being painted first, then players placed on top of it and the cliff flattened without the texture being updated.
clCliff at least ignores the CC for those 13 or 19 tiles there, so it will be at least as playable as before.
This bug must exist since the introduction of the map.
Pretty sure I had this diff here written at some point already, strange.
It's certainly correct.
(For alpha 23 the starting resources should likely still have some kind of distance retry loop, as these errors can occur on many maps.)
This revision is now accepted and ready to land.Mar 14 2018, 11:38 AM
Closed by commit rP21552: Fix a bug in Latium and Ardennes Forest (authored by temple). · Explain WhyMar 15 2018, 12:05 AM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Mar 15 2018, 12:05 AM
Revision Contents
Changeset List

Path
Size
ps/
trunk/
binaries/
data/
mods/
public/
maps/
random/
ardennes_forest.js
4 lines
latium.js
4 lines
Diff 6171

View Options
ps/trunk/binaries/data/mods/public/maps/random/ardennes_forest.js
