Changed the phase up sound.

Added a new "tech complete" sound for ALL techs.

Added some new armor techs for infantry and spearmen.

This was SVN commit r13849.

binaries/data/mods/public/art/actors/props/special/eyecandy/road_temperate_intersect_x.xml

@@ -3,9 +3,13 @@
   <castshadow/>
   <group>
     <variant name="road temperate intersect X">
-      <decal width="20" depth="20" angle="0" offsetx="0" offsetz="0"/>
+      <decal angle="0" depth="20" offsetx="0" offsetz="0" width="20"/>
-      <textures><texture file="props/road_temperate_intersect_X.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/road_temperate_intersect_X.dds" name="baseTex"/>
+        <texture file="props/road_temperate_intersect_X_norm.png" name="normTex"/>
+        <texture file="props/road_temperate_intersect_X_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
-  <material>terrain_base.xml</material>
+  <material>terrain_norm_spec.xml</material>
 </actor>

binaries/data/mods/public/audio/interface/alarm/alarm_phase.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>0.1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>0.1</GainUpper>
+	<GainLower>0.08</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>alarmvictory_1.ogg</Replacement>
+	<Path>audio/interface/alarm/</Path>
+	<Sound>alarmvictory_1.ogg</Sound>
+</SoundGroup>

binaries/data/mods/public/audio/interface/alarm/alarm_techcomplete.xml

@@ -2,7 +2,7 @@
 <SoundGroup>
 	<Omnipresent>1</Omnipresent>
 	<HeardBy>owner</HeardBy>
-	<Gain>1</Gain>
+	<Gain>0.075</Gain>
 	<Pitch>1</Pitch>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
@@ -11,8 +11,8 @@
 	<Looping>0</Looping>
 	<RandOrder>1</RandOrder>
 	<RandGain>1</RandGain>
-	<GainUpper>1</GainUpper>
+	<GainUpper>0.1</GainUpper>
-	<GainLower>0.8</GainLower>
+	<GainLower>0.075</GainLower>
 	<RandPitch>1</RandPitch>
 	<PitchUpper>1.1</PitchUpper>
 	<PitchLower>0.9</PitchLower>

binaries/data/mods/public/audio/interface/alarm/alarm_upgradearmory.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
-	<Gain>1</Gain>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>0.25</Gain>
 	<Pitch>1</Pitch>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
@@ -9,8 +11,8 @@
 	<Looping>0</Looping>
 	<RandOrder>1</RandOrder>
 	<RandGain>1</RandGain>
-	<GainUpper>1</GainUpper>
+	<GainUpper>0.25</GainUpper>
-	<GainLower>0.8</GainLower>
+	<GainLower>0.2</GainLower>
 	<RandPitch>1</RandPitch>
 	<PitchUpper>1.1</PitchUpper>
 	<PitchLower>0.9</PitchLower>

binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "Equip your cavalry mounts with armor. All Cavalry +1 Hack armor level.",
 	"modifications": [{"value": "Armour/Hack", "add": 1.0}],
-	"affects": ["Cavalry"]
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_01.json

