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

tileCanBeImproved was never actually called without a unit.

Browse Source
This commit is contained in:
Yair Morgenstern
2022-02-06 19:40:22 +02:00
parent b0b16787e4
commit 9726b90b22
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,29 +282,25 @@ class WorkerAutomation(
* Tests if tile can be improved by a specific unit, or if no unit is passed, any unit at all
* (but does not check whether the ruleset contains any unit capable of it)
*/
private fun tileCanBeImproved(unit: MapUnit?, tile: TileInfo): Boolean {
private fun tileCanBeImproved(unit: MapUnit, tile: TileInfo): Boolean {
if (!tile.isLand || tile.isImpassible() || tile.isCityCenter())
return false
val city = tile.getCity()
if (city == null || city.civInfo != civInfo)
return false
if (tile.improvement != null && !UncivGame.Current.settings.automatedWorkersReplaceImprovements) {
if (unit != null) {
if (unit.civInfo.isPlayerCivilization())
return false
} else if (UncivGame.Current.gameInfo.currentPlayerCiv.isPlayerCivilization())
if (unit.civInfo.isPlayerCivilization())
return false
}
if (tile.improvement == null) {
if (unit == null) return true
if (tile.improvementInProgress != null && unit.canBuildImprovement(tile.getTileImprovementInProgress()!!, tile)) return true
val chosenImprovement = chooseImprovement(unit, tile)
if (chosenImprovement != null && tile.canBuildImprovement(chosenImprovement, civInfo) && unit.canBuildImprovement(chosenImprovement, tile)) return true
} else if (!tile.containsGreatImprovement() && tile.hasViewableResource(civInfo)
&& tile.tileResource.improvement != tile.improvement
&& (unit == null || chooseImprovement(unit, tile) // if the chosen improvement is not null and buildable
&& (chooseImprovement(unit, tile) // if the chosen improvement is not null and buildable
.let { it != null && tile.canBuildImprovement(it, civInfo) && unit.canBuildImprovement(it, tile)}))
return true
return false // couldn't find anything to construct here