Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml	(revision 25655)
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>7</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>2.5</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Cavalry Archer</GenericName>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.85</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml	(revision 25655)
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
         <Pierce>20</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
         <Spread>2</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>30</wood>
       <metal>20</metal>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Cavalry Crossbowman</GenericName>
     <VisibleClasses datatype="tokens">Crossbowman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>3</wood>
     <metal>2</metal>
   </Loot>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml	(revision 25655)
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Pierce>18</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>4</Spread>
         <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Javelineer</VisibleClasses>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml	(revision 25655)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>14</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>1</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.85</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml	(revision 25655)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
         <Pierce>40</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
         <Spread>0.8</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Champion Cavalry Crossbowman</GenericName>
     <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml	(revision 25655)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Pierce>36</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>1.6</Spread>
         <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Champion Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml	(revision 25655)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>13.5</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>1</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <Turretable/>
   <UnitMotion>
     <WalkSpeed op="add">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml	(revision 25655)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
         <Pierce>40</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
         <Spread>0.8</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <GenericName>Champion Infantry Crossbowman</GenericName>
     <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <Turretable/>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml	(revision 25655)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Pierce>26</Pierce>
+        <Pierce>32</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>400</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>1.6</Spread>
         <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <GenericName>Champion Infantry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <Turretable/>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </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 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 25655)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>28</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>0.5</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.85</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml	(revision 25655)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
         <Pierce>80</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
         <Spread>0.4</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Hero Cavalry Crossbowman</GenericName>
     <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml	(revision 25655)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Pierce>60</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>0.8</Spread>
         <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Hero Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
 </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 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 25655)
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>27</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>0.5</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <Turretable/>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml	(revision 25655)
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
         <Pierce>80</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
         <Spread>0.4</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Hero Infantry Crossbowman</GenericName>
     <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <Turretable/>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml	(revision 25655)
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Pierce>50</Pierce>
+        <Pierce>62</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>600</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>400</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>0.8</Spread>
         <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Hero Infantry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <Turretable/>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml	(revision 25655)
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>6.7</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>2.5</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <food>50</food>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Archer</GenericName>
   </Identity>
   <Loot>
     <wood>5</wood>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>1</Hack>
         <Pierce>1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="add">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml	(revision 25655)
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
         <Pierce>20</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
         <Spread>2</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>30</wood>
       <metal>20</metal>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Infantry Crossbowman</GenericName>
     <VisibleClasses datatype="tokens">Crossbowman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>3</wood>
     <metal>2</metal>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>1</Hack>
         <Pierce>1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml	(revision 25655)
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Pierce>16</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>4</Spread>
         <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Infantry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Javelineer</VisibleClasses>
   </Identity>
   <Loot>
     <wood>5</wood>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>1</Hack>
         <Pierce>1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="add">2.4</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml	(revision 25654)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml	(revision 25655)
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Sling</AttackName>
       <Damage>
         <Pierce>11.5</Pierce>
         <Crush>1.1</Crush>
       </Damage>
       <MaxRange>45</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>90</Speed>
         <Spread>3</Spread>
         <Gravity>45</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <stone>30</stone>
       <wood>20</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Slinger</VisibleClasses>
     <GenericName>Slinger</GenericName>
   </Identity>
   <Loot>
     <stone>3</stone>
     <wood>2</wood>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>1</Hack>
         <Pierce>1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/sling_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>