Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json	(nonexistent)
@@ -1,17 +0,0 @@
-{
-	"pair": "pair_walls_01",
-	"genericName": "Geometric Masonry",
-	"description": "Using geometric masonry increases the sturdiness of defensive walls.",
-	"cost": { "food": 0, "wood": 0, "stone": 200, "metal": 0 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "stone_blocks.png",
-	"researchTime": 40,
-	"tooltip": "Walls +2 crush armor, but +10% build time.",
-	"modifications": [
-		{ "value": "Armour/Crush", "add": 2 },
-		{ "value": "Cost/BuildTime", "multiply": 1.1 }
-	],
-	"affects": ["Wall"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json	(nonexistent)
@@ -1,17 +0,0 @@
-{
-	"pair": "pair_walls_01",
-	"genericName": "Rubble Materials",
-	"description": "Using rubble materials reduces the costs and build times of walls.",
-	"cost": { "food": 0, "wood": 200, "stone": 0, "metal": 0 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "stone_blocks_brown.png",
-	"researchTime": 40,
-	"tooltip": "Walls −20% build time, but −1 crush armor.",
-	"modifications": [
-		{ "value": "Armour/Crush", "add": -1 },
-		{ "value": "Cost/BuildTime", "multiply": 0.8 }
-	],
-	"affects": ["Wall"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json	(nonexistent)
@@ -1,6 +0,0 @@
-{
-	"genericName": "Wall armor vs build time.",
-	"top": "buildtime_walls_rubble",
-	"bottom": "health_walls_geometric_masonry",
-	"requirements": { "notciv": "iber" }
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml	(revision 23915)
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_tower">
   <Footprint replace="">
     <Circle radius="6"/>
     <Height>13</Height>
   </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Dorre</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="10" depth="10"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -pair_walls_01
-    </Technologies>
-  </ProductionQueue>
   <StatusBars>
     <HeightOffset>14</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>structures/iberians/wall_tower.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>10</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml	(revision 23915)
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive">
   <BuildRestrictions>
     <PlacementType>land-shore</PlacementType>
     <Category>Wall</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>1200</CapturePoints>
   </Capturable>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Wall</GenericName>
     <SelectionGroupName>template_structure_defensive_wall</SelectionGroupName>
     <Tooltip>Wall off your town for a stout defense.</Tooltip>
     <VisibleClasses datatype="tokens">Wall</VisibleClasses>
     <Icon>structures/wall.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
+  <ProductionQueue 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>
     </SoundGroups>
   </Sound>
   <TerritoryDecay>
     <DecayRate>5.0</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>20</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml	(revision 23915)
@@ -1,52 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall">
   <!-- We need a Cost component, although gates cannot be built directly, as Cost/BuildTime is required to prevent instantaneous repair -->
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>12</wood>
       <stone>18</stone>
     </Resources>
   </Cost>
   <GarrisonHolder disable=""/>
   <Gate>
     <PassRange>20</PassRange>
   </Gate>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_long</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Gate</GenericName>
     <SelectionGroupName>template_structure_defensive_wall_gate</SelectionGroupName>
     <Tooltip>Allow units access through Walls. Can be locked to prevent access.</Tooltip>
     <VisibleClasses datatype="tokens">Gate</VisibleClasses>
     <Icon>structures/gate.png</Icon>
   </Identity>
   <Loot>
     <wood>2</wood>
     <stone>4</stone>
   </Loot>
   <Obstruction>
     <Static disable=""/>
   </Obstruction>
-  <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gate.xml</select>
       <upgraded>interface/complete/building/complete_gate.xml</upgraded>
       <constructed>interface/complete/building/complete_gate.xml</constructed>
       <gate_closing>actor/gate/stonegate_close.xml</gate_closing>
       <gate_opening>actor/gate/stonegate_open.xml</gate_opening>
       <gate_locked>interface/select/building/sel_gate.xml</gate_locked>
       <gate_unlocked>interface/select/building/sel_gate.xml</gate_unlocked>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <FoundationActor>structures/fndn_9x3_wall.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>36</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml	(revision 23915)
@@ -1,49 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall">
   <Auras datatype="tokens">
     structures/wall_garrisoned
   </Auras>
   <Cost>
     <BuildTime>36</BuildTime>
     <Resources>
       <stone>36</stone>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>5</Max>
     <List datatype="tokens">Ranged+Infantry</List>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_long</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Tooltip>Can be converted into a Gate.</Tooltip>
     <Classes datatype="tokens">WallLong</Classes>
   </Identity>
   <Loot>
     <stone>7</stone>
   </Loot>
-  <ProductionQueue disable=""/>
   <Upgrade>
     <Gate>
       <Entity>structures/{civ}_wall_gate</Entity>
       <Tooltip>Allow units access through Walls. Can be locked to prevent access.</Tooltip>
       <Cost>
         <wood>20</wood>
       </Cost>
       <Time>12</Time>
       <Variant>upgrading</Variant>
     </Gate>
   </Upgrade>
   <VisualActor>
     <FoundationActor>structures/fndn_9x3_wall.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>36</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml	(revision 23915)
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall">
   <Auras datatype="tokens">
     structures/wall_garrisoned
   </Auras>
   <Cost>
     <BuildTime>24</BuildTime>
     <Resources>
       <stone>24</stone>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>3</Max>
     <List datatype="tokens">Ranged+Infantry</List>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_medium</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Classes datatype="tokens">WallMedium</Classes>
   </Identity>
   <Loot>
     <stone>5</stone>
   </Loot>
-  <ProductionQueue disable=""/>
   <VisualActor>
     <FoundationActor>structures/fndn_6x3_wall.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>24</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml	(revision 23915)
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>12</BuildTime>
     <Resources>
       <stone>12</stone>
     </Resources>
   </Cost>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_short</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Classes datatype="tokens">WallShort</Classes>
   </Identity>
   <Loot>
     <stone>3</stone>
   </Loot>
-  <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3_wall.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>12</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml	(revision 23914)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml	(revision 23915)
@@ -1,83 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>8.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>12.0</MinRange>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>75.0</Speed>
         <Spread>1.5</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>0</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <BuildTime>80</BuildTime>
     <Resources>
       <stone>90</stone>
     </Resources>
   </Cost>
   <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>decay|rubble/rubble_stone_wall_tower</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Wall Turret</GenericName>
     <SelectionGroupName>template_structure_defensive_wall_tower</SelectionGroupName>
     <Tooltip>Garrison Infantry for additional arrows.</Tooltip>
     <Classes datatype="tokens">WallTower</Classes>
     <Icon>structures/tower.png</Icon>
   </Identity>
   <Loot>
     <stone>18</stone>
   </Loot>
   <Obstruction>
     <ControlPersist/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      pair_walls_01
-    </Technologies>
-  </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tower.xml</select>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3_tower.xml</FoundationActor>
   </VisualActor>
 </Entity>