This patch is a follow-up to D2991/rP24044. It introduces `gaia/ore/` and `gaia/rock/` subfolders for geology templates and moves and renames the following:
* `geology_metal_*.xml` → `ore/*_small.xml`
* `geology_metal_*_slabs.xml` → `ore/*_large.xml`
* `geology_stone_*.xml` → `rock/*_small.xml`
* `geology_stonemine_*_quarry.xml` → `rock/*_large.xml`
`ore` and `rock` are chosen instead of `metal` and `stone` for consistency with their generic `template_gaia_*.xml` parent templates and the already existing `fish/`, `ruins/`, and `treasure/` subfolders.
The advantages of this patch include a more organized `gaia/` folder and shorter and clearer file names, making it easier for map makers to figure out which entity they want, without actually having to open the files in question. The disadvantage is that it breaks all maps in mods, however, that's easy to fix.
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/geology_metal_alpine,ore/alpine_small,g' \
-e 's,gaia/geology_metal_alpine_slabs,ore/alpine_large,g' \
-e 's,gaia/geology_metal_desert_badlands_slabs,ore/badlands_large,g' \
-e 's,gaia/geology_metal_desert_slabs,ore/desert_large,g' \
-e 's,gaia/geology_metal_desert_small,ore/desert_small,g' \
-e 's,gaia/geology_metal_greek,ore/greece_small,g' \
-e 's,gaia/geology_metal_mediterranean,ore/mediterranean_small,g' \
-e 's,gaia/geology_metal_mediterranean_slabs,ore/mediterranean_large,g' \
-e 's,gaia/geology_metal_savanna_slabs,ore/savanna_large,g' \
-e 's,gaia/geology_metal_temperate,ore/temperate_small,g' \
-e 's,gaia/geology_metal_temperate_slabs,ore/temperate_large,g' \
-e 's,gaia/geology_metal_tropic,ore/tropical_small,g' \
-e 's,gaia/geology_metal_tropic_slabs,ore/tropical_large,g' \
-e 's,gaia/geology_stone_alpine_a,rock/alpine_small,g' \
-e 's,gaia/geology_stone_desert_quarried,rock/desert_cut,g' \
-e 's,gaia/geology_stone_desert_small,rock/desert_small,g' \
-e 's,gaia/geology_stone_greek,rock/greece_small,g' \
-e 's,gaia/geology_stone_mediterranean,rock/mediterranean_small,g' \
-e 's,gaia/geology_stone_savanna_quarried,rock/savanna_cut,g' \
-e 's,gaia/geology_stone_savanna_small,rock/savanna_small,g' \
-e 's,gaia/geology_stone_temperate,rock/temperate_small,g' \
-e 's,gaia/geology_stone_tropic_a,rock/tropical_small,g' \
-e 's,gaia/geology_stonemine_alpine_quarry,rock/alpine_large,g' \
-e 's,gaia/geology_stonemine_desert_badlands_quarry,rock/badlands_large,g' \
-e 's,gaia/geology_stonemine_desert_quarry,rock/desert_large,g' \
-e 's,gaia/geology_stonemine_medit_quarry,rock/mediterranean_large,g' \
-e 's,gaia/geology_stonemine_savanna_quarry,rock/savanna_large,g' \
-e 's,gaia/geology_stonemine_temperate_formation,rock/temperate_large_02,g' \
-e 's,gaia/geology_stonemine_temperate_granite_quarry,rock/temperate_large_03,g' \
-e 's,gaia/geology_stonemine_temperate_quarry,rock/_large,g' \
-e 's,gaia/geology_stonemine_tropic_quarry,rock/tropical_large,g'
```
Similar patches include:
* D989/rP21094 (ruins) + rP21095 (treasure)
* D1009 (flora)
* D2083/rP22657 (territory pull)
* D2254/rP23977 (birds)
* D2774/rP24031 (fish)