Page MenuHomeWildfire Games

remove armour trailing zeroes from templates
ClosedPublic

Authored by Nescio on Sep 10 2019, 11:23 AM.

Details

Reviewers
bb
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP23432: Remove trailing 0's from Armour items in templates
Summary

Most templates have no trailing zeroes in the <Armour> node, but a dozen still do, which is unnecessary and inconsistent. This patch removes the trailing zeroes from those, as suggested by @elexis in D2247.
D1953 removed trailing zeroes from technology files, D2000 from auras.

Test Plan

Check for mistakes and omissions.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Nescio created this revision.Sep 10 2019, 11:23 AM

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

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/124/display/redirect

Stan added a subscriber: Stan.Sep 10 2019, 11:26 AM
Stan added inline comments.
binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
4 ↗(On Diff #9702)

Why change that? (removing the operators)

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

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

Nescio added inline comments.Sep 10 2019, 11:38 AM
binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
4 ↗(On Diff #9702)

Because:

  • it's clearer
  • all values are redefined
  • <Foundation> armour values in this file don't have op="add" either
  • other special structures (e.g. cart_super_dock.xml, rome_siege_wall_gate.xml, etc.) also just redefine armour values without operators
Nescio added a subscriber: bb.Jan 14 2020, 10:07 PM

@bb, interested in reviewing this one?

bb accepted this revision.Wed, Jan 22, 11:20 PM

All Armour values got consistent now, feel free to removing trailing 0's from other template values too

binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
4 ↗(On Diff #9702)

agreeing the op doesn't make sense here (template_structure_special and this template do not have an obvious relation here)

This revision is now accepted and ready to land.Wed, Jan 22, 11:20 PM
This revision was automatically updated to reflect the committed changes.

All Armour values got consistent now, feel free to removing trailing 0's from other template values too

D2000 removes trailing zeros from aura files, D2222 improves the civ files.
For templates, maybe later, preferably after D2502 (adjusting wall footprints) is in, because rebasing that would be a lot of work.