Railroad now looks like a railroad and visible on tundra

android/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 104
+        versionCode 105
-        versionName "2.6.6"
+        versionName "2.6.7"
     }
     buildTypes {
         release {

core/src/com/unciv/logic/map/TileMap.kt

@@ -54,7 +54,6 @@ class TileMap {
     }
 
     fun getViewableTiles(position: Vector2, sightDistance: Int): MutableList<TileInfo> {
-        var sightDistance = sightDistance
         val viewableTiles = getTilesInDistance(position, 1).toMutableList()
         for (i in 1..sightDistance) { // in each layer,
             getTilesAtDistance(position, i).filterTo(viewableTiles) // take only tiles which have a visible neighbor, which is lower than the tile

core/src/com/unciv/ui/tilegroups/TileGroup.kt

@@ -22,7 +22,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     protected var resourceImage: Image? = null
     protected var improvementImage: Image? =null
     var populationImage: Image? = null
-    private val roadImages = HashMap<TileInfo, Image>()
+    private val roadImages = HashMap<TileInfo, RoadImage>()
     private val borderImages = HashMap<TileInfo, List<Image>>() // map of neiboring tile to border images
     protected var civilianUnitImage: Group? = null
     protected var militaryUnitImage: Group? = null
@@ -30,6 +30,11 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     private val fogImage = ImageGetter.getImage("TerrainIcons/Fog.png")
     var yieldGroup = YieldGroup()
 
+    class RoadImage{
+        var roadStatus:RoadStatus = RoadStatus.None
+        var image:Image? = null
+    }
+
     init {
         val groupSize = 54f
         this.setSize(groupSize,groupSize)
@@ -164,34 +169,45 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     }
 
     private fun updateRoadImages() {
-        if (tileInfo.roadStatus !== RoadStatus.None) {
+        for (neighbor in tileInfo.neighbors) {
-            for (neighbor in tileInfo.neighbors) {
+            if (!roadImages.containsKey(neighbor)) roadImages[neighbor] = RoadImage()
-                if (neighbor.roadStatus === RoadStatus.None) continue
+            val roadImage = roadImages[neighbor]!!
-                if (!roadImages.containsKey(neighbor)) {
-                    val image = ImageGetter.getImage(ImageGetter.WhiteDot)
-                    roadImages[neighbor] = image
 
-                    val relativeHexPosition = tileInfo.position.cpy().sub(neighbor.position)
+            val roadStatus = when{
-                    val relativeWorldPosition = HexMath().Hex2WorldCoords(relativeHexPosition)
+                tileInfo.roadStatus==RoadStatus.None || neighbor.roadStatus === RoadStatus.None -> RoadStatus.None
-
+                tileInfo.roadStatus==RoadStatus.Road || neighbor.roadStatus === RoadStatus.Road -> RoadStatus.Road
-                    // This is some crazy voodoo magic so I'll explain.
+                else -> RoadStatus.Railroad
-                    image.moveBy(25f, 25f) // Move road to center of tile
-                    // in addTiles, we set   the position of groups by relative world position *0.8*groupSize, filter groupSize = 50
-                    // Here, we want to have the roads start HALFWAY THERE and extend towards the tiles, so we give them a position of 0.8*25.
-                    image.moveBy(-relativeWorldPosition.x * 0.8f * 25f, -relativeWorldPosition.y * 0.8f * 25f)
-                    image.setSize(10f, 2f)
-
-                    image.setOrigin(0f, 1f) // This is so that the rotation is calculated from the middle of the road and not the edge
-                    image.rotation = (180 / Math.PI * Math.atan2(relativeWorldPosition.y.toDouble(), relativeWorldPosition.x.toDouble())).toFloat()
-                    addActor(image)
-                }
-
-                if (tileInfo.roadStatus === RoadStatus.Railroad && neighbor.roadStatus === RoadStatus.Railroad)
-                    roadImages[neighbor]!!.color = Color.GRAY // railroad
-                else
-                    roadImages[neighbor]!!.color = Color.BROWN // road
             }
+            if (roadImage.roadStatus == roadStatus ) continue // the image is correct
+
+            roadImage.roadStatus = roadStatus
+
+            if(roadImage.image!=null) {
+                roadImage.image!!.remove()
+                roadImage.image = null
+            }
+            if(roadStatus==RoadStatus.None) continue // no road image
+
+            val image = if(roadStatus==RoadStatus.Road) ImageGetter.getImage(ImageGetter.WhiteDot).apply { color= Color.BROWN }
+            else ImageGetter.getImage("OtherIcons/Railroad.png")
+            roadImage.image=image
+
+            val relativeHexPosition = tileInfo.position.cpy().sub(neighbor.position)
+            val relativeWorldPosition = HexMath().Hex2WorldCoords(relativeHexPosition)
+
+            // This is some crazy voodoo magic so I'll explain.
+            image.moveBy(25f, 25f) // Move road to center of tile
+            // in addTiles, we set   the position of groups by relative world position *0.8*groupSize, filter groupSize = 50
+            // Here, we want to have the roads start HALFWAY THERE and extend towards the tiles, so we give them a position of 0.8*25.
+            image.moveBy(-relativeWorldPosition.x * 0.8f * 25f, -relativeWorldPosition.y * 0.8f * 25f)
+
+            image.setSize(10f, 2f)
+            image.setOrigin(0f, 1f) // This is so that the rotation is calculated from the middle of the road and not the edge
+
+            image.rotation = (180 / Math.PI * Math.atan2(relativeWorldPosition.y.toDouble(), relativeWorldPosition.x.toDouble())).toFloat()
+            addActor(image)
         }
+
     }
 
     private fun updateTileColor(isViewable: Boolean) {