AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing workers dying in mountains bug for Carthage (#9665)

Browse Source 
* Fixed workers dying in mountain tiles issue for Carthage

* Accounts for all damage dealing tiles

* Update WorkerAutomation.kt

* Update Tile.kt

* Update WorkerAutomation.kt

* Update WorkerAutomation.kt
This commit is contained in:
random271 2023-06-28 09:48:44 +02:00 committed by GitHub
parent 73fa87e6b4
commit d298f85099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,7 @@ class WorkerAutomation(
.filter { .filter {
it !in tilesToAvoid it !in tilesToAvoid
&& (it.civilianUnit == null || it == currentTile) && (it.civilianUnit == null || it == currentTile)
&& (it.owningCity == null || it.getOwner()==civInfo) && (it.owningCity == null || it.getOwner() == civInfo)
&& getPriority(it) > 1 && getPriority(it) > 1
&& it.getTilesInDistance(2) // don't work in range of enemy cities && it.getTilesInDistance(2) // don't work in range of enemy cities
.none { tile -> tile.isCityCenter() && tile.getCity()!!.civ.isAtWarWith(civInfo) } .none { tile -> tile.isCityCenter() && tile.getCity()!!.civ.isAtWarWith(civInfo) }
@ -279,9 +279,11 @@ class WorkerAutomation(
} }
.sortedByDescending { getPriority(it) } .sortedByDescending { getPriority(it) }
// Carthage can move through mountains, special case
// If there is a non-damage dealing tile available, move to that tile, otherwise move to the damage dealing tile
// These are the expensive calculations (tileCanBeImproved, canReach), so we only apply these filters after everything else it done. // These are the expensive calculations (tileCanBeImproved, canReach), so we only apply these filters after everything else it done.
val selectedTile = val selectedTile =
workableTiles.firstOrNull { unit.movement.canReach(it) && (tileCanBeImproved(unit, it) || it.isPillaged()) } workableTiles.sortedByDescending { tile -> unit.getDamageFromTerrain(tile) <= 0 }.firstOrNull { unit.movement.canReach(it) && (tileCanBeImproved(unit, it) || it.isPillaged()) }
?: return currentTile ?: return currentTile
return if ((!tileCanBeImproved(unit, currentTile) && !currentTile.isPillaged()) // current tile is unimprovable return if ((!tileCanBeImproved(unit, currentTile) && !currentTile.isPillaged()) // current tile is unimprovable