Details

Reviewers

Hannibal_Barca
Phormio

Commits

rP19647: River Archipelago random map script.

Summary

A unique map composing of strips of land.
Needs lots of optimizing but @elexis wanted it.

Original design by Hannibal_Barca:

Updated design by elexis, 50% chance for each:

Test Plan

Test map for uniqueness, playability, resource collisions and the like.
Paint extra terrain under Civic Centers to ensure they won't be underwater.
Base resources same problem.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

Hannibal_Barca created this revision.May 9 2017, 4:14 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!

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

Harbormaster completed remote builds in B1591: Diff 1793.May 9 2017, 8:56 PM

River island archipelago is the correct geomorphological type I guess.
Wrong continent, but the only fitting location I could find: https://en.wikipedia.org/wiki/Anavilhanas_National_Park

Fix various brokenness and most style issues.
Ensure terrain on player territory.
Currently no trees in the middle strips.

elexis planned changes to this revision.May 17 2017, 4:25 AM

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!

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

Harbormaster completed remote builds in B1591: Diff 1793.May 17 2017, 5:09 AM

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!

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

Harbormaster completed remote builds in B1773: Diff 1992.May 17 2017, 5:55 AM

Refactor strip code, especially mirror the strip size and position.
Smaller strips, thus more space for ship navigation but much smaller likelihood of having enemies connected.
Fix ugly grass patches underwater. Remove unpaint calls.
Distinguish clPlayer from the new clPlayerTerritory class, especially to add forests close to the territory border.
createBumps.
Much more fish.
Make mountains actually appear.
Fix city radius painting.
Fix few more style mistakes and resource collisions.
Tested with tiny mapsize.

Rename to River Archipelago.
Also had added gaia.

Extended map description welcome @Hannibal_Barca

Harbormaster completed remote builds in B1878: Diff 2106.May 22 2017, 2:48 AM

Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '{'.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/strips.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/strips.js
| 143| 143| 		new LayeredPainter([tRoadWild, tRoad], [1]),
| 144| 144| 		null);
| 145| 145| 
| 146|    |-	placeCivDefaultEntities(fx, fz, id,  { 'iberWall': 'towers' });
|    | 146|+	placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
| 147| 147| 
| 148| 148| 	placeDefaultChicken(fx, fz, clBaseResource, undefined, oPeacock);
| 149| 149| 

binaries/data/mods/public/maps/random/strips.js
| 204| »   let·stripIndex·=·i·==·0·?·0·:·stripWidths.length·-·1;
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.
Executing section Python...
Executing section Perl...

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

Harbormaster failed remote builds in B1877: Diff 2105!May 22 2017, 3:27 AM

elexis retitled this revision from New map - Strips to River Archipelago random map script.May 22 2017, 4:16 AM

elexis edited the summary of this revision. (Show Details)

Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '{'.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/river_archipelago.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/river_archipelago.js
| 143| 143| 		new LayeredPainter([tRoadWild, tRoad], [1]),
| 144| 144| 		null);
| 145| 145| 
| 146|    |-	placeCivDefaultEntities(fx, fz, id,  { 'iberWall': 'towers' });
|    | 146|+	placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
| 147| 147| 
| 148| 148| 	placeDefaultChicken(fx, fz, clBaseResource, undefined, oPeacock);
| 149| 149| 

binaries/data/mods/public/maps/random/river_archipelago.js
| 204| »   let·stripIndex·=·i·==·0·?·0·:·stripWidths.length·-·1;
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.
Executing section Python...
Executing section Perl...

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

Harbormaster failed remote builds in B1878: Diff 2106!May 22 2017, 5:03 AM

In D467#21587, @elexis wrote:

Rename to River Archipelago.
Also had added gaia.

Extended map description welcome @Hannibal_Barca

I have thought also to something like kerala backwaters, which fits the biome.

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!

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

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!

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

Thank you for fixing map up, works and looks very nice.

This revision is now accepted and ready to land.May 22 2017, 6:26 PM

improving map description

improved map description

Owners added a subscriber: Restricted Owners Package.May 23 2017, 1:54 PM

Phormio added inline comments.May 23 2017, 1:58 PM

binaries/data/mods/public/maps/random/river_archipelago.json
5 ↗	(On Diff #2149)	This is the modified part, I left the rest as it was.

elexis commandeered this revision.May 23 2017, 2:07 PM

elexis edited reviewers, added: Phormio; removed: elexis.

Phormio added inline comments.May 23 2017, 2:34 PM

binaries/data/mods/public/maps/random/river_archipelago.json
5 ↗	(On Diff #2149)	Let's change that to '[...] plenty of game, but beware [...]'

Replace "plenty of game and fish" with "plenty of game", since fish is included in game (https://en.wikipedia.org/wiki/Game_fish), then I'm happy with the map.

This revision now requires changes to proceed.May 23 2017, 3:09 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!

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

Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '{'.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/river_archipelago.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/maps/random/river_archipelago.js
| 143| 143| 		new LayeredPainter([tRoadWild, tRoad], [1]),
| 144| 144| 		null);
| 145| 145| 
| 146|    |-	placeCivDefaultEntities(fx, fz, id,  { 'iberWall': 'towers' });
|    | 146|+	placeCivDefaultEntities(fx, fz, id, { 'iberWall': 'towers' });
| 147| 147| 
| 148| 148| 	placeDefaultChicken(fx, fz, clBaseResource, undefined, oPeacock);
| 149| 149| 

binaries/data/mods/public/maps/random/river_archipelago.js
| 204| »   let·stripIndex·=·i·==·0·?·0·:·stripWidths.length·-·1;
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.
Executing section Python...
Executing section Perl...

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

Harbormaster failed remote builds in B1918: Diff 2149!May 23 2017, 3:22 PM

Closed by commit rP19647: River Archipelago random map script. (authored by elexis). · Explain WhyMay 24 2017, 1:06 AM

This revision was automatically updated to reflect the committed changes.

Nice, thank you very much!

elexis edited the summary of this revision. (Show Details)May 24 2017, 1:44 PM

elexis mentioned this in rP20264: Remove unneeded waterheight init loop from River Archipelago (refs #4354, D467)..Oct 6 2017, 8:49 PM