From 4d27f7f7697327a423df82cef6182584d0f8e429 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 9 Aug 2018 21:52:28 +0300
Subject: [PATCH] Added icon to city tiles

---
 android/assets/OtherIcons/City.png             | Bin 0 -> 3532 bytes
 core/src/com/unciv/ui/tilegroups/TileGroup.kt  |  17 +++++++++++++++++
 .../com/unciv/ui/tilegroups/WorldTileGroup.kt  |  11 ++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 android/assets/OtherIcons/City.png

diff --git a/android/assets/OtherIcons/City.png b/android/assets/OtherIcons/City.png
new file mode 100644
index 0000000000000000000000000000000000000000..62d35beff9190b0d54a772f8dd0e6e1a3f13c504
GIT binary patch
literal 3532
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

literal 0
HcmV?d00001

diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
index db909bdc99..f8a59a76cd 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
@@ -18,6 +18,7 @@ import com.unciv.ui.utils.colorFromRGB
 open class TileGroup(var tileInfo: TileInfo) : Group() {
     protected val hexagon = ImageGetter.getImage("TerrainIcons/Hexagon.png")
     protected var terrainFeatureImage:Image?=null
+    protected var cityImage:Image?=null
 
     protected var resourceImage: Image? = null
     protected var improvementImage: Image? =null
@@ -110,6 +111,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         }
 
         updateTerrainFeatureImage()
+        updateCityImage()
         updateTileColor(isViewable)
 
         updateResourceImage(isViewable)
@@ -129,6 +131,21 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         fogImage.isVisible=!(isViewable || UnCivGame.Current.viewEntireMapForDebug)
     }
 
+    private fun updateCityImage() {
+        if(cityImage==null && tileInfo.isCityCenter()){
+            cityImage = ImageGetter.getImage("OtherIcons/City.png")
+            addActor(cityImage)
+            cityImage!!.run {
+                setSize(60f, 60f)
+                center(this@TileGroup)
+            }
+        }
+        if(cityImage!=null && !tileInfo.isCityCenter()){
+            cityImage!!.remove()
+            cityImage = null
+        }
+    }
+
     var previousTileOwner:CivilizationInfo?=null
     private fun updateBorderImages() {
         // This is longer than it could be, because of performance -
diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
index accc28816f..bba35b8724 100644
--- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
@@ -35,7 +35,6 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
 
 
     override fun update(isViewable: Boolean) {
-
         val city = tileInfo.getCity()
 
         removePopulationIcon()
@@ -52,6 +51,16 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
         yieldGroup.isVisible = !UnCivGame.Current.settings.showResourcesAndImprovements
         if(yieldGroup.isVisible)
             yieldGroup.setStats(tileInfo.getTileStats(UnCivGame.Current.gameInfo.getPlayerCivilization()))
+
+        // order by z index!
+        cityImage?.toFront()
+        terrainFeatureImage?.toFront()
+        yieldGroup.toFront()
+        improvementImage?.toFront()
+        resourceImage?.toFront()
+        cityButton?.toFront()
+        civilianUnitImage?.toFront()
+        militaryUnitImage?.toFront()
     }
 
     private fun updateCityButton(city: CityInfo?, viewable: Boolean) {