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

Great general unique no longer restricted to civilian units

Browse Source
This commit is contained in:
Yair Morgenstern
2021-05-02 09:33:08 +03:00
parent ba1f647a8e
commit 204791c4b8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,9 +87,8 @@ object BattleDamage {
val nearbyCivUnits = combatant.unit.getTile().getTilesInDistance(2)
.filter { it.civilianUnit?.civInfo == combatant.unit.civInfo }
.map { it.civilianUnit }
if (nearbyCivUnits.any { it!!.hasUnique("Bonus for units in 2 tile radius 15%") }) {
.flatMap { it.getUnits() }.filter { it.civInfo == combatant.unit.civInfo }
if (nearbyCivUnits.any { it.hasUnique("Bonus for units in 2 tile radius 15%") }) {
val greatGeneralModifier = if (combatant.unit.civInfo.hasUnique("Great General provides double combat bonus")) 30 else 15
modifiers["Great General"] = greatGeneralModifier
}