AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: reduce automateWorkerAction complexity even more

Browse Source
This commit is contained in:
yairm210 2025-01-07 20:15:36 +02:00
parent 1296520737
commit 6f068d5fd3
1 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
View File

@ -84,40 +84,19 @@ class WorkerAutomation(
val tileToWork = findTileToWork(unit, dangerousTiles, localUniqueCache) val tileToWork = findTileToWork(unit, dangerousTiles, localUniqueCache)
if (tileToWork != currentTile && tileToWork != null) { if (tileToWork != currentTile && tileToWork != null) {
headTowardsTileToWork(unit, tileToWork, localUniqueCache) headTowardsTileToWork(unit, tileToWork)
return return
} }
if (currentTile.improvementInProgress != null) return // we're working! if (currentTile.improvementInProgress != null) return // we're working!
if (tileToWork == currentTile && tileHasWorkToDo(currentTile, unit, localUniqueCache)) { if (tileToWork == currentTile && tileHasWorkToDo(currentTile, unit, localUniqueCache))
workOnCurrentTile(unit) workOnCurrentTile(unit)
}
if (unit.cache.hasUniqueToCreateWaterImprovements) {
// Support Alpha Frontier-Style Workers that _also_ have the "May create improvements on water resources" unique // Support Alpha Frontier-Style Workers that _also_ have the "May create improvements on water resources" unique
if (automateWorkBoats(unit)) return if (unit.cache.hasUniqueToCreateWaterImprovements && automateWorkBoats(unit)) return
}
val citiesToNumberOfUnimprovedTiles = HashMap<String, Int>() if (tryHeadTowardsUndevelopedCity(unit, localUniqueCache, currentTile)) return
for (city in unit.civ.cities) {
citiesToNumberOfUnimprovedTiles[city.id] = city.getTiles()
.count { tile -> tile.isLand
&& tile.getUnits().none { unit -> unit.cache.hasUniqueToBuildImprovements }
&& (tile.isPillaged() || tileHasWorkToDo(tile, unit, localUniqueCache)) }
}
val closestUndevelopedCity = unit.civ.cities.asSequence()
.filter { citiesToNumberOfUnimprovedTiles[it.id]!! > 0 }
.sortedByDescending { it.getCenterTile().aerialDistanceTo(currentTile) }
.firstOrNull { unit.movement.canReach(it.getCenterTile()) } //goto most undeveloped city
if (closestUndevelopedCity != null && closestUndevelopedCity != currentTile.owningCity) {
debug("WorkerAutomation: %s -> head towards undeveloped city %s", unit, closestUndevelopedCity.name)
val reachedTile = unit.movement.headTowards(closestUndevelopedCity.getCenterTile())
if (reachedTile != currentTile) unit.doAction() // since we've moved, maybe we can do something here - automate
return
}
// Nothing to do, try again to connect cities // Nothing to do, try again to connect cities
if (roadBetweenCitiesAutomation.tryConnectingCities(unit, citiesToConnect)) return if (roadBetweenCitiesAutomation.tryConnectingCities(unit, citiesToConnect)) return
@ -131,6 +110,36 @@ class WorkerAutomation(
wander(unit, stayInTerritory = true, tilesToAvoid = dangerousTiles) wander(unit, stayInTerritory = true, tilesToAvoid = dangerousTiles)
} }
private fun tryHeadTowardsUndevelopedCity(
unit: MapUnit,
localUniqueCache: LocalUniqueCache,
currentTile: Tile
): Boolean {
val citiesToNumberOfUnimprovedTiles = HashMap<String, Int>()
for (city in unit.civ.cities) {
citiesToNumberOfUnimprovedTiles[city.id] = city.getTiles()
.count { tile ->
tile.isLand
&& tile.getUnits().none { unit -> unit.cache.hasUniqueToBuildImprovements }
&& (tile.isPillaged() || tileHasWorkToDo(tile, unit, localUniqueCache))
}
}
val closestUndevelopedCity = unit.civ.cities.asSequence()
.filter { citiesToNumberOfUnimprovedTiles[it.id]!! > 0 }
.sortedByDescending { it.getCenterTile().aerialDistanceTo(currentTile) }
.firstOrNull { unit.movement.canReach(it.getCenterTile()) } //goto most undeveloped city
if (closestUndevelopedCity != null && closestUndevelopedCity != currentTile.owningCity) {
debug("WorkerAutomation: %s -> head towards undeveloped city %s", unit, closestUndevelopedCity.name)
val reachedTile = unit.movement.headTowards(closestUndevelopedCity.getCenterTile())
if (reachedTile != currentTile) unit.doAction() // since we've moved, maybe we can do something here - automate
return true
}
return false
}
private fun workOnCurrentTile(unit: MapUnit) { private fun workOnCurrentTile(unit: MapUnit) {
val currentTile = unit.currentTile val currentTile = unit.currentTile
val tileRankings = tileRankings[currentTile]!! val tileRankings = tileRankings[currentTile]!!
@ -151,7 +160,6 @@ class WorkerAutomation(
private fun headTowardsTileToWork( private fun headTowardsTileToWork(
unit: MapUnit, unit: MapUnit,
tileToWork: Tile, tileToWork: Tile,
localUniqueCache: LocalUniqueCache
) { ) {
debug("WorkerAutomation: %s -> head towards %s", unit.toString(), tileToWork) debug("WorkerAutomation: %s -> head towards %s", unit.toString(), tileToWork)
val currentTile = unit.getTile() val currentTile = unit.getTile()
@ -183,25 +191,7 @@ class WorkerAutomation(
// If there's move still left, perform action // If there's move still left, perform action
// Unit may stop due to Enemy Unit within walking range during doAction() call // Unit may stop due to Enemy Unit within walking range during doAction() call
workOnCurrentTile(unit)
// TODO: Check diff with workOnCurrentTile - they should be merged
if (reachedTile.isPillaged()) {
debug("WorkerAutomation: $unit -> repairs $reachedTile")
UnitActionsFromUniques.getRepairAction(unit)?.action?.invoke()
return
}
if (reachedTile.improvementInProgress == null && reachedTile.isLand
&& tileHasWorkToDo(reachedTile, unit, localUniqueCache)
) {
debug("WorkerAutomation: $unit -> start improving $reachedTile")
reachedTile.startWorkingOnImprovement(
tileRankings[reachedTile]!!.bestImprovement!!,
civInfo,
unit
)
return
}
} }