mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 00:08:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #427 from ninjatao/fix_cityscreen

Browse Source 
Fix city screen info windows.
This commit is contained in:
Yair Morgenstern
2019-01-22 13:19:52 +02:00
committed by GitHub
parent 9ba73c4a6f 2d69fa9804
commit 2267d2945d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -98,11 +98,16 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
+city.population.getFreePopulation().toString() + "/" + city.population.population,skin)) +city.population.getFreePopulation().toString() + "/" + city.population.population,skin))
.colspan(columns).row() .colspan(columns).row()
val turnsToExpansion = ceil((city.expansion.getCultureToNextTile() - city.expansion.cultureStored) val turnsToExpansionString : String
/ city.cityStats.currentCityStats.culture).toInt() if (city.cityStats.currentCityStats.culture > 0) {
val turnsToExpansionString = turnsToExpansion.toString() + " turns to expansion"+ val turnsToExpansion = ceil((city.expansion.getCultureToNextTile() - city.expansion.cultureStored)
" (" + city.expansion.cultureStored + "/" + city.expansion.getCultureToNextTile() + ")" / city.cityStats.currentCityStats.culture).toInt()
table.add(Label(turnsToExpansionString,skin)).colspan(columns).row() 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 val turnsToPopString : String
if (city.cityStats.currentCityStats.food > 0) { if (city.cityStats.currentCityStats.food > 0) {
@ -119,7 +124,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
,skin)).colspan(columns).row() ,skin)).colspan(columns).row()
if (city.resistanceCounter > 0) { 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() table.addSeparator()