Page MenuHomeWildfire Games

Remove template_unit_mechanical.xml
Needs ReviewPublic

Authored by Nescio on Thu, Jan 24, 3:57 PM.

Details

Reviewers
wraitii
Summary

Currently the template tree includes a template_unit_mechanical.xml, which has only two children, *_ship.xml and *_siege.xml. However:

  • it does very little
  • it implies ships and siege engines are closer related than, say, cavalry and infantry
  • there are no *_organic_* or *_soldier_* templates either

Therefore it makes sense to simplify the templates a bit by deprecating the mechanical one (similar to D1734).

This patch:

  • deletes template_unit_mechanical.xml and inserts its relevant values into its descendants
  • renames template_unit_mechanical_ship* to template_unit_ship*
  • renames template_unit_mechanical_siege.xml to template_unit_siege.xml
    • renames template_unit_mechanical_siege_ballista.xml to template_unit_siege_boltshooter.xml
    • renames template_unit_mechanical_siege_onager.xml to template_unit_siege_stonethrower.xml
    • renames template_unit_mechanical_siege_ram.xml to template_unit_siege_ram.xml
    • renames template_unit_mechanical_siege_tower.xml to template_unit_siege_tower.xml
  • adjusts all entity parent paths

The ballista→boltshooter and onager→stonethrower moves are to avoid unnecessary misunderstandings: ballist(r)a, catapult, and onager are words that could be applied to various torsion engines, both dart and rock weapons. E.g. 0 A.D.'s cart and rome “ballistas” have the “onager”, not the “ballista”, as their parent. Contrary to the current AoE terminology, “boltshooter” and “stonethrower” make immediately clear what kind of artillery these templates represent.

Test Plan

Probably unproblematic, but check nevertheless.

Diff Detail

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

Event Timeline

Nescio created this revision.Thu, Jan 24, 3:57 PM
Vulcan added a subscriber: Vulcan.Thu, Jan 24, 3:59 PM

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

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

elexis added a subscriber: elexis.Thu, Jan 24, 6:14 PM

(refs D490 for ships)

From the D490 discussion:

Relatedly, the siege templates could use some renaming too. The "Ballista" parent template is a bolt shooter, but ballistae in the ancient period were rock throwers!!! This naming convention I think sounds like a holdover ffrom the AOE2 mod days. So:

template_unit_mechanical_siege_boltshooter
template_unit_mechanical_siege_stonethrower

Is more logical to me. Thoughts on this guy?

Yes. It's planned.

And done in this patch.

wraitii added a subscriber: wraitii.

Will ensure this is complete and commit