Gameplay rebalance after a long period of testing and rebalancing. See https://github.com/scythetwirler/0ad for details on changes.

This was SVN commit r15713.

binaries/data/mods/public/gui/session/utility_functions.js

@@ -170,17 +170,17 @@ function damageTypeDetails(dmg)
 	var dmgArray = [];
 	if (dmg.hack)
 		dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
-			damage: dmg.hack,
+			damage: dmg.hack.toFixed(1),
 			damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Hack") + "[/color][/font]"
 		}));
 	if (dmg.pierce)
 		dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
-			damage: dmg.pierce,
+			damage: dmg.pierce.toFixed(1),
 			damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Pierce") + "[/color][/font]"
 		}));
 	if (dmg.crush)
 		dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
-			damage: dmg.crush,
+			damage: dmg.crush.toFixed(1),
 			damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Crush") + "[/color][/font]"
 		}));
 
@@ -246,17 +246,17 @@ function damageTypesToText(dmg)
 	var dmgArray = [];
 	if (dmg.hack)
 		dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
-			damage: dmg.hack,
+			damage: dmg.hack.toFixed(1),
 			damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Hack") + "[/color][/font]"
 		}));
 	if (dmg.pierce)
 		dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
-			damage: dmg.pierce,
+			damage: dmg.pierce.toFixed(1),
 			damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Pierce") + "[/color][/font]"
 		}));
 	if (dmg.crush)
 		dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
-			damage: dmg.crush,
+			damage: dmg.crush.toFixed(1),
 			damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Crush") + "[/color][/font]"
 		}));
 

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

