Page MenuHomeWildfire Games

civic_civil_centre → civic_center
AbandonedPublic

Authored by Nescio on Aug 24 2019, 11:57 AM.

Details

Reviewers
wraitii
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Summary

This patch:

  • renames template_structure_civic_civil_centre.xml to template_structure_civic_center.xml
  • renames template_structure_civic_civil_centre_military_colony.xml to template_structure_civic_center_colony.xml
  • updates all simulation files that use them accordingly (did a grep -r 'civic_civil')

Not only was the old name unnecessary long, but also potentially misleading: e.g. template_structure_civic_civil_centre_military.xml doesn't exist. Just “center” and “center_colony” is clearer, more correct, and more consistent with other template_structure_*.xml names.
See also D2036.

In a future patch the {civ}_civil_centre.xml templates could be corrected to {civ}_civic_center.xml, but that also means updating virtually all map files.

Test Plan

Agree this is an improvement.

Diff Detail

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

Event Timeline

Nescio created this revision.Aug 24 2019, 11:57 AM
Nescio edited the summary of this revision. (Show Details)

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

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

Nescio retitled this revision from template_structure_civic_civil_centre → template_structure_civic_center to civic_civil_centre → civic_center.Aug 24 2019, 12:09 PM

In my opinion this is only an improvement if we actually rename 'Civil Centre' to 'Civic Centre' (or 'Centre'). The templates actually seem to follow proper conventions of adding on to the parent's name.
The 'Military Colony' name is arguably a bit of a misnomer and that one could perhaps be changed.

These are long file names, true, but I don't think we can really shorten them with the current file structure.

I'm not suggesting changes, as I'd actually suggest abandoning this diff (or doing only the military colony).

Nescio abandoned this revision.Sep 1 2019, 11:08 AM