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

Better expansion and population growth turns message.

Browse Source
This commit is contained in:
Duan Tao
2019-07-17 16:51:50 +08:00
committed by Yair Morgenstern
parent 8f30db74ab
commit 75059a7859
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.TileGroupMap import com.unciv.ui.worldscreen.TileGroupMap
import java.util.* import java.util.*
import kotlin.math.ceil import kotlin.math.ceil
import kotlin.math.floor
import kotlin.math.round import kotlin.math.round
class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
@ -116,8 +117,9 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
val turnsToExpansionString : String val turnsToExpansionString : String
if (city.cityStats.currentCityStats.culture > 0) { if (city.cityStats.currentCityStats.culture > 0) {
val turnsToExpansion = ceil((city.expansion.getCultureToNextTile() - city.expansion.cultureStored) var turnsToExpansion = ceil((city.expansion.getCultureToNextTile() - city.expansion.cultureStored)
/ city.cityStats.currentCityStats.culture).toInt() / city.cityStats.currentCityStats.culture).toInt()
if (turnsToExpansion < 1) turnsToExpansion = 1
turnsToExpansionString = "[$turnsToExpansion] turns to expansion".tr() turnsToExpansionString = "[$turnsToExpansion] turns to expansion".tr()
} else { } else {
turnsToExpansionString = "Stopped expansion".tr() turnsToExpansionString = "Stopped expansion".tr()
@ -127,11 +129,12 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
val turnsToPopString : String val turnsToPopString : String
if (city.cityStats.currentCityStats.food > 0) { if (city.cityStats.currentCityStats.food > 0) {
val turnsToPopulation = ceil((city.population.getFoodToNextPopulation()-city.population.foodStored) var turnsToPopulation = ceil((city.population.getFoodToNextPopulation()-city.population.foodStored)
/ city.cityStats.currentCityStats.food).toInt() / city.cityStats.currentCityStats.food).toInt()
if (turnsToPopulation < 1) turnsToPopulation = 1
turnsToPopString = "[$turnsToPopulation] turns to new population".tr() turnsToPopString = "[$turnsToPopulation] turns to new population".tr()
} else if (city.cityStats.currentCityStats.food < 0) { } else if (city.cityStats.currentCityStats.food < 0) {
val turnsToStarvation = ceil(city.population.foodStored / -city.cityStats.currentCityStats.food).toInt() val turnsToStarvation = floor(city.population.foodStored / -city.cityStats.currentCityStats.food).toInt() + 1
turnsToPopString = "[$turnsToStarvation] turns to lose population".tr() turnsToPopString = "[$turnsToStarvation] turns to lose population".tr()
} else { } else {
turnsToPopString = "Stopped population growth".tr() turnsToPopString = "Stopped population growth".tr()