remove some unnecessary lines from a few civic templates
ClosedPublic
Actions

Authored by Nescio on Jun 30 2020, 9:56 PM.

Details

Reviewers

Freagarach

Group Reviewers

Restricted Owners Package

(Owns No Changed Paths)

Commits

rP23957: Remove some unnecessary lines from a few civic structure templates.

Summary

This patch removes some unnecessary lines from a few civic structure templates.
See also D2744, D2855.

Test Plan

Check for mistakes.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 12776
Build 24906: Vulcan Build	Jenkins
Build 24905: Vulcan Build (macOS)	Jenkins
Build 24904: Vulcan Build (Windows)	Jenkins
Build 24903: arc lint + arc unit

Event Timeline

Nescio created this revision.Jun 30 2020, 9:56 PM

Owners added a subscriber: Restricted Owners Package.Jun 30 2020, 9:56 PM

Nescio added inline comments.Jun 30 2020, 9:58 PM

binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml
4	Already defined in parent.
15	idem
37–39	idem
binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
2	Does not really take any values defined in rome_temple, therefore unnecessary parent step.
binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
51–53	This structure gets a territory root from its parent, therefore it is immune to territory decay.

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2557/display/redirect

rome_temple_mars

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2558/display/redirect

Harbormaster completed remote builds in B12268: Diff 12509.Jun 30 2020, 10:39 PM

Harbormaster completed remote builds in B12269: Diff 12510.Jun 30 2020, 10:59 PM

Nescio mentioned this in D2855: clean up sound groups in unit templates.Jul 2 2020, 8:58 PM

Nescio edited the summary of this revision. (Show Details)

Nescio mentioned this in D2744: remove unnecessary lines from ship templates.

Nescio mentioned this in D2892: clean up market and other structure classes.Jul 21 2020, 10:02 PM

Freagarach added a subscriber: Freagarach.Aug 5 2020, 7:59 PM

Freagarach added inline comments.

binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
2	Well, it takes the civ and more importantly, the production queue. I'd even say mars should inherit from `rome_temple` as well, but that may be contested.

Nescio added inline comments.Aug 5 2020, 8:06 PM

binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
2	Production queue, good point! I'll update this patch. Having a parent just to save a <Civ> line is rather unusual. `kush_shrine.xml` and `kush_temple_amun.xml` don't inherit from `kush_temple.xml` either.

production queue, per @Freagarach

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

Linter detected issues:
Executing section Source...
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2906/display/redirect

Harbormaster completed remote builds in B12776: Diff 13088.Aug 5 2020, 8:29 PM

Freagarach added inline comments.Aug 5 2020, 8:37 PM

binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
2	Not really for the civ line, but for the production queue change. Such that also mars has the vision tech, but that may be changing balance.

Nescio added inline comments.Aug 5 2020, 8:47 PM

binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
2	`rome_temple_mars.xml` is not buildable, therefore its production queue does not affect gameplay balance. Unlike b/a/e units, `rome_temple.xml` and `rome_temple_vesta.xml` are independent structures, one can not promote or upgrade to the other. Adding extra parenting just to save a few lines is unusual, if not inconsistent. Likewise, `pers_tacara.xml` and `pers_apadana.xml` are very similar templates, but one is not the child of the other.