Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_armor.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_armor.json	(revision 24721)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_armor.json	(nonexistent)
@@ -1,23 +0,0 @@
-{
-	"genericName": "Armor plating",
-	"description": "Increased armor on siege engines.",
-	"cost": {
-		"wood": 500,
-		"metal": 250
-	},
-	"requirements": {
-		"all": [
-			{ "tech": "phase_city" },
-			{ "notciv": "maur" }
-		]
-	},
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "armor_plates_gold.png",
-	"researchTime": 40,
-	"tooltip": "Siege Engines +2 hack resistance.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 2 }
-	],
-	"affects": ["Siege"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_armor.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json	(revision 24721)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json	(nonexistent)
@@ -1,24 +0,0 @@
-{
-	"genericName": "Artillery Instructors",
-	"description": "Siege engines require less wood.",
-	"cost": {
-		"food": 500,
-		"stone": 250,
-		"metal": 500
-	},
-	"requirements": {
-		"all": [
-			{ "tech": "phase_city" },
-			{ "notciv": "maur" }
-		]
-	},
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "anvil.png",
-	"researchTime": 40,
-	"tooltip": "Siege Engines −20% wood cost.",
-	"modifications": [
-		{ "value": "Cost/Resources/wood", "multiply": 0.8 }
-	],
-	"affects": ["Siege"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json	(revision 24721)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json	(nonexistent)
@@ -1,24 +0,0 @@
-{
-	"genericName": "Metalworker",
-	"description": "Siege engines require less metal.",
-	"cost": {
-		"food": 500,
-		"wood": 500,
-		"stone": 250
-	},
-	"requirements": {
-		"all": [
-			{ "tech": "phase_city" },
-			{ "notciv": "maur" }
-		]
-	},
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "metalworker.png",
-	"researchTime": 40,
-	"tooltip": "Siege Engines −20% metal cost.",
-	"modifications": [
-		{ "value": "Cost/Resources/metal", "multiply": 0.8 }
-	],
-	"affects": ["Siege"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_attack.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_attack.json	(revision 24721)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_attack.json	(revision 24722)
@@ -1,24 +1,24 @@
 {
 	"genericName": "Advanced Siege",
 	"description": "Advanced technologies improve siege efficiency.",
 	"cost": {
-		"wood": 1000,
+		"wood": 800,
 		"metal": 500
 	},
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
 			{ "notciv": "maur" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "siege_ram.png",
 	"researchTime": 40,
 	"tooltip": "Siege Engines +25% attack crush damage.",
 	"modifications": [
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.25 },
 		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.25 }
 	],
 	"affects": ["Siege"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_build_time.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_build_time.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_build_time.json	(revision 24722)
@@ -0,0 +1,17 @@
+{
+	"genericName": "Siegecraft",
+	"description": "The science or craft of laying or carrying out sieges.",
+	"cost": {
+		"wood": 600
+	},
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "engineering.png",
+	"researchTime": 40,
+	"tooltip": "Siege Weapons −40% construction time.",
+	"modifications": [
+		{ "value": "Cost/BuildTime", "multiply": 0.8 }
+	],
+	"affects": ["Siege"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_build_time.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_health.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_health.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_health.json	(revision 24722)
@@ -0,0 +1,17 @@
+{
+	"genericName": "Armor plating",
+	"description": "Cover the exterior with iron plates to protect against fire and projectiles.",
+	"cost": {
+		"metal": 600
+	},
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "armor_plates_gold.png",
+	"researchTime": 40,
+	"tooltip": "Siege Towers and Battering Rams +25% health.",
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 1.25 }
+	],
+	"affects": ["Ram", "SiegeTower"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_health.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json	(revision 24722)
@@ -0,0 +1,27 @@
+{
+	"genericName": "Military Engineers",
+	"description": "Military engineers are responsible for improvements in siege weapons",
+	"cost": {
+		"food": 800
+	},
+	"requirements": {
+		"all": [
+			{ "tech": "phase_city" },
+			{ "notciv": "brit" },
+			{ "notciv": "gaul" },
+			{ "notciv": "iber" },
+			{ "notciv": "maur" },
+			{ "notciv": "kush" },
+			{ "notciv": "pers" }
+		]
+	},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "military_engineers.png",
+	"researchTime": 40,
+	"tooltip": "Siege Weapons –40% pack and unpack time.",
+	"modifications": [
+		{ "value": "Pack/Time", "multiply": 0.6 }
+	],
+	"affects": ["Siege"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml	(revision 24721)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml	(revision 24722)
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Auras datatype="tokens">
     structures/arsenal_repair
   </Auras>
   <Cost>
     <BuildTime>180</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>2</Max>
     <List datatype="tokens">Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Arsenal</GenericName>
     <SelectionGroupName>template_structure_military_arsenal</SelectionGroupName>
     <Tooltip>Train Champion Infantry Crossbowmen, construct Siege Engines, and research Siege Engine technologies.</Tooltip>
     <VisibleClasses datatype="tokens">City Arsenal</VisibleClasses>
     <Icon>structures/siege_workshop.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>60</wood>
   </Loot>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry_crossbowman
       units/{civ}/siege_scorpio_packed
       units/{civ}/siege_polybolos_packed
       units/{civ}/siege_oxybeles_packed
       units/{civ}/siege_lithobolos_packed
       units/{civ}/siege_ballista_packed
       units/{civ}/siege_ram
       units/{civ}/siege_tower
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
+      siege_build_time
+      siege_health
+      siege_pack_unpack
       siege_bolt_accuracy
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_barracks.xml</constructed>
       <select>interface/select/building/sel_barracks.xml</select>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>38</Radius>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>