Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml	(revision 7321)
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Identity>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_gymnasion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_gymnasion.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_gymnasion.xml	(revision 7321)
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Identity>
     <SpecificName>Gymnasion</SpecificName>
     <IconCell>63</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <stone>200</stone>
+      <metal>200</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>2200</Max>
   </Health>
   <VisualActor>
     <Actor>structures/hellenes/special_gym.xml</Actor>
   </VisualActor>
   <Footprint>
     <Square width="22.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 7321)
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Identity>
     <GenericName>Healer</GenericName>
     <IconCell>33</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <metal>120</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>85</Max>
     <RegenRate>0.3</RegenRate>
   </Health>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml	(revision 7321)
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <Identity>
     <GenericName>Farmstead</GenericName>
     <IconCell>49</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>900</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <Footprint>
     <Square width="12.0" depth="12.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml	(revision 7321)
@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Identity>
     <GenericName>Civic Centre</GenericName>
     <IconCell>47</IconCell>
   </Identity>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
+    <Resources>
+      <wood>100</wood>
+      <stone>100</stone>
+      <metal>100</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>3000</Max>
   </Health>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml	(revision 7321)
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_ranged">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Ekdromos</SpecificName>
     <IconCell>14</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>55</wood>
+      <metal>35</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>130</Max>
   </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>9.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/super_unit_2.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml	(revision 7321)
@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gaesata</SpecificName>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>45</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>90</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>3.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_spearman_b.xml</Actor>
   </VisualActor>
   <Builder>
     <Entities datatype="tokens">
       structures/celt_fortress_b
       structures/celt_fortress_g
       structures/celt_sb1
     </Entities>
   </Builder>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos.xml	(revision 7321)
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_onager">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Lithobolos</SpecificName>
     <IconCell>35</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>330</wood>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>300</Max>
   </Health>
   <UnitMotion>
     <WalkSpeed>5.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_rock.xml</Actor>
   </VisualActor>
   <Footprint>
     <Square width="3.5" depth="8.0"/>
     <Height>3.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml	(revision 7321)
@@ -1,26 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Philip II</SpecificName>
     <IconCell>31</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <metal>93</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>380</Max>
   </Health>
   <Armour>
     <Hack>14.0</Hack>
     <Pierce>11.0</Pierce>
     <Crush>22.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.9</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>32.0</Hack>
     <Crush>3.0</Crush>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/philip_horse.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_helepolis.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_helepolis.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_helepolis.xml	(revision 7321)
@@ -1,30 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_ram">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Helepolis</SpecificName>
     <IconCell>36</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>500</wood>
+      <metal>500</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>1000</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>25.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>200.0</Crush>
     <Range>5.0</Range>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/mechanical_siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/source/tools/entconvert/entconvert.pl
