Page MenuHomeWildfire Games
Differential D1416

Changes to Fields of Meroe
ClosedPublic
Actions

Authored by lyv on Mar 25 2018, 7:41 PM.

Details

Reviewers
elexis
Commits
rP21680: Add two cataracts and more mines to Fields Of Meroë.
Summary

Added more mines and a crossable shallow to the river.

Test Plan

Make sure the passage is crossable and whether mine count is appropriate.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
/ps/trunk
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 5771
Build 9680: Vulcan BuildJenkins
Build 9679: arc lint + arc unit

Event Timeline

lyv created this revision.Mar 25 2018, 7:41 PM
Owners added a subscriber: Restricted Owners Package.Mar 25 2018, 7:41 PM
Vulcan added a subscriber: Vulcan.Mar 25 2018, 7:53 PM

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 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 122| 122| 	"landFunc": (position, shoreDist1, shoreDist2) => {
| 123| 123| 		for (let riv of riverTextures)
| 124| 124| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 125|    |-				{
|    | 125|+			{
| 126| 126| 					riv.tileClass.add(position);
| 127| 127| 					if (riv.terrain)
| 128| 128| 						createTerrain(riv.terrain).place(position);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 123| 123| 		for (let riv of riverTextures)
| 124| 124| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 125| 125| 				{
| 126|    |-					riv.tileClass.add(position);
|    | 126|+				riv.tileClass.add(position);
| 127| 127| 					if (riv.terrain)
| 128| 128| 						createTerrain(riv.terrain).place(position);
| 129| 129| 				}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 124| 124| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 125| 125| 				{
| 126| 126| 					riv.tileClass.add(position);
| 127|    |-					if (riv.terrain)
|    | 127|+				if (riv.terrain)
| 128| 128| 						createTerrain(riv.terrain).place(position);
| 129| 129| 				}
| 130| 130| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 125| 125| 				{
| 126| 126| 					riv.tileClass.add(position);
| 127| 127| 					if (riv.terrain)
| 128|    |-						createTerrain(riv.terrain).place(position);
|    | 128|+					createTerrain(riv.terrain).place(position);
| 129| 129| 				}
| 130| 130| 	}
| 131| 131| });
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 126| 126| 					riv.tileClass.add(position);
| 127| 127| 					if (riv.terrain)
| 128| 128| 						createTerrain(riv.terrain).place(position);
| 129|    |-				}
|    | 129|+			}
| 130| 130| 	}
| 131| 131| });
| 132| 132| Engine.SetProgress(10);

Link to build: https://jenkins.wildfiregames.com/job/differential/310/display/redirect

Harbormaster completed remote builds in B5691: Diff 6273.Mar 25 2018, 7:53 PM
temple added a comment.Mar 26 2018, 2:29 AM

Thanks for the crossing, otherwise I think it's too hard to continually ferry units across the river.

elexis added a comment.Mar 26 2018, 3:23 PM

About the part that ships can't cross, that's geographically and historically accurate. Land trade was important because of that.

binaries/data/mods/public/maps/random/fields_of_meroe.js
146

PI/2 can be avoided by switching X/Y I guess.
In rP21620 is an example showing how one can replace this helper function with a more familiar createArea call.

Also it would be good to have scaleByMapSize(2, 4) passages, right?
(Perhaps they don't need a minimm distance if it's too timeconsuming to implement)

154

Was wondering if we should have bumps and stones around the area too (NearTileClasses(clPassage) constrained to the water area).

402

ByAreas, otherwise you get too few rocks, also performance

lyv added inline comments.Mar 26 2018, 3:26 PM
binaries/data/mods/public/maps/random/fields_of_meroe.js
146

I actually wanted to include the fifth and sixth(?) cataracts. But couldnt get the constraint to work, and i guess its not geographically accurate when two are too close.

elexis added inline comments.Mar 26 2018, 3:31 PM
binaries/data/mods/public/maps/random/fields_of_meroe.js
146

I forgot, exactly two of them. We should have it as a code comment if we don't add it to the map description (the latter wouldn't be inadvisable as it teaches the players some relevant history and geography).

A simple implementation of two cataracts would be for (let x of randFloat(0.15, 0.35), randFloat(0.65, 0.85))

