Surprise.

100% brand new rebalance for every unit in the game, after lengthy
discussion with Enrique.

Some updated portraits.

A couple new tips.

Stan's "cataphract" mask and helmet (the helmet needs a texture).

This was SVN commit r15644.

binaries/data/mods/public/art/actors/props/units/heads/sele_cataphract_helmet.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Seleucid Cataphract helmet">
+      <mesh>props/helmet/cataphract_helmet.dae</mesh>
+      <textures>
+        <texture file="props/helmet/sele_romanized_visor_brass_2.png" name="baseTex"/>
+        <texture file="props/helmet/sele_romanized_norm.png" name="normTex"/>
+        <texture file="props/helmet/sele_romanized_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/props/units/heads/sele_cataphract_mask.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Seleucid Cataphract mask">
+      <mesh>props/helmet/cataphract_mask.dae</mesh>
+      <textures>
+        <texture file="props/helmet/cataphract_diffuse.png" name="baseTex"/>
+        <texture file="props/helmet/cataphract_norm.png" name="normTex"/>
+        <texture file="props/helmet/cataphract_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/units/seleucids/hero_antiochus_the_great_r.xml

@@ -13,7 +13,8 @@
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/ptol_romanized_crest_brass.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/sele_cataphract_helmet.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/sele_cataphract_mask.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_long.xml" attachpoint="r_hand"/>
       </props>
       <textures>

binaries/data/mods/public/gui/text/tips/pikemen.txt

@@ -0,0 +1,6 @@
+PIKEMEN
+- Heavily armored and slow. Low attack.
+
+- Used against cavalry for a 4x attack bonus or against other melee infantry to pin them them in place.
+
+- Available to: Macedonians, Seleucids, and Ptolemies.

binaries/data/mods/public/gui/text/tips/spartan_hoplites.txt

@@ -3,6 +3,6 @@ SPARTIATES
 
 - Champion Infantry available to the Spartans faction.
 
-- Long train time, but high armor and attack.
+- Use them to slaughter enemy cavalry or as a shock force to bolster your regular line infantry.
 
 - Use the 'Phalanx' formation for extra armor bonuses.

binaries/data/mods/public/gui/text/tips/spearmen.txt

@@ -0,0 +1,8 @@
+SPEARMEN
+- The basic melee infantry for every faction in the game.
+
+- Used against cavalry for a 2x attack bonus.
+
+- Decent hack attack and a good charge bonus make them good front line troops.
+
+- They are countered by ranged units and swordsmen, so support your spearmen with slingers or cavalry.

binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json

@@ -1,5 +1,5 @@
 {
-	"genericName": "Infantry Spear Fighting",
+	"genericName": "Infantry Spear Training",
 	"specificName": {
 		"hele": "Doratismos",
 		"mace": "Doratismos",
@@ -7,13 +7,13 @@
 		"athen": "Doratismos",
 		"theb": "Doratismos"
 	},
-	"description": "Spear fighting training increases damage of infantry spear units.",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 100},
+	"description": "Spear fighting training increases damage of spear-wielding infantry units.",
+	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
 	"requirements": {"all": [{"tech": "phase_city"}, {"any": [{"civ": "hele"},{"civ": "athen"},{"civ": "mace"},{"civ": "spart"},{"civ": "theb"}]}]},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "spear.png",
 	"researchTime": 40,
