Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json	(revision 23824)
@@ -1,16 +1,19 @@
 {
 	"type": "range",
-	"radius": 60,
+	"radius": 70,
 	"affects": ["Soldier"],
 	"modifications": [
+		{ "value": "Armour/Hack", "add": 1 },
+		{ "value": "Armour/Pierce", "add": 1 },
+		{ "value": "Armour/Crush", "add": 1 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 },
 		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.1 },
 		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.1 },
 		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.1 }
 	],
 	"auraName": "Exhortative Presence",
-	"auraDescription": "Soldiers +10% melee and ranged attack damage.",
+	"auraDescription": "Soldiers +1 armor level and +10% melee and ranged attack damage.",
 	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json	(revision 23824)
@@ -1,14 +1,14 @@
 {
 	"genericName": "Wooden Construction",
 	"autoResearch": true,
 	"description": "Celtic structures were mostly made of wood with rubble foundations.",
 	"requirements": { "any": [{ "civ": "brit" }, { "civ": "gaul" }] },
 	"icon": "wooden_buildings.png",
 	"tooltip": "Briton and Gaulish Structures −20% build time, −20% health, and −20% capture points.",
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 0.8 },
 		{ "value": "Capturable/CapturePoints", "multiply": 0.8 },
 		{ "value": "Cost/BuildTime", "multiply": 0.8 }
 	],
-	"affects": ["Structure"]
+	"affects": ["Structure !Wonder"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json	(revision 23824)
@@ -1,14 +1,14 @@
 {
 	"genericName": "Hellenic Architecture",
 	"autoResearch": true,
 	"description": "The Greeks used stone construction from early Mycenaean times.",
 	"requirements": { "any": [{ "civ": "athen" }, { "civ": "mace" }, { "civ": "spart" }] },
 	"icon": "ionic_column.png",
 	"tooltip": "Athenian, Macedonian, and Spartan Structures +10% build time, +10% health, and +10% capture points.",
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.1 },
 		{ "value": "Capturable/CapturePoints", "multiply": 1.1 },
 		{ "value": "Cost/BuildTime", "multiply": 1.1 }
 	],
-	"affects": ["Structure"]
+	"affects": ["Structure !Wonder"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json	(revision 23824)
@@ -1,15 +1,21 @@
 {
 	"genericName": "Monumental Architecture",
-	"cost": { "food": 0, "wood": 500, "stone": 250, "metal": 250 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "civ": "kush" }] },
-	"requirementsTooltip": "Unlocked in City Phase.",
+	"cost": { "food": 0, "wood": 0, "stone": 600, "metal": 0 },
+	"requirements": {
+		"all": [
+			{ "tech": "phase_town" },
+			{ "civ": "kush" }
+		]
+	},
+	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "pers_hundred_columns.png",
 	"researchTime": 60,
-	"tooltip": "+25% HP and -50% build time for Civic Centers, Temples, Pyramids and Wonders.",
+	"tooltip": "Civic Structures +20% build time, +20% health, and +20% capture points.",
 	"modifications": [
-		{ "value": "Health/Max", "multiply": 1.25 },
-		{ "value": "Cost/BuildTime", "multiply": 0.5 }
+		{ "value": "Capturable/CapturePoints", "multiply": 1.2 },
+		{ "value": "Cost/BuildTime", "multiply": 1.2 },
+		{ "value": "Health/Max", "multiply": 1.2 }
 	],
