From 8cb7c4ec3416e1758cacacd03affbe92cb346a38 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Tue, 28 May 2019 20:46:56 +0000
Subject: [PATCH] New horse and cattle fauna template corrections Patch by:
 @Nescio Reviewed by: @Stan Differential Revision:
 https://code.wildfiregames.com/D1874 This was SVN commit r22315.

---
 .../templates/gaia/fauna_cattle_bull.xml      |  4 +--
 .../templates/gaia/fauna_cattle_cow.xml       |  6 ++--
 .../templates/gaia/fauna_cattle_sanga.xml     |  6 ++--
 .../{fauna_zebu.xml => fauna_cattle_zebu.xml} |  6 ++--
 ...le.xml => fauna_cattle_zebu_trainable.xml} |  2 +-
 .../templates/gaia/fauna_horse_breed.xml      | 30 +------------------
 .../templates/gaia/fauna_horse_lusitano.xml   | 30 +------------------
 .../templates/gaia/fauna_horse_marwari.xml    | 30 +------------------
 .../templates/gaia/fauna_horse_persian.xml    | 30 +------------------
 .../templates/structures/gaul_corral.xml      |  1 +
 .../templates/structures/kush_corral.xml      |  3 +-
 .../templates/structures/maur_corral.xml      |  2 +-
 ...plate_unit_fauna_herd_domestic_cattle.xml} |  5 +---
 ...emplate_unit_fauna_hunt_defensive_bull.xml |  3 --
 14 files changed, 21 insertions(+), 137 deletions(-)
 rename binaries/data/mods/public/simulation/templates/gaia/{fauna_zebu.xml => fauna_cattle_zebu.xml} (55%)
 rename binaries/data/mods/public/simulation/templates/gaia/{fauna_zebu_trainable.xml => fauna_cattle_zebu_trainable.xml} (84%)
 rename binaries/data/mods/public/simulation/templates/{template_unit_fauna_hunt_passive_cattle.xml => template_unit_fauna_herd_domestic_cattle.xml} (68%)

diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
index ee37e55d5b..ca045a8dcc 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_bull">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Taurus</SpecificName>
+    <GenericName>Bull</GenericName>
+    <SpecificName>Bos taurus taurus</SpecificName>
     <Icon>gaia/fauna_bull.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
index 8c6c5db77b..a51c94eb66 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_passive_cattle">
+<Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Taurus</SpecificName>
+    <GenericName>Cow</GenericName>
+    <SpecificName>Bos taurus taurus</SpecificName>
     <Icon>gaia/fauna_cow.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
index 1f3c5ab139..dd324dc015 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_passive_cattle">
+<Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Africanus</SpecificName>
+    <GenericName>Sanga Cattle</GenericName>
+    <SpecificName>Bos taurus africanus</SpecificName>
     <Icon>gaia/fauna_sanga.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
similarity index 55%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
index a55b6b19c0..ccdf2b7701 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_passive_cattle">
+<Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Indicus</SpecificName>
+    <GenericName>Zebu</GenericName>
+    <SpecificName>Bos taurus indicus</SpecificName>
     <Icon>gaia/fauna_zebu.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu_trainable.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
similarity index 84%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_zebu_trainable.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
index 13344115ae..ebdccb91fb 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu_trainable.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_zebu">
+<Entity parent="gaia/fauna_cattle_zebu">
   <Cost>
     <BuildTime>53</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml
index 069832b831..b2d591cd8e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_breed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml
index 184de7f05b..cd43922db9 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_lusitano.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml
index 6bf6632cda..e41ffbda1c 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_marwari.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml
index b19dce1be0..8f5b5e284e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_persian.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml
index 37e2d90190..bfd685864d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml
@@ -14,6 +14,7 @@
     <Entities datatype="tokens">
       -gaia/fauna_sheep_trainable
       gaia/fauna_pig_trainable
+      gaia/fauna_cattle_cow_trainable
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_corral.xml b/binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
index 07d9bc59c3..bae4d37987 100644
--- a/binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
@@ -13,8 +13,9 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      gaia/fauna_goat_trainable
       -gaia/fauna_sheep_trainable
+      gaia/fauna_goat_trainable
+      gaia/fauna_cattle_sanga_trainable
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_corral.xml b/binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
index 52f4e6f82c..a852775a7b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
@@ -14,7 +14,7 @@
     <Entities datatype="tokens">
       -gaia/fauna_sheep_trainable
       gaia/fauna_goat_trainable
-      gaia/fauna_zebu_trainable
+      gaia/fauna_cattle_zebu_trainable
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_cattle.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_cattle.xml
rename to binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
index c9bef30540..c12e04052b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_cattle.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
+<Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Square width="1.9" depth="3.8"/>
     <Height>2.0</Height>
@@ -8,7 +8,4 @@
     <WalkSpeed op="mul">0.4</WalkSpeed>
     <RunMultiplier>1.4</RunMultiplier>
   </UnitMotion>
-  <UnitAI>
-    <NaturalBehaviour>passive</NaturalBehaviour>
-  </UnitAI>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
index 1f63b124f7..ee501d8175 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -15,9 +15,6 @@
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
-  <Identity>
-    <VisibleClasses datatype="tokens">Cattle</VisibleClasses>
-  </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>