Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml	(revision 23887)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml	(revision 23888)
@@ -1,118 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AttackDetection>
     <SuppressionTransferRange>80</SuppressionTransferRange>
     <SuppressionRange>160</SuppressionRange>
     <SuppressionTime>60000</SuppressionTime>
   </AttackDetection>
   <BattleDetection>
     <TimerInterval>200</TimerInterval>
     <RecordLength>12</RecordLength>
     <DamageRateThreshold>0.04</DamageRateThreshold>
     <AlertnessBattleThreshold>4</AlertnessBattleThreshold>
     <AlertnessPeaceThreshold>0</AlertnessPeaceThreshold>
     <AlertnessMax>8</AlertnessMax>
   </BattleDetection>
   <EntityLimits>
     <Limits>
       <CivilCentre>1</CivilCentre>
       <Tower>30</Tower>
       <Fortress>10</Fortress>
       <Wonder>1</Wonder>
       <Hero>1</Hero>
       <Palace>1</Palace>
       <Embassy>3</Embassy>
       <Monument>5</Monument>
       <Pillar>0</Pillar>
       <Theater>1</Theater>
       <Council>1</Council>
       <Library>1</Library>
       <Lighthouse>1</Lighthouse>
       <Juggernaut>1</Juggernaut>
-      <IshtarGate>1</IshtarGate>
-      <Hall>2</Hall>
       <Stoa>2</Stoa>
       <PyramidSmall>4</PyramidSmall>
       <PyramidLarge>2</PyramidLarge>
       <TempleOfAmun>1</TempleOfAmun>
       <TempleOfVesta>1</TempleOfVesta>
       <Gladiator>0</Gladiator>
       <WarDog>20</WarDog>
     </Limits>
     <LimitChangers>
       <Pillar>
         <Ashoka>5</Ashoka>
       </Pillar>
       <Juggernaut>
         <PtolemyIV>4</PtolemyIV>
       </Juggernaut>
       <Gladiator>
         <Amphitheater>15</Amphitheater>
       </Gladiator>
     </LimitChangers>
     <LimitRemovers>
       <CivilCentre>
         <RequiredTechs datatype="tokens">phase_town</RequiredTechs>
       </CivilCentre>
     </LimitRemovers>
   </EntityLimits>
   <Identity>
     <Civ/>
     <GenericName>Player</GenericName>
     <Classes datatype="tokens">Player</Classes>
     <Undeletable>true</Undeletable>
   </Identity>
   <Player>
     <BarterMultiplier>
       <Buy>
         <food>1.0</food>
         <wood>1.0</wood>
         <stone>1.0</stone>
         <metal>1.0</metal>
       </Buy>
       <Sell>
         <food>1.0</food>
         <wood>1.0</wood>
         <stone>1.0</stone>
         <metal>1.0</metal>
       </Sell>
     </BarterMultiplier>
     <SharedLosTech>unlock_shared_los</SharedLosTech>
     <SharedDropsitesTech>unlock_shared_dropsites</SharedDropsitesTech>
     <SpyCostMultiplier>1.0</SpyCostMultiplier>
   </Player>
   <ResourceTrickle>
     <Rates>
       <food>0.0</food>
       <wood>0.0</wood>
       <stone>0.0</stone>
       <metal>0.0</metal>
     </Rates>
     <Interval>1000</Interval>
   </ResourceTrickle>
   <StatisticsTracker>
 	<!-- The summary screen and lobby rankings expect these classes, but additional classes may be added -->
 	<UnitClasses datatype="tokens">
 		Infantry
 		Worker
 		FemaleCitizen
 		Cavalry
 		Champion
 		Hero
 		Siege
 		Ship
 		Domestic
 		Trader
 	</UnitClasses>
 	<StructureClasses datatype="tokens">
 		House
 		Economic
 		Outpost
 		Military
 		Fortress
 		CivCentre
 		Wonder
 	</StructureClasses>
   </StatisticsTracker>
   <TechnologyManager/>
 </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 23887)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml	(revision 23888)
@@ -1,63 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <BuildRestrictions>
-    <Category>Hall</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <stone>250</stone>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Gate of All Nations</GenericName>
     <SpecificName>Duvarθi Visadahyu</SpecificName>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Hall</VisibleClasses>
     <Icon>structures/pers_hall.png</Icon>
-    <Tooltip>Train Champions.</Tooltip>
   </Identity>
   <Loot>
     <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>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/hall.xml</Actor>
     <FoundationActor>structures/fndn_7x7.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 23887)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml	(revision 23888)
@@ -1,55 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">
     structures/loyalty_regen
   </Auras>
   <BuildRestrictions>
     <Category>IshtarGate</Category>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>250</stone>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="17.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Ishtar Gate of Babylon</GenericName>
-    <Tooltip>Territory root.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">IshtarGate</VisibleClasses>
     <Icon>structures/pers_gate.png</Icon>
   </Identity>
   <Loot>
     <stone>50</stone>
     <metal>100</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_9x3_wall.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml	(revision 23887)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml	(revision 23888)
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
       structures/pers_stable
       structures/pers_apadana
-      structures/pers_ishtar_gate
-      structures/pers_hall
     </Entities>
   </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers_infantry_archer_b</SelectionGroupName>
     <GenericName>Sogdian Archer</GenericName>
     <SpecificName>Θanuvaniya Suguda</SpecificName>
     <Icon>units/pers_infantry_archer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers_infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml	(revision 23887)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml	(revision 23888)
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
       structures/pers_stable
       structures/pers_apadana
-      structures/pers_ishtar_gate
-      structures/pers_hall
     </Entities>
   </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers_infantry_javelinist_b</SelectionGroupName>
     <GenericName>Lydian Auxiliary</GenericName>
     <SpecificName>Pastiš Spardiya</SpecificName>
     <Icon>units/pers_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_infantry_javelinist_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml	(revision 23887)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml	(revision 23888)
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
       structures/pers_stable
       structures/pers_apadana
-      structures/pers_ishtar_gate
-      structures/pers_hall
     </Entities>
   </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers_infantry_spearman_b</SelectionGroupName>
     <GenericName>Shield Bearer</GenericName>
     <SpecificName>Sparabara</SpecificName>
     <Icon>units/pers_infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers_infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>