Page MenuHomeWildfire Games

River Archipelago - Left vs Right
ClosedPublic

Authored by elexis on Jun 7 2017, 3:49 PM.

Details

Summary

As most of the code of this map, the player positioning was copied from Kerala. Hence it's always "top vs bottom". But as decided with Hannibal Barca some time ago,
it should also occur that players on the left strip play vs players on the right strip.

The attached patch implements it with a 50% 50% chance, so that the map is a surprise each time (there is already a 50% to 50% chance that the strips in the middle are very close and likely connected).
Also ensures more initial player territory on tiny mapsizes to prevent mines in the water.

Test Plan

Make sure it works for less than 8 players as well, especially for uneven playercounts.

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 7 2017, 3:49 PM
Vulcan added a subscriber: Vulcan.Jun 7 2017, 4:36 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/1499/ for more details.

Vulcan added a comment.Jun 7 2017, 4:38 PM
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
| 158| 158| 		new LayeredPainter([tRoadWild, tRoad], [1]),
| 159| 159| 		null);
| 160| 160| 
| 161|    |-	placeCivDefaultEntities(fx, fz, playerIDs[i],  { 'iberWall': 'towers' });
|    | 161|+	placeCivDefaultEntities(fx, fz, playerIDs[i], { 'iberWall': 'towers' });
| 162| 162| 
| 163| 163| 	placeDefaultChicken(fx, fz, clBaseResource, undefined, oPeacock);
| 164| 164| 

binaries/data/mods/public/maps/random/river_archipelago.js
| 235| »   »   »   »   stayClasses(clStrip[i·==·0·?·0·:·stripWidths.length·-·1],·1)
|    | [NORMAL] JSHintBear:
|    | Use '===' to compare with '0'.
Executing section XML GUI...
Executing section Python...
Executing section Perl...

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

FeXoR accepted this revision.Jun 8 2017, 2:01 PM
This revision is now accepted and ready to land.Jun 8 2017, 2:01 PM
This revision was automatically updated to reflect the committed changes.