[work in progress]
Currently about half of the `gaia/flora_bush_*` files inherit from `template_gaia_fruit.xml`, the other half from `template_gaia_tree.xml`; most of the `gaia/flora_tree_*` files inherit from `template_gaia_tree.xml`, but some from `template_gaia_fruit.xml`. The bush vs tree distinction is mostly based on how something looks and not really functional for templates; a more sensible approach is to differentiate by resource subtype (see D2990/rP24043).
This patch:
* merges fishoves templates that inherit from `template_gaia_fruit.xml` into a new `gaia/fruit/` subfolder and renames them accordingly;
* moves templates that inherit from `template_gaia_tree.xml` into a new `gaia/tree/` subfolder and renames them accordingly.
**TODO**: `flora_tree_*` → `tree/*`
To correct the maps/ files, fish_tilapia, and fish_tuna (three identical 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/flora_bush_badlands,tree/bush_badlands,g' \
-e 's,gaia/flora_bush_temperate,tree/bush_temperate,g' \
-e 's,gaia/flora_bush_temperate_winter,tree/bush_temperate_winter,g' \
* changes the parent of the muskox from `domestic` into `hunt_skittish` (muskoxen have never been domesticated) -e 's,gaia/flora_bush_tropic,tree/bush_tropic,g' \
* renames rhino to rhinoceros (cf. crocodile) -e 's,gaia/flora_bush_berry_desert,fruit/berry_05,g' \
* moves -e 's,gaia/fauna_* to gaia/fauna/*lora_bush_berry_autumn_01,fruit/berry_04,g' \
* moves flora_tree_medit_fan_palm.xml to -e 's,gaia/flora/tree_fan_palm_mediterranean.xml_bush_berry_03,fruit/berry_03,g' \
* moves flora_tree_palm_tropic.xml to flora/tree_tropical_tall.xml -e 's,gaia/flora_bush_berry_02,fruit/berry_02,g' \
* moves flora_tree_senegal_date_palm.xml to flora/tree_date_palm_senegal.xml -e 's,gaia/flora_bush_berry,fruit/berry_01,g' \
* moves -e 's,gaia/flora_* to gaia/flora/*bush_grapes,fruit/grapes,g' \
* corrects all corral production queues
To correct the maps/ files, run this script in your 0ad/ repository: -e 's,gaia/flora_tree_apple,fruit/apple,g' \
{F273678} -e 's,gaia/flora_tree_banana,fruit/banana,g' \
-e 's,gaia/flora_tree_date_palm_fruit,fruit/date,g' \
-e 's,gaia/flora_tree_fig,fruit/fig,g' \
-e 's,gaia/flora_tree_olive,fruit/olive,g' \
-e 's,gaia/flora/tree_,gaia/tree/,g'
```
See also discussions at D989 and #4770imilar patches include:
* D989/rP21094 (ruins) + rP21095 (treasure)
* D2083/rP22657 (territory pull)
* D2254/rP23977 (birds)
* D2774/rP24031 (fish)