===================================================================
--- ps/trunk/source/tools/entconvert/entconvert.pl	(revision 7320)
+++ ps/trunk/source/tools/entconvert/entconvert.pl	(revision 7321)
@@ -1,198 +1,237 @@
 use strict;
 use warnings;
 
 use File::Find;
 use XML::Simple;
 use Data::Dumper;
 
 my $dir = '../../../binaries/data/mods/public/entities';
 my $dir2 = '../../../binaries/data/mods/public/simulation/templates';
 my @xml;
 find({ wanted => sub {
     push @xml, $_ if /\.xml$/ and !/template_entity(|_full|_quasi)\.xml$/;
 }, no_chdir => 1 }, $dir);
 s~\Q$dir/~~ for @xml;
 
 my %xml = ('template_entity_full.xml' => 1, 'template_entity_quasi.xml' => 1);
 $xml{$_} = 1 for @xml;
 
 my (%dot_actor, %dot_inherit);
 
 for my $xml (@xml) {
     print "$xml\n";
 
     my $name = $xml;
     $name =~ s/\.xml$//;
 
     my %opt = (KeyAttr => []);
 
     my $data = XMLin("$dir/$xml", %opt, ForceArray => 1);
     my $c = convert($name, $data);
     my $out = $c;
 #    print "$out\n\n";
     open my $fo, "> $dir2/$xml" or die $!; print $fo $out;
 }
 
 sub convert {
     my ($name, $data) = @_;
     #print Dumper $data if $name eq 'template_unit_infantry';
     my $out = qq{<?xml version="1.0" encoding="utf-8"?>\n};
 
     my $i = "  ";
 
     $out .= qq{<Entity};
     if ($data->{Parent}) {
         my $p = $data->{Parent};
         $p = "units/$p" if $p =~ /^(celt|cart|hele|iber|pers|rome)_(cavalry|infantry)/;
         warn "Unknown parent $p\n" unless $xml{"$p.xml"};
         $out .= qq{ parent="$p"};
         $dot_inherit{$name}{$p} = 1;
     }
     $out .= qq{>\n};
 
     my $civ;
     $civ = $1 if $name =~ /^units\/([a-z]{4})_/;
     my $needs_explicit_civ = ($civ and $data->{Parent} !~ /^${civ}_/);
     if ($data->{Traits}[0]{Id} or $needs_explicit_civ) {
         $out .= qq{$i<Identity>\n};
         $out .= qq{$i$i<Civ>$civ</Civ>\n} if $needs_explicit_civ;
         my @map = (
             [Generic => 'GenericName'],
             [Specific => 'SpecificName'],
             [Icon => 'IconSheet'],
             [Icon_Cell => 'IconCell'],
         );
         for my $m (@map) {
             $out .= qq{$i$i<$m->[1]>$data->{Traits}[0]{Id}[0]{$m->[0]}[0]</$m->[1]>\n} if $data->{Traits}[0]{Id}[0]{$m->[0]};
         }
         for my $k (keys %{$data->{Traits}[0]{Id}[0]}) {
             next if $k =~ /^(Civ)$/; # we do civ based on the filename instead, since it's more reliable
             next if $k =~ /^(Tooltip|History|Internal_Only|Classes|Rollover|Civ_Code)$/; # TODO: convert these somehow
             warn "Unrecognised field <Id><$k>" unless grep $_->[0] eq $k, @map;
         }
         $out .= qq{$i</Identity>\n};
     }
 
     if ($name eq 'template_unit') {
         $out .= qq{$i<UnitAI/>\n};
         $out .= qq{$i<Cost>\n};
         $out .= qq{$i$i<Population>1</Population>\n};
         $out .= qq{$i</Cost>\n};
     }
 
-    if ($data->{Traits}[0]{Population}) {
+    if ($data->{Traits}[0]{Population} or $data->{Traits}[0]{Creation}[0]{Resource}) {
         $out .= qq{$i<Cost>\n};
         $out .= qq{$i$i<Population>$data->{Traits}[0]{Population}[0]{Rem}[0]</Population>\n} if $data->{Traits}[0]{Population}[0]{Rem}
             and $data->{Traits}[0]{Population}[0]{Rem}[0] != 1;
         $out .= qq{$i$i<PopulationBonus>$data->{Traits}[0]{Population}[0]{Add}[0]</PopulationBonus>\n} if $data->{Traits}[0]{Population}[0]{Add};
+        if ($data->{Traits}[0]{Creation}[0]{Resource}) {
+            $out .= qq{$i$i<Resources>\n};
+            for (qw(Food Wood Stone Metal)) {
+                $out .= qq{$i$i$i<\l$_>$data->{Traits}[0]{Creation}[0]{Resource}[0]{$_}[0]</\l$_>\n} if $data->{Traits}[0]{Creation}[0]{Resource}[0]{$_}[0];
+            }
+            $out .= qq{$i$i</Resources>\n};
+        }
         $out .= qq{$i</Cost>\n};
     }
 
+    if ($data->{Traits}[0]{Supply} and $name =~ /template_gaia/) {
+        $out .= qq{$i<Selectable/>\n};
+    }
+
+    if ($data->{Traits}[0]{Supply}) {
+        $out .= qq{$i<ResourceSupply>\n};
+        $out .= qq{$i$i<Amount>$data->{Traits}[0]{Supply}[0]{Max}[0]</Amount>\n};
+        $out .= qq{$i$i<Type>$data->{Traits}[0]{Supply}[0]{Type}[0]</Type>\n};
+        $out .= qq{$i$i<Subtype>$data->{Traits}[0]{Supply}[0]{SubType}[0]</Subtype>\n} if $data->{Traits}[0]{Supply}[0]{SubType};
+        $out .= qq{$i</ResourceSupply>\n};
+    }
+
+    if ($data->{Actions}[0]{Gather}) {
+        $out .= qq{$i<ResourceGatherer>\n};
+        $out .= qq{$i$i<BaseSpeed>$data->{Actions}[0]{Gather}[0]{Speed}[0]</BaseSpeed>\n};
+        if ($data->{Actions}[0]{Gather}[0]{Resource}) {
+            $out .= qq{$i$i<Rates>\n};
+            my $r = $data->{Actions}[0]{Gather}[0]{Resource}[0];
+            for my $t (sort keys %$r) {
+                if (ref $r->{$t}[0]) {
+                    for my $s (sort keys %{$r->{$t}[0]}) {
+                        $out .= qq{$i$i$i<\L$t.$s>$r->{$t}[0]{$s}[0]</$t.$s>\n};
+                    }
+                } else {
+                    $out .= qq{$i$i$i<\L$t>$r->{$t}[0]</$t>\n};
+                }
+            }
+            $out .= qq{$i$i</Rates>\n};
+        }
+        $out .= qq{$i</ResourceGatherer>\n};
+    }
+
     if ($data->{Traits}[0]{Health}) {
         $out .= qq{$i<Health>\n};
         $out .= qq{$i$i<Max>$data->{Traits}[0]{Health}[0]{Max}[0]</Max>\n} if $data->{Traits}[0]{Health}[0]{Max};
         $out .= qq{$i$i<RegenRate>$data->{Traits}[0]{Health}[0]{RegenRate}[0]</RegenRate>\n} if $data->{Traits}[0]{Health}[0]{RegenRate};
         $out .= qq{$i</Health>\n};
     }
 
     if ($data->{Traits}[0]{Armour}) {
         $out .= qq{$i<Armour>\n};
         for my $n (qw(Hack Pierce Crush)) {
             $out .= qq{$i$i<$n>$data->{Traits}[0]{Armour}[0]{$n}[0]</$n>\n} if $data->{Traits}[0]{Armour}[0]{$n};
         }
         $out .= qq{$i</Armour>\n};
     }
 
     if ($data->{Actions}[0]{Move}) {
         $out .= qq{$i<UnitMotion>\n};
         $out .= qq{$i$i<WalkSpeed>$data->{Actions}[0]{Move}[0]{Speed}[0]</WalkSpeed>\n} if $data->{Actions}[0]{Move}[0]{Speed};
         $out .= qq{$i</UnitMotion>\n};
     }
 
     if ($data->{Actions}[0]{Attack}[0]{Melee}) {
         $out .= qq{$i<Attack>\n};
         for my $n (qw(Hack Pierce Crush Range)) {
             $out .= qq{$i$i<$n>$data->{Actions}[0]{Attack}[0]{Melee}[0]{$n}[0]</$n>\n} if $data->{Actions}[0]{Attack}[0]{Melee}[0]{$n};
         }
         if ($data->{Actions}[0]{Attack}[0]{Melee}[0]{Speed}) {
             my $s = $data->{Actions}[0]{Attack}[0]{Melee}[0]{Speed}[0];
             if ($s eq '1000') {
                 $out .= qq{$i$i<PrepareTime>600</PrepareTime>\n};
                 $out .= qq{$i$i<RepeatTime>1000</RepeatTime>\n};
             } elsif ($s eq '1500') {
                 $out .= qq{$i$i<PrepareTime>900</PrepareTime>\n};
                 $out .= qq{$i$i<RepeatTime>1500</RepeatTime>\n};
             } else {
                 die $s;
             }
         }
         $out .= qq{$i</Attack>\n};
     }
 
     $dot_actor{$name} = $data->{Actor};
 
     if ($data->{Actor}) {
         $out .= qq{$i<VisualActor>\n};
         $out .= qq{$i$i<Actor>$data->{Actor}[0]</Actor>\n};
         $out .= qq{$i</VisualActor>\n};
     }
 
     if ($data->{Traits}[0]{Footprint}) {
         $out .= qq{$i<Footprint>\n};
         if ($data->{Traits}[0]{Footprint}[0]{Radius}) {
             $out .= qq{$i$i<Circle radius="$data->{Traits}[0]{Footprint}[0]{Radius}[0]"/>\n};
         }
         if ($data->{Traits}[0]{Footprint}[0]{Width}) {
             $out .= qq{$i$i<Square width="$data->{Traits}[0]{Footprint}[0]{Width}[0]" depth="$data->{Traits}[0]{Footprint}[0]{Depth}[0]"/>\n};
         }
         if ($data->{Traits}[0]{Footprint}[0]{Height}) {
             $out .= qq{$i$i<Height>$data->{Traits}[0]{Footprint}[0]{Height}[0]</Height>\n};
         }
         $out .= qq{$i</Footprint>\n};
     }
 
     if ($name =~ /^template_(structure|gaia)$/) {
         $out .= qq{$i<Obstruction/>\n};
     }
 
     if ($data->{Actions}[0]{Create}[0]{List}[0]{StructCiv} or $data->{Actions}[0]{Create}[0]{List}[0]{StructMil}) {
         $out .= qq{$i<Builder>\n};
         $out .= qq{$i$i<Entities datatype="tokens">\n};
         for (sort (keys %{$data->{Actions}[0]{Create}[0]{List}[0]{StructCiv}[0]}, keys %{$data->{Actions}[0]{Create}[0]{List}[0]{StructMil}[0]})) {
             my $n = "structures/" . ($civ || "{civ}") . "_" . (lc $_);
             $out .= qq{$i$i$i$n\n};
         }
         $out .= qq{$i$i</Entities>\n};
         $out .= qq{$i</Builder>\n};
     }
 
 
     $out .= qq{</Entity>\n};
     return $out;
 }
 
 open my $dot, '> entities.dot' or die $!;
 print $dot <<EOF;
 digraph g
 {
   graph [nodesep=.1];
   node [fontname=ArialN fontsize=8];
   node [shape=rectangle];
 EOF
 for (sort grep { not $dot_actor{$_} } keys %dot_actor) {
     print $dot qq{"$_";\n};
 }
 print $dot qq{node [style=filled fillcolor=lightgray]\n};
 for (sort grep { $dot_actor{$_} } keys %dot_actor) {
     print $dot qq{"$_";\n};
 }
 print $dot qq{node [style=solid shape=ellipse]\n};
 for (sort grep { $dot_actor{$_} } keys %dot_actor) {
     print $dot qq{"$dot_actor{$_}[0]" -> "$_";\n};
 }
 for my $p (sort keys %dot_inherit) {
     for my $c (sort keys %{$dot_inherit{$p}}) {
         print $dot qq{"$p" -> "$c";\n};
     }
 }
 print $dot "}\n";
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml	(revision 7321)
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Identity>
     <GenericName>Outpost</GenericName>
     <IconCell>53</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>50</wood>
+      <stone>50</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>1200</Max>
   </Health>
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml	(revision 7321)
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <Identity>
     <GenericName>Mill</GenericName>
     <IconCell>52</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>800</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <Footprint>
     <Square width="12.0" depth="12.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml	(revision 7321)
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Identity>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml	(revision 7321)
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Identity>
     <GenericName>Infantry Swordsman</GenericName>
     <IconCell>0</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>50</food>
+      <metal>62</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>90</Max>
   </Health>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>3.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.5</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>17.0</Hack>
     <Pierce>0.0</Pierce>
   </Attack>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml	(revision 7321)
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora">
   <Identity>
     <GenericName>Tree</GenericName>
     <IconSheet>PortraitSheetTree</IconSheet>
     <IconCell>0</IconCell>
   </Identity>
+  <Selectable/>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <Type>wood</Type>
+  </ResourceSupply>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Identity>
     <SpecificName>Bear</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/bear.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.3"/>
     <Height>3.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml	(revision 7321)
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Large Oak Tree</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>200</Amount>
+    <Type>wood</Type>
+  </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/oak_large.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_temperate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_temperate.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_temperate.xml	(revision 7321)
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Deciduous Bush</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>50</Amount>
+    <Type>wood</Type>
+  </ResourceSupply>
   <VisualActor>
     <Actor>props/flora/bush_tempe_a.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>3.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Identity>
     <SpecificName>Boar</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>150</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/boar.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.0"/>
     <Height>3.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_passive">
   <Identity>
     <SpecificName>Muskox</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>200</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/muskox.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Identity>
     <SpecificName>Elephant</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>500</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/elephant.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>3.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Identity>
     <SpecificName>Rabbit</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>50</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/rabbit1.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="0.75"/>
     <Height>1.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Identity>
     <SpecificName>African Bush Elephant</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>800</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/elephant_african_bush.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>3.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_passive">
   <Identity>
     <SpecificName>Chicken</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>40</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/chicken.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="0.5"/>
     <Height>1.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Identity>
     <SpecificName>Walrus</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/walrus.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="2.3"/>
     <Height>2.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Identity>
     <SpecificName>Infant African Elephant</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/elephant_african_baby.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>1.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_passive">
   <Identity>
     <SpecificName>Goat</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>120</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/goat.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.0"/>
     <Height>2.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Identity>
     <SpecificName>North African Elephant</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>500</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <VisualActor>
     <Actor>fauna/elephant_african_forest.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>3.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml	(revision 7321)
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Baobab</SpecificName>
     <IconCell>3</IconCell>
   </Identity>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <Type>wood</Type>
+  </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/baobab.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>10.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml	(revision 7321)
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Identity>
     <SpecificName>Zebra</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Amount>150</Amount>
+    <Type>food</Type>
+    <Subtype>meat</Subtype>
+  </ResourceSupply>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/zebra.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.8"/>
     <Height>1.8</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml	(revision 7321)
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush">
   <Identity>
     <GenericName>Bush</GenericName>
     <SpecificName>Berries</SpecificName>
     <IconSheet>PortraitSheetTree</IconSheet>
     <IconCell>2</IconCell>
   </Identity>
+  <Selectable/>
+  <ResourceSupply>
+    <Amount>120</Amount>
+    <Type>food</Type>
+    <Subtype>fruit</Subtype>
+  </ResourceSupply>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml	(revision 7321)
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
   <Identity>
     <GenericName>Corral</GenericName>
     <IconCell>51</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <ResourceSupply>
+    <Amount>200</Amount>
+    <Type>food</Type>
+    <Subtype>milk</Subtype>
+  </ResourceSupply>
   <Health>
     <Max>100</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="9.5" depth="19.75"/>
     <Height>5.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(revision 7321)
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Identity>
     <GenericName>Siege Ballista</GenericName>
     <IconCell>37</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>190</wood>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>180</Max>
   </Health>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>4.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.75</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml	(revision 7321)
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super">
   <Identity>
     <GenericName>Super Cavalry</GenericName>
     <IconCell>43</IconCell>
   </Identity>
   <Cost>
     <Population>2</Population>
+    <Resources>
+      <food>150</food>
+    </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>35.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <Range>4.8</Range>
     <PrepareTime>600</PrepareTime>
     <RepeatTime>1000</RepeatTime>
   </Attack>
   <Footprint>
     <Circle radius="1.2"/>
     <Height>5.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_theatron.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_theatron.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_theatron.xml	(revision 7321)
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Identity>
     <SpecificName>Theatron</SpecificName>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>200</wood>
+      <stone>500</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>5500</Max>
   </Health>
   <VisualActor>
     <Actor>structures/hellenes/special_theatre.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="26.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_tholos.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_tholos.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hele_tholos.xml	(revision 7321)
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Identity>
     <SpecificName>Tholos</SpecificName>
     <IconCell>24</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <stone>100</stone>
+      <metal>200</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>2200</Max>
   </Health>
   <VisualActor>
     <Actor>structures/hellenes/tholos.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="10.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml	(revision 7321)
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_entity_full">
   <Identity>
     <GenericName>Structure</GenericName>
     <IconSheet>PortraitSheet</IconSheet>
   </Identity>
+  <Cost>
+    <Resources>
+    </Resources>
+  </Cost>
   <Health>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>42.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Obstruction/>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml	(revision 7321)
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo">
   <Identity>
     <GenericName>Mineral</GenericName>
     <IconSheet>PortraitSheetRock</IconSheet>
     <IconCell>1</IconCell>
   </Identity>
+  <Selectable/>
+  <ResourceSupply>
+    <Amount>1000</Amount>
+    <Type>metal</Type>
+  </ResourceSupply>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_b.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_b.xml	(revision 7321)
@@ -1,26 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Thracian Peltast</SpecificName>
     <IconCell>6</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <metal>75</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.7</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_b.xml</Actor>
   </VisualActor>
   <Builder>
     <Entities datatype="tokens">
       structures/hele_gymnasion
       structures/hele_theatron
       structures/hele_tholos
     </Entities>
   </Builder>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml	(revision 7321)
@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_infantry">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gallic Solduri</SpecificName>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>60</food>
+      <metal>110</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>110</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/celts/super_unit_1.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml	(revision 7321)
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_b">
+  <ResourceGatherer>
+    <BaseSpeed>1500</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>150</Max>
     <RegenRate>0.3</RegenRate>
   </Health>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>1.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>19.0</Hack>
     <Crush>4.0</Crush>
     <Range>2.0</Range>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/cavalry_swordsman_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml	(revision 7321)
@@ -1,29 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_ranged">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Boudicca</SpecificName>
     <IconCell>44</IconCell>
   </Identity>
   <Cost>
     <Population>4</Population>
+    <Resources>
+      <food>180</food>
+      <wood>100</wood>
+      <metal>250</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>350</Max>
   </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>12.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>14.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
   </VisualActor>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>5.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml	(revision 7321)
@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brennus</SpecificName>
     <IconCell>29</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>100</food>
+      <wood>250</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>220</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>10.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>25.0</Crush>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
   <VisualActor>
     <Actor>units/celts/brennus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml	(revision 7321)
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super">
   <Identity>
     <GenericName>Super Infantry</GenericName>
     <IconCell>43</IconCell>
   </Identity>
   <Cost>
+    <Resources>
+      <food>75</food>
+    </Resources>
   </Cost>
   <Health>
     <Max>150</Max>
   </Health>
   <Armour>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>5.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <Range>4.0</Range>
     <PrepareTime>600</PrepareTime>
     <RepeatTime>1000</RepeatTime>
   </Attack>
   <Footprint>
     <Circle radius="0.5"/>
     <Height>2.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_e.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_e.xml	(revision 7321)
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_javelinist_a">
   <Identity>
     <IconCell>8</IconCell>
   </Identity>
+  <ResourceGatherer>
+    <BaseSpeed>2000</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>120</Max>
     <RegenRate>0.4</RegenRate>
   </Health>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml	(revision 7321)
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_infantry">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Pezhetairoi</SpecificName>
     <IconCell>13</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>63</wood>
+      <metal>30</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>145</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>7.0</Pierce>
     <Crush>16.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.2</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>15.0</Hack>
     <Pierce>25.0</Pierce>
     <Range>7.0</Range>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/super_unit_3.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_b.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_b.xml	(revision 7321)
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_swordsman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Hyppikon</SpecificName>
     <IconCell>18</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>5</wood>
+      <metal>17</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>140</Max>
   </Health>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>1.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.4</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>17.0</Hack>
     <Crush>3.0</Crush>
     <Range>2.4</Range>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/cavalry_swordsman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml	(revision 7321)
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_a">
+  <ResourceGatherer>
+    <BaseSpeed>2000</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>160</Max>
     <RegenRate>0.4</RegenRate>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>16.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.5</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>19.0</Hack>
     <Crush>7.0</Crush>
     <Range>2.0</Range>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/cavalry_swordsman_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml	(revision 7321)
@@ -1,29 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_ranged">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brythonic Carbanto</SpecificName>
     <IconCell>41</IconCell>
   </Identity>
   <Cost>
     <Population>4</Population>
+    <Resources>
+      <food>180</food>
+      <wood>100</wood>
+      <metal>120</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>7.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/celts/super_unit_4.xml</Actor>
   </VisualActor>
   <Footprint>
     <Square width="1.0" depth="7.0"/>
     <Height>5.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml	(revision 7321)
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Vercingetorix</SpecificName>
     <IconCell>31</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>150</food>
+      <metal>300</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>300</Max>
   </Health>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>13.0</Pierce>
     <Crush>13.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>50.0</Hack>
   </Attack>
   <VisualActor>
     <Actor>units/celts/vercingetorix_horse.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_b.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_b.xml	(revision 7321)
@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Hoplite</SpecificName>
     <IconCell>3</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>75</wood>
+      <metal>5</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>9.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.1</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>5.0</Hack>
     <Pierce>15.0</Pierce>
     <Range>4.8</Range>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_spearman_b.xml</Actor>
   </VisualActor>
   <Builder>
     <Entities datatype="tokens">
       structures/hele_gymnasion
       structures/hele_theatron
       structures/hele_tholos
     </Entities>
   </Builder>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml	(revision 7321)
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_cavalry">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gallic Brihent</SpecificName>
   </Identity>
+  <Cost>
+    <Resources>
+      <metal>130</metal>
+    </Resources>
+  </Cost>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/celts/super_unit_2.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml	(revision 7321)
@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_cavalry">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Hetairoi</SpecificName>
     <IconCell>15</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>32</wood>
+      <metal>45</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>9.0</Hack>
     <Pierce>4.0</Pierce>
     <Crush>16.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.3</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>11.0</Hack>
     <Pierce>15.0</Pierce>
     <Crush>0.0</Crush>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/super_unit_4.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_a.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_a.xml	(revision 7321)
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_archer_b">
+  <ResourceGatherer>
+    <BaseSpeed>1500</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>95</Max>
     <RegenRate>0.3</RegenRate>
   </Health>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>1.0</Pierce>
     <Crush>3.0</Crush>
   </Armour>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml	(revision 7321)
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_javelinist_b">
   <Identity>
     <IconCell>7</IconCell>
   </Identity>
+  <ResourceGatherer>
+    <BaseSpeed>1500</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>110</Max>
     <RegenRate>0.3</RegenRate>
   </Health>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.2</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml	(revision 7321)
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Identity>
     <GenericName>Trader</GenericName>
     <IconCell>34</IconCell>
   </Identity>
   <Cost>
+    <Resources>
+      <food>50</food>
+      <metal>50</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.0</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml	(revision 7321)
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Identity>
     <GenericName>Bireme</GenericName>
     <IconCell>39</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>250</wood>
+      <metal>250</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>15.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(revision 7321)
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Identity>
     <GenericName>Fortress</GenericName>
     <IconCell>61</IconCell>
   </Identity>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
+    <Resources>
+      <stone>500</stone>
+    </Resources>
   </Cost>
   <Health>
     <Max>4200</Max>
   </Health>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>25.0</Crush>
   </Armour>
   <Footprint>
     <Square width="24.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
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 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml	(revision 7321)
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Identity>
     <GenericName>Cavalry Javelinist</GenericName>
     <IconCell>6</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>100</food>
+      <wood>70</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>150</Max>
   </Health>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>4.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml	(revision 7321)
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_ranged">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Xenophon</SpecificName>
     <IconCell>23</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>50</wood>
+      <metal>82</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>280</Max>
   </Health>
   <Armour>
     <Hack>12.0</Hack>
     <Pierce>10.0</Pierce>
     <Crush>22.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/xenophon.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml	(revision 7321)
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Alexander</SpecificName>
     <IconCell>30</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>12</wood>
+      <metal>97</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>400</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>7.0</Pierce>
     <Crush>19.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.4</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>45.0</Hack>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/alexander.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml	(revision 7321)
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Baguada</SpecificName>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>45</wood>
+    </Resources>
+  </Cost>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_b.xml</Actor>
   </VisualActor>
   <Builder>
     <Entities datatype="tokens">
       structures/celt_fortress_b
       structures/celt_fortress_g
       structures/celt_sb1
     </Entities>
   </Builder>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml	(revision 7321)
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Britomartus</SpecificName>
     <IconCell>30</IconCell>
   </Identity>
   <Cost>
+    <Resources>
+      <food>80</food>
+      <metal>400</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>14.0</Pierce>
     <Crush>20.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>0.0</Hack>
     <Pierce>50.0</Pierce>
     <Crush>0.0</Crush>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
   <VisualActor>
     <Actor>units/celts/britomartus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml	(revision 7321)
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Demetrius</SpecificName>
     <IconCell>29</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>51</wood>
+      <metal>73</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>275</Max>
   </Health>
   <Armour>
     <Hack>13.0</Hack>
     <Pierce>10.0</Pierce>
     <Crush>22.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>4.7</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>24.0</Pierce>
     <Crush>0.0</Crush>
     <Range>7.0</Range>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/demetrius.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml	(revision 7321)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_archer_a">
+  <ResourceGatherer>
+    <BaseSpeed>2000</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>105</Max>
     <RegenRate>0.4</RegenRate>
   </Health>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.7</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml	(revision 7321)
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
   <Identity>
     <GenericName>Field</GenericName>
     <IconCell>50</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>20</wood>
+    </Resources>
+  </Cost>
+  <ResourceSupply>
+    <Amount>1000</Amount>
+    <Type>food</Type>
+    <Subtype>grain</Subtype>
+  </ResourceSupply>
   <Health>
     <Max>120</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/camp_mace_hypaspist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/camp_mace_hypaspist.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/camp_mace_hypaspist.xml	(revision 7321)
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_infantry">
   <Identity>
     <SpecificName>Argyraspides</SpecificName>
     <IconCell>12</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>65</food>
+      <metal>120</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>135</Max>
   </Health>
   <Armour>
     <Hack>9.0</Hack>
     <Pierce>11.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.5</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>18.0</Hack>
     <Pierce>22.0</Pierce>
     <Crush>0.0</Crush>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
   <VisualActor>
     <Actor>temp/mace_su1_hypaspist.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml	(revision 7321)
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Identity>
     <GenericName>Siege Ram</GenericName>
     <IconCell>36</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>260</wood>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>65.0</Crush>
     <Range>5.0</Range>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml	(revision 7321)
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Identity>
     <GenericName>Gate</GenericName>
     <IconCell>56</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>3000</Max>
   </Health>
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 7321)
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_cavalry">
   <Identity>
     <GenericName>Hero</GenericName>
   </Identity>
   <Cost>
     <Population>2</Population>
+    <Resources>
+      <food>150</food>
+      <metal>25</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>400</Max>
     <RegenRate>0.5</RegenRate>
   </Health>
   <Armour>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>1.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <Range>3.6</Range>
     <PrepareTime>600</PrepareTime>
     <RepeatTime>1000</RepeatTime>
   </Attack>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles.xml	(revision 7321)
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Oxybeles</SpecificName>
     <IconCell>37</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>190</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_spear.xml</Actor>
   </VisualActor>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml	(revision 7321)
@@ -1,26 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Themistocles</SpecificName>
     <IconCell>22</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <metal>137</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>280</Max>
   </Health>
   <Armour>
     <Hack>16.0</Hack>
     <Pierce>14.0</Pierce>
     <Crush>21.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>27.0</Hack>
     <Crush>3.0</Crush>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/themistocles.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml	(revision 7321)
@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Caratacos</SpecificName>
     <IconCell>45</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>150</food>
+      <metal>175</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>225</Max>
   </Health>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>10.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>50.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
   <VisualActor>
     <Actor>units/celts/caradoc.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml	(revision 7321)
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Coun</SpecificName>
   </Identity>
   <Cost>
+    <Resources>
+      <food>90</food>
+    </Resources>
   </Cost>
   <Health>
     <Max>50</Max>
   </Health>
   <Armour>
     <Hack>1.0</Hack>
     <Pierce>1.0</Pierce>
     <Crush>1.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>10.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <Range>0.5</Range>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_spearman_b.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="0.6"/>
     <Height>3.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml	(revision 7321)
@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Cynvelin</SpecificName>
     <IconCell>46</IconCell>
   </Identity>
   <Cost>
     <Population>2</Population>
+    <Resources>
+      <food>135</food>
+      <metal>200</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>250</Max>
   </Health>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>14.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>40.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cynvelin_horse.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.4"/>
     <Height>2.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_b.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_b.xml	(revision 7321)
@@ -1,30 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Toxotes</SpecificName>
     <IconCell>9</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>35</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>85</Max>
     <RegenRate>0.2</RegenRate>
   </Health>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>1.0</Pierce>
     <Crush>1.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.8</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_b.xml</Actor>
   </VisualActor>
   <Builder>
     <Entities datatype="tokens">
       structures/hele_gymnasion
       structures/hele_theatron
       structures/hele_tholos
     </Entities>
   </Builder>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml	(revision 7321)
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo">
   <Identity>
     <GenericName>Rock</GenericName>
     <SpecificName>Rock</SpecificName>
     <IconSheet>PortraitSheetRock</IconSheet>
     <IconCell>0</IconCell>
   </Identity>
+  <Selectable/>
+  <ResourceSupply>
+    <Amount>500</Amount>
+    <Type>stone</Type>
+  </ResourceSupply>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 7321)
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Identity>
     <GenericName>Barracks</GenericName>
     <IconCell>59</IconCell>
   </Identity>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
