*
ClosedPublic
Actions

Authored by Nescio on May 31 2020, 5:50 PM.

Details

Reviewers

Freagarach

Commits

rP24031: Move "fauna_fish* -> "fish/*".

Summary

Fish inherits from template_gaia_fish.xml, not from template_unit_fauna.xml, therefore their current file names (fauna_fish*) are incorrect. This patch moves them into a subfolder of their own (gaia/fish/), because although only three types of fish exist right now, it's not inconceivable many more will be added in the future.
Cf. gaia/ruins/ and gaia/treasure/, which contain files that inherit from template_gaia_ruins.xml and template_gaia_treasure.xml, respectively.

Apply the patch, then run the following command to adjust all map files:

find binaries/data/mods/public/maps/ \( -name '*.js' -o -name '*.json' -o -name '*.xml' \) -print0 | xargs -0 sed -i \
  -e 's,gaia/fauna_fish_tuna,gaia/fish/tuna,g' \
  -e 's,gaia/fauna_fish_tilapia,gaia/fish/tilapia,g' \
  -e 's,gaia/fauna_fish,gaia/fish/generic,g'

Similar patches include:

Test Plan

Check for mistakes.

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.May 31 2020, 5:50 PM

Owners added a subscriber: Restricted Owners Package.May 31 2020, 5:50 PM

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

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

Harbormaster failed remote builds in B11878: Diff 12072!May 31 2020, 5:51 PM

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

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/876/display/redirect

Nescio mentioned this in D2254: gaia/fauna_hawk → birds/buzzard.May 31 2020, 5:57 PM

Nescio mentioned this in D2914: rename templates: javelinist → javelineer.Jul 27 2020, 3:25 PM

Nescio mentioned this in D2925: deprecate campaigns/ folder.Aug 3 2020, 11:03 AM

Freagarach edited reviewers, added: Freagarach; removed: Restricted Owners Package.Aug 3 2020, 11:33 AM

Nescio edited the summary of this revision. (Show Details)Aug 3 2020, 11:51 AM

Complete:

Checkrefs passes.
Random maps load fine (and include fish).
Manual inspection of random maps revealed no errors regarding fish.

I think this is a step in the right direction. I plan to commit next week unless someone objects.

This revision is now accepted and ready to land.Sep 4 2020, 10:04 AM

This revision was landed with ongoing or failed builds.Sep 10 2020, 10:21 AM

Closed by commit rP24031: Move "fauna_fish* -> "fish/*". (authored by Freagarach). · Explain Why

This revision was automatically updated to reflect the committed changes.

Freagarach added a commit: rP24031: Move "fauna_fish* -> "fish/*"..

Owners added a subscriber: Restricted Owners Package.Sep 10 2020, 10:21 AM

Thank you!
Folders for other resource subtypes could make sense too, though the gaia/* files could use some clean-up first, hence D2953, D2990, D2991. Interested?