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

Select next idle is no longer enables if an ENEMY unit is idle

Browse Source
This commit is contained in:
Yair Morgenstern
2018-04-09 12:54:33 +03:00
parent 90baebc63d
commit 8798f02217
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
View File

@ -9,9 +9,11 @@ import com.unciv.ui.utils.enable
import com.unciv.ui.worldscreen.WorldScreen import com.unciv.ui.worldscreen.WorldScreen
class IdleUnitButton internal constructor(internal val worldScreen: WorldScreen) : TextButton("Select next idle unit", CameraStageBaseScreen.skin) { class IdleUnitButton internal constructor(internal val worldScreen: WorldScreen) : TextButton("Select next idle unit", CameraStageBaseScreen.skin) {
fun getTilesWithIdleUnits() = worldScreen.civInfo.gameInfo.tileMap.values.filter { it.hasIdleUnit() && it.unit!!.owner == worldScreen.civInfo.civName }
init { init {
addClickListener { addClickListener {
val tilesWithIdleUnits = worldScreen.civInfo.gameInfo.tileMap.values.filter { it.hasIdleUnit() && it.unit!!.owner == worldScreen.civInfo.civName } val tilesWithIdleUnits = getTilesWithIdleUnits()
val tileToSelect: TileInfo val tileToSelect: TileInfo
if (!tilesWithIdleUnits.contains(worldScreen.tileMapHolder.selectedTile)) if (!tilesWithIdleUnits.contains(worldScreen.tileMapHolder.selectedTile))
@ -27,7 +29,7 @@ class IdleUnitButton internal constructor(internal val worldScreen: WorldScreen)
} }
internal fun update() { internal fun update() {
if (worldScreen.civInfo.gameInfo.tileMap.values.any { it.hasIdleUnit() }) enable() if (getTilesWithIdleUnits().isNotEmpty()) enable()
else disable() else disable()
} }
} }