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

monitor adjustment screen, changed "calibrate" to "adjust" (NOT the STRING_ID of langpack)

Browse Source 
Former-commit-id: ffae41e5876e54e2e0aedb5a93092db8e8f75d01
Former-commit-id: 65883b385a205d47b76c60f18a91186c2be922b2
This commit is contained in:
Song Minjae
2016-07-06 20:17:51 +09:00
parent 4843819d84
commit 186d6a8cb9
53 changed files with 425 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -47,6 +47,8 @@ constructor(gamename: String) : StateBasedGame(gamename) {
@Throws(SlickException::class)
override fun initStatesList(gc: GameContainer) {
gc.input.enableKeyRepeat()
gameFont = GameFontWhite()
smallNumbers = TinyAlphNum()
@@ -57,14 +59,20 @@ constructor(gamename: String) : StateBasedGame(gamename) {
}
}
appgc.input.enableKeyRepeat()
game = StateGame()
addState(game)
//game = StateGame()
//addState(game)
addState(StateMonitorCheck())
}
companion object {
val sysLang: String
get() {
val lan = System.getProperty("user.language")
val country = System.getProperty("user.country")
return lan + country
}
/**
* To be used with physics simulator
*/
@@ -86,7 +94,7 @@ constructor(gamename: String) : StateBasedGame(gamename) {
var VSYNC = true
val VSYNC_TRIGGER_THRESHOLD = 56
lateinit var game: StateGame
lateinit var ingame: StateInGame
lateinit var gameConfig: GameConfig
lateinit var OSName: String
@@ -101,7 +109,7 @@ constructor(gamename: String) : StateBasedGame(gamename) {
private set
private val localeSimple = arrayOf("de", "en", "es", "it")
var gameLocale = "en" // locale override
var gameLocale = "####" // locale override
set(value) {
if (localeSimple.contains(value.substring(0..1)))
field = value.substring(0..1)
@@ -114,8 +122,14 @@ constructor(gamename: String) : StateBasedGame(gamename) {
lateinit var smallNumbers: Font
private set
val SCENE_ID_HOME = 1
val SCENE_ID_GAME = 3
// 0x0 - 0xF: Game-related
// 0x10 - 0x1F: Config
// 0x100 and onward: unit tests for dev
val SCENE_ID_HOME = 0x1
val SCENE_ID_GAME = 0x3
val SCENE_ID_CONFIG_CALIBRATE = 0x11
val SCENE_ID_TEST_FONT = 0x100
var hasController = false
val CONTROLLER_DEADZONE = 0.1f
@@ -258,20 +272,6 @@ constructor(gamename: String) : StateBasedGame(gamename) {
}
// exception handling
val sysLang: String
get() {
val lan = System.getProperty("user.language")
var country = System.getProperty("user.country")
if (lan == "en") country = "US"
else if (lan == "fr") country = "FR"
else if (lan == "de") country = "DE"
else if (lan == "ko") country = "KR"
return lan + country
}
/**
* Return config from config set. If the config does not exist, default value will be returned.
* @param key