curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 19:14: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

2
src/net/torvald/terrarum/console/Authenticator.kt
View File

@@ -22,7 +22,7 @@ class Authenticator : ConsoleCommand {
Echo().execute(msg)
println("[Authenticator] " + msg)
a = !a
(Terrarum.game.consoleHandler.UI as ConsoleWindow).reset()
(Terrarum.ingame.consoleHandler.UI as ConsoleWindow).reset()
}
else {
printUsage() // thou shalt not pass!

2
src/net/torvald/terrarum/console/CodexEdictis.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.StateGame
import net.torvald.terrarum.StateInGame
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.ui.ConsoleWindow

2
src/net/torvald/terrarum/console/CommandDict.kt
View File

@@ -29,7 +29,7 @@ object CommandDict {
Pair("exportav", ExportAV()),
Pair("setgl", SetGlobalLightLevel()),
Pair("getfaction", GetFactioning()),
Pair("auth", Terrarum.game.auth),
Pair("auth", Terrarum.ingame.auth),
Pair("spawnball", SpawnPhysTestBall()),
Pair("batch", Batch()),
Pair("settime", SetTime()),

2
src/net/torvald/terrarum/console/CommandInterpreter.kt
View File

@@ -43,7 +43,7 @@ object CommandInterpreter {
commandObj = CommandDict.getCommand(single_command.name.toLowerCase())
}
else {
if (Terrarum.game.auth.b()) {
if (Terrarum.ingame.auth.b()) {
commandObj = CommandDict.getCommand(
single_command.name.toLowerCase())
}

4
src/net/torvald/terrarum/console/Echo.kt
View File

@@ -19,13 +19,13 @@ internal class Echo : ConsoleCommand {
val sb = StringBuilder()
for (ch in single_line) {
if (ch == '\n') {
(Terrarum.game.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
(Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
sb.delete(0, sb.length - 1)
}
else
sb.append(ch)
}
(Terrarum.game.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
(Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
}
override fun printUsage() {

2
src/net/torvald/terrarum/console/Error.kt
View File

@@ -14,7 +14,7 @@ class Error : ConsoleCommand {
}
fun execute(single_line: String) {
(Terrarum.game.consoleHandler.UI as ConsoleWindow).sendMessage("${GameFontBase.colToCode["r"]}$single_line")
(Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage("${GameFontBase.colToCode["r"]}$single_line")
}
override fun printUsage() {

2
src/net/torvald/terrarum/console/ExportAV.kt
View File

@@ -13,7 +13,7 @@ class ExportAV : ConsoleCommand {
if (args.size == 2) {
try {
JsonWriter.writeToFile(
Terrarum.game.player.actorValue,
Terrarum.ingame.player.actorValue,
Terrarum.defaultDir + "/Exports/" + args[1] + ".json")
Echo().execute("ExportAV: exported to " + args[1] + ".json")

6
src/net/torvald/terrarum/console/ExportMap.kt
View File

@@ -22,10 +22,10 @@ class ExportMap : ConsoleCommand {
if (args.size == 2) {
buildColorTable()
var mapData = ByteArray(Terrarum.game.map.width * Terrarum.game.map.height * 3)
var mapData = ByteArray(Terrarum.ingame.map.width * Terrarum.ingame.map.height * 3)
var mapDataPointer = 0
for (tile in Terrarum.game.map.terrainIterator()) {
for (tile in Terrarum.ingame.map.terrainIterator()) {
val colArray = (colorTable as Map<Int, Col4096>)
.getOrElse(tile, { Col4096(0xFFF) }).toByteArray()
@@ -44,7 +44,7 @@ class ExportMap : ConsoleCommand {
try {
RasterWriter.writePNG_RGB(
Terrarum.game.map.width, Terrarum.game.map.height, mapData, dir + args[1] + ".png")
Terrarum.ingame.map.width, Terrarum.ingame.map.height, mapData, dir + args[1] + ".png")
Echo().execute("ExportMap: exported to " + args[1] + ".png")
}

20
src/net/torvald/terrarum/console/GetAV.kt
View File

@@ -23,7 +23,7 @@ class GetAV : ConsoleCommand {
try {
if (args.size == 1) {
// print all actorvalue of player
val av = Terrarum.game.player.actorValue
val av = Terrarum.ingame.player.actorValue
val keyset = av.keySet
echo.execute("$ccW== ActorValue list for ${ccY}player $ccW==")
@@ -41,19 +41,19 @@ class GetAV : ConsoleCommand {
if (!args[1].isNum()) { // args[1] is ActorValue name
echo.execute("${ccW}player.$ccM${args[1]} $ccW= " +
ccG +
Terrarum.game.player.actorValue[args[1]] +
Terrarum.ingame.player.actorValue[args[1]] +
" $ccO" +
Terrarum.game.player.actorValue[args[1]]!!.javaClass.simpleName
Terrarum.ingame.player.actorValue[args[1]]!!.javaClass.simpleName
)
println("[GetAV] player.${args[1]} = " +
Terrarum.game.player.actorValue[args[1]] +
Terrarum.ingame.player.actorValue[args[1]] +
" " +
Terrarum.game.player.actorValue[args[1]]!!.javaClass.simpleName
Terrarum.ingame.player.actorValue[args[1]]!!.javaClass.simpleName
)
}
else {
// args[1] is actor ID
val actor = Terrarum.game.getActorByID(args[1].toInt())
val actor = Terrarum.ingame.getActorByID(args[1].toInt())
val av = actor.actorValue
val keyset = av.keySet
@@ -75,14 +75,14 @@ class GetAV : ConsoleCommand {
val id = args[1].toInt()
val av = args[2]
echo.execute("$ccW$id.$ccM$av $ccW= $ccG" +
Terrarum.game.getActorByID(id).actorValue[av] +
Terrarum.ingame.getActorByID(id).actorValue[av] +
" $ccO" +
Terrarum.game.getActorByID(id).actorValue[av]!!.javaClass.simpleName
Terrarum.ingame.getActorByID(id).actorValue[av]!!.javaClass.simpleName
)
println("id.av = " +
Terrarum.game.getActorByID(id).actorValue[av] +
Terrarum.ingame.getActorByID(id).actorValue[av] +
" " +
Terrarum.game.getActorByID(id).actorValue[av]!!.javaClass.simpleName
Terrarum.ingame.getActorByID(id).actorValue[av]!!.javaClass.simpleName
)
}
}

2
src/net/torvald/terrarum/console/GetFactioning.kt
View File

@@ -25,7 +25,7 @@ class GetFactioning : ConsoleCommand {
val error = Error()
fun printOutFactioning(id: Int) {
val a = Terrarum.game.getActorByID(id)
val a = Terrarum.ingame.getActorByID(id)
if (a is Factionable) {
echo.execute("$ccW== Faction assignment for $ccY${if (id == Player.PLAYER_REF_ID) "player" else id.toString()} $ccW==")
println("[GetFactioning] == Faction assignment for '${if (id == Player.PLAYER_REF_ID) "player" else id.toString()}' ==")

2
src/net/torvald/terrarum/console/GetTime.kt
View File

@@ -8,7 +8,7 @@ import net.torvald.terrarum.Terrarum
class GetTime : ConsoleCommand {
override fun execute(args: Array<String>) {
val echo = Echo()
val worldTime = Terrarum.game.map.worldTime
val worldTime = Terrarum.ingame.map.worldTime
echo.execute("Year ${worldTime.years}, Month ${worldTime.months}, " +
"Day ${worldTime.days} (${worldTime.getDayNameShort()}), " +
"${worldTime.getFormattedTime()}"

2
src/net/torvald/terrarum/console/GsonTest.kt
View File

@@ -14,7 +14,7 @@ import java.io.IOException
class GsonTest : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2) {
val avelem = Gson().toJsonTree(Terrarum.game.player)
val avelem = Gson().toJsonTree(Terrarum.ingame.player)
val jsonString = avelem.toString()

2
src/net/torvald/terrarum/console/Seed.kt
View File

@@ -13,7 +13,7 @@ class Seed : ConsoleCommand {
// tsalagi
override fun execute(args: Array<String>) {
Echo().execute("${ccY}Map$ccW: $ccG${Terrarum.game.map.generatorSeed}")
Echo().execute("${ccY}Map$ccW: $ccG${Terrarum.ingame.map.generatorSeed}")
// TODO display randomiser seed
}

6
src/net/torvald/terrarum/console/SetAV.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.StateGame
import net.torvald.terrarum.StateInGame
import net.torvald.terrarum.Terrarum
/**
@@ -70,7 +70,7 @@ internal class SetAV : ConsoleCommand {
return
}
Terrarum.game.player.actorValue[args[1]] = `val`
Terrarum.ingame.player.actorValue[args[1]] = `val`
echo.execute("${ccW}Set $ccM${args[1]} ${ccW}for ${ccY}player ${ccW}to $ccG$`val`")
println("[SetAV] set ActorValue '${args[1]}' for player to '$`val`'.")
}
@@ -78,7 +78,7 @@ internal class SetAV : ConsoleCommand {
try {
val id = args[1].toInt()
val `val` = parseAVInput(args[3])
val actor = Terrarum.game.getActorByID(id)
val actor = Terrarum.ingame.getActorByID(id)
// check if av is number
if (args[2].isNum()) {

2
src/net/torvald/terrarum/console/SetBulletin.kt
View File

@@ -25,7 +25,7 @@ class SetBulletin : ConsoleCommand {
* @param message real message
*/
fun send(message: Array<String>) {
Terrarum.game.sendNotification(message)
Terrarum.ingame.sendNotification(message)
println("sent notifinator")
}
}

4
src/net/torvald/terrarum/console/SetGlobalLightLevel.kt
View File

@@ -15,7 +15,7 @@ class SetGlobalLightLevel : ConsoleCommand {
val b = args[3].toInt()
val GL = LightmapRenderer.constructRGBFromInt(r, g, b)
Terrarum.game.map.globalLight = GL
Terrarum.ingame.map.globalLight = GL
}
catch (e: NumberFormatException) {
Echo().execute("Wrong number input.")
@@ -33,7 +33,7 @@ class SetGlobalLightLevel : ConsoleCommand {
Echo().execute("Range: 0-" + (LightmapRenderer.COLOUR_RANGE_SIZE - 1))
}
else {
Terrarum.game.map.globalLight = GL
Terrarum.ingame.map.globalLight = GL
}
}
catch (e: NumberFormatException) {

6
src/net/torvald/terrarum/console/SetTime.kt
View File

@@ -11,10 +11,10 @@ class SetTime : ConsoleCommand {
if (args.size == 2) {
val timeToSet = WorldTime.parseTime(args[1])
Terrarum.game.map.worldTime.setTime(timeToSet)
Terrarum.ingame.map.worldTime.setTime(timeToSet)
Echo().execute("Set time to ${Terrarum.game.map.worldTime.elapsedSeconds()} " +
"(${Terrarum.game.map.worldTime.hours}h${formatMin(Terrarum.game.map.worldTime.minutes)})")
Echo().execute("Set time to ${Terrarum.ingame.map.worldTime.elapsedSeconds()} " +
"(${Terrarum.ingame.map.worldTime.hours}h${formatMin(Terrarum.ingame.map.worldTime.minutes)})")
}
else {
printUsage()

6
src/net/torvald/terrarum/console/SetTimeDelta.kt
View File

@@ -14,11 +14,11 @@ class SetTimeDelta : ConsoleCommand {
if (args[1].toInt() > HARD_LIMIT)
Error().execute("Delta too large -- acceptable delta is 0-60.")
Terrarum.game.map.worldTime.setTimeDelta(args[1].toInt())
if (Terrarum.game.map.worldTime.timeDelta == 0)
Terrarum.ingame.map.worldTime.setTimeDelta(args[1].toInt())
if (Terrarum.ingame.map.worldTime.timeDelta == 0)
Echo().execute("時間よ止まれ！ザ・ワルド！！")
else
Echo().execute("Set time delta to ${Terrarum.game.map.worldTime.timeDelta}")
Echo().execute("Set time delta to ${Terrarum.ingame.map.worldTime.timeDelta}")
}
else {
printUsage()

2
src/net/torvald/terrarum/console/SpawnPhysTestBall.kt
View File

@@ -25,7 +25,7 @@ class SpawnPhysTestBall : ConsoleCommand {
)
ball.elasticity = elasticity
Terrarum.game.addActor(ball)
Terrarum.ingame.addActor(ball)
}
else {
printUsage()

4
src/net/torvald/terrarum/console/TeleportPlayer.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.StateGame
import net.torvald.terrarum.StateInGame
import net.torvald.terrarum.mapdrawer.MapDrawer
import net.torvald.terrarum.Terrarum
@@ -26,7 +26,7 @@ class TeleportPlayer : ConsoleCommand {
return
}
Terrarum.game.player.setPosition(x.toDouble(), y.toDouble())
Terrarum.ingame.player.setPosition(x.toDouble(), y.toDouble())
}
}

6
src/net/torvald/terrarum/console/ToggleNoClip.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.StateGame
import net.torvald.terrarum.StateInGame
import net.torvald.terrarum.Terrarum
/**
@@ -8,9 +8,9 @@ import net.torvald.terrarum.Terrarum
*/
class ToggleNoClip : ConsoleCommand {
override fun execute(args: Array<String>) {
val status = Terrarum.game.player.isNoClip()
val status = Terrarum.ingame.player.isNoClip()
Terrarum.game.player.setNoClip(!status)
Terrarum.ingame.player.setNoClip(!status)
Echo().execute("Set no-clip status to " + (!status).toString())
}

10
src/net/torvald/terrarum/console/Zoom.kt
View File

@@ -18,14 +18,14 @@ class Zoom : ConsoleCommand {
return
}
if (zoom < Terrarum.game.ZOOM_MIN) {
zoom = Terrarum.game.ZOOM_MIN
if (zoom < Terrarum.ingame.ZOOM_MIN) {
zoom = Terrarum.ingame.ZOOM_MIN
}
else if (zoom > Terrarum.game.ZOOM_MAX) {
zoom = Terrarum.game.ZOOM_MAX
else if (zoom > Terrarum.ingame.ZOOM_MAX) {
zoom = Terrarum.ingame.ZOOM_MAX
}
Terrarum.game.screenZoom = zoom
Terrarum.ingame.screenZoom = zoom
System.gc()