curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 12:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

font updating to indev version

Browse Source
This commit is contained in:
minjaesong
2021-11-11 16:49:31 +09:00
parent 043cca4f2e
commit 435677a543
12 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/console/GetFaction.kt
View File

@@ -6,8 +6,6 @@ import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.console.EchoError
import net.torvald.terrarum.gameactors.Factionable
import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
import net.torvald.terrarumsansbitmap.gdx.GameFontBase
/**
* Created by minjaesong on 2016-02-17.

7
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt
View File

@@ -266,6 +266,9 @@ private class UIItemInputKeycap(
super.update(delta)
}
private fun isDiacritic(c: Int) = c in 0x300..0x36F || c in 0x1AB0..0x1AFF ||
c in 0x1DC0..0x1DFF || c in 0x20D0..0x20FF || c in 0xFE20..0xFE2F
override fun render(batch: SpriteBatch, camera: Camera) {
super.render(batch, camera)
@@ -320,11 +323,13 @@ private class UIItemInputKeycap(
parent.highlayer?.config?.symbols?.get(key) ?: parent.lowlayer.symbols[key]
else
parent.lowlayer.symbols[key]
val keysym =
var keysym =
(if (parent.shiftin && parent.altgrin && keysym0[3]?.isNotEmpty() == true) keysym0[3]
else if (parent.altgrin && keysym0[2]?.isNotEmpty() == true) keysym0[2]
else if (parent.shiftin && keysym0[1]?.isNotEmpty() == true) keysym0[1]
else keysym0[0]) ?: ""
if (isDiacritic(keysym[0].code))
keysym = "ɔ$keysym"
if (keysym[0].code == 0xA0)
batch.draw(labels.get(22, 2), (posX + (width - 20) / 2).toFloat(), posY + 4f)