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

Negative stats UI Updates (#8240)

Browse Source 
* Fix UI for negative Science, Culture, and Faith

* Fix more UI issues
Support Happiness Transportation Upkeep
Create Culture->Happiness deficit

* Remove deficit
Functionalize Rate + addition
This commit is contained in:
itanasi
2022-12-27 22:19:01 -08:00
committed by GitHub
parent 41db6e079a
commit 84fe92fab3
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View File

@ -274,6 +274,10 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
statMap.add("Policies", civInfo.policies.getAdoptedPolicies().count { !Policy.isBranchCompleteByName(it) } / 2)
}
val transportUpkeep = getTransportationUpkeep() * -1
if (transportUpkeep.happiness != 0f)
statMap["Transportation Upkeep"] = transportUpkeep.happiness
for ((key, value) in getGlobalStatsFromUniques())
statMap.add(key,value.happiness)

16
core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
View File

@ -311,12 +311,16 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() {
layoutButtons()
}
private fun rateLabel(value: Float): String {
return (if (value > 0) "+" else "") + value.roundToInt()
}
private fun updateStatsTable(civInfo: CivilizationInfo) {
val nextTurnStats = civInfo.statsForNextTurn
val goldPerTurn = "(" + (if (nextTurnStats.gold > 0) "+" else "") + nextTurnStats.gold.roundToInt() + ")"
val goldPerTurn = " (" + rateLabel(nextTurnStats.gold) + ")"
goldLabel.setText(civInfo.gold.toString() + goldPerTurn)
scienceLabel.setText("+" + nextTurnStats.science.roundToInt())
scienceLabel.setText(rateLabel(nextTurnStats.science))
happinessLabel.setText(getHappinessText(civInfo))
@ -331,7 +335,8 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() {
}
cultureLabel.setText(getCultureText(civInfo, nextTurnStats))
faithLabel.setText(civInfo.religionManager.storedFaith.toString() + "(+" + nextTurnStats.faith.roundToInt() + ")")
faithLabel.setText(civInfo.religionManager.storedFaith.toString() +
" (" + rateLabel(nextTurnStats.faith) + ")")
}
private fun updateResourcesTable(civInfo: CivilizationInfo) {
@ -357,11 +362,12 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() {
}
private fun getCultureText(civInfo: CivilizationInfo, nextTurnStats: Stats): String {
var cultureString = "+" + nextTurnStats.culture.roundToInt()
var cultureString = rateLabel(nextTurnStats.culture)
if (nextTurnStats.culture == 0f) return cultureString // when you start the game, you're not producing any culture
val turnsToNextPolicy = (civInfo.policies.getCultureNeededForNextPolicy() - civInfo.policies.storedCulture) / nextTurnStats.culture
cultureString += if (turnsToNextPolicy <= 0f) " (!)"
cultureString += if (nextTurnStats.culture < 0) " (∞)"
else if (turnsToNextPolicy <= 0f) " (!)"
else " (" + ceil(turnsToNextPolicy).toInt() + ")"
return cultureString
}