Fixes pending...

swimup: Speed corrected.

vertical velocity: reset only with to on ground or small velocity.
This commit is contained in:
asofold 2013-02-03 18:37:06 +01:00
parent ec70fb1df4
commit c3b0bf1012

View File

@ -264,8 +264,7 @@ public class SurvivalFly extends Check {
vAllowedDistance = swimmingSpeed + 0.5; vAllowedDistance = swimmingSpeed + 0.5;
} }
else{ else{
vAllowedDistance = swimmingSpeed; vAllowedDistance = swimmingSpeed + 0.02;
} }
vDistanceAboveLimit = yDistance - vAllowedDistance; vDistanceAboveLimit = yDistance - vAllowedDistance;
if (vDistanceAboveLimit > 0) tags.add("swimup"); if (vDistanceAboveLimit > 0) tags.add("swimup");
@ -398,7 +397,7 @@ public class SurvivalFly extends Check {
// Apply reset conditions. // Apply reset conditions.
data.toWasReset = resetTo || data.noFallAssumeGround; data.toWasReset = resetTo || data.noFallAssumeGround;
data.fromWasReset = resetFrom || data.noFallAssumeGround; data.fromWasReset = resetFrom || data.noFallAssumeGround;
if (yDistance < 0 && data.sfLastYDist > 0){ if (yDistance <= 0 && data.sfLastYDist > 0){
// data.verticalFreedom = 0; // data.verticalFreedom = 0;
data.verticalVelocityCounter = 0; data.verticalVelocityCounter = 0;
data.verticalVelocity = 0; data.verticalVelocity = 0;
@ -409,9 +408,11 @@ public class SurvivalFly extends Check {
data.sfJumpPhase = 0; data.sfJumpPhase = 0;
data.clearAccounting(); data.clearAccounting();
// TODO: Experimental: reset velocity. // TODO: Experimental: reset velocity.
data.verticalVelocityCounter = 0; if (toOnGround || Math.abs(yDistance) < 0.18){
data.verticalFreedom = 0; data.verticalVelocityCounter = 0;
data.verticalVelocity = 0; data.verticalFreedom = 0;
data.verticalVelocity = 0;
}
if (hDistance < sprintingSpeed){ if (hDistance < sprintingSpeed){
data.horizontalFreedom = 0; data.horizontalFreedom = 0;
data.horizontalVelocityCounter = 0; data.horizontalVelocityCounter = 0;