Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/maur_palace.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/maur_palace.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/maur_palace.xml	(revision 18740)
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <PopulationBonus>10</PopulationBonus>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="16.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Harmya</SpecificName>
     <Icon>gaia/special_stoa.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="36.0" depth="12.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen
       units/{civ}_champion_maiden_archer
       units/{civ}_hero_chanakya
       units/{civ}_hero_maurya
       units/{civ}_hero_ashoka
     </Entities>
   </ProductionQueue>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/mauryans/misc_structure_01.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml	(revision 18740)
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Gymnasium</GenericName>
     <SpecificName>Gymnásion</SpecificName>
     <Tooltip>Train champion units.</Tooltip>
     <History>The gymnasion was a vital place in Athens, where physical exercises were performed and social contacts established.</History>
     <Icon>structures/gymnasion.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
       units/{civ}_champion_ranged
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/athenians/gymnasion.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml	(revision 18740)
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Council</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>100</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="16.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Council Chamber</GenericName>
     <SpecificName>Prytaneîon</SpecificName>
     <Tooltip>Train heroes. Research special technologies.</Tooltip>
     <History>The Prytaneion is the meeting place for the city elders to dine and to make swift decisions.</History>
     <Icon>structures/tholos.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>25</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="24.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_hero_themistocles
       units/{civ}_hero_pericles
       units/{civ}_hero_iphicrates
     </Entities>
     <Technologies datatype="tokens">
       hellenes/special_long_walls
       hellenes/special_iphicratean_reforms
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tholos.xml</select>
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/athenians/prytaneion.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml	(revision 18740)
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">iber_monument</Auras>
   <BuildRestrictions>
     <Category>Monument</Category>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>120</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>100</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
   <Health>
     <Max>1200</Max>
     <SpawnEntityOnDeath>rubble/rubble_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>iber</Civ>
     <GenericName>Revered Monument</GenericName>
     <SpecificName>Gur Oroigarri</SpecificName>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <Icon>structures/iberian_bull.png</Icon>
     <Tooltip>All units within vision of this monument will fight harder. Buildings in the territory of the monument do not decay.</Tooltip>
     <History>The Iberians were a religious people who built small monuments to their various gods. These monuments could also serve as family tombs.</History>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>25</stone>
     <metal>25</metal>
   </Loot>
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_iber_monument.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
   </TerritoryInfluence>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/iberians/sb_1.xml</Actor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml	(revision 18740)
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="29.0" depth="27.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <List datatype="tokens">Elephant</List>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Elephant Stables</GenericName>
     <SpecificName>Vāraṇaśālā</SpecificName>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>structures/elephant_stables.png</Icon>
     <Tooltip>Train elephant units.</Tooltip>
     <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_elephant
       units/{civ}_elephant_archer_b
       units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_elephant_stables.xml</select>
       <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>38</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/mauryans/stables.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml	(revision 18740)
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">maur_pillar</Auras>
   <BuildRestrictions>
     <Category>Pillar</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>80</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>100</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="7.0" depth="7.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Edict Pillar of Ashoka</GenericName>
     <SpecificName>Śāsana Stambha Aśokā</SpecificName>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <Icon>structures/monument.png</Icon>
     <Tooltip>The famous pillar of Ashoka. Increases the walk speed of traders. Buildings in the territory of the monument do not decay.</Tooltip>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>25</stone>
     <metal>25</metal>
   </Loot>
   <Obstruction>
     <Static width="4" depth="4"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_iber_monument.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>props/structures/mauryans/ashoka_pillar.xml</Actor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml	(revision 18740)
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Apadana</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <PopulationBonus>10</PopulationBonus>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>300</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Persian Palace</GenericName>
     <SpecificName>Apadana</SpecificName>
     <Classes datatype="tokens">Palace Apadana</Classes>
     <History>The term Apadana designates a large hypostyle palace found in Persia. The best known example, and by far the largest, was the great Apadana at Persepolis. Functioning as the empire's central audience hall, the palace is famous for the reliefs of the tribute-bearers and of the army, including the Immortals. The annual tribute that the Persians received from their satrapies and vassal states, as regularised by Darius the Great, accounted for incredible annual revenue.</History>
     <Icon>structures/palace.png</Icon>
     <Tooltip>"Satrapy Tribute": Gain a trickle of food, wood, stone, and metal resources. Train Persian heroes and their "Immortals" bodyguards.</Tooltip>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>75</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_hero_cyrus
       units/{civ}_hero_darius
       units/{civ}_hero_xerxes
       units/{civ}_champion_infantry
     </Entities>
     <Technologies datatype="tokens">
       persians/immortals
     </Technologies>
   </ProductionQueue>
   <ResourceTrickle>
     <Rates>
       <food>1.0</food>
       <wood>1.0</wood>
       <stone>0.75</stone>
       <metal>0.75</metal>
     </Rates>
     <Interval>1000</Interval>
   </ResourceTrickle>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/apadana.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml	(revision 18740)
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Hall</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>250</stone>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>rubble/rubble_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Persian Hall</GenericName>
     <SpecificName>Duvarthi Visadahyu</SpecificName>
     <Icon>structures/palace.png</Icon>
     <Tooltip>Train War Elephants and Kardakes mercenaries.</Tooltip>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_kardakes_hoplite
       units/{civ}_kardakes_skirmisher
       units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/hall.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml	(revision 18740)
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">loyalty_regen</Auras>
   <BuildRestrictions>
     <Category>UniqueBuilding</Category>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>250</stone>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="17.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Persian Special Building</GenericName>
     <SpecificName>Ishtar Gate of Babylon</SpecificName>
     <Tooltip>Increases the loyalty regeneration of nearby structures, making them harder to capture.</Tooltip>
     <Icon>structures/gate.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>125</metal>
   </Loot>
   <Obstruction>
     <Static disable=""/>
     <Obstructions>
       <Right width="11" depth="13" x="12.5" z="0"/>
       <Left width="11" depth="13" x="-12.5" z="0"/>
       <Door width="14" depth="13" x="0" z="0"/>
     </Obstructions>
   </Obstruction>
   <ProductionQueue disable=""/>
   <TerritoryInfluence>
     <Root>true</Root>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>special/pers_ishtar_gate.xml</Actor>
     <FoundationActor>structures/fndn_wall.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml	(revision 18740)
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
     <Category>Dock</Category>
   </BuildRestrictions>
   <Footprint replace="">
     <Circle radius="14.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Lighthouse</GenericName>
     <SpecificName>Pháros</SpecificName>
     <Classes datatype="tokens">-ConquestCritical Lighthouse</Classes>
     <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
     <Tooltip>Build along the shore to reveal the shorelines over the entire map. Very large vision range: 180 meters.</Tooltip>
     <History>The Ptolemaic dynasty in Egypt built the magnificent Lighthouse of Alexandria near the harbor mouth of that Nile Delta city. This structure could be seen for many kilometers out to sea and was one of the Seven Wonders of the World.</History>
     <Icon>structures/lighthouse.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="25.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
   </Position>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
       <constructed>interface/complete/building/complete_temple.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <TerritoryInfluence>
     <Radius>0</Radius>
   </TerritoryInfluence>
   <Vision>
     <Range>180</Range>
     <RevealShore>true</RevealShore>
   </Vision>
   <VisualActor>
     <Actor>structures/ptolemies/lighthouse.xml</Actor>
     <FoundationActor>structures/fndn_4x4_dock.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml	(revision 18740)
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>100</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="12.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>spart</Civ>
     <GenericName>Spartan Senate</GenericName>
     <SpecificName>Gerontía</SpecificName>
     <Tooltip>Train heroes.</Tooltip>
     <History>The Gerontía (called Gerousía in Athens) is the meeting place for the 30 elected city elders. Of the 30 members, 2 of them were the hereditary Spartan kings, one each from the Agiad and the Eurypontid clans.</History>
     <Icon>structures/tholos.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>25</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_hero_leonidas
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tholos.xml</select>
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/hellenes/prytaneion.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml	(revision 18740)
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="20.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>spart</Civ>
     <GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssítion</SpecificName>
     <Classes datatype="tokens">Syssiton</Classes>
     <Tooltip>Train Spartan heroes and Spartiate champion hoplites.</Tooltip>
     <History>The Syssítia were where full-blooded Spartans, even Spartan kings, were barracked and dined together.</History>
     <Icon>structures/gymnasion.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_hero_leonidas
       units/{civ}_hero_brasidas
       units/{civ}_hero_agis
       units/{civ}_champion_infantry_spear
     </Entities>
     <Technologies datatype="tokens">
       hellenes/spartans_agoge
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/spartans/syssiton.xml</Actor>
     <FoundationActor>structures/fndn_4x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml	(revision 18740)
