Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantry_02.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantry_02.json	(revision 24603)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantry_02.json	(nonexistent)
@@ -1,27 +0,0 @@
-{
-	"genericName": "Laminated Linen Body Armor",
-	"specificName": {
-		"athen": "Linothōrax",
-		"mace": "Linothōrax",
-		"ptol": "Linothōrax",
-		"sele": "Linothōrax",
-		"spart": "Linothōrax"
-	},
-	"description": "Laminated linen body armor for infantrymen.",
-	"cost": {
-		"wood": 1000,
-		"metal": 450
-	},
-	"supersedes": "armor_infantry_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "armor_pteruges.png",
-	"researchTime": 40,
-	"tooltip": "Infantry +1 hack and pierce resistance.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 }
-	],
-	"affects": ["Infantry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantry_02.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/armor_infantry_01.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantry_01.json	(revision 24603)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantry_01.json	(nonexistent)
@@ -1,26 +0,0 @@
-{
-	"genericName": "Quilted Body Armor",
-	"specificName": {
-		"athen": "Spolas",
-		"mace": "Spolas",
-		"ptol": "Spolas",
-		"sele": "Spolas",
-		"spart": "Spolas"
-	},
-	"description": "Quilted linen or leather body armor for infantrymen.",
-	"cost": {
-		"wood": 1000,
-		"metal": 350
-	},
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "armor_leather.png",
-	"researchTime": 40,
-	"tooltip": "Infantry +1 hack and pierce resistance.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 }
-	],
-	"affects": ["Infantry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantry_01.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/armor_cav_02.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_cav_02.json	(revision 24603)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_cav_02.json	(nonexistent)
@@ -1,20 +0,0 @@
-{
-	"genericName": "Chamfron",
-	"description": "Metal armor for a horse's body.",
-	"cost": {
-		"wood": 1000,
-		"metal": 450
-	},
-	"supersedes": "armor_cav_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "armor_plates_cavalry.png",
-	"researchTime": 40,
-	"tooltip": "Cavalry +1 hack and pierce resistance.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_cav_02.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/armor_cav_01.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_cav_01.json	(revision 24603)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_cav_01.json	(nonexistent)
@@ -1,26 +0,0 @@
-{
-	"genericName": "Chamfron",
-	"specificName": {
-		"athen": "Prometōpidion",
-		"mace": "Prometōpidion",
-		"ptol": "Prometōpidion",
-		"sele": "Prometōpidion",
-		"spart": "Prometōpidion"
-	},
-	"description": "Metal armor for a horse's face.",
-	"cost": {
-		"wood": 1000,
-		"metal": 350
-	},
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "armor_plates_cavalry.png",
-	"researchTime": 40,
-	"tooltip": "Cavalry +1 hack and pierce resistance.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_cav_01.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/soldier_resistance_hack_01.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_01.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_01.json	(revision 24604)
@@ -0,0 +1,25 @@
+{
+	"genericName": "Quilted Body Armor",
+	"specificName": {
+		"athen": "Spolas",
+		"mace": "Spolas",
+		"ptol": "Spolas",
+		"sele": "Spolas",
+		"spart": "Spolas"
+	},
+	"description": "Body armor made from quilted wool, linen, cotton, or leather.",
+	"cost": {
+		"food": 400,
+		"metal": 400
+	},
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "armor_leather.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +1 hack resistance.",
+	"modifications": [
+		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 }
+	],
+	"affects": ["Soldier"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_01.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json	(revision 24604)
@@ -0,0 +1,26 @@
+{
+	"genericName": "Laminated Linen Body Armor",
+	"specificName": {
+		"athen": "Linothōrax",
+		"mace": "Linothōrax",
+		"ptol": "Linothōrax",
+		"sele": "Linothōrax",
+		"spart": "Linothōrax"
+	},
+	"description": "Body armor made from laminated linen.",
+	"cost": {
+		"wood": 600,
+		"metal": 600
+	},
+	"supersedes": "soldier_resistance_hack_01",
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "armor_pteruges.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +1 hack resistance.",
+	"modifications": [
+		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 }
+	],
+	"affects": ["Soldier"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_01.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_01.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_01.json	(revision 24604)
@@ -0,0 +1,18 @@
+{
+	"genericName": "Wooden Shield",
+	"description": "Wooden shields are heavier but much better able to resist projectiles and blows than wicker-frame shields.",
+	"cost": {
+		"wood": 400,
+		"metal": 400
+	},
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "shield_parma.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +1 pierce resistance.",
+	"modifications": [
+		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 }
+	],
+	"affects": ["Soldier"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_01.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json	(revision 24604)
@@ -0,0 +1,19 @@
+{
+	"genericName": "Metal Shield",
+	"description": "Strengthen shields with a metal rim or spine.",
+	"cost": {
+		"wood": 600,
+		"metal": 600
+	},
+	"supersedes": "soldier_resistance_pierce_01",
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "shields_generic_bronze.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +1 pierce resistance.",
+	"modifications": [
+		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 }
+	],
+	"affects": ["Soldier"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml	(revision 24603)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml	(revision 24604)
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
     <BuildTime>120</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="22.0" depth="22.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
     <List datatype="tokens">Infantry Healer</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Forge</GenericName>
     <SelectionGroupName>template_structure_military_forge</SelectionGroupName>
     <Tooltip>Research attack and resistance technologies.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Town Forge</VisibleClasses>
     <Icon>structures/blacksmith.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>40</wood>
   </Loot>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
       attack_infantry_melee_01
       attack_infantry_melee_02
       attack_infantry_ranged_01
       attack_infantry_ranged_02
       attack_cavalry_melee_01
       attack_cavalry_melee_02
       attack_cavalry_ranged_01
       attack_cavalry_ranged_02
-      armor_infantry_01
-      armor_infantry_02
-      armor_cav_01
-      armor_cav_02
+      soldier_resistance_hack_01
+      soldier_resistance_hack_02
+      soldier_resistance_pierce_01
+      soldier_resistance_pierce_02
       armor_hero_01
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_forge.xml</select>
       <constructed>interface/complete/building/complete_forge.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>38</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>