Page MenuHomeWildfire Games

reduce template_structure_military* duplication
ClosedPublic

Authored by Nescio on Mar 17 2019, 5:05 PM.

Details

Summary

This patch (requested by @bb in D1791) moves some attributes to the template_structure_military.xml template, to reduce the amount of duplication in its children:

  • <BuildRestrictions/Category>Military
  • <GarrisonHolder>
  • <TerritoryInfluence>

D1795 removes unnecessary building_collapse_large sounds

Test Plan

Check if nothing is overlooked and everything still works.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
/ps/trunk
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 7110
Build 11607: Vulcan BuildJenkins
Build 11606: arc lint + arc unit

Event Timeline

Nescio created this revision.Mar 17 2019, 5:05 PM
Vulcan added a subscriber: Vulcan.Mar 17 2019, 5:48 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/differential/1110/display/redirect

Nescio updated this revision to Diff 7677.Apr 5 2019, 1:36 PM
Nescio retitled this revision from template_structure_military* duplication to reduce template_structure_military* duplication.
Nescio edited the summary of this revision. (Show Details)
Vulcan added a comment.Apr 5 2019, 1:38 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/differential/1173/display/redirect

bb accepted this revision.Apr 12 2019, 3:58 PM

Changes to trivial to not accept,

checked nothing else than the buildrestriction tag changed in the final templates
Proofreading gives that nothing else can easily be moved upstairs (k, that death sound is still in the patch context, but that is already fixed globally in svn)

Took way to long to get this patch in, now I see it actually was a pretty easy one...

binaries/data/mods/public/simulation/templates/template_structure_military.xml
14

That is a template change, but a good one, grepped for completeness.

binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
71

!= 40000

binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
61–65

2 nukable lines

binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
58

!= 0.1

This revision is now accepted and ready to land.Apr 12 2019, 3:58 PM
This revision was automatically updated to reflect the committed changes.