From 98af4207ecdd1cc8bab4172acde2262f5c8a010c Mon Sep 17 00:00:00 2001 From: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com> Date: Sat, 25 Jun 2022 15:30:04 -0400 Subject: [PATCH] Make mounted vs city penalties only for attacking (#7296) * Make horse vs city penalties only for attacking * Reorder conditions Co-authored-by: Yair Morgenstern --- .../jsons/Civ V - Gods & Kings/Units.json | 24 +++++++++---------- .../assets/jsons/Civ V - Vanilla/Units.json | 16 ++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/android/assets/jsons/Civ V - Gods & Kings/Units.json b/android/assets/jsons/Civ V - Gods & Kings/Units.json index 2a6b4c8c6d..62595b983d 100644 --- a/android/assets/jsons/Civ V - Gods & Kings/Units.json +++ b/android/assets/jsons/Civ V - Gods & Kings/Units.json @@ -371,7 +371,7 @@ "requiredResource": "Horses", "upgradesTo": "Knight", "obsoleteTech": "Chivalry", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength " ], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength " ], "hurryCostModifier": 20, "attackSound": "horse" }, @@ -388,7 +388,7 @@ "obsoleteTech": "Chivalry", "promotions": ["Great Generals I"], "requiredResource": "Horses", - "uniques": ["Can move after attacking", "No defensive terrain bonus", "[-33]% Strength "], + "uniques": ["Can move after attacking", "No defensive terrain bonus", "[-33]% Strength "], "hurryCostModifier": 20, "attackSound": "horse" }, @@ -404,7 +404,7 @@ "upgradesTo": "Knight", "obsoleteTech": "Chivalry", "promotions": ["Great Generals II"], - "uniques": ["Can move after attacking", "No defensive terrain bonus", "[-33]% Strength ", + "uniques": ["Can move after attacking", "No defensive terrain bonus", "[-33]% Strength ", "[-10]% Strength for enemy [Military] units in adjacent [All] tiles"], "hurryCostModifier": 20, "attackSound": "elephant" @@ -421,7 +421,7 @@ "upgradesTo": "Knight", "obsoleteTech": "Chivalry", "requiredResource": "Horses", - "uniques": ["Can move after attacking", "[-25]% Strength "], + "uniques": ["Can move after attacking", "[-25]% Strength "], "hurryCostModifier": 20, "attackSound": "horse" }, @@ -581,7 +581,7 @@ "obsoleteTech": "Military Science", "upgradesTo": "Cavalry", "requiredResource": "Horses", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], "attackSound": "horse" }, { @@ -630,7 +630,7 @@ "requiredTech": "Chivalry", "obsoleteTech": "Military Science", "upgradesTo": "Cavalry", - "uniques": ["Can move after attacking","No defensive terrain bonus","[+50]% Strength ","[-33]% Strength "], + "uniques": ["Can move after attacking","No defensive terrain bonus","[+50]% Strength ","[-33]% Strength "], "attackSound": "elephant" }, { @@ -946,7 +946,7 @@ "cost": 185, "requiredTech": "Metallurgy", "requiredResource": "Horses", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ","Never appears as a Barbarian unit"], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ","Never appears as a Barbarian unit"], "promotions": ["Formation I"], "upgradesTo": "Anti-Tank Gun", "obsoleteTech": "Combined Arms", @@ -962,7 +962,7 @@ "cost": 185, "requiredTech": "Metallurgy", "requiredResource": "Horses", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "[+1] Sight"], "promotions": ["[Sipahi] ability","Formation I"], "upgradesTo": "Anti-Tank Gun", @@ -979,7 +979,7 @@ "cost": 185, "requiredTech": "Metallurgy", "requiredResource": "Horses", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength "], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength "], "promotions": ["[Hakkapeliitta] ability","Formation I"], "upgradesTo": "Anti-Tank Gun", "obsoleteTech": "Combined Arms", @@ -1077,7 +1077,7 @@ "obsoleteTech": "Combustion", "requiredResource": "Horses", "upgradesTo": "Landship", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], "attackSound": "horse" }, { @@ -1092,7 +1092,7 @@ "obsoleteTech": "Combustion", "requiredResource": "Horses", "upgradesTo": "Landship", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength "], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength "], "promotions": ["[Cossack] ability"], "attackSound": "horse" }, @@ -1108,7 +1108,7 @@ "obsoleteTech": "Combustion", "requiredResource": "Horses", "upgradesTo": "Landship", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "[+1] Sight"], "promotions": ["[Hussar] ability"], "attackSound": "horse" diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index 93b9be1866..4adf30ad47 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -281,7 +281,7 @@ "requiredResource": "Horses", "upgradesTo": "Knight", "obsoleteTech": "Chivalry", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength " ], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength " ], "hurryCostModifier": 20, "attackSound": "horse" }, @@ -298,7 +298,7 @@ "obsoleteTech": "Chivalry", "promotions": ["Great Generals I"], "requiredResource": "Horses", - "uniques": ["Can move after attacking", "No defensive terrain bonus", "[-33]% Strength "], + "uniques": ["Can move after attacking", "No defensive terrain bonus", "[-33]% Strength "], "hurryCostModifier": 20, "attackSound": "horse" }, @@ -435,7 +435,7 @@ "obsoleteTech": "Military Science", "upgradesTo": "Cavalry", "requiredResource": "Horses", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], "attackSound": "horse" }, { @@ -484,7 +484,7 @@ "requiredTech": "Chivalry", "obsoleteTech": "Military Science", "upgradesTo": "Cavalry", - "uniques": ["Can move after attacking","No defensive terrain bonus","[+50]% Strength ","[-33]% Strength "], + "uniques": ["Can move after attacking","No defensive terrain bonus","[+50]% Strength ","[-33]% Strength "], "attackSound": "elephant" }, { @@ -775,7 +775,7 @@ "cost": 185, "requiredTech": "Metallurgy", "requiredResource": "Horses", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ","Never appears as a Barbarian unit"], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ","Never appears as a Barbarian unit"], "promotions": ["Formation I"], "upgradesTo": "Anti-Tank Gun", "obsoleteTech": "Combustion", @@ -791,7 +791,7 @@ "cost": 185, "requiredTech": "Metallurgy", "requiredResource": "Horses", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "[+1] Sight"], "promotions": ["[Sipahi] ability","Formation I"], "upgradesTo": "Anti-Tank Gun", @@ -849,7 +849,7 @@ "obsoleteTech": "Combustion", "requiredResource": "Horses", "upgradesTo": "Tank", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength ", "Never appears as a Barbarian unit"], "attackSound": "horse" }, { @@ -864,7 +864,7 @@ "obsoleteTech": "Combustion", "requiredResource": "Horses", "upgradesTo": "Tank", - "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength "], + "uniques": ["Can move after attacking","No defensive terrain bonus","[-33]% Strength "], "promotions":["[Cossack] ability"], "attackSound": "horse" },