wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug where unit would try to randomwalk but there wasn't anywhere to go

Browse source
This commit is contained in:
Yair Morgenstern 2018-05-25 12:08:06 +03:00
parent 389c489faf
commit 1a2d3d4421
1 changed files with 6 additions and 3 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

@ -151,9 +151,12 @@ class UnitAutomation{
}
// else, go to a random space
unit.moveToTile(unit.getDistanceToTiles()
.filter { it.key.unit == null && it.value==unit.currentMovement } // at edge of walking distance
.toList().getRandom().first)
val reachableTiles = unit.getDistanceToTiles()
.filter { it.key.unit == null} // at edge of walking distance
val reachableTilesMaxWalkingDistance = reachableTiles.filter { it.value==unit.currentMovement}
if(reachableTilesMaxWalkingDistance.any()) unit.moveToTile(reachableTilesMaxWalkingDistance.toList().getRandom().first)
else if(reachableTiles.any()) unit.moveToTile(reachableTiles.toList().getRandom().first)
// if both failed, then... there aren't any reachable tiles. Which is possible.
}
fun rankTileAsCityCenter(tileInfo: TileInfo, nearbyTileRankings: Map<TileInfo, Float>): Float {