+    <Resources>
+      <wood>100</wood>
+      <stone>100</stone>
+    </Resources>
   </Cost>
   <Health>
     <Max>2000</Max>
   </Health>
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>20.0</Crush>
   </Armour>
   <Footprint>
     <Square width="17.0" depth="17.0"/>
     <Height>5.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(revision 7321)
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Identity>
     <GenericName>Siege Onager</GenericName>
     <IconCell>35</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>330</wood>
+      <stone>80</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>250</Max>
   </Health>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>4.75</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 7321)
@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_infantry">
   <Identity>
     <GenericName>Hero</GenericName>
   </Identity>
   <Cost>
+    <Resources>
+      <food>75</food>
+      <metal>25</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>300</Max>
     <RegenRate>0.5</RegenRate>
   </Health>
   <Armour>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>10.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <Range>4.8</Range>
     <PrepareTime>600</PrepareTime>
     <RepeatTime>1000</RepeatTime>
   </Attack>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml	(revision 7321)
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_ranged">
   <Identity>
     <GenericName>Hero</GenericName>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>100</food>
+      <wood>500</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>200</Max>
     <RegenRate>0.2</RegenRate>
   </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>10.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.0</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml	(revision 7321)
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_spearman_b">
   <Identity>
     <IconCell>4</IconCell>
   </Identity>
