Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json @@ -1,34 +0,0 @@ -{ - "genericName": "Steel Working", - "specificName": { - "maur": "Wootz Steel", - "iber": "Toledo Steel" - }, - "description": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.", - "cost": { - "wood": 200, - "metal": 200 - }, - "requirements": { - "all": [ - { "tech": "phase_city" }, - { - "any": [ - { "civ": "iber" }, - { "civ": "maur" } - ] - } - ] - }, - "requirementsTooltip": "Unlocked in City Phase.", - "icon": "metalworker.png", - "researchTime": 60, - "tooltip": "Swordsmen +20% attack damage.", - "modifications": [ - { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 }, - { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 }, - { "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 } - ], - "affects": ["Swordsman"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json @@ -10,12 +10,12 @@ }, "description": "Often, a soldier 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": 600, - "metal": 400 + "food": 200, + "metal": 100 }, "requirements": { "tech": "phase_town" }, "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "sword.png", + "icon": "sword_01.png", "researchTime": 40, "tooltip": "Soldiers +15% melee attack damage.", "modifications": [ Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json @@ -2,14 +2,14 @@ "genericName": "Iron Weapons", "description": "Using iron instead of bronze gave weapons additional power.", "cost": { - "food": 900, - "metal": 600 + "food": 350, + "metal": 250 }, "supersedes": "soldier_attack_melee_01", "requirements": { "tech": "phase_city" }, "requirementsTooltip": "Unlocked in City Phase.", - "icon": "sword_cross.png", - "researchTime": 60, + "icon": "sword_02.png", + "researchTime": 50, "tooltip": "Soldiers +15% melee attack damage.", "modifications": [ { "value": "Attack/Melee/Damage/Hack", "multiply": 1.15 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_03.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_03.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_03.json @@ -0,0 +1,27 @@ +{ + "genericName": "Carburization", + "description": "By adding a small amount of carbon during the iron smelting process, a stronger material, steel, can be forged.", + "cost": { + "food": 500, + "metal": 400 + }, + "supersedes": "soldier_attack_melee_02", + "requirements": { + "all": [ + { "tech": "phase_city" }, + { "notciv": "iber" }, + { "notciv": "maur" } + ] + }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "sword_03.png", + "researchTime": 60, + "tooltip": "Soldiers +20% melee attack damage.", + "modifications": [ + { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 } + ], + "affects": ["Soldier !Elephant"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_03_variant.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_03_variant.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_03_variant.json @@ -0,0 +1,38 @@ +{ + "genericName": "Steel Working", + "specificName": { + "maur": "Wootz Steel", + "iber": "Toledo Steel" + }, + "description": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.", + "cost": { + "food": 500, + "metal": 400 + }, + "supersedes": "soldier_attack_melee_02", + "requirements": { + "all": [ + { "tech": "phase_city" }, + { + "any": [ + { "civ": "iber" }, + { "civ": "maur" } + ] + } + ] + }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "metalworker.png", + "researchTime": 60, + "tooltip": "Soldiers +20% melee attack damage. Swordsmen get an additional +20% bonus.", + "modifications": [ + { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Hack", "affects": "Swordsman", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Pierce", "affects": "Swordsman", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Crush", "affects": "Swordsman", "multiply": 1.2 } + ], + "affects": ["Soldier !Elephant"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json @@ -1,13 +1,13 @@ { - "genericName": "Iron Arrowheads", - "description": "Projectile points made of iron enable missiles to penetrate deeper.", + "genericName": "Improved Fletching", + "description": "Improving the fletching of arrows increases their stability and speed, and thus their penetration.", "cost": { - "wood": 600, - "metal": 400 + "wood": 200, + "metal": 100 }, "requirements": { "tech": "phase_town" }, "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "arrow.png", + "icon": "arrow_01.png", "researchTime": 40, "tooltip": "Soldiers +15% ranged attack damage.", "modifications": [ Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json @@ -1,15 +1,15 @@ { - "genericName": "Trilobate Arrowheads", - "description": "Arrowheads with three lobes instead of two inflict larger wounds.", + "genericName": "Iron Arrowheads", + "description": "Projectile points made of iron enable missiles to penetrate deeper.", "cost": { - "wood": 900, - "metal": 600 + "wood": 350, + "metal": 250 }, "supersedes": "soldier_attack_ranged_01", "requirements": { "tech": "phase_city" }, "requirementsTooltip": "Unlocked in City Phase.", - "icon": "arrow_accuracy.png", - "researchTime": 60, + "icon": "arrow_02.png", + "researchTime": 50, "tooltip": "Soldiers +15% ranged attack damage.", "modifications": [ { "value": "Attack/Ranged/Damage/Hack", "multiply": 1.15 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_03.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_03.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_03.json @@ -0,0 +1,21 @@ +{ + "genericName": "Trilobate Arrowheads", + "description": "Arrowheads with three lobes instead of two inflict larger wounds.", + "cost": { + "wood": 500, + "metal": 400 + }, + "supersedes": "soldier_attack_ranged_02", + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "arrow_03.png", + "researchTime": 60, + "tooltip": "Soldiers +20% ranged attack damage.", + "modifications": [ + { "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 }, + { "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 }, + { "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 } + ], + "affects": ["Soldier"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_01.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_01.json @@ -9,8 +9,8 @@ }, "description": "Body armor made from quilted wool, linen, cotton, or leather.", "cost": { - "food": 400, - "metal": 400 + "food": 200, + "metal": 100 }, "requirements": { "tech": "phase_town" }, "requirementsTooltip": "Unlocked in Town Phase.", Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json @@ -9,14 +9,14 @@ }, "description": "Body armor made from laminated linen.", "cost": { - "food": 600, - "metal": 600 + "food": 350, + "metal": 250 }, "supersedes": "soldier_resistance_hack_01", "requirements": { "tech": "phase_city" }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "armor_pteruges.png", - "researchTime": 60, + "researchTime": 50, "tooltip": "Soldiers +1 hack resistance.", "modifications": [ { "value": "Resistance/Entity/Damage/Hack", "add": 1 } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_03.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_03.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_03.json @@ -0,0 +1,19 @@ +{ + "genericName": "Mail Body Armor", + "description": "Body armor made of small metal rings linked together.", + "cost": { + "food": 500, + "metal": 400 + }, + "supersedes": "soldier_resistance_hack_02", + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "armor_chain.png", + "researchTime": 60, + "tooltip": "Soldiers +2 hack resistance.", + "modifications": [ + { "value": "Resistance/Entity/Damage/Hack", "add": 2 } + ], + "affects": ["Soldier"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_01.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_01.json @@ -2,12 +2,12 @@ "genericName": "Wooden Shield", "description": "Wooden shields are heavier but much better able to resist projectiles and blows than wicker-frame shields.", "cost": { - "wood": 400, - "metal": 400 + "wood": 200, + "metal": 100 }, "requirements": { "tech": "phase_town" }, "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "shield_parma.png", + "icon": "shields_generic_wood.png", "researchTime": 40, "tooltip": "Soldiers +1 pierce resistance.", "modifications": [ Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json @@ -2,14 +2,14 @@ "genericName": "Metal Rim", "description": "Strengthen shields with a metal rim or spine.", "cost": { - "wood": 600, - "metal": 600 + "wood": 350, + "metal": 250 }, "supersedes": "soldier_resistance_pierce_01", "requirements": { "tech": "phase_city" }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "shields_generic_bronze.png", - "researchTime": 60, + "researchTime": 50, "tooltip": "Soldiers +1 pierce resistance.", "modifications": [ { "value": "Resistance/Entity/Damage/Pierce", "add": 1 } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_03.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_03.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_03.json @@ -0,0 +1,19 @@ +{ + "genericName": "Improved Shield Alloys", + "description": "Strengthen shields further with stronger metal alloys.", + "cost": { + "wood": 500, + "metal": 400 + }, + "supersedes": "soldier_resistance_pierce_02", + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "shields_generic_silver.png", + "researchTime": 60, + "tooltip": "Soldiers +2 pierce resistance.", + "modifications": [ + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 } + ], + "affects": ["Soldier"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/forge.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/forge.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/forge.xml @@ -4,11 +4,6 @@ iber Harotz - - - attack_steel_working - - structures/iberians/blacksmith.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/forge.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/forge.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/forge.xml @@ -4,11 +4,6 @@ maur Lohakāra - - - attack_steel_working - - structures/mauryas/blacksmith.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml @@ -37,12 +37,17 @@ soldier_attack_melee_01 soldier_attack_melee_02 + soldier_attack_melee_03 + soldier_attack_melee_03_variant soldier_attack_ranged_01 soldier_attack_ranged_02 + soldier_attack_ranged_03 soldier_resistance_hack_01 soldier_resistance_hack_02 + soldier_resistance_hack_03 soldier_resistance_pierce_01 soldier_resistance_pierce_02 + soldier_resistance_pierce_03 archer_attack_spread