Index: ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
@@ -102,6 +102,9 @@
 				"<element name='Pierce' a:help='Pierce damage strength'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='Crush' a:help='Crush damage strength'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
+				"<element name='PrepareTime' a:help='Time from the start of the attack command until the attack actually occurs (in milliseconds). This value relative to RepeatTime should closely match the \"event\" point in the actor&apos;s attack animation'>" +
+					"<data type='nonNegativeInteger'/>" +
+				"</element>" +
 				"<element name='RepeatTime' a:help='Time between attacks (in milliseconds). The attack animation will be stretched to match this time'>" + // TODO: it shouldn't be stretched
 					"<data type='positiveInteger'/>" +
 				"</element>" +
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -11,6 +11,7 @@
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -10,6 +10,7 @@
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
+      <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -7,7 +7,7 @@
       <Crush>0</Crush>
       <MaxRange>72.0</MaxRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
-      <PrepareTime>1000</PrepareTime>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>2.2</Spread>
     </Ranged>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -7,7 +7,7 @@
       <Crush>0</Crush>
       <MaxRange>28.0</MaxRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
-      <PrepareTime>1250</PrepareTime>
+      <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.8</Spread>
     </Ranged>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -8,7 +8,7 @@
       <MaxRange>76.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
-      <PrepareTime>1000</PrepareTime>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>1.8</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -8,7 +8,7 @@
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
-      <PrepareTime>1250</PrepareTime>
+      <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -10,6 +10,7 @@
       <Pierce>26.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>3500</RepeatTime>
       <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -10,6 +10,7 @@
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
+      <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
@@ -6,6 +6,7 @@
       <Pierce>0</Pierce>
       <Crush>150.0</Crush>
       <MaxRange>8.0</MaxRange>
+      <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -8,7 +8,7 @@
       <MaxRange>76</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>300</PrepareTime>
       <RepeatTime>500</RepeatTime>
       <Spread>1.2</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -8,7 +8,7 @@
       <MaxRange>28.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
-      <PrepareTime>1000</PrepareTime>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>1.1</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -11,6 +11,7 @@
       <Pierce>6.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -10,6 +10,7 @@
       <Pierce>5.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>900</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -10,6 +10,7 @@
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
+      <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -17,6 +17,7 @@
       <Pierce>2</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>3.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
@@ -6,6 +6,7 @@
       <Pierce>1</Pierce>
       <Crush>0</Crush>
       <MaxRange>4</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -11,6 +11,7 @@
       <Pierce>10.0</Pierce>
       <Crush>20.0</Crush>
       <MaxRange>6.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusCav>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
@@ -6,6 +6,7 @@
       <Pierce>1</Pierce>
       <Crush>0</Crush>
       <MaxRange>4</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
@@ -6,6 +6,7 @@
       <Pierce>1</Pierce>
       <Crush>0</Crush>
       <MaxRange>4</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
@@ -6,6 +6,7 @@
       <Pierce>1</Pierce>
       <Crush>0</Crush>
       <MaxRange>4</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -8,7 +8,7 @@
       <MaxRange>36.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>80.0</ProjectileSpeed>
-      <PrepareTime>1250</PrepareTime>
+      <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.3</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -10,6 +10,7 @@
       <Pierce>52.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>3500</RepeatTime>
       <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -10,6 +10,7 @@
      <Pierce>0.0</Pierce>
      <Crush>0.0</Crush>
      <MaxRange>6.0</MaxRange>
+     <PrepareTime>500</PrepareTime>
      <RepeatTime>1000</RepeatTime>
      <PreferredClasses datatype="tokens">Siege Human</PreferredClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -11,6 +11,7 @@
       <Pierce>0</Pierce>
       <Crush>50.0</Crush>
       <MaxRange>8.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -8,7 +8,7 @@
       <MaxRange>80</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
-      <PrepareTime>300</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>300</RepeatTime>
       <Spread>1.0</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -8,7 +8,7 @@
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
-      <PrepareTime>1000</PrepareTime>
+      <PrepareTime>600</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>1.0</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -11,6 +11,7 @@
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -10,6 +10,7 @@
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -10,6 +10,7 @@
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
@@ -6,6 +6,7 @@
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -13,7 +13,7 @@
       <MaxRange>1.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>28.0</ProjectileSpeed>
-      <PrepareTime>1250</PrepareTime>
+      <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.6</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -12,7 +12,7 @@
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>120.0</ProjectileSpeed>
-      <PrepareTime>1000</PrepareTime>
+      <PrepareTime>600</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>2.0</Spread>
     </Ranged>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -12,7 +12,7 @@
       <MaxRange>24.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>56.0</ProjectileSpeed>
-      <PrepareTime>1250</PrepareTime>
+      <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.3</Spread>
     </Ranged>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -12,7 +12,7 @@
       <MaxRange>48.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>60.0</ProjectileSpeed>
-      <PrepareTime>1000</PrepareTime>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>1.4</Spread>
     </Ranged>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
@@ -8,7 +8,7 @@
       <MaxRange>45.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>60.0</ProjectileSpeed>
-      <PrepareTime>2000</PrepareTime>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
       <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
@@ -6,6 +6,7 @@
       <Pierce>10.0</Pierce>
       <Crush>10.0</Crush>
       <MaxRange>8.0</MaxRange>
+      <PrepareTime>50</PrepareTime>
       <RepeatTime>100</RepeatTime>
     </Melee>
   </Attack>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
@@ -11,6 +11,7 @@
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">!SeaCreature</RestrictedClasses>
     </Melee>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
@@ -9,7 +9,7 @@
       <MinRange>8.0</MinRange>
       <Spread>2.5</Spread>
       <ProjectileSpeed>300.0</ProjectileSpeed>
-      <PrepareTime>5000</PrepareTime>
+      <PrepareTime>3000</PrepareTime>
       <RepeatTime>4000</RepeatTime>
       <Splash>
         <Shape>Linear</Shape>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
@@ -8,7 +8,7 @@
       <MaxRange>80.0</MaxRange>
       <MinRange>12.0</MinRange>
       <ProjectileSpeed>28.0</ProjectileSpeed>
-      <PrepareTime>5000</PrepareTime>
+      <PrepareTime>4000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Spread>6.0</Spread>
       <Splash>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
@@ -6,6 +6,7 @@
       <Pierce>0.0</Pierce>
       <Crush>150.0</Crush>
       <MaxRange>6.5</MaxRange>
+      <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <PreferredClasses datatype="tokens">Gates Structure</PreferredClasses>
     </Melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -6,6 +6,7 @@
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Infantry Cavalry Champion Structure Ship CitizenSoldier Hero</RestrictedClasses>
     </Melee>