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

actor jump slowdown in water

Browse Source 
Former-commit-id: 45fdd22f084ec4e9a9017bd617393c9e6acd56e8
Former-commit-id: bf1bbc9210bd2232381116312447724976aaf1f8
This commit is contained in:
Song Minjae
2017-01-19 13:43:38 +09:00
parent b08060bffc
commit 02f38eab3c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,10 +326,10 @@ open class ActorWithBody(renderOrder: ActorOrder) : Actor(renderOrder) {
* *
* Since we're adding some value every frame, the value is equivalent to the acceleration. * Since we're adding some value every frame, the value is equivalent to the acceleration.
* Look for Newton's second law for the background knowledge. * Look for Newton's second law for the background knowledge.
* @param vec : Acceleration in Vector2 * @param acc : Acceleration in Vector2
*/ */
fun applyForce(vec: Vector2) { fun applyForce(acc: Vector2) {
velocity += vec velocity += acc.times(speedMultByTile)
} }
override fun update(gc: GameContainer, delta: Int) { override fun update(gc: GameContainer, delta: Int) {
@@ -383,7 +383,7 @@ open class ActorWithBody(renderOrder: ActorOrder) : Actor(renderOrder) {
} }
setHorizontalFriction() setHorizontalFriction()
if (isPlayerNoClip) { // or hanging on the rope, etc. if (isPlayerNoClip) { // TODO also hanging on the rope, etc.
setVerticalFriction() setVerticalFriction()
} }
@@ -404,6 +404,16 @@ open class ActorWithBody(renderOrder: ActorOrder) : Actor(renderOrder) {
} }
} }
/**
* Similar to applyForce but deals with walking. Read below:
*
* how speedcap is achieved with moveDelta:
* moveDelta is (velo + walk), but this added value is reset every update.
* if it wasn't, it will go like this:
* F 0 velo + walk
* F 1 velo + walk + velo + walk
* as a result, the speed will keep increase without it
*/
private fun applyMovementVelocity() { private fun applyMovementVelocity() {
if (this is Controllable) { if (this is Controllable) {
// decide whether to ignore walkX // decide whether to ignore walkX
@@ -890,7 +900,7 @@ open class ActorWithBody(renderOrder: ActorOrder) : Actor(renderOrder) {
fun Int.viscosityToMult(): Double = 16.0 / (16.0 + this) fun Int.viscosityToMult(): Double = 16.0 / (16.0 + this)
internal val speedCapByTile: Double internal val speedMultByTile: Double
get() { get() {
val notSubmergedCap = if (grounded) val notSubmergedCap = if (grounded)
feetViscosity.viscosityToMult() feetViscosity.viscosityToMult()
@@ -1246,7 +1256,7 @@ open class ActorWithBody(renderOrder: ActorOrder) : Actor(renderOrder) {
val avSpeedCap: Double val avSpeedCap: Double
get() = actorValue.getAsDouble(AVKey.SPEED)!! * get() = actorValue.getAsDouble(AVKey.SPEED)!! *
actorValue.getAsDouble(AVKey.SPEEDBUFF)!! * actorValue.getAsDouble(AVKey.SPEEDBUFF)!! *
speedCapByTile * speedMultByTile *
scale.sqrt() scale.sqrt()
} }