chore: Remove unused city distance

core/src/com/unciv/logic/GameInfo.kt

@@ -28,7 +28,6 @@ import com.unciv.logic.civilization.managers.TechManager
 import com.unciv.logic.civilization.managers.TurnManager
 import com.unciv.logic.civilization.managers.VictoryManager
 import com.unciv.logic.github.Github.repoNameToFolderName
-import com.unciv.logic.map.CityDistanceData
 import com.unciv.logic.map.MapShape
 import com.unciv.logic.map.TileMap
 import com.unciv.logic.map.tile.Tile
@@ -178,9 +177,6 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
     @Transient
     var spaceResources = HashSet<String>()
 
-    @Transient
-    var cityDistances: CityDistanceData = CityDistanceData()
-
     //endregion
     //region Pure functions
 
@@ -699,8 +695,6 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
 
         barbarians.setTransients(this)
 
-        cityDistances.game = this
-
         guaranteeUnitPromotions()
         migrateToTileHistory()
         migrateGreatGeneralPools()

core/src/com/unciv/logic/city/City.kt

@@ -413,8 +413,6 @@ class City : IsPartOfGameInfoSerialization, INamed {
             civ.updateProximity(otherCiv,
                 otherCiv.updateProximity(civ))
         }
-
-        civ.gameInfo.cityDistances.setDirty()
     }
 
     fun annexCity() = CityConquestFunctions(this).annexCity()

core/src/com/unciv/logic/city/managers/CityFounder.kt

@@ -82,7 +82,6 @@ class CityFounder {
         }
 
         triggerCitiesSettledNearOtherCiv(city)
-        civInfo.gameInfo.cityDistances.setDirty()
 
         addStartingBuildings(city, civInfo, startingEra)
 

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

@@ -1,125 +0,0 @@
-package com.unciv.logic.map
-
-import com.badlogic.gdx.math.Vector2
-import com.unciv.logic.GameInfo
-import com.unciv.logic.city.City
-import com.unciv.logic.civilization.Civilization
-import com.unciv.logic.map.tile.Tile
-
-class CityDistance(
-    val city: City,
-    val distance: Int) {
-
-    companion object {
-        fun compare(a: CityDistance?, b: CityDistance?) : CityDistance? {
-
-            if (a == null && b != null)
-                return b
-            else if (a != null && b == null)
-                return a
-            else if (a == null && b == null)
-                return null
-
-            if (a!!.distance < b!!.distance)
-                return a
-            else if (a.distance > b.distance)
-                return b
-
-            if (a.city.civ.isMajorCiv() && b.city.civ.isMinorCiv())
-                return a
-            else if (b.city.civ.isMajorCiv() && a.city.civ.isMinorCiv())
-                return b
-
-            return a
-        }
-    }
-}
-
-/** This class holds information about distance from every tile to the nearest city */
-class CityDistanceData {
-
-    @Transient
-    lateinit var game: GameInfo
-
-    companion object {
-        const val IDENTIFIER_ALL_CIVS = "ALL_CIVS"
-        const val IDENTIFIER_MAJOR_CIVS = "MAJOR_CIVS"
-    }
-
-    private var shouldUpdate: Boolean = true
-
-    /** Identifier -> Map (Tile position -> Distance)
-     *  Identifier is either: Civ name, ALL_CIVS or MAJOR_CIVS */
-    private var data: HashMap<String, HashMap<Vector2, CityDistance?>> = HashMap()
-
-    private fun reset() {
-        data = HashMap()
-        data[IDENTIFIER_ALL_CIVS]= HashMap()
-        data[IDENTIFIER_MAJOR_CIVS] = HashMap()
-    }
-
-    private fun resetPlayer(identifier: String) {
-        data[identifier] = HashMap()
-    }
-
-    private fun updateDistanceIfLower(identifier: String, position: Vector2, city: City, distance: Int) {
-        val currentDistance = data[identifier]!![position]
-        val newDistance = CityDistance(city, distance)
-        data[identifier]!![position] = CityDistance.compare(currentDistance, newDistance)
-    }
-
-    private fun updateDistances(thisTile: Tile, city: City, owner: Civilization, isMajor: Boolean) {
-
-        val cityTile = city.getCenterTile()
-        val distance = thisTile.aerialDistanceTo(cityTile)
-
-        updateDistanceIfLower(IDENTIFIER_ALL_CIVS, thisTile.position, city, distance)
-        if (isMajor) {
-            updateDistanceIfLower(IDENTIFIER_MAJOR_CIVS, thisTile.position, city, distance)
-            updateDistanceIfLower(owner.civName, thisTile.position, city, distance)
-        }
-    }
-
-    private fun update() {
-
-        // Clear previous info
-        reset()
-
-        for (player in game.civilizations) {
-
-            // Not interested in defeated players
-            if (player.isDefeated())
-                continue
-
-            val isMajor = player.isMajorCiv()
-            if (isMajor)
-                resetPlayer(player.civName)
-
-            // Update distances for each tile inside radius 4 around each city
-            for (city in player.cities.asSequence())
-                for (otherTile in city.getCenterTile().getTilesInDistance(4))
-                    updateDistances(otherTile, city, player, isMajor)
-        }
-
-        shouldUpdate = false
-
-    }
-
-    fun getClosestCityDistance(tile: Tile, player: Civilization? = null, majorsOnly: Boolean = false) : CityDistance? {
-
-        if (shouldUpdate)
-            update()
-
-        val identifier = when {
-            player != null && player.isMajorCiv() -> player.civName
-            majorsOnly -> IDENTIFIER_MAJOR_CIVS
-            else -> IDENTIFIER_ALL_CIVS
-        }
-        return data[identifier]!![tile.position]
-    }
-
-    fun setDirty() {
-        shouldUpdate = true
-    }
-
-}