diff --git a/android/assets/jsons/Tutorials.json b/android/assets/jsons/Tutorials.json index f1ef3cd3f0..f17ec3faf1 100644 --- a/android/assets/jsons/Tutorials.json +++ b/android/assets/jsons/Tutorials.json @@ -168,4 +168,19 @@ ] ], + Unhappiness: [ + [ + "It seems that your citizens are unhappy!", + "While unhappy, cities will grow at 1/4 the speed,", + " and your units will suffer a 2% penalty for each unhappiness" + ], + [ + "Unhappiness has two main causes: Population and cities", + " Each city causes 3 unhappiness, and each population, 1", + "There are 2 main ways to combat unhappiness:", + " by building happiness buildings for your population", + " or by having improved luxury resources within your borders" + ] + ], + } diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index 85d0e904d6..1ea830bac1 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -71,7 +71,6 @@ open class CameraStageBaseScreen : Screen { tutorialTable.background(ImageGetter.getDrawable(ImageGetter.WhiteDot) .tint(Color(0x101050cf))) val label = Label(tutorialTexts[0], skin) - label.setFontScale(1.5f) label.setAlignment(Align.center) tutorialTexts.removeAt(0) tutorialTable.add(label).pad(10f).row() diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index d4aac2ed49..fdc9fb6c93 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -135,6 +135,9 @@ class WorldScreen : CameraStageBaseScreen() { } displayTutorials("NextTurn") + if(civInfo.happiness<0) + displayTutorials("Unhappiness") + if(gameInfo.turns>=100) displayTutorials("ContactMe") }