AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-29 00:23:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix -hax +fly being extremely slow flying (Thanks fam0r)

Browse Source
This commit is contained in:
UnknownShadow200 2017-04-09 22:30:01 +10:00
parent feed58a2c7
commit 9044b14bb5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ClassicalSharp/Entities/Components/PhysicsComponent.cs
View File

@ -110,8 +110,10 @@ namespace ClassicalSharp.Entities {
public void PhysicsTick(Vector3 vel) { public void PhysicsTick(Vector3 vel) {
if (hacks.Noclip) entity.onGround = false; if (hacks.Noclip) entity.onGround = false;
float baseSpeed = GetBaseSpeed(); float baseSpeed = GetBaseSpeed();
float horSpeed = baseSpeed * GetSpeed(true); float verSpeed = baseSpeed * Math.Max(1, GetSpeed(hacks.CanSpeed, 8f) / 5);
float verSpeed = baseSpeed * Math.Max(1, GetSpeed(hacks.CanSpeed) / 5); float horSpeed = baseSpeed * GetSpeed(true, 8f/5);
// previously horSpeed used to be multiplied by factor of 0.02 in last case
// it's now multiplied by 0.1, so need to divide by 5 so user speed modifier comes out same
if (!hacks.Floating) { if (!hacks.Floating) {
if (secondJump) { horSpeed *= 93f; verSpeed *= 10f; } if (secondJump) { horSpeed *= 93f; verSpeed *= 10f; }
@ -125,7 +127,7 @@ namespace ClassicalSharp.Entities {
} else if (entity.TouchesAnyRope() && !hacks.Floating) { } else if (entity.TouchesAnyRope() && !hacks.Floating) {
MoveNormal(vel, 0.02f * 1.7f, ropeDrag, ropeGrav, verSpeed); MoveNormal(vel, 0.02f * 1.7f, ropeDrag, ropeGrav, verSpeed);
} else { } else {
float factor = !hacks.Floating && entity.onGround ? 0.1f : 0.02f; float factor = hacks.Floating || entity.onGround ? 0.1f : 0.02f;
float gravity = useLiquidGravity ? liquidGrav : entity.Model.Gravity; float gravity = useLiquidGravity ? liquidGrav : entity.Model.Gravity;
if (hacks.Floating) { if (hacks.Floating) {
@ -187,8 +189,8 @@ namespace ClassicalSharp.Entities {
entity.Velocity.Y -= gravity; entity.Velocity.Y -= gravity;
} }
float GetSpeed(bool canSpeed) { float GetSpeed(bool canSpeed, float speedMul) {
float factor = hacks.Floating ? 8 : 1, speed = factor; float factor = hacks.Floating ? speedMul : 1, speed = factor;
if (hacks.Speeding && canSpeed) speed += factor * hacks.SpeedMultiplier; if (hacks.Speeding && canSpeed) speed += factor * hacks.SpeedMultiplier;
if (hacks.HalfSpeeding && canSpeed) speed += factor * hacks.SpeedMultiplier / 2; if (hacks.HalfSpeeding && canSpeed) speed += factor * hacks.SpeedMultiplier / 2;
return hacks.CanSpeed ? speed : Math.Min(speed, hacks.MaxSpeedMultiplier); return hacks.CanSpeed ? speed : Math.Min(speed, hacks.MaxSpeedMultiplier);