From 5c81bf25343e5f51a69bc3793f554651a560181a Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 25 Mar 2020 10:43:33 +0200
Subject: [PATCH] When moving between units to units in cities, tiles they can
 move to are now shown

---
 .../unciv/logic/civilization/CapitalConnectionsFinder.kt    | 6 ++++--
 core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt b/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt
index 5cfc35db82..7b2dfd645c 100644
--- a/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt
+++ b/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt
@@ -1,7 +1,9 @@
 package com.unciv.logic.civilization
 
+import com.unciv.Constants
 import com.unciv.logic.city.CityInfo
 import com.unciv.logic.map.BFS
+import com.unciv.logic.map.RoadStatus
 import com.unciv.logic.map.TileInfo
 import kotlin.collections.set
 
@@ -15,8 +17,8 @@ class CapitalConnectionsFinder(private val civInfo: CivilizationInfo) {
     private val theWheelIsResearched = civInfo.tech.isResearched("The Wheel")
     private val railroadIsResearched = civInfo.tech.isResearched("Railroad")
 
-    private val road = "Road"
-    private val railroad = "Railroad"
+    private val road = RoadStatus.Road.name
+    private val railroad = RoadStatus.Railroad.name
     private val harbor = "Harbor"
 
     init {
diff --git a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt b/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
index 4b32b8c4e7..bf38afa2dc 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
@@ -46,6 +46,7 @@ class IdleUnitButton (
 
             unitToSelect.due = false
             tileMapHolder.setCenterPosition(unitToSelect.currentTile.position)
+            unitTable.selectedCity = null // need to deselect city, so that units on cities show their tiles
             unitTable.selectedUnit = unitToSelect
             unitTable.worldScreen.shouldUpdate=true