Page MenuHomeWildfire Games

Change fish parent to gaia

Authored by Nescio on Feb 6 2019, 12:07 PM.



Currently fish is a child of template_unit_fauna.xml; however, fish does not move, has no armour, attack, or health, and disables a few other things as well. In many ways fish is much more similar to gaia objects such as metal mines or fruit trees.
This proposal moves fish to template_gaia_fish.xml and adjust all fish templates accordingly.

Test Plan

Check if nothing is overlooked.

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.Feb 6 2019, 12:07 PM
Vulcan added a subscriber: Vulcan.Feb 6 2019, 12:08 PM

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

Link to build:

Nescio updated this revision to Diff 7454.Feb 6 2019, 12:09 PM

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

Link to build:

bb added a subscriber: bb.Mar 16 2019, 6:21 PM

Idea seems good.

Opening a map with fish on it throws a bunch of errors (invalid template)

4–6 ↗(On Diff #7454)

This indeed seems better, the identity description is false either way

9 ↗(On Diff #7454)

SeaCreature Animal Organic -ConquestCritical

19 ↗(On Diff #7454)

k docks

Nescio added inline comments.Mar 16 2019, 6:46 PM
9 ↗(On Diff #7454)

Its new parent (gaia) does not have ConquestCritical, therefore it doesn't need to be removed.
Fish has no health, therefore it doesn't need Organic (O means it can be healed by healers); trees aren't O either.
Animal and Unit are unnecessary too, because fish doesn't move and no longer has template_unit_fauna.xml as its parent.

Nescio updated this revision to Diff 7542.Mar 16 2019, 6:53 PM

Updated, now with <Obstruction/Unit/> node, should solve errors.

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

Link to build:

bb accepted this revision.Mar 16 2019, 9:28 PM

Game works, Atlas works changes make sense => accept

9 ↗(On Diff #7454)

The conclusion seems right, trees don't have organic either, so that excludes that one. Animal seems counterpart of Human, so leaving them out looks ok on second sight. (You were already right about conqestcritical)

14 ↗(On Diff #7454)

kindof sad that this duplicates these values, nothing to do about that I suppose (anytime someone could create a gaia food harvest place in need of these values)

This revision is now accepted and ready to land.Mar 16 2019, 9:28 PM
This revision was automatically updated to reflect the committed changes.