lyv updated this revision to Diff 6301.Apr 2 2018, 1:50 PM
elexis added inline comments.Apr 2 2018, 2:08 PM
binaries/data/mods/public/maps/random/fields_of_meroe.js
138

areaPassage

146

Is it intended that start and end use two different angles?

Use a constant for -1

160

may use undefined too

lyv updated this revision to Diff 6302.Apr 2 2018, 2:23 PM
lyv updated this revision to Diff 6308.Apr 3 2018, 3:35 PM

Fixed an oversight

elexis added a comment.Apr 5 2018, 1:38 PM

Besides aRock, this contains the fixes to the inline comments: https://pastebin.com/8ikR3vX1

binaries/data/mods/public/maps/random/fields_of_meroe.js
138

Can move the PI/2 and riverAngle here too to remove a bit of duplication

148

\n}

152

Constants for heights

156

100 retries shouldn't be needed now that it always tries to place within that area.
Also since it doesn't have a constraint, it always succeeds.

390–399

aRockA doesnt fit to water, should avoid it
\n

399

This one needs more retries, because it choses a random point on the map and its unlikely that its near the cataract. (An alternative would be to create an area around the passage and then use createObjectGroupsByAreas, but that doesn't seem worth the lines of code)

lyv updated this revision to Diff 6321.Apr 5 2018, 2:17 PM
Vulcan added a comment.Apr 5 2018, 3:02 PM

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 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 124| 124| 	"landFunc": (position, shoreDist1, shoreDist2) => {
| 125| 125| 		for (let riv of riverTextures)
| 126| 126| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 127|    |-				{
|    | 127|+			{
| 128| 128| 					riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 125| 125| 		for (let riv of riverTextures)
| 126| 126| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 127| 127| 				{
| 128|    |-					riv.tileClass.add(position);
|    | 128|+				riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
| 131| 131| 				}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 126| 126| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 127| 127| 				{
| 128| 128| 					riv.tileClass.add(position);
| 129|    |-					if (riv.terrain)
|    | 129|+				if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
| 131| 131| 				}
| 132| 132| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 127| 127| 				{
| 128| 128| 					riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130|    |-						createTerrain(riv.terrain).place(position);
|    | 130|+					createTerrain(riv.terrain).place(position);
| 131| 131| 				}
| 132| 132| 	}
| 133| 133| });
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 128| 128| 					riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
| 131|    |-				}
|    | 131|+			}
| 132| 132| 	}
| 133| 133| });
| 134| 134| Engine.SetProgress(10);
|    | [NORMAL] ESLintBear (semi):
|    | Missing semicolon.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 168| 168| 		undefined,
| 169| 169| 		scaleByMapSize(20, 50),
| 170| 170| 		20,
| 171|    |-		[areaPassage])
|    | 171|+		[areaPassage]);
| 172| 172| }
| 173| 173| 
| 174| 174| var [playerIDs, playerPosition] = playerPlacementRandom(sortAllPlayers(), avoidClasses(clRiver, 15, clPlayer, 30));

binaries/data/mods/public/maps/random/fields_of_meroe.js
| 171| »   »   [areaPassage])
|    | [NORMAL] JSHintBear:
|    | Missing semicolon.

Link to build: https://jenkins.wildfiregames.com/job/differential/345/display/redirect

Harbormaster completed remote builds in B5767: Diff 6321.Apr 5 2018, 3:02 PM
elexis added inline comments.Apr 5 2018, 6:53 PM
binaries/data/mods/public/maps/random/fields_of_meroe.js
293

This calls the officially Deprecated function which is bugged and places too few mines. See #4695.

