Fix wrong starting units for all maps in accordance with D647
ClosedPublic
Actions

Authored by Phormio on Jun 16 2017, 2:41 PM.

Details

Reviewers

elexis
Grugnas

Commits

rP19789: Apply previous commit to scenario maps.

Summary

Once D647 is approved, three scenario maps start with the wrong type of Iberian cavalryman. This patch fixes that.

Test Plan

Not applicable.

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

Phormio created this revision.Jun 16 2017, 2:41 PM

Owners added a subscriber: Restricted Owners Package.Jun 16 2017, 2:41 PM

Phormio added a subscriber: elexis.Jun 16 2017, 2:46 PM

Thanks for the quick sighting of my oversight in the not yet committed D647!

Siwa Oasis needs an update too.

The other maps do their own thing with regards to starting units, so don't really need an update.

So the patch is correct and complete besides that one map, I can fix it when committing if you don't feel the urge to update this.

binaries/data/mods/public/maps/scenarios/Serengeti.xml
29 ↗	(On Diff #2584)	We are still in string freeze, so we can't change english strings for the alpha 22 release (could do in alpha 23 however). Also is this dash really wrong?

Those maps have particular starting units:

Gold Rush: 3 women 3spearmen infantry 1 spearman cavalry
Sahel: same units as in multiplayer games 4 women 2 swordsmen inf 2 skirmishers inf 1 spearman cavalry
Serengeti: 6 women 1 swordsman inf 1 spearman inf 1 skirmisher inf 1 spearman cavalry

Perhaps those particular scenario maps could be preserved as they are but Sahel.

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/1572/ for more details.

Harbormaster completed remote builds in B2310: Diff 2584.Jun 16 2017, 6:04 PM

elexis mentioned this in rP19788: Fix starting units on random and skirmish maps..Jun 16 2017, 6:52 PM

elexis accepted this revision.Jun 16 2017, 6:52 PM

This revision is now accepted and ready to land.Jun 16 2017, 6:52 PM

remove spelling correction from diff due to string freeze

Phormio added inline comments.Jun 16 2017, 7:04 PM

binaries/data/mods/public/maps/scenarios/Serengeti.xml
29 ↗	(On Diff #2584)	Change removed from this differential. Remains part of D589.

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/1574/ for more details.

Harbormaster completed remote builds in B2314: Diff 2591.Jun 16 2017, 8:29 PM

Closed by commit rP19789: Apply previous commit to scenario maps. (authored by elexis). · Explain WhyJun 16 2017, 8:51 PM

This revision was automatically updated to reflect the committed changes.

Grugnas added a reviewer: Grugnas.Jun 16 2017, 9:05 PM