@@ -0,0 +1,28 @@
+{
+	"pair": "pair_inf_armor_01",
+	"genericName": "Quilted Body Armor",
+	"specificName": {
+		"hele": "Spolas",
+		"mace": "Spolas",
+		"spart": "Spolas",
+		"athen": "Spolas",
+		"pers": "Spolas",
+		"rome": "Spolas",
+		"cart": "Spolas",
+		"iber": "Spolas",
+		"maur": "Spolas",
+		"celt": "Spolas",
+		"brit": "Spolas",
+		"gaul": "Spolas"
+	},
+	"description": "Quilted linen or leather body armor for infantrymen.",
+	"cost": {"food": 0, "wood": 50, "stone": 0, "metal": 0},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "armor_cuirass_empire.png",
+	"researchTime": 40,
+	"tooltip": "All Infantry +1 Hack Armor Level.",
+	"modifications": [{"value": "Armour/Hack", "add": 1.0}],
+	"affects": ["Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_02.json

@@ -0,0 +1,23 @@
+{
+	"pair": "pair_inf_armor_02",
+	"genericName": "Laminated Linen Body Armor",
+	"specificName": {
+		"hele": "Linothorakes",
+		"mace": "Linothorakes",
+		"spart": "Linothorakes",
+		"athen": "Linothorakes",
+		"pers": "Linothorakes",
+		"rome": "Linothorakes",
+		"cart": "Linothorakes"
+	},
+	"description": "Reinforced laminated linen body armor for infantrymen.",
+	"cost": {"food": 100, "wood": 100, "stone": 0, "metal": 0},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "armor_plates_gold.png",
+	"researchTime": 40,
+	"tooltip": "All Infantry +1 Hack Armor Level.",
+	"modifications": [{"value": "Armour/Hack", "add": 1.0}],
+	"affects": ["Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json

@@ -0,0 +1,28 @@
+{
+	"pair": "pair_inf_armor_01",
+	"genericName": "Plywood Shield Construction",
+	"specificName": {
+		"hele": "Aspidiskè",
+		"mace": "Aspidiskè",
+		"spart": "Aspidiskè",
+		"athen": "Aspidiskè",
+		"pers": "Plywood Shield Construction",
+		"rome": "Plywood Shield Construction",
+		"cart": "Plywood Shield Construction",
+		"iber": "Plywood Shield Construction",
+		"maur": "Plywood Shield Construction",
+		"celt": "Plywood Shield Construction",
+		"brit": "Plywood Shield Construction",
+		"gaul": "Plywood Shield Construction"
+	},
+	"description": "Plywood construction for large shields.",
+	"cost": {"food": 0, "wood": 50, "stone": 0, "metal": 0},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "shields_generic_wood.png",
+	"researchTime": 40,
+	"tooltip": "Infantry Spearmen +2 Pierce Armor Levels.",
+	"modifications": [{"value": "Armour/Pierce", "add": 2.0}],
+	"affects": ["Infantry Spear"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json

@@ -0,0 +1,20 @@
+{
+	"pair": "pair_inf_armor_02",
+	"genericName": "Reinforced Shield",
+	"specificName": {
+		"hele": "Aspides",
+		"mace": "Aspides",
+		"spart": "Aspides",
+		"athen": "Aspides"
+	},
+	"description": "Plywood construction for large shields.",
+	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 100},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "shields_generic_bronze.png",
+	"researchTime": 40,
+	"tooltip": "Infantry Spearmen +1 Pierce Armor Levels.",
+	"modifications": [{"value": "Armour/Pierce", "add": 2.0}],
+	"affects": ["Infantry Spear"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json

@@ -13,5 +13,6 @@
 		{"value": "Armour/Pierce", "add": 2.0},
 		{"value": "Armour/Crush", "add": 2.0}
 	],
-	"affects": ["Ship"]
+	"affects": ["Ship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json

@@ -13,5 +13,6 @@
 		{"value": "Armour/Pierce", "add": 2.0},
 		{"value": "Armour/Crush", "add": 2.0}
 	],
-	"affects": ["Ship"]
+	"affects": ["Ship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json

@@ -12,5 +12,6 @@
 		{"value": "Armour/Pierce", "add": 2.0},
 		{"value": "Armour/Crush", "add": 2.0}
 	],
-	"affects": ["Ship"]
+	"affects": ["Ship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/armor_trade_convoys.json

@@ -10,5 +10,6 @@
 	"modifications": [
 		{"value": "Armour/Hack", "add": 2.0},
 		{"value": "Armour/Pierce", "add": 2.0}],
-	"affects": ["Trader"]
+	"affects": ["Trader"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json

@@ -16,5 +16,6 @@
 	"researchTime": 40,
 	"tooltip": "Equip your melee cavalry with better weapons. Melee Cavalry +2 Hack Attack.",
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
-	"affects": ["Cavalry Melee"]
+	"affects": ["Cavalry Melee"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/attack_champions_elite.json

@@ -18,5 +18,6 @@
 	"modifications": [
 		{"value": "Attack/Melee/Hack", "add": 2.0, "affects": ["Champion Melee"]},
 		{"value": "Attack/Ranged/Pierce", "add": 2.0, "affects": ["Champion Ranged"]}
-	]
+	],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/attack_citizensoldiers_will.json

@@ -17,5 +17,6 @@
 	"modifications": [
 		{"value": "Attack/Melee/Hack", "add": 2.0, "affects": ["CitizenSoldier Melee"]},
 		{"value": "Attack/Ranged/Pierce", "add": 2.0, "affects": ["CitizenSoldier Ranged"]}
-	]
+	],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json

@@ -12,5 +12,6 @@
 	"researchTime": 60,
 	"tooltip": "+2 attack for all sword units.",
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
-	"affects": ["Sword"]
+	"affects": ["Sword"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/attack_tower_crenellations.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Install crenellations and murder holes to have 40% more arrows fired per garrisoned soldier.",
 	"modifications": [{"value": "BuildingAI/GarrisonArrowMultiplier", "multiplier": 1.4}],
-	"affects": ["Defensive Tower"]
+	"affects": ["Defensive Tower"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Post night's watchmen to double the number of default arrows in ungarrisoned Towers.",
 	"modifications": [{"value": "BuildingAI/DefaultArrowCount", "add": 1.0}],
-	"affects": ["Defensive Tower"]
+	"affects": ["Defensive Tower"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json

@@ -12,5 +12,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 0.8},
 		{"value": "Armour/Crush", "add": -1.0}
 	],
-	"affects": ["StoneWall"]  
+	"affects": ["StoneWall"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Hire a Celtic mercenary captain to reduce cost -20 metal for Celtic mercenaries.",
 	"modifications": [{"value": "Cost/Resources/metal", "add": -20}],
-	"affects": ["Celt Mercenary"]
+	"affects": ["Celt Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs_2.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Hire a Gallic mercenary general to reduce cost -20 metal for Celtic mercenaries.",
 	"modifications": [{"value": "Cost/Resources/metal", "add": -20}],
-	"affects": ["Celt Mercenary"]
+	"affects": ["Celt Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Hire a Lusitanian mercenary captain to reduce cost -20 metal for Iberian mercenaries.",
 	"modifications": [{"value": "Cost/Resources/metal", "add": -20}],
-	"affects": ["Iberian Mercenary"]
+	"affects": ["Iberian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs_2.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Hire a Celtiberian mercenary general to reduce cost -20 metal for Iberian mercenaries.",
 	"modifications": [{"value": "Cost/Resources/metal", "add": -20}],
-	"affects": ["Iberian Mercenary"]
+	"affects": ["Iberian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Hire an Italiote mercenary captain to reduce cost -20 metal for Italian mercenaries.",
 	"modifications": [{"value": "Cost/Resources/metal", "add": -20}],
-	"affects": ["Italian Mercenary"]
+	"affects": ["Italian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs_2.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Hire an Italiote mercenary general to reduce cost -20 metal for Italian mercenaries.",
 	"modifications": [{"value": "Cost/Resources/metal", "add": -20}],
-	"affects": ["Italian Mercenary"]
+	"affects": ["Italian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/special_colonisation.json

@@ -8,5 +8,6 @@
 	"researchTime": 60,
 	"tooltip": "Carthaginians were colonizers. Civilization Centers, Temples, and Houses -25% build time.",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.75}],
-	"affects": ["Civic"]
+	"affects": ["Civic"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/special_exploration.json

@@ -8,5 +8,6 @@
 	"researchTime": 60,
 	"tooltip": "Carthaginians were explorers. All Traders and Ships +25% vision range.",
 	"modifications": [{"value": "Vision/Range", "multiplier": 1.25}],
-	"affects": ["Trader", "Ship"]
+	"affects": ["Trader", "Ship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/training_phoenician_naval_architects.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Shipyard increased batch construction speed bonus.",
 	"modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}],
-	"affects": ["Shipyard"]
+	"affects": ["Shipyard"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Ally with Celtic towns to reduce recruit time -20% for Celtic mercenaries.",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
-	"affects": ["Celt Mercenary"]
+	"affects": ["Celt Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs_2.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Subjugate Gallic tribes to reduce recruit time -20% for Celtic mercenaries.",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
-	"affects": ["Celt Mercenary"]
+	"affects": ["Celt Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Ally with Iberian towns to reduce recruit time -20% for Iberian mercenaries.",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
-	"affects": ["Iberian Mercenary"]
+	"affects": ["Iberian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs_2.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Subjugate Spain to reduce recruit time -20% for Iberian mercenaries.",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
-	"affects": ["Iberian Mercenary"]
+	"affects": ["Iberian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Ally with Italiote towns to reduce recruit time -20% for Italian mercenaries.",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
-	"affects": ["Italian Mercenary"]
+	"affects": ["Italian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs_2.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Subjugate Italiote towns to reduce recruit time -20% for Italian mercenaries.",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
-	"affects": ["Italian Mercenary"]
+	"affects": ["Italian Mercenary"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/celts/special_gather_crop_rotation.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Increase the yield of your farms. +25% farming rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/food.grain", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/decay_outpost.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Territory decay -50% for Outposts.",
 	"modifications": [{"value": "TerritoryDecay/HealthDecayRate", "multiplier": 0.5}],
-	"affects": ["Outpost"]
+	"affects": ["Outpost"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_animals_stockbreeding.json

@@ -7,5 +7,6 @@
 	"researchTime": 40,
 	"tooltip": "Breed time -25% for domestic animals (sheep, goats, cattle, etc.).",
 	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.75}],
-	"affects": ["Domestic"]
+	"affects": ["Domestic"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_capacity_wheelbarrow.json

@@ -14,5 +14,6 @@
 		{"value": "ResourceGatherer/Capacities/stone", "add": 5},
 		{"value": "ResourceGatherer/Capacities/metal", "add": 5}		
 	],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_farming_plough.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Equip your workers with iron ploughs. +25% farming rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/food.grain", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_lumbering_ironaxes.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Workers +25% lumbering rate for trees.",
 	"modifications": [{"value": "ResourceGatherer/Rates/wood.tree", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_mining_serfs.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "Compel serfs to help your workers mine stone. +25% stone gathering rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_mining_servants.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "+25% stone gathering rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_mining_shaftmining.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Develop shaft mining. +25% metal gathering rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_mining_silvermining.json

@@ -12,5 +12,6 @@
 	"researchTime": 40,
 	"tooltip": "Strike a vein of precious silver. +25% metal gathering rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_mining_slaves.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "Buy slaves to help your workers mine for stone. +25% stone gathering rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_mining_wedgemallet.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "+25% metal gathering rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiplier": 1.25}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/gather_wicker_baskets.json

@@ -7,5 +7,6 @@
 	"researchTime": 40,
 	"tooltip": "Equip your foragers with wicker baskets. +50% fruit foraging rate.",
 	"modifications": [{"value": "ResourceGatherer/Rates/food.fruit", "multiplier": 1.5}],
-	"affects": ["Worker"]
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/heal_range.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "Healers +4 Healing Range.",
 	"modifications": [{"value": "Heal/Range", "add": 4.0}],
-	"affects": ["Healer"]
+	"affects": ["Healer"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/heal_range_2.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "Healers +4 Healing Range.",
 	"modifications": [{"value": "Heal/Range", "add": 4.0}],
-	"affects": ["Healer"]
+	"affects": ["Healer"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/heal_rate.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "Healers +25% healing rate.",
 	"modifications": [{"value": "Heal/Rate", "add": -500.0}],
-	"affects": ["Healer"]
+	"affects": ["Healer"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/heal_rate_2.json

@@ -15,5 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "Healers +25% healing rate.",
 	"modifications": [{"value": "Heal/Rate", "add": -500.0}],
-	"affects": ["Healer"]
+	"affects": ["Healer"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/heal_temple.json

@@ -14,5 +14,6 @@
 	"researchTime": 40,
 	"tooltip": "Temples +50% garrisoned healing rate.",
 	"modifications": [{"value": "GarrisonHolder/BuffHeal", "multiplier": 1.5}],
-	"affects": ["Temple"]
+	"affects": ["Temple"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json

@@ -12,5 +12,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 1.1},
 		{"value": "Armour/Crush", "add": 2.0}
 	],
-	"affects": ["StoneWall"]  
+	"affects": ["StoneWall"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json

@@ -11,5 +11,6 @@
 		{"value": "Health/Max", "multiplier": 1.25},
 		{"value": "Cost/BuildTime", "multiplier": 1.1}
 	],
-	"affects": ["Spear Infantry"]
+	"affects": ["Spear Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/hellenes/special_hellenistic_metropolis.json

@@ -11,5 +11,6 @@
 		{"value": "BuildingAI/DefaultArrowCount", "multiplier": 2.0},
 		{"value": "Health/Max", "multiplier": 2.0}
 	],
-	"affects": ["CivCentre"]
+	"affects": ["CivCentre"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/hellenes/special_iphicratean_reforms.json

@@ -6,5 +6,6 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 60,
-	"tooltip": "Athenian triremes can train Marines and Cretan Mercenary Archers."
+	"tooltip": "Athenian triremes can train Marines and Cretan Mercenary Archers.",
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/hellenes/special_long_walls.json

@@ -10,5 +10,6 @@
 	"modifications": [
 		{"value": "BuildRestrictions/Territory", "replace": ["own", "neutral"]}
 	],
-	"affects": ["StoneWall"]
+	"affects": ["StoneWall"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/hellenes/temp_special_hellenization.json

@@ -8,5 +8,6 @@
 	"researchTime": 60,
 	"tooltip": "The Hellenic culture is very influential. +25% territory effect for all buildings.",
 	"modifications": [{"value": "TerritoryInfluence/Radius", "multiplier": 1.25}],
-	"affects": ["Structure"]
+	"affects": ["Structure"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/melee_inf_spearfighting.json

@@ -16,5 +16,6 @@
 	"researchTime": 40,
 	"tooltip": "Spearmen +2 hack attack.",
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
-	"affects": ["Infantry Spear"]
+	"affects": ["Infantry Spear"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/melee_inf_training.json

@@ -16,5 +16,6 @@
 	"researchTime": 40,
 	"tooltip": "Melee infantry +1 hack attack.",
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 1.0}],
-	"affects": ["Infantry Melee"]
+	"affects": ["Infantry Melee"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/pair_inf_armor_01.json

@@ -0,0 +1,5 @@
+{
+	"genericName": "Infantry Hack Armor vs. Spearmen Pierce Armor",
+	"top": "armor_infantry_hack_01",
+	"bottom": "armor_infantryspearmen_pierce_01"
+}

binaries/data/mods/public/simulation/data/technologies/pair_inf_armor_02.json

@@ -0,0 +1,6 @@
+{
+	"genericName": "Infantry Hack Armor vs. Spearmen Pierce Armor",
+	"top": "armor_infantry_hack_02",
+	"bottom": "armor_infantryspearmen_pierce_02",
+    "supersedes": "pair_inf_armor_01"
+}

binaries/data/mods/public/simulation/data/technologies/persians/immortals.json

@@ -11,5 +11,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 0.5},
 		{"value": "Health/Max", "add": -20}
 	],
-	"affects": ["Champion Infantry"]
+	"affects": ["Champion Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json

@@ -10,5 +10,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 1.20},
 		{"value": "Health/Max", "multiplier": 1.25}
 	],
-	"affects": ["Structure"]
+	"affects": ["Structure"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Stables increased batch training speed bonus.",
 	"modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}],
-	"affects": ["Stables"]
+	"affects": ["Stables"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Barracks increased batch training speed bonus.",
 	"modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}],
-	"affects": ["Barracks"]
+	"affects": ["Barracks"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json

@@ -11,5 +11,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 0.9},
 		{"value": "Health/Max", "add": -10}
 	],
-	"affects": ["Cavalry"]  
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json

@@ -11,5 +11,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 0.9},
 		{"value": "Health/Max", "add": -5}
 	],
-	"affects": ["Infantry"]  
+	"affects": ["Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_city.json

@@ -4,5 +4,5 @@
 	"autoResearch": true,
 	"modifications": [{"value": "TerritoryInfluence/Radius", "multiplier": 1.50}],
 	"affects": ["CivCentre"],
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json

@@ -13,5 +13,5 @@
 	"tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civilisation Centres increased by another +50%. Silver Owls civ bonus grants an extra +10% metal gather rate to all workers.",
 	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiplier": 1.1}],
 	"affects": ["Worker"],
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_city_britons.json

@@ -7,5 +7,5 @@
 	"icon": "city_phase.png",
 	"researchTime": 80,
 	"tooltip": "Advance to City Phase, which unlocks Brythonic structures and units. Territory radius for Civilisation Centres increased by another +50%",
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_city_gauls.json

@@ -7,5 +7,5 @@
 	"icon": "city_phase.png",
 	"researchTime": 80,
 	"tooltip": "Advance to City Phase, which unlocks Gallic structures and units. Territory radius for Civilisation Centres increased by another +50%",
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json

@@ -14,5 +14,5 @@
 	"icon": "city_phase.png",
 	"researchTime": 80,
 	"tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civilisation Centres increased by another +50%",
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_city_spart.json

@@ -15,5 +15,5 @@
 		{"value": "Promotion/RequiredXp", "multiplier": 0.1, "affects": ["CitizenSoldier"]},
 		{"value": "Player/MaxPopulation", "multiplier": 0.9}
 	],
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_town.json

@@ -4,5 +4,5 @@
 	"autoResearch": true,
 	"modifications": [{"value": "TerritoryInfluence/Radius", "multiplier": 1.30}],
 	"affects": ["CivCentre"],
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json

@@ -13,5 +13,5 @@
 	"tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civilization Centers increased by +30%. 'Silver Owls' civ bonus grants an extra +10% metal gather rate to all workers.",
 	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiplier": 1.1}],
 	"affects": ["Worker"],
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json

@@ -8,5 +8,5 @@
 	"icon": "town_phase.png",
 	"researchTime": 80,
 	"tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civilization Centers increased by +30%",
-	"soundComplete": "interface/alarm/alarm_techcomplete.xml"
+	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

binaries/data/mods/public/simulation/data/technologies/ranged_inf_irregulars.json

@@ -16,5 +16,6 @@
 	"researchTime": 40,
 	"tooltip": "Ranged infantry +2 pierce attack.",
 	"modifications": [{"value": "Attack/Ranged/Pierce", "add": 2.0}],
-	"affects": ["Infantry Ranged"]
+	"affects": ["Infantry Ranged"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json

@@ -16,5 +16,6 @@
 	"researchTime": 30,
 	"tooltip": "Skirmisher infantry +2 pierce attack.",
 	"modifications": [{"value": "Attack/Ranged/Pierce", "add": 2.0}],
-	"affects": ["Infantry Javelin"]
+	"affects": ["Infantry Javelin"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/siege_armor.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "All Siege weapons +2 Hack armor levels.",
 	"modifications": [{"value": "Armour/Hack", "add": 2.0}],
-	"affects": ["Siege"]
+	"affects": ["Siege"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/siege_attack.json

@@ -10,5 +10,6 @@
 	"modifications": [
 		{"value": "Attack/Melee/Crush", "add": 3},
 		{"value": "Attack/Ranged/Crush", "add": 3}],
-	"affects": ["Siege"]
+	"affects": ["Siege"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Bolt shooter accuracy increased 25%",
 	"modifications": [{"value": "Attack/Ranged/Spread", "multiplier": 0.75}],
-	"affects": ["Bolt Shooter"]
+	"affects": ["Bolt Shooter"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Siege weapons cost 20% less metal",
 	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.80}],
-	"affects": ["Siege"]
+	"affects": ["Siege"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Siege weapons cost 20% less wood",
 	"modifications": [{"value": "Cost/Resources/wood", "multiplier": 0.80}],
-	"affects": ["Siege"]
+	"affects": ["Siege"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/siege_packing.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Immobile siege weapons pack/unpack 25% faster",
 	"modifications": [{"value": "Pack/Time", "multiplier": 0.75}],
-	"affects": ["Siege"]
+	"affects": ["Siege"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/training_conscription.json

@@ -9,5 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Barracks increased batch training speed bonus.",
 	"modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}],
-	"affects": ["Barracks"]
+	"affects": ["Barracks"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/training_levy_cavalry.json

@@ -12,5 +12,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 0.9},
 		{"value": "Health/Max", "add": -10}
 	],
-	"affects": ["Cavalry"]  
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/training_levy_infantry.json

@@ -12,5 +12,6 @@
 		{"value": "Cost/BuildTime", "multiplier": 0.9},
 		{"value": "Health/Max", "add": -5}
 	],
-	"affects": ["Infantry"]  
+	"affects": ["Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json

@@ -8,5 +8,6 @@
 	"researchTime": 40,
 	"tooltip": "Docks increased batch construction speed bonus.",
 	"modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}],
-	"affects": ["Dock"]
+	"affects": ["Dock"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json

@@ -13,5 +13,6 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 40,
-	"tooltip": "Unlock the ability to train Champions at the barracks."
+	"tooltip": "Unlock the ability to train Champions at the barracks.",
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/unlock_females_house.json

@@ -12,5 +12,6 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "wives_festival.png",
 	"researchTime": 40,
-	"tooltip": "Unlock the ability to train women from houses."
+	"tooltip": "Unlock the ability to train women from houses.",
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/data/technologies/vision_outpost.json

@@ -7,5 +7,6 @@
 	"researchTime": 40,
 	"tooltip": "Vision Range +50% for Outposts.",
 	"modifications": [{"value": "Vision/Range", "multiplier": 1.5}],
-	"affects": ["Outpost"]
+	"affects": ["Outpost"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml

@@ -50,6 +50,8 @@
     <Technologies datatype="tokens">
 	  pair_inf_01
       pair_inf_02
+	  pair_inf_armor_01
+	  pair_inf_armor_02
       pair_cav_01
     </Technologies>
   </ProductionQueue>