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

Merge branch 'temp'

Browse Source
This commit is contained in:
Yair Morgenstern
2023-05-24 11:43:39 +03:00
parent 4cde648ebb 4ef33b84e5
commit 133704282c
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,8 +145,6 @@ object SpecificUnitAutomation {
}
}
if (unit.getDamageFromTerrain() < unit.health) return // Also make sure we won't die waiting
// It's possible that we'll see a tile "over the sea" that's better than the tiles close by, but that's not a reason to abandon the close tiles!
// Also this lead to some routing problems, see https://github.com/yairm210/Unciv/issues/3653
val bestCityLocation: Tile? =

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

@ -242,6 +242,7 @@ object UnitAutomation {
.mapNotNull { it.militaryUnit }
.filter { it.civ.isAtWarWith(unit.civ) }
.flatMap { it.movement.getReachableTilesInCurrentTurn() }
.filter { it.militaryUnit?.civ != unit.civ }
.toSet()
if (unit.hasUnique(UniqueType.FoundCity))