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

Removed more double icons

Browse Source
This commit is contained in:
Yair Morgenstern
2023-04-19 11:32:00 +03:00
parent 4d63f0542f
commit 85c0f71f2a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/trade/TradeOffer.kt
View File

@ -44,7 +44,7 @@ data class TradeOffer(val name: String, val type: TradeType, var amount: Int = 1
city?.run { "{$name} (${population.population})" } ?: "Non-existent city" city?.run { "{$name} (${population.population})" } ?: "Non-existent city"
} }
else -> name else -> name
}.tr() }.tr(hideIcons = true)
if (type.numberType == TradeTypeNumberType.Simple || type.numberType == TradeTypeNumberType.Gold) offerText += " ($amount)" if (type.numberType == TradeTypeNumberType.Simple || type.numberType == TradeTypeNumberType.Gold) offerText += " ($amount)"
else if (name == Constants.researchAgreement) offerText += " (-$amount${Fonts.gold})" else if (name == Constants.researchAgreement) offerText += " (-$amount${Fonts.gold})"

2
core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt
View File

@ -300,7 +300,7 @@ class GlobalPoliticsOverviewTable (
private fun getCivMiniTable(civInfo: Civilization): Table { private fun getCivMiniTable(civInfo: Civilization): Table {
val table = Table() val table = Table()
table.add(ImageGetter.getNationPortrait(civInfo.nation, 25f)).pad(5f) table.add(ImageGetter.getNationPortrait(civInfo.nation, 25f)).pad(5f)
table.add(civInfo.civName.toLabel()).left().padRight(10f) table.add(civInfo.civName.toLabel(hideIcons = true)).left().padRight(10f)
table.touchable = Touchable.enabled table.touchable = Touchable.enabled
table.onClick { table.onClick {
if (civInfo.isDefeated() || viewingPlayer.isSpectator() || civInfo == viewingPlayer) return@onClick if (civInfo.isDefeated() || viewingPlayer.isSpectator() || civInfo == viewingPlayer) return@onClick