AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #581 - Turns to production values are now always accurate and don't depend on bonuses to the current production

Browse Source
This commit is contained in:
Yair Morgenstern 2019-03-25 19:52:29 +02:00
parent e43c22a74b
commit 3295753d2d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,9 +111,19 @@ class CityConstructions {
fun turnsToConstruction(constructionName: String): Int {
val workLeft = getRemainingWork(constructionName)
val cityStats = cityInfo.cityStats.currentCityStats
var production = Math.round(cityStats.production)
if (constructionName == Settler) production += cityStats.food.toInt()
// The ol' Switcharoo - what would our stats be if that was our current construction?
// Since this is only ever used for UI purposes, I feel fine with having it be a bit inefficient
// and recalculating the entire city stats
val currConstruction = currentConstruction
currentConstruction = constructionName
cityInfo.cityStats.update()
val cityStatsForConstruction = cityInfo.cityStats.currentCityStats
// revert!
currentConstruction = currConstruction
cityInfo.cityStats.update()
var production = Math.round(cityStatsForConstruction.production)
if (constructionName == Settler) production += cityStatsForConstruction.food.toInt()
return Math.ceil((workLeft / production.toDouble())).toInt()
}