+  <ResourceGatherer>
+    <BaseSpeed>1500</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>110</Max>
     <RegenRate>0.3</RegenRate>
   </Health>
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>17.0</Pierce>
     <Crush>18.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>6.0</Hack>
     <Pierce>16.0</Pierce>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_spearman_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml	(revision 7321)
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_spearman_a">
   <Identity>
     <IconCell>5</IconCell>
   </Identity>
+  <ResourceGatherer>
+    <BaseSpeed>2000</BaseSpeed>
+  </ResourceGatherer>
   <Health>
     <Max>120</Max>
     <RegenRate>0.4</RegenRate>
   </Health>
   <Armour>
     <Hack>13.0</Hack>
     <Pierce>16.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.4</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>7.0</Hack>
     <Pierce>17.0</Pierce>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_spearman_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml	(revision 7321)
@@ -1,30 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_infantry">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brythonic Delamokludda</SpecificName>
     <IconCell>40</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>65</food>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Armour>
     <Hack>12.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>35.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <Range>5.0</Range>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
   <VisualActor>
     <Actor>units/celts/super_unit_3.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml	(revision 7321)
@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Leonidas</SpecificName>
     <IconCell>21</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>35</wood>
+      <metal>150</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>16.0</Hack>
     <Pierce>14.0</Pierce>
     <Crush>21.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>0.0</Crush>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/leonidas.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml	(revision 7321)
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_infantry">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Spartiate</SpecificName>
     <IconCell>12</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>35</wood>
