Page MenuHomeWildfire Games

gaia/fauna_hawk → birds/buzzard

Authored by Nescio on Sep 3 2019, 11:40 AM.



This patch moves the gaia/fauna_hawk.xml template to birds/buzzard.xml, because according to the relevant forum post, our hawk is actually a common buzzard (Buteo buteo).
Birds do not inherit from template_gaia.xml, do not provide any resources, and do not interact, do not even have <Identity>, therefore they don't really belong in the gaia/ folder. A separate birds/ folder makes sense (cf. rubble/, territory_pulls/) and allows for future additions (eagles, falcons, hawks, vultures, etc.).

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

find binaries/data/mods/public/maps/ \( -name '*.js' -o -name '*.json' -o -name '*.xml' \) -print0 | xargs -0 sed -i 's,gaia/fauna_hawk,birds/buzzard,g'

Similar patches include:

Test Plan

Check for mistakes.

Diff Detail

rP 0 A.D. Public Repository
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Nescio created this revision.Sep 3 2019, 11:40 AM
Nescio added a reviewer: Restricted Owners Package.
Nescio added a subscriber: wowgetoffyourcellphone.

Successful build - Chance fights ever on the side of the prudent.

Link to build:

Successful build - Chance fights ever on the side of the prudent.

Link to build:

Stan added a subscriber: Stan.EditedSep 3 2019, 11:51 AM

I believe you forgot all the maps where they are used ?

EDIT: nevermind.

EDIT2: Will likely break mods they should be notified.

EDIT3: Someone with Linux will have to commit this...

Stan added a comment.Jan 6 2020, 9:59 PM

This doesn't look too bad, but I'm not sure we should have a template folder specific to birds.

gaia/birds/buzzard.xml then?
Birds inherit from template_bird.xml, not from template_gaia.xml, and don't provide any resources, as files inside gaia/ do.

Nescio added a subscriber: bb.May 31 2020, 5:30 PM

@bb, interested in reviewing this one?

Nescio edited the summary of this revision. (Show Details)May 31 2020, 5:57 PM

I agree with the birds folder, since it follows the same structure as the other folders.
One could argue that they should be in the GAIA folder, though that would imply it inherits from template_gaia. One could do that, but it means the bird-template would get larger (lots of disabling besides the enabling). While I think that would technically be correct I am not convinced it is worth the hassle. If one goes that route it seems logical to also split the fauna/flora/geological in the "gaia" folder into separate folders?

Nescio edited the summary of this revision. (Show Details)Aug 3 2020, 11:52 AM
Freagarach accepted this revision.Aug 18 2020, 9:23 AM

Nice change, complete and correct.
This forum post pulled me over the line.

This revision is now accepted and ready to land.Aug 18 2020, 9:23 AM
Freagarach removed a reviewer: Restricted Owners Package.Aug 20 2020, 10:22 AM
This revision was automatically updated to reflect the committed changes.
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Aug 20 2020, 11:16 AM

Thanks! That's one incorrectly named template less. How about fish (D2774)? Those are not really fauna either, since they inherit from template_gaia_fish.xml, not template_unit_fauna.xml.