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

Reducing hierarchy by merging ActorWithBody with ActorWBMovable

Browse Source
This commit is contained in:
minjaesong
2020-03-20 19:30:17 +09:00
parent 5cafe16f20
commit 07b9e76090
26 changed files with 1844 additions and 1864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/modulebasegame/console/SetScale.kt
View File

@@ -6,7 +6,7 @@ import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.console.EchoError
import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.gameactors.ActorWBMovable
import net.torvald.terrarum.gameactors.ActorWithBody
/**
* Created by minjaesong on 2017-01-20.
@@ -24,7 +24,7 @@ internal object SetScale : ConsoleCommand {
val target = Terrarum.ingame!!.getActorByID(targetID!!)
if (target !is ActorWBMovable) {
if (target !is ActorWithBody) {
EchoError("Target is not ActorWBMovable")
}
else {

20
src/net/torvald/terrarum/modulebasegame/console/Teleport.kt
View File

@@ -4,7 +4,7 @@ import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.console.EchoError
import net.torvald.terrarum.gameactors.ActorWBMovable
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.worlddrawer.CreateTileAtlas
@@ -34,8 +34,8 @@ internal object Teleport : ConsoleCommand {
EchoError("missing 'to' on teleport command")
return
}
val fromActor: ActorWBMovable
val targetActor: ActorWBMovable
val fromActor: ActorWithBody
val targetActor: ActorWithBody
try {
val fromActorID = args[1].toInt()
val targetActorID = if (args[3].toLowerCase() == "player") {
@@ -53,13 +53,13 @@ internal object Teleport : ConsoleCommand {
// if from == target, ignore the action
if (fromActorID == targetActorID) return
if (Terrarum.ingame!!.getActorByID(fromActorID) !is ActorWBMovable ||
Terrarum.ingame!!.getActorByID(targetActorID) !is ActorWBMovable) {
if (Terrarum.ingame!!.getActorByID(fromActorID) !is ActorWithBody ||
Terrarum.ingame!!.getActorByID(targetActorID) !is ActorWithBody) {
throw IllegalArgumentException()
}
else {
fromActor = Terrarum.ingame!!.getActorByID(fromActorID) as ActorWBMovable
targetActor = Terrarum.ingame!!.getActorByID(targetActorID) as ActorWBMovable
fromActor = Terrarum.ingame!!.getActorByID(fromActorID) as ActorWithBody
targetActor = Terrarum.ingame!!.getActorByID(targetActorID) as ActorWithBody
}
}
catch (e: NumberFormatException) {
@@ -82,7 +82,7 @@ internal object Teleport : ConsoleCommand {
return
}
val actor: ActorWBMovable
val actor: ActorWithBody
val x: Int
val y: Int
try {
@@ -90,11 +90,11 @@ internal object Teleport : ConsoleCommand {
y = args[4].toInt() * CreateTileAtlas.TILE_SIZE + CreateTileAtlas.TILE_SIZE / 2
val actorID = args[1].toInt()
if (Terrarum.ingame!!.getActorByID(actorID) !is ActorWBMovable) {
if (Terrarum.ingame!!.getActorByID(actorID) !is ActorWithBody) {
throw IllegalArgumentException()
}
else {
actor = Terrarum.ingame!!.getActorByID(actorID) as ActorWBMovable
actor = Terrarum.ingame!!.getActorByID(actorID) as ActorWithBody
}
}
catch (e: NumberFormatException) {