diff --git a/android/build.gradle b/android/build.gradle index 91fff997dc..94639e9875 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 30 - versionName "1.3.3" + versionCode 31 + versionName "1.3.4" } buildTypes { release { diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 6ade6ad7c1..1a190b21e6 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -3,7 +3,6 @@ package com.unciv.ui.tilegroups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.ui.Image -import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.utils.Align import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo @@ -23,7 +22,6 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { private var roadImages = HashMap() private var borderImages = ArrayList() - public var cityButton: TextButton? = null init { val groupSize = 50f @@ -69,7 +67,6 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { setPosition(this@TileGroup.width /2-width/2, this@TileGroup.height/2-height/2) } - } if(terrainFeatureImage!=null && tileInfo.terrainFeature==null){ @@ -77,6 +74,16 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { terrainFeatureImage=null } + if(cityImage==null && tileInfo.isCityCenter){ + terrainFeatureImage = ImageGetter.getImage("TerrainIcons/City.png") + addActor(terrainFeatureImage) + setSize(30f,30f) + setColor(1f,1f,1f,0.5f) + setPosition(this@TileGroup.width /2-width/2, + this@TileGroup.height/2-height/2) + } + } + val RGB= tileInfo.getBaseTerrain().RGB!! hexagon.color = Color(RGB[0]/255f,RGB[1]/255f,RGB[2]/255f,1f) diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt index 918371ec7b..b4f43cf64b 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt @@ -9,6 +9,7 @@ import com.unciv.ui.worldscreen.WorldScreen class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) { + var cityButton: TextButton? = null fun setIsViewable(isViewable: Boolean) { if (isViewable) {