Page MenuHomeWildfire Games

Remove <Actor> and <SpecificName> from generic templates.
ClosedPublic

Authored by Nescio on Jan 24 2019, 11:37 AM.

Details

Summary

The <SpecificName> and <Actor> values do not belong in the generic templates, they should be in the specific templates in the sub-folders.
This patch:

  • removes <Actor> from the generic template_* files
  • adds the appropiate actors to their specific children in the cases they were not yet included there
  • removes <SpecificName> from the generic template_* files
  • adds the appropiate specific names to their specific children in the cases they were not yet included there
  • removes <GenericName> from the gaia/ruins/* files
  • removes <GenericName> from the gaia/treasure/* files
  • removes <Icon> from the gaia/treasure/* files if it's identical to the parent template

<Actor> is still present in the following generic templates:

  • template_formation.xml
  • template_unit_catafalque.xml
Test Plan

Check for omissions.

Diff Detail

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

Event Timeline

Nescio created this revision.Jan 24 2019, 11:37 AM
Vulcan added a subscriber: Vulcan.Jan 24 2019, 11:39 AM

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

Link to build: https://jenkins.wildfiregames.com/job/differential/992/

Stan added a comment.Jan 24 2019, 11:57 AM

Thanks for the patch, I'll try to have more in depth look soon.

Stan added a reviewer: Stan.Jan 24 2019, 11:58 AM
Stan added a reviewer: bb.Mar 17 2019, 5:55 PM
Stan added a comment.Apr 2 2019, 10:24 AM

I'm not sure we want to display Ruins on top of the pyramids do we ?

Why not? These pyramids are ruins, a source of stone.

Nescio updated this revision to Diff 7885.Apr 30 2019, 10:35 AM

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

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

Nescio updated this revision to Diff 7943.May 9 2019, 2:09 PM
Nescio edited the summary of this revision. (Show Details)
Vulcan added a comment.May 9 2019, 2:12 PM

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

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

Stan added inline comments.May 9 2019, 5:37 PM
binaries/data/mods/public/simulation/templates/structures/gaul_theatron.xml
6 โ†—(On Diff #7943)

Note sure about the capitalization https://www.italki.com/question/223770

binaries/data/mods/public/simulation/templates/template_rubble.xml
28

Does every template override that ?

Nescio added inline comments.May 9 2019, 6:17 PM
binaries/data/mods/public/simulation/templates/structures/gaul_theatron.xml
6 โ†—(On Diff #7943)
binaries/data/mods/public/simulation/templates/template_rubble.xml
28

Yes.

Stan accepted this revision.May 9 2019, 7:08 PM
This revision is now accepted and ready to land.May 9 2019, 7:08 PM
This revision was automatically updated to reflect the committed changes.