From 2d69fa98046e612f5caaff355f3b339d430327b7 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Tue, 22 Jan 2019 19:06:02 +0800 Subject: [PATCH] Fix city screen info windows. --- core/src/com/unciv/ui/cityscreen/CityScreen.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 913d139497..bf019d4efe 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -98,11 +98,16 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { +city.population.getFreePopulation().toString() + "/" + city.population.population,skin)) .colspan(columns).row() - val turnsToExpansion = ceil((city.expansion.getCultureToNextTile() - city.expansion.cultureStored) - / city.cityStats.currentCityStats.culture).toInt() - val turnsToExpansionString = turnsToExpansion.toString() + " turns to expansion"+ - " (" + city.expansion.cultureStored + "/" + city.expansion.getCultureToNextTile() + ")" - table.add(Label(turnsToExpansionString,skin)).colspan(columns).row() + val turnsToExpansionString : String + if (city.cityStats.currentCityStats.culture > 0) { + val turnsToExpansion = ceil((city.expansion.getCultureToNextTile() - city.expansion.cultureStored) + / city.cityStats.currentCityStats.culture).toInt() + turnsToExpansionString = turnsToExpansion.toString() + " turns to expansion" + } else { + turnsToExpansionString = "Stopped expansion" + } + table.add(Label(turnsToExpansionString + " (" + city.expansion.cultureStored + "/" + city.expansion.getCultureToNextTile() + ")", + skin)).colspan(columns).row() val turnsToPopString : String if (city.cityStats.currentCityStats.food > 0) { @@ -119,7 +124,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { ,skin)).colspan(columns).row() if (city.resistanceCounter > 0) { - table.add(Label("In resistance for another ${city.resistanceCounter} turns",skin)).row() + table.add(Label("In resistance for another ${city.resistanceCounter} turns",skin)).colspan(columns).row() } table.addSeparator()