From b5bbed4690c8aaca87f573c18f167718c2767095 Mon Sep 17 00:00:00 2001 From: wraitii Date: Wed, 20 Jan 2021 14:23:16 +0000 Subject: [PATCH] [gameplay] Rework attack forge techs Follow up to D3287/9a3da390b9. - Remove the specialised infantry/cavalry attack technologies, in favour of generalist melee/ranged techs to make it easier to switch army compositions. - Lower the costs of the technologies substantially. - Make melee techs cost Food/Metal and Ranged techs Wood/Metal, like resistance techs. - City phase upgrades take 60s - New names and descriptions for the ranged attack technologies. Initial patch by @borg-, rebased and updated by @Nescio. Differential Revision: https://code.wildfiregames.com/D3366 This was SVN commit r24725. --- .../technologies/attack_cavalry_melee_01.json | 29 ------------------ .../technologies/attack_cavalry_melee_02.json | 30 ------------------- .../attack_cavalry_ranged_01.json | 21 ------------- .../attack_cavalry_ranged_02.json | 22 -------------- .../attack_infantry_melee_01.json | 30 ------------------- .../attack_infantry_melee_02.json | 23 -------------- .../attack_infantry_ranged_01.json | 29 ------------------ .../attack_infantry_ranged_02.json | 30 ------------------- .../technologies/soldier_attack_melee_01.json | 28 +++++++++++++++++ .../technologies/soldier_attack_melee_02.json | 21 +++++++++++++ .../soldier_attack_ranged_01.json | 20 +++++++++++++ .../soldier_attack_ranged_02.json | 21 +++++++++++++ .../soldier_resistance_hack_02.json | 2 +- .../soldier_resistance_pierce_02.json | 2 +- .../template_structure_military_forge.xml | 14 ++++----- 15 files changed, 97 insertions(+), 225 deletions(-) delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json deleted file mode 100644 index 5e17076b20..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json deleted file mode 100644 index dbd4821147..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json deleted file mode 100644 index 61e3ea4432..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json deleted file mode 100644 index 67db55bc0f..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json deleted file mode 100644 index 6d055cd7ae..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json deleted file mode 100644 index d228e427af..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json deleted file mode 100644 index 2203ac98ab..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json deleted file mode 100644 index ee171c7587..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json +++ /dev/null @@ -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" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json new file mode 100644 index 0000000000..5471728790 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json @@ -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" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json new file mode 100644 index 0000000000..ccafee08d2 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json @@ -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" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json new file mode 100644 index 0000000000..35eb32cd16 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json @@ -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" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json new file mode 100644 index 0000000000..b35040142e --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json @@ -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" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json b/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json index 86b8ec229e..6efb00c951 100644 --- a/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json +++ b/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_hack_02.json @@ -16,7 +16,7 @@ "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 } diff --git a/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json b/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json index 02f09509f5..ff4b4d9fca 100644 --- a/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json +++ b/binaries/data/mods/public/simulation/data/technologies/soldier_resistance_pierce_02.json @@ -9,7 +9,7 @@ "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 } diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml index 82db0553b9..bc4811ad0c 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml @@ -21,7 +21,7 @@ Forge template_structure_military_forge - Research attack and resistance technologies. + Research attack damage and damage resistance technologies. -ConquestCritical Town Forge structures/blacksmith.png @@ -35,14 +35,10 @@ - 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