wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When moving between units to units in cities, tiles they can move to are now shown

Browse source
This commit is contained in:
Yair Morgenstern 2020-03-25 10:43:33 +02:00
parent ea3f7f9dc0
commit 5c81bf2534
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt
View file

@ -1,7 +1,9 @@
package com.unciv.logic.civilization package com.unciv.logic.civilization
import com.unciv.Constants
import com.unciv.logic.city.CityInfo import com.unciv.logic.city.CityInfo
import com.unciv.logic.map.BFS import com.unciv.logic.map.BFS
import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import kotlin.collections.set import kotlin.collections.set
@ -15,8 +17,8 @@ class CapitalConnectionsFinder(private val civInfo: CivilizationInfo) {
private val theWheelIsResearched = civInfo.tech.isResearched("The Wheel") private val theWheelIsResearched = civInfo.tech.isResearched("The Wheel")
private val railroadIsResearched = civInfo.tech.isResearched("Railroad") private val railroadIsResearched = civInfo.tech.isResearched("Railroad")
private val road = "Road" private val road = RoadStatus.Road.name
private val railroad = "Railroad" private val railroad = RoadStatus.Railroad.name
private val harbor = "Harbor" private val harbor = "Harbor"
init { init {

1
core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
View file

@ -46,6 +46,7 @@ class IdleUnitButton (
unitToSelect.due = false unitToSelect.due = false
tileMapHolder.setCenterPosition(unitToSelect.currentTile.position) tileMapHolder.setCenterPosition(unitToSelect.currentTile.position)
unitTable.selectedCity = null // need to deselect city, so that units on cities show their tiles
unitTable.selectedUnit = unitToSelect unitTable.selectedUnit = unitToSelect
unitTable.worldScreen.shouldUpdate=true unitTable.worldScreen.shouldUpdate=true