Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml	(revision 18765)
@@ -1,124 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <AlertRaiser>
     <MaximumLevel>2</MaximumLevel>
     <Range>140</Range>
   </AlertRaiser>
   <Armour>
     <Hack op="add">5</Hack>
     <Pierce op="add">5</Pierce>
     <Foundation>
       <Hack>5</Hack>
       <Pierce>15</Pierce>
       <Crush>3</Crush>
     </Foundation>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>15.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>72.0</MaxRange>
       <MinRange>10.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Category>CivilCentre</Category>
     <Distance>
       <FromClass>CivilCentre</FromClass>
       <MinDistance>200</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>2500</CapturePoints>
     <RegenRate>5.0</RegenRate>
   </Capturable>
   <Cost>
     <PopulationBonus>20</PopulationBonus>
     <BuildTime>500</BuildTime>
     <Resources>
       <food>0</food>
       <wood>500</wood>
       <stone>500</stone>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>1</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Civic Center</GenericName>
     <Tooltip>Build to acquire large tracts of territory. Train citizens.</Tooltip>
     <Classes datatype="tokens">Defensive CivCentre</Classes>
     <VisibleClasses datatype="tokens">CivilCentre</VisibleClasses>
     <Icon>structures/civic_centre.png</Icon>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>0</food>
     <wood>200</wood>
     <stone>200</stone>
     <metal>200</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen
     </Entities>
     <Technologies datatype="tokens">
       phase_town
       phase_city
     </Technologies>
   </ProductionQueue>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
     <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_civ_center.xml</select>
       <constructed>interface/complete/building/complete_civ_center.xml</constructed>
       <attack>attack/weapon/arrowfly.xml</attack>
       <death>attack/destruction/building_collapse_large.xml</death>
       <alert0>interface/alarm/alarm_alert_0.xml</alert0>
       <alert1>interface/alarm/alarm_alert_1.xml</alert1>
       <alert2>interface/alarm/alarm_alert_2.xml</alert2>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>140</Radius>
     <Weight>10000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>90</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml	(revision 18765)
@@ -1,98 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense">
   <Armour>
     <Hack>5</Hack>
     <Pierce>20</Pierce>
     <Crush>1</Crush>
     <Foundation>
       <Hack>1</Hack>
       <Pierce>5</Pierce>
       <Crush>1</Crush>
     </Foundation>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>55.0</MaxRange>
       <MinRange>13.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>2.0</Spread>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Category>House</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>80</wood>
       <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="9.0" depth="9.0"/>
     <Height>15.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Outpost</GenericName>
     <Tooltip>Build in neutral and own territories to scout areas of the map. Slowly converts to Gaia while in neutral territory.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Village Outpost</VisibleClasses>
     <Icon>structures/outpost.png</Icon>
   </Identity>
   <Loot>
     <wood>8</wood>
   </Loot>
   <Obstruction>
     <Static width="6.5" depth="6.5"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       vision_outpost
       decay_outpost
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tower.xml</select>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>18.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
     <DecayRate>2</DecayRate>
   </TerritoryDecay>
   <Vision>
     <Range>80</Range>
   </Vision>
   <VisualActor>
     <Actor>props/special/palisade_rocks_outpost.xml</Actor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml	(revision 18765)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
   <Armour>
     <Hack>4</Hack>
     <Pierce>3</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>13</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>750</RepeatTime>
-      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+      <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee</VisibleClasses>
     <GenericName>Melee Cavalry</GenericName>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml	(revision 18765)
@@ -1,42 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>40.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1250</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.5</Spread>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Champion Cavalry Skirmisher</GenericName>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <death>actor/fauna/death/death_horse.xml</death>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>20.5</WalkSpeed>
     <Run>
       <Speed>28.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>10.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml	(revision 18765)
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack op="add">1</Hack>
     <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>12.0</Hack>
       <Pierce>26.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>3500</RepeatTime>
+      <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Champion Cavalry Spearman</GenericName>
   </Identity>
   <UnitMotion>
     <WalkSpeed>25.0</WalkSpeed>
     <Run>
       <Speed>40.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml	(revision 18765)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack op="add">1</Hack>
     <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>13.0</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>750</RepeatTime>
-      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+      <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>75</wood>
       <metal>125</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
   <UnitMotion>
     <WalkSpeed>23.0</WalkSpeed>
     <Run>
       <Speed>40.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml	(revision 18765)
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_elephant">
   <Attack replace="">
     <Melee>
       <Hack>20</Hack>
       <Pierce>0</Pierce>
       <Crush>150.0</Crush>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>1500</RepeatTime>
