Page MenuHomeWildfire Games

-ConquestCritical clear-up
Needs ReviewPublic

Authored by Nescio on Sep 13 2018, 5:23 PM.
This revision needs review, but there are no reviewers specified.



Currently the "ConquestCritical" class is added to the basic template_structure.xml file and subsequently removed in the majority of cases. This is quite ugly. A much neater way is to add it only to the cases that actually have it (Civic, Military, Wonder, and several special structures), but not to the basic parent template.

Test Plan

Effectively nothing ought to be changed.

Diff Detail

rP 0 A.D. Public Repository
Lint OK
No Unit Test Coverage
Build Status
Buildable 6365
Build 10552: Vulcan BuildJenkins
Build 10551: arc lint + arc unit

Event Timeline

Nescio created this revision.Sep 13 2018, 5:23 PM
Vulcan added a subscriber: Vulcan.Sep 13 2018, 5:29 PM

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

Link to build:

bb added a subscriber: bb.Dec 26 2018, 5:42 PM

15 removed cases, 10 added ones (if counting holds, the 15 goes down to 13 given the structure_defense_* comment)

Not convinced either way about this patch


With the current design the structure_defense_* could be moved into the parent

Currently template_structure.xml adds ConquestCritical, but:

  • template_structure_defense_*.xml
  • template_structure_economic.xml
  • template_structure_resource.xml
  • template_structure_special_*.xml

remove it. Instead of adding it everywhere and subsequently removing it often, I think it's neater to simply add it only to the cases that actually use it:

  • template_structure_civic.xml
  • template_structure_military.xml
  • template_structure_wonder.xml
  • several structures/ files.