Index: simulation/data/technologies/armor_cav_01.json =================================================================== --- simulation/data/technologies/armor_cav_01.json +++ simulation/data/technologies/armor_cav_01.json @@ -1,23 +0,0 @@ -{ - "genericName": "Chamfron", - "specificName": { - "athen": "Prometōpidion", - "mace": "Prometōpidion", - "ptol": "Prometōpidion", - "sele": "Prometōpidion", - "spart": "Prometōpidion" - }, - "description": "Metal armor for a horse's face.", - "cost": { "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": "Cavalry +1 hack and pierce armor.", - "modifications": [ - { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 1 } - ], - "affects": ["Cavalry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Index: simulation/data/technologies/armor_cav_02.json =================================================================== --- simulation/data/technologies/armor_cav_02.json +++ simulation/data/technologies/armor_cav_02.json @@ -1,17 +0,0 @@ -{ - "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": "Cavalry +1 hack and pierce armor.", - "modifications": [ - { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 1 } - ], - "affects": ["Cavalry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Index: simulation/data/technologies/armor_cavalry_01.json =================================================================== --- simulation/data/technologies/armor_cavalry_01.json +++ simulation/data/technologies/armor_cavalry_01.json @@ -0,0 +1,24 @@ +{ + "genericName": "Chamfron", + "specificName": { + "athen": "Prometōpidion", + "mace": "Prometōpidion", + "ptol": "Prometōpidion", + "sele": "Prometōpidion", + "spart": "Prometōpidion" + }, + "description": "Metal armor for a horse's face.", + "cost": { "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": "Cavalry +1 armor.", + "modifications": [ + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 } + ], + "affects": ["Cavalry"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: simulation/data/technologies/armor_cavalry_02.json =================================================================== --- simulation/data/technologies/armor_cavalry_02.json +++ simulation/data/technologies/armor_cavalry_02.json @@ -0,0 +1,18 @@ +{ + "genericName": "Chamfron", + "description": "Metal armor for a horse's body.", + "cost": { "food": 0, "wood": 1000, "stone": 0, "metal": 450 }, + "supersedes": "armor_cavalry_01", + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "armor_plates_cavalry.png", + "researchTime": 40, + "tooltip": "Cavalry +1 armor.", + "modifications": [ + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 } + ], + "affects": ["Cavalry"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: simulation/data/technologies/armor_hero_01.json =================================================================== --- simulation/data/technologies/armor_hero_01.json +++ simulation/data/technologies/armor_hero_01.json @@ -14,11 +14,12 @@ "requirementsTooltip": "Unlocked in City Phase.", "icon": "armor_cuirass_empire.png", "researchTime": 40, - "tooltip": "Heroes +50 metal cost, +2 hack and pierce armor.", + "tooltip": "Heroes +2 armor, +50 metal cost.", "modifications": [ { "value": "Cost/Resources/metal", "add": 50 }, { "value": "Resistance/Entity/Damage/Hack", "add": 2 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 2 } + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 2 } ], "affects": ["Hero"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" Index: simulation/data/technologies/armor_infantry_01.json =================================================================== --- simulation/data/technologies/armor_infantry_01.json +++ simulation/data/technologies/armor_infantry_01.json @@ -13,10 +13,11 @@ "requirementsTooltip": "Unlocked in Town Phase.", "icon": "armor_leather.png", "researchTime": 40, - "tooltip": "Infantry +1 hack and pierce armor.", + "tooltip": "Infantry +1 armor.", "modifications": [ { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 1 } + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 } ], "affects": ["Infantry"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" Index: simulation/data/technologies/armor_infantry_02.json =================================================================== --- simulation/data/technologies/armor_infantry_02.json +++ simulation/data/technologies/armor_infantry_02.json @@ -17,7 +17,8 @@ "tooltip": "Infantry +1 hack and pierce armor.", "modifications": [ { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 1 } + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 } ], "affects": ["Infantry"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" Index: simulation/templates/template_structure_military_forge.xml =================================================================== --- simulation/templates/template_structure_military_forge.xml +++ simulation/templates/template_structure_military_forge.xml @@ -45,8 +45,8 @@ attack_cavalry_ranged_02 armor_infantry_01 armor_infantry_02 - armor_cav_01 - armor_cav_02 + armor_cavalry_01 + armor_cavalry_02 armor_hero_01