From 6d422d6674c8fd6537f34a817f96e81bbc75a4b3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 16 Oct 2020 14:42:01 +0300 Subject: [PATCH] City connections work well when road and railroad required techs are changed (in mods) --- .../unciv/logic/civilization/CapitalConnectionsFinder.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt b/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt index 3b58b995b6..61db345640 100644 --- a/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt +++ b/core/src/com/unciv/logic/civilization/CapitalConnectionsFinder.kt @@ -14,14 +14,15 @@ class CapitalConnectionsFinder(private val civInfo: CivilizationInfo) { private val allCivCities = civInfo.gameInfo.getCities() - private val theWheelIsResearched = civInfo.tech.isResearched("The Wheel") - private val railroadIsResearched = civInfo.tech.isResearched("Railroad") - private val road = RoadStatus.Road.name private val railroad = RoadStatus.Railroad.name private val harborFromRoad = "Harbor-Road" private val harborFromRailroad = "Harbor-Railroad" + private val ruleset = civInfo.gameInfo.ruleSet + private val theWheelIsResearched = ruleset.tileImprovements.containsKey(road) && civInfo.tech.isResearched(ruleset.tileImprovements[road]!!.techRequired!!) + private val railroadIsResearched = ruleset.tileImprovements.containsKey(railroad) && civInfo.tech.isResearched(ruleset.tileImprovements[railroad]!!.techRequired!!) + init { citiesReachedToMediums[civInfo.getCapital()] = hashSetOf("Start") }