diff --git a/android/assets/jsons/Tutorials/Tutorials_English.json b/android/assets/jsons/Tutorials/Tutorials_English.json index f99403e19a..7350224d0c 100644 --- a/android/assets/jsons/Tutorials/Tutorials_English.json +++ b/android/assets/jsons/Tutorials/Tutorials_English.json @@ -238,9 +238,8 @@ ] ] - EnemyCity: [ + Enemy_City: [ [ - "You have encountered an enemy city!", "Cities can be conquered by reducing their health to 1,", " and entering the city with a melee unit.", "Since cities heal each turn, it is best to attack with ranged units" @@ -248,18 +247,16 @@ ] ] - LuxuryResource: [ + Luxury_Resource: [ [ - "You have gained your first luxury resource!", "Each unique Luxury resource you have adds 5 happiness to your civilization,", " but extra resources of the same type don't add anything, ", " so use them for trading with other civilizations!" ] ] - StrategicResource: [ + Strategic_Resource: [ [ - "You have gained your first strategic resource!", "Strategic resources allow you to train units and construct buildings that", " require those specific resources, for example the Horseman requires Horses." "Each unit 'consumes' a copy of that resource, but if the unit is killed you can ", diff --git a/android/assets/jsons/Tutorials/Tutorials_French.json b/android/assets/jsons/Tutorials/Tutorials_French.json index 015af3522e..c54b9b965f 100644 --- a/android/assets/jsons/Tutorials/Tutorials_French.json +++ b/android/assets/jsons/Tutorials/Tutorials_French.json @@ -278,7 +278,7 @@ ] ] - EnemyCity: [ + Enemy_City: [ [ "Vous avez rencontré une ville ennemie !", " Les villes peuvent être conquises en réduisant leur vie à 1", @@ -288,7 +288,7 @@ ] ] - LuxuryResource: [ + Luxury_Resource: [ [ "Vous avez trouvé votre première ressource de luxe !", " Chaque ressource de luxe différente que vous possédez vous donne 5 de bonheur", @@ -297,7 +297,7 @@ ] ] - StrategicResource: [ + Strategic_Resource: [ [ "Vous avez trouvé votre première ressource stratégique !", " Les ressources stratégiques servent à produire certaines unités et certains bâtiments", diff --git a/android/assets/jsons/Tutorials/Tutorials_Italian.json b/android/assets/jsons/Tutorials/Tutorials_Italian.json index 2db5059bb2..4e7389237c 100644 --- a/android/assets/jsons/Tutorials/Tutorials_Italian.json +++ b/android/assets/jsons/Tutorials/Tutorials_Italian.json @@ -252,7 +252,7 @@ ] ], - EnemyCity: [ + Enemy_City: [ [ "Hai avvistato una città nemica!", "Puoi conquistare le città prima riducendo la loro salute a 1,", @@ -262,7 +262,7 @@ ] ], - LuxuryResource: [ + Luxury_Resource: [ [ "Hai ottenuto la tua prima risorsa di lusso!", "Ogni risorsa unica di lusso posseduta frutta 5 punti felicità alla civiltà,", @@ -271,7 +271,7 @@ ] ], - StrategicResource: [ + Strategic_Resource: [ [ "Hai ottenuto la tua prima risorsa strategica!", "Le risorse strategiche ti permettono di addestrare unità e costruire edifici ", diff --git a/android/assets/jsons/Tutorials/Tutorials_Russian.json b/android/assets/jsons/Tutorials/Tutorials_Russian.json index 42672ae9ec..8411956b8a 100644 --- a/android/assets/jsons/Tutorials/Tutorials_Russian.json +++ b/android/assets/jsons/Tutorials/Tutorials_Russian.json @@ -206,7 +206,7 @@ ] ] - EnemyCity: [ + Enemy_City: [ [ "Вы встретили вражеский город!", "Города могут быть захвачены уменьшением их здоровья до 1,", @@ -216,7 +216,7 @@ ] ] - LuxuryResource: [ + Luxury_Resource: [ [ "Вы добыли ваш первый редкий ресурс!", "Каждый уникальный редкий ресурс, который у вас есть добавляет 5 счастья вашей цивилизации,", @@ -225,7 +225,7 @@ ] ] - StrategicResource: [ + Strategic_Resource: [ [ "Вы добыли ваш первый стратегический ресурс!", "Стратегические ресурсы позволяют вам тренировать юнитов и строить строения, которые", diff --git a/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json b/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json index 6c142c5be5..f103f4cb82 100644 --- a/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json +++ b/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json @@ -245,7 +245,7 @@ ] ] - EnemyCity: [ + Enemy_City: [ [ "您已经包围了敌人的一座城市!", "当城市的耐久降至1时就可以被占领。", @@ -255,7 +255,7 @@ ] ] - LuxuryResource: [ + Luxury_Resource: [ [ "您已经获得了第一个奢侈资源!", "您拥有的每种独一无二的奢侈资源都会给您的文明+5快乐，", @@ -264,7 +264,7 @@ ] ] - StrategicResource: [ + Strategic_Resource: [ [ "您已经获得了第一个战略资源!", "战略资源允许您组建特定的单位和建造特定的建筑。", diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 65402618f4..5291f75b48 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -440,12 +440,12 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() { if(gameInfo.turns >= 50 && UnCivGame.Current.settings.checkForDueUnits) displayTutorials("Idle_Units") if(gameInfo.turns >= 100) displayTutorials("ContactMe") val resources = viewingCiv.getCivResources() - if(resources.any { it.resource.resourceType==ResourceType.Luxury }) displayTutorials("LuxuryResource") - if(resources.any { it.resource.resourceType==ResourceType.Strategic}) displayTutorials("StrategicResource") - if("EnemyCity" !in shownTutorials + if(resources.any { it.resource.resourceType==ResourceType.Luxury }) displayTutorials("Luxury_Resource") + if(resources.any { it.resource.resourceType==ResourceType.Strategic}) displayTutorials("Strategic_Resource") + if("Enemy_City" !in shownTutorials && gameInfo.civilizations.filter { it!=viewingCiv } .flatMap { it.cities }.any { viewingCiv.exploredTiles.contains(it.location) }) - displayTutorials("EnemyCity") + displayTutorials("Enemy_City") if(viewingCiv.containsBuildingUnique("Enables construction of Spaceship parts")) displayTutorials("Apollo_Program") if(viewingCiv.getCivUnits().any { it.type == UnitType.Siege })