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

generalised things so that they would work outside of ingame.world; title screen wip

Browse Source
This commit is contained in:
minjaesong
2017-07-21 19:59:51 +09:00
parent cb8d3fd8b9
commit f1391bea6f
68 changed files with 1141 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -12,7 +12,7 @@ internal object GetAV : ConsoleCommand {
try {
if (args.size == 1 && Terrarum.ingame!!.player != null) {
// print all actorvalue of player
val av = Terrarum.ingame!!.player!!.actorValue
val av = Terrarum.ingame!!.player.actorValue
val keyset = av.keySet
Echo("$ccW== ActorValue list for ${ccY}player $ccW==")
@@ -30,14 +30,14 @@ 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]] +
Terrarum.ingame!!.player.actorValue[args[1]] +
" $ccO" +
Terrarum.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName
Terrarum.ingame!!.player.actorValue[args[1]]!!.javaClass.simpleName
)
println("[GetAV] player.${args[1]} = " +
Terrarum.ingame!!.player!!.actorValue[args[1]] +
Terrarum.ingame!!.player.actorValue[args[1]] +
" " +
Terrarum.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName
Terrarum.ingame!!.player.actorValue[args[1]]!!.javaClass.simpleName
)
}
else {

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

@@ -59,7 +59,7 @@ internal object SetAV : ConsoleCommand {
return
}
Terrarum.ingame!!.player!!.actorValue[args[1]] = newValue
Terrarum.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'.")
}

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

@@ -10,7 +10,7 @@ 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 Terrarum.ingame!!.player.referenceID
val scale = args[if (args.size == 3) 2 else 1].toDouble()
val target = Terrarum.ingame!!.getActorByID(targetID)

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

@@ -20,7 +20,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
val xvel = args[2].toDouble()
val yvel = if (args.size >= 4) args[3].toDouble() else 0.0
val ball = PhysTestBall()
val ball = PhysTestBall(Terrarum.ingame!!.world)
ball.setPosition(
(mouseX + WorldCamera.x).toDouble(),
(mouseY + WorldCamera.y).toDouble()
@@ -33,7 +33,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
else if (args.size == 2) {
val elasticity = args[1].toDouble()
val ball = PhysTestBall()
val ball = PhysTestBall(Terrarum.ingame!!.world)
ball.setPosition(
(mouseX + WorldCamera.x).toDouble(),
(mouseY + WorldCamera.y).toDouble()

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

@@ -8,7 +8,7 @@ import net.torvald.terrarum.gameactors.FixtureTikiTorch
*/
internal object SpawnTikiTorch : ConsoleCommand {
override fun execute(args: Array<String>) {
val torch = FixtureTikiTorch()
val torch = FixtureTikiTorch(Terrarum.ingame!!.world)
torch.setPosition(Terrarum.mouseX, Terrarum.mouseY)
Terrarum.ingame!!.addNewActor(torch)

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

@@ -23,7 +23,7 @@ internal object Teleport : ConsoleCommand {
return
}
Terrarum.ingame!!.player!!.setPosition(x.toDouble(), y.toDouble())
Terrarum.ingame!!.player.setPosition(x.toDouble(), y.toDouble())
}
else if (args.size == 4) {
if (args[2].toLowerCase() != "to") {
@@ -35,7 +35,7 @@ internal object Teleport : ConsoleCommand {
try {
val fromActorID = args[1].toInt()
val targetActorID = if (args[3].toLowerCase() == "player")
Terrarum.ingame!!.player!!.referenceID
Terrarum.ingame!!.player.referenceID
else
args[3].toInt()

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

@@ -7,9 +7,9 @@ import net.torvald.terrarum.Terrarum
*/
internal object ToggleNoClip : ConsoleCommand {
override fun execute(args: Array<String>) {
val status = Terrarum.ingame!!.player!!.isNoClip()
val status = Terrarum.ingame!!.player.isNoClip()
Terrarum.ingame!!.player!!.setNoClip(!status)
Terrarum.ingame!!.player.setNoClip(!status)
Echo("Set no-clip status to " + (!status).toString())
}