Page MenuHomeWildfire Games

split template_gaia_geo*
ClosedPublic

Authored by Nescio on Fri, Sep 4, 8:04 PM.

Details

Reviewers
Freagarach
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP24044: Split "template_gaia_geo".
Summary

Currently the public folder has:

template_gaia_geo.xml
template_gaia_geo_mineral.xml
template_gaia_geo_mineral_slabs.xml
template_gaia_geo_rock.xml
template_gaia_geo_rock_slabs.xml

The first one basically defines a footprint and is thus not really worth a separate template; functionally there is no compelling reason for a *_geo.xml parent. The second and fourth are meaningful and define the resource subtypes (metal.ore and stone.rock, respectively), among other things; the third and fifth are basically larger versions (5000/24 instead of 1000/8).

This patch changes it to a cleaner and clearer:

template_gaia_ore.xml
template_gaia_ore_large.xml
template_gaia_rock.xml
template_gaia_rock_large.xml

All specific gaia/geology_* templates have their parents adjusted accordingly. The parents of the golden_fleece.xml and pegasus.xml are corrected as well.

Having one generic template corresponding to a resource subtype is also consistent with:

template_gaia_fish.xml
template_gaia_ruins.xml
template_gaia_treasure.xml

Similar patches include:

Test Plan

Check for completeness and correctness. Verify everything works as before.

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.Fri, Sep 4, 8:04 PM
Owners added a subscriber: Restricted Owners Package.Fri, Sep 4, 8:04 PM
Nescio requested review of this revision.Fri, Sep 4, 8:10 PM
  • Checkrefs says it is complete.
  • Playtesting reveals no errors.
  • UnitsDemo loads fine.
  • Change is for the better.

(I assume specific templates are renamed in another diff?)

Freagarach accepted this revision.Thu, Sep 10, 11:18 AM
This revision is now accepted and ready to land.Thu, Sep 10, 11:18 AM

(I assume specific templates are renamed in another diff?)

Yes, this is only cleaning up the lines inside; file moves will be done in a separate patch, to keep things reviewable. Same for D2990 and D2953.

This revision was automatically updated to reflect the committed changes.