Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json	(revision 23819)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json	(revision 23820)
@@ -1,30 +1,30 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_advanced.png",
 	"tooltip": "Advanced and Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
 	"modifications": [
 		{ "value": "Armour/Hack", "add": 1 },
 		{ "value": "Armour/Pierce", "add": 1 },
 		{ "value": "Armour/Crush", "add": 1 },
-		{ "value": "Attack/Capture/Capture", "add": 0.4 },
+		{ "value": "Attack/Capture/Capture", "add": 0.7 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
 		{ "value": "Health/Max", "multiply": 1.1 },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/HP", "add": 5, "affects": "Healer" },
 		{ "value": "Loot/food", "multiply": 1.2 },
 		{ "value": "Loot/wood", "multiply": 1.2 },
 		{ "value": "Loot/stone", "multiply": 1.2 },
 		{ "value": "Loot/metal", "multiply": 1.2 },
 		{ "value": "Loot/xp", "multiply": 1.2 },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
 		{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
 	],
 	"affects": ["Advanced Unit", "Elite Unit"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json	(revision 23819)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json	(revision 23820)
@@ -1,30 +1,30 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_elite.png",
 	"tooltip": "Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
 	"modifications": [
 		{ "value": "Armour/Hack", "add": 1 },
 		{ "value": "Armour/Pierce", "add": 1 },
 		{ "value": "Armour/Crush", "add": 1 },
-		{ "value": "Attack/Capture/Capture", "add": 0.4 },
+		{ "value": "Attack/Capture/Capture", "add": 0.8 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
 		{ "value": "Health/Max", "multiply": 1.1 },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/HP", "add": 5, "affects": "Healer" },
 		{ "value": "Loot/food", "multiply": 1.2 },
 		{ "value": "Loot/wood", "multiply": 1.2 },
 		{ "value": "Loot/stone", "multiply": 1.2 },
 		{ "value": "Loot/metal", "multiply": 1.2 },
 		{ "value": "Loot/xp", "multiply": 1.2 },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
 		{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
 	],
 	"affects": ["Elite Unit"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 23819)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 23820)
@@ -1,103 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>3</Hack>
     <Pierce>1</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
-      <Capture>2</Capture>
+      <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <Damage>
         <Hack>100.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Cost>
     <Population>1</Population>
     <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="4" depth="6"/>
     <Height>7.5</Height>
   </Footprint>
   <Health>
     <Max>160</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Soldier Cavalry</VisibleClasses>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Loot>
     <xp>130</xp>
     <food>10</food>
     <wood>5</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.meat>5</food.meat>
     </Rates>
     <Capacities>
       <food>20</food>
       <wood>20</wood>
       <stone>20</stone>
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>92</Range>
   </Vision>
 </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 23819)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 23820)
@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>10</Hack>
     <Pierce>20</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
-      <Capture>15</Capture>
+      <Capture>10</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
   </Attack>
   <Auras datatype="tokens">
     units/heroes/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>
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
     <Icon>technologies/laurel_wreath.png</Icon>
     <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>256x256/star.png</MainTexture>
         <MainTextureMask>256x256/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>
   <Vision>
     <Range>88</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 23819)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 23820)
@@ -1,127 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>2</Hack>
     <Pierce>4</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
-      <Capture>2</Capture>
+      <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}_civil_centre
       structures/{civ}_crannog
       structures/{civ}_military_colony
       structures/{civ}_house
       structures/{civ}_storehouse
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_corral
       structures/{civ}_outpost
       structures/wallset_palisade
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_defense_tower
       structures/{civ}_wallset_stone
       structures/{civ}_workshop
       structures/{civ}_fortress
       structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
     <BuildTime>10</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>80</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker Soldier Infantry</VisibleClasses>
     <GenericName>Infantry</GenericName>
     <Rank>Basic</Rank>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Promotion>
     <RequiredXp>100</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.25</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.75</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.5</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.5</metal.ore>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>