diff --git a/android/assets/jsons/Tutorials.json b/android/assets/jsons/Tutorials.json index f17ec3faf1..2e4bf9b3ec 100644 --- a/android/assets/jsons/Tutorials.json +++ b/android/assets/jsons/Tutorials.json @@ -21,7 +21,7 @@ CityEntered: [ [ "Welcome to your first city!", - "As on now, you only have 1 population,", + "As of now, you only have 1 population,", " but this will grow when you amass enough surplus food" ], [ @@ -176,11 +176,23 @@ ], [ "Unhappiness has two main causes: Population and cities", - " Each city causes 3 unhappiness, and each population, 1", + " 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" ] ], + GoldenAge: [ + [ + "You have entered a golden age!", + "Golden age points are accumulated each turn by the total happiness ", + " of your civilization", + "When in a golden age, culture and production generation increases +20%,", + " and every tile already providing at least one gold will provide an extra gold." + ] + ], + } diff --git a/android/build.gradle b/android/build.gradle index e6a4d5731b..754ed755a6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 82 - versionName "2.4.11.2" + versionCode 83 + versionName "2.4.12" } buildTypes { release { diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index f2a34a6b79..7a47f0debb 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -167,7 +167,10 @@ class CityStats { private fun getStatPercentBonusesFromGoldenAge(isGoldenAge: Boolean): Stats { val stats = Stats() - if (isGoldenAge) stats.production += 20f + if (isGoldenAge){ + stats.production += 20f + stats.culture += 20f + } return stats } diff --git a/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt b/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt index 7656e961f5..891260bc8a 100644 --- a/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt @@ -10,6 +10,7 @@ import com.unciv.models.stats.Stats import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.ImageGetter.getImage import com.unciv.ui.utils.addClickListener +import com.unciv.ui.utils.setFont class BuildingsTable(private val cityScreen: CityScreen) : Table() { @@ -32,7 +33,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() { fun createLabel(text:String): Label { val label = Label(text, skin) - label.setFontScale(1.5f) + label.setFont(20) label.color = Color.GREEN return label } diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 07c31b0f21..b98de739e3 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -248,11 +248,6 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { tileTable.pad(20f) tileTable.columnDefaults(0).padRight(10f) - val cityStatsHeader = Label("Tile Stats", CameraStageBaseScreen.skin) - cityStatsHeader.setFont(25) - tileTable.add(cityStatsHeader).colspan(2).pad(10f) - tileTable.row() - tileTable.add(Label(selectedTile!!.toString(), CameraStageBaseScreen.skin)).colspan(2) tileTable.row() diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 14a9348393..3032d921d2 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -138,6 +138,9 @@ class WorldScreen : CameraStageBaseScreen() { if(civInfo.happiness<0) displayTutorials("Unhappiness") + if(civInfo.goldenAges.isGoldenAge()) + displayTutorials("GoldenAge") + if(gameInfo.turns>=100) displayTutorials("ContactMe") }