mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-11 00:08:58 +07:00
Merge pull request #427 from ninjatao/fix_cityscreen
Fix city screen info windows.
This commit is contained in:
@ -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()
|
||||||
|
Reference in New Issue
Block a user