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

Hopefully fixed a recurring bug in tryHeadTowardsEnemyCity

Browse Source
This commit is contained in:
Yair Morgenstern 2019-05-28 23:13:08 +03:00
parent b6512535fb
commit d0cb10abbe
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -233,15 +233,14 @@ class UnitAutomation{
.filter { unit.civInfo.isAtWarWith(it) } .filter { unit.civInfo.isAtWarWith(it) }
.flatMap { it.cities }.asSequence() .flatMap { it.cities }.asSequence()
.filter { it.location in unit.civInfo.exploredTiles } .filter { it.location in unit.civInfo.exploredTiles }
.map { it.getCenterTile() }.toList()
if(unit.type.isRanged()) // ranged units don't harm capturable cities, waste of a turn if(unit.type.isRanged()) // ranged units don't harm capturable cities, waste of a turn
enemyCities = enemyCities.filterNot { it.getCity()!!.health==1 } enemyCities = enemyCities.filterNot { it.health==1 }
val closestReachableEnemyCity = enemyCities val closestReachableEnemyCity = enemyCities
.asSequence() .asSequence().map { it.getCenterTile() }
.sortedBy { city -> // sort enemy cities by closeness to our cities, and only then choose the first reachable - checking canReach is comparatively very time-intensive! .sortedBy { cityCenterTile -> // sort enemy cities by closeness to our cities, and only then choose the first reachable - checking canReach is comparatively very time-intensive!
unit.civInfo.cities.asSequence().map { city.arialDistanceTo(it.getCenterTile()) }.min()!! unit.civInfo.cities.asSequence().map { cityCenterTile.arialDistanceTo(it.getCenterTile()) }.min()!!
} }
.firstOrNull { unit.movementAlgs().canReach(it) } .firstOrNull { unit.movementAlgs().canReach(it) }