Backups/Amalgam
1
0 Fork 0
mirror of https://github.com/rei-2/Amalgam.git synced 2026-10-11 01:38:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
rei-2 committed 2025-02-18 18:59:35 -05:00
1 parent 1b9bbad1fd
commit cc99a5aef6
4 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Amalgam/src/Features/Aimbot/AimbotProjectile/AimbotProjectile.cpp
+4 -4
View File
@@ -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)
{
Amalgam/src/Features/ImGui/Menu/Menu.cpp
+3 -3
View File
@@ -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"))
{
Amalgam/src/Features/Simulation/ProjectileSimulation/ProjectileSimulation.cpp
+2 -2
View File
@@ -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
Amalgam/src/SDK/Vars.h
+1 -1
View File
@@ -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)