diff --git a/Amalgam/src/Features/Aimbot/AimbotProjectile/AimbotProjectile.cpp b/Amalgam/src/Features/Aimbot/AimbotProjectile/AimbotProjectile.cpp index ba18abc7..4e54a000 100644 --- a/Amalgam/src/Features/Aimbot/AimbotProjectile/AimbotProjectile.cpp +++ b/Amalgam/src/Features/Aimbot/AimbotProjectile/AimbotProjectile.cpp @@ -611,14 +611,14 @@ static inline void SolveProjectileSpeed(CTFWeaponBase* pWeapon, const Vec3& vLoc case Demoman_s_FestiveStickybombLauncher: case Demoman_s_TheQuickiebombLauncher: case Demoman_s_TheScottishResistance: flDrag = Math::RemapValClamped(flVelocity, 922.f, k_flMaxVelocity, 0.085f, 0.190f); break; // 0.085 low, 0.190 capped, 0.230 v2400 + case Scout_t_TheSandman: flDrag = 0.180f; break; + case Scout_t_TheWrapAssassin: flDrag = 0.285f; break; } } - flDragTime = powf(flTime, 2) * flDrag / 1.5f; // rough estimate to prevent m_flTime being too low + float flOverride = Vars::Aimbot::Projectile::TimeOverride.Value; + flDragTime = powf(flTime, 2) * flDrag / (flOverride ? flOverride : 1.5f); // rough estimate to prevent m_flTime being too low flVelocity = flVelocity - flVelocity * flTime * flDrag; - - if (Vars::Aimbot::Projectile::TimeOverride.Value) - flDragTime = Vars::Aimbot::Projectile::TimeOverride.Value; } void CAimbotProjectile::CalculateAngle(const Vec3& vLocalPos, const Vec3& vTargetPos, Info_t& tInfo, int iSimTime, Solution_t& out, bool bAccuracy) { diff --git a/Amalgam/src/Features/ImGui/Menu/Menu.cpp b/Amalgam/src/Features/ImGui/Menu/Menu.cpp index ebb2ba8c..191c3de5 100644 --- a/Amalgam/src/Features/ImGui/Menu/Menu.cpp +++ b/Amalgam/src/Features/ImGui/Menu/Menu.cpp @@ -251,7 +251,7 @@ void CMenu::MenuAimbot() FSlider("hull increase", Vars::Aimbot::Projectile::HullIncrease, 0.f, 3.f, 0.5f, "%g", FSlider_Right | FSlider_Min | FSlider_Precision); FSlider("drag override", Vars::Aimbot::Projectile::DragOverride, 0.f, 1.f, 0.01f, "%g", FSlider_Left | FSlider_Min | FSlider_Precision); - FSlider("time override", Vars::Aimbot::Projectile::TimeOverride, 0.f, 1.f, 0.01f, "%g", FSlider_Right | FSlider_Min | FSlider_Precision); + FSlider("time override", Vars::Aimbot::Projectile::TimeOverride, 0.f, 2.f, 0.01f, "%g", FSlider_Right | FSlider_Min | FSlider_Precision); FSlider("huntsman lerp", Vars::Aimbot::Projectile::HuntsmanLerp, 0.f, 100.f, 1.f, "%g%%", FSlider_Left | FSlider_Clamp | FSlider_Precision); FSlider("huntsman lerp low", Vars::Aimbot::Projectile::HuntsmanLerpLow, 0.f, 100.f, 1.f, "%g%%", FSlider_Right | FSlider_Clamp | FSlider_Precision); FSlider("huntsman add", Vars::Aimbot::Projectile::HuntsmanAdd, 0.f, 20.f, 1.f, "%g", FSlider_Left | FSlider_Clamp | FSlider_Precision); @@ -377,9 +377,9 @@ void CMenu::MenuAimbot() PopTransparent(); FSlider("Cycle yaw", Vars::AntiHack::Resolver::CycleYaw, -180.f, 180.f, 45.f, "%g", FSlider_Left | FSlider_Clamp | FSlider_Precision); FSlider("Cycle pitch", Vars::AntiHack::Resolver::CyclePitch, -180.f, 180.f, 90.f, "%g", FSlider_Right | FSlider_Clamp); - FToggle("Cycle minwalk", Vars::AntiHack::Resolver::CycleMinwalk, FToggle_Left); FToggle("Cycle view", Vars::AntiHack::Resolver::CycleView, FToggle_Right); - PopTransparent(); + FToggle("Cycle minwalk", Vars::AntiHack::Resolver::CycleMinwalk, FToggle_Left); + PopTransparent(); } EndSection(); if (Section("Auto Peek")) { diff --git a/Amalgam/src/Features/Simulation/ProjectileSimulation/ProjectileSimulation.cpp b/Amalgam/src/Features/Simulation/ProjectileSimulation/ProjectileSimulation.cpp index 9022f306..bfeae5ee 100644 --- a/Amalgam/src/Features/Simulation/ProjectileSimulation/ProjectileSimulation.cpp +++ b/Amalgam/src/Features/Simulation/ProjectileSimulation/ProjectileSimulation.cpp @@ -333,12 +333,12 @@ bool CProjectileSimulation::Initialize(ProjectileInfo& info, bool bSimulate) break; case TF_PROJECTILE_THROWABLE: flDrag = 1.f; - vDragBasis = { 0.006645f, 0.006581f, 0.006710f }; + vDragBasis = { 0.009000f /*0.006645f*/, 0.006581f, 0.006710f}; vAngDragBasis = { 0.002233f, 0.002246f, 0.002206f }; break; case TF_PROJECTILE_FESTIVE_ARROW: flDrag = 1.f; - vDragBasis = { 0.010867f, 0.0108727f, 0.010804f }; + vDragBasis = { 0.013500f /*0.010867f*/, 0.0108727f, 0.010804f }; vAngDragBasis = { 0.002081f, 0.002162f, 0.002069f }; break; case TF_PROJECTILE_JAR: // there are different drags for different models, though shouldn't matter too much here diff --git a/Amalgam/src/SDK/Vars.h b/Amalgam/src/SDK/Vars.h index 463460d2..97065803 100644 --- a/Amalgam/src/SDK/Vars.h +++ b/Amalgam/src/SDK/Vars.h @@ -296,8 +296,8 @@ namespace Vars CVar(AutoResolvePitchAmount, 90.f) CVar(CycleYaw, 0.f) CVar(CyclePitch, 0.f) - CVar(CycleMinwalk, false) CVar(CycleView, false) + CVar(CycleMinwalk, false) SUBNAMESPACE_END(Resolver) NAMESPACE_END(AntiHack)