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	(revision 19855)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml	(revision 19856)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
-      <Pierce>20.0</Pierce>
+      <Pierce>18.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>28.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>3.0</Spread>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <food>100</food>
       <wood>40</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
     <GenericName>Cavalry Skirmisher</GenericName>
     <History>The javelins thrown from a horse's back were probably 3 at most. The idea was to quickly advance with 3 in hand, then throw them all. After you had done that it was time to switch to your secondary weapon which was usually a spear or a sword. However, in the game these units will only have ranged attack.</History>
   </Identity>
   <UnitMotion>
     <WalkSpeed>17.5</WalkSpeed>
     <Run>
       <Speed>28.0</Speed>
     </Run>
   </UnitMotion>
 </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 19855)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml	(revision 19856)
@@ -1,43 +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>
+      <Pierce>36.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>1.0</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_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml	(revision 19855)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml	(revision 19856)
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
-      <Pierce>36.0</Pierce>
+      <Pierce>26.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>28.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>1.0</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Champion Skirmisher</GenericName>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>16.0</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
 </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 19855)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(revision 19856)
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>56.0</Pierce>
+      <Pierce>60.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>36.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>0.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <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_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 19855)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 19856)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
-      <Pierce>60.0</Pierce>
+      <Pierce>50.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>600</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>0.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <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_infantry_ranged_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml	(revision 19855)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml	(revision 19856)
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0</Hack>
-      <Pierce>18.0</Pierce>
+      <Pierce>16.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>24.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>3.0</Spread>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
     <GenericName>Skirmisher</GenericName>
     <History>These were the skirmishers. These lightly armored units would advance quickly, throw a hail of javelins and then retreat back to their ranks. Grab another spear and repeat. They would do well against any unit that wasn't wearing proper armor, but more poorly if they fought hand to hand vs a well armored unit. They didn't always have to throw their spears either. They used these light small spears in hand to hand similar to a quarterstaff. Also note that the development of the pilum was a key transition. The pilum was a weapon with a long steel shaft that would sink into a shield and was nearly impossible to remove. This rendered the shield useless. They also weighted and balanced them to make them accurately hit with a punch.</History>
   </Identity>
   <Loot>
     <wood>5</wood>
   </Loot>
   <UnitMotion>
     <WalkSpeed>13.5</WalkSpeed>
     <Run>
       <Speed>24.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>