Page MenuHomeWildfire Games

rename some fauna templates
ClosedPublic

Authored by Nescio on Sep 21 2020, 1:26 PM.

Details

Reviewers
bb
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP24062: Make fauna names consistent
Summary

This patch renames some fauna templates:

  • *arctic_wolf**wolf_arctic* (cf. *fox_arctic*)
  • *crocodile**crocodile_nile* (there are other crocodile species)
  • *mastiff**dog_mastiff* (it's a dog)
  • *pony**horse_pony* (it's an horse)
  • *rhino**rhinoceros_white* (there are other rhinoceros species)
  • *wolfhound**dog_wolfhound* (it's a dog)

To correct the maps/ files, run this command in your 0ad/ repository:

find binaries/data/mods/public/maps/ \( -name '*.js' -o -name '*.json' -o -name '*.xml' \) -print0 | xargs -0 sed -i \
  -e 's,gaia/fauna_crocodile,gaia/fauna_crocodile_nile,g' \
  -e 's,gaia/fauna_mastiff,gaia/fauna_dog_mastiff,g' \
  -e 's,gaia/fauna_wolfhound,gaia/fauna_dog_wolfhound,g' \
  -e 's,gaia/fauna_pony,gaia/fauna_horse_pony,g' \
  -e 's,gaia/fauna_rhino,gaia/fauna_rhinoceros_white,g' \
  -e 's,gaia/fauna_arctic_wolf,gaia/fauna_wolf_arctic,g'
Test Plan

Apply the patch, run the sed script, check for mistakes and omissions, verify everything works as before, agree the changes are an improvement.

Event Timeline

Nescio created this revision.Sep 21 2020, 1:26 PM
Owners added a subscriber: Restricted Owners Package.Sep 21 2020, 1:26 PM
Nescio updated this revision to Diff 13512.Sep 21 2020, 1:34 PM
  • fix arctic wolf parent

Build failure - The Moirai have given mortals hearts that can endure.

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

Nescio requested review of this revision.Sep 21 2020, 2:11 PM
bb accepted this revision.Sep 21 2020, 11:11 PM
bb added a subscriber: bb.

Correctness forces the accept

Proofreading other fauna names does not result in more cases.
front doesn't fall

This revision is now accepted and ready to land.Sep 21 2020, 11:11 PM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Sep 21 2020, 11:19 PM

Proofreading other fauna names does not result in more cases.

Actually there are at least two more: deer and zebra. I didn't include them because it's unclear which species they are. When correcting the specific names (D1523/rP22014) I made educated guesses, but the actors are not that clear and it could be argued they're meant to represent a different species.