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

Resolved #12187 - units are not added to cities in resistance if non-resistant cities are available

Browse Source
This commit is contained in:
yairm210 2024-09-07 22:37:29 +03:00
parent 2a0ff58cc9
commit 9c0e9131f0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/civilization/managers/UnitManager.kt
View File

@ -53,11 +53,14 @@ class UnitManager(val civInfo: Civilization) {
if (civInfo.cities.isEmpty()) return null if (civInfo.cities.isEmpty()) return null
val unit = civInfo.getEquivalentUnit(baseUnit) val unit = civInfo.getEquivalentUnit(baseUnit)
val citiesNotInResistance = civInfo.cities.filterNot { it.isInResistance() }
val cityToAddTo = when { val cityToAddTo = when {
unit.isWaterUnit && (city == null || !city.isCoastal()) -> unit.isWaterUnit && (city == null || !city.isCoastal()) ->
citiesNotInResistance.filter { it.isCoastal() }.randomOrNull() ?:
civInfo.cities.filter { it.isCoastal() }.randomOrNull() civInfo.cities.filter { it.isCoastal() }.randomOrNull()
city != null -> city city != null -> city
else -> civInfo.cities.random() else -> citiesNotInResistance.randomOrNull() ?: civInfo.cities.random()
} ?: return null // If we got a free water unit with no coastal city to place it in } ?: return null // If we got a free water unit with no coastal city to place it in
val placedUnit = placeUnitNearTile(cityToAddTo.location, unit.name) val placedUnit = placeUnitNearTile(cityToAddTo.location, unit.name)
// silently bail if no tile to place the unit is found // silently bail if no tile to place the unit is found