Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json (nonexistent) @@ -1,22 +0,0 @@ -{ - "genericName": "Iron Weapons", - "description": "Replaces bronze weapons with iron.", - "cost": { - "food": 500, - "wood": 500, - "metal": 500 - }, - "supersedes": "attack_cavalry_ranged_01", - "requirements": { "tech": "phase_city" }, - "requirementsTooltip": "Unlocked in City Phase.", - "icon": "horse_rider.png", - "researchTime": 40, - "tooltip": "Cavalry +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": ["Cavalry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json (nonexistent) @@ -1,21 +0,0 @@ -{ - "genericName": "Ranged Combat Cavalry Training", - "description": "Training increases ranged attack.", - "cost": { - "food": 500, - "wood": 750, - "metal": 350 - }, - "requirements": { "tech": "phase_town" }, - "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "horse_rider.png", - "researchTime": 40, - "tooltip": "Cavalry +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": ["Cavalry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json (nonexistent) @@ -1,29 +0,0 @@ -{ - "genericName": "Close Combat Cavalry Training", - "specificName": { - "athen": "Xyston", - "mace": "Xyston", - "ptol": "Xyston", - "rome": "Hasta", - "sele": "Xyston", - "spart": "Xyston" - }, - "description": "Training increases melee attack.", - "cost": { - "food": 500, - "wood": 750, - "metal": 350 - }, - "requirements": { "tech": "phase_town" }, - "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "horse_trainer.png", - "researchTime": 40, - "tooltip": "Cavalry +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": ["Cavalry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json (nonexistent) @@ -1,30 +0,0 @@ -{ - "genericName": "Iron Weapons", - "specificName": { - "athen": "Xyston", - "mace": "Xyston", - "ptol": "Xyston", - "rome": "Hasta", - "sele": "Xyston", - "spart": "Xyston" - }, - "description": "Replaces bronze weapons with iron.", - "cost": { - "food": 500, - "wood": 500, - "metal": 500 - }, - "supersedes": "attack_cavalry_melee_01", - "requirements": { "tech": "phase_city" }, - "requirementsTooltip": "Unlocked in City Phase.", - "icon": "spear_cavalry.png", - "researchTime": 40, - "tooltip": "Cavalry +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": ["Cavalry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json (nonexistent) @@ -1,30 +0,0 @@ -{ - "genericName": "Ranged Infantry Masterclass", - "specificName": { - "athen": "Ataktoi", - "mace": "Ataktoi", - "ptol": "Ataktoi", - "sele": "Ataktoi", - "spart": "Ataktoi" - }, - "description": "Training increases damage of ranged infantry.", - "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": "Infantry +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": ["Infantry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json (nonexistent) @@ -1,23 +0,0 @@ -{ - "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": "Infantry +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": ["Infantry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json (nonexistent) @@ -1,30 +0,0 @@ -{ - "genericName": "Side Arms", - "specificName": { - "athen": "Xiphos", - "mace": "Xiphos", - "ptol": "Xiphos", - "rome": "Pugio", - "sele": "Xiphos", - "spart": "Xiphos" - }, - "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": "Infantry +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": ["Infantry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json (nonexistent) @@ -1,29 +0,0 @@ -{ - "genericName": "Ranged Infantry Irregulars", - "specificName": { - "athen": "Ataktoi", - "mace": "Ataktoi", - "ptol": "Ataktoi", - "sele": "Ataktoi", - "spart": "Ataktoi" - }, - "description": "Training increases damage of ranged infantry.", - "cost": { - "food": 500, - "wood": 500, - "stone": 250, - "metal": 250 - }, - "requirements": { "tech": "phase_town" }, - "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "arrow.png", - "researchTime": 40, - "tooltip": "Infantry +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": ["Infantry"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json (revision 24725) @@ -0,0 +1,28 @@ +{ + "genericName": "Side Arms", + "specificName": { + "athen": "Xiphos", + "mace": "Xiphos", + "ptol": "Xiphos", + "rome": "Pugio", + "sele": "Xiphos", + "spart": "Xiphos" + }, + "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 + }, + "requirements": { "tech": "phase_town" }, + "requirementsTooltip": "Unlocked in Town Phase.", + "icon": "sword.png", + "researchTime": 40, + "tooltip": "Soldiers +15% melee attack damage.", + "modifications": [ + { "value": "Attack/Melee/Damage/Hack", "multiply": 1.15 }, + { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.15 }, + { "value": "Attack/Melee/Damage/Crush", "multiply": 1.15 } + ], + "affects": ["Soldier !Elephant"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json (revision 24725) @@ -0,0 +1,21 @@ +{ + "genericName": "Iron Weapons", + "description": "Using iron instead of bronze gave weapons additional power.", + "cost": { + "food": 900, + "metal": 600 + }, + "supersedes": "soldier_attack_melee_01", + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "sword_cross.png", + "researchTime": 60, + "tooltip": "Soldiers +15% melee attack damage.", + "modifications": [ + { "value": "Attack/Melee/Damage/Hack", "multiply": 1.15 }, + { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.15 }, + { "value": "Attack/Melee/Damage/Crush", "multiply": 1.15 } + ], + "affects": ["Soldier !Elephant"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json (revision 24725) @@ -0,0 +1,20 @@ +{ + "genericName": "Iron Arrowheads", + "description": "Projectile points made of iron enable missiles to penetrate deeper.", + "cost": { + "wood": 600, + "metal": 400 + }, + "requirements": { "tech": "phase_town" }, + "requirementsTooltip": "Unlocked in Town Phase.", + "icon": "arrow.png", + "researchTime": 40, + "tooltip": "Soldiers +15% ranged attack damage.", + "modifications": [ + { "value": "Attack/Ranged/Damage/Hack", "multiply": 1.15 }, + { "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.15 }, + { "value": "Attack/Ranged/Damage/Crush", "multiply": 1.15 } + ], + "affects": ["Soldier"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json (revision 24725) @@ -0,0 +1,21 @@ +{ + "genericName": "Trilobate Arrowheads", + "description": "Arrowheads with three lobes instead of two inflict larger wounds.", + "cost": { + "wood": 900, + "metal": 600 + }, + "supersedes": "soldier_attack_ranged_01", + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "arrow_accuracy.png", + "researchTime": 60, + "tooltip": "Soldiers +15% ranged attack damage.", + "modifications": [ + { "value": "Attack/Ranged/Damage/Hack", "multiply": 1.15 }, + { "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.15 }, + { "value": "Attack/Ranged/Damage/Crush", "multiply": 1.15 } + ], + "affects": ["Soldier"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json (revision 24725) @@ -1,26 +1,26 @@ { "genericName": "Laminated Linen Body Armor", "specificName": { "athen": "Linothōrax", "mace": "Linothōrax", "ptol": "Linothōrax", "sele": "Linothōrax", "spart": "Linothōrax" }, "description": "Body armor made from laminated linen.", "cost": { "food": 600, "metal": 600 }, "supersedes": "soldier_resistance_hack_01", "requirements": { "tech": "phase_city" }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "armor_pteruges.png", - "researchTime": 40, + "researchTime": 60, "tooltip": "Soldiers +1 hack resistance.", "modifications": [ { "value": "Resistance/Entity/Damage/Hack", "add": 1 } ], "affects": ["Soldier"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } 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 (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json (revision 24725) @@ -1,19 +1,19 @@ { "genericName": "Metal Rim", "description": "Strengthen shields with a metal rim or spine.", "cost": { "wood": 600, "metal": 600 }, "supersedes": "soldier_resistance_pierce_01", "requirements": { "tech": "phase_city" }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "shields_generic_bronze.png", - "researchTime": 40, + "researchTime": 60, "tooltip": "Soldiers +1 pierce resistance.", "modifications": [ { "value": "Resistance/Entity/Damage/Pierce", "add": 1 } ], "affects": ["Soldier"], "soundComplete": "interface/alarm/alarm_upgradearmory.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 (revision 24724) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml (revision 24725) @@ -1,68 +1,64 @@ 120 200 12.0 1 Infantry Healer 2000 decay|rubble/rubble_stone_4x4 Forge template_structure_military_forge - Research attack and resistance technologies. + Research attack damage and damage resistance technologies. -ConquestCritical Town Forge structures/blacksmith.png phase_town 40 - attack_infantry_melee_01 - attack_infantry_melee_02 - attack_infantry_ranged_01 - attack_infantry_ranged_02 - attack_cavalry_melee_01 - attack_cavalry_melee_02 - attack_cavalry_ranged_01 - attack_cavalry_ranged_02 + soldier_attack_melee_01 + soldier_attack_melee_02 + soldier_attack_ranged_01 + soldier_attack_ranged_02 soldier_resistance_hack_01 soldier_resistance_hack_02 soldier_resistance_pierce_01 soldier_resistance_pierce_02 interface/complete/building/complete_forge.xml 38 30000 32 structures/fndn_5x5.xml