AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed all prebuilt font characters to single-char characters - this is in the vague hope that it will solve the Mystery of the Disappearing C's

Browse Source
This commit is contained in:
Yair Morgenstern 2020-10-20 19:41:36 +03:00
parent 940fe07a0a
commit c7e0b57a5d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt
View File

@ -324,8 +324,8 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
val table=Table(skin).apply { defaults().pad(5f) } val table=Table(skin).apply { defaults().pad(5f) }
table.add("Name".tr()) table.add("Name".tr())
table.add("Action".tr()) table.add("Action".tr())
table.add(Fonts.strength) table.add(Fonts.strength.toString())
table.add(Fonts.rangedStrength) table.add(Fonts.rangedStrength.toString())
table.add(Fonts.movement.toString()) table.add(Fonts.movement.toString())
table.add("Closest city".tr()) table.add("Closest city".tr())
table.add("Promotions".tr()) table.add("Promotions".tr())

15
core/src/com/unciv/ui/utils/Fonts.kt
View File

@ -56,7 +56,6 @@ class NativeBitmapFontData(val fontImplementation: NativeFontImplementation) : B
override fun getGlyph(ch: Char): Glyph { override fun getGlyph(ch: Char): Glyph {
var glyph: Glyph? = super.getGlyph(ch) var glyph: Glyph? = super.getGlyph(ch)
if (glyph == null) { if (glyph == null) {
if(ch == '\uD83D' || ch == '\uD83C' ) return Glyph() // This is the 'first character' of an emoji - empty space
val charPixmap = getPixmapFromChar(ch) val charPixmap = getPixmapFromChar(ch)
glyph = Glyph() glyph = Glyph()
@ -84,9 +83,9 @@ class NativeBitmapFontData(val fontImplementation: NativeFontImplementation) : B
private fun getPixmapFromChar(ch: Char): Pixmap { private fun getPixmapFromChar(ch: Char): Pixmap {
return when (ch) { return when (ch) {
Fonts.strength[1] -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Strength").region) Fonts.strength -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Strength").region)
Fonts.rangedStrength[1] -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/RangedStrength").region) Fonts.rangedStrength -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/RangedStrength").region)
Fonts.range[1] -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Range").region) Fonts.range -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Range").region)
Fonts.movement -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Movement").region) Fonts.movement -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("StatIcons/Movement").region)
Fonts.turn -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Turn").region) Fonts.turn -> Fonts.extractPixmapFromTextureRegion(ImageGetter.getDrawable("EmojiIcons/Turn").region)
else -> fontImplementation.getCharPixmap(ch) else -> fontImplementation.getCharPixmap(ch)
@ -138,14 +137,12 @@ object Fonts {
return pixmap return pixmap
} }
const val food = "\uD83C\uDF4E"
const val gold = "\uD83D\uDCB0"
const val turn = '⏳' const val turn = '⏳'
const val strength = "\uD83D\uDCAA" const val strength = '†'
const val rangedStrength = "\uD83C\uDFF9" const val rangedStrength = '‡'
const val movement = '➡' const val movement = '➡'
const val range = "\uD83D\uDCCF" const val range = '…'
// const val production = '⚙' // const val production = '⚙'
} }