AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 03:23:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed honor policy not adding bonus vs barbarians (#4160)

Browse Source 
* Fixed honor policy not adding bonus vs barbarians

* Implemented requested changes
This commit is contained in:
Xander Lenstra 2021-06-16 17:49:27 +02:00 committed by GitHub
parent 4fc2364cb0
commit 591fd9c138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,10 @@ object BattleDamage {
val civInfo = combatant.getCivInfo() val civInfo = combatant.getCivInfo()
if (combatant is MapUnitCombatant) { if (combatant is MapUnitCombatant) {
for (unique in combatant.unit.getMatchingUniques("+[]% Strength vs []")) { for (unique in
combatant.unit.getMatchingUniques("+[]% Strength vs []") +
civInfo.getMatchingUniques("+[]% Strength vs []")
) {
if (enemy.matchesCategory(unique.params[1])) if (enemy.matchesCategory(unique.params[1]))
modifiers.add("vs [${unique.params[1]}]", unique.params[0].toInt()) modifiers.add("vs [${unique.params[1]}]", unique.params[0].toInt())
} }
@ -94,9 +97,10 @@ object BattleDamage {
modifiers["Difficulty"] = modifiers["Difficulty"] =
(civInfo.gameInfo.getDifficulty().barbarianBonus * 100).toInt() (civInfo.gameInfo.getDifficulty().barbarianBonus * 100).toInt()
// Deprecated since 3.14.17 // Deprecated since 3.14.17
if (civInfo.hasUnique("+25% bonus vs Barbarians")) { if (civInfo.hasUnique("+25% bonus vs Barbarians")) {
modifiers["vs Barbarians (deprecated)"] = 25 modifiers["vs Barbarians (deprecated)"] = 25
} }
//
} }
return modifiers return modifiers