The main question is: is it mainly a tree or a bush? If the answer is a bush, you can just change the Minimap stuff in that template.

I don't know the difference between tree and bush. I know that five of the trees/bushes have fruit and the rest of the trees/bushes have wood.

I see now that template_gaia_flora_bush is only used in template_gaia_flora_bush_berry, so it makes sense to combine them if that was your point.

Are there consequences for changing the generic name? e.g. with the AI.

Unless the AI has learnt to read recently, no. The GenericName is read by human-players, so the consequence in changing it is that it will need re-translation. (For resource gathering, the AI looks at the ResourceSupply component.)

@temple:

"<element name='GenericName' a:help='Generic English-language name for this class of unit.'>"
"<optional>" + "<element name='SpecificName' a:help='Specific native-language name for this unit type.'>"

It seems in fact that the specific names are useless here (or they are used for a different purpose than the one explained in the schema help).

I meant that if you change inheritance only for the minimap it's not the good way to do. In that case you could just have change the Minimap entry in flora_tree_fig.xml/
I don't say that current inheritance or current template namming are right. We just need to do a decision.
For example, I expect flora_tree_olive, flora_tree_fig, flora_tree_oak to all inherit from template_gaia_flora_tree. Nonetheless, 2 among those 3 have ResourceSupply and the 1st one doesn't inherit from tree template. Imo that's completly wrong and I wonder if your fix is ok.
That said, it remains a / design decision / policy / choice /: what do we decide to be tree and bush. Do we decide that by ResourceSupply or by Obstruction behavior. Both choice has its pros and cons. I won't give you an answer. But if you choose to make flora_tree_fig inherit from template_gaia_flora_bush, then imo rename it to flora_bush_fig (and fix obstruction). If you don't choose the converse then fix flora_tree_olive.
A proper solution could be to add a new generic template template_gaia_flora_tree_fruit (where fruit could be replace with another word meaning that it provides food) and makes flora_tree_fig and other trees wich provides food inherits from that.

In D845#33152, @s0600204 wrote:

Are there consequences for changing the generic name? e.g. with the AI.

Unless the AI has learnt to read recently, no. The GenericName is read by human-players, so the consequence in changing it is that it will need re-translation. (For resource gathering, the AI looks at the ResourceSupply component.)

Okay. That's what I assumed, but when poking around I saw a few "generics" so I wanted to at least ask the question.

Checking again, it seems the AI has learned a few words: :)

petra/queueplanBuilding.js:				else if (template.hasClass("GarrisonFortress") && ent.genericName() == "House")
petra/queueplanBuilding.js:				else if (template.genericName() === "Rotary Mill" && ent.hasClass("Field"))
common-api/entity.js:		if (specificName && specificName === "Rabbit")

In D845#33160, @fatherbushido wrote:

(and fix obstruction)

I didn't notice that, thanks. I just saw 2-1, apple and olive vs fig.

It's weird to me that berries and grapes don't block movement/pathfinding, but I'll leave it in. (I guess the two wood bushes shouldn't block movement/pathfinding either, in that case?)

Like unit overlaping and things like that, it's tweaks for the pathfinder (to avoid stucked units for example).

Well, disclaimer: I still don't provide orders / solutions / answers.
It seems clear that we have two kind of things: bushes and trees.
That's well reflected by their template names.

So that needs to be deeply thought and deeply cleaned.

Rework inheritence, rework namming, merging things,... are tracks to achieve that goal.

An idea:
template_gaia_flora_tree -> template_gaia_flora_tree_fruit and template_gaia_flora_tree_wood
template_gaia_flora_bush -> template_gaia_flora_bush_fruit and template_gaia_flora_bush_wood

To help, here are good (old / outdated) things to read

https://trac.wildfiregames.com/wiki/List%3A_Entities%3A_Nature%3A_Flora
https://trac.wildfiregames.com/wiki/List%3A_Entities%3A_Nature%3A_Flora%3A_Plants
https://trac.wildfiregames.com/wiki/List%3A_Entities%3A_Nature%3A_Flora%3A_Trees