lyv updated this revision to Diff 6324.Apr 6 2018, 2:44 PM
Vulcan added a comment.Apr 6 2018, 2:49 PM

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 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 123| 123| 	"landFunc": (position, shoreDist1, shoreDist2) => {
| 124| 124| 		for (let riv of riverTextures)
| 125| 125| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 126|    |-				{
|    | 126|+			{
| 127| 127| 					riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 124| 124| 		for (let riv of riverTextures)
| 125| 125| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 126| 126| 				{
| 127|    |-					riv.tileClass.add(position);
|    | 127|+				riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
| 130| 130| 				}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 125| 125| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 126| 126| 				{
| 127| 127| 					riv.tileClass.add(position);
| 128|    |-					if (riv.terrain)
|    | 128|+				if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
| 130| 130| 				}
| 131| 131| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 126| 126| 				{
| 127| 127| 					riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129|    |-						createTerrain(riv.terrain).place(position);
|    | 129|+					createTerrain(riv.terrain).place(position);
| 130| 130| 				}
| 131| 131| 	}
| 132| 132| });
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 127| 127| 					riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
| 130|    |-				}
|    | 130|+			}
| 131| 131| 	}
| 132| 132| });
| 133| 133| Engine.SetProgress(10);
|    | [NORMAL] ESLintBear (object-curly-spacing):
|    | A space is required before '}'.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 145| 145| 		"tileClass": clCataract,
| 146| 146| 		"startHeight": heightCataract,
| 147| 147| 		"endHeight": heightCataract,
| 148|    |-		"constraints": new HeightConstraint(-Infinity, 0)});
|    | 148|+		"constraints": new HeightConstraint(-Infinity, 0) });
| 149| 149| 
| 150| 150| 	createAreasInAreas(
| 151| 151| 		new ClumpPlacer(4, 0.4, 0.6),
|    | [NORMAL] ESLintBear (semi):
|    | Missing semicolon.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 161| 161| 		undefined,
| 162| 162| 		scaleByMapSize(20, 50),
| 163| 163| 		50,
| 164|    |-		[areaPassage])
|    | 164|+		[areaPassage]);
| 165| 165| }
| 166| 166| 
| 167| 167| var [playerIDs, playerPosition] = playerPlacementRandom(sortAllPlayers(), avoidClasses(clRiver, 15, clPlayer, 30));

binaries/data/mods/public/maps/random/fields_of_meroe.js
| 164| »   »   [areaPassage])
|    | [NORMAL] JSHintBear:
|    | Missing semicolon.

Link to build: https://jenkins.wildfiregames.com/job/differential/347/display/redirect

Harbormaster completed remote builds in B5771: Diff 6324.Apr 6 2018, 2:49 PM
lyv updated this revision to Diff 6325.Apr 6 2018, 4:21 PM
Vulcan added a comment.Apr 6 2018, 4:25 PM

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 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 123| 123| 	"landFunc": (position, shoreDist1, shoreDist2) => {
| 124| 124| 		for (let riv of riverTextures)
| 125| 125| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 126|    |-				{
|    | 126|+			{
| 127| 127| 					riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 124| 124| 		for (let riv of riverTextures)
| 125| 125| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 126| 126| 				{
| 127|    |-					riv.tileClass.add(position);
|    | 127|+				riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
| 130| 130| 				}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 125| 125| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 126| 126| 				{
| 127| 127| 					riv.tileClass.add(position);
| 128|    |-					if (riv.terrain)
|    | 128|+				if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
| 130| 130| 				}
| 131| 131| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 126| 126| 				{
| 127| 127| 					riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129|    |-						createTerrain(riv.terrain).place(position);
|    | 129|+					createTerrain(riv.terrain).place(position);
| 130| 130| 				}
| 131| 131| 	}
| 132| 132| });
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 127| 127| 					riv.tileClass.add(position);
| 128| 128| 					if (riv.terrain)
| 129| 129| 						createTerrain(riv.terrain).place(position);
| 130|    |-				}
|    | 130|+			}
| 131| 131| 	}
| 132| 132| });
| 133| 133| Engine.SetProgress(10);
|    | [NORMAL] ESLintBear (object-curly-spacing):
|    | A space is required before '}'.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 145| 145| 		"tileClass": clCataract,
| 146| 146| 		"startHeight": heightCataract,
| 147| 147| 		"endHeight": heightCataract,
| 148|    |-		"constraints": new HeightConstraint(-Infinity, 0)});
|    | 148|+		"constraints": new HeightConstraint(-Infinity, 0) });
| 149| 149| 
| 150| 150| 	createAreasInAreas(
| 151| 151| 		new ClumpPlacer(4, 0.4, 0.6),
|    | [NORMAL] ESLintBear (semi):
|    | Missing semicolon.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 161| 161| 		undefined,
| 162| 162| 		scaleByMapSize(20, 50),
| 163| 163| 		50,
| 164|    |-		[areaPassage])
|    | 164|+		[areaPassage]);
| 165| 165| }
| 166| 166| 
| 167| 167| var [playerIDs, playerPosition] = playerPlacementRandom(sortAllPlayers(), avoidClasses(clRiver, 15, clPlayer, 30));