@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>15.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>76.0</MaxRange>
       <MinRange>10.0</MinRange>
       <ElevationBonus>15</ElevationBonus>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Category>DefenseTower</Category>
     <Distance>
       <FromClass>DefenseTower</FromClass>
       <MinDistance>60</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>100</wood>
       <stone>100</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>15.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Defense Tower</GenericName>
     <Tooltip>Shoots arrows. Garrison to provide extra defense. Needs the murder holes tech to protect its foot.</Tooltip>
     <Classes datatype="tokens">Tower GarrisonTower -ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Town DefenseTower</VisibleClasses>
     <Icon>structures/defense_tower.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>20</stone>
   </Loot>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       attack_tower_watch
       attack_tower_crenellations
       attack_tower_range
       attack_tower_murderholes
       attack_tower_defense
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tower.xml</select>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
       <attack>attack/weapon/arrowfly.xml</attack>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>21.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>32</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>80</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </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 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml	(revision 18740)
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense">
   <BuildRestrictions>
     <PlacementType>land-shore</PlacementType>
     <Category>Wall</Category>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>25</BuildTime>
     <Resources>
       <stone>20</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>rubble/rubble_wall</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical Defensive StoneWall</Classes>
     <GenericName>Stone Wall</GenericName>
     <Tooltip>Wall off your town for a stout defense.</Tooltip>
     <Icon>structures/wall.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>15</stone>
   </Loot>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Repairable>
     <RepairTimeRatio>4.5</RepairTimeRatio>
   </Repairable>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_wall.xml</select>
       <constructed>interface/complete/building/complete_wall.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>20</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_wall.xml</FoundationActor>
   </VisualActor>
 </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 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml	(revision 18740)
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>72.0</MaxRange>
       <MinRange>12.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>0</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <PlacementType>land-shore</PlacementType>
     <Category>Wall</Category>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>80</BuildTime>
     <Resources>
       <stone>90</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>2</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>4000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_wall_tower</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Wall Turret</GenericName>
     <Tooltip>Shoots arrows. Garrison to defend a city wall against attackers.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical StoneWall Tower</Classes>
     <Icon>structures/tower.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>15</stone>
   </Loot>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
     <ControlPersist/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Technologies datatype="tokens">
       pair_walls_01
     </Technologies>
   </ProductionQueue>
   <Repairable>
     <RepairTimeRatio>4.5</RepairTimeRatio>
   </Repairable>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tower.xml</select>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
       <attack>attack/weapon/arrowfly.xml</attack>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>20.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>20</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wooden_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wooden_tower.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wooden_tower.xml	(revision 18740)