+      <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee</VisibleClasses>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml	(revision 18765)
@@ -1,50 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">8</Hack>
     <Pierce op="add">8</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
       <Pierce>5.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>1500</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
     <GenericName>Champion Pikeman</GenericName>
     <History>Pike, or sarissa, infantry were developed by Philip II of Macedon based on the hoplite of the Greek city-states. The Macedonian pikemen, or phalangites, wielded an extra long spear (sarissa) approximatly 4 to 7 meters (13–21 feet) in length. Because of it's length and weight, the pike required the use of both hands, so the shield was slung over the pikeman's shoulder with a leather strap. Front-line pikemen of the age were generally highly-armored, while those in the back lines were lightly armored. Such pike-wielding troops were employed by numerous states, from Carthage to Syria, and were used to fix enemy infantry in position while the army's cavalry worked to turn the enemy flanks.</History>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/syntagma
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
     <Run>
       <Speed>13.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml	(revision 18765)
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">3</Hack>
     <Pierce op="add">3</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>6.0</Hack>
       <Pierce>5.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>750</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Champion Spearman</GenericName>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>11.5</WalkSpeed>
     <Run>
       <Speed>23.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml	(revision 18765)
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">2</Hack>
     <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>11.0</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>750</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>75</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Champion Swordsman</GenericName>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>12.5</WalkSpeed>
     <Run>
       <Speed>16.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 18765)
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
-  <Attack> 
+  <Attack>
     <Capture>
-      <Value>15</Value> 
-      <MaxRange>4</MaxRange> 
-      <RepeatTime>1000</RepeatTime> 
+      <Value>15</Value>
+      <MaxRange>4</MaxRange>
+      <RepeatTime>1000</RepeatTime>
     </Capture> 
   </Attack>
   <Auras datatype="tokens">hero_garrison</Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>600</Max>
   </Health>
   <Identity>
     <GenericName>Hero</GenericName>
     <Classes datatype="tokens">Organic Human</Classes>
     <VisibleClasses datatype="tokens">Hero Soldier</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>400</xp>
     <food>10</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
       <Texture>
         <MainTexture>star/256x256.png</MainTexture>
         <MainTextureMask>star/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/sword.xml</attack>
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>
   <UnitMotion>
     <WalkSpeed>10.5</WalkSpeed>
     <Run>
       <Speed>22.5</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>88</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 18765)
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
       <Pierce>35</Pierce>
       <Crush>0</Crush>
       <MaxRange>80.0</MaxRange>
       <MinRange>20.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
       <food>100</food>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(revision 18765)
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>56.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>36.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>80.0</ProjectileSpeed>
       <PrepareTime>1250</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.3</Spread>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
       <food>100</food>
       <wood>100</wood>
       <metal>75</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
     <GenericName>Hero Cavalry Skirmisher</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>17.0</WalkSpeed>
     <Run>
       <Speed>28.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>16.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml	(revision 18765)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
     <Hack>11</Hack>
     <Pierce>10</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>24.0</Hack>
       <Pierce>52.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>3500</RepeatTime>
-      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+      <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Hero Cavalry Spearman</GenericName>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml	(revision 18765)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
     <Hack>11</Hack>
     <Pierce>9</Pierce>
   </Armour>
   <Attack>
     <Melee>
      <Hack>26.0</Hack>
      <Pierce>0.0</Pierce>
      <Crush>0.0</Crush>
      <MaxRange>6.0</MaxRange>
      <RepeatTime>1000</RepeatTime>
-      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+     <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 18765)
@@ -1,75 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
     <Crush>12</Crush>
   </Armour>
   <Attack replace="">
     <Melee>
       <Hack>17.5</Hack>
       <Pierce>0</Pierce>
       <Crush>25.0</Crush>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusStructures>
           <Classes>Structure</Classes>
           <Multiplier>1.5</Multiplier>
         </BonusStructures>
         <BonusCav>
           <Classes>Cavalry</Classes>
           <Multiplier>2</Multiplier>
         </BonusCav>
         <BonusGates>
           <Classes>Gates</Classes>
           <Multiplier>1.5</Multiplier>
         </BonusGates>
       </Bonuses>
+      <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Population>3</Population>
     <BuildTime>60</BuildTime>
     <Resources>
       <food>500</food>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Elephant</Classes>
     <VisibleClasses datatype="tokens">Melee</VisibleClasses>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack>actor/fauna/animal/elephant_attack.xml</attack>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
     <Run>
       <Speed>14.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>10.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 18765)
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
       <Pierce>8.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>80</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>300</PrepareTime>
       <RepeatTime>300</RepeatTime>
       <Spread>1.0</Spread>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>35</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Hero Archer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 18765)
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
       <Pierce>60.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>1.0</Spread>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>35</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Hero Skirmisher</GenericName>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml	(revision 18765)
