From 85c0f71f2a52918b99a37f7af4c642adee34d8aa Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 19 Apr 2023 11:32:00 +0300 Subject: [PATCH] Removed more double icons --- core/src/com/unciv/logic/trade/TradeOffer.kt | 2 +- .../ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/trade/TradeOffer.kt b/core/src/com/unciv/logic/trade/TradeOffer.kt index c1287bbb6b..01d58ae813 100644 --- a/core/src/com/unciv/logic/trade/TradeOffer.kt +++ b/core/src/com/unciv/logic/trade/TradeOffer.kt @@ -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" } else -> name - }.tr() + }.tr(hideIcons = true) if (type.numberType == TradeTypeNumberType.Simple || type.numberType == TradeTypeNumberType.Gold) offerText += " ($amount)" else if (name == Constants.researchAgreement) offerText += " (-$amount${Fonts.gold})" diff --git a/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt index e7c1cebbbb..f03d74530a 100644 --- a/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt @@ -300,7 +300,7 @@ class GlobalPoliticsOverviewTable ( private fun getCivMiniTable(civInfo: Civilization): Table { val table = Table() 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.onClick { if (civInfo.isDefeated() || viewingPlayer.isSpectator() || civInfo == viewingPlayer) return@onClick