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

Updating happiness happens in a different thread so it doesn't impede the update() function

Browse Source
This commit is contained in:
Yair Morgenstern
2018-07-12 19:17:58 +03:00
parent c05503bb86
commit bfb53a1940
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -77,6 +77,8 @@ class WorldScreen : CameraStageBaseScreen() {
fun update() {
kotlin.concurrent.thread { civInfo.happiness = civInfo.getHappinessForNextTurn().values.sum() }
if (game.gameInfo.tutorial.contains("CityEntered")) {
displayTutorials("AfterCityEntered")
}

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

@ -160,7 +160,7 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() {
}
private fun getHappinessText(civInfo: CivilizationInfo): String {
var happinessText = civInfo.getHappinessForNextTurn().values.sum().toString()
var happinessText = civInfo.happiness.toString()
if (civInfo.goldenAges.isGoldenAge())
happinessText += " GOLDEN AGE (${civInfo.goldenAges.turnsLeftForCurrentGoldenAge})"
else