@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
     <Hack>17</Hack>
     <Pierce>17</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>2.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>3.0</Multiplier>
         </BonusCavMelee>
       </Bonuses>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
     <GenericName>Hero Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
     <Run>
       <Speed>17.5</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml	(revision 18765)
@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
     <Hack>12</Hack>
     <Pierce>12</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>12.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>3.0</Multiplier>
         </BonusCavMelee>
       </Bonuses>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Hero Spearman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>9</WalkSpeed>
     <Run>
       <Speed>18.75</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml	(revision 18765)
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
     <Hack>12</Hack>
     <Pierce>12</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>22.0</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Swordsman</GenericName>
   </Identity>
   <UnitMotion>
     <WalkSpeed>9.5</WalkSpeed>
     <Run>
       <Speed>20.0</Speed>
       <Range>600.0</Range>
       <RangeMin>8.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml	(revision 18765)
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
     <Hack>5</Hack>
     <Pierce>5</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>5.5</Hack>
       <Pierce>0</Pierce>
       <MaxRange>2.0</MaxRange>
       <RepeatTime>750</RepeatTime>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>40</wood>
       <metal>10</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Sword</VisibleClasses>
     <GenericName>Swordsman</GenericName>
     <History>Weapon is basically a developed sickle. Probably from the club, to the axe, to the sickle to the sword. It was the Romans who used them to combat the long range of the sarissa. Their spears were so long they had to use two hands to wield them. In a formation they were almost impossible to maneuver. If flanked, they were easily cut down by a sword as demonstrated by the Romans at the battle of Cynoscephalae. Generally swordsmen were well armored, had shields, and tended to be nobles. A good sword was an expensive weapon.</History>
   </Identity>
   <Loot>
     <metal>5</metal>
   </Loot>
   <UnitMotion>
     <WalkSpeed>9.5</WalkSpeed>
     <Run>
       <Speed>16.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(revision 18765)
@@ -1,62 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>150.0</Pierce>
       <Crush>25.0</Crush>
       <MaxRange>80.0</MaxRange>
       <MinRange>8.0</MinRange>
       <Spread>2.5</Spread>
       <ProjectileSpeed>300.0</ProjectileSpeed>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>4000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Ranged>
   </Attack>
   <Capturable>
     <RegenRate>20</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>250</wood>
       <metal>250</metal>
     </Resources>
     <Population>2</Population>
   </Cost>
   <Footprint replace="">
     <Square width="5.0" depth="12.0"/>
     <Height>2.0</Height>
   </Footprint>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <GenericName>Bolt Shooter</GenericName>
     <VisibleClasses datatype="tokens">BoltShooter Ranged</VisibleClasses>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>0</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>10</metal>
   </Loot>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <UnitMotion>
     <WalkSpeed>8</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>120</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(revision 18765)
@@ -1,78 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>100.0</Crush>
       <MaxRange>80.0</MaxRange>
       <MinRange>12.0</MinRange>
       <ProjectileSpeed>28.0</ProjectileSpeed>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Spread>6.0</Spread>
       <Splash>
         <Shape>Circular</Shape>
         <Range>10</Range>
         <FriendlyFire>false</FriendlyFire>
         <Hack>0.0</Hack>
         <Pierce>15.0</Pierce>
         <Crush>35.0</Crush>
       </Splash>
+      <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Ranged>
   </Attack>
   <Capturable>
     <RegenRate>20</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>25</BuildTime>
     <Resources>
       <wood>350</wood>
       <stone>350</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="6.0" depth="15.0"/>
     <Height>4.5</Height>
   </Footprint>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <GenericName>Siege Catapult</GenericName>
     <VisibleClasses datatype="tokens">Catapult Ranged</VisibleClasses>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>0</food>
     <wood>20</wood>
     <stone>10</stone>
     <metal>0</metal>
   </Loot>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <attack>attack/siege/ballist_attack.xml</attack>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.5</BarHeight>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>7</WalkSpeed>
     <Run>
       <Speed>10.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>120</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml	(revision 18764)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml	(revision 18765)
@@ -1,86 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>5.0</Crush>
       <MaxRange>55.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ElevationBonus>10</ElevationBonus>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>2.0</Spread>
-      <PreferredClasses datatype="tokens">Structure</PreferredClasses>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
     <Capture>
       <Value>10</Value>
       <MaxRange>8</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Capture>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>0</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
       <wood>500</wood>
       <metal>300</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="15.0" depth="15.0"/>
     <Height>20.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>500</Max>
   </Health>
   <Identity>
     <GenericName>Siege Tower</GenericName>
     <VisibleClasses datatype="tokens">SiegeTower Ranged</VisibleClasses>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <order_attack>attack/siege/ram_attack.xml</order_attack>
       <trained>attack/siege/ram_move.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
     <Run>
       <Speed>10.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>