From bfb53a1940b4e632206ef8c788b2b71d3f08fc34 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 12 Jul 2018 19:17:58 +0300
Subject: [PATCH] Updating happiness happens in a different thread so it
 doesn't impede the update() function

---
 android/build.gradle                                   | 2 +-
 core/src/com/unciv/ui/worldscreen/WorldScreen.kt       | 2 ++
 core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 072e599d02..832ce05936 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,7 +21,7 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 98
+        versionCode 99
         versionName "2.6.2"
     }
     buildTypes {
diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
index 65c4c243ce..4707d2639d 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
@@ -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")
         }
diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
index d2351d8c15..d6e45611a3 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
@@ -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