binaries/data/mods/public/maps/random/fields_of_meroe.js
| 164| »   »   [areaPassage])
|    | [NORMAL] JSHintBear:
|    | Missing semicolon.

Link to build: https://jenkins.wildfiregames.com/job/differential/348/display/redirect

Harbormaster completed remote builds in B5772: Diff 6325.Apr 6 2018, 4:25 PM
elexis added a comment.Apr 7 2018, 12:51 PM

Now there is the createPassage call again.

lyv updated this revision to Diff 6340.Apr 7 2018, 1:18 PM
Vulcan added a comment.Apr 7 2018, 1:22 PM

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 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 124| 124| 	"landFunc": (position, shoreDist1, shoreDist2) => {
| 125| 125| 		for (let riv of riverTextures)
| 126| 126| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 127|    |-				{
|    | 127|+			{
| 128| 128| 					riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 125| 125| 		for (let riv of riverTextures)
| 126| 126| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 127| 127| 				{
| 128|    |-					riv.tileClass.add(position);
|    | 128|+				riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
| 131| 131| 				}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 126| 126| 			if (riv.left < +shoreDist1 && +shoreDist1 < riv.right || riv.left < -shoreDist2 && -shoreDist2 < riv.right)
| 127| 127| 				{
| 128| 128| 					riv.tileClass.add(position);
| 129|    |-					if (riv.terrain)
|    | 129|+				if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
| 131| 131| 				}
| 132| 132| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 127| 127| 				{
| 128| 128| 					riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130|    |-						createTerrain(riv.terrain).place(position);
|    | 130|+					createTerrain(riv.terrain).place(position);
| 131| 131| 				}
| 132| 132| 	}
| 133| 133| });
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 128| 128| 					riv.tileClass.add(position);
| 129| 129| 					if (riv.terrain)
| 130| 130| 						createTerrain(riv.terrain).place(position);
| 131|    |-				}
|    | 131|+			}
| 132| 132| 	}
| 133| 133| });
| 134| 134| Engine.SetProgress(10);
|    | [NORMAL] ESLintBear (semi):
|    | Missing semicolon.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/random/fields_of_meroe.js
| 168| 168| 		undefined,
| 169| 169| 		scaleByMapSize(20, 50),
| 170| 170| 		20,
| 171|    |-		[areaPassage])
|    | 171|+		[areaPassage]);
| 172| 172| }
| 173| 173| 
| 174| 174| var [playerIDs, playerPosition] = playerPlacementRandom(sortAllPlayers(), avoidClasses(clRiver, 15, clPlayer, 30));

binaries/data/mods/public/maps/random/fields_of_meroe.js
| 171| »   »   [areaPassage])
|    | [NORMAL] JSHintBear:
|    | Missing semicolon.

Link to build: https://jenkins.wildfiregames.com/job/differential/358/display/redirect

Harbormaster completed remote builds in B5786: Diff 6340.Apr 7 2018, 1:22 PM
elexis accepted this revision.Apr 9 2018, 2:11 PM

Thanks (-_-)

binaries/data/mods/public/maps/random/fields_of_meroe.js
152

keeping this

157

should add a positive failFraction, because on tiny map sometimes all tries fail

250

keep this print

284

metal wasnt placed yet

315

animals dont ignore mines

317

clMetal, 15

This revision is now accepted and ready to land.Apr 9 2018, 2:11 PM
Closed by commit rP21680: Add two cataracts and more mines to Fields Of Meroë. (authored by elexis). · Explain WhyApr 9 2018, 2:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
binaries/
data/
mods/
public/
maps/
random/
104 lines

Diff 6324

View Options

binaries/data/mods/public/maps/random/fields_of_meroe.js

Loading...
Wildfire Games · Phabricator