mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-20 04:38:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix CityScreen tile yields indicator

Browse Source
This commit is contained in:
tunerzinc@gmail.com
2023-02-08 02:34:08 +01:00
parent c2c03d8202
commit e7da347a05
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/tilegroups/CityTileGroup.kt
View File

@ -16,7 +16,7 @@ import com.unciv.ui.utils.extensions.setFontColor
import com.unciv.ui.utils.extensions.toGroup
import com.unciv.ui.utils.extensions.toLabel
class CityTileGroup(private val city: City, tile: Tile, tileSetStrings: TileSetStrings) : TileGroup(tile,tileSetStrings) {
class CityTileGroup(val city: City, tile: Tile, tileSetStrings: TileSetStrings) : TileGroup(tile,tileSetStrings) {
var isWorkable = false
var isPurchasable = false

7
core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt
View File

@ -14,6 +14,7 @@ import com.unciv.models.helpers.MiscArrowTypes
import com.unciv.models.helpers.TintedMapArrow
import com.unciv.models.helpers.UnitMovementMemoryType
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.tilegroups.CityTileGroup
import com.unciv.ui.tilegroups.TileGroup
import com.unciv.ui.tilegroups.TileSetStrings
import com.unciv.ui.tilegroups.WorldTileGroup
@ -226,7 +227,10 @@ class TileLayerMisc(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, si
if (showTileYields) {
// Setting up YieldGroup Icon
yields.setStats(tile().stats.getTileStats(viewingCiv))
if (tileGroup is CityTileGroup)
yields.setStats(tile().stats.getTileStats(tileGroup.city, viewingCiv))
else
yields.setStats(tile().stats.getTileStats(viewingCiv))
yields.setOrigin(Align.center)
yields.setScale(0.7f)
yields.toFront()
@ -269,6 +273,7 @@ class TileLayerMisc(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, si
fun setYieldVisible(isVisible: Boolean) {
yields.isVisible = isVisible
determineVisibility()
}
override fun doUpdate(viewingCiv: Civilization?) {