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

More defensive coding of speedupWonderConstruction (#9671)

Browse Source
This commit is contained in:
SomeTroglodyte 2023-06-25 18:24:30 +02:00 committed by GitHub
parent 330fa6593b
commit 6a8f4914b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,11 +304,8 @@ object SpecificUnitAutomation {
}.mapNotNull { city -> }.mapNotNull { city ->
val path = unit.movement.getShortestPath(city.getCenterTile()) val path = unit.movement.getShortestPath(city.getCenterTile())
if (path.any() && path.size <= 5) city to path.size else null if (path.any() && path.size <= 5) city to path.size else null
}.minByOrNull { it.second }?.first }.minByOrNull { it.second }
?.first ?: return false
if (nearbyCityWithAvailableWonders == null) {
return false
}
if (unit.currentTile == nearbyCityWithAvailableWonders.getCenterTile()) { if (unit.currentTile == nearbyCityWithAvailableWonders.getCenterTile()) {
val wonderToHurry = val wonderToHurry =
@ -317,11 +314,12 @@ object SpecificUnitAutomation {
0, 0,
wonderToHurry.name wonderToHurry.name
) )
UnitActions.getUnitActions(unit) unit.showAdditionalActions = false // make sure getUnitActions doesn't skip the important ones
.first { val unitAction = UnitActions.getUnitActions(unit).firstOrNull {
it.type == UnitActionType.HurryBuilding it.type == UnitActionType.HurryBuilding || it.type == UnitActionType.HurryWonder
|| it.type == UnitActionType.HurryWonder } } ?: return false
.action!!.invoke() if (unitAction.action == null) return false
unitAction.action.invoke()
return true return true
} }