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

staircase climbing seemingly working

Browse Source
This commit is contained in:
minjaesong
2021-08-20 20:31:25 +09:00
parent 64271dc9ba
commit 69075ad6da
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -905,11 +905,11 @@ open class ActorWithBody(renderOrder: RenderOrder, val physProp: PhysProperties,
// adjust finalDisplacement for honest-to-god staircasing // adjust finalDisplacement for honest-to-god staircasing
if (vectorSum.y <= 0.0 && staircaseStatus in listOf(1, 4) && selfCollisionStatus in (if (gravitation.y >= 0.0) listOf(3,6) else listOf(9, 12))) { if (vectorSum.y <= 0.0 && staircaseStatus in listOf(1, 4) && selfCollisionStatus in (if (gravitation.y >= 0.0) listOf(3,6) else listOf(9, 12))) {
// TODO!!
// remove Y displacement // remove Y displacement
// let original X velocity to pass-thru instead of snapping to tiles coded above // let original X velocity to pass-thru instead of snapping to tiles coded above
// pass-thru values are held by the vectorSum // pass-thru values are held by the vectorSum
println("staircasing: $staircaseStatus for $selfCollisionStatus")
//println("staircasing: $staircaseStatus for $selfCollisionStatus")
finalDisplacement.y = if (staircaseStatus == COLLIDING_LEFT) -stairHeightLeft else -stairHeightRight finalDisplacement.y = if (staircaseStatus == COLLIDING_LEFT) -stairHeightLeft else -stairHeightRight
finalDisplacement.x = vectorSum.x finalDisplacement.x = vectorSum.x
@@ -917,9 +917,11 @@ open class ActorWithBody(renderOrder: RenderOrder, val physProp: PhysProperties,
bounceX = false bounceX = false
bounceY = false bounceY = false
// maybe slow down the player? // this will slow down the player, but its main purpose is to hide a bug
// where when player happens to be "walled" (which zeroes the x velo) and keeps moving left/right
// so we also zero the same exact value here for perfect hiding
if (controllerV != null) { if (controllerV != null) {
controllerV!!.x *= 0.5 controllerV!!.x = 0.0
} }
} }
else { else {