diff --git a/assets/graphics/fonts/23-seg_red.png b/assets/graphics/fonts/23-seg_red.png deleted file mode 100644 index af1d247eb..000000000 Binary files a/assets/graphics/fonts/23-seg_red.png and /dev/null differ diff --git a/assets/graphics/fonts/24-seg_red.png b/assets/graphics/fonts/24-seg_red.png new file mode 100644 index 000000000..3e5df2a80 Binary files /dev/null and b/assets/graphics/fonts/24-seg_red.png differ diff --git a/src/net/torvald/terrarum/StateFontTester.kt b/src/net/torvald/terrarum/StateFontTester.kt index e11d65244..a34bc3f67 100644 --- a/src/net/torvald/terrarum/StateFontTester.kt +++ b/src/net/torvald/terrarum/StateFontTester.kt @@ -2,9 +2,7 @@ package net.torvald.terrarum import net.torvald.imagefont.GameFontWhite import net.torvald.terrarum.langpack.Lang -import org.newdawn.slick.Font -import org.newdawn.slick.GameContainer -import org.newdawn.slick.Graphics +import org.newdawn.slick.* import org.newdawn.slick.state.BasicGameState import org.newdawn.slick.state.StateBasedGame @@ -16,10 +14,17 @@ class StateFontTester : BasicGameState() { lateinit var canvas: Graphics + lateinit var segfont: Font + override fun init(gc: GameContainer, game: StateBasedGame) { canvas = Graphics(1024, 1024) Terrarum.gameLocale = "fiFI" + + segfont = SpriteSheetFont( + SpriteSheet("./assets/graphics/fonts/24-seg_red.png", 22, 31), + ' ' + ) } override fun update(gc: GameContainer, game: StateBasedGame, delta: Int) { @@ -27,9 +32,9 @@ class StateFontTester : BasicGameState() { } override fun render(gc: GameContainer, game: StateBasedGame, g: Graphics) { - g.font = Terrarum.fontGame + //g.font = Terrarum.fontGame - val text = arrayOf( + /*val text = arrayOf( Lang["APP_WARNING_HEALTH_AND_SAFETY"], "", "90’ 10’ 20” 50 cm", @@ -42,12 +47,14 @@ class StateFontTester : BasicGameState() { for (i in 0..text.size - 1) { g.drawString(text[i], 10f, 10f + (g.font.lineHeight * i)) - } + }*/ - g.font = Terrarum.fontSmallNumbers + //g.font = Terrarum.fontSmallNumbers + g.font = segfont - g.drawString("The true master needs but one channel", 0f, 64f) - g.drawString("Press a key to start", 0f, 64f + 16f) + val line = """print("Lua is copyrighted (C) 1994-2013 Lua.org, PUC-Rio")""" + + g.drawString(line, 10f, 10f) } override fun getID(): Int = Terrarum.STATE_ID_TEST_FONT