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

Fix cases where AI great people get stuck trying to build a great improvement (#7239)

Browse Source
This commit is contained in:
OptimizedForDensity
2022-06-22 02:29:43 -04:00
committed by GitHub
parent 8f53262fc4
commit 50e479b21d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt
View File

@ -257,14 +257,14 @@ object SpecificUnitAutomation {
val applicableTiles = city.getWorkableTiles().filter { val applicableTiles = city.getWorkableTiles().filter {
it.isLand && it.resource == null && !it.isCityCenter() it.isLand && it.resource == null && !it.isCityCenter()
&& (unit.currentTile == it || unit.movement.canMoveTo(it)) && (unit.currentTile == it || unit.movement.canMoveTo(it))
&& !it.containsGreatImprovement() && !it.containsGreatImprovement() && it.canBuildImprovement(improvement, unit.civInfo)
} }
if (applicableTiles.none()) continue if (applicableTiles.none()) continue
val pathToCity = unit.movement.getShortestPath(city.getCenterTile()) val pathToCity = unit.movement.getShortestPath(city.getCenterTile())
if (pathToCity.isEmpty()) continue if (pathToCity.isEmpty()) continue
if (pathToCity.size > 2) { if (pathToCity.size > 2 && unit.getTile().getCity() != city) {
if (unit.getTile().militaryUnit == null) return // Don't move until you're accompanied by a military unit if (unit.getTile().militaryUnit == null) return // Don't move until you're accompanied by a military unit
unit.movement.headTowards(city.getCenterTile()) unit.movement.headTowards(city.getCenterTile())
return return