From e8876e90bf03706e1de2819dc439beb97dfc1d50 Mon Sep 17 00:00:00 2001 From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Date: Mon, 2 Aug 2021 22:35:58 +0200 Subject: [PATCH] All stats available as text characters (#4734) --- android/Images/EmojiIcons/Culture.png | Bin 0 -> 1408 bytes android/Images/EmojiIcons/Faith.png | Bin 0 -> 1920 bytes android/Images/EmojiIcons/Food.png | Bin 0 -> 1799 bytes android/Images/EmojiIcons/Happiness.png | Bin 0 -> 2284 bytes android/Images/EmojiIcons/Science.png | Bin 0 -> 1842 bytes core/src/com/unciv/ui/utils/Fonts.kt | 10 ++++++++++ 6 files changed, 10 insertions(+) create mode 100644 android/Images/EmojiIcons/Culture.png create mode 100644 android/Images/EmojiIcons/Faith.png create mode 100644 android/Images/EmojiIcons/Food.png create mode 100644 android/Images/EmojiIcons/Happiness.png create mode 100644 android/Images/EmojiIcons/Science.png diff --git a/android/Images/EmojiIcons/Culture.png b/android/Images/EmojiIcons/Culture.png new file mode 100644 index 0000000000000000000000000000000000000000..d7f44beabb6096f300fe90a11b3bcf45fb721ae0 GIT binary patch literal 1408 zcmV-`1%LX9P)=cKDB{4ASS}EzeKX^kq!6;7gb7eU}nLc*}X84=F*Mr5XJMEXP8 zu1Z*y6F_a5;&xhuA4TZvjmT)piS&oGOO@|bIR^O3oP?G{_*sNgy%C9(jELij)2e(9 zc-?%Xsw7ggq%$chOg{mCH6jIF084~(B7E(}Glt8U2s@tey0s#k&2T4vg^R!c#P#7z zq|%Fpdc~{CF;&9-A+0HjNPkF8RgOC`QP6c#AZ;x%{d|u2NQ|e`W2kDOWPGZeP~~`k zNX=CfQRq=PSxjIHusEOOZu~k6$?4T>QLAuLp=VV@oX0NYq}U=~T_GMD;ZFPt$))+i zH&D7!LVY0(6z&makMr1-o0~TWxE1@8#pGDb(Z z*L0N>yBym_T@gXq?^LlRfyZM~9jvE1SkIQm?L2P3$GwM99*sQauheg3vo_mW_u(}w z@@=)zvF#UkL|*h0r78wrdd6dTs0!4vqx}Fa_1n1LG|26{H@G(V2Y%lM-f7;2$cit5 z2U$K1=ZcZeau!mC;h}m%Jw08AIQ0H!1cCvEV^>*7&bT>|&O*{}$6B@OVtxo8AQk%TBNE zKyv(lX06Fo`ZrP?+(b5;&9`*M^*aK@fqK^&Nfj%TB5kF}s*T6+;xSAoSGo5}Yts&V zUVpx&arZ=CNHz!E7?8G-j6c24$oMc*GtaQ?3_hQqy6Og=O-;IPK?NaLS?y-w1NTIf zDDXwT5@pFsGW_5&L$|N7Fqd%50Y!PlcsXvM?bzlrMuY)JcUs{(WqJJ1JqDv!S(r;8 z4hde;DGTNt+uRXx6u=dmek+q^^vT~O7Lw&O{B^_}+gy8O!chS2TsvlLi-pBm*Z02^ z*UGVJ!Znd_L@eMuFqUgq)8l1BFn?WXh(V>ls!#=GIgA14bLqs!3dcAk!i8L3@tPI1 zHg2af;Ln+46{T@Y1I?SZVu(?!H!dIy72N8EBa%RfAj{uL5rej-o$Pz>0|G%m`U)L& z{u*2AIk5W^YO9)xZTg21A}fj9W*!A33Y<|my_}Nbs|e8D`4LrtS{_c^<@wZ8EXyJg z2+&x+nQg6mXsB(&FpBC3rUlNx@@dz#(&z|u->ULeE^SLSOWI12N-tt(Gk8rO{)(W} zC>0eOOCo%a@J%?6s9iS6v;-)vWD3w5kx>y&iEs{BS_2YG4vAB475V?)SmCvpDeIsI z;cU2^gPvE&lx_3|M8j(_dV5Wg{BI9K-yrlt#(b;e>2<7Q9qU-fTfx7ABsI0IELx@j O0000j9P)OOIx5!pirRYN2zGQF@8uib<5%i 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 literal 0 HcmV?d00001 diff --git a/android/Images/EmojiIcons/Happiness.png b/android/Images/EmojiIcons/Happiness.png new file mode 100644 index 0000000000000000000000000000000000000000..a8bf02fa20e2a4d639150dfc651f09cd137899e5 GIT binary patch literal 2284 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 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') }