mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 00:08:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

"+[]% combat bonus in []" -> "+[]% Strength in []"

Browse Source
This commit is contained in:
Yair Morgenstern
2021-04-14 18:25:37 +03:00
parent e01859f6b9
commit e424ec4a91
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/assets/jsons/Civ V - Vanilla/Units.json
View File

@ -61,7 +61,7 @@
"strength": 8, "strength": 8,
"cost": 40, "cost": 40,
"obsoleteTech": "Metal Casting", "obsoleteTech": "Metal Casting",
"uniques": ["+[33]% combat bonus in [Forest]", "+[33]% combat bonus in [Jungle]", "Heals [25] damage if it kills a unit"], "uniques": ["+[33]% Strength in [Forest]", "+[33]% Strength in [Jungle]", "Heals [25] damage if it kills a unit"],
"promotions": ["Woodsman"], "promotions": ["Woodsman"],
"upgradesTo": "Swordsman", "upgradesTo": "Swordsman",
"attackSound": "nonmetalhit" "attackSound": "nonmetalhit"
@ -361,7 +361,7 @@
"upgradesTo": "Longswordsman", "upgradesTo": "Longswordsman",
"obsoleteTech": "Gunpowder", "obsoleteTech": "Gunpowder",
"hurryCostModifier": 20, "hurryCostModifier": 20,
"uniques": ["+[33]% combat bonus in [Forest]", "+[33]% combat bonus in [Jungle]"], "uniques": ["+[33]% Strength in [Forest]", "+[33]% Strength in [Jungle]"],
"attackSound": "metalhit" "attackSound": "metalhit"
}, },
/* /*
@ -917,7 +917,7 @@
"requiredTech": "Rifling", "requiredTech": "Rifling",
"obsoleteTech": "Replaceable Parts", "obsoleteTech": "Replaceable Parts",
"upgradesTo": "Great War Infantry", "upgradesTo": "Great War Infantry",
"uniques": ["+[25]% combat bonus in [Snow]", "+[25]% combat bonus in [Tundra]", "+[25]% combat bonus in [Hill]", "Double movement in Snow, Tundra and Hills"], "uniques": ["+[25]% Strength in [Snow]", "+[25]% Strength in [Tundra]", "+[25]% Strength in [Hill]", "Double movement in Snow, Tundra and Hills"],
"attackSound": "shot" "attackSound": "shot"
}, },
{ {
@ -1149,7 +1149,7 @@
"requiredTech": "Replaceable Parts", "requiredTech": "Replaceable Parts",
"upgradesTo": "Infantry", "upgradesTo": "Infantry",
"obsoleteTech": "Plastics", "obsoleteTech": "Plastics",
"uniques": ["+[20]% combat bonus in [Foreign Land]"], "uniques": ["+[20]% Strength in [Foreign Land]"],
"attackSound": "shot" "attackSound": "shot"
}, },
/* /*

2
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -201,7 +201,7 @@ object BattleDamage {
private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): Counter<String> { private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): Counter<String> {
val modifiers = Counter<String>() val modifiers = Counter<String>()
for (unique in unit.unit.getMatchingUniques("+[]% combat bonus in []") for (unique in unit.unit.getMatchingUniques("+[]% combat bonus in []") // deprecated as of 3.14.1
+ unit.unit.getMatchingUniques("+[]% Strength in []") + unit.unit.getMatchingUniques("+[]% Strength in []")
+ unit.getCivInfo().getMatchingUniques("+[]% combat bonus for units fighting in []")) { + unit.getCivInfo().getMatchingUniques("+[]% combat bonus for units fighting in []")) {
val filter = unique.params[1] val filter = unique.params[1]