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

LibGDX, here I am.

Browse Source
This commit is contained in:
minjaesong
2017-06-22 02:31:07 +09:00
parent 1ecbc57f83
commit ad481853bb
356 changed files with 3125 additions and 21138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/console/AVTracker.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.debuggerapp.ActorValueTracker
import java.util.*
@@ -12,14 +12,14 @@ internal object AVTracker : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size < 2) {
jPanelInstances.add(ActorValueTracker(Terrarum.ingame!!.player))
jPanelInstances.add(ActorValueTracker(TerrarumGDX.ingame!!.player))
}
else {
try {
val actorID = args[1].toInt()
if (Terrarum.ingame!!.theGameHasActor(actorID)) {
jPanelInstances.add(ActorValueTracker(Terrarum.ingame!!.getActorByID(actorID)))
if (TerrarumGDX.ingame!!.theGameHasActor(actorID)) {
jPanelInstances.add(ActorValueTracker(TerrarumGDX.ingame!!.getActorByID(actorID)))
}
else {
throw IllegalArgumentException()

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.debuggerapp.ActorsLister
import java.util.*
@@ -12,8 +12,8 @@ internal object ActorsList : ConsoleCommand {
override fun execute(args: Array<String>) {
jPanelInstances.add(ActorsLister(
Terrarum.ingame!!.actorContainer,
Terrarum.ingame!!.actorContainerInactive)
TerrarumGDX.ingame!!.actorContainer,
TerrarumGDX.ingame!!.actorContainerInactive)
)
}

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.ui.ConsoleWindow
import org.apache.commons.codec.digest.DigestUtils
@@ -11,12 +11,12 @@ import org.apache.commons.codec.digest.DigestUtils
* For each releases new password should be set. The new password must:
* - start with next alphabet of previous password
* if previous password started with Z, the new password must start with A
* - be a name appear in the Legend of Zelda series which officially released by Nintendo
* - be a name appear in the Legend of Zelda series which officially released by Nintendo (no CD-i)
* - be lowercase
* - BE CRACKABLE (crackstation.net)
*
* Example passwords would be:
* aryll -> biggoron -> ciela -> ... -> linebeck -> midna -> navi -> ...
* aryll -> beedle -> ciela -> daruk -> ... -> linebeck -> mido -> navi -> ...
*
* Notes:
* do NOT put plaintext anywhere in the code (except for comments maybe)
@@ -39,7 +39,7 @@ internal object Authenticator : ConsoleCommand {
Echo(msg)
println("[Authenticator] " + msg)
a = !a
(Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).reset()
(TerrarumGDX.ingame!!.consoleHandler.UI as ConsoleWindow).reset()
}
else {
printUsage() // thou shalt not pass!

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

@@ -1,6 +1,5 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.langpack.Lang
import java.util.Formatter
@@ -10,7 +9,7 @@ import java.util.Formatter
*/
internal object CodexEdictis : ConsoleCommand {
val ccW = GameFontBase.colToCode["o"]
val ccW = 0.toChar()//GameFontBase.colToCode["o"]
override fun execute(args: Array<String>) {
if (args.size == 1) {

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

@@ -1,9 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.Terrarum
import java.time.LocalDateTime
import java.time.ZonedDateTime
import java.util.ArrayList
@@ -26,10 +23,10 @@ internal object CommandInterpreter {
"tips"
)
private val ccW = GameFontBase.colToCode["w"]
private val ccG = GameFontBase.colToCode["g"]
private val ccY = GameFontBase.colToCode["y"]
private val ccR = GameFontBase.colToCode["r"]
private val ccW = 0.toChar()//GameFontBase.colToCode["w"]
private val ccG = 0.toChar()//GameFontBase.colToCode["g"]
private val ccY = 0.toChar()//GameFontBase.colToCode["y"]
private val ccR = 0.toChar()//GameFontBase.colToCode["r"]
internal fun execute(command: String) {
val cmd: Array<CommandInput?> = parse(command)

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

@@ -1,11 +1,8 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.ui.ConsoleWindow
import java.util.Arrays
/**
* Created by minjaesong on 16-01-16.
*/
@@ -19,13 +16,13 @@ internal object Echo : ConsoleCommand {
val sb = StringBuilder()
for (ch in single_line) {
if (ch == '\n') {
(Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
(TerrarumGDX.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
sb.delete(0, sb.length - 1)
}
else
sb.append(ch)
}
(Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
(TerrarumGDX.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString())
}
operator fun invoke(args: Array<String>) = execute(args)

5
src/net/torvald/terrarum/console/EchoError.kt
View File

@@ -1,7 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.ui.ConsoleWindow
/**
@@ -14,7 +13,7 @@ internal object EchoError : ConsoleCommand {
}
fun execute(single_line: String) {
(Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage("${GameFontBase.colToCode["r"]}$single_line")
(TerrarumGDX.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage(single_line)
}
operator fun invoke(args: Array<String>) = execute(args)

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

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.utils.JsonWriter
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import java.io.IOException
@@ -13,8 +13,8 @@ internal object ExportAV : ConsoleCommand {
if (args.size == 2) {
try {
JsonWriter.writeToFile(
Terrarum.ingame!!.player!!.actorValue,
Terrarum.defaultDir + "/Exports/" + args[1] + ".json")
TerrarumGDX.ingame!!.player!!.actorValue,
TerrarumGDX.defaultDir + "/Exports/" + args[1] + ".json")
Echo("ExportAV: exported to " + args[1] + ".json")
}

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

@@ -2,7 +2,7 @@ package net.torvald.terrarum.console
import net.torvald.colourutil.Col4096
import net.torvald.terrarum.utils.RasterWriter
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.blockproperties.Block
import java.io.*
@@ -60,10 +60,10 @@ internal object ExportMap : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2) {
var mapData = ByteArray(Terrarum.ingame!!.world.width * Terrarum.ingame!!.world.height * 3)
var mapData = ByteArray(TerrarumGDX.ingame!!.world.width * TerrarumGDX.ingame!!.world.height * 3)
var mapDataPointer = 0
for (tile in Terrarum.ingame!!.world.terrainIterator()) {
for (tile in TerrarumGDX.ingame!!.world.terrainIterator()) {
val colArray = (colorTable as Map<Int, Col4096>)
.getOrElse(tile, { Col4096(0xFFF) }).toByteArray()
@@ -74,7 +74,7 @@ internal object ExportMap : ConsoleCommand {
mapDataPointer += 3
}
val dir = Terrarum.defaultDir + "/Exports/"
val dir = TerrarumGDX.defaultDir + "/Exports/"
val dirAsFile = File(dir)
if (!dirAsFile.exists()) {
dirAsFile.mkdir()
@@ -82,7 +82,7 @@ internal object ExportMap : ConsoleCommand {
try {
RasterWriter.writePNG_RGB(
Terrarum.ingame!!.world.width, Terrarum.ingame!!.world.height, mapData, dir + args[1] + ".png")
TerrarumGDX.ingame!!.world.width, TerrarumGDX.ingame!!.world.height, mapData, dir + args[1] + ".png")
Echo("ExportMap: exported to " + args[1] + ".png")
}

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

@@ -1,25 +1,24 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-01-19.
*/
internal object GetAV : ConsoleCommand {
val ccW = GameFontBase.colToCode["w"]
val ccG = GameFontBase.colToCode["g"]
val ccY = GameFontBase.colToCode["y"]
val ccM = GameFontBase.colToCode["m"]
val ccK = GameFontBase.colToCode["k"]
val ccO = GameFontBase.colToCode["o"]
val ccW = 0.toChar()//GameFontBase.colToCode["w"]
val ccG = 0.toChar()//GameFontBase.colToCode["g"]
val ccY = 0.toChar()//GameFontBase.colToCode["y"]
val ccM = 0.toChar()//GameFontBase.colToCode["m"]
val ccK = 0.toChar()//GameFontBase.colToCode["k"]
val ccO = 0.toChar()//GameFontBase.colToCode["o"]
override fun execute(args: Array<String>) {
try {
if (args.size == 1 && Terrarum.ingame!!.player != null) {
if (args.size == 1 && TerrarumGDX.ingame!!.player != null) {
// print all actorvalue of player
val av = Terrarum.ingame!!.player!!.actorValue
val av = TerrarumGDX.ingame!!.player!!.actorValue
val keyset = av.keySet
Echo("$ccW== ActorValue list for ${ccY}player $ccW==")
@@ -37,19 +36,19 @@ internal object GetAV : ConsoleCommand {
if (!args[1].isNum()) { // args[1] is ActorValue name
Echo("${ccW}player.$ccM${args[1]} $ccW= " +
ccG +
Terrarum.ingame!!.player!!.actorValue[args[1]] +
TerrarumGDX.ingame!!.player!!.actorValue[args[1]] +
" $ccO" +
Terrarum.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName
TerrarumGDX.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName
)
println("[GetAV] player.${args[1]} = " +
Terrarum.ingame!!.player!!.actorValue[args[1]] +
TerrarumGDX.ingame!!.player!!.actorValue[args[1]] +
" " +
Terrarum.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName
TerrarumGDX.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName
)
}
else {
// args[1] is actor ID
val actor = Terrarum.ingame!!.getActorByID(args[1].toInt())
val actor = TerrarumGDX.ingame!!.getActorByID(args[1].toInt())
val av = actor.actorValue
val keyset = av.keySet
@@ -71,14 +70,14 @@ internal object GetAV : ConsoleCommand {
val id = args[1].toInt()
val av = args[2]
Echo("$ccW$id.$ccM$av $ccW= $ccG" +
Terrarum.ingame!!.getActorByID(id).actorValue[av] +
TerrarumGDX.ingame!!.getActorByID(id).actorValue[av] +
" $ccO" +
Terrarum.ingame!!.getActorByID(id).actorValue[av]!!.javaClass.simpleName
TerrarumGDX.ingame!!.getActorByID(id).actorValue[av]!!.javaClass.simpleName
)
println("$id.$av = " +
Terrarum.ingame!!.getActorByID(id).actorValue[av] +
TerrarumGDX.ingame!!.getActorByID(id).actorValue[av] +
" " +
Terrarum.ingame!!.getActorByID(id).actorValue[av]!!.javaClass.simpleName
TerrarumGDX.ingame!!.getActorByID(id).actorValue[av]!!.javaClass.simpleName
)
}
}

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

@@ -1,9 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.gameactors.Factionable
import net.torvald.terrarum.gameactors.Player
@@ -11,12 +9,12 @@ import net.torvald.terrarum.gameactors.Player
* Created by minjaesong on 16-02-17.
*/
internal object GetFactioning : ConsoleCommand {
val ccW = GameFontBase.colToCode["w"]
val ccG = GameFontBase.colToCode["g"]
val ccY = GameFontBase.colToCode["y"]
val ccM = GameFontBase.colToCode["m"]
val ccK = GameFontBase.colToCode["k"]
val ccB = GameFontBase.colToCode["b"]
val ccW = 0.toChar()//GameFontBase.colToCode["w"]
val ccG = 0.toChar()//GameFontBase.colToCode["g"]
val ccY = 0.toChar()//GameFontBase.colToCode["y"]
val ccM = 0.toChar()//GameFontBase.colToCode["m"]
val ccK = 0.toChar()//GameFontBase.colToCode["k"]
val ccB = 0.toChar()//GameFontBase.colToCode["b"]
private val PRINT_INDENTATION = "$ccK --> $ccW"
@@ -25,7 +23,7 @@ internal object GetFactioning : ConsoleCommand {
val error = Error()
fun printOutFactioning(id: Int) {
val a = Terrarum.ingame!!.getActorByID(id)
val a = TerrarumGDX.ingame!!.getActorByID(id)
if (a is Factionable) {
Echo("$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/GetLocale.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-01-22.

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-03-20.
@@ -8,7 +8,7 @@ import net.torvald.terrarum.Terrarum
internal object GetTime : ConsoleCommand {
override fun execute(args: Array<String>) {
val worldTime = Terrarum.ingame!!.world.time
val worldTime = TerrarumGDX.ingame!!.world.time
Echo(worldTime.getFormattedTime())
}

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import com.google.gson.Gson
import com.google.gson.JsonElement
@@ -14,14 +14,14 @@ import java.io.IOException
internal object GsonTest : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2) {
val avelem = Gson().toJsonTree(Terrarum.ingame!!.player)
val avelem = Gson().toJsonTree(TerrarumGDX.ingame!!.player)
val jsonString = avelem.toString()
val bufferedWriter: BufferedWriter
val writer: FileWriter
try {
writer = FileWriter(Terrarum.defaultDir + "/Exports/" + args[1] + ".json")
writer = FileWriter(TerrarumGDX.defaultDir + "/Exports/" + args[1] + ".json")
bufferedWriter = BufferedWriter(writer)
bufferedWriter.write(jsonString)

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.langpack.Lang
/**

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.gameactors.ActorInventory
import net.torvald.terrarum.gameactors.Player
import net.torvald.terrarum.gameactors.Pocketed
@@ -11,7 +11,7 @@ import net.torvald.terrarum.itemproperties.ItemCodex
*/
internal object Inventory : ConsoleCommand {
private var target: Pocketed? = Terrarum.ingame!!.player
private var target: Pocketed? = TerrarumGDX.ingame!!.player
override fun execute(args: Array<String>) {
if (args.size == 1) {
@@ -46,7 +46,7 @@ internal object Inventory : ConsoleCommand {
}
private fun setTarget(actorRefId: Int = Player.PLAYER_REF_ID) {
val actor = Terrarum.ingame!!.getActorByID(actorRefId)
val actor = TerrarumGDX.ingame!!.getActorByID(actorRefId)
if (actor !is Pocketed) {
EchoError("Cannot edit inventory of incompatible actor: $actor")
}

3
src/net/torvald/terrarum/console/JavaIMTest.kt
View File

@@ -1,8 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.swingapp.IMStringReader
import javax.swing.JFrame
/**
* Created by SKYHi14 on 2017-02-05.
@@ -12,7 +10,6 @@ internal object JavaIMTest : ConsoleCommand {
override fun execute(args: Array<String>) {
IMStringReader(
Terrarum.appgc,
{ Echo("[JavaIMTest -> IMStringReader] $it") }, // send input to Echo
"JavaIMTest"
)

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.langpack.Lang
/**
@@ -11,7 +11,7 @@ internal object KillActor : ConsoleCommand {
if (args.size == 2) {
try {
val actorid = args[1].toInt()
Terrarum.ingame!!.removeActor(actorid)
TerrarumGDX.ingame!!.removeActor(actorid)
}
catch (e: NumberFormatException) {
EchoError("Wrong number input.")

7
src/net/torvald/terrarum/console/MusicTest.kt
View File

@@ -1,8 +1,7 @@
package net.torvald.terrarum.console
import org.newdawn.slick.Music
import org.newdawn.slick.openal.AudioLoader
import java.io.File
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.audio.Music
/**
* Created by minjaesong on 16-08-02.
@@ -34,7 +33,7 @@ internal object MusicTest : ConsoleCommand {
File("./assets/sounds/test/${args[1]}").absoluteFile.toURI().toURL()
).playAsMusic(1f, 1f, false)*/
music = Music("./assets/sounds/test/${args[1]}")
music = Gdx.audio.newMusic(Gdx.files.internal("./assets/sounds/test/${args[1]}"))
music!!.play()
}

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

@@ -1,19 +1,18 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-06-16.
*/
internal object Seed : ConsoleCommand {
val ccG = GameFontBase.colToCode["g"]
val ccW = GameFontBase.colToCode["w"]
val ccY = GameFontBase.colToCode["y"]
val ccG = 0.toChar()//GameFontBase.colToCode["g"]
val ccW = 0.toChar()//GameFontBase.colToCode["w"]
val ccY = 0.toChar()//GameFontBase.colToCode["y"]
override fun execute(args: Array<String>) {
Echo("Map$ccW: $ccG${Terrarum.ingame!!.world.generatorSeed}")
println("[seed] Map$ccW: $ccG${Terrarum.ingame!!.world.generatorSeed}")
Echo("Map$ccW: $ccG${TerrarumGDX.ingame!!.world.generatorSeed}")
println("[seed] Map$ccW: $ccG${TerrarumGDX.ingame!!.world.generatorSeed}")
// TODO display randomiser seed
}

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

@@ -1,19 +1,17 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.StateInGame
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-01-15.
*/
internal object SetAV : ConsoleCommand {
val ccW = GameFontBase.colToCode["w"]
val ccG = GameFontBase.colToCode["g"]
val ccY = GameFontBase.colToCode["y"]
val ccR = GameFontBase.colToCode["r"]
val ccM = GameFontBase.colToCode["m"]
val ccW = 0.toChar()//GameFontBase.colToCode["w"]
val ccG = 0.toChar()//GameFontBase.colToCode["g"]
val ccY = 0.toChar()//GameFontBase.colToCode["y"]
val ccR = 0.toChar()//GameFontBase.colToCode["r"]
val ccM = 0.toChar()//GameFontBase.colToCode["m"]
override fun printUsage() {
Echo("${ccW}Set actor value of specific target to desired value.")
@@ -66,7 +64,7 @@ internal object SetAV : ConsoleCommand {
return
}
Terrarum.ingame!!.player!!.actorValue[args[1]] = newValue
TerrarumGDX.ingame!!.player!!.actorValue[args[1]] = newValue
Echo("${ccW}Set $ccM${args[1]} ${ccW}for ${ccY}player ${ccW}to $ccG$newValue")
println("[SetAV] set ActorValue '${args[1]}' for player to '$newValue'.")
}
@@ -74,7 +72,7 @@ internal object SetAV : ConsoleCommand {
try {
val id = args[1].toInt()
val newValue = parseAVInput(args[3])
val actor = Terrarum.ingame!!.getActorByID(id)
val actor = TerrarumGDX.ingame!!.getActorByID(id)
// check if av is number
if (args[2].isNum()) {

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

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.ui.Notification
/**
@@ -25,7 +25,7 @@ internal object SetBulletin : ConsoleCommand {
* @param message real message
*/
fun send(message: Array<String>) {
Terrarum.ingame!!.sendNotification(message)
TerrarumGDX.ingame!!.sendNotification(message)
println("sent notifinator")
}
}

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

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.worlddrawer.LightmapRenderer
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-02-17.
@@ -20,7 +20,7 @@ internal object SetGlobalLightOverride : ConsoleCommand {
val GL = LightmapRenderer.constructRGBFromInt(r, g, b)
lightOverride = true
Terrarum.ingame!!.world.globalLight = GL
TerrarumGDX.ingame!!.world.globalLight = GL
}
catch (e: NumberFormatException) {
Echo("Wrong number input.")
@@ -38,7 +38,7 @@ internal object SetGlobalLightOverride : ConsoleCommand {
Echo("Range: 0-" + (LightmapRenderer.COLOUR_RANGE_SIZE - 1))
}
else {
Terrarum.ingame!!.world.globalLight = GL
TerrarumGDX.ingame!!.world.globalLight = GL
}
}
catch (e: NumberFormatException) {

13
src/net/torvald/terrarum/console/SetLocale.kt
View File

@@ -1,10 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.Terrarum
import org.apache.commons.csv.CSVRecord
import org.newdawn.slick.SlickException
import net.torvald.terrarum.TerrarumGDX
import java.io.IOException
@@ -14,14 +11,14 @@ import java.io.IOException
internal object SetLocale : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2) {
val prevLocale = Terrarum.gameLocale
Terrarum.gameLocale = args[1]
val prevLocale = TerrarumGDX.gameLocale
TerrarumGDX.gameLocale = args[1]
try {
Echo("Set locale to '" + Terrarum.gameLocale + "'.")
Echo("Set locale to '" + TerrarumGDX.gameLocale + "'.")
}
catch (e: IOException) {
Echo("could not read lang file.")
Terrarum.gameLocale = prevLocale
TerrarumGDX.gameLocale = prevLocale
}
}

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.gameactors.ActorWithPhysics
/**
@@ -10,10 +10,10 @@ internal object SetScale : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2 || args.size == 3) {
try {
val targetID = if (args.size == 3) args[1].toInt() else Terrarum.ingame!!.player!!.referenceID
val targetID = if (args.size == 3) args[1].toInt() else TerrarumGDX.ingame!!.player!!.referenceID
val scale = args[if (args.size == 3) 2 else 1].toDouble()
val target = Terrarum.ingame!!.getActorByID(targetID)
val target = TerrarumGDX.ingame!!.getActorByID(targetID)
if (target !is ActorWithPhysics) {
EchoError("Target is not ActorWithPhysics")

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

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.gameworld.WorldTime
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-03-20.
@@ -11,10 +11,10 @@ internal object SetTime : ConsoleCommand {
if (args.size == 2) {
val timeToSet = WorldTime.parseTime(args[1])
Terrarum.ingame!!.world.time.setTimeOfToday(timeToSet)
TerrarumGDX.ingame!!.world.time.setTimeOfToday(timeToSet)
Echo("Set time to ${Terrarum.ingame!!.world.time.todaySeconds} " +
"(${Terrarum.ingame!!.world.time.hours}h${formatMin(Terrarum.ingame!!.world.time.minutes)})")
Echo("Set time to ${TerrarumGDX.ingame!!.world.time.todaySeconds} " +
"(${TerrarumGDX.ingame!!.world.time.hours}h${formatMin(TerrarumGDX.ingame!!.world.time.minutes)})")
}
else {
printUsage()

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-03-20.
@@ -11,11 +11,11 @@ internal object SetTimeDelta : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2) {
Terrarum.ingame!!.world.time.timeDelta = args[1].toInt()
if (Terrarum.ingame!!.world.time.timeDelta == 0)
TerrarumGDX.ingame!!.world.time.timeDelta = args[1].toInt()
if (TerrarumGDX.ingame!!.world.time.timeDelta == 0)
Echo("時間よ止まれ！ザ・ワルド！！")
else
Echo("Set time delta to ${Terrarum.ingame!!.world.time.timeDelta}")
Echo("Set time delta to ${TerrarumGDX.ingame!!.world.time.timeDelta}")
}
else {
printUsage()

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

@@ -1,7 +1,8 @@
package net.torvald.terrarum.console
import com.badlogic.gdx.Gdx
import net.torvald.terrarum.gameactors.PhysTestBall
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.worlddrawer.WorldCamera
import org.dyn4j.geometry.Vector2
@@ -11,8 +12,8 @@ import org.dyn4j.geometry.Vector2
internal object SpawnPhysTestBall : ConsoleCommand {
@Throws(Exception::class)
override fun execute(args: Array<String>) {
val mouseX = Terrarum.appgc.input.mouseX
val mouseY = Terrarum.appgc.input.mouseY
val mouseX = TerrarumGDX.mouseX
val mouseY = TerrarumGDX.mouseY
if (args.size >= 3) {
val elasticity = args[1].toDouble()
@@ -28,7 +29,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
ball.elasticity = elasticity
ball.applyForce(Vector2(xvel, yvel))
Terrarum.ingame!!.addNewActor(ball)
TerrarumGDX.ingame!!.addNewActor(ball)
}
else if (args.size == 2) {
val elasticity = args[1].toDouble()
@@ -40,7 +41,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
)
ball.elasticity = elasticity
Terrarum.ingame!!.addNewActor(ball)
TerrarumGDX.ingame!!.addNewActor(ball)
}
else {
printUsage()

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.gameactors.DecodeTapestry
import java.io.File
import java.io.FileInputStream
@@ -16,7 +16,7 @@ internal object SpawnTapestry : ConsoleCommand {
}
val tapestry = DecodeTapestry(File(args[1]))
Terrarum.ingame!!.addNewActor(tapestry)
TerrarumGDX.ingame!!.addNewActor(tapestry)
}
override fun printUsage() {

8
src/net/torvald/terrarum/console/SpawnTikiTorch.kt
View File

@@ -1,9 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.gameactors.FixtureTikiTorch
import net.torvald.terrarum.gamecontroller.mouseX
import net.torvald.terrarum.gamecontroller.mouseY
/**
* Created by minjaesong on 2016-12-17.
@@ -11,9 +9,9 @@ import net.torvald.terrarum.gamecontroller.mouseY
internal object SpawnTikiTorch : ConsoleCommand {
override fun execute(args: Array<String>) {
val torch = FixtureTikiTorch()
torch.setPosition(Terrarum.appgc.mouseX, Terrarum.appgc.mouseY)
torch.setPosition(TerrarumGDX.mouseX, TerrarumGDX.mouseY)
Terrarum.ingame!!.addNewActor(torch)
TerrarumGDX.ingame!!.addNewActor(torch)
}
override fun printUsage() {

18
src/net/torvald/terrarum/console/Teleport.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.worlddrawer.FeaturesDrawer
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.gameactors.ActorWithPhysics
/**
@@ -23,7 +23,7 @@ internal object Teleport : ConsoleCommand {
return
}
Terrarum.ingame!!.player!!.setPosition(x.toDouble(), y.toDouble())
TerrarumGDX.ingame!!.player!!.setPosition(x.toDouble(), y.toDouble())
}
else if (args.size == 4) {
if (args[2].toLowerCase() != "to") {
@@ -35,20 +35,20 @@ internal object Teleport : ConsoleCommand {
try {
val fromActorID = args[1].toInt()
val targetActorID = if (args[3].toLowerCase() == "player")
Terrarum.ingame!!.player!!.referenceID
TerrarumGDX.ingame!!.player!!.referenceID
else
args[3].toInt()
// if from == target, ignore the action
if (fromActorID == targetActorID) return
if (Terrarum.ingame!!.getActorByID(fromActorID) !is ActorWithPhysics ||
Terrarum.ingame!!.getActorByID(targetActorID) !is ActorWithPhysics) {
if (TerrarumGDX.ingame!!.getActorByID(fromActorID) !is ActorWithPhysics ||
TerrarumGDX.ingame!!.getActorByID(targetActorID) !is ActorWithPhysics) {
throw IllegalArgumentException()
}
else {
fromActor = Terrarum.ingame!!.getActorByID(fromActorID) as ActorWithPhysics
targetActor = Terrarum.ingame!!.getActorByID(targetActorID) as ActorWithPhysics
fromActor = TerrarumGDX.ingame!!.getActorByID(fromActorID) as ActorWithPhysics
targetActor = TerrarumGDX.ingame!!.getActorByID(targetActorID) as ActorWithPhysics
}
}
catch (e: NumberFormatException) {
@@ -79,11 +79,11 @@ internal object Teleport : ConsoleCommand {
y = args[4].toInt() * FeaturesDrawer.TILE_SIZE + FeaturesDrawer.TILE_SIZE / 2
val actorID = args[1].toInt()
if (Terrarum.ingame!!.getActorByID(actorID) !is ActorWithPhysics) {
if (TerrarumGDX.ingame!!.getActorByID(actorID) !is ActorWithPhysics) {
throw IllegalArgumentException()
}
else {
actor = Terrarum.ingame!!.getActorByID(actorID) as ActorWithPhysics
actor = TerrarumGDX.ingame!!.getActorByID(actorID) as ActorWithPhysics
}
}
catch (e: NumberFormatException) {

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

@@ -1,16 +1,15 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.StateInGame
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-01-19.
*/
internal object ToggleNoClip : ConsoleCommand {
override fun execute(args: Array<String>) {
val status = Terrarum.ingame!!.player!!.isNoClip()
val status = TerrarumGDX.ingame!!.player!!.isNoClip()
Terrarum.ingame!!.player!!.setNoClip(!status)
TerrarumGDX.ingame!!.player!!.setNoClip(!status)
Echo("Set no-clip status to " + (!status).toString())
}

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.langpack.Lang
/**
@@ -9,7 +9,7 @@ import net.torvald.terrarum.langpack.Lang
internal object Version : ConsoleCommand {
override fun execute(args: Array<String>) {
Echo("${Terrarum.NAME} ${Terrarum.VERSION_STRING}")
Echo("${TerrarumGDX.NAME} ${TerrarumGDX.VERSION_STRING}")
Echo("Polyglot language pack version ${Lang.POLYGLOT_VERSION}")
}

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
/**
* Created by minjaesong on 16-01-25.
@@ -18,14 +18,14 @@ internal object Zoom : ConsoleCommand {
return
}
if (zoom < Terrarum.ingame!!.ZOOM_MIN) {
zoom = Terrarum.ingame!!.ZOOM_MIN
if (zoom < TerrarumGDX.ingame!!.ZOOM_MIN) {
zoom = TerrarumGDX.ingame!!.ZOOM_MIN
}
else if (zoom > Terrarum.ingame!!.ZOOM_MAX) {
zoom = Terrarum.ingame!!.ZOOM_MAX
else if (zoom > TerrarumGDX.ingame!!.ZOOM_MAX) {
zoom = TerrarumGDX.ingame!!.ZOOM_MAX
}
Terrarum.ingame!!.screenZoom = zoom
TerrarumGDX.ingame!!.screenZoom = zoom
System.gc()