diff --git a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt index fa809474e2..b5a9cd2e40 100644 --- a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt @@ -324,8 +324,8 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa val table=Table(skin).apply { defaults().pad(5f) } table.add("Name".tr()) table.add("Action".tr()) - table.add(Fonts.strength) - table.add(Fonts.rangedStrength) + table.add(Fonts.strength.toString()) + table.add(Fonts.rangedStrength.toString()) table.add(Fonts.movement.toString()) table.add("Closest city".tr()) table.add("Promotions".tr()) diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt index 108cbe55f0..7b914fafc2 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/utils/Fonts.kt @@ -56,7 +56,6 @@ class NativeBitmapFontData(val fontImplementation: NativeFontImplementation) : B override fun getGlyph(ch: Char): Glyph { var glyph: Glyph? = super.getGlyph(ch) if (glyph == null) { - if(ch == '\uD83D' || ch == '\uD83C' ) return Glyph() // This is the 'first character' of an emoji - empty space val charPixmap = getPixmapFromChar(ch) glyph = Glyph() @@ -84,9 +83,9 @@ class NativeBitmapFontData(val fontImplementation: NativeFontImplementation) : B private fun getPixmapFromChar(ch: Char): Pixmap { return when (ch) { - Fonts.strength[1] -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Strength").region) - Fonts.rangedStrength[1] -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/RangedStrength").region) - Fonts.range[1] -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Range").region) + Fonts.strength -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Strength").region) + Fonts.rangedStrength -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/RangedStrength").region) + Fonts.range -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Range").region) Fonts.movement -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Movement").region) Fonts.turn -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Turn").region) else -> fontImplementation.getCharPixmap(ch) @@ -138,14 +137,12 @@ object Fonts { return pixmap } - const val food = "\uD83C\uDF4E" - const val gold = "\uD83D\uDCB0" const val turn = '⏳' - const val strength = "\uD83D\uDCAA" - const val rangedStrength = "\uD83C\uDFF9" + const val strength = '†' + const val rangedStrength = '‡' const val movement = '➡' - const val range = "\uD83D\uDCCF" + const val range = '…' // const val production = '⚙' }