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

Unstack enemy unit strength modifiers (#7390)

Browse Source
This commit is contained in:
OptimizedForDensity
2022-07-07 10:52:16 -04:00
committed by GitHub
parent fc1896eaf1
commit 60f7ea4322
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,12 +60,13 @@ object BattleDamage {
//https://www.carlsguides.com/strategy/civilization5/war/combatbonuses.php //https://www.carlsguides.com/strategy/civilization5/war/combatbonuses.php
val adjacentUnits = combatant.getTile().neighbors.flatMap { it.getUnits() } val adjacentUnits = combatant.getTile().neighbors.flatMap { it.getUnits() }
for (unique in adjacentUnits.filter { it.civInfo.isAtWarWith(civInfo) } val strengthMalus = adjacentUnits.filter { it.civInfo.isAtWarWith(civInfo) }
.flatMap { it.getMatchingUniques(UniqueType.StrengthForAdjacentEnemies) }) .flatMap { it.getMatchingUniques(UniqueType.StrengthForAdjacentEnemies) }
if (combatant.matchesCategory(unique.params[1]) && combatant.getTile() .filter { combatant.matchesCategory(it.params[1]) && combatant.getTile().matchesFilter(it.params[2]) }
.matchesFilter(unique.params[2]) .maxByOrNull { it.params[0] }
) if (strengthMalus != null) {
modifiers.add("Adjacent enemy units", unique.params[0].toInt()) modifiers.add("Adjacent enemy units", strengthMalus.params[0].toInt())
}
val civResources = civInfo.getCivResourcesByName() val civResources = civInfo.getCivResourcesByName()
for (resource in combatant.unit.baseUnit.getResourceRequirements().keys) for (resource in combatant.unit.baseUnit.getResourceRequirements().keys)