@@ -0,0 +1,23 @@
+{
+	"genericName": "Chamfron",
+	"specificName": {
+		"hele": "Prometoopidion",
+		"mace": "Prometoopidion",
+		"spart": "Prometoopidion",
+		"athen": "Prometoopidion",
+		"sele": "Prometoopidion",
+		"ptol": "Prometoopidion",
+		"theb": "Prometoopidion"
+	},
+	"description": "Metal armor for a horse's face.",
+	"cost": {"food": 0, "wood": 1000, "stone": 0, "metal": 350},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "armor_plates_cavalry.png",
+	"researchTime": 40,
+	"tooltip": "Equip your cavalry mounts with armor. All Cavalry +1 Hack and Pierce armor level.",
+	"modifications": [{"value": "Armour/Hack", "add": 1.0},
+		{"value": "Armour/Pierce", "add": 1.0}],
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,15 @@
+{
+	"genericName": "Chamfron",
+	"description": "Metal armor for a horse's body.",
+	"cost": {"food": 0, "wood": 1000, "stone": 0, "metal": 450},
+	"supersedes": "armor_cav_01",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "armor_plates_cavalry.png",
+	"researchTime": 40,
+	"tooltip": "Equip your cavalry mounts with armor. All Cavalry +1 Hack and Pierce armor level.",
+	"modifications": [{"value": "Armour/Hack", "add": 1.0},
+		{"value": "Armour/Pierce", "add": 1.0}],
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,29 @@
+{
+	"genericName": "Quilted Body Armor",
+	"specificName": {
+		"generic": "Spolas",
+		"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": 1000, "stone": 0, "metal": 350},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "armor_leather.png",
+	"researchTime": 40,
+	"tooltip": "All Infantry +1 Hack and Pierce Armor Level.",
+	"modifications": [{"value": "Armour/Hack", "add": 1.0},
+		{"value": "Armour/Pierce", "add": 1.0}],
+	"affects": ["Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,26 @@
+{
+	"genericName": "Laminated Linen Body Armor",
+	"specificName": {
+		"hele": "Linothorakes",
+		"mace": "Linothorakes",
+		"spart": "Linothorakes",
+		"athen": "Linothorakes",
+		"ptol": "Linothorakes",
+		"sele": "Linothorakes",
+		"pers": "Linothorakes",
+		"rome": "Linothorakes",
+		"cart": "Linothorakes"
+	},
+	"description": "Laminated linen body armor for infantrymen.",
+	"cost": {"food": 0, "wood": 1000, "stone": 0, "metal": 450},
+	"supersedes": "armor_infantry_01",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "armor_pteruges.png",
+	"researchTime": 40,
+	"tooltip": "All Infantry +1 Hack and Pierce Armor Level.",
+	"modifications": [{"value": "Armour/Hack", "add": 1.0},
+		{"value": "Armour/Pierce", "add": 1.0}],
+	"affects": ["Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -13,7 +13,7 @@
 	},
 	"description": "A long spear made specifically for cavalry.",
 	"cost": {"food": 0, "wood": 50, "stone": 0, "metal": 150},
-	"requirements": {"any": [{"tech": "phase_town"},{"civ": "celt"},{"civ": "brit"},{"civ": "gaul"}]},
+	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "spear_cavalry.png",
 	"researchTime": 40,
@@ -21,4 +21,4 @@
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
 	"affects": ["Cavalry Melee"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -0,0 +1,25 @@
+{
+	"genericName": "Close Combat Cavalry Training",
+	"specificName": {
+		"hele": "Xyston",
+		"mace": "Xyston",
+		"spart": "Xyston",
+		"athen": "Xyston",
+		"sele": "Xyston",
+		"ptol": "Xyston",
+		"theb": "Xyston",
+		"rome": "Hasta"
+	},
+	"description": "Training increases melee attack.",
+	"cost": {"food": 500, "wood": 750, "stone": 0, "metal": 350},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "horse_trainer.png",
+	"researchTime": 40,
+	"tooltip": "+20% melee cavalry attack.",
+	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"affects": ["Cavalry Melee"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,26 @@
+{
+	"genericName": "Iron Weapons",
+	"specificName": {
+		"hele": "Xyston",
+		"mace": "Xyston",
+		"spart": "Xyston",
+		"athen": "Xyston",
+		"sele": "Xyston",
+		"ptol": "Xyston",
+		"theb": "Xyston",
+		"rome": "Hasta"
+	},
+	"description": "Replaces bronze weapons with iron.",
+	"cost": {"food": 500, "wood": 500, "stone": 0, "metal": 500},
+	"supersedes": "attack_cavalry_melee_01",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "spear_cavalry.png",
+	"researchTime": 40,
+	"tooltip": "Equip your melee cavalry with better weapons. +20% melee cavalry attack.",
+	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"affects": ["Cavalry Melee"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,25 @@
+{
+	"genericName": "Ranged Combat Cavalry Training",
+	"specificName": {
+		"hele": "Xyston",
+		"mace": "Xyston",
+		"spart": "Xyston",
+		"athen": "Xyston",
+		"sele": "Xyston",
+		"ptol": "Xyston",
+		"theb": "Xyston",
+		"rome": "Hasta"
+	},
+	"description": "Training increases ranged attack.",
+	"cost": {"food": 500, "wood": 750, "stone": 0, "metal": 350},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "horse_rider.png",
+	"researchTime": 40,
+	"tooltip": "+20% ranged cavalry attack.",
+	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"affects": ["Cavalry Ranged"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,26 @@
+{
+	"genericName": "Iron Weapons",
+	"specificName": {
+		"hele": "Xyston",
+		"mace": "Xyston",
+		"spart": "Xyston",
+		"athen": "Xyston",
+		"sele": "Xyston",
+		"ptol": "Xyston",
+		"theb": "Xyston",
+		"rome": "Hasta"
+	},
+	"description": "Replaces bronze weapons with iron.",
+	"cost": {"food": 500, "wood": 500, "stone": 0, "metal": 500},
+	"supersedes": "attack_cavalry_ranged_01",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "horse_rider.png",
+	"researchTime": 40,
+	"tooltip": "Equip your ranged cavalry with better weapons. +20% ranged cavalry attack.",
+	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"affects": ["Cavalry Ranged"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,5 +1,4 @@
-{
+{	
-	"pair": "pair_champ_02",	
 	"genericName": "Heroism",
 	"specificName": {
 		"hele": "Andreia",

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

@@ -0,0 +1,25 @@
+{
+	"genericName": "Side Arms",
+	"specificName": {
+		"hele": "Xíphos",
+		"mace": "Xíphos",
+		"spart": "Xíphos",
+		"athen": "Xíphos",
+		"theb": "Xíphos",
+		"ptol": "Xíphos",
+		"sele": "Xíphos",
+		"rome": "Pugio"
+	},
+	"description": "Often, an infantryman would carry a secondary weapon in addition to his primary weapon of choice, to be drawn when the primary weapon has failed or been broken.",
+	"cost": {"food": 500, "wood": 500, "stone": 250, "metal": 250},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "sword.png",
+	"researchTime": 40,
+	"tooltip": "+20% melee infantry attack.",
+	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"affects": ["Infantry Melee"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,16 @@
+{
+	"genericName": "Iron Weapons",
+	"description": "Using iron instead of bronze gave weapons additional power.",
+	"cost": {"food": 500, "wood": 500, "stone": 250, "metal": 450},
+	"supersedes": "attack_infantry_melee_01",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "sword_cross.png",
+	"researchTime": 40,
+	"tooltip": "+20% melee infantry attack.",
+	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"affects": ["Infantry Melee"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,24 @@
+{
+	"genericName": "Ranged Infantry Irregulars",
+	"specificName": {
+		"hele": "Átaktoi",
+		"mace": "Átaktoi",
+		"spart": "Átaktoi",
+		"athen": "Átaktoi",
+		"theb": "Átaktoi",
+		"sele": "Átaktoi",
+		"ptol": "Átaktoi"
+	},
+	"description": "Training increases damage of ranged infantry units.",
+	"cost": {"food": 500, "wood": 500, "stone": 250, "metal": 250},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "arrow.png",
+	"researchTime": 40,
+	"tooltip": "+20% ranged infantry attack.",
+	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"affects": ["Infantry Ranged"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,25 @@
+{
+	"genericName": "Ranged Infantry Masterclass",
+	"specificName": {
+		"hele": "Átaktoi",
+		"mace": "Átaktoi",
+		"spart": "Átaktoi",
+		"athen": "Átaktoi",
+		"theb": "Átaktoi",
+		"sele": "Átaktoi",
+		"ptol": "Átaktoi"
+	},
+	"description": "Training increases damage of ranged infantry units.",
+	"cost": {"food": 500, "wood": 500, "stone": 250, "metal": 350},
+	"supersedes": "attack_infantry_ranged_01",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "javelin_thong.png",
+	"researchTime": 40,
+	"tooltip": "+20% ranged infantry attack.",
+	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"affects": ["Infantry Ranged"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -10,15 +10,17 @@
 		"sele": "Dynamis"
 	},
 	"description": "The will to fight is crucial to victory.",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 300},
+	"cost": {"food": 3000, "wood": 3000, "stone": 3000, "metal": 3000},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "clenched_fist.png",
 	"researchTime": 40,
-	"tooltip": "Inspire your troops with higher pay. All citizen-Soldiers +2 attack.",
+	"tooltip": "Inspire your troops with higher pay. All soldiers +25% attack.",
 	"modifications": [
-		{"value": "Attack/Melee/Hack", "add": 2.0, "affects": "CitizenSoldier Melee"},
+		{"value": "Attack/Melee/Hack", "multiply": 1.25, "affects": "CitizenSoldier Melee"},
-		{"value": "Attack/Ranged/Pierce", "add": 2.0, "affects": "CitizenSoldier Ranged"}
+		{"value": "Attack/Ranged/Pierce", "multiply": 1.25, "affects": "CitizenSoldier Ranged"},
+		{"value": "Attack/Melee/Hack", "multiply": 1.25, "affects": "Champion Melee"},
+		{"value": "Attack/Ranged/Pierce", "multiply": 1.25, "affects": "Champion Ranged"}
 	],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -1,8 +1,7 @@
 {
-	"pair": "pair_tower_01",	
 	"genericName": "Crenellations",
 	"description": "Crenellations on the battlements allow soldiers wider range of fire in defending a keep.",
-	"cost": {"food": 0, "wood": 0, "stone": 100, "metal": 100},
+	"cost": {"food": 0, "wood": 0, "stone": 500, "metal": 250},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "crenelations.png",

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

@@ -0,0 +1,15 @@
+{
+	"genericName": "Sturdy Foundations",
+	"description": "Reinforce the foundations in preparation of an attack.",
+	"cost": {"food": 0, "wood": 500, "stone": 500, "metal": 500},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "architecture.png",
+	"researchTime": 40,
+	"tooltip": "Increases armour level of the defense tower by 2 levels.",
+	"modifications": [{"value": "Armour/Hack", "add": 2},
+		{"value": "Armour/Pierce", "add": 2},
+		{"value": "Armour/Crush", "add": 2}],
+	"affects": ["Defensive Tower"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,13 @@
+{
+	"genericName": "Arrow Shooters",
+	"description": "Arrow shooters increase the maximum range of the fire arrows.",
+	"cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "arrow.png",
+	"researchTime": 40,
+	"tooltip": "Increases defense tower maximum range by 8 meters.",
+	"modifications": [{"value": "Attack/Ranged/MaxRange", "add": 8}],
+	"affects": ["Defensive Tower"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_tower_01",	
 	"genericName": "Sentries",
 	"specificName": {
 		"hele": "Nyktophylakes",
@@ -11,7 +10,7 @@
 		"rome": "Vigiles"
 	},
 	"description": "A night's watch increases vigilance.",
-	"cost": {"food": 100, "wood": 100, "stone": 0, "metal": 0},
+	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 0},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "helmet_corinthian_bronze.png",
@@ -20,4 +19,4 @@
 	"modifications": [{"value": "BuildingAI/DefaultArrowCount", "add": 1.0}],
 	"affects": ["Defensive Tower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -0,0 +1,18 @@
+{
+	"genericName": "Baskets",
+	"description": "Increases shuttling capacity for all resources.",
+	"cost": {"food": 300, "wood": 300, "stone": 0, "metal": 0},
+	"requirements": {"tech": "phase_village"},
+	"requirementsTooltip": "Unlocked in Village Phase.",
+	"icon": "gather_basket_empty.png",
+	"researchTime": 40,
+	"tooltip": "Workers use baskets. +5 shuttle capacity for all resources.",
+	"modifications": [
+		{"value": "ResourceGatherer/Capacities/food", "add": 5},
+		{"value": "ResourceGatherer/Capacities/wood", "add": 5},
+		{"value": "ResourceGatherer/Capacities/stone", "add": 5},
+		{"value": "ResourceGatherer/Capacities/metal", "add": 5}		
+	],
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,19 @@
+{
+	"genericName": "Horse-drawn Carts",
+	"description": "Increases shuttling capacity for all resources.",
+	"cost": {"food": 1000, "wood": 1000, "stone": 0, "metal": 0},
+	"supersedes": "gather_capacity_wheelbarrow",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "handcart_empty.png",
+	"researchTime": 40,
+	"tooltip": "Workers use horse-drawn carts. +10 shuttle capacity for all resources.",
+	"modifications": [
+		{"value": "ResourceGatherer/Capacities/food", "add": 10},
+		{"value": "ResourceGatherer/Capacities/wood", "add": 10},
+		{"value": "ResourceGatherer/Capacities/stone", "add": 10},
+		{"value": "ResourceGatherer/Capacities/metal", "add": 10}		
+	],
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,10 +1,10 @@
 {
-	"pair": "pair_gather_wood_01",	
 	"genericName": "Wheelbarrow",
 	"description": "Increases shuttling capacity for all resources.",
-	"cost": {"food": 100, "wood": 100, "stone": 0, "metal": 0},
+	"cost": {"food": 500, "wood": 500, "stone": 0, "metal": 0},
-	"requirements": {"tech": "phase_village"},
+	"supersedes": "gather_capacity_basket",
-	"requirementsTooltip": "Unlocked in Village Phase.",
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "wheelbarrow_empty.png",
 	"researchTime": 40,
 	"tooltip": "Workers use wheelbarrows. +5 shuttle capacity for all resources.",

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

@@ -0,0 +1,14 @@
+{
+	"genericName": "Fertilizer",
+	"description": "Extra nutrients for farms.",
+	"cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250},
+	"supersedes": "gather_farming_training",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "plow.png",
+	"researchTime": 40,
+	"tooltip": "Workers +25% farming rate.",
+	"modifications": [{"value": "ResourceGatherer/Rates/food.grain", "multiply": 1.25}],
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,13 +1,13 @@
 {
 	"genericName": "Iron Plow",
 	"description": "A horse drawn instrument to turn the sod.",
-	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
+	"cost": {"food": 0, "wood": 200, "stone": 0, "metal": 100},
-	"requirements": {"tech": "phase_town"},
+	"requirements": {"tech": "phase_village"},
-	"requirementsTooltip": "Unlocked in Town Phase.",
+	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "plow.png",
 	"researchTime": 40,
-	"tooltip": "Equip your workers with iron plows. +25% farming rate.",
+	"tooltip": "Equip your workers with iron plows. +15% farming rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/food.grain", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/food.grain", "multiply": 1.15}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -0,0 +1,14 @@
+{
+	"genericName": "Gather Training",
+	"description": "Training for workers to increase farm gathering speed.",
+	"cost": {"food": 0, "wood": 300, "stone": 0, "metal": 150},
+	"supersedes": "gather_farming_plows",
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "plow.png",
+	"researchTime": 40,
+	"tooltip": "Workers +15% farming rate.",
+	"modifications": [{"value": "ResourceGatherer/Rates/food.grain", "multiply": 1.15}],
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,14 +1,13 @@
-{
+{	
-	"pair": "pair_gather_wood_01",	
 	"genericName": "Iron Ax Heads",
 	"description": "Increases wood gathering rates for trees.",
-	"cost": {"food": 0, "wood": 50, "stone": 0, "metal": 50},
+	"cost": {"food": 0, "wood": 200, "stone": 0, "metal": 50},
 	"requirements": {"tech": "phase_village"},
 	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "wood_axe.png",
 	"researchTime": 40,
-	"tooltip": "Workers +25% lumbering rate for trees.",
+	"tooltip": "Workers +15% lumbering rate for trees.",
-	"modifications": [{"value": "ResourceGatherer/Rates/wood.tree", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/wood.tree", "multiply": 1.15}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -0,0 +1,14 @@
+{
+	"genericName": "Sharp Ax Heads",
+	"description": "Increases wood gathering rates for trees.",
+	"cost": {"food": 0, "wood": 1000, "stone": 150, "metal": 150},
+	"supersedes": "gather_lumbering_strongeraxes",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "wood_axe.png",
+	"researchTime": 40,
+	"tooltip": "Workers +50% lumbering rate for trees.",
+	"modifications": [{"value": "ResourceGatherer/Rates/wood.tree", "multiply": 1.50}],
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,14 @@
+{
+	"genericName": "Stronger Ax",
+	"description": "Increases wood gathering rates for trees.",
+	"cost": {"food": 0, "wood": 250, "stone": 0, "metal": 50},
+	"supersedes": "gather_lumbering_ironaxes",
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "wood_axe.png",
+	"researchTime": 40,
+	"tooltip": "Workers +15% lumbering rate for trees.",
+	"modifications": [{"value": "ResourceGatherer/Rates/wood.tree", "multiply": 1.15}],
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,5 +1,4 @@
-{
+{	
-	"pair": "pair_gather_02",	
 	"genericName": "Serfs",
 	"specificName": {
 		"hele": "Heilotes",
@@ -8,13 +7,14 @@
 		"athen": "Heilotes"
 	},
 	"description": "Increases stone gathering rates.",
-	"cost": {"food": 100, "wood": 100, "stone": 0, "metal": 0},
+	"cost": {"food": 250, "wood": 0, "stone": 0, "metal": 50},
+	"supersedes": "gather_mining_servants",
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "mining_stone.png",
 	"researchTime": 40,
-	"tooltip": "Compel serfs to help your workers mine stone. +25% stone gathering rate.",
+	"tooltip": "Compel serfs to help your workers mine stone. +15% stone gathering rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiply": 1.15}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_gather_01",	
 	"genericName": "Servants",
 	"specificName": {
 		"hele": "Douloi",
@@ -8,13 +7,13 @@
 		"athen": "Douloi"
 	},
 	"description": "Increases stone gathering rates.",
-	"cost": {"food": 50, "wood": 0, "stone": 0, "metal": 0},
+	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 50},
 	"requirements": {"tech": "phase_village"},
 	"requirementsTooltip": "Hire servants to help mine stone. No requirements.",
 	"icon": "mining_stone.png",
 	"researchTime": 40,
-	"tooltip": "+25% stone gathering rate.",
+	"tooltip": "+15% stone gathering rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiply": 1.15}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -1,14 +1,14 @@
 {
-	"pair": "pair_gather_02",	
 	"genericName": "Shaft Mining",
 	"description": "Increases metal gathering rates.",
-	"cost": {"food": 100, "wood": 100, "stone": 0, "metal": 0},
+	"cost": {"food": 0, "wood": 250, "stone": 0, "metal": 50},
+	"supersedes": "gather_mining_wedgemallet",
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "mining_metal.png",
 	"researchTime": 40,
-	"tooltip": "Develop shaft mining. +25% metal gathering rate.",
+	"tooltip": "Develop shaft mining. +15% metal gathering rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.15}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -1,18 +1,18 @@
 {
-	"pair": "pair_gather_03",	
 	"genericName": "Silver Mining",
 	"specificName": {
 		"athen": "Mines of Laureion",
 		"mace": "Mines of Krenides"
 	},
 	"description": "Increases metal gathering rates.",
-	"cost": {"food": 100, "wood": 100, "stone": 100, "metal": 0},
+	"cost": {"food": 0, "wood": 1000, "stone": 150, "metal": 150},
+	"supersedes": "gather_mining_shaftmining",
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "mining_metal.png",
 	"researchTime": 40,
-	"tooltip": "Strike a vein of precious silver. +25% metal gathering rate.",
+	"tooltip": "Strike a vein of precious silver. +50% metal gathering rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.50}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_gather_03",	
 	"genericName": "Slaves",
 	"specificName": {
 		"hele": "Andrapodon",
@@ -8,13 +7,14 @@
 		"athen": "Andrapodon"
 	},
 	"description": "Increases stone gathering rates.",
-	"cost": {"food": 100, "wood": 100, "stone": 0, "metal": 100},
+	"cost": {"food": 1000, "wood": 0, "stone": 150, "metal": 150},
+	"supersedes": "gather_mining_serfs",
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "mining_stone.png",
 	"researchTime": 40,
-	"tooltip": "Buy slaves to help your workers mine for stone. +25% stone gathering rate.",
+	"tooltip": "Buy slaves to help your workers mine for stone. +50% stone gathering rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/stone.rock", "multiply": 1.50}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -1,14 +1,13 @@
 {
-	"pair": "pair_gather_01",	
 	"genericName": "Wedge and Mallet",
 	"description": "Increases metal gathering rates.",
-	"cost": {"food": 0, "wood": 50, "stone": 0, "metal": 0},
+	"cost": {"food": 0, "wood": 200, "stone": 0, "metal": 50},
 	"requirements": {"tech": "phase_village"},
 	"requirementsTooltip": "Equip your workers with helpful tools. No requirements.",
 	"icon": "mining_metal.png",
 	"researchTime": 40,
-	"tooltip": "+25% metal gathering rate.",
+	"tooltip": "+15% metal gathering rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.25}],
+	"modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.15}],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -0,0 +1,13 @@
+{
+	"genericName": "Living Conditions",
+	"description": "Units garrisoned in barracks heal over time.",
+	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 250},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "bandage.png",
+	"researchTime": 40,
+	"tooltip": "Units gain health over time while garrisoned in barracks.",
+	"modifications": [{"value": "GarrisonHolder/BuffHeal", "add": 1}],
+	"affects": ["Temple"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_heal_01",	
 	"genericName": "Healing Range",
 	"specificName": {
 		"hele": "Olympic Pantheon",
@@ -8,13 +7,13 @@
 		"athen": "Olympic Pantheon"
 	},
 	"description": "Increases the healing range of all healers.",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 100},
+	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 250},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "healing_range.png",
 	"researchTime": 40,
-	"tooltip": "Healers +4 Healing Range.",
+	"tooltip": "Healers +8 Healing Range.",
-	"modifications": [{"value": "Heal/Range", "add": 4.0}],
+	"modifications": [{"value": "Heal/Range", "add": 8.0}],
 	"affects": ["Healer"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_heal_02",	
 	"genericName": "Healing Range 2",
 	"specificName": {
 		"hele": "Akademia",
@@ -8,13 +7,14 @@
 		"athen": "Akademia"
 	},
 	"description": "Increases the healing range of all healers.",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 1000, "wood": 0, "stone": 0, "metal": 500},
+	"supersedes": "heal_range",
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "healing_range.png",
 	"researchTime": 40,
-	"tooltip": "Healers +4 Healing Range.",
+	"tooltip": "Healers +8 Healing Range.",
-	"modifications": [{"value": "Heal/Range", "add": 4.0}],
+	"modifications": [{"value": "Heal/Range", "add": 8.0}],
 	"affects": ["Healer"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_heal_01",	
 	"genericName": "Healing Rate",
 	"specificName": {
 		"hele": "Sphagia",
@@ -8,13 +7,13 @@
 		"athen": "Sphagia"
 	},
 	"description": "Increases the Healing Rate of all healers.",
-	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 0},
+	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 250},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "healing_rate.png",
 	"researchTime": 40,
 	"tooltip": "Healers +25% healing rate.",
-	"modifications": [{"value": "Heal/Rate", "add": -500.0}],
+	"modifications": [{"value": "Heal/Rate", "multiply": 0.8}],
 	"affects": ["Healer"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_heal_02",	
 	"genericName": "Healing Rate 2",
 	"specificName": {
 		"hele": "Hippocratic Oath",
@@ -8,13 +7,14 @@
 		"athen": "Hippocratic Oath"
 	},
 	"description": "Increases the Healing Rate of all healers.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 0},
+	"cost": {"food": 1000, "wood": 0, "stone": 0, "metal": 500},
+	"supersedes": "heal_rate",
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "healing_rate.png",
 	"researchTime": 40,
 	"tooltip": "Healers +25% healing rate.",
-	"modifications": [{"value": "Heal/Rate", "add": -500.0}],
+	"modifications": [{"value": "Heal/Rate", "multiply": 0.8}],
 	"affects": ["Healer"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_heal_03",
 	"genericName": "Divine Offerings",
 	"specificName": {
 		"hele": "Olympic Games",
@@ -8,7 +7,7 @@
 		"athen": "Eleusian Mysteries"
 	},
 	"description": "Units garrisoned in a temple are healed faster.",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 250},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "cauldron.png",
@@ -17,4 +16,4 @@
 	"modifications": [{"value": "GarrisonHolder/BuffHeal", "multiply": 1.5}],
 	"affects": ["Temple"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,8 +1,7 @@
 {
-	"pair": "pair_house_01",
 	"genericName": "The Loom",
 	"description": "The Loom allowed the creation of finer clothing to clothe citizens in the settlement. Women of the household were taught from a young age how to weave on the loom, and subsequently spent a large  share of their lives working with it.",
-	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 0},
+	"cost": {"food": 250, "wood": 0, "stone": 0, "metal": 0},
 	"requirements": {"tech": "phase_village"},
 	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "wives_festival.png",

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

@@ -1,8 +1,7 @@
 {
-	"pair": "pair_heal_03",
 	"genericName": "Battlefield Medicine",
 	"description": "Unlock health regeneration for your units.",
-	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
+	"cost": {"food": 1000, "wood": 0, "stone": 0, "metal": 250},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "bandage.png",
@@ -11,4 +10,4 @@
 	"modifications": [{"value": "Health/RegenRate", "add": 0.5}],
 	"affects": ["Unit Organic"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_inf_02",
 	"genericName": "Iron Spearheads",
 	"specificName": {
 		"hele": "Siderénies Aichmés",
@@ -20,4 +19,4 @@
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
 	"affects": ["Spear"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -2,7 +2,8 @@
 	"genericName": "City Phase",
 	"requirements": { "any": [{"tech":"phase_city_generic"}, {"tech":"phase_city_britons"}, {"tech":"city_phase_gauls"}, {"tech":"phase_city_pair_celts"}, {"tech":"phase_city_athen"}]},
 	"autoResearch": true,
-	"modifications": [{"value": "TerritoryInfluence/Radius", "multiply": 1.50}],
+	"modifications": [{"value": "TerritoryInfluence/Radius", "multiply": 1.50},
-	"affects": ["CivCentre"],
+		{"value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier"}],
+	"affects": ["CivCentre", "Infantry", "Cavalry"],
 	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

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

@@ -2,7 +2,8 @@
 	"genericName": "Town Phase",
 	"requirements": { "any": [{"tech":"phase_town_generic"}, {"tech":"phase_town_athen"}]},
 	"autoResearch": true,
-	"modifications": [{"value": "TerritoryInfluence/Radius", "multiply": 1.30}],
+	"modifications": [{"value": "TerritoryInfluence/Radius", "multiply": 1.30},
-	"affects": ["CivCentre"],
+		{"value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier"}],
+	"affects": ["CivCentre", "Infantry", "Cavalry"], 
 	"soundComplete": "interface/alarm/alarm_phase.xml"
 }

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_house_01",
 	"genericName": "Home Garden",
 	"specificName": {
 		"hele": "Peristyle",
@@ -12,13 +11,13 @@
 		"pers": "Paradise"
 	},
 	"description": "Home gardens ranged from simple fenced-in areas to large manicured and colonnaded enclosures.",
-	"cost": {"food": 0, "wood": 0, "stone": 100, "metal": 0},
+	"cost": {"food": 0, "wood": 500, "stone": 100, "metal": 0},
 	"requirements": {"tech": "phase_village"},
 	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "population.png",
 	"researchTime": 40,
-	"tooltip": "Houses +1 population cap bonus.",
+	"tooltip": "Houses +20% population cap bonus.",
-	"modifications": [{"value": "Cost/PopulationBonus", "add": 1.0}],
+	"modifications": [{"value": "Cost/PopulationBonus", "multiply": 1.2}],
 	"affects": ["House"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_house_02",
 	"genericName": "Manors",
 	"specificName": {
 		"rome": "Insulae"
@@ -10,8 +9,8 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "population.png",
 	"researchTime": 40,
-	"tooltip": "Houses +2 population cap bonus.",
+	"tooltip": "Houses +20% population cap bonus.",
-	"modifications": [{"value": "Cost/PopulationBonus", "add": 2.0}],
+	"modifications": [{"value": "Cost/PopulationBonus", "multiply": 1.2}],
 	"affects": ["House"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -0,0 +1,22 @@
+{
+	"genericName": "Glorious Expansion",
+	"specificName": {
+		"hele": "Peristyle",
+		"mace": "Peristyle",
+		"spart": "Peristyle",
+		"athen": "Peristyle",
+		"sele": "Peristyle",
+		"ptol": "Peristyle",
+		"rome": "Peristyle",
+		"pers": "Paradise"
+	},
+	"description": "The wonder attracts many more people to your civilization.",
+	"cost": {"food": 3000, "wood": 3000, "stone": 500, "metal": 500},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "special_treasure.png",
+	"researchTime": 40,
+	"tooltip": "+50 maximum population cap.",
+	"modifications": [{"value": "Player/MaxPopulation", "add": 50}],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_inf_01",
 	"genericName": "Ranged Infantry Irregulars",
 	"specificName": {
 		"hele": "Átaktoi",
@@ -11,13 +10,15 @@
 		"ptol": "Átaktoi"
 	},
 	"description": "Training increases damage of ranged infantry units.",
-	"cost": {"food": 0, "wood": 50, "stone": 0, "metal": 0},
+	"cost": {"food": 500, "wood": 500, "stone": 250, "metal": 250},
-	"requirements": {"any": [{"tech": "phase_town"},{"civ": "celt"},{"civ": "brit"},{"civ": "gaul"}]},
+	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "arrow.png",
 	"researchTime": 40,
-	"tooltip": "Ranged infantry +2 pierce attack.",
+	"tooltip": "+20% ranged infantry attack.",
-	"modifications": [{"value": "Attack/Ranged/Pierce", "add": 2.0}],
+	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
 	"affects": ["Infantry Ranged"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_inf_02",	
 	"genericName": "Javelin Thong",
 	"specificName": {
 		"hele": "Ankyle",
@@ -24,4 +23,4 @@
 		{"value": "Vision/Range", "add": 4.0}],
 	"affects": ["Javelin"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,7 +1,7 @@
 {
 	"genericName": "Armor plating",
 	"description": "Increased armor on siege weapons",
-	"cost": {"food": 0, "wood": 300, "stone": 0, "metal": 350},
+	"cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "armor_plates_gold.png",

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

@@ -1,15 +1,15 @@
 {
 	"genericName": "Advanced Siege",
 	"description": "Advanced technologies improve siege efficiency",
-	"cost": {"food": 0, "wood": 200, "stone": 0, "metal": 250},
+	"cost": {"food": 0, "wood": 1000, "stone": 0, "metal": 500},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "siege_ram.png",
 	"researchTime": 40,
-	"tooltip": "All siege weapons +5 Crush damage.",
+	"tooltip": "All siege weapons +25% Crush damage.",
 	"modifications": [
-		{"value": "Attack/Melee/Crush", "add": 5},
+		{"value": "Attack/Melee/Crush", "multiply": 1.25},
-		{"value": "Attack/Ranged/Crush", "add": 5}],
+		{"value": "Attack/Ranged/Crush", "multiply": 1.25}],
 	"affects": ["Siege"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

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

@@ -1,7 +1,7 @@
 {
 	"genericName": "Bolt Accuracy",
 	"description": "Improvement to projectile accuracy",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 220},
+	"cost": {"food": 0, "wood": 250, "stone": 0, "metal": 250},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "accuracy_bolt.png",
@@ -10,4 +10,4 @@
 	"modifications": [{"value": "Attack/Ranged/Spread", "multiply": 0.75}],
 	"affects": ["Bolt Shooter"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,7 +1,7 @@
 {
 	"genericName": "Metalworker",
 	"description": "Siege weapons require less metal resource",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 0},
+	"cost": {"food": 500, "wood": 500, "stone": 250, "metal": 0},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "metalworker.png",
@@ -10,4 +10,4 @@
 	"modifications": [{"value": "Cost/Resources/metal", "multiply": 0.80}],
 	"affects": ["Siege"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -1,7 +1,7 @@
 {
 	"genericName": "Artillery Instructors",
 	"description": "Siege weapons cost less wood",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 500, "wood": 0, "stone": 250, "metal": 500},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "anvil.png",
@@ -10,4 +10,4 @@
 	"modifications": [{"value": "Cost/Resources/wood", "multiply": 0.80}],
 	"affects": ["Siege"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

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

@@ -0,0 +1,13 @@
+{
+	"genericName": "Cavalry Breeding",
+	"description": "Breed the fastest horses.",
+	"cost": {"food": 500, "wood": 500, "stone": 0, "metal": 150},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "nisean_war_horses.png",
+	"researchTime": 40,
+	"tooltip": "+10% cavalry walk speed.",
+	"modifications": [{"value": "UnitMotion/WalkSpeed", "multiply": 1.1}],
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -0,0 +1,14 @@
+{
+	"genericName": "Cavalry Speed Training",
+	"description": "Train your horses to move faster.",
+	"cost": {"food": 500, "wood": 500, "stone": 0, "metal": 150},
+	"supersedes": "speed_cavalry_01",
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "nisean_war_horses.png",
+	"researchTime": 40,
+	"tooltip": "+10% cavalry walk speed.",
+	"modifications": [{"value": "UnitMotion/WalkSpeed", "multiply": 1.1}],
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

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

@@ -1,6 +1,5 @@
 {
 	"genericName": "Conscription",
-    "supersedes": "pair_levy_01",
 	"description": "Significantly increase training speed of soldiers at the barracks by training them in large batches or battalions.",
 	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 0},
 	"requirements": {"tech": "phase_city"},

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

@@ -1,5 +1,4 @@
 {
-	"pair": "pair_house_02",
 	"genericName": "Fertility Festival",
 	"specificName": {
 		"hele": "Thesmophoria",
@@ -9,11 +8,11 @@
 		"rome": "Bona Dea"
 	},
 	"description": "A festival attended by women-only, to celebrate female fertility.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 250, "wood": 0, "stone": 0, "metal": 250},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "wives_festival.png",
 	"researchTime": 60,
 	"tooltip": "Unlock the ability to train women from houses.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
+}

binaries/data/mods/public/simulation/templates/special_units/rome_mechanical_siege_ballista_common.xml

@@ -2,7 +2,7 @@
 <Entity parent="template_unit_mechanical_siege_onager">
   <Attack>
     <Ranged>
-      <MaxRange>76</MaxRange>
+      <MaxRange>110</MaxRange>
       <MinRange>16.0</MinRange>
       <ProjectileSpeed>22.0</ProjectileSpeed>
       <RepeatTime>6000</RepeatTime>
@@ -18,10 +18,6 @@
   </Attack>
   <Cost>
     <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>300</wood>
-      <stone>100</stone>
-    </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="10.0" depth="10.0"/>

binaries/data/mods/public/simulation/templates/special_units/rome_mechanical_siege_scorpio_common.xml

@@ -3,27 +3,21 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>40.0</Pierce>
+      <Pierce>120.0</Pierce>
-      <Crush>20.0</Crush>
+      <Crush>25.0</Crush>
-      <MaxRange>56</MaxRange>
+      <MaxRange>100</MaxRange>
       <MinRange>4.0</MinRange>
-      <ProjectileSpeed>64.0</ProjectileSpeed>
+      <ProjectileSpeed>300.0</ProjectileSpeed>
       <RepeatTime>2500</RepeatTime>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>15</BuildTime>
-    <Resources>
-      <wood>90</wood>
-    </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="5.0" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
-  <Health>
-    <Max>150</Max>
-  </Health>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Scorpio</SpecificName>

binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml

@@ -31,8 +31,6 @@
     </Entities>
     <Technologies datatype="tokens">
 	  -unlock_champion_units
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_elite_infantry
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml

@@ -19,9 +19,10 @@
       units/athen_mechanical_siege_lithobolos_packed
     </Entities>
     <Technologies datatype="tokens">
-      -pair_champ_02
+      siege_attack
-      pair_siege_attack_pack
+      siege_armor
-      pair_siege_cost_armor
+      siege_cost_metal
+      siege_cost_wood
       siege_bolt_accuracy
     </Technologies>
   </ProductionQueue>

binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml

@@ -28,11 +28,6 @@
       units/brit_cavalry_javelinist_b
 	  units/brit_champion_cavalry_barracks
     </Entities>
-    <Technologies datatype="tokens">
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_advanced_cavalry
-	  upgrade_rank_elite_cavalry
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/britons/barracks.xml</Actor>

binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml

@@ -7,18 +7,11 @@
     <Civ>brit</Civ>
     <SpecificName>Amoridas</SpecificName>
 	<History>Figured to have it represent an armory; these were common, and not all Celts (truthfully, not even most) had to provide their own weapons. Just, they had to provide their own GOOD weapons and armor, but mass-produced spears and javelins and shields were distributed freely at need. The possession of a armory by the local lord was considered quite prestigious among the Celts, especially the larger examples found in Gaul that could maintain armies.</History>
-    <RequiredTechnology>phase_village</RequiredTechnology>
+    <RequiredTechnology>phase_town</RequiredTechnology>
     <VisibleClasses datatype="tokens">
-	  -Town
+	  Town
-	  Village
+    </VisibleClasses>
-	</VisibleClasses>
   </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-	  -pair_inf_armor_03
-	  -pair_inf_armor_04
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/blacksmith.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml

@@ -42,8 +42,10 @@
       units/brit_mechanical_siege_ram
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_cost
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
     </Technologies>
   </ProductionQueue>
   <Vision>

binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml

@@ -33,8 +33,6 @@
     <Technologies datatype="tokens">
       carthaginians/pair_celt_mercs_1
       carthaginians/pair_celt_mercs_2
-	  carthaginians/upgrade_rank_advanced_celts
-	  carthaginians/upgrade_rank_elite_celts
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml

@@ -27,8 +27,6 @@
     <Technologies datatype="tokens">
       carthaginians/pair_iberian_mercs_1
       carthaginians/pair_iberian_mercs_2
-	  carthaginians/upgrade_rank_advanced_iberian
-	  carthaginians/upgrade_rank_elite_iberian
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml

@@ -33,8 +33,6 @@
     <Technologies datatype="tokens">
       carthaginians/pair_italian_mercs_1
       carthaginians/pair_italian_mercs_2
-	  carthaginians/upgrade_rank_advanced_italiote
-	  carthaginians/upgrade_rank_elite_italiote
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml

@@ -23,8 +23,10 @@
       units/cart_mechanical_siege_oxybeles_packed
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_pack
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
 	  siege_bolt_accuracy
     </Technologies>
   </ProductionQueue>

binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml

@@ -28,6 +28,14 @@
     <Square width="42.0" depth="58.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>20</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Support Infantry Cavalry</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
   <Health>
     <Max>5000</Max>
   </Health>
@@ -48,7 +56,11 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
-  <TerritoryInfluence disable=""/>
+  <TerritoryInfluence>
+    <Root>true</Root>
+    <Radius>200</Radius>
+    <Weight>25000</Weight>
+  </TerritoryInfluence>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">

binaries/data/mods/public/simulation/templates/structures/celt_barracks.xml

@@ -26,11 +26,6 @@
       units/celt_cavalry_swordsman_b
       units/celt_cavalry_javelinist_b
     </Entities>
-    <Technologies datatype="tokens">
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_advanced_cavalry
-	  upgrade_rank_elite_cavalry
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/barracks.xml</Actor>

binaries/data/mods/public/simulation/templates/structures/celt_blacksmith.xml

@@ -7,18 +7,11 @@
     <Civ>celt</Civ>
     <SpecificName>Amoridas</SpecificName>
 	<History>Figured to have it represent an armory; these were common, and not all Celts (truthfully, not even most) had to provide their own weapons. Just, they had to provide their own GOOD weapons and armor, but mass-produced spears and javelins and shields were distributed freely at need. The possession of a armory by the local lord was considered quite prestigious among the Celts, especially the larger examples found in Gaul that could maintain armies.</History>
-    <RequiredTechnology>phase_village</RequiredTechnology>
+    <RequiredTechnology>phase_town</RequiredTechnology>
     <VisibleClasses datatype="tokens">
-	  -Town
+	  Town
-	  Village
+    </VisibleClasses>
-	</VisibleClasses>
   </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-	  -pair_inf_armor_03
-	  -pair_inf_armor_04
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/blacksmith.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml

@@ -43,8 +43,10 @@
       units/celt_mechanical_siege_ram
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_cost
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
     </Technologies>
   </ProductionQueue>
   <Vision>

binaries/data/mods/public/simulation/templates/structures/celt_fortress_g.xml

@@ -30,8 +30,10 @@
       units/celt_mechanical_siege_ram
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_cost
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml

@@ -28,11 +28,6 @@
       units/gaul_cavalry_javelinist_b
 	  units/gaul_champion_cavalry_barracks
     </Entities>
-    <Technologies datatype="tokens">
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_advanced_cavalry
-	  upgrade_rank_elite_cavalry
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/barracks.xml</Actor>

binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml

@@ -7,18 +7,11 @@
     <Civ>gaul</Civ>
     <SpecificName>Amoridas</SpecificName>
 	<History>Figured to have it represent an armory; these were common, and not all Celts (truthfully, not even most) had to provide their own weapons. Just, they had to provide their own GOOD weapons and armor, but mass-produced spears and javelins and shields were distributed freely at need. The possession of a armory by the local lord was considered quite prestigious among the Celts, especially the larger examples found in Gaul that could maintain armies.</History>
-    <RequiredTechnology>phase_village</RequiredTechnology>
+    <RequiredTechnology>phase_town</RequiredTechnology>
     <VisibleClasses datatype="tokens">
-	  -Town
+	  Town
-	  Village
+    </VisibleClasses>
-	</VisibleClasses>
   </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-	  -pair_inf_armor_03
-	  -pair_inf_armor_04
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/blacksmith.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml

@@ -26,8 +26,10 @@
       units/gaul_mechanical_siege_ram
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_cost
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml

@@ -34,8 +34,6 @@
     </Entities>
     <Technologies datatype="tokens">
 	  -unlock_champion_units
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_elite_infantry
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/hele_fortress.xml

@@ -26,8 +26,10 @@
       units/hele_mechanical_siege_tower
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_pack
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
       siege_bolt_accuracy
     </Technologies>
   </ProductionQueue>

binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml

@@ -22,10 +22,6 @@
       units/iber_cavalry_javelinist_b
 	  units/iber_champion_cavalry_barracks
     </Entities>
-    <Technologies datatype="tokens">
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_advanced_cavalry
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/barracks.xml</Actor>

binaries/data/mods/public/simulation/templates/structures/iber_blacksmith.xml

@@ -7,8 +7,7 @@
   </Identity>
   <ProductionQueue>
     <Technologies datatype="tokens">
-	  -pair_inf_armor_04
+      attack_steel_working
-	  attack_steel_working
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml

@@ -29,8 +29,10 @@
       units/iber_mechanical_siege_ram
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_cost
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml

@@ -32,12 +32,6 @@
       units/mace_cavalry_javelinist_b
       units/mace_champion_cavalry_barracks
     </Entities>
-    <Technologies datatype="tokens">
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_elite_infantry
-	  upgrade_rank_advanced_cavalry
-	  upgrade_rank_elite_cavalry
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/macedonians/barracks.xml</Actor>

binaries/data/mods/public/simulation/templates/structures/mace_siege_workshop.xml

@@ -30,9 +30,11 @@
       units/mace_mechanical_siege_tower
     </Entities>
     <Technologies datatype="tokens">
-	  pair_siege_attack_pack
+      siege_attack
-	  pair_siege_cost_armor
+      siege_armor
-	  siege_bolt_accuracy
+      siege_cost_metal
+      siege_cost_wood
+      siege_bolt_accuracy
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/maur_blacksmith.xml

@@ -7,8 +7,6 @@
   </Identity>
   <ProductionQueue>
     <Technologies datatype="tokens">
-	  -pair_inf_armor_03
-	  -pair_inf_armor_04
 	  attack_steel_working
     </Technologies>
   </ProductionQueue>

binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml

@@ -16,7 +16,7 @@
       units/maur_champion_chariot
     </Entities>
     <Technologies datatype="tokens">
-      pair_champ_02
+      attack_soldiers_will
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml

@@ -17,7 +17,6 @@
 	  persians/training_levy_infantry
 	  persians/training_conscription_infantry
 	  persians/special_archery_tradition
-	  -pair_levy_01
 	  -training_conscription
 	  -unlock_champion_units
     </Technologies>

binaries/data/mods/public/simulation/templates/structures/pers_blacksmith.xml

@@ -4,13 +4,6 @@
     <Civ>pers</Civ>
     <SpecificName>Arštišta</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-	  -pair_inf_armor_02
-	  -pair_inf_armor_03
-	  -pair_inf_armor_04
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/blacksmith.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml

@@ -12,8 +12,10 @@
       units/pers_mechanical_siege_ram
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_cost
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/pers_stables.xml

@@ -36,13 +36,10 @@
       units/pers_cavalry_archer_b
     </Entities>
     <Technologies datatype="tokens">
-	  -pair_levy_01
 	  -training_conscription
 	  -unlock_champion_units
 	  persians/training_levy_cavalry
 	  persians/training_conscription_cavalry
-	  upgrade_rank_advanced_cavalry
-	  upgrade_rank_elite_cavalry
 	  successors/special_war_horses
     </Technologies>
   </ProductionQueue>

binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml

@@ -24,9 +24,11 @@
       units/ptol_mechanical_siege_tower
     </Entities>
     <Technologies datatype="tokens">
-	  pair_siege_attack_pack
+      siege_attack
-	  pair_siege_cost_armor
+      siege_armor
-	  siege_bolt_accuracy
+      siege_cost_metal
+      siege_cost_wood
+      siege_bolt_accuracy
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml

@@ -49,10 +49,6 @@
     <Technologies datatype="tokens">
       -phase_town_generic
       -phase_city_generic
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_elite_infantry
-	  upgrade_rank_advanced_cavalry
-	  upgrade_rank_elite_cavalry
     </Technologies>
   </ProductionQueue>
   <Sound>

binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Armour>
-    <Hack>10.0</Hack>
+    <Hack>3.0</Hack>
-    <Pierce>40.0</Pierce>
+    <Pierce>25.0</Pierce>
-    <Crush>10.0</Crush>
+    <Crush>1.0</Crush>
     <Foundation>
-      <Hack>3.0</Hack>
+      <Hack>1.0</Hack>
-      <Pierce>8.0</Pierce>
+      <Pierce>5.0</Pierce>
-      <Crush>3.0</Crush>
+      <Crush>1.0</Crush>
     </Foundation>
   </Armour>
   <Attack>
@@ -33,7 +33,7 @@
   </BuildRestrictions>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
-    <BuildTime>160</BuildTime>
+    <BuildTime>250</BuildTime>
     <Resources>
       <wood>400</wood>
       <stone>0</stone>
@@ -50,8 +50,8 @@
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
-    <Max>3600</Max>
+    <Max>2500</Max>
-    <Repairable>false</Repairable>
+    <Repairable>true</Repairable>
     <SpawnEntityOnDeath>rubble/rubble_rome_sb</SpawnEntityOnDeath>
   </Health>
   <Identity>
@@ -76,7 +76,7 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay>
-    <HealthDecayRate>5</HealthDecayRate>
+    <HealthDecayRate>10</HealthDecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <ProductionQueue>
@@ -90,9 +90,6 @@
       units/rome_mechanical_siege_scorpio_packed
       units/rome_mechanical_siege_ram
     </Entities>
-    <Technologies datatype="tokens">
-	  romans/decay_logistics
-    </Technologies>
   </ProductionQueue>
   <Vision>
     <Range>60</Range>

binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml

@@ -31,10 +31,6 @@
       units/rome_cavalry_javelinist_b
 	  units/rome_champion_cavalry_barracks
     </Entities>
-    <Technologies datatype="tokens">
-	  upgrade_rank_advanced_infantry
-	  upgrade_rank_elite_infantry
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/barracks.xml</Actor>

binaries/data/mods/public/simulation/templates/structures/rome_blacksmith.xml

@@ -5,11 +5,6 @@
     <SpecificName>Armamentarium</SpecificName>
     <History>The Roman army stored and repaired its equipment in the armamentarium of the camp.</History>
   </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-	  -pair_inf_armor_04
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/blacksmith.xml</Actor>
   </VisualActor>

binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml

@@ -17,8 +17,10 @@
       units/rome_mechanical_siege_ram
     </Entities>
     <Technologies datatype="tokens">
-      pair_siege_attack_pack
+      siege_attack
-      pair_siege_cost_armor
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/rome_tent.xml

@@ -40,8 +40,6 @@
       -units/{civ}_support_female_citizen_house
     </Entities>
     <Technologies datatype="tokens">
-      -pair_house_01
-      -pair_house_02
     </Technologies>
   </ProductionQueue>
   <Sound>