Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml	(revision 25339)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml	(revision 25340)
@@ -1,122 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AttackDetection>
     <SuppressionTransferRange>80</SuppressionTransferRange>
     <SuppressionRange>160</SuppressionRange>
     <SuppressionTime>60000</SuppressionTime>
   </AttackDetection>
   <BattleDetection>
     <TimerInterval>200</TimerInterval>
     <RecordLength>12</RecordLength>
     <DamageRateThreshold>0.04</DamageRateThreshold>
     <AlertnessBattleThreshold>4</AlertnessBattleThreshold>
     <AlertnessPeaceThreshold>0</AlertnessPeaceThreshold>
     <AlertnessMax>8</AlertnessMax>
   </BattleDetection>
   <EntityLimits>
     <Limits>
+      <Animal>50</Animal>
       <CivilCentre>1</CivilCentre>
       <Council>1</Council>
       <Fortress>10</Fortress>
       <Gladiator>0</Gladiator>
       <Hero>1</Hero>
       <Juggernaut>1</Juggernaut>
       <Library>1</Library>
       <Lighthouse>1</Lighthouse>
       <Monument>5</Monument>
       <Palace>1</Palace>
       <Pillar>0</Pillar>
       <PyramidLarge>2</PyramidLarge>
       <PyramidSmall>4</PyramidSmall>
       <TempleOfAmun>1</TempleOfAmun>
       <TempleOfVesta>1</TempleOfVesta>
       <Theater>1</Theater>
       <Tower>30</Tower>
       <WarDog>20</WarDog>
       <Wonder>1</Wonder>
     </Limits>
     <LimitChangers>
       <Gladiator>
         <Amphitheater>15</Amphitheater>
       </Gladiator>
       <Juggernaut>
         <PtolemyIV>4</PtolemyIV>
       </Juggernaut>
       <Pillar>
         <Ashoka>5</Ashoka>
       </Pillar>
     </LimitChangers>
     <LimitRemovers>
       <CivilCentre>
         <RequiredTechs datatype="tokens">phase_town</RequiredTechs>
       </CivilCentre>
     </LimitRemovers>
   </EntityLimits>
   <Identity>
     <Civ/>
     <GenericName>Player</GenericName>
     <Classes datatype="tokens">Player</Classes>
     <Undeletable>true</Undeletable>
   </Identity>
   <Player>
     <BarterMultiplier>
       <Buy>
         <food>1.0</food>
         <wood>1.0</wood>
         <stone>1.0</stone>
         <metal>1.0</metal>
       </Buy>
       <Sell>
         <food>1.0</food>
         <wood>1.0</wood>
         <stone>1.0</stone>
         <metal>1.0</metal>
       </Sell>
     </BarterMultiplier>
     <SharedLosTech>unlock_shared_los</SharedLosTech>
     <SharedDropsitesTech>unlock_shared_dropsites</SharedDropsitesTech>
     <SpyCostMultiplier>1.0</SpyCostMultiplier>
   </Player>
   <ResourceTrickle>
     <Rates>
       <food>0.0</food>
       <wood>0.0</wood>
       <stone>0.0</stone>
       <metal>0.0</metal>
     </Rates>
     <Interval>1000</Interval>
   </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <defeated>interface/alarm/alarm_defeated.xml</defeated>
       <defeated_ally>interface/alarm/alarm_defeated_ally.xml</defeated_ally>
       <defeated_enemy>interface/alarm/alarm_defeated_enemy.xml</defeated_enemy>
       <no_idle_unit>interface/alarm/alarm_no_idle_unit.xml</no_idle_unit>
     </SoundGroups>
   </Sound>
   <StatisticsTracker>
     <!-- The summary screen and lobby rankings expect these classes, but additional classes may be added. -->
     <UnitClasses datatype="tokens">
       Cavalry
       Champion
       Domestic
       FemaleCitizen
       Hero
       Infantry
       Ship
       Siege
       Trader
       Worker
     </UnitClasses>
     <StructureClasses datatype="tokens">
       Economic
       CivCentre
       Fortress
       House
       Military
       Outpost
       Wonder
     </StructureClasses>
   </StatisticsTracker>
   <TechnologyManager/>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml	(revision 25339)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml	(revision 25340)
@@ -1,53 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Cost>
     <Population>0</Population>
   </Cost>
   <Footprint replace="">
     <Square width="2.0" depth="4.0"/>
     <Height>4.0</Height>
   </Footprint>
   <Guard disable=""/>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical Animal</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
     <Formations disable=""/>
   </Identity>
   <Loot disable=""/>
   <Minimap>
     <Type>food</Type>
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <Position>
     <TurnRate>4</TurnRate>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
+  <TrainingRestrictions>
+    <Category>Animal</Category>
+  </TrainingRestrictions>
   <TreasureCollecter disable=""/>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
     <RoamDistance>8.0</RoamDistance>
     <FleeDistance>24.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>15000</FeedTimeMin>
     <FeedTimeMax>60000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.7</WalkSpeed>
   </UnitMotion>
   <Visibility>
     <RetainInFog>true</RetainInFog>
   </Visibility>
   <Vision>
     <Range>60</Range>
   </Vision>
 </Entity>