diff --git a/android/Images/EmojiIcons/Culture.png b/android/Images/EmojiIcons/Culture.png new file mode 100644 index 0000000000..d7f44beabb Binary files /dev/null and b/android/Images/EmojiIcons/Culture.png differ diff --git a/android/Images/EmojiIcons/Faith.png b/android/Images/EmojiIcons/Faith.png new file mode 100644 index 0000000000..720aebe932 Binary files /dev/null and b/android/Images/EmojiIcons/Faith.png differ diff --git a/android/Images/EmojiIcons/Food.png b/android/Images/EmojiIcons/Food.png new file mode 100644 index 0000000000..0601726bce Binary files /dev/null and b/android/Images/EmojiIcons/Food.png differ diff --git a/android/Images/EmojiIcons/Happiness.png b/android/Images/EmojiIcons/Happiness.png new file mode 100644 index 0000000000..a8bf02fa20 Binary files /dev/null and b/android/Images/EmojiIcons/Happiness.png differ diff --git a/android/Images/EmojiIcons/Science.png b/android/Images/EmojiIcons/Science.png new file mode 100644 index 0000000000..84631968ce Binary files /dev/null and b/android/Images/EmojiIcons/Science.png differ diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt index 391b2b06b4..66ef46b7cc 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/utils/Fonts.kt @@ -90,6 +90,11 @@ class NativeBitmapFontData(val fontImplementation: NativeFontImplementation) : B Fonts.turn -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Turn").region) Fonts.production -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Production").region) Fonts.gold -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Gold").region) + Fonts.food -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Food").region) + Fonts.science -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Science").region) + Fonts.culture -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Culture").region) + Fonts.faith -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Faith").region) + Fonts.happiness -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Happiness").region) else -> fontImplementation.getCharPixmap(ch) } } @@ -154,4 +159,9 @@ object Fonts { const val range = 'โ€ฆ' // U+2026 'horizontal ellipsis' const val production = 'โš™' // U+2699 'gear' const val gold = 'ยค' // U+00A4 'currency sign' + const val food = 'โ‚' // U+2042 'asterism' (to avoid ๐Ÿ U+1F34F 'green apple' needing 2 symbols in utf-16 and 4 in utf-8) + const val science = 'โพ' // U+237E 'bell symbol' (๐Ÿงช U+1F9EA 'test tube', ๐Ÿ”ฌ U+1F52C 'microscope') + const val culture = 'โ™ช' // U+266A 'eighth note' (๐ŸŽต U+1F3B5 'musical note') + const val happiness = 'โŒฃ' // U+2323 'smile' (๐Ÿ˜€ U+1F600 'grinning face') + const val faith = 'โ˜ฎ' // U+262E 'peace symbol' (๐Ÿ•Š U+1F54A 'dove of peace') }