From 691a305e5061f0a78949a42d3a84b1c55d32bbfc Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 16 Oct 2019 23:16:27 +0800 Subject: [PATCH] Duantao/settler food info (#1198) * Better info for building settler. * Shorter message. * Fix message. --- android/assets/jsons/Translations/Other.json | 4 ++++ core/src/com/unciv/ui/cityscreen/CityScreen.kt | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 883afa30df..a31b1eb1ac 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -950,6 +950,10 @@ Japanese:"[turnsToPopulation]新しい人口に目を向けます" } + "Food converts to production":{ + + } + "[turnsToStarvation] turns to lose population":{ Italian:"Perdita di popolazione tra [turnsToStarvation] turni" Russian:"[turnsToStarvation] ходов до уменьшения населения" diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index bc2a668c4e..799d5358d2 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.utils.Align +import com.unciv.Constants import com.unciv.UnCivGame import com.unciv.logic.HexMath import com.unciv.logic.city.CityInfo @@ -132,10 +133,14 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { val turnsToPopString : String if (city.cityStats.currentCityStats.food > 0) { - var turnsToPopulation = ceil((city.population.getFoodToNextPopulation()-city.population.foodStored) - / city.cityStats.currentCityStats.food).toInt() - if (turnsToPopulation < 1) turnsToPopulation = 1 - turnsToPopString = "[$turnsToPopulation] turns to new population".tr() + if (city.cityConstructions.currentConstruction == Constants.settler) { + turnsToPopString = "Food converts to production".tr() + } else { + var turnsToPopulation = ceil((city.population.getFoodToNextPopulation()-city.population.foodStored) + / city.cityStats.currentCityStats.food).toInt() + if (turnsToPopulation < 1) turnsToPopulation = 1 + turnsToPopString = "[$turnsToPopulation] turns to new population".tr() + } } else if (city.cityStats.currentCityStats.food < 0) { val turnsToStarvation = floor(city.population.foodStored / -city.cityStats.currentCityStats.food).toInt() + 1 turnsToPopString = "[$turnsToStarvation] turns to lose population".tr()