From cbb5db2fb882acb4c3319c10feeeb7b085f10ccc Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 20 Nov 2019 23:33:09 +0200
Subject: [PATCH] Resolved #1231 - can now aquire tiles from eighboring cities
 again, kudos @klondi

---
 core/src/com/unciv/ui/cityscreen/CityTileGroup.kt | 2 +-
 core/src/com/unciv/ui/utils/Tutorials.kt          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt b/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
index de1324e039..22f340178a 100644
--- a/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
@@ -101,7 +101,7 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo, tileSetStrin
             center(this@CityTileGroup)
             x += 20 // right
         }
-        miscLayerGroup.addActor(this)
+        miscLayerGroup.addActor(icons.populationIcon)
     }
 
 }
\ No newline at end of file
diff --git a/core/src/com/unciv/ui/utils/Tutorials.kt b/core/src/com/unciv/ui/utils/Tutorials.kt
index 0c5d84df01..19e27c832e 100644
--- a/core/src/com/unciv/ui/utils/Tutorials.kt
+++ b/core/src/com/unciv/ui/utils/Tutorials.kt
@@ -48,11 +48,11 @@ class Tutorials{
         val tutorials: LinkedHashMap<String, Array<Array<String>>> =
                 GameBasics.getFromJson(x.javaClass, "Tutorials/Tutorials_$language")
         val tutorialMap = HashMap<String, ArrayList<String>>()
-        for (tut in tutorials){
+        for (tutorial in tutorials){
             val list = ArrayList<String>()
-            for(paragraph in tut.value)
+            for(paragraph in tutorial.value)
                 list += paragraph.joinToString("\n")
-            tutorialMap[tut.key] = list
+            tutorialMap[tutorial.key] = list
         }
         return tutorialMap
     }