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

More rankings & demographics screen icons (#7063)

Browse Source 
* Add icons to demographics/rankings screen

* Unused import

* Some simplification

* Reviews

* Undelete atlas
This commit is contained in:
OptimizedForDensity
2022-06-06 02:33:34 -04:00
committed by GitHub
parent e91c0ff212
commit 1312140793
3 changed files with 2181 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3790
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

27
core/src/com/unciv/ui/victoryscreen/RankingType.kt
View File

@ -1,14 +1,19 @@
package com.unciv.ui.victoryscreen package com.unciv.ui.victoryscreen
enum class RankingType { import com.badlogic.gdx.graphics.Color
Score, import com.badlogic.gdx.scenes.scene2d.ui.Image
Population, import com.unciv.ui.images.ImageGetter
Crop_Yield,
Production, enum class RankingType(val getImage: ()->Image?) {
Gold, // production, gold, happiness, and culture already have icons added when the line is `tr()`anslated
Territory, Score({ ImageGetter.getImage("OtherIcons/Cultured").apply { color = Color.FIREBRICK } }),
Force, Population({ ImageGetter.getStatIcon("Population") }),
Happiness, Crop_Yield({ ImageGetter.getStatIcon("Food") }),
Technologies, Production({ null }),
Culture Gold({ null }),
Territory({ ImageGetter.getImage("OtherIcons/Hexagon") }),
Force({ ImageGetter.getImage("OtherIcons/Shield") }),
Happiness({ null }),
Technologies({ ImageGetter.getStatIcon("Science") }),
Culture({ null })
} }

14
core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt
View File

@ -223,8 +223,12 @@ class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() {
for (category in RankingType.values()) { for (category in RankingType.values()) {
val headers = Table().apply { defaults().pad(5f) } val headers = Table().apply { defaults().pad(5f) }
headers.add(category.name.replace('_', ' ').toLabel()).row() val textAndIcon = Table().apply { defaults() }
headers.addSeparator().fillX() val columnImage = category.getImage()
if (columnImage != null) textAndIcon.add(columnImage).center().size(Constants.defaultFontSize.toFloat() * 0.75f).padRight(2f).padTop(-2f)
textAndIcon.add(category.name.replace('_', ' ').toLabel()).row()
headers.add(textAndIcon)
headers.addSeparator()
demographicsTable.add(headers) demographicsTable.add(headers)
} }
} }
@ -234,7 +238,11 @@ class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() {
for (category in RankingType.values()) { for (category in RankingType.values()) {
val column = Table().apply { defaults().pad(5f) } val column = Table().apply { defaults().pad(5f) }
column.add(category.name.replace('_' , ' ').toLabel()).row() val textAndIcon = Table().apply { defaults() }
val columnImage = category.getImage()
if (columnImage != null) textAndIcon.add(columnImage).size(Constants.defaultFontSize.toFloat() * 0.75f).padRight(2f).padTop(-2f)
textAndIcon.add(category.name.replace('_' , ' ').toLabel()).row()
column.add(textAndIcon)
column.addSeparator() column.addSeparator()
for (civ in majorCivs.sortedByDescending { it.getStatForRanking(category) }) { for (civ in majorCivs.sortedByDescending { it.getStatForRanking(category) }) {