Fixed Embarkation tutorial

android/assets/jsons/Tutorials_English.json

@@ -301,10 +301,9 @@
 	
 	CanEmbark:[
 		[
-			"Your land units can now embark!",
+			"Your land units can now embark, allowing them to traverse water tiles!",
-			"Siege units are extremely powerful against cities, but need to be Set Up before they can attack.",
+			"Entering or leaving water takes the entire turn.",
-			"Once your siege unit is set up, it can attack from the current tile,",
+			"Units are defenseless while embarked, so be careful!"
-			"  but once moved to another tile, it will need to be set up again."
 		]
 	]
 	

android/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 161
+        versionCode 163
-        versionName "2.10.2"
+        versionName "2.10.3"
     }
     buildTypes {
         release {

core/src/com/unciv/ui/cityscreen/BuildingsTable.kt

@@ -82,7 +82,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
             add(specialistBuildingsExpander).row()
 
             // specialist allocation
-            addSpecialistAllocation(skin, specialistBuildings, cityInfo)
+            addSpecialistAllocation(skin, cityInfo)
         }
 
         if (!others.isEmpty()) {
@@ -96,7 +96,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
         pack()
     }
 
-    private fun addSpecialistAllocation(skin: Skin, specialistBuildings: MutableList<Building>, cityInfo: CityInfo) {
+    private fun addSpecialistAllocation(skin: Skin, cityInfo: CityInfo) {
         val specialistAllocationExpander = ExpanderTab("Specialist allocation", skin)
         specialistAllocationExpander.innerTable.defaults().pad(5f)
 
@@ -104,17 +104,17 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
         val currentSpecialists = cityInfo.population.specialists.toHashMap()
         val maximumSpecialists = cityInfo.population.getMaxSpecialists()
 
-        for (entry in maximumSpecialists.toHashMap()) {
+        for (statToMaximumSpecialist in maximumSpecialists.toHashMap()) {
-            if (entry.value == 0f) continue
+            if (statToMaximumSpecialist.value == 0f) continue
-            val stat = entry.key
+            val stat = statToMaximumSpecialist.key
             // these two are conflictingly named compared to above...
-            val assignedSpecialists = currentSpecialists[entry.key]!!.toInt()
+            val assignedSpecialists = currentSpecialists[statToMaximumSpecialist.key]!!.toInt()
-            val maxSpecialists = entry.value.toInt()
+            val maxSpecialists = statToMaximumSpecialist.value.toInt()
             if (assignedSpecialists > 0) {
                 val unassignButton = TextButton("-", skin)
                 unassignButton.label.setFontSize(24)
                 unassignButton.onClick {
-                    cityInfo.population.specialists.add(entry.key, -1f)
+                    cityInfo.population.specialists.add(statToMaximumSpecialist.key, -1f)
                     cityInfo.cityStats.update()
                     cityScreen.update()
                 }
@@ -131,7 +131,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
                 val assignButton = TextButton("+", skin)
                 assignButton.label.setFontSize(24)
                 assignButton.onClick {
-                    cityInfo.population.specialists.add(entry.key, +1f)
+                    cityInfo.population.specialists.add(statToMaximumSpecialist.key, +1f)
                     cityInfo.cityStats.update()
                     cityScreen.update()
                 }

core/src/com/unciv/ui/tilegroups/TileGroup.kt

@@ -119,8 +119,8 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         updateCityImage()
         updateTileColor(isViewable)
 
-        updateResourceImage(isViewable,showResourcesAndImprovements)
+        updateResourceImage(showResourcesAndImprovements)
-        updateImprovementImage(isViewable,showResourcesAndImprovements)
+        updateImprovementImage(showResourcesAndImprovements)
 
 
         civilianUnitImage = newUnitImage(tileInfo.civilianUnit, civilianUnitImage, isViewable, -20f)
@@ -272,7 +272,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         }
     }
 
-    private fun updateImprovementImage(viewable: Boolean, showResourcesAndImprovements: Boolean) {
+    private fun updateImprovementImage(showResourcesAndImprovements: Boolean) {
         if (improvementImage != null) {
             improvementImage!!.remove()
             improvementImage = null
@@ -293,7 +293,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         }
     }
 
-    private fun updateResourceImage(viewable: Boolean, showResourcesAndImprovements: Boolean) {
+    private fun updateResourceImage(showResourcesAndImprovements: Boolean) {
         val shouldDisplayResource = showResourcesAndImprovements
                 && tileInfo.hasViewableResource(tileInfo.tileMap.gameInfo.getPlayerCivilization())
 
@@ -365,9 +365,9 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
 
     fun showCircle(color: Color) {
         circleImage.isVisible = true
-        val color = color.cpy()
+        val colorCopy = color.cpy()
-        color.a = 0.3f
+        colorCopy.a = 0.3f
-        circleImage.color = color
+        circleImage.color = colorCopy
     }
 
     fun hideCircle() {