diff --git a/android/Images/TerrainIcons/Flood plains.png b/android/Images/TerrainIcons/Default/Flood plainsOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Flood plains.png rename to android/Images/TerrainIcons/Default/Flood plainsOverlay.png diff --git a/android/Images/TerrainIcons/Forest.png b/android/Images/TerrainIcons/Default/ForestOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Forest.png rename to android/Images/TerrainIcons/Default/ForestOverlay.png diff --git a/android/Images/TerrainIcons/Hill.png b/android/Images/TerrainIcons/Default/HillOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Hill.png rename to android/Images/TerrainIcons/Default/HillOverlay.png diff --git a/android/Images/TerrainIcons/Jungle.png b/android/Images/TerrainIcons/Default/JungleOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Jungle.png rename to android/Images/TerrainIcons/Default/JungleOverlay.png diff --git a/android/Images/TerrainIcons/Lakes.png b/android/Images/TerrainIcons/Default/LakesOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Lakes.png rename to android/Images/TerrainIcons/Default/LakesOverlay.png diff --git a/android/Images/TerrainIcons/Marsh.png b/android/Images/TerrainIcons/Default/MarshOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Marsh.png rename to android/Images/TerrainIcons/Default/MarshOverlay.png diff --git a/android/Images/TerrainIcons/Mountain.png b/android/Images/TerrainIcons/Default/MountainOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Mountain.png rename to android/Images/TerrainIcons/Default/MountainOverlay.png diff --git a/android/Images/TerrainIcons/Oasis.png b/android/Images/TerrainIcons/Default/OasisOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Oasis.png rename to android/Images/TerrainIcons/Default/OasisOverlay.png diff --git a/android/Images/TerrainIcons/Test/Flood plainsOverlay.png b/android/Images/TerrainIcons/Test/Flood plainsOverlay.png new file mode 100644 index 0000000000..d77ce89099 Binary files /dev/null and b/android/Images/TerrainIcons/Test/Flood plainsOverlay.png differ diff --git a/android/Images/TerrainIcons/Test/ForestOverlay.png b/android/Images/TerrainIcons/Test/ForestOverlay.png new file mode 100644 index 0000000000..8c2e11e8cf Binary files /dev/null and b/android/Images/TerrainIcons/Test/ForestOverlay.png differ diff --git a/android/Images/TerrainIcons/Test/Grasslands.png b/android/Images/TerrainIcons/Test/Grasslands.png new file mode 100644 index 0000000000..d15e8c5c28 Binary files /dev/null and b/android/Images/TerrainIcons/Test/Grasslands.png differ diff --git a/android/Images/TerrainIcons/Test/HillOverlay.png b/android/Images/TerrainIcons/Test/HillOverlay.png new file mode 100644 index 0000000000..0139f972f9 Binary files /dev/null and b/android/Images/TerrainIcons/Test/HillOverlay.png differ diff --git a/android/Images/TerrainIcons/Test/JungleOverlay.png b/android/Images/TerrainIcons/Test/JungleOverlay.png new file mode 100644 index 0000000000..32943e13dd Binary files /dev/null and b/android/Images/TerrainIcons/Test/JungleOverlay.png differ diff --git a/android/Images/TerrainIcons/Test/LakesOverlay.png b/android/Images/TerrainIcons/Test/LakesOverlay.png new file mode 100644 index 0000000000..e839d59a61 Binary files /dev/null and b/android/Images/TerrainIcons/Test/LakesOverlay.png differ diff --git a/android/Images/TerrainIcons/Test/MarshOverlay.png b/android/Images/TerrainIcons/Test/MarshOverlay.png new file mode 100644 index 0000000000..776297e9ea Binary files /dev/null and b/android/Images/TerrainIcons/Test/MarshOverlay.png differ diff --git a/android/Images/TerrainIcons/Test/MountainOverlay.png b/android/Images/TerrainIcons/Test/MountainOverlay.png new file mode 100644 index 0000000000..41288f7abc Binary files /dev/null and b/android/Images/TerrainIcons/Test/MountainOverlay.png differ diff --git a/android/Images/TerrainIcons/Test/OasisOverlay.png b/android/Images/TerrainIcons/Test/OasisOverlay.png new file mode 100644 index 0000000000..1ee6bd0a6b Binary files /dev/null and b/android/Images/TerrainIcons/Test/OasisOverlay.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 4d734544b6..6b1d85235c 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -1992,20 +1992,118 @@ TerrainIcons/CrosshatchHexagon orig: 273, 236 offset: 0, 0 index: -1 -TerrainIcons/Flood plains +TerrainIcons/Default/Flood plainsOverlay rotate: false xy: 1150, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Forest +TerrainIcons/Test/Flood plainsOverlay + rotate: false + xy: 1150, 1438 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Default/ForestOverlay rotate: false xy: 844, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +TerrainIcons/Test/ForestOverlay + rotate: false + xy: 844, 1030 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Default/HillOverlay + rotate: false + xy: 714, 724 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Test/HillOverlay + rotate: false + xy: 714, 724 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Default/JungleOverlay + rotate: false + xy: 1224, 826 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Test/JungleOverlay + rotate: false + xy: 1224, 826 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Default/LakesOverlay + rotate: false + xy: 1603, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Test/LakesOverlay + rotate: false + xy: 1603, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Default/MarshOverlay + rotate: false + xy: 1456, 1238 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Test/MarshOverlay + rotate: false + xy: 1456, 1238 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Default/MountainOverlay + rotate: false + xy: 1864, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Test/MountainOverlay + rotate: false + xy: 1864, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Default/OasisOverlay + rotate: false + xy: 1864, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/Test/OasisOverlay + rotate: false + xy: 1864, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 TerrainIcons/Hexagon rotate: false xy: 2, 1806 @@ -2020,46 +2118,11 @@ TerrainIcons/HexagonBorder orig: 139, 120 offset: 0, 0 index: -1 -TerrainIcons/Hill +TerrainIcons/Test/Grasslands rotate: false - xy: 714, 724 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TerrainIcons/Jungle - rotate: false - xy: 1224, 826 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TerrainIcons/Lakes - rotate: false - xy: 1603, 1640 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TerrainIcons/Marsh - rotate: false - xy: 1456, 1238 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TerrainIcons/Mountain - rotate: false - xy: 1864, 1436 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TerrainIcons/Oasis - rotate: false - xy: 1864, 1130 - size: 100, 100 - orig: 100, 100 + xy: 1531, 1964 + size: 32, 30 + orig: 32, 30 offset: 0, 0 index: -1 TerrainIcons/road @@ -2491,273 +2554,273 @@ UnitPromotionIcons/Barrage_II_(Civ5) index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 1531, 1974 + xy: 234, 79 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 234, 79 + xy: 2018, 700 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 2018, 700 + xy: 1979, 598 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 1979, 598 + xy: 1981, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 1981, 1974 + xy: 106, 46 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 106, 46 + xy: 1425, 294 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1425, 294 + xy: 1447, 294 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 1447, 294 + xy: 2015, 1822 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 2015, 1822 + xy: 1966, 942 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 1966, 942 + xy: 852, 192 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 852, 192 + xy: 256, 79 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1531, 1952 + xy: 2018, 678 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 256, 79 + xy: 1979, 576 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 2018, 678 + xy: 1981, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 1979, 576 + xy: 2003, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 1981, 1952 + xy: 106, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 2003, 1974 + xy: 106, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 106, 24 + xy: 1425, 272 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 106, 2 + xy: 2015, 1800 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1425, 272 + xy: 1988, 942 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 2015, 1800 + xy: 852, 170 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1988, 942 + xy: 874, 192 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 852, 170 + xy: 278, 79 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 874, 192 + xy: 2018, 656 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 278, 79 + xy: 1979, 554 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 2018, 656 + xy: 2003, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1979, 554 + xy: 1425, 250 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 2003, 1952 + xy: 1447, 272 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1425, 250 + xy: 1469, 293 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1447, 272 + xy: 2015, 1778 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1469, 293 + xy: 852, 148 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 2015, 1778 + xy: 874, 170 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 852, 148 + xy: 896, 192 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 874, 170 + xy: 300, 79 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 896, 192 + xy: 2018, 634 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 300, 79 + xy: 1979, 532 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 2018, 634 + xy: 1425, 228 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 1979, 532 + xy: 1447, 250 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 1425, 228 + xy: 1469, 271 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 153ff70249..415de8a020 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index ce6cf56c73..d2cb774163 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -687,7 +687,7 @@ Japanese:"表示オプション" } - "Turns between autosaves:":{ + "Turns between autosaves":{ Italian:"Turni tra autosalvataggi" } @@ -721,7 +721,7 @@ Japanese:"隠す" } - "worked tiles":{ + "Worked tiles":{ Italian:"celle sfruttate" Russian:"обработанные клетки" French:"cases exploités" @@ -734,7 +734,7 @@ Japanese:"働いたタイル" } - "resources and improvements":{ + "Resources and improvements":{ Italian:"Risorse e miglioramenti" Russian:"ресурсы и улучшения" French:"ressources et améliorations" diff --git a/core/src/com/unciv/GameSettings.kt b/core/src/com/unciv/GameSettings.kt index 4c15eb615c..74f7cef0bc 100644 --- a/core/src/com/unciv/GameSettings.kt +++ b/core/src/com/unciv/GameSettings.kt @@ -11,6 +11,7 @@ class GameSettings { var hasCrashedRecently = false var soundEffectsVolume = 0.5f var turnsBetweenAutosaves = 1 + var tileSet:String = "Default" fun save(){ GameSaver().setGeneralSettings(this) diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 7af13b54d0..008ea1a7f2 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -1,7 +1,6 @@ package com.unciv.ui.tilegroups import com.badlogic.gdx.graphics.Color -import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.ui.Image @@ -18,7 +17,9 @@ import com.unciv.ui.utils.UnitGroup import com.unciv.ui.utils.center open class TileGroup(var tileInfo: TileInfo) : Group() { - protected val hexagon = ImageGetter.getImage("TerrainIcons/Hexagon.png") + val tileSetLocation = "TerrainIcons/"+UnCivGame.Current.settings.tileSet +"/" + + protected var hexagon :Image= ImageGetter.getImage("TerrainIcons/Hexagon.png") protected var baseTerrainImage: Image? = null protected var baseTerrain:String="" protected var terrainFeatureImage: Image? = null @@ -48,7 +49,9 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { init { val groupSize = 54f this.setSize(groupSize, groupSize) + addHexagon(groupSize) + addCircleImage() addFogImage(groupSize) addCrosshairImage() @@ -87,6 +90,10 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { } private fun addHexagon(groupSize: Float) { + val terrainTileLocation = tileSetLocation+tileInfo.baseTerrain + if(ImageGetter.imageExists(terrainTileLocation)) + hexagon = ImageGetter.getImage(terrainTileLocation) + val imageScale = groupSize * 1.5f / hexagon.width hexagon.setScale(imageScale) hexagon.setOrigin(Align.center) @@ -135,8 +142,8 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { return } - updateTerrainFeatureImage() updateTerrainBaseImage() + updateTerrainFeatureImage() updateCityImage() updateTileColor(isViewable) @@ -165,7 +172,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { baseTerrainImage=null } - val imagePath = "TerrainIcons/" + tileInfo.baseTerrain + val imagePath = tileSetLocation + tileInfo.baseTerrain + "Overlay" if (!ImageGetter.imageExists(imagePath)) return baseTerrainImage = ImageGetter.getImage(imagePath) baseTerrainImage!!.run { @@ -291,13 +298,10 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { } - override fun draw(batch: Batch?, parentAlpha: Float) { - super.draw(batch, parentAlpha) - } - private fun updateTileColor(isViewable: Boolean) { - hexagon.color = tileInfo.getBaseTerrain().getColor() if (!isViewable) hexagon.color = hexagon.color.lerp(Color.BLACK, 0.6f) + else if(ImageGetter.imageExists(tileSetLocation+tileInfo.baseTerrain)) return // no need to color it, it's already colored + else hexagon.color = tileInfo.getBaseTerrain().getColor() } private fun updateTerrainFeatureImage() { @@ -307,7 +311,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { terrainFeatureImage = null if(terrainFeature!=null) { - terrainFeatureImage = ImageGetter.getImage("TerrainIcons/$terrainFeature.png") + terrainFeatureImage = ImageGetter.getImage(tileSetLocation +"$terrainFeature"+"Overlay") addActor(terrainFeatureImage) terrainFeatureImage!!.run { setSize(30f, 30f) diff --git a/core/src/com/unciv/ui/worldscreen/TileGroupMap.kt b/core/src/com/unciv/ui/worldscreen/TileGroupMap.kt index c9f1eb1f38..5ec8b9cff8 100644 --- a/core/src/com/unciv/ui/worldscreen/TileGroupMap.kt +++ b/core/src/com/unciv/ui/worldscreen/TileGroupMap.kt @@ -28,6 +28,9 @@ class TileGroupMap(tileGroups:Collection, padding:Float): Group group.moveBy(-bottomX + padding, -bottomY + padding) } + for(group in tileGroups.sortedByDescending { it.tileInfo.position.x + it.tileInfo.position.y }) + group.toFront() + // there are tiles "below the zero", // so we zero out the starting position of the whole board so they will be displayed as well setSize(topX - bottomX + padding*2, topY - bottomY + padding*2) diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt index 31a495e0c5..54c87b8d89 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt @@ -5,7 +5,6 @@ import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.SelectBox import com.badlogic.gdx.scenes.scene2d.ui.Slider -import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener import com.badlogic.gdx.utils.Array import com.unciv.UnCivGame @@ -42,12 +41,14 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ settings.save() clear() - if (settings.showWorkedTiles) addButton("{Hide} {worked tiles}") { settings.showWorkedTiles = false; update() } - else addButton("{Show} {worked tiles}") { settings.showWorkedTiles = true; update() } + add("Worked tiles".toLabel()) + if (settings.showWorkedTiles) addButton("Hide") { settings.showWorkedTiles = false; update() } + else addButton("Show") { settings.showWorkedTiles = true; update() } + add("Resources and improvements".toLabel()) if (settings.showResourcesAndImprovements) - addButton("{Hide} {resources and improvements}") { settings.showResourcesAndImprovements = false; update() } - else addButton("{Show} {resources and improvements}") { settings.showResourcesAndImprovements = true; update() } + addButton("Hide") { settings.showResourcesAndImprovements = false; update() } + else addButton("Show") { settings.showResourcesAndImprovements = true; update() } addLanguageSelectBox() @@ -65,6 +66,8 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ } private fun addSoundEffectsVolumeSlider() { + add("Sound effects volume".tr()) + val soundEffectsVolumeSlider = Slider(0f, 1.0f, 0.1f, false, skin) soundEffectsVolumeSlider.value = UnCivGame.Current.settings.soundEffectsVolume soundEffectsVolumeSlider.addListener(object : ChangeListener() { @@ -74,11 +77,12 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ Sounds.play("click") } }) - add("Sound effects volume".tr()).row() add(soundEffectsVolumeSlider).row() } private fun addResolutionSelectBox() { + add("Resolution".toLabel()) + val resolutionSelectBox = SelectBox(skin) val resolutionArray = Array() resolutionArray.addAll("900x600", "1050x700", "1200x800", "1500x1000") @@ -98,16 +102,15 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ } private fun addAutosaveTurnsSelectBox() { + add("Turns between autosaves".toLabel()) + val autosaveTurnsSelectBox = SelectBox(skin) val autosaveTurnsArray = Array() autosaveTurnsArray.addAll(1,2,5,10) autosaveTurnsSelectBox.items = autosaveTurnsArray autosaveTurnsSelectBox.selected = UnCivGame.Current.settings.turnsBetweenAutosaves - val table = Table() - table.add("Turns between autosaves:".toLabel()) - table.add(autosaveTurnsSelectBox).pad(10f) - add(table).row() + add(autosaveTurnsSelectBox).pad(10f).row() autosaveTurnsSelectBox.addListener(object : ChangeListener() { override fun changed(event: ChangeEvent?, actor: Actor?) { @@ -119,6 +122,8 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ } private fun addLanguageSelectBox() { + add("Language".toLabel()) + val languageArray = Array() GameBasics.Translations.getLanguages().map { Language(it) }.sortedByDescending { it.percentComplete } .forEach { languageArray.add(it) }