To me, it makes more sense to group as fruit vs wood rather than tree vs bush, because there's more commonality: generic name, tooltip, icon, minimap, resource supply, and sound; compared to footprint height and status bars (and possibly obstruction blocks). Plus there's five fruits but only four bushes.

In D845#33196, @fatherbushido wrote:

It's weird to me that berries and grapes don't block movement/pathfinding, but I'll leave it in. (I guess the two wood bushes shouldn't block movement/pathfinding either, in that case?)

Like unit overlaping and things like that, it's tweaks for the pathfinder (to avoid stucked units for example).

Okay, but it still seems weird.

To help, here are good (old / outdated) things to read

"Last modified 8 years ago", before even the pre-alphas existed. :)

In D845#33196, @fatherbushido wrote:

It's weird to me that berries and grapes don't block movement/pathfinding, but I'll leave it in. (I guess the two wood bushes shouldn't block movement/pathfinding either, in that case?)

Like unit overlaping and things like that, it's tweaks for the pathfinder (to avoid stucked units for example).

Is this causing berries to be sometimes placed in mines?
Edit: Nevermind, I see that's not the case.

To complicate things even further, personally I'd prefer:

• fruit bushes (e.g. grapevine): food
• fruit trees (e.g. olive, fig, date): both food *and* wood
• ordinary trees (e.g. birch, oak, pine): wood

And corresponding minimap colours, e.g. animals and fruit bushes red-ish, fruit trees yellow-ish, ordinary trees green-ish, metal blue-ish, and stone grey-ish.

Just my two cents, feel free to ignore :)

Wouldn't the proposed new parent template fruit tree fix these things? Well, I didn't want to get involved originally :S

In D845#37799, @temple wrote:

Added a fruit tree template to reduce duplication. Now the food minimap color is only defined twice, once for bush berries and once for fruit trees.

Seems the wanted solution.
(The one which fits the original \begin{inception} well thought \end{inception} schemas.)
I can review it for completeness and check it doesn't 'break' the AI (perhaps did you?)

Here's some other resource tooltips:

A mineral deposit, providing access to rare forms of precious Metal.
A treasure that can be quickly gathered.
Chop down to accumulate Wood.
Collect food from this bountiful oceanic resource.
Collect food from this bountiful riparian resource. [new word to me: riparian = relating to or situated on the banks of a river]
Gather figs for Food.
Gather grapes from these vines for Food.
Gather the fruit from these bushes to accumulate Food.
Kill, then collect food from this bountiful oceanic resource.
Mine these to provide Stone building material.
These ruins that can be mined for resources.

My addition was:

Gather apples for Food.
Gather olives for Food.

I don't have a preference either way. Disabling the tooltip would be fine, for example most fauna don't have a tooltip.

I don't really mind either either, I just wanted to inform that there are such points of view.
(The existing tooltips are not necessarily regarded as a good example by everyone)

\begin{Review}

https://trac.wildfiregames.com/wiki/List%3A_Entities%3A_Nature%3A_Flora
https://trac.wildfiregames.com/wiki/List%3A_Entities%3A_Nature%3A_Flora%3A_Plants
https://trac.wildfiregames.com/wiki/List%3A_Entities%3A_Nature%3A_Flora%3A_Trees

Current flora files:

So:

gaia/flora_bush_badlands
gaia/flora_bush_temperate

should inherit from template_gaia_flora_bush (you can add res wood at that place).

gaia/flora_tree_fig

gaia/flora_tree_apple
gaia/flora_tree_olive

should inherit from template_gaia_flora_tree_fruit

\end{Review}

Else it's ok, I set 'Request Changes' but that's minor.

refs r3860, r14727, r7976, r9304, r7259 (I don't put the P after r to not spam those old revs).

(AI should be fine as it uses the resourceSupplyType)