A bunch of updated portraits. Thinking of going this color-coded route: Blue for citizen-soldiers. Red for champions and heroes. Maybe green for mercenary soldiers.

Tweaked a couple footprints.

This was SVN commit r14635.

binaries/data/mods/public/art/actors/units/athenians/iphicrates.xml

@@ -24,7 +24,9 @@
         <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
         <prop actor="props/units/shields/hele_round_xenophon.xml" attachpoint="shield"/>
       </props>
-      <textures><texture file="skeletal/hele_xenophon.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_xenophon.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -56,5 +58,5 @@
       </props>
     </variant>
   </group>
-  <material>playercolor_spec.xml</material>
+  <material>player_trans.xml</material>
 </actor>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="16.5" depth="16.5"/>
+    <Square width="18" depth="19"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
@@ -10,7 +10,7 @@
     <History>Although there must have been many small farms as well, when the Carthaginians expanded into the hinterland, most farms and orchardist establishments were created by the wealthy segment of society that became known as the landowners, and the resulting estates were mostly worked by ?almost enslaved? Liby-Phoenicians, Numidians, and whomever they could get.</History>
   </Identity>
   <Obstruction>
-    <Static width="16.5" depth="16.5"/>
+    <Static width="16.0" depth="17"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/farmstead.xml</Actor>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
-    <Square width="24.0" depth="22.0"/>
+    <Square width="24.0" depth="20.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
@@ -13,7 +13,7 @@
     <History>As Rome grew more and more affluent, many of the rich senators built lavish villas throughout Italy. Most of them emulated earlier Hellenistic examples; remains can be seen even today at Pompeii.</History>
   </Identity>
   <Obstruction>
-    <Static width="20.0" depth="18.0"/>
+    <Static width="20.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/romans/farmstead.xml</Actor>

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

@@ -47,7 +47,7 @@
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
-      <metal>80</metal>
+      <metal>75</metal>
     </Resources>
   </Cost>
   <Identity>

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

@@ -5,7 +5,7 @@
 	<GenericName>Athenian Marine</GenericName>
     <SpecificName>Épibatēs Athēnaïkós</SpecificName>
     <History>.</History>
-    <Icon>units/hele_champion_ranged_polis.png</Icon>
+    <Icon>units/athen_champion_marine.png</Icon>
 	<RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
   </Identity>
   <UnitMotion>

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

@@ -22,7 +22,7 @@
     <GenericName>Athenian Hoplite</GenericName>
 	<SpecificName>Hoplī́tēs Athēnaïkós</SpecificName>
     <History>Hoplites were the very symbol of Hellenic prestige and citizenship, armed with a spear and a large round bronze-coated shield known as an aspis. Armor was heavy, with bronze helmets and a cuirass of either bronze or linen, in addition to greaves. Hoplites fought in a tight formation called a phalanx, guarding each other with their shields while they attacked the enemy with their 2.5 meter spear or short iron sword.</History>
-    <Icon>units/hele_infantry_spearman.png</Icon>
+    <Icon>units/athen_infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen_infantry_spearman_a</Entity>

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

@@ -10,8 +10,8 @@
   <Identity>
     <Civ>mace</Civ>
 	<SelectionGroupName>units/mace_cavalry_javelinist_b</SelectionGroupName>
-	<GenericName>Odrysian Cavalry</GenericName>
-    <SpecificName>Hippeus Odrysi</SpecificName>
+	<GenericName>Odrysian Skirmish Cavalry</GenericName>
+    <SpecificName>Hippakontistès Odrysón</SpecificName>
     <History>Thracian cavalry skirmishers were recruited from the Odrysian tribe of central Thrace.</History>
     <Icon>units/mace_cavalry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>

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

@@ -14,17 +14,10 @@
       <MaxRange>6.0</MaxRange>
     </Charge>
   </Attack>
-  <Cost>
-    <Resources>
-      <metal>20</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>mace</Civ>
 	<GenericName>Companion Cavalry</GenericName>
     <SpecificName>Hetaîros</SpecificName>
-    <Tooltip>Macedonian Champion Cavalry.
-Counters Cavalry and Archers. Countered by Champion Units.</Tooltip>
     <History>The Hetairoi, or Companion cavalry, were a preferred general stand in Macedonian armies. Macedonian noblemen made up this elite cavalry unit, which was key to victory for Macedonian kings starting with Philip II, who increased their number from 600 to several thousand.</History>
     <Icon>units/hele_champion_cavalry_mace.png</Icon>
   </Identity>

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

@@ -4,7 +4,7 @@
     <Civ>sele</Civ>
 	<GenericName>Silver Shield Pikeman</GenericName>
     <SpecificName>Phalangitès Argyraspis</SpecificName>
-    <History>The 'Silver Shields' pike corps made up the infantry arm of the Royal Agema, or "guards." They were the élite of the traditional Seleucid and Macedonian infantry.</History>
+    <History>The 'Silver Shields' pike corps made up the infantry arm of the Royal Agema, or "guards." They were the élite infantry of the traditional Seleucid and Macedonian armies.</History>
     <Icon>units/sele_champion_infantry_pikeman.png</Icon>
     <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
   </Identity>

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

@@ -22,7 +22,7 @@
 Counters: 2x vs. Spearmen, 1.5x vs. Elephants. 
 Countered by: Archers, Cavalry Spearmen, and Cavalry Archers.</Tooltip>
     <History>Thracian tribesmen who wield the fiercesome rhomphaia polearm weapon in combat. They were ubiquitous mercenary swordsmen throughout Hellenistic times, sometimes even serving in two opposing armies.</History>
-    <Icon>units/thracian_rhomphaia.png</Icon>
+    <Icon>units/sele_infantry_swordsman.png</Icon>
 	<RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <UnitMotion>