AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for the tile yields

Browse Source
This commit is contained in:
Yair Morgenstern 2020-12-13 09:52:15 +02:00
parent 0e5b2f0db0
commit 7ec176ac45
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -9,7 +9,7 @@ data class WindowState (val width:Int=0, val height:Int=0)
class GameSettings { class GameSettings {
var showWorkedTiles: Boolean = false var showWorkedTiles: Boolean = false
var showResourcesAndImprovements: Boolean = true var showResourcesAndImprovements: Boolean = true
var showTileYields: Boolean = true // JN var showTileYields: Boolean = false
var checkForDueUnits: Boolean = true var checkForDueUnits: Boolean = true
var singleTapMove: Boolean = false var singleTapMove: Boolean = false
var language: String = "English" var language: String = "English"

12
core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt
View File

@ -11,7 +11,7 @@ import com.unciv.logic.map.MapUnit
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
/** Helper class for TileGroup, which was getting too full */ /** Helper class for TileGroup, which was getting too full */
class TileGroupIcons(val tileGroup: TileGroup){ class TileGroupIcons(val tileGroup: TileGroup) {
var improvementIcon: Actor? = null var improvementIcon: Actor? = null
var populationIcon: Image? = null //reuse for acquire icon var populationIcon: Image? = null //reuse for acquire icon
@ -19,11 +19,11 @@ class TileGroupIcons(val tileGroup: TileGroup){
var civilianUnitIcon: UnitGroup? = null var civilianUnitIcon: UnitGroup? = null
var militaryUnitIcon: UnitGroup? = null var militaryUnitIcon: UnitGroup? = null
fun update(showResourcesAndImprovements: Boolean, showTileYields: Boolean, tileIsViewable: Boolean, showMilitaryUnit: Boolean, viewingCiv:CivilizationInfo?) { fun update(showResourcesAndImprovements: Boolean, showTileYields: Boolean, tileIsViewable: Boolean, showMilitaryUnit: Boolean, viewingCiv: CivilizationInfo?) {
updateResourceIcon(showResourcesAndImprovements) updateResourceIcon(showResourcesAndImprovements)
updateImprovementIcon(showResourcesAndImprovements) updateImprovementIcon(showResourcesAndImprovements)
updateYieldIcon(showTileYields) // JN if (viewingCiv != null) updateYieldIcon(showTileYields, viewingCiv)
civilianUnitIcon = newUnitIcon(tileGroup.tileInfo.civilianUnit, civilianUnitIcon, civilianUnitIcon = newUnitIcon(tileGroup.tileInfo.civilianUnit, civilianUnitIcon,
tileIsViewable, -20f, viewingCiv) tileIsViewable, -20f, viewingCiv)
@ -103,7 +103,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
if (tileGroup.tileInfo.improvement != null && showResourcesAndImprovements) { if (tileGroup.tileInfo.improvement != null && showResourcesAndImprovements) {
val newImprovementImage = ImageGetter.getImprovementIcon(tileGroup.tileInfo.improvement!!) val newImprovementImage = ImageGetter.getImprovementIcon(tileGroup.tileInfo.improvement!!)
tileGroup.miscLayerGroup.addActor(newImprovementImage) tileGroup.miscLayerGroup.addActor(newImprovementImage)
newImprovementImage .run { newImprovementImage.run {
setSize(20f, 20f) setSize(20f, 20f)
center(tileGroup) center(tileGroup)
this.x -= 22 // left this.x -= 22 // left
@ -117,7 +117,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
} }
// JN updating display of tile yields // JN updating display of tile yields
private fun updateYieldIcon(showTileYields: Boolean) { private fun updateYieldIcon(showTileYields: Boolean, viewingCiv: CivilizationInfo) {
// Hiding yield icons (in order to update) // Hiding yield icons (in order to update)
tileGroup.tileYieldGroup.isVisible = false tileGroup.tileYieldGroup.isVisible = false
@ -125,7 +125,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
if (showTileYields) { if (showTileYields) {
// Setting up YieldGroup Icon // Setting up YieldGroup Icon
tileGroup.tileYieldGroup.setStats(tileGroup.tileInfo.getTileStats(CivilizationInfo())) tileGroup.tileYieldGroup.setStats(tileGroup.tileInfo.getTileStats(viewingCiv))
tileGroup.tileYieldGroup.setOrigin(Align.center) tileGroup.tileYieldGroup.setOrigin(Align.center)
tileGroup.tileYieldGroup.setScale(0.7f) tileGroup.tileYieldGroup.setScale(0.7f)
tileGroup.tileYieldGroup.toFront() tileGroup.tileYieldGroup.toFront()