Page MenuHomeWildfire Games

New horse and cattle fauna template corrections
Needs ReviewPublic

Authored by Nescio on Fri, May 10, 5:31 PM.

Details

Reviewers
Stan
Summary

rP22257 introduced new cattle templates. Unfortunately, they contained mistakes. This patch corrects them:

  • removes unnecessary <Civ>gaia</Civ>, because all units and gaia objects already have this by default
  • add <GenericName>
  • correct <SpecificName> capitalization: in scientific names Genus is always capitalized, species and subspecies never.
  • moved shared parent: template_unit_fauna_hunt_passive_cattle.xmltemplate_unit_fauna_herd_domestic_cattle.xml
  • added European cow to gaul corral and Sanga cattle to kush corral so they can get used

Also removed duplication from the new horse templates introduced in rP22260.

Test Plan

Probably unproblematic. These new templates are not yet used in maps.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
/ps/trunk
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 7433
Build 12095: Vulcan BuildJenkins
Build 12094: arc lint + arc unit

Event Timeline

Nescio created this revision.Fri, May 10, 5:31 PM

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

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

Stan requested changes to this revision.Fri, May 10, 6:42 PM

I see you moved the cost in the parent template, but I think it's bad for consistency with the other trainable animals. Currently it's not the case, but in the future we might want to add props on the domesticated fauna, and we will need a different template for that.

binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
18

That's wrong, we should have a template called "fauna_cattle_sanga_trainable" that defines the training time and the resources needed, else you will get the same spam bug than in Millenium ad and TM

binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
17

Same here.

This revision now requires changes to proceed.Fri, May 10, 6:42 PM

Or perhaps the *_trainable.xml goat, pig, and sheep should be merged with their respective parents.

Nescio updated this revision to Diff 7960.Fri, May 10, 7:33 PM
Nescio edited the summary of this revision. (Show Details)

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

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

Stan added a comment.Fri, May 10, 8:07 PM
In D1874#77520, @Nescio wrote:

Or perhaps the *_trainable.xml goat, pig, and sheep should be merged with their respective parents.

As I said eventually there should be a visual actor difference between the two :)

Nescio updated this revision to Diff 7967.Sat, May 11, 9:59 AM

Updated, keeping *_trainable.xml files.

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

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

Nescio updated this revision to Diff 7968.Sat, May 11, 10:10 AM

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

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