curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

player can exit from sinking platform by jumping

Browse Source
This commit is contained in:
minjaesong
2026-02-09 02:54:56 +09:00
parent 855e0ea12a
commit e91b7ceb0d
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/net/torvald/terrarum/gameactors/PhysContraption.kt
View File

@@ -21,6 +21,8 @@ import org.dyn4j.geometry.Vector2
*/ */
abstract class PhysContraption() : ActorWithBody() { abstract class PhysContraption() : ActorWithBody() {
// NOTE: the entire code assumes downward gravity, meaning this code breaks if gravity is reversed //
/** Actors currently riding this contraption, stored by ActorID for serialisation. */ /** Actors currently riding this contraption, stored by ActorID for serialisation. */
protected val actorsRiding = ArrayList<ActorID>() protected val actorsRiding = ArrayList<ActorID>()
@@ -114,23 +116,31 @@ abstract class PhysContraption() : ActorWithBody() {
rider.hitbox.startX < hitbox.endX rider.hitbox.startX < hitbox.endX
// Detect real jumps (not small residuals) — threshold is 4x the mount threshold // Detect real jumps (not small residuals) — threshold is 4x the mount threshold
val combinedVelY = rider.externalV.y + (rider.controllerV?.y ?: 0.0) val combinedVelY = rider.externalV.y + (rider.controllerV?.y ?: 0.0)
val isJumping = combinedVelY < JUMP_THRESHOLD_Y * 4.0 val isJumping = combinedVelY < JUMP_THRESHOLD_Y// * 4.0
if (!feetNear || !horizontalOverlap || isJumping) { if (!feetNear || !horizontalOverlap || isJumping) {
dismount(rider) if (isJumping) {
// Jump-initiated dismount: always conserve horizontal momentum.
// For vertical: rising platforms (negative Y vel) give a jump
// boost; sinking platforms (positive Y vel) are ignored to avoid
// counteracting the jump impulse.
actorsRiding.remove(rider.referenceID)
rider.platformsRiding.remove(this.referenceID)
rider.externalV.x += contraptionVelocity.x
if (contraptionVelocity.y < 0.0) {
rider.externalV.y += contraptionVelocity.y
}
}
else {
dismount(rider)
}
} }
} }
ridersToRemove.forEach { actorsRiding.remove(it) } ridersToRemove.forEach { actorsRiding.remove(it) }
// --- Step 2b: Mount detection for new candidates --- // --- Step 2b: Mount detection for new candidates ---
val candidates = ArrayList<ActorWithBody>() val candidates: List<ActorWithBody> = (INGAME.actorContainerActive.filterIsInstance<ActorWithBody>().filter { it !== this && it !is PhysContraption } + INGAME.actorNowPlaying).filterNotNull()
INGAME.actorContainerActive.forEach {
if (it is ActorWithBody && it !== this && it !is PhysContraption) {
candidates.add(it)
}
}
INGAME.actorNowPlaying?.let { candidates.add(it) }
for (actor in candidates) { for (actor in candidates) {
if (actorsRiding.contains(actor.referenceID)) continue if (actorsRiding.contains(actor.referenceID)) continue