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

All cityinfo functions now work with same definition of 'food we'll get next turn', to avoid silly arithmetic errors

Browse Source
This commit is contained in:
Yair Morgenstern 2020-03-28 21:51:09 +03:00
parent 9f0ee0d578
commit 55ffd94af5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -202,17 +202,17 @@ class CityInfo {
}
fun isGrowing(): Boolean {
return cityStats.currentCityStats.food > 0 && cityConstructions.currentConstruction != Constants.settler
return foodForNextTurn() > 0 && cityConstructions.currentConstruction != Constants.settler
}
fun isStarving(): Boolean {
return cityStats.currentCityStats.food < 0
}
fun isStarving(): Boolean = foodForNextTurn() < 0
private fun foodForNextTurn() = cityStats.currentCityStats.food.roundToInt()
/** Take null to mean infinity. */
fun getNumTurnsToNewPopulation(): Int? {
if (isGrowing()) {
val roundedFoodPerTurn = cityStats.currentCityStats.food.roundToInt().toFloat()
val roundedFoodPerTurn = foodForNextTurn().toFloat()
val remainingFood = population.getFoodToNextPopulation() - population.foodStored
var turnsToGrowth = ceil( remainingFood / roundedFoodPerTurn).toInt()
if (turnsToGrowth < 1) turnsToGrowth = 1
@ -225,7 +225,7 @@ class CityInfo {
/** Take null to mean infinity. */
fun getNumTurnsToStarvation(): Int? {
if (isStarving()) {
return population.foodStored / -cityStats.currentCityStats.food.roundToInt() + 1
return population.foodStored / -foodForNextTurn() + 1
}
return null
@ -310,7 +310,7 @@ class CityInfo {
population.autoAssignPopulation(foodWeight)
cityStats.update()
foodPerTurn = cityStats.currentCityStats.food
foodPerTurn = foodForNextTurn().toFloat()
foodWeight += 0.5f
}
}
@ -330,7 +330,7 @@ class CityInfo {
population.foodStored = population.getFoodToNextPopulation() - 1//...reduce below the new growth treshold
}
}
} else population.nextTurn(stats.food)
} else population.nextTurn(foodForNextTurn())
if (this in civInfo.cities) { // city was not destroyed
health = min(health + 20, getMaxHealth())

6
core/src/com/unciv/logic/city/PopulationManager.kt
View File

@ -46,9 +46,9 @@ class PopulationManager {
//endregion
fun nextTurn(food: Float) {
foodStored += food.roundToInt()
if(food.roundToInt() < 0)
fun nextTurn(food: Int) {
foodStored += food
if(food < 0)
cityInfo.civInfo.addNotification("["+cityInfo.name + "] is starving!", cityInfo.location, Color.RED)
if (foodStored < 0)
// starvation!