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

Worker AI short distance priority fix (#10835)

Browse Source 
* Removed extra tilesToAvoid check

* Fixed getBasePriority being negative
This commit is contained in:
Oskar Niesen 2023-12-30 13:01:29 -06:00 committed by GitHub
parent 5898f91bb8
commit 16fce2bb1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,7 +468,6 @@ class WorkerAutomation(
&& (it.civilianUnit == null || it == currentTile) && (it.civilianUnit == null || it == currentTile)
&& (it.owningCity == null || it.getOwner() == civInfo) && (it.owningCity == null || it.getOwner() == civInfo)
&& !it.isCityCenter() && !it.isCityCenter()
&& !tilesToAvoid.contains(currentTile)
&& getBasePriority(it, unit) > 1 && getBasePriority(it, unit) > 1
} }
@ -501,7 +500,7 @@ class WorkerAutomation(
* This is a cheap guess on how helpful it might be to do work on this tile * This is a cheap guess on how helpful it might be to do work on this tile
*/ */
fun getBasePriority(tile: Tile, unit: MapUnit): Float { fun getBasePriority(tile: Tile, unit: MapUnit): Float {
val unitSpecificPriority = 2 - tile.aerialDistanceTo(unit.getTile()).coerceAtMost(4) val unitSpecificPriority = 2 - (tile.aerialDistanceTo(unit.getTile()) / 2.0f).coerceIn(0f, 2f)
if (tileRankings.containsKey(tile)) if (tileRankings.containsKey(tile))
return tileRankings[tile]!!.tilePriority + unitSpecificPriority return tileRankings[tile]!!.tilePriority + unitSpecificPriority