Page MenuHomeWildfire Games

Fauna names and other corrections
ClosedPublic

Authored by Nescio on May 25 2018, 6:54 PM.

Details

Summary

This patch:

  • generic and specific names were applied inconsistently and often absent. This patch standardizes the scheme that was already present in some: e.g.: fauna_crocodile.xml: <SpecificName>Crocodylus niloticus</SpecificName> <GenericName>Nile Crocodile</GenericName>
  • corrected the muskox to hunt_skittish, because it's not a domesticated species
  • cleared up the lioness template, which was mostly identical to the lion.
  • icons, names, and visualactors do not belong in the shared template_* files and are moved to the appropiate children
  • <Civ>gaia</Civ> is removed from templates, because it is aleady set in template_unit.xml, from which the fauna templates inherit.

Not done here, because it belongs in separate patch(es):

  • gaia/fauna_arctic_wolf.xml should be renamed to gaia/fauna_wolf_arctic.xml; cf. gaia/fauna_fox_arctic.xml
  • gaia/fauna_mastiff.xml and gaia/fauna_wolfhound.xml should be renamed to gaia/fauna_dog_mastiff.xml and gaia/fauna_dog_wolfhound.xml, respectively
  • gaia/fauna_pony.xml should be renamed to gaia/fauna_horse_pony.xml, because it has <Entity parent="gaia/fauna_horse">
  • gaia/fauna_elephant_north_african.xml should be renamed to gaia/fauna_elephant_african_forest.xml
  • fauna_fish.xml, fauna_fish_tilapia.xml, fauna_fish_tuna.xml are duplicates, identical in all except name.
Test Plan

Everything that currently works should still work, everything that is currently broken should still be broken; check nonetheless.

Diff Detail

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

Event Timeline

Nescio created this revision.May 25 2018, 6:54 PM
Stan added a comment.May 25 2018, 7:04 PM

Well you did your research on animal names. Where do those come from ?

I always have been wondering though what the real purpose of the specific name is. Is it like dog mastiff or mastiff (Insert Latin name here)

binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
19 ↗(On Diff #6642)

If it's the same name than the pig shouldn't it inherit it ?

Wikipedia is a great help for finding names of species and for animal images. E.g. there are five quite different rhinoceros species, but 0 A.D.'s looks clearly like the "white" one.

binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
19 ↗(On Diff #6642)

You're right, it can actually be removed.

Nescio updated this revision to Diff 6645.May 25 2018, 7:21 PM

Removed unnecessary specific name from flaming pig, per Stanislas.

Nescio updated this revision to Diff 6646.May 25 2018, 7:40 PM

Corrected typo (thomsoni ends in one i, not two).

Nescio updated this revision to Diff 6647.May 25 2018, 7:49 PM

Oops, it actually should end with two i's; reverted previous "correction".

Nescio edited the summary of this revision. (Show Details)May 25 2018, 8:37 PM
Nescio edited the summary of this revision. (Show Details)
Nescio edited the summary of this revision. (Show Details)May 25 2018, 8:43 PM
Vulcan added a subscriber: Vulcan.May 25 2018, 8:54 PM

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

Link to build: https://jenkins.wildfiregames.com/job/differential/569/display/redirect

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

Link to build: https://jenkins.wildfiregames.com/job/differential/571/display/redirect

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

Link to build: https://jenkins.wildfiregames.com/job/differential/572/display/redirect

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

Link to build: https://jenkins.wildfiregames.com/job/differential/573/display/redirect

No new animals have been added yet, so this one still looks good. Hopefully someone is willing to review and commit it.

Stan added a comment.Dec 30 2018, 11:29 AM

Will do when I have some time. I misread your comment I thought new animals had been added.

Nescio updated this revision to Diff 7211.Jan 3 2019, 11:52 AM
Nescio edited the summary of this revision. (Show Details)

Updated, now with donkey.

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

Link to build: https://jenkins.wildfiregames.com/job/differential/888/

Stan accepted this revision.Jan 3 2019, 11:55 AM

Looking good.

This revision is now accepted and ready to land.Jan 3 2019, 11:55 AM
This revision was automatically updated to reflect the committed changes.
In D1523#62158, @Stan wrote:

I always have been wondering though what the real purpose of the specific name is. Is it like dog mastiff or mastiff (Insert Latin name here)

SpecificName is the "Specific native-language name for this unit type" so it makes sense to use binomial for that.

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
9

For that one I would have been more cautious :-)

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
12

I always wondered if that thing is actually a rabbit.

Nescio marked 2 inline comments as done.Jan 3 2019, 12:37 PM
Nescio added inline comments.
ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
9

Do you think it is a different species?

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
12

What do you mean exactly?

fatherbushido added inline comments.Jan 3 2019, 12:54 PM
ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
9

Honestly I don't know it's hard to do a choice here.
I don't know on what we should argument (actor? maps? geography? history?)
According to geography or history, it seems the safe choice.
Looking at the actors:

  • for the female: we really can't conclude (I always thought it was roe deer in game).
  • for the male actor variant: imo it's not really accurate

But well that's good enough...

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
12

Sounds more like an hare.

Nescio marked 2 inline comments as done.Jan 5 2019, 9:25 PM
Nescio added inline comments.
ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
9

When in doubt, I simply viewed the animal actor in Atlas and compared it with images and descriptions on Wikipedia (good enough for me, I'm not a biologist).
In this case I assumed it was a red deer, because I believe the roe deer is smaller. But I can be mistaken, of course.

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
12

All hares belong to the *Lepus* genus.

The idea is more: what are those things?

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
9

Obviously it's not a roe deer. I didn't say that!
You can't be mistaken, of course, because it depends of the criteria used to match a game entity and a real thing ;-)

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
12

Lepus europaeus I meant.
But anyway that's not relevant to the current patch.

Stan added inline comments.Jan 6 2019, 1:03 PM
ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
12

Actually I'm planning to get a hare made for 0 A.D. A24 release