From 2e7a2cda1241fed8498e9eceada9bf050d07161b Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Tue, 11 Dec 2018 19:06:36 +0800 Subject: [PATCH 1/2] Add city range tutorial. --- android/assets/jsons/Tutorials_English.json | 8 ++++++++ core/src/com/unciv/ui/cityscreen/CityScreen.kt | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/android/assets/jsons/Tutorials_English.json b/android/assets/jsons/Tutorials_English.json index 32403a4104..7a88d9be48 100644 --- a/android/assets/jsons/Tutorials_English.json +++ b/android/assets/jsons/Tutorials_English.json @@ -306,5 +306,13 @@ "Units are defenseless while embarked, so be careful!" ] ] + + CityRange:[ + [ + "Your citizens can work 3 tiles away from city center.", + "The city border will keep expanding,", + "But citizen cannot be assigned to a tile too far." + ] + ] } diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index c0fe6ac32f..3e3fc9140f 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -60,6 +60,10 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { updateGoToWorldButton() updateTileTable() updateTileGroups() + + if (city.getCenterTile().getTilesAtDistance(4).isNotEmpty()){ + displayTutorials("CityRange") + } } private fun updateTileGroups() { From d73bf6d13f8d73960645742e98407eecf869f7cf Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Tue, 11 Dec 2018 19:19:36 +0800 Subject: [PATCH 2/2] Fix spelling error. --- android/assets/jsons/Tutorials_English.json | 2 +- core/src/com/unciv/UnCivGame.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Tutorials_English.json b/android/assets/jsons/Tutorials_English.json index 7a88d9be48..362146b696 100644 --- a/android/assets/jsons/Tutorials_English.json +++ b/android/assets/jsons/Tutorials_English.json @@ -311,7 +311,7 @@ [ "Your citizens can work 3 tiles away from city center.", "The city border will keep expanding,", - "But citizen cannot be assigned to a tile too far." + "but citizen cannot be assigned to a tile too far." ] ] diff --git a/core/src/com/unciv/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt index d42f058e89..fb5df00b86 100644 --- a/core/src/com/unciv/UnCivGame.kt +++ b/core/src/com/unciv/UnCivGame.kt @@ -21,7 +21,7 @@ class UnCivGame : Game() { val viewEntireMapForDebug = false // For when you need to test something in an advanced game and don't have time to faff around - val superchargedForDebug = true + val superchargedForDebug = false lateinit var worldScreen: WorldScreen