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

Unified stat summing in city overview table

Browse Source
This commit is contained in:
Yair Morgenstern 2021-04-27 19:02:14 +03:00
parent 3da02b18b6
commit 5b7170bf9f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/ui/overviewscreen/CityOverviewTable.kt
View File

@ -15,7 +15,7 @@ import kotlin.math.roundToInt
class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen: EmpireOverviewScreen): Table() {
val columnsNames = arrayListOf("Population", "Food", "Gold", "Science", "Production", "Culture", "Happiness")
.apply { if(viewingPlayer.gameInfo.ruleSet.hasReligion()) add("Faith") }
.apply { if (viewingPlayer.gameInfo.ruleSet.hasReligion()) add("Faith") }
init {
val iconSize = 50f //if you set this too low, there is a chance that the tables will be misaligned
@ -62,13 +62,11 @@ class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen:
cityInfoTableTotal.add("Total".toLabel())
cityInfoTableTotal.add(viewingPlayer.cities.sumBy { it.population.population }.toString().toLabel())
cityInfoTableTotal.add()//an intended empty space
cityInfoTableTotal.add(viewingPlayer.cities.sumBy { getStatOfCity(it, Stat.Gold) }.toLabel())
cityInfoTableTotal.add(viewingPlayer.cities.sumBy { getStatOfCity(it, Stat.Science) }.toLabel())
cityInfoTableTotal.add()//an intended empty space
cityInfoTableTotal.add(viewingPlayer.cities.sumBy { getStatOfCity(it, Stat.Culture) }.toLabel())
cityInfoTableTotal.add(viewingPlayer.cities.sumBy { getStatOfCity(it, Stat.Happiness) }.toLabel())
for (column in columnsNames.filter { it.isStat() }) {
val stat = Stat.valueOf(column)
if (stat == Stat.Food || stat == Stat.Production) cityInfoTableTotal.add()//an intended empty space
else cityInfoTableTotal.add(viewingPlayer.cities.sumBy { getStatOfCity(it, stat) }.toLabel())
}
cityInfoTableTotal.pack()
val table = Table(skin)
@ -97,7 +95,7 @@ class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen:
val sorter = Comparator { city2, city1: CityInfo ->
when {
sortType == "Population" -> city1.population.population - city2.population.population
Stat.values().any { it.name == sortType } -> {
sortType.isStat() -> {
val stat = Stat.valueOf(sortType)
return@Comparator getStatOfCity(city1, stat) - getStatOfCity(city2, stat)
}
@ -119,7 +117,7 @@ class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen:
citiesTable.add(city.cityConstructions.getCityProductionTextForCityButton().toLabel())
citiesTable.add(city.population.population.toLabel()).align(Align.center)
for (column in columnsNames) {
if (!Stat.values().any { it.name == column }) continue
if (!column.isStat()) continue
citiesTable.add(getStatOfCity(city, Stat.valueOf(column)).toLabel()).align(Align.center)
}
citiesTable.row()
@ -127,4 +125,6 @@ class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen:
citiesTable.pack()
}
private fun String.isStat() = Stat.values().any { it.name == this }
}