Page MenuHomeWildfire Games

Sort templates and data.
ClosedPublic

Authored by Freagarach on Aug 27 2020, 12:44 PM.

Details

Summary

After rP24001, but also before that, not all templates are sorted anymore. This should fix that. Also after rP24001 the technologies and auras were not sorted anymore.

Test Plan

Review changes, run checkrefs.pl.

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

Freagarach created this revision.Aug 27 2020, 12:44 PM
Owners added a subscriber: Restricted Owners Package.Aug 27 2020, 12:44 PM
Freagarach requested review of this revision.Aug 27 2020, 12:50 PM
Nescio requested changes to this revision.Aug 27 2020, 12:55 PM

Comments shouldn't be moved (special/filter/*.xml).

This revision now requires changes to proceed.Aug 27 2020, 12:55 PM
Freagarach updated this revision to Diff 13311.Aug 27 2020, 1:28 PM
Freagarach retitled this revision from Sort templates. to Sort templates and data..
Freagarach edited the summary of this revision. (Show Details)

Would be nice to also be able to sort data using a script ;)

Nescio added inline comments.Aug 27 2020, 1:36 PM
binaries/data/mods/public/simulation/data/auras/structures/wall_garrisoned.json
8 ↗(On Diff #13311)

This line shouldn't be moved.

Freagarach updated this revision to Diff 13312.EditedAug 27 2020, 1:39 PM
Freagarach marked an inline comment as done.

|0| Tired I guess.

Nescio added inline comments.Aug 27 2020, 1:54 PM
binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
13–14 ↗(On Diff #13312)

Shouldn't <Max> be before <List>?

binaries/data/mods/public/simulation/templates/template_formation.xml
5 ↗(On Diff #13312)

Is this necessary?

technologies/civbonuses/celt_structures.json
technologies/persians/persian_architecture.json
technologies/phase_city_athen.json
technologies/phase_city_generic.json
technologies/phase_town_athen.json
technologies/phase_town_generic.json
Freagarach updated this revision to Diff 13317.Aug 27 2020, 8:26 PM
Freagarach marked 2 inline comments as done.

Some techs.

binaries/data/mods/public/simulation/templates/template_formation.xml
5 ↗(On Diff #13312)

For the formation, yes, for this particular diff, no.

Nescio accepted this revision.Aug 28 2020, 9:47 AM
  • The changes are correct.
  • It appears to be complete (at least the auras and technologies part; I assumed the templates part was done by script).
  • perl checkrefs.pl --validate-templates found 0 validation errors.
  • No errors or warnings when running the game or opening Atlas.
binaries/data/mods/public/simulation/templates/template_formation.xml
5 ↗(On Diff #13312)

But it's inside a comment?

This revision is now accepted and ready to land.Aug 28 2020, 9:47 AM
Freagarach marked an inline comment as done.Aug 28 2020, 9:52 AM

Thanks for the review @Nescio :)

binaries/data/mods/public/simulation/templates/template_formation.xml
5 ↗(On Diff #13312)

Yeah, but it annoyed me that I had to add it every time I wanted to visualise a formation ^^'

This revision was automatically updated to reflect the committed changes.
Freagarach marked an inline comment as done.