Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml	(revision 24684)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml	(revision 24685)
@@ -1,68 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Capturable>
-    <CapturePoints>500</CapturePoints>
-    <RegenRate>10</RegenRate>
-    <GarrisonRegenRate>10</GarrisonRegenRate>
-  </Capturable>
   <Cost>
     <Population>3</Population>
   </Cost>
   <Decay>
     <DelayTime>0.0</DelayTime>
     <SinkRate>0.0</SinkRate>
     <SinkAccel>2.0</SinkAccel>
   </Decay>
   <Health>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Classes datatype="tokens">-Organic</Classes>
     <VisibleClasses datatype="tokens">Siege</VisibleClasses>
     <GenericName>Siege</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Position>
     <Anchor>pitch-roll</Anchor>
     <TurnRate>2</TurnRate>
   </Position>
   <Repairable>
     <RepairTimeRatio>4.0</RepairTimeRatio>
   </Repairable>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>1</Hack>
-        <Pierce>50</Pierce>
+        <Pierce>25</Pierce>
         <Crush>5</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/rounded_rectangle.png</MainTexture>
         <MainTextureMask>128x256/rounded_rectangle_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_move.xml</order_attack>
       <trained>attack/siege/ram_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.5</BarHeight>
   </StatusBars>
   <UnitAI>
     <CanGuard>false</CanGuard>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <RunMultiplier>1</RunMultiplier>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml	(revision 24684)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml	(revision 24685)
@@ -1,79 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <AttackName>Bolt</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>240</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>90</MaxRange>
       <MinRange>15</MinRange>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>6000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>150.0</Speed>
         <Spread>1.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <Splash>
         <Shape>Linear</Shape>
         <Range>9</Range>
         <FriendlyFire>false</FriendlyFire>
         <Damage>
           <Pierce>80</Pierce>
         </Damage>
       </Splash>
     </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>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged BoltShooter</VisibleClasses>
     <GenericName>Bolt Shooter</GenericName>
   </Identity>
   <Loot>
     <xp>200</xp>
     <wood>50</wood>
     <metal>50</metal>
   </Loot>
   <Pack>
     <Time>10000</Time>
   </Pack>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <DefaultStance>standground</DefaultStance>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml	(revision 24684)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml	(revision 24685)
@@ -1,62 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Melee>
       <AttackName>Ram</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>150.0</Crush>
       </Damage>
       <MaxRange>6.5</MaxRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <PreferredClasses datatype="tokens">Gate Defensive Structure</PreferredClasses>
       <RestrictedClasses datatype="tokens">Field Organic</RestrictedClasses>
     </Melee>
   </Attack>
-  <Capturable disable=""/>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>300</wood>
       <metal>150</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>10</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>400</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Ram</VisibleClasses>
     <GenericName>Battering Ram</GenericName>
     <Tooltip>Cannot attack Fields or Organic Units.</Tooltip>
   </Identity>
   <Loot>
     <xp>200</xp>
     <wood>60</wood>
     <metal>30</metal>
   </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Pierce>50</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <order_attack>attack/siege/ram_attack_order.xml</order_attack>
       <trained>attack/siege/ram_trained.xml</trained>
       <attack_melee>attack/siege/ram_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml	(revision 24684)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml	(revision 24685)
@@ -1,72 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
         <Crush>210</Crush>
       </Damage>
       <MaxRange>80</MaxRange>
       <MinRange>40</MinRange>
       <PrepareTime>6000</PrepareTime>
       <RepeatTime>7000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>40.0</Speed>
         <Spread>6.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
         <ImpactActorName>props/units/weapons/rock_explosion.xml</ImpactActorName>
         <ImpactAnimationLifetime>0.1</ImpactAnimationLifetime>
       </Projectile>
       <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Ranged>
   </Attack>
-  <Capturable>
-    <RegenRate>20</RegenRate>
-  </Capturable>
   <Cost>
     <BuildTime>25</BuildTime>
     <Resources>
       <wood>400</wood>
       <stone>250</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="6.0" depth="15.0"/>
     <Height>4.5</Height>
   </Footprint>
   <Health>
     <Max>250</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged StoneThrower</VisibleClasses>
     <GenericName>Siege Catapult</GenericName>
   </Identity>
   <Loot>
     <xp>250</xp>
     <wood>80</wood>
     <stone>50</stone>
   </Loot>
   <Pack>
     <Time>10000</Time>
   </Pack>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/siegeprojectilehit.xml</attack_impact_ranged>
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <DefaultStance>standground</DefaultStance>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml	(revision 24684)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml	(revision 24685)
@@ -1,97 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>12.0</Pierce>
         <Crush>2.5</Crush>
       </Damage>
       <MaxRange>55.0</MaxRange>
       <MinRange>10.0</MinRange>
       <ElevationBonus>10</ElevationBonus>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>75.0</Speed>
         <Spread>2.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>0</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>500</wood>
       <metal>300</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="12.0" depth="12.0"/>
     <Height>30.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>
     <VisibleClasses datatype="tokens">Ranged SiegeTower</VisibleClasses>
     <GenericName>Siege Tower</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Loot>
     <xp>250</xp>
     <wood>100</wood>
     <metal>60</metal>
   </Loot>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>256x256/rounded_rectangle.png</MainTexture>
         <MainTextureMask>256x256/rounded_rectangle_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_attack>attack/siege/ram_move.xml</order_attack>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
       <trained>attack/siege/ram_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Pierce>50</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <UnitMotion>
     <WalkSpeed op="mul">0.7</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>