@@ -1,74 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_defense_tower">
   <Armour>
     <Hack op="add">-5.0</Hack>
     <Pierce op="add">-5.0</Pierce>
     <Crush op="add">-2.0</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>6.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>60.0</MaxRange>
       <MinRange>4.0</MinRange>
     </Ranged>
   </Attack>
   <BuildRestrictions>
     <Category>DefenseTower</Category>
     <Distance>
       <FromClass>DefenseTower</FromClass>
       <MinDistance>40</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>800</CapturePoints>
   </Capturable>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>100</wood>
       <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="9.5" depth="8.5"/>
     <Height>9.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>3</Max>
   </GarrisonHolder>
   <Health>
     <Max>250</Max>
   </Health>
   <Identity>
     <SpecificName>Wooden Tower</SpecificName>
     <GenericName>Wooden Tower</GenericName>
     <Icon>structures/palisade_fort.png</Icon>
     <Classes datatype="tokens">WoodenTower</Classes>
     <VisibleClasses datatype="tokens">Village -Town</VisibleClasses>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>20</wood>
-    <stone disable=""/>
+    <stone>0</stone>
   </Loot>
   <Obstruction>
     <Static width="9.0" depth="7.5"/>
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
       -attack_tower_crenellations
       -attack_tower_range
       -attack_tower_murderholes
       -attack_tower_defense
     </Technologies>
   </ProductionQueue>
   <StatusBars>
     <HeightOffset>18.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>props/special/palisade_rocks_fort.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml	(revision 18740)
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">library</Auras>
   <BuildRestrictions>
     <Category>Library</Category>
   </BuildRestrictions>
   <Footprint>
     <Square width="29.0" depth="34.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Library</GenericName>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <Tooltip>Research special technologies.</Tooltip>
     <History>Alexander the Great founded libraries all over his new empire. These became centers of learning for an entirely new synthesized culture: the Hellenistic culture.</History>
     <Icon>structures/library_scroll.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       successors/special_hellenistic_metropolis
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
       <constructed>interface/complete/building/complete_temple.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>50</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/macedonians/library.xml</Actor>
     <FoundationActor>structures/fndn_4x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml	(revision 18740)
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">theatron</Auras>
   <BuildRestrictions>
     <Category>Theater</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>500</stone>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="24.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <GenericName>Greek Theater</GenericName>
     <SpecificName>Théātron</SpecificName>
     <Classes datatype="tokens">Theater -ConquestCritical</Classes>
     <History>Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture and spreading its influence.</History>
     <Icon>structures/theatron.png</Icon>
   </Identity>
   <Loot>
-    <wood disable=""/>
+    <wood>0</wood>
     <stone>125</stone>
     <metal>125</metal>
   </Loot>
   <Obstruction>
     <Static width="46.0" depth="46.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_greek_theater.xml</select>
       <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>100</Radius>
   </TerritoryInfluence>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml	(revision 18739)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml	(revision 18740)
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Armour>
     <Hack>4</Hack>
     <Pierce>2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>6.5</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>35</wood>
       <metal>20</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Sword</VisibleClasses>
     <GenericName>Cavalry Swordsman</GenericName>
     <History>Fighting from horseback with a sword is a tricky thing to do. This required usage of a sword that was longer than the typical infantry sword. One needed a good reach to attack from the height of a horse. If you were without spear (the ideal weapon of choice) it was probably because you needed your hands free to do other tasks such as riding hard and fast. It wasn't uncommon for the men to dismount and attack from foot if they were armed with only a sword.</History>
   </Identity>
   <Loot>
-    <wood disabled=""/>
+    <wood>0</wood>
     <metal>5</metal>
   </Loot>
   <UnitMotion>
     <WalkSpeed>20.0</WalkSpeed>
     <Run>
       <Speed>28.75</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>