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

Mitigate #10613 - remove a !! by splitting 'getImprovementToImprove' and using it as source of truth for the improvement to start working on, INSTEAD of counting on the fact that chooseImprovement returns that improvement.

Browse Source 
Which it looks like it won't, if somehow the improvementInProgress is NOT in the list of potentialTileImprovements.

Only case I can think of is: You captured an enemy city with a civ--unique improvement in the middle of construction. So fixed that as well.
This commit is contained in:
Yair Morgenstern 2023-11-28 23:55:03 +02:00
parent 09dd8c61aa
commit d2148d4ea5
1 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ class WorkerAutomation(
private val bestRoadAvailable: RoadStatus =
cloningSource?.bestRoadAvailable ?:
//Player can choose not to auto-build roads & railroads.
if (civInfo.isHuman() && (!UncivGame.Current.settings.autoBuildingRoads
if (civInfo.isHuman() && (!UncivGame.Current.settings.autoBuildingRoads
|| UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()))
RoadStatus.None
else civInfo.tech.getBestRoadAvailable()
@ -163,9 +163,12 @@ class WorkerAutomation(
return
}
if (currentTile.improvementInProgress == null && tileCanBeImproved(unit, currentTile)) {
debug("WorkerAutomation: ${unit.label()} -> start improving $currentTile")
return currentTile.startWorkingOnImprovement(chooseImprovement(unit, currentTile)!!, civInfo, unit)
if (currentTile.improvementInProgress == null) {
val newImprovement = getImprovementToImprove(unit, currentTile)
if (newImprovement != null) {
debug("WorkerAutomation: ${unit.label()} -> start improving $currentTile")
return currentTile.startWorkingOnImprovement(newImprovement, civInfo, unit)
}
}
if (currentTile.improvementInProgress != null) return // we're working!
@ -180,7 +183,7 @@ class WorkerAutomation(
val citiesToNumberOfUnimprovedTiles = HashMap<String, Int>()
for (city in unit.civ.cities) {
citiesToNumberOfUnimprovedTiles[city.id] = city.getTiles()
.count { it.isLand && it.civilianUnit == null && (tileCanBeImproved(unit, it) || it.isPillaged()) }
.count { it.isLand && it.civilianUnit == null && (it.isPillaged() || tileCanBeImproved(unit, it)) }
}
val mostUndevelopedCity = unit.civ.cities.asSequence()
@ -302,7 +305,7 @@ class WorkerAutomation(
// These are the expensive calculations (tileCanBeImproved, canReach), so we only apply these filters after everything else it done.
val selectedTile = workableTilesPrioritized
.firstOrNull { unit.movement.canReach(it) && (tileCanBeImproved(unit, it) || it.isPillaged()) }
.firstOrNull { unit.movement.canReach(it) && (it.isPillaged() || tileCanBeImproved(unit, it)) }
?: return currentTile
// Note: workableTiles is a Sequence, and we oiginally used workableTiles.contains for the second
@ -311,7 +314,7 @@ class WorkerAutomation(
// currentTile is always the very first entry of the _unsorted_ Sequence - if it is still
// contained at all and not dropped by the filters - which is the point here.
return if ( currentTile == selectedTile // No choice
|| (!tileCanBeImproved(unit, currentTile) && !currentTile.isPillaged()) // current tile is unimprovable
|| (!currentTile.isPillaged() && !tileCanBeImproved(unit, currentTile)) // current tile is unimprovable
|| workableTilesCenterFirst.firstOrNull() != currentTile // current tile is unworkable by city
|| getPriority(selectedTile) > getPriority(currentTile)) // current tile is less important
selectedTile
@ -323,45 +326,62 @@ class WorkerAutomation(
* (but does not check whether the ruleset contains any unit capable of it)
*/
private fun tileCanBeImproved(unit: MapUnit, tile: Tile): Boolean {
return getImprovementToImprove(unit, tile) != null
}
private fun getImprovementToImprove(unit: MapUnit, tile: Tile): TileImprovement? {
//todo This is wrong but works for Alpha Frontier, because the unit has both:
// It should test for the build over time ability, but this tests the create and die ability
if (!tile.isLand && !unit.cache.hasUniqueToCreateWaterImprovements) return false
if (!tile.isLand && !unit.cache.hasUniqueToCreateWaterImprovements) return null
// Allow outlandish mods having non-road improvements on Mountains
if (tile.isImpassible() && !unit.cache.canPassThroughImpassableTiles) return false
if (tile.isCityCenter()) return false
if (tile.isImpassible() && !unit.cache.canPassThroughImpassableTiles) return null
if (tile.isCityCenter()) return null
val city = tile.getCity()
if (city == null || city.civ != civInfo)
return false
return null
if (!city.tilesInRange.contains(tile)
&& !tile.hasViewableResource(civInfo)
&& civInfo.cities.none { it.getCenterTile().aerialDistanceTo(tile) <= 3 })
return false // unworkable tile
&& !tile.hasViewableResource(civInfo)
&& civInfo.cities.none { it.getCenterTile().aerialDistanceTo(tile) <= 3 }
)
return null // unworkable tile
//If the tile is a junk improvement or a fort placed in a bad location.
val junkImprovement = tile.getTileImprovement()?.hasUnique(UniqueType.AutomatedWorkersWillReplace) == true
|| (tile.improvement == Constants.fort && !evaluateFortSuroundings(tile, false)
&& (!civInfo.isHuman() || UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()))
|| (tile.improvement == Constants.fort && !evaluateFortSuroundings(tile, false)
&& (!civInfo.isHuman() || UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()))
if (tile.improvement != null && !junkImprovement
&& !UncivGame.Current.settings.automatedWorkersReplaceImprovements
&& unit.civ.isHuman() && !UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI())
return false
&& !UncivGame.Current.settings.automatedWorkersReplaceImprovements
&& unit.civ.isHuman() && !UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()
)
return null
if (tile.improvement == null || junkImprovement) {
if (tile.improvementInProgress != null && unit.canBuildImprovement(tile.getTileImprovementInProgress()!!, tile)) return true
val chosenImprovement = chooseImprovement(unit, tile)
if (chosenImprovement != null && tile.improvementFunctions.canBuildImprovement(chosenImprovement, civInfo) && unit.canBuildImprovement(chosenImprovement, tile)) return true
} else if (!tile.containsGreatImprovement() && tile.hasViewableResource(civInfo)
val anyImprovementIsOk = tile.improvement == null || junkImprovement
if (anyImprovementIsOk
&& tile.improvementInProgress != null
&& unit.canBuildImprovement(tile.getTileImprovementInProgress()!!, tile))
return tile.getTileImprovementInProgress()!!
val isResourceTileWithoutResourceProvider = !tile.containsGreatImprovement()
&& tile.hasViewableResource(civInfo)
&& !tile.tileResource.isImprovedBy(tile.improvement!!)
&& (chooseImprovement(unit, tile) // if the chosen improvement is not null and buildable
.let { it != null && tile.improvementFunctions.canBuildImprovement(it, civInfo) && unit.canBuildImprovement(it, tile)}))
return true
return false // couldn't find anything to construct here
if (anyImprovementIsOk || isResourceTileWithoutResourceProvider) {
val chosenImprovement = chooseImprovement(unit, tile)
if (chosenImprovement != null
&& tile.improvementFunctions.canBuildImprovement(chosenImprovement, civInfo)
&& unit.canBuildImprovement(chosenImprovement, tile)
)
return chosenImprovement
}
return null // couldn't find anything to construct here
}
/**
* Calculate a priority for improving a tile
*/
@ -384,6 +404,8 @@ class WorkerAutomation(
* Determine the improvement appropriate to a given tile and worker
*/
private fun chooseImprovement(unit: MapUnit, tile: Tile): TileImprovement? {
// You can keep working on half-built improvements, even if they're unique to another civ
if (tile.improvementInProgress != null) return ruleSet.tileImprovements[tile.improvementInProgress!!]
val potentialTileImprovements = ruleSet.tileImprovements.filter {
unit.canBuildImprovement(it.value, tile)
@ -421,7 +443,6 @@ class WorkerAutomation(
// After gathering all the data, we conduct the hierarchy in one place
val improvementString = when {
tile.improvementInProgress != null -> tile.improvementInProgress!!
improvementStringForResource != null -> if (improvementStringForResource==tile.improvement) null else improvementStringForResource
// if this is a resource that HAS an improvement, but this unit can't build it, don't waste your time
tile.resource != null && tile.tileResource.getImprovements().any() -> return null