Differential D659

Remove caledonian meadows / wild lake duplication
ClosedPublic
Actions

Authored by elexis on Jun 19 2017, 2:48 PM.

Details

Reviewers

FeXoR

Commits

rP19807: Move duplicate rmgen functions from caledonian meadows and wild lake to the…

Summary

This moves the exact copies without changing anything logically (adds a handful of spaces and a period)

Test Plan

Start the two maps with teams.

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

elexis created this revision.Jun 19 2017, 2:48 PM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...

http://jw:8080/job/phabricator/1584/ for more details.

Executing section Default...
Executing section Source...
Executing section JS...

binaries/data/mods/public/maps/random/rmgen/library.js
|  40| function·scaleByMapSize(min,·max)
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'min' is already declared in the upper scope.

binaries/data/mods/public/maps/random/rmgen/library.js
|  40| function·scaleByMapSize(min,·max)
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'max' is already declared in the upper scope.

binaries/data/mods/public/maps/random/heightmap/heightmap.js
| 128| »   »   »   if·(avoidPoints.every(ap·=>·getDistance(checkpoint.x,·checkpoint.y,·ap.x,·ap.y)·>·minDistance))
|    | [NORMAL] JSHintBear:
|    | Don't make functions within a loop.

binaries/data/mods/public/maps/random/heightmap/heightmap.js
| 144| »   »   if·(placements.every(p·=>·getDistance(p.x,·p.y,·checkPoint.x,·checkPoint.y)·>·minDistance))
|    | [NORMAL] JSHintBear:
|    | Don't make functions within a loop.

binaries/data/mods/public/maps/random/heightmap/heightmap.js
| 207| »   »   »   »   if·(x·%·2·==·0·&&·y·%·2·==·0)·//·Old·tile
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.

binaries/data/mods/public/maps/random/heightmap/heightmap.js
| 207| »   »   »   »   if·(x·%·2·==·0·&&·y·%·2·==·0)·//·Old·tile
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.

binaries/data/mods/public/maps/random/heightmap/heightmap.js
| 381| »   »   if·(placements.every(p·=>·getDistance(p.x,·p.y,·point.x,·point.y)·>·max(minDistance,·p.dist)))
|    | [NORMAL] JSHintBear:
|    | Don't make functions within a loop.

binaries/data/mods/public/maps/random/heightmap/heightmap.js
| 386| »   »   if·(tries·!=·0·&&·tries·%·100·==·0)·//·Time·Check
|    | [NORMAL] JSHintBear:
|    | Use '!==' to compare with '0'.

binaries/data/mods/public/maps/random/heightmap/heightmap.js
| 386| »   »   if·(tries·!=·0·&&·tries·%·100·==·0)·//·Time·Check
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.
|    | [NORMAL] ESLintBear (no-undef-init):
|    | It's not necessary to initialize 'actor' to undefined.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/caledonian_meadows.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/caledonian_meadows.js
| 463| 463| 	{
| 464| 464| 		let x = areas[h][t].x;
| 465| 465| 		let y = areas[h][t].y;
| 466|    |-		let actor = undefined;
|    | 466|+		let actor;
| 467| 467| 		let texture = pickRandom(myBiome[h].texture);
| 468| 468| 
| 469| 469| 		if (slopeMap[x][y] < 0.4 * (minSlope[h] + maxSlope[h]))

binaries/data/mods/public/maps/random/caledonian_meadows.js
|  17| »   while·(true)
|    | [NORMAL] ESLintBear (no-constant-condition):
|    | Unexpected constant condition.

binaries/data/mods/public/maps/random/caledonian_meadows.js
| 109| »   »   if·(i·%·3·==·0)
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.

binaries/data/mods/public/maps/random/caledonian_meadows.js
| 159| »   »   if·(i·%·2·==·0)
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.

binaries/data/mods/public/maps/random/caledonian_meadows.js
| 466| »   »   let·actor·=·undefined;
|    | [NORMAL] JSHintBear:
|    | It's not necessary to initialize 'actor' to 'undefined'.

binaries/data/mods/public/maps/random/caledonian_meadows.js
| 505| »   if·(choice·==·0)
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.
|    | [NORMAL] ESLintBear (no-undef-init):
|    | It's not necessary to initialize 'actor' to undefined.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/wild_lake.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/wild_lake.js
| 630| 630| 	{
| 631| 631| 		let x = areas[h][t].x;
| 632| 632| 		let y = areas[h][t].y;
| 633|    |-		let actor = undefined;
|    | 633|+		let actor;
| 634| 634| 		let texture = pickRandom(wildLakeBiome[h].texture);
| 635| 635| 
| 636| 636| 		if (slopeMap[x][y] < 0.5 * (minSlope[h] + maxSlope[h]))

binaries/data/mods/public/maps/random/wild_lake.js
| 247| »   groveActors·=·[g_Decoratives.grass,·g_Decoratives.rockMedium,·g_Decoratives.bushMedium],·groveTileClass·=·undefined,
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'groveActors' is already declared in the upper scope.

binaries/data/mods/public/maps/random/wild_lake.js
|  18| randomizeBiome()
|    | [NORMAL] JSHintBear:
|    | Missing semicolon.

binaries/data/mods/public/maps/random/wild_lake.js
| 259| »   »   if·(i·%·3·==·0)
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.

binaries/data/mods/public/maps/random/wild_lake.js
| 350| »   »   return·averageDistToCC·+·randFloat(-dAverageDistToCC,·dAverageDistToCC)
|    | [NORMAL] JSHintBear:
|    | Missing semicolon.

binaries/data/mods/public/maps/random/wild_lake.js
| 369| »   »   if·(i·%·2·==·0)
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.

binaries/data/mods/public/maps/random/wild_lake.js
| 633| »   »   let·actor·=·undefined;
|    | [NORMAL] JSHintBear:
|    | It's not necessary to initialize 'actor' to 'undefined'.

binaries/data/mods/public/maps/random/wild_lake.js
| 684| »   if·(choice·==·0)
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.
Executing section XML GUI...
Executing section Python...
Executing section Perl...

http://jw:8080/job/phabricator_lint/208/ for more details.

Harbormaster completed remote builds in B2339: Diff 2620.Jun 19 2017, 4:29 PM

FeXoR mentioned this in D662: Prevent woods to grow into players bases.Jun 19 2017, 10:45 PM

I'd add a comment to the documentation of getTileCenteredHeightmap() that TILE_CENTERED_HEIGHMAP must be false (see comment at the top of heightmap.js) for this is the point where things would break.
Otherwise perfect, thanks much, @elexis !

FeXoR accepted this revision.Jun 19 2017, 11:38 PM

This revision is now accepted and ready to land.Jun 19 2017, 11:38 PM

Closed by commit rP19807: Move duplicate rmgen functions from caledonian meadows and wild lake to the… (authored by elexis). · Explain WhyJun 19 2017, 11:44 PM

This revision was automatically updated to reflect the committed changes.