-	"tooltip": "Spearmen +2 hack attack.",
+	"tooltip": "Spear Infantry +2 hack attack.",
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
 	"affects": ["Infantry Spear"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"

binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json

@@ -1,12 +1,12 @@
 {
 	"genericName": "The Agoge",
-	"description": "Spartans were housed and trained from a young age to be superlative warriors and to endure any hardship a military life can give them.",
+	"description": "Spartans were housed and trained from age 6 to be superlative warriors and to endure any hardship a military life can give them.",
 	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 500},
 	"requirements": {"all": [{"tech": "phase_city"}, {"civ": "spart"}]},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "agoge.png",
 	"researchTime": 60,
-	"tooltip": "+25% health for spear infantry, but also +10% train time.",
+	"tooltip": "+25% health for Spear Infantry, but also +10% train time.",
 	"modifications": [
 		{"value": "Health/Max", "multiply": 1.25},
 		{"value": "Cost/BuildTime", "multiply": 1.1}

binaries/data/mods/public/simulation/data/technologies/persians/immortals.json

@@ -6,10 +6,10 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "fist_spear.png",
 	"researchTime": 60,
-	"tooltip": "Anusiya Champion Infantry -50% train time, but also -20 health.",
+	"tooltip": "Anusiya Champion Infantry -50% train time, but also -10 health.",
 	"modifications": [
 		{"value": "Cost/BuildTime", "multiply": 0.5},
-		{"value": "Health/Max", "add": -20}
+		{"value": "Health/Max", "add": -10}
 	],
 	"affects": ["Champion Infantry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"

binaries/data/mods/public/simulation/data/technologies/successors/special_hellenistic_metropolis.json

@@ -2,7 +2,7 @@
 	"genericName": "Hellenistic Metropolis",
 	"description": "Beginning with Alexander, the Hellenistic monarchs founded many cities throughout their empires, where Greek culture and art blended with local customs to create the motley Hellenistic civilization.",
 	"cost": {"food": 0, "wood": 0, "stone": 500, "metal": 500},
-	"requirements": {"all": [{"tech": "phase_city"}, {"any":[{"civ": "mace", "civ": "ptol", "civ": "sele"}]}]},
+	"requirements": {"all": [{"tech": "phase_city"}, {"any":[{"civ": "mace"},{"civ": "ptol"},{"civ": "sele"}]}]},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "statue_face_stone.png",
 	"researchTime": 60,

binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json

@@ -5,7 +5,7 @@
 	},
 	"description": "The now-extinct Nisian breed of horse was one of the largest and robust horses of ancient times. They were highly sought after by the Seleucids and Persians as both rider and mount gained heavier armor as time progressed.",
 	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
-	"requirements": {"all": [{"tech": "phase_city"}, {"civ": "sele"}]},
+	"requirements": {"all": [{"tech": "phase_city"}, {"any": [{"civ": "sele"},{"civ": "pers"}]}]},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "nisean_war_horses.png",
 	"researchTime": 60,

binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml

@@ -41,6 +41,7 @@
     </Entities>
     <Technologies datatype="tokens">
       pair_champ_02
+	  hellenes/attack_inf_spearfighting
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/hele_gymnasion.xml

@@ -42,6 +42,9 @@
       units/hele_champion_infantry_polis
       units/hele_champion_swordsman_polis
     </Entities>
+    <Technologies datatype="tokens">
+	  hellenes/attack_inf_spearfighting
+    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/hellenes/gymnasion.xml</Actor>

binaries/data/mods/public/simulation/templates/structures/iber_house.xml

@@ -5,7 +5,7 @@
     <Height>5.0</Height>
   </Footprint>
   <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>iber</Civ>

binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml

@@ -37,6 +37,7 @@
 	  upgrade_rank_elite_infantry
 	  upgrade_rank_advanced_cavalry
 	  upgrade_rank_elite_cavalry
+	  hellenes/attack_inf_spearfighting
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
+  <Cost>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Padgan</SpecificName>

binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml

@@ -21,7 +21,7 @@
     <GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssítion</SpecificName>
     <Classes datatype="tokens">
-	  Syssiton
+	  Syssition
 	</Classes>
     <Tooltip>Train Spartan heroes and Spartiate champion hoplites.</Tooltip>
     <History>The Syssítia were where full-blooded Spartans, even Spartan kings, were barracked and dined together.</History>
@@ -48,6 +48,7 @@
     <Technologies datatype="tokens">
       pair_champ_02
 	  hellenes/spartans_agoge
+	  hellenes/attack_inf_spearfighting
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml

@@ -13,7 +13,7 @@
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>60.0</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MinRange>12.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>

binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml

@@ -5,7 +5,7 @@
       <Hack>0.0</Hack>
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>57.0</MaxRange>
+      <MaxRange>48.0</MaxRange>
       <MinRange>8.0</MinRange>
       <ElevationBonus>15</ElevationBonus>
       <ProjectileSpeed>75.0</ProjectileSpeed>

binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml

@@ -3,10 +3,10 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>25.0</Pierce>
+      <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>85.0</MaxRange>
-      <MinRange>8.0</MinRange>
+      <MaxRange>60.0</MaxRange>
+      <MinRange>12.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>

binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml

@@ -56,7 +56,7 @@
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
-      <food.meat>5</food.meat>
+      <food.meat>2</food.meat>
     </Rates>
     <Capacities>
       <food>30</food>

binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml

@@ -2,12 +2,12 @@
 <Entity parent="template_unit_cavalry">
   <Armour>
     <Hack>1</Hack>
-    <Pierce>5</Pierce>
+    <Pierce>4</Pierce>
     <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
+      <Hack>8.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>

binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml

@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
+  <Armour>
+    <Hack>2</Hack>
+    <Pierce>4</Pierce>
+    <Crush>2</Crush>
+  </Armour>
   <Attack>
     <Melee>
+      <Hack>8.0</Hack>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Sword</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>2</Multiplier>
 		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Javelin</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
 	  </Bonuses>
     </Melee>
     <Charge>
+      <Hack>32.0</Hack>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Sword</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>2</Multiplier>
 		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Javelin</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
 	  </Bonuses>
     </Charge>
   </Attack>
   <Cost>
     <Resources>
-      <wood>55</wood>
+      <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Spear</VisibleClasses>
     <GenericName>Cavalry Spearman</GenericName>
     <History>This was the weapon of choice from horseback. This was the unit that would eventually evolve to the medieval knight (after heavy influence by the Sarmartians and their lances). Infantry were an easy kill; just ride them down and skewer them with your stick and its point on the end. As with all cavalry - it was only the rich and the nobles who were able to fight from horseback due to the cost of owning such a beast.</History>
-    <Tooltip>Counters: 2x vs. Swordsmen and Siege Weapons, 1.5x vs. Skirmishers.
-Countered by: Spearmen, Archers, Elephants.</Tooltip>
+    <Tooltip>Counters: 2x vs. Siege Weapons and Ranged Infantry.
+Countered by: Spear Infantry, Elephants, and Camels.</Tooltip>
   </Identity>
   <Loot>
     <xp>130</xp>

binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml

@@ -8,29 +8,29 @@
       <MaxRange>6.0</MaxRange>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Support</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
-		  <Classes>Infantry Bow</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Cavalry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 	  </Bonuses>
     </Melee>
     <Charge>
-      <Hack>30.0</Hack>
+      <Hack>25.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Support</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
-		  <Classes>Infantry Bow</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Cavalry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 	  </Bonuses>
     </Charge>
@@ -44,8 +44,8 @@
     <VisibleClasses datatype="tokens">Sword</VisibleClasses>
     <GenericName>Cavalry Swordsman</GenericName>
     <History>Fighting from horseback with a sword is a tricky thing to do. This required usage of a sword that was longer than the typical infantry sword. One needed a good reach to attack from the height of a horse. If you were without spear (the ideal weapon of choice) it was probably because you needed your hands free to do other tasks such as riding hard and fast. It wasn't uncommon for the men to dismount and attack from foot if they were armed with only a sword.</History>
-    <Tooltip>Counters: 2x vs. Archers, All Support Units, and Siege Weapons.
-Countered by: Spearmen, Cavalry Skirmishers, and Elephants.</Tooltip>
+    <Tooltip>Counters: 2x vs. Siege Weapons, 1.5x vs. Ranged Infantry and Ranged Cavalry.
+Countered by: Spear Infantry, Elephants, and Camels.</Tooltip>
   </Identity>
   <Loot>
     <xp>130</xp>

binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml

@@ -11,17 +11,25 @@
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>16.0</MaxRange>
-      <MinRange>20.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>25.0</ProjectileSpeed>
       <PrepareTime>900</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <PreferredClasses datatype="tokens">Organic</PreferredClasses>
-      <Spread>1.6</Spread>
+      <Spread>1.75</Spread>
       <Bonuses>
         <Hunting>
           <Classes>Animal</Classes>
           <Multiplier>2</Multiplier>
         </Hunting>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
       </Bonuses>
     </Ranged>
   </Attack>

binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml

@@ -3,39 +3,36 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>20.0</Pierce>
+      <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>56.0</MaxRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <Spread>2.0</Spread>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Spear</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Sword</Classes>
+		  <Classes>Infantry Melee</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
+		</BonusPrimary>
 	  </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <food>100</food>
-      <wood>60</wood>
+      <wood>50</wood>
     </Resources>
   </Cost>
   <Health>
-    <Max>150</Max>
+    <Max>130</Max>
   </Health>
   <Identity>
 	<VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Cavalry Archer</GenericName>
-    <History>A very rare unit in Part 1. It was used by the Persians, but it didn't gain much traction until the Parthians, Huns, Mongols, and other people of the nomadic steeps introduced them to Western Europe. This was the most effective unit on the battlefield for several hundred years until the well armored knight came along. Therefore, this unit will gain much more prominence in Part 2.</History>
-    <Tooltip>Counters: 2x vs. Spearmen, 1.5x vs. Swordsmen.
-Countered by: Skirmishers and Elephants.</Tooltip>
+    <History>A very rare unit in Empires Ascendant. It was used by the Persians, but it didn't gain much traction until the Parthians, Huns, Mongols, and other people of the nomadic steeps introduced them to Western Europe. This was the most effective unit on the battlefield for several hundred years until the well armored knight came along. Therefore, this unit will gain much more prominence in Part 2, Empires Besieged.</History>
+    <Tooltip>Counters: 1.5x vs. Melee Infantry.
+Countered by: Javelin Infantry, Sword Cavalry, and Elephants.</Tooltip>
   </Identity>
   <Loot>
     <xp>130</xp>

binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
+  <Armour>
+    <Hack>1</Hack>
+    <Pierce>2</Pierce>
+    <Crush>1</Crush>
+  </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>20.0</Pierce>
+      <Pierce>15.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>40</MaxRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
@@ -11,13 +16,17 @@
       <RepeatTime>2000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Bow</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Cavalry Sword</Classes>
+		  <Classes>Support</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
+		</BonusPrimary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
 	  </Bonuses>
     </Ranged>
   </Attack>
@@ -28,14 +37,14 @@
     </Resources>
   </Cost>
   <Health>
-    <Max>140</Max>
+    <Max>130</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
     <GenericName>Cavalry Skirmisher</GenericName>
-    <Rollover>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.</Rollover>
-    <Tooltip>Counters: 2x vs. Archers, 1.5x vs. Cavalry Swordsmen.
-Countered by: Spearmen, Elephants.</Tooltip>
+    <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>
+    <Tooltip>Counters: 1.5x vs. Support Units.
+Countered by: Javelin Infantry, Cavalry Swordsmen, and Elephants.</Tooltip>
   </Identity>
   <Loot>
     <xp>130</xp>

binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml

@@ -8,9 +8,9 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>30.0</Pierce>
+      <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>58</MaxRange>
+      <MaxRange>60</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
@@ -18,13 +18,17 @@
       <Spread>1.5</Spread>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Spear</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Sword</Classes>
+		  <Classes>Infantry Melee</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
+		</BonusPrimary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
 	  </Bonuses>
       <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
@@ -38,6 +42,8 @@
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer.</GenericName>
+    <Tooltip>Counters: 1.5x vs. Melee Infantry.
+Countered by: Javelin Infantry, Sword Cavalry, and Elephants.</Tooltip>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml

@@ -8,37 +8,41 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>30.0</Pierce>
+      <Pierce>25.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>56</MaxRange>
+      <MaxRange>52</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
-      <Spread>1.2</Spread>
+      <Spread>1.25</Spread>
       <Bonuses>
-        <BonusPrimary>
-          <Classes>Infantry Bow</Classes>
-          <Multiplier>2.0</Multiplier>
-        </BonusPrimary>
-        <BonusSecondary>
-          <Classes>Cavalry Sword</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusSecondary>
+		<BonusPrimary>
+		  <Classes>Support</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusPrimary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
       </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <food>100</food>
-      <wood>70</wood>
+      <wood>75</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Champion Cavalry Skirmisher</GenericName>
-    <Tooltip>Counters: 2x vs. Archers, 1.5x vs. Cavalry Swordsmen.
-Countered by: Spearmen and Elephants.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Support Units.
+Countered by: Skirmishers, Cavalry Swordsmen, and Elephants.</Tooltip>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml

@@ -2,25 +2,21 @@
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack>4</Hack>
-    <Pierce>6</Pierce>
-    <Crush>7</Crush>
+    <Pierce>7</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
-      <Hack>15.0</Hack>
+      <Hack>14.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Sword</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>2</Multiplier>
 		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Javelin</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
 		  <Multiplier>2.0</Multiplier>
@@ -36,20 +32,37 @@
 	  </Bonuses>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
+    <Charge>
+      <Hack>48.0</Hack>
+	  <Bonuses>
+		<BonusPrimary>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>2</Multiplier>
+		</BonusPrimary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
+	  </Bonuses>
+    </Charge>
   </Attack>
   <Cost>
-    <BuildTime>16</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
-    <Max>230</Max>
+    <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Champion Cavalry Spearman</GenericName>
-	<Tooltip>Counters: 2x vs. Swordsmen and Siege Weapons, 1.5x vs. Skirmishers.
-Countered by: Spearmen, Archers, and Elephants.</Tooltip>
+    <Tooltip>Counters: 2x vs. Siege Weapons and Ranged Infantry.
+Countered by: Spear Infantry, Elephants, and Camels.</Tooltip>
   </Identity>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml

@@ -7,19 +7,19 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>15.0</Hack>
+      <Hack>16.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Support</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
-		  <Classes>Infantry Bow</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Cavalry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
@@ -37,19 +37,19 @@
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
     <Charge>
-      <Hack>45.0</Hack>
+      <Hack>40.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Support</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
-		  <Classes>Infantry Bow</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Cavalry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
@@ -64,18 +64,18 @@
     </Charge>
   </Attack>
   <Cost>
-    <BuildTime>16</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
-    <Max>230</Max>
+    <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
-	<Tooltip>Counters: 2x vs. Archers, All Support Units, and Siege Weapons.
-Countered by: Spearmen, Cavalry Skirmishers, and Elephants.</Tooltip>
+    <Tooltip>Counters: 2x vs. Siege Weapons, 1.5x vs. Ranged Infantry and Ranged Cavalry.
+Countered by: Spear Infantry, Elephants, and Camels.</Tooltip>
   </Identity>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml

@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
-  <Attack>
-    <Melee>
-      <Hack>23.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
-    </Melee>
-    <Charge>
-      <Hack>46.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
-    </Charge>
-  </Attack>
   <Cost>
     <BuildTime>13</BuildTime>
     <Resources>

binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml

@@ -8,24 +8,24 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>15.0</Pierce>
+      <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>58</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
-      <Spread>1.25</Spread>
-      <Bonuses>
-        <BonusPrimary>
-          <Classes>Infantry Sword</Classes>
-          <Multiplier>2.0</Multiplier>
-        </BonusPrimary>
-        <BonusSecondary>
-          <Classes>Cavalry Spear</Classes>
-          <Multiplier>1.25</Multiplier>
-        </BonusSecondary>
-      </Bonuses>
+      <Spread>1.5</Spread>
+	  <Bonuses>
+		<BonusSwordsmen>
+		  <Classes>Infantry Sword</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusSwordsmen>
+		<BonusSpearmen>
+		  <Classes>Infantry Spear</Classes>
+		  <Multiplier>1.25</Multiplier>
+		</BonusSpearmen>
+	  </Bonuses>
       <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
@@ -43,8 +43,8 @@
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Archer</GenericName>
-	<Tooltip>Counters: 2x vs. Swordsmen, 1.25x vs. Cavalry Spearmen.
-Countered by: Cavalry Swordsmen and Cavalry Skirmishers.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Sword Infantry, 1.25x vs Spear Infantry.
+Countered by: Melee Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml

@@ -15,25 +15,21 @@
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
-      <Spread>1.0</Spread>
-      <Bonuses>
-        <BonusPrimary>
-          <Classes>Infantry Spear</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusPrimary>
-        <BonusSecondary>
-          <Classes>Cavalry Bow</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusSecondary>
-        <BonusElephants>
-          <Classes>Elephant</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusElephants>
-        <BonusChariots>
-          <Classes>Chariot</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusChariots>
-      </Bonuses>
+      <Spread>1.25</Spread>
+	  <Bonuses>
+		<BonusPrimary>
+		  <Classes>Infantry Spear</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusPrimary>
+		<BonusSecondary>
+		  <Classes>Cavalry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusSecondary>
+		<BonusElephants>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusElephants>
+	  </Bonuses>
       <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
@@ -51,8 +47,8 @@
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Champion Skirmisher</GenericName>
-	<Tooltip>Counters: 1.5x vs. Spearmen, Cavalry Archers, Elephants, and Chariots.
-Countered by: Swordsmen and Cavalry Spearmen.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Spear Infantry, Ranged Cavalry, and Elephants.
+Countered by: Melee Cavalry and Sword Infantry.</Tooltip>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml

@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack>15</Hack>
-    <Pierce>10</Pierce>
-    <Crush>10</Crush>
+    <Hack>10</Hack>
+    <Pierce>8</Pierce>
+    <Crush>8</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
       <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
-		<BonusCavalry>
+		<BonusCavMelee>
 		  <Classes>Cavalry</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusCavalry>
-		<BonusEles>
-		  <Classes>Elephant</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusEles>
+		  <Multiplier>4.0</Multiplier>
+		</BonusCavMelee>
 	  </Bonuses>
     </Melee>
+    <Charge>
+      <Hack>20.0</Hack>
+      <Pierce>0.0</Pierce>
+      <MaxRange>8.0</MaxRange>
+	  <Bonuses>
+		<BonusCharge>
+		  <Classes>Cavalry</Classes>
+		  <Multiplier>4.0</Multiplier>
+		</BonusCharge>
+	  </Bonuses>
+    </Charge>
   </Attack>
   <Cost>
     <Resources>
@@ -36,13 +41,11 @@
     <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
     <GenericName>Champion Pikeman</GenericName>
 	<History>Pike, or sarissa, infantry were developed by Philip II of Macedon based on the hoplite of the Greek city-states. The Macedonian pikemen, or phalangites, wielded an extra long spear (sarissa) approximatly 4 to 7 meters (13–21 feet) in length. Because of it's length and weight, the pike required the use of both hands, so the shield was slung over the pikeman's shoulder with a leather strap. Front-line pikemen of the age were generally highly-armored, while those in the back lines were lightly armored. Such pike-wielding troops were employed by numerous states, from Carthage to Syria, and were used to fix enemy infantry in position while the army's cavalry worked to turn the enemy flanks.</History>
-	<Tooltip>Classes: Champion Melee Infantry Spearman.
-Counters: 2x vs. All Cavalry, 1.5x vs. Elephants.
-Countered by: Swordsmen, Skirmishers, and Cavalry Archers.</Tooltip>
+    <Tooltip>Counters: 4x vs. All Cavalry.
+Countered by: Ranged Units and Sword Infantry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/syntagma
-      formations/testudo
     </Formations>
   </Identity>
   <Sound>

binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml

@@ -7,7 +7,7 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>15.0</Hack>
+      <Hack>14.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
@@ -20,7 +20,7 @@
 	  </Bonuses>
     </Melee>
     <Charge>
-      <Hack>30.0</Hack>
+      <Hack>35.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
@@ -42,9 +42,8 @@
   <Identity>
     <GenericName>Champion Spearman</GenericName>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
-	<Tooltip>Classes: Champion Melee Infantry Spearman.
-Counters: 2x vs. All Cavalry.
-Countered by: Skirmishers, Swordsmen, and Cavalry Archers.</Tooltip>
+    <Tooltip>Counters: 2x vs. All Cavalry.
+Countered by: Ranged Units and Sword Infantry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo

binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml

@@ -7,7 +7,7 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>15.0</Hack>
+      <Hack>16.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
@@ -15,7 +15,7 @@
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Spear</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Elephant</Classes>
@@ -24,15 +24,15 @@
 	  </Bonuses>
     </Melee>
     <Charge>
-      <Hack>30.0</Hack>
+      <Hack>32.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Spear</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Elephant</Classes>
@@ -50,8 +50,8 @@
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Champion Swordsman</GenericName>
-	<Tooltip>Counters: 2x vs. Spearmen, 1.5x vs. Elephants.
-Countered by: Archers, Cavalry Spearmen, and Cavalry Archers.</Tooltip>
+	<Tooltip>Counters: 1.5x vs. Infantry and Elephants.
+Countered by: Archer Infantry and Archer Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo

binaries/data/mods/public/simulation/templates/template_unit_dog.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>1</Hack>
+    <Hack>2</Hack>
     <Pierce>1</Pierce>
     <Crush>1</Crush>
   </Armour>
@@ -21,7 +21,7 @@
 	  <Bonuses>
 		<BonusSupport>
 		  <Classes>Support</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Multiplier>1.5</Multiplier>
 		</BonusSupport>
 		<BonusCav>
 		  <Classes>Cavalry</Classes>
@@ -43,11 +43,11 @@
 	  <Bonuses>
 		<BonusSupport>
 		  <Classes>Support</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Multiplier>1.5</Multiplier>
 		</BonusSupport>
 		<BonusCav>
 		  <Classes>Cavalry</Classes>
-		  <Multiplier>3.0</Multiplier>
+		  <Multiplier>1.5</Multiplier>
 		</BonusCav>
 		<BonusHunt>
 		  <Classes>Animal</Classes>
@@ -79,7 +79,7 @@
     <VisibleClasses datatype="tokens">Dog</VisibleClasses>
     <GenericName>War Dog</GenericName>
     <Rank>Basic</Rank>
-    <Tooltip>Counters: 3x vs. Cavalry, 2x vs. Support, 1.5x vs. Animals. Cannot attack structures.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Cavalry, Support Units, and Animals. Cannot attack structures.</Tooltip>
   </Identity>
   <Loot>
     <xp>130</xp>

binaries/data/mods/public/simulation/templates/template_unit_hero.xml

@@ -24,10 +24,10 @@
   </Identity>
   <Loot>
     <xp>400</xp>
-    <food>10</food>
-    <wood>0</wood>
-    <stone>0</stone>
-    <metal>25</metal>
+    <food>100</food>
+    <wood>100</wood>
+    <stone>100</stone>
+    <metal>100</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>

binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml

@@ -8,24 +8,28 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>40.0</Pierce>
+      <Pierce>30.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>60.0</MaxRange>
-      <MinRange>20.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
-      <Bonuses>
-        <BonusPrimary>
-          <Classes>Infantry Spear</Classes>
-          <Multiplier>2.0</Multiplier>
-        </BonusPrimary>
-        <BonusSecondary>
-          <Classes>Infantry Sword</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusSecondary>
-      </Bonuses>
+	  <Bonuses>
+		<BonusPrimary>
+		  <Classes>Infantry Melee</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusPrimary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
+	  </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
@@ -33,12 +37,14 @@
     <Resources>
       <food>100</food>
       <wood>100</wood>
-      <metal>100</metal>
+      <metal>50</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Cavalry Archer</GenericName>
+    <Tooltip>Counters: 1.5x vs. Melee Infantry.
+Countered by: Javelin Infantry, Sword Cavalry, and Elephants.</Tooltip>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml

@@ -8,23 +8,27 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>50.0</Pierce>
+      <Pierce>40.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>56</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
-      <Spread>1.2</Spread>
+      <Spread>1.25</Spread>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Bow</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Cavalry Sword</Classes>
+		  <Classes>Support</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
+		</BonusPrimary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
 	  </Bonuses>
     </Ranged>
   </Attack>
@@ -33,7 +37,7 @@
     <Resources>
       <food>100</food>
       <wood>100</wood>
-      <metal>75</metal>
+      <metal>50</metal>
     </Resources>
   </Cost>
   <Identity>

binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml

@@ -7,20 +7,16 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>30.0</Hack>
+      <Hack>16.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
+      <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Infantry Sword</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>2</Multiplier>
 		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Javelin</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
 		  <Multiplier>2.0</Multiplier>
@@ -36,10 +32,29 @@
 	  </Bonuses>
       <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Melee>
+    <Charge>
+      <Hack>64.0</Hack>
+	  <Bonuses>
+		<BonusPrimary>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>2</Multiplier>
+		</BonusPrimary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
+	  </Bonuses>
+    </Charge>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Hero Cavalry Spearman</GenericName>
+    <Tooltip>Counters: 2x vs. Siege Weapons and Ranged Infantry.
+Countered by: Spear Infantry, Elephants, and Camels.</Tooltip>
   </Identity>
   <Loot>
     <xp>500</xp>

binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml

@@ -7,19 +7,19 @@
   </Armour>
   <Attack>
     <Melee>
-     <Hack>30.0</Hack>
-     <Pierce>0.0</Pierce>
-     <Crush>0.0</Crush>
-     <MaxRange>6.0</MaxRange>
-     <RepeatTime>1000</RepeatTime>
+      <Hack>20.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
-		  <Classes>Support</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
-		  <Classes>Infantry Bow</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Classes>Cavalry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
@@ -34,11 +34,39 @@
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
-      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
+    <Charge>
+      <Hack>50.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <MinRange>0.0</MinRange>
+	  <Bonuses>
+		<BonusPrimary>
+		  <Classes>Infantry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusPrimary>
+		<BonusSecondary>
+		  <Classes>Cavalry Ranged</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusSecondary>
+		<ElephantStench>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</ElephantStench>
+		<CamelStench>
+		  <Classes>Camel</Classes>
+		  <Multiplier>0.5</Multiplier>
+		</CamelStench>
+	  </Bonuses>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+    </Charge>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
+    <Tooltip>Counters: 2x vs. Siege Weapons, 1.5x vs. Ranged Infantry and Ranged Cavalry.
+Countered by: Spear Infantry, Elephants, and Camels.</Tooltip>
   </Identity>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml

@@ -17,14 +17,14 @@
       <RepeatTime>2000</RepeatTime>
       <Spread>1.0</Spread>
 	  <Bonuses>
-		<BonusPrimary>
+		<BonusSwordsmen>
 		  <Classes>Infantry Sword</Classes>
-		  <Multiplier>3.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Cavalry Spear</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusSwordsmen>
+		<BonusSpearmen>
+		  <Classes>Infantry Spear</Classes>
 		  <Multiplier>1.25</Multiplier>
-		</BonusSecondary>
+		</BonusSpearmen>
 	  </Bonuses>
     </Ranged>
   </Attack>
@@ -37,6 +37,8 @@
   <Identity>
     <GenericName>Hero Archer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
+    <Tooltip>Counters: 1.5x vs. Sword Infantry, 1.25x vs Spear Infantry.
+Countered by: Melee Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml

@@ -22,17 +22,13 @@
 		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
-		  <Classes>Cavalry Bow</Classes>
+		  <Classes>Cavalry Ranged</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusElephants>
 		  <Classes>Elephant</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusElephants>
-		<BonusChariots>
-		  <Classes>Chariot</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusChariots>
+		</BonusElephants>
 	  </Bonuses>
     </Ranged>
   </Attack>
@@ -45,8 +41,8 @@
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Hero Skirmisher</GenericName>
-    <Tooltip>Counters: +50% Attack vs. Spearmen, Cavalry Archers and Chariots. +100% Attack vs Elephants.
-Countered by: Melee Cavalry.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Spear Infantry, Ranged Cavalry, and Elephants.
+Countered by: Melee Cavalry and Sword Infantry.</Tooltip>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml

@@ -7,30 +7,41 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
+      <Hack>15.0</Hack>
       <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
-		<BonusCavalry>
+		<BonusCavMelee>
 		  <Classes>Cavalry</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusCavalry>
+		  <Multiplier>4.0</Multiplier>
+		</BonusCavMelee>
 	  </Bonuses>
     </Melee>
+    <Charge>
+      <Hack>30.0</Hack>
+      <Pierce>0.0</Pierce>
+      <MaxRange>8.0</MaxRange>
+	  <Bonuses>
+		<BonusCharge>
+		  <Classes>Cavalry</Classes>
+		  <Multiplier>4.0</Multiplier>
+		</BonusCharge>
+	  </Bonuses>
+    </Charge>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
     <GenericName>Hero Pikeman</GenericName>
+    <Tooltip>Counters: 4x vs. All Cavalry.
+Countered by: Ranged Units and Sword Infantry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
-      formations/testudo
+      formations/syntagma
     </Formations>
   </Identity>
   <Loot>
-    <wood>10</wood>
-    <metal>10</metal>
+    <wood>100</wood>
+    <metal>100</metal>
   </Loot>
   <Stamina>
     <Max>1200</Max>
@@ -38,7 +49,7 @@
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
     <Run>
-      <Speed>17.5</Speed>
+      <Speed>13</Speed>
     </Run>
   </UnitMotion>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml

@@ -7,7 +7,7 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>30.0</Hack>
+      <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
@@ -19,12 +19,25 @@
 		</BonusCavMelee>
 	  </Bonuses>
     </Melee>
+    <Charge>
+      <Hack>50.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <MinRange>0.0</MinRange>
+	  <Bonuses>
+		<BonusCavMelee>
+		  <Classes>Cavalry</Classes>
+		  <Multiplier>2.0</Multiplier>
+		</BonusCavMelee>
+	  </Bonuses>
+    </Charge>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Hero Spearman</GenericName>
     <Tooltip>Counters: 2x vs. All Cavalry.
-Countered by: Skirmishers, Swordsmen, and Cavalry Archers.</Tooltip>
+Countered by: Ranged Units and Sword Infantry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
@@ -37,7 +50,7 @@ Countered by: Skirmishers, Swordsmen, and Cavalry Archers.</Tooltip>
   <UnitMotion>
     <WalkSpeed>7.5</WalkSpeed>
     <Run>
-      <Speed>18.75</Speed>
+      <Speed>15</Speed>
     </Run>
   </UnitMotion>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml

@@ -7,32 +7,45 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>30.0</Hack>
+      <Hack>25.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
-		<BonusPrimary>
-		  <Classes>Infantry Spear</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Javelin</Classes>
+		<BonusAllInfantry>
+		  <Classes>Infantry</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
-		<BonusTertiary>
+		</BonusAllInfantry>
+		<BonusElephant>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusTertiary>
+		</BonusElephant>
 	  </Bonuses>
     </Melee>
+    <Charge>
+      <Hack>50.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <MinRange>0.0</MinRange>
+	  <Bonuses>
+		<BonusAllInfantry>
+		  <Classes>Infantry</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusAllInfantry>
+		<BonusElephant>
+		  <Classes>Elephant</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusElephant>
+	  </Bonuses>
+    </Charge>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Swordsman</GenericName>
-    <Tooltip>Counters: 2x vs. Spearmen, 1.5x vs. Skirmishers and Elephants.
-Countered by: Archers, Cavalry Archers.</Tooltip> 
+	<Tooltip>Counters: 1.5x vs. Infantry and Elephants.
+Countered by: Archer Infantry and Archer Cavalry.</Tooltip>
   </Identity>
   <UnitMotion>
     <WalkSpeed>8.0</WalkSpeed>
@@ -42,7 +55,4 @@ Countered by: Archers, Cavalry Archers.</Tooltip>
       <RangeMin>8.0</RangeMin>
     </Run>
   </UnitMotion>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>8</Pierce>
-    <Crush>8</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
@@ -13,7 +13,7 @@
 	  <Bonuses>
 		<BonusCavMelee>
 		  <Classes>Cavalry</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Multiplier>4.0</Multiplier>
 		</BonusCavMelee>
 	  </Bonuses>
     </Melee>
@@ -24,7 +24,7 @@
 	  <Bonuses>
 		<BonusCharge>
 		  <Classes>Cavalry</Classes>
-		  <Multiplier>2.0</Multiplier>
+		  <Multiplier>4.0</Multiplier>
 		</BonusCharge>
 	  </Bonuses>
     </Charge>
@@ -38,8 +38,8 @@
     <VisibleClasses datatype="tokens">Spear Pike</VisibleClasses>
     <GenericName>Pikeman</GenericName>
 	<History>Pike, or sarissa, infantry were developed by Philip II of Macedon based on the hoplite of the Greek city-states. The Macedonian pikemen, or phalangites, wielded an extra long spear (sarissa) approximatly 4 to 7 meters (13–21 feet) in length. Because of it's length and weight, the pike required the use of both hands, so the shield was slung over the pikeman's shoulder with a leather strap. Front-line pikemen of the age were generally highly-armored, while those in the back lines were lightly armored. Such pike-wielding troops were employed by numerous states, from Carthage to Syria, and were used to fix enemy infantry in position while the army's cavalry worked to turn the enemy flanks.</History>
-    <Tooltip>Counters: 2x vs. All Cavalry.
-Countered by: Skirmishers, Swordsmen, Cavalry Archers.</Tooltip>
+    <Tooltip>Counters: 4x vs. All Cavalry.
+Countered by: Ranged Units and Sword Infantry.</Tooltip>
     <Formations datatype="tokens">
       formations/syntagma
     </Formations>

binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>1</Pierce>
+    <Hack>3</Hack>
+    <Pierce>2</Pierce>
     <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
+      <Hack>8.0</Hack>
       <Pierce>0.0</Pierce>
 	  <Bonuses>
-		<BonusCavMelee>
+		<BonusCavalry>
 		  <Classes>Cavalry</Classes>
 		  <Multiplier>2.0</Multiplier>
-		</BonusCavMelee>
+		</BonusCavalry>
 	  </Bonuses>
     </Melee>
     <Charge>
@@ -35,9 +35,9 @@
   <Identity>
     <VisibleClasses datatype="tokens">Spear</VisibleClasses>
     <GenericName>Spearman</GenericName>
-    <History>Probably one of the most primitive units in the game. Fighting with a sharp object at the end of the pole didn't require a lot of technology to develop. It also allowed the human to distance themselves from their attacker. As time passed the spears got longer and longer. Started with a fighting style similar to using a quarterstaff, then to using them in numbers as a 'pin cushion' vs. humans (sarissa in a phalanx). Later it was developed to combat cavalry. During the medieval period it evolved to the pike. These units tended to be armored as heavily as possible.</History>
+    <History>Probably one of the most primitive units in the game. Fighting with a sharp object at the end of a pole didn't require a lot of technology to develop. It also allowed the human to distance themselves from their attacker. As time passed the spears got longer and longer. Started with a fighting style similar to using a quarterstaff, then to using them in numbers as a 'pin cushion' vs. humans (sarissa in a phalanx). Later it was developed to combat cavalry. During the medieval period it evolved to the pike. These units tended to be armored as heavily as possible.</History>
     <Tooltip>Counters: 2x vs. All Cavalry.
-Countered by: Skirmishers, Swordsmen, Cavalry Archers.</Tooltip>
+Countered by: Ranged Units and Sword Infantry.</Tooltip>
   </Identity>
   <Loot>
     <wood>5</wood>

binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml

@@ -3,56 +3,49 @@
   <Armour>
     <Hack>3</Hack>
     <Pierce>1</Pierce>
-    <Crush>1</Crush>
+    <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
       <Pierce>0.0</Pierce>
 	  <Bonuses>
-		<BonusPrimary>
-		  <Classes>Infantry Spear</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Javelin</Classes>
+		<BonusAllInfantry>
+		  <Classes>Infantry</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
-		<BonusTertiary>
+		</BonusAllInfantry>
+		<BonusElephant>
 		  <Classes>Elephant</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusTertiary>
+		  <Multiplier>1.5</Multiplier>
+		</BonusElephant>
 	  </Bonuses>
     </Melee>
     <Charge>
       <Hack>20.0</Hack>
 	  <Bonuses>
-		<BonusPrimary>
-		  <Classes>Infantry Spear</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Infantry Javelin</Classes>
+		<BonusAllInfantry>
+		  <Classes>Infantry</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusSecondary>
-		<BonusTertiary>
+		</BonusAllInfantry>
+		<BonusElephant>
 		  <Classes>Elephant</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusTertiary>
+		  <Multiplier>1.5</Multiplier>
+		</BonusElephant>
 	  </Bonuses>
     </Charge>
   </Attack>
   <Cost>
     <Resources>
-      <metal>60</metal>
+      <food>60</food>
+	  <metal>40</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Sword</VisibleClasses>
     <GenericName>Swordsman</GenericName>
     <History>Weapon is basically a developed sickle. Probably from the club, to the axe, to the sickle to the sword. It was the Romans who used them to combat the long range of the sarissa. Their spears were so long they had to use two hands to wield them. In a formation they were almost impossible to maneuver. If flanked, they were easily cut down by a sword as demonstrated by the Romans at the battle of Cynoscephalae. Generally swordsmen were well armored, had shields, and tended to be nobles. A good sword was an expensive weapon.</History>
-    <Tooltip>Counters: 2x vs. Spearmen, 1.5x vs. Skirmishers, and 1.25x vs. Elephants.
-Countered by: Archers, Cavalry Spearmen, and Cavalry Archers.</Tooltip>
+	<Tooltip>Counters: 1.5x vs. Infantry and Elephants.
+Countered by: Archer Infantry and Archer Cavalry.</Tooltip>
   </Identity>
   <Loot>
     <metal>5</metal>

binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml

@@ -10,7 +10,7 @@
       <ProjectileSpeed>28.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
-      <Spread>1.6</Spread>
+      <Spread>2.0</Spread>
       <Bonuses>
         <Hunting>
           <Classes>Animal</Classes>

binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml

@@ -8,22 +8,23 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>15.0</Pierce>
+      <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>50.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <Spread>2.0</Spread>
 	  <Bonuses>
-		<BonusPrimary>
+		<BonusSwordsmen>
 		  <Classes>Infantry Sword</Classes>
-		  <Multiplier>2.0</Multiplier>
-		</BonusPrimary>
-		<BonusSecondary>
-		  <Classes>Cavalry Spear</Classes>
+		  <Multiplier>1.5</Multiplier>
+		</BonusSwordsmen>
+		<BonusSpearmen>
+		  <Classes>Infantry Spear</Classes>
 		  <Multiplier>1.25</Multiplier>
-		</BonusSecondary>
+		</BonusSpearmen>
 	  </Bonuses>
     </Ranged>
   </Attack>
@@ -37,8 +38,8 @@
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Archer</GenericName>
     <History>They tended to be lightly armored. They usually only participated in the first stage of a battle, sending a volley of arrows raining down the enemy. Of course they would have to stop shooting once the melee units closed in. This means their job was largely over once the 'true battle' was underway. They spent hours training with a bow, but if you were hit by an arrow it was more likely an act of random chance than being specifically targeted by an archer.</History>
-    <Tooltip>Counters: 2x vs. Swordsmen, 1.25x vs. Cavalry Spearmen.
-Countered by: Cavalry Swordsmen, Cavalry Skirmishers.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Sword Infantry, 1.25x vs Spear Infantry.
+Countered by: Melee Cavalry.</Tooltip>
   </Identity>
   <Loot>
     <wood>6</wood>

binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml

@@ -8,44 +8,42 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>20.0</Pierce>
+      <Pierce>15.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>36</MaxRange>
+      <MaxRange>40</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <Spread>1.75</Spread>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Spear</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
-		  <Classes>Cavalry Bow</Classes>
+		  <Classes>Cavalry Ranged</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusElephants>
 		  <Classes>Elephant</Classes>
-		  <Multiplier>1.25</Multiplier>
+		  <Multiplier>1.5</Multiplier>
 		</BonusElephants>
-		<BonusChariots>
-		  <Classes>Chariot</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusChariots>
 	  </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
-      <wood>50</wood>
+      <food>40</food>
+	  <wood>60</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>
-    <Tooltip>Counters: 1.5x vs. Spearmen and Cavalry Archers, 1.25x vs. Elephants and Chariots.
-Countered by: Swordsmen, Cavalry Spearmen.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Spear Infantry, Ranged Cavalry, and Elephants.
+Countered by: Melee Cavalry and Sword Infantry.</Tooltip>
   </Identity>
   <Loot>
     <wood>5</wood>

binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml

@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
     <Hack>1</Hack>
-    <Pierce>2</Pierce>
+    <Pierce>1</Pierce>
     <Crush>1</Crush>
   </Armour>
   <Attack>
@@ -10,21 +10,21 @@
       <Hack>0.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>48.0</MaxRange>
+      <MaxRange>40.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>60.0</ProjectileSpeed>
       <PrepareTime>900</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <Spread>1.5</Spread>
 	  <Bonuses>
-		<BonusInfantryRanged>
+		<BonusPrimary>
 		  <Classes>Infantry Ranged</Classes>
 		  <Multiplier>1.5</Multiplier>
-		</BonusInfantryRanged>
-		<BonusInfantryMelee>
-		  <Classes>Infantry Melee</Classes>
+		</BonusPrimary>
+		<BonusSecondary>
+		  <Classes>Sword Infantry</Classes>
 		  <Multiplier>1.25</Multiplier>
-		</BonusInfantryMelee>
+		</BonusSecondary>
 	  </Bonuses>
     </Ranged>
   </Attack>
@@ -36,8 +36,8 @@
   <Identity>
     <VisibleClasses datatype="tokens">Sling</VisibleClasses>
     <GenericName>Slinger</GenericName>
-    <Tooltip>Counters: 1.5x vs. Ranged Infantry, 1.25x vs. Melee Infantry.
-Countered by: Cavalry.</Tooltip>
+    <Tooltip>Counters: 1.5x vs. Ranged Infantry, 1.25x vs. Sword Infantry.
+Countered by: Melee Cavalry.</Tooltip>
   </Identity>
   <Loot>
     <xp>75</xp>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml

@@ -44,8 +44,8 @@
   </Health>
   <Identity>
     <GenericName>Light Warship</GenericName>
-    <Tooltip>Classes: Mechanical Warship Light Ranged.</Tooltip>
-    <Classes datatype="tokens">Warship Light Bow Ranged</Classes>
+    <Tooltip>Light Warship, good for harassing enemy coastlines and trade routes.</Tooltip>
+    <VisibleClasses datatype="tokens">Warship Light Bow Ranged</VisibleClasses>
 	<RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <ResourceGatherer disable=""/>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml

@@ -32,9 +32,8 @@
   </Health>
   <Identity>
     <GenericName>Fire Ship</GenericName>
-    <Classes datatype="tokens">Warship Fireship Melee</Classes>
-    <Tooltip>Classes: Mechanical Warship Fireship Melee.
-Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly.</Tooltip>
+    <VisibleClasses datatype="tokens">Warship Fireship Melee</VisibleClasses>
+    <Tooltip>Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly.</Tooltip>
 	<RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml

@@ -30,9 +30,8 @@
   </GarrisonHolder>
   <Identity>
     <GenericName>Fishing Boat</GenericName>
-    <Tooltip>Classes: Mechanical Ship FishingBoat.
-Fish the waters for Food. Garrison a support or infantry unit inside to boost fishing rate.</Tooltip>
-    <Classes datatype="tokens">FishingBoat</Classes>
+    <Tooltip>Fish the waters for Food. Garrison a support or infantry unit inside to boost fishing rate.</Tooltip>
+    <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
   </Identity>
   <Obstruction>
     <Unit radius="2.0"/>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml

@@ -21,13 +21,13 @@
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
-    <Max>400</Max>
+    <Max>300</Max>
   </Health>
   <Identity>
     <GenericName>Merchantman</GenericName>
-    <Tooltip>Classes: Mechanical Ship Trader.
+    <Tooltip>
 Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
-    <Classes datatype="tokens">Trader</Classes>
+    <VisibleClasses datatype="tokens">Trader</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Formations disable=""/>
   </Identity>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml

@@ -48,14 +48,13 @@
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
-    <Max>2000</Max>
+    <Max>1200</Max>
   </Health>
   <Identity>
     <GenericName>Heavy Warship</GenericName>
-    <Tooltip>Classes: Mechanical Warship Heavy Ranged Melee.
-Garrison with catapults to increase ranged fire power.
+    <Tooltip>Garrison with catapults to increase ranged fire power.
 Secondary Attack: Ramming.</Tooltip>
-    <Classes datatype="tokens">Warship Heavy Ranged</Classes>
+    <VisibleClasses datatype="tokens">Warship Heavy Ranged NavalSiege</VisibleClasses>
 	<RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Sound>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml

@@ -40,13 +40,13 @@
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
-    <Max>1400</Max>
+    <Max>1000</Max>
   </Health>
   <Identity>
     <GenericName>Medium Warship</GenericName>
-    <Tooltip>Classes: Mechanical Warship Medium Ranged Melee.
+    <Tooltip>Medium Warship, good for naval combat and transporting troops.
 Secondary Attack: Ramming.</Tooltip>
-    <Classes datatype="tokens">Warship Medium Ranged</Classes>
+    <VisibleClasses datatype="tokens">Warship Medium Ranged Ram</VisibleClasses>
 	<RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <ResourceGatherer disable=""/>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml

@@ -35,8 +35,8 @@
   <Cost>
     <BuildTime>18</BuildTime>
     <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
+      <wood>80</wood>
+      <metal>80</metal>
     </Resources>
     <Population>2</Population>
   </Cost>
@@ -45,11 +45,11 @@
     <Height>2.0</Height>
   </Footprint>
   <Health>
-    <Max>120</Max>
+    <Max>150</Max>
   </Health>
   <Identity>
     <GenericName>Bolt Shooter</GenericName>
-	<Classes datatype="tokens">BoltShooter Ranged</Classes>
+    <VisibleClasses datatype="tokens">Ranged BoltShooter</VisibleClasses>
     <Tooltip>Classes: Siege Ranged BoltShooter.
 Counters: 2x vs. Infantry and Cavalry units. Also useful vs. Buildings.
 Countered by: Melee Cavalry.</Tooltip>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml

@@ -2,7 +2,7 @@
 <Entity parent="template_unit_mechanical_siege">
   <Armour>
     <Hack>2</Hack>
-    <Pierce>30</Pierce>
+    <Pierce>20</Pierce>
     <Crush>10</Crush>
   </Armour>
   <Attack>
@@ -39,7 +39,7 @@
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
-      <wood>200</wood>
+      <wood>150</wood>
       <stone>100</stone>
     </Resources>
   </Cost>
@@ -48,12 +48,13 @@
     <Height>4.5</Height>
   </Footprint>
   <Health>
-    <Max>150</Max>
+    <Max>180</Max>
   </Health>
   <Identity>
     <GenericName>Siege Catapult</GenericName>
-    <Tooltip>Classes: Siege Ranged Catapult.
-Counters: Structures and Massed Infantry. Causes splash damage.
+    <VisibleClasses datatype="tokens">Ranged Catapult</VisibleClasses>
+    <Tooltip>Area (Splash) Damage Effect: 10 meters from impact. Can cause Friendly Fire.
+Counters: Structures and Massed Infantry. 1.25x vs. Fortresses.
 Countered by: Melee Cavalry.</Tooltip>
     <Classes datatype="tokens">Ranged Catapult</Classes>
   </Identity>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>30</Pierce>
     <Crush>10</Crush>
   </Armour>
@@ -24,7 +24,7 @@
     <Charge>
       <Hack>0.0</Hack>
       <Pierce>0.0</Pierce>
-      <Crush>100.0</Crush>
+      <Crush>120.0</Crush>
       <MaxRange>6.5</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
@@ -54,13 +54,12 @@
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
-    <Max>200</Max>
+    <Max>250</Max>
   </Health>
   <Identity>
     <GenericName>Battering Ram</GenericName>
-    <Classes datatype="tokens">Melee Ram</Classes>
-    <Tooltip>Classes: Siege Melee Ram.
-Counters: 1.5x vs. Gates. Generally good vs. Buildings.
+    <VisibleClasses datatype="tokens">Melee Ram</VisibleClasses>
+    <Tooltip>Counters: 1.5x vs. Gates. Generally good vs. Buildings.
 Countered by: Melee Cavalry. Cannot attack organic units (but can attack other siege and ships).</Tooltip>
   </Identity>
   <Sound>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml

@@ -56,11 +56,10 @@
   </Health>
   <Identity>
     <GenericName>Siege Tower</GenericName>
-	<Classes datatype="tokens">Ranged SiegeTower</Classes>
-    <Tooltip>Classes: Ranged SiegeTower.
-Garrison up to 20 infantry inside to increase arrow count from 0 to 10.
+	<VisibleClasses datatype="tokens">Ranged SiegeTower</VisibleClasses>
+    <Tooltip>Garrison up to 20 infantry inside to increase arrow count from 0 to 10.
 Counters: 2x vs. Buildings.
-Countered by: Melee Cavalry.</Tooltip>
+Countered by: Melee Cavalry, Siege.</Tooltip>
   </Identity>
   <Obstruction>
     <Unit radius="4.0"/>

binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml

@@ -47,6 +47,7 @@
     <Resources>
       <food>50</food>
     </Resources>
+    <BuildTime>10</BuildTime>
   </Cost>
   <Health>
     <Max>50</Max>

binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml

@@ -8,11 +8,11 @@
   <Attack>
     <Ranged>
       <MaxRange>44</MaxRange>
-      <Spread>1.3</Spread>
+      <Spread>1.5</Spread>
     </Ranged>
   </Attack>
   <Health>
-    <Max>150</Max>
+    <Max>140</Max>
   </Health>
   <Identity>
     <Rank>Advanced</Rank>
@@ -23,12 +23,6 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <UnitMotion>
-    <WalkSpeed>13.5</WalkSpeed>
-    <Run>
-      <Speed>27.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/athenians/cavalry_javelinist_a.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml

@@ -8,11 +8,11 @@
   <Attack>
     <Ranged>
       <MaxRange>48</MaxRange>
-      <Spread>1.0</Spread>
+      <Spread>1.25</Spread>
     </Ranged>
   </Attack>
   <Health>
-    <Max>160</Max>
+    <Max>150</Max>
   </Health>
   <Identity>
     <Rank>Elite</Rank>
@@ -21,12 +21,6 @@
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <UnitMotion>
-    <WalkSpeed>13.0</WalkSpeed>
-    <Run>
-      <Speed>26.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/athenians/cavalry_javelinist_e.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml

@@ -10,7 +10,7 @@
       <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>25.0</Hack>
+      <Hack>30.0</Hack>
     </Charge>
   </Attack>
   <Health>
@@ -25,12 +25,6 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <UnitMotion>
-    <WalkSpeed>12.5</WalkSpeed>
-    <Run>
-      <Speed>25.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/athenians/cavalry_swordsman_a.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml

@@ -10,7 +10,7 @@
       <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>30.0</Hack>
+      <Hack>35.0</Hack>
     </Charge>
   </Attack>
   <Health>
@@ -23,12 +23,6 @@
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <UnitMotion>
-    <WalkSpeed>12.0</WalkSpeed>
-    <Run>
-      <Speed>24.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/athenians/cavalry_swordsman_e.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml

@@ -4,6 +4,7 @@
     <Civ>athen</Civ>
 	<GenericName>Athenian Marine</GenericName>
     <SpecificName>Épibatēs Athēnaïkós</SpecificName>
+	<VisibleClasses datatype="tokens">Marine</VisibleClasses>
     <History>.</History>
     <Icon>units/athen_champion_marine.png</Icon>
 	<RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>