From 3160ecea1666efa6e8b35e1a03a812a316a07555 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sun, 23 Oct 2016 00:47:50 +0900 Subject: [PATCH] new segment font Former-commit-id: 8b04af556a047db26c58e649ec0f7878a04459a0 Former-commit-id: fb222e31c73ec26b365b338f02c15beb0d0d11f6 --- assets/graphics/fonts/23-seg_red.png | Bin 3669 -> 0 bytes assets/graphics/fonts/24-seg_red.png | Bin 0 -> 6660 bytes src/net/torvald/terrarum/StateFontTester.kt | 25 +++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 assets/graphics/fonts/23-seg_red.png create mode 100644 assets/graphics/fonts/24-seg_red.png diff --git a/assets/graphics/fonts/23-seg_red.png b/assets/graphics/fonts/23-seg_red.png deleted file mode 100644 index af1d247ebb6d3df3e4f6065fce0a0732bc88f974..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3669 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 NaCOF^YMc(G{u{JXhi3o) diff --git a/assets/graphics/fonts/24-seg_red.png b/assets/graphics/fonts/24-seg_red.png new file mode 100644 index 0000000000000000000000000000000000000000..3e5df2a80d667b5da1b5da46b487fe99b0c53214 GIT binary patch literal 6660 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 literal 0 HcmV?d00001 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