keycap font, edit on Thai font, actor can now flagged to despawn, draft for projectile "actor"

Former-commit-id: 5a46366ac1680f040fe6e5ace742b71a86982efa
Former-commit-id: 30e481f10cc8c09d4fc4ff1f52a4a45d91e3ab2d
This commit is contained in:
Song Minjae
2016-08-31 01:05:35 +09:00
parent 720df532aa
commit 6e51b0c751
59 changed files with 288 additions and 117 deletions

View File

@@ -32,7 +32,7 @@ class StateSplash : BasicGameState() {
var opacity = 0f
val fadeTime = 500
var fadeTimer = 0
var fadeTimer = -1
var anykey_hit = false
@@ -67,13 +67,14 @@ class StateSplash : BasicGameState() {
override fun update(container: GameContainer, game: StateBasedGame, delta: Int) {
// next splash or load next scene
if (anykey_hit && opened) {
if (anykey_hit && opacity < 0.0001f) {
game.enterState(Terrarum.STATE_ID_GAME)
}
// fade-in
if (delta < deltathre) {
init = true
fadeTimer += delta
if (opacity < 1f && !anykey_hit) {
opacity = FastMath.interpolateLinear(
@@ -93,11 +94,9 @@ class StateSplash : BasicGameState() {
}
// auto dismiss
if (opened && fadeTimer >= auto_dismiss)
//doAnykeyThingy()
fadeTimer += delta
println(fadeTimer)
if (opened && fadeTimer >= auto_dismiss) {
doAnykeyThingy()
}
}
override fun getID(): Int = Terrarum.STATE_ID_SPLASH
@@ -111,7 +110,7 @@ class StateSplash : BasicGameState() {
Typography.printCentered(thisG, Lang["APP_WARNING_HEALTH_AND_SAFETY"],
thisG.font.lineHeight * 2)
Typography.printCentered(thisG, Lang["MENU_LABEL_PRESS_ANYKEY_CONTINUE"],
Typography.printCentered(thisG, Lang["MENU_LABEL_PRESS_ANYKEY"],
Terrarum.HEIGHT - thisG.font.lineHeight.times(3))
imageGallery.render(container, thisG)
@@ -119,13 +118,6 @@ class StateSplash : BasicGameState() {
g.drawImage(fadeSheet, 0f, 0f, Color(1f, 1f, 1f, opacity))
}
private fun knowYourPlace(i: Int): Int {
val gutter = (imageBoardHeight - virtualImageHeight.times(pictogramCollection.size)).toFloat().div(
pictogramCollection.size + 1f
)
return (gutter * i.plus(1) + virtualImageHeight * i).roundInt()
}
override fun keyPressed(key: Int, c: Char) {
doAnykeyThingy()
}