-	"affects": ["CivilCentre", "Wonder", "Pyramid", "Temple"],
+	"affects": ["Civic"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json	(revision 23824)
@@ -1,16 +1,16 @@
 {
 	"genericName": "Persian Architecture",
 	"description": "The Persians built the wonderful 1677 mile-long Royal Highway from Sardis to Susa; Darius the Great and Xerxes also built the magnificent Persepolis; Cyrus the Great greatly improved Ecbatana and virtually 'rebuilt' the old Elamite capital of Susa.",
 	"cost": { "food": 0, "wood": 200, "stone": 200, "metal": 0 },
 	"requirements": { "all": [{ "tech": "phase_village" }, { "civ": "pers" }] },
 	"icon": "stone_blocks.png",
 	"researchTime": 60,
 	"tooltip": "All Persian structures +25% health and capture points, but also +20% build time.",
 	"modifications": [
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
 		{ "value": "Capturable/CapturePoints", "multiply": 1.25 },
 		{ "value": "Health/Max", "multiply": 1.25 }
 	],
-	"affects": ["Structure"],
+	"affects": ["Structure !Wonder"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml	(revision 23824)
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
   <Footprint>
     <Square width="32.0" depth="32"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Pr-nsw</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="31.0" depth="31"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_archer_b
       units/{civ}_cavalry_javelinist_b
     </Entities>
+    <Technologies datatype="tokens">
+      kushites/monumental_architecture
+    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/civic_centre_kush.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml	(revision 23824)
@@ -1,65 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
+<Entity parent="template_structure_civic">
   <Auras datatype="tokens">
-    structures/kush_pyramids_territory
-    structures/kush_pyramids_economic
     structures/kush_pyramids_military
   </Auras>
   <BuildRestrictions>
     <Category>PyramidLarge</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
-      <stone>400</stone>
-      <metal>400</metal>
+      <stone>450</stone>
+      <metal>150</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="22.0" depth="26.0"/>
     <Height>20.0</Height>
   </Footprint>
   <Health>
     <Max>3000</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Large Pyramid</GenericName>
     <SpecificName>mr ʿȝ</SpecificName>
-    <VisibleClasses datatype="tokens">Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid PyramidLarge</Classes>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">City Pyramid</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/kush_pyramid_big.png</Icon>
   </Identity>
   <Loot>
-    <stone>80</stone>
-    <metal>80</metal>
+    <stone>90</stone>
+    <metal>30</metal>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="24.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      kushites/monumental_architecture
-    </Technologies>
-  </ProductionQueue>
+  <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple_10.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>15.0</HeightOffset>
   </StatusBars>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>40</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/kushites/pyramid_large.xml</Actor>
     <FoundationActor>structures/fndn_5x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml	(revision 23824)
@@ -1,58 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
+<Entity parent="template_structure_civic">
   <Auras datatype="tokens">
     structures/kush_pyramids_economic
   </Auras>
   <BuildRestrictions>
     <Category>PyramidSmall</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
-      <food>300</food>
       <stone>300</stone>
+      <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Small Pyramid</GenericName>
     <SpecificName>mr</SpecificName>
-    <VisibleClasses datatype="tokens">-City Town Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid PyramidSmall</Classes>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Town Pyramid</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>structures/kush_pyramid_small.png</Icon>
   </Identity>
   <Loot>
-    <food>60</food>
     <stone>60</stone>
+    <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple_10.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>12.0</HeightOffset>
-  </StatusBars>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>30</Radius>
+    <Weight>30000</Weight>
+  </TerritoryInfluence>
   <Vision>
     <Range>30</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/kushites/pyramid_small.xml</Actor>
     <FoundationActor>structures/fndn_4x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml	(revision 23823)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml	(revision 23824)
@@ -1,107 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
     <Hack>15</Hack>
     <Pierce>25</Pierce>
     <Crush>3</Crush>
     <Foundation>
       <Hack>2</Hack>
       <Pierce>10</Pierce>
       <Crush>2</Crush>
     </Foundation>
   </Armour>
   <Auras datatype="tokens">
-    structures/epic_temple_heal
     structures/wonder_pop_1
     structures/wonder_pop_2
   </Auras>
   <BuildRestrictions>
     <Category>Wonder</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>2000</CapturePoints>
     <RegenRate>5.0</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>1000</BuildTime>
     <Resources>
-      <food>1000</food>
       <wood>1000</wood>
-      <stone>1000</stone>
+      <stone>1500</stone>
       <metal>1000</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="34.0" depth="34.0"/>
     <Height>10.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>50</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Soldier</List>
     <BuffHeal>5</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>5000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Wonder</GenericName>
     <SelectionGroupName>template_structure_wonder</SelectionGroupName>
     <Tooltip>Bring glory to your civilization and add large tracts of land to your empire.</Tooltip>
     <VisibleClasses datatype="tokens">City Wonder</VisibleClasses>
     <Icon>structures/wonder.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>300</xp>
-    <food>200</food>
     <wood>200</wood>
-    <stone>200</stone>
+    <stone>300</stone>
     <metal>200</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       pop_wonder
     </Technologies>
   </ProductionQueue>
   <ResourceTrickle>
     <Rates>
       <food>1.0</food>
       <wood>1.0</wood>
       <stone>1.0</stone>
       <metal>1.0</metal>
     </Rates>
     <Interval>2000</Interval>
   </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_wonder.xml</select>
       <constructed>interface/complete/building/complete_wonder.xml</constructed>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>100</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>72</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
   </VisualActor>
   <Wonder/>
 </Entity>