Page MenuHomeWildfire Games

Prevent woods to grow into players bases
ClosedPublic

Authored by FeXoR on Jun 19 2017, 10:41 PM.

Details

Reviewers
elexis
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP19808: Prevent height based forests to grow into player start locations.
Summary

Due to swapped order of player base flattening and height area calculation woods sometimes grew into players bases. This patch fixes that.

Test Plan

Create several maps with this patch with different combinations of map size, number of players and seed.

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

FeXoR created this revision.Jun 19 2017, 10:41 PM
FeXoR added a reviewer: Restricted Owners Package.Jun 19 2017, 10:42 PM

Wait with this after D659 !

Vulcan added a subscriber: Vulcan.Jun 19 2017, 10:53 PM

Build has FAILED

Link to build: http://jw:8080/job/phabricator/1588/
See console output for more information: http://jw:8080/job/phabricator/1588/console

Executing section Default...
Executing section Source...
Executing section JS...
Executing section XML GUI...
Executing section Python...
Executing section Perl...

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

To reproduce the original bug:
Generate: Map Size: Normal, Number of Players: 4, Seed: 2537 (High ground trees in bases of player 1 and 4)

FeXoR updated this revision to Diff 2626.Jun 20 2017, 12:42 AM

Rebased after changeset 19807 (D659 committed)

Build has FAILED

Link to build: http://jw:8080/job/phabricator/1589/
See console output for more information: http://jw:8080/job/phabricator/1589/console

Executing section Default...
Executing section Source...
Executing section JS...
Executing section XML GUI...
Executing section Python...
Executing section Perl...

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

elexis accepted this revision.Jun 20 2017, 12:51 AM
elexis added a subscriber: elexis.

Change reads correct, fixes the bug reproducible with the given seen and doesn't appear to influence anything else.

binaries/data/mods/public/maps/random/caledonian_meadows.js
629 ↗(On Diff #2624)

start locations

This revision is now accepted and ready to land.Jun 20 2017, 12:51 AM
This revision was automatically updated to reflect the committed changes.