+      <metal>78</metal>
+    </Resources>
+  </Cost>
   <Health>
     <Max>150</Max>
   </Health>
   <Armour>
     <Hack>16.0</Hack>
     <Pierce>14.0</Pierce>
     <Crush>21.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.0</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>15.0</Hack>
     <Pierce>20.0</Pierce>
     <Range>4.8</Range>
   </Attack>
   <VisualActor>
     <Actor>units/hellenes/super_unit_1.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_siege.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_siege.xml	(revision 7321)
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super">
   <Identity>
     <GenericName>Super Siege</GenericName>
     <IconCell>44</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>500</wood>
+      <metal>400</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>550.0</Hack>
     <Pierce>600.0</Pierce>
     <Crush>200.0</Crush>
   </Armour>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml	(revision 7321)
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <Identity>
     <GenericName>Market</GenericName>
     <IconCell>60</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>300</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>1500</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>20.0</Crush>
   </Armour>
   <Footprint>
     <Square width="17.0" depth="17.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 7321)
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Identity>
     <GenericName>Infantry</GenericName>
   </Identity>
   <Cost>
+    <Resources>
+      <food>50</food>
+    </Resources>
   </Cost>
+  <ResourceGatherer>
+    <BaseSpeed>1000</BaseSpeed>
+    <Rates>
+      <food.fish>1</food.fish>
+      <food.fruit>1</food.fruit>
+      <food.grain>1</food.grain>
+      <food.meat>1</food.meat>
+      <metal>3</metal>
+      <stone>3</stone>
+      <wood>2</wood>
+    </Rates>
+  </ResourceGatherer>
   <Health>
     <Max>100</Max>
     <RegenRate>0.2</RegenRate>
   </Health>
   <Armour>
     <Hack>1.0</Hack>
     <Pierce>1.0</Pierce>
     <Crush>9.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}_barracks
       structures/{civ}_civil_centre
       structures/{civ}_corral
       structures/{civ}_dock
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_fortress
       structures/{civ}_house
       structures/{civ}_market
       structures/{civ}_mill
       structures/{civ}_scout_tower
       structures/{civ}_temple
       structures/{civ}_wall_gate
       structures/{civ}_wall_long
       structures/{civ}_wall_tower
     </Entities>
   </Builder>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml	(revision 7321)
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Identity>
     <GenericName>Cavalry Archer</GenericName>
     <IconCell>24</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>100</food>
+      <wood>85</wood>
+    </Resources>
+  </Cost>
   <Health>
     <Max>150</Max>
   </Health>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.0</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 7321)
@@ -1,31 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Identity>
     <GenericName>Female Citizen</GenericName>
     <IconCell>32</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>50</food>
+    </Resources>
+  </Cost>
+  <ResourceGatherer>
+    <BaseSpeed>1000</BaseSpeed>
+    <Rates>
+      <food.fish>0.8</food.fish>
+      <food.fruit>3</food.fruit>
+      <food.grain>3</food.grain>
+      <food.meat>0.5</food.meat>
+      <metal>1</metal>
+      <stone>1</stone>
+      <wood>2</wood>
+    </Rates>
+  </ResourceGatherer>
   <Health>
     <Max>75</Max>
     <RegenRate>0.3</RegenRate>
   </Health>
   <Armour>
     <Hack>1.0</Hack>
     <Pierce>1.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
   </UnitMotion>
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}_civil_centre
       structures/{civ}_corral
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_house
       structures/{civ}_market
       structures/{civ}_mill
       structures/{civ}_temple
     </Entities>
   </Builder>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml	(revision 7321)
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Identity>
     <GenericName>House</GenericName>
     <IconCell>48</IconCell>
   </Identity>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
+    <Resources>
+      <wood>100</wood>
+    </Resources>
   </Cost>
   <Health>
     <Max>800</Max>
   </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
   <Footprint>
     <Square width="9.0" depth="9.0"/>
     <Height>5.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml	(revision 7321)
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Identity>
     <GenericName>Tower</GenericName>
     <IconCell>55</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <stone>25</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>2500</Max>
   </Health>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 7321)
@@ -1,25 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Identity>
     <GenericName>Cavalry</GenericName>
   </Identity>
   <Cost>
     <Population>2</Population>
+    <Resources>
+      <food>100</food>
+    </Resources>
   </Cost>
+  <ResourceGatherer>
+    <BaseSpeed>1000</BaseSpeed>
+    <Rates>
+      <food.meat>20</food.meat>
+    </Rates>
+  </ResourceGatherer>
   <Health>
     <Max>150</Max>
     <RegenRate>0.2</RegenRate>
   </Health>
   <Armour>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
   </UnitMotion>
   <Footprint>
     <Circle radius="1.2"/>
     <Height>7.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml	(revision 7321)
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Identity>
     <GenericName>Merchantman</GenericName>
     <IconCell>38</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>10.0</Pierce>
     <Crush>1.0</Crush>
   </Armour>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml	(revision 7321)
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Identity>
     <GenericName>Trireme</GenericName>
     <IconCell>40</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>400</wood>
+      <metal>350</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml	(revision 7321)
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super">
   <Identity>
     <GenericName>Super Ranged</GenericName>
   </Identity>
   <Cost>
+    <Resources>
+      <food>75</food>
+    </Resources>
   </Cost>
   <Health>
     <Max>150</Max>
   </Health>
   <Armour>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
   <Footprint>
     <Circle radius="0.5"/>
     <Height>2.5</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml	(revision 7321)
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Identity>
     <GenericName>Quinquereme</GenericName>
     <IconCell>41</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <wood>600</wood>
+      <metal>500</metal>
+    </Resources>
+  </Cost>
   <Armour>
     <Hack>25.0</Hack>
     <Pierce>25.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml	(revision 7321)
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Identity>
     <GenericName>Infantry Slinger</GenericName>
     <IconCell>12</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>50</food>
+      <stone>30</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>70</Max>
   </Health>
   <Armour>
     <Hack>1.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>7.5</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml	(revision 7321)
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Identity>
     <GenericName>Dock</GenericName>
     <IconCell>57</IconCell>
   </Identity>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
+    <Resources>
+      <wood>300</wood>
+    </Resources>
   </Cost>
   <Health>
     <Max>2500</Max>
   </Health>
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>20.0</Crush>
   </Armour>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(revision 7321)
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Identity>
     <GenericName>Temple</GenericName>
     <IconCell>58</IconCell>
   </Identity>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
+    <Resources>
+      <stone>300</stone>
+    </Resources>
   </Cost>
   <Health>
     <Max>2000</Max>
   </Health>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="12.0" depth="12.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 7321)
@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Identity>
     <GenericName>Hero</GenericName>
   </Identity>
   <Cost>
+    <Resources>
+      <food>100</food>
+      <metal>250</metal>
+    </Resources>
   </Cost>
   <Health>
     <Max>300</Max>
     <RegenRate>0.5</RegenRate>
   </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>12.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
   </UnitMotion>
   <Attack>
     <Hack>40.0</Hack>
     <Pierce>0.0</Pierce>
     <Crush>0.0</Crush>
     <Range>5.0</Range>
     <PrepareTime>900</PrepareTime>
     <RepeatTime>1500</RepeatTime>
   </Attack>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml	(revision 7320)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml	(revision 7321)
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Identity>
     <GenericName>Wall</GenericName>
     <IconCell>54</IconCell>
   </Identity>
+  <Cost>
+    <Resources>
+      <stone>20</stone>
+    </Resources>
+  </Cost>
   <Health>
     <Max>2000</Max>
   </Health>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
 </Entity>