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

still have no idea how to make this work

Browse Source
This commit is contained in:
minjaesong
2022-04-05 17:46:03 +09:00
parent 59921ce2f8
commit d958683365
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/modulebasegame/gameactors/ActorMovingPlatform.kt → src/net/torvald/terrarum/gameactors/ActorMovingPlatform.kt
View File

@@ -1,4 +1,4 @@
package net.torvald.terrarum.modulebasegame.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.gameactors.ActorID import net.torvald.terrarum.gameactors.ActorID
@@ -11,7 +11,7 @@ import net.torvald.terrarum.gameactors.PhysProperties
open class ActorMovingPlatform() : ActorWithBody() { open class ActorMovingPlatform() : ActorWithBody() {
protected var tilewiseWidth = 3 protected var tilewiseWidth = 3
protected val actorsRiding = ArrayList<ActorID>() // saving actorID due to serialisation issues @Transient protected val actorsRiding = ArrayList<ActorID>() // saving actorID due to serialisation issues
init { init {
physProp = PhysProperties.PHYSICS_OBJECT physProp = PhysProperties.PHYSICS_OBJECT

9
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -281,6 +281,13 @@ open class ActorWithBody : Actor {
var isPickedUp = false var isPickedUp = false
/**
* Redundant entry for ActorMovingPlatform.actorsRiding. This field must be modified by the platforms!
*
* Also see [net.torvald.terrarum.modulebasegame.gameactors.ActorMovingPlatform.actorsRiding]
*/
@Transient protected val platformsRiding = ArrayList<ActorID>()
/** /**
* Gravitational Constant G. Load from gameworld. * Gravitational Constant G. Load from gameworld.
* [m / s^2] * [m / s^2]
@@ -1064,7 +1071,7 @@ open class ActorWithBody : Actor {
val x2 = hitbox.endX - A_PIXEL val x2 = hitbox.endX - A_PIXEL
val y1 = hitbox.startY val y1 = hitbox.startY
val y2 = hitbox.endY - A_PIXEL val y2 = hitbox.endY - A_PIXEL
// this commands and the commands on isWalled WILL NOT match (1 px gap on endX/Y). THIS IS INTENDED! // this commands and the commands on isWalled WILL NOT match (1 px gap on endX/Y). THIS IS INTENTIONAL!
val txStart = x1.plus(HALF_PIXEL).floorInt() val txStart = x1.plus(HALF_PIXEL).floorInt()
val txEnd = x2.plus(HALF_PIXEL).floorInt() val txEnd = x2.plus(HALF_PIXEL).floorInt()