Capture spike fortification by territory too
AbandonedPublic
Actions

Authored by elexis on Jun 5 2017, 11:34 PM.

Details

Reviewers

fatherbushido

Summary

rP19694 forgot to remove the territory decay disabling of the spikes too.

So on Danubius, the gaia fortification will have it's walls being converted to the player,
then the gaia units destroy its own walls, except the spikes.

There must be an uncapturable special filter once it's supported by the AI.
For the current release (a22), it might be best to not add workaround templates and not commit this fix.

Test Plan

Search for <TerritoryDecay disable=""/> and parent="template_structure_defense_wall". Start danubius and watch it decay.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 2192
Build 3588: Vulcan Build (Windows)	Jenkins
Build 3587: Vulcan Build	Jenkins
Build 3586: arc lint + arc unit

Event Timeline

elexis created this revision.Jun 5 2017, 11:34 PM

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/142/ 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!
Checking XML files...

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

Harbormaster completed remote builds in B2192: Diff 2455.Jun 6 2017, 5:21 AM

The issue is most the messy state of the other/ folder.
All that needs to be flattened and discussed. For example differentiating gaia palisades and player wooden walls (palisades :D)

(And also other thoughts, but too long).

Those spikes are used in

scenarios/Sandbox - Britons.xml
scenarios/Azure Coast(4).xml
scenarios/Sandbox - Gauls.xml
scenarios/Azure Coast.xml
scenarios/Azure Coast(2).xml
skirmishes/Alpine_Mountains_(3).xml
skirmishes/Gallic Fields (3).xml
random/danubius.js

So as a workaround for that release, why not.

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

I set request changes as it was accepted as a workaround for a22

This revision now requires changes to proceed.Jul 30 2017, 11:53 AM

This isn't a workaround, nor was it targetted for alpha 22.