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

Fixed bug where if 2 tiles were of same "ranking", the worker would try and switch back and forth between them.

Browse Source
This commit is contained in:
Yair Morgenstern
2018-04-25 22:19:35 +03:00
parent 9816cd57da
commit 6fcf9ec93e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/WorkerAutomation.kt
View File

@ -36,7 +36,7 @@ public class WorkerAutomation(){
.getShortestPath(currentTile.position, it.position, 2f, 2, civInfo).isNotEmpty() .getShortestPath(currentTile.position, it.position, 2f, 2, civInfo).isNotEmpty()
} }
.maxBy { getPriority(it, civInfo) } .maxBy { getPriority(it, civInfo) }
if (selectedTile != null && getPriority(selectedTile, civInfo) > 1) return selectedTile if (selectedTile != null && getPriority(selectedTile, civInfo) > getPriority(currentTile,civInfo)) return selectedTile
else return currentTile else return currentTile
} }

4
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -2,7 +2,7 @@ package com.unciv.ui.worldscreen.unit
import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.UnCivGame import com.unciv.UnCivGame
import com.unciv.logic.Automation import com.unciv.logic.WorkerAutomation
import com.unciv.logic.map.MapUnit import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.gamebasics.Building import com.unciv.models.gamebasics.Building
@ -86,7 +86,7 @@ class UnitActions {
actionList += UnitAction("Automate", actionList += UnitAction("Automate",
{ {
tile.unit!!.action = "automation" tile.unit!!.action = "automation"
Automation().automateWorkerAction(tile.unit!!) WorkerAutomation().automateWorkerAction(tile.unit!!)
},unit.currentMovement != 0f },unit.currentMovement != 0f
) )
} }