mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-20 04:38:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

Expanded and clarified stats breakdown

Browse Source
This commit is contained in:
Yair Morgenstern
2019-10-16 10:33:24 +03:00
parent 7ca7851bec
commit e95fbc3fb9
2 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -406,7 +406,7 @@ class CityStats {
val newFinalStatList = LinkedHashMap<String, Stats>() // again, we don't edit the existing currentCityStats directly, in order to avoid concurrency exceptions val newFinalStatList = LinkedHashMap<String, Stats>() // again, we don't edit the existing currentCityStats directly, in order to avoid concurrency exceptions
for (entry in baseStatList) for (entry in baseStatList)
newFinalStatList[entry.key] = entry.value newFinalStatList[entry.key] = entry.value.clone()
val statPercentBonusesSum = Stats() val statPercentBonusesSum = Stats()
for (bonus in statPercentBonusList.values) statPercentBonusesSum.add(bonus) for (bonus in statPercentBonusList.values) statPercentBonusesSum.add(bonus)

94
core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
View File

@ -13,11 +13,9 @@ import com.unciv.logic.civilization.GreatPersonManager
import com.unciv.models.gamebasics.Building import com.unciv.models.gamebasics.Building
import com.unciv.models.gamebasics.tr import com.unciv.models.gamebasics.tr
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
import com.unciv.models.stats.Stats
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.*
class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseScreen.skin) { class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseScreen.skin) {
@ -141,55 +139,83 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS
private fun addStatInfo() { private fun addStatInfo() {
val cityStats = cityScreen.city.cityStats val cityStats = cityScreen.city.cityStats
val unifiedStatList = LinkedHashMap<String, Stats>(cityStats.baseStatList) //
// for(stats in unifiedStatList.values) stats.happiness=0f
for(stats in unifiedStatList.values) stats.happiness=0f //
// // add happiness to stat list
// add happiness to stat list // for(entry in cityStats.happinessList.filter { it.value!=0f }){
for(entry in cityStats.happinessList.filter { it.value!=0f }){ // if(!unifiedStatList.containsKey(entry.key))
if(!unifiedStatList.containsKey(entry.key)) // unifiedStatList[entry.key]= Stats()
unifiedStatList[entry.key]= Stats() // unifiedStatList[entry.key]!!.happiness=entry.value
unifiedStatList[entry.key]!!.happiness=entry.value // }
}
// Add maintenance if relevant // Add maintenance if relevant
//
val maintenance = cityStats.cityInfo.cityConstructions.getMaintenanceCosts() // val maintenance = cityStats.cityInfo.cityConstructions.getMaintenanceCosts()
if(maintenance>0) // if(maintenance>0)
unifiedStatList["Maintenance"]=Stats().add(Stat.Gold,-maintenance.toFloat()) // unifiedStatList["Maintenance"]=Stats().add(Stat.Gold,-maintenance.toFloat())
for(stat in Stat.values()){ for(stat in Stat.values().filter { it!=Stat.Happiness }){
if(unifiedStatList.all { it.value.get(stat)==0f }) continue val relevantBaseStats = cityStats.baseStatList.filter { it.value.get(stat)!=0f }
if(relevantBaseStats.isEmpty()) continue
val statValuesTable = Table().apply { defaults().pad(2f) } val statValuesTable = Table().apply { defaults().pad(2f) }
addCategory(stat.name, statValuesTable) addCategory(stat.name, statValuesTable)
for(entry in unifiedStatList) {
statValuesTable.add("Base values".toLabel().setFontSize(24)).colspan(2).row()
var sumOfAllBaseValues = 0f
for(entry in relevantBaseStats) {
val specificStatValue = entry.value.get(stat) val specificStatValue = entry.value.get(stat)
if(specificStatValue==0f) continue sumOfAllBaseValues += specificStatValue
statValuesTable.add(entry.key.toLabel()) statValuesTable.add(entry.key.toLabel())
statValuesTable.add(DecimalFormat("0.#").format(specificStatValue).toLabel()).row() statValuesTable.add(DecimalFormat("0.#").format(specificStatValue).toLabel()).row()
} }
for(entry in cityStats.statPercentBonusList){ statValuesTable.addSeparator()
val specificStatValue = entry.value.toHashMap()[stat]!! statValuesTable.add("Total".toLabel())
if(specificStatValue==0f) continue statValuesTable.add(DecimalFormat("0.#").format(sumOfAllBaseValues).toLabel()).row()
val relevantBonuses = cityStats.statPercentBonusList.filter { it.value.get(stat)!=0f }
if(relevantBonuses.isNotEmpty()) {
statValuesTable.add("Bonuses".toLabel().setFontSize(24)).colspan(2).padTop(20f).row()
var sumOfBonuses = 0f
for (entry in relevantBonuses) {
val specificStatValue = entry.value.get(stat)
sumOfBonuses += specificStatValue
statValuesTable.add(entry.key.toLabel()) statValuesTable.add(entry.key.toLabel())
val decimal = DecimalFormat("0.#").format(specificStatValue) val decimal = DecimalFormat("0.#").format(specificStatValue)
if (specificStatValue > 0) if (specificStatValue > 0) statValuesTable.add("+$decimal%".toLabel()).row()
statValuesTable.add("+$decimal%".toLabel()).row() else statValuesTable.add("$decimal%".toLabel()).row() // negative bonus
else
statValuesTable.add("$decimal%".toLabel()).row()
} }
if(stat==Stat.Food){ statValuesTable.addSeparator()
statValuesTable.add("Food eaten".toLabel()) statValuesTable.add("Total".toLabel())
statValuesTable.add(("-"+DecimalFormat("0.#").format(cityStats.foodEaten)).toLabel()).row() val decimal = DecimalFormat("0.#").format(sumOfBonuses)
val growthBonus = cityStats.getGrowthBonusFromPolicies() if (sumOfBonuses > 0) statValuesTable.add("+$decimal%".toLabel()).row()
if(growthBonus>0){ else statValuesTable.add("$decimal%".toLabel()).row() // negative bonus
statValuesTable.add("Growth bonus".toLabel())
statValuesTable.add(("+"+((growthBonus*100).toInt().toString())+"%").toLabel())
} }
statValuesTable.add("Final".toLabel().setFontSize(24)).colspan(2).padTop(20f).row()
var finalTotal = 0f
for (entry in cityStats.finalStatList) {
val specificStatValue = entry.value.get(stat)
finalTotal += specificStatValue
if (specificStatValue == 0f) continue
statValuesTable.add(entry.key.toLabel())
statValuesTable.add(DecimalFormat("0.#").format(specificStatValue).toLabel()).row()
} }
statValuesTable.addSeparator()
statValuesTable.add("Total".toLabel())
statValuesTable.add(DecimalFormat("0.#").format(finalTotal).toLabel()).row()
// if(stat==Stat.Food){
// val growthBonus = cityStats.getGrowthBonusFromPolicies()
// if(growthBonus>0){
// statValuesTable.add("Growth bonus".toLabel())
// statValuesTable.add(("+"+((growthBonus*100).toInt().toString())+"%").toLabel())
// }
// }
} }
} }