Page MenuHomeWildfire Games

gaia/fauna_fish* → gaia/fish/*
Needs ReviewPublic

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

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
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'

See also D2254.

Test Plan

Check for mistakes.

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

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

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