Backups/Amalgam
1
0
Fork 0
mirror of https://github.com/rei-2/Amalgam synced 2026-10-10 04:43:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

move splash mode into main vars
MSBuild / msbuild (Release, x64) (push) Has been cancelled
Details
MSBuild / msbuild (ReleaseAVX2, x64) (push) Has been cancelled
Details
MSBuild / msbuild (ReleaseFreetype, x64) (push) Has been cancelled
Details
MSBuild / msbuild (ReleaseFreetypeAVX2, x64) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
rei-2
2026-10-05 22:08:22 -04:00
parent d063a96e06
commit da2fae6319
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amalgam/src/Features/Aimbot/AimbotMelee/AimbotMelee.cpp
+12 -12
View File
@@ -505,10 +505,10 @@ static inline void DrawVisuals(CTFPlayer* pLocal, CTFWeaponBase* pWeapon, CUserC
G::AimPoint = { tTarget.m_vPos, I::GlobalVars->tickcount }; G::AimPoint = { tTarget.m_vPos, I::GlobalVars->tickcount };
bool bPath = Vars::Visuals::Prediction::SwingLines.Value && Vars::Visuals::Prediction::PlayerPath.Value; bool bPath = Vars::Visuals::Prediction::SwingLines.Value && Vars::Visuals::Prediction::PlayerPath.Value;
bool bLine = Vars::Visuals::Line::TracersEnabled.Value; //bool bLine = Vars::Visuals::Line::TracersEnabled.Value;
bool bBoxes = Vars::Visuals::Hitbox::BonesEnabled.Value & Vars::Visuals::Hitbox::BonesEnabledEnum::OnShot; bool bBoxes = Vars::Visuals::Hitbox::BonesEnabled.Value & Vars::Visuals::Hitbox::BonesEnabledEnum::OnShot;
bool bRealPath = Vars::Visuals::Prediction::RealPath.Value; bool bRealPath = Vars::Visuals::Prediction::RealPath.Value;
if (bPath || bLine || bBoxes || bRealPath) if (bPath /*|| bLine*/ || bBoxes || bRealPath)
{ {
if (pCmd->buttons & IN_ATTACK && G::CanPrimaryAttack && pWeapon->m_flSmackTime() < 0.f) if (pCmd->buttons & IN_ATTACK && G::CanPrimaryAttack && pWeapon->m_flSmackTime() < 0.f)
{ {
@@ -538,17 +538,17 @@ static inline void DrawVisuals(CTFPlayer* pLocal, CTFWeaponBase* pWeapon, CUserC
} }
if (G::Attacking == 1) if (G::Attacking == 1)
{ {
if (bLine) //if (bLine)
{ //{
Vec3 vEyePos = pLocal->GetShootPos(); // Vec3 vEyePos = pLocal->GetShootPos();
float flDist = vEyePos.DistTo(tTarget.m_vPos); // float flDist = vEyePos.DistTo(tTarget.m_vPos);
Vec3 vForward; Math::AngleVectors(tTarget.m_vAngleTo, &vForward); // Vec3 vForward; Math::AngleVectors(tTarget.m_vAngleTo, &vForward);
if (Vars::Colors::LineIgnoreZ.Value.a) // if (Vars::Colors::LineIgnoreZ.Value.a)
G::LineStorage.emplace_back(std::pair<Vec3, Vec3>(vEyePos, vEyePos + vForward * flDist), I::GlobalVars->curtime + Vars::Visuals::Line::DrawDuration.Value, Vars::Colors::LineIgnoreZ.Value); // G::LineStorage.emplace_back(std::pair<Vec3, Vec3>(vEyePos, vEyePos + vForward * flDist), I::GlobalVars->curtime + Vars::Visuals::Line::DrawDuration.Value, Vars::Colors::LineIgnoreZ.Value);
if (Vars::Colors::Line.Value.a) // if (Vars::Colors::Line.Value.a)
G::LineStorage.emplace_back(std::pair<Vec3, Vec3>(vEyePos, vEyePos + vForward * flDist), I::GlobalVars->curtime + Vars::Visuals::Line::DrawDuration.Value, Vars::Colors::Line.Value, true); // G::LineStorage.emplace_back(std::pair<Vec3, Vec3>(vEyePos, vEyePos + vForward * flDist), I::GlobalVars->curtime + Vars::Visuals::Line::DrawDuration.Value, Vars::Colors::Line.Value, true);
} //}
if (bBoxes) if (bBoxes)
{ {
auto vBoxes = F::Visuals.GetHitboxes(tTarget.m_pRecord->m_aBones, tTarget.m_pEntity->As<CBaseAnimating>()); auto vBoxes = F::Visuals.GetHitboxes(tTarget.m_pRecord->m_aBones, tTarget.m_pEntity->As<CBaseAnimating>());
Amalgam/src/Features/ImGui/Menu/Menu.cpp
+5 -5
View File
@@ -282,11 +282,12 @@ void CMenu::MenuAimbot(int iTab)
if (Section("Projectile")) if (Section("Projectile"))
{ {
FDropdown(Vars::Aimbot::Projectile::StrafePrediction, FDropdownEnum::Left); FDropdown(Vars::Aimbot::Projectile::StrafePrediction, FDropdownEnum::Left);
FDropdown(Vars::Aimbot::Projectile::SplashPrediction, FDropdownEnum::Right); FDropdown(Vars::Aimbot::Projectile::Hitboxes, FDropdownEnum::Right);
FDropdown(Vars::Aimbot::Projectile::SplashPrediction, FDropdownEnum::Left);
FDropdown(Vars::Aimbot::Projectile::SplashMode, FDropdownEnum::Right);
FDropdown(Vars::Aimbot::Projectile::AutoDetonate, FDropdownEnum::Left); FDropdown(Vars::Aimbot::Projectile::AutoDetonate, FDropdownEnum::Left);
FDropdown(Vars::Aimbot::Projectile::AutoAirblast, FDropdownEnum::Right); FDropdown(Vars::Aimbot::Projectile::AutoAirblast, FDropdownEnum::Right);
FDropdown(Vars::Aimbot::Projectile::Hitboxes, FDropdownEnum::Left); FDropdown(Vars::Aimbot::Projectile::Modifiers);
FDropdown(Vars::Aimbot::Projectile::Modifiers, FDropdownEnum::Right);
FSlider(Vars::Aimbot::Projectile::MaxSimulationTime, FSliderEnum::Left); FSlider(Vars::Aimbot::Projectile::MaxSimulationTime, FSliderEnum::Left);
PushTransparent(!Vars::Aimbot::Projectile::StrafePrediction.Value); PushTransparent(!Vars::Aimbot::Projectile::StrafePrediction.Value);
{ {
@@ -327,9 +328,8 @@ void CMenu::MenuAimbot(int iTab)
} }
FText("Splash", { 5, 5 }); FText("Splash", { 5, 5 });
if (FPopupButton("Splash", { 0, -5 }, -8)) if (FPopupButton("Splash", { 0, -5 }))
{ {
FDropdown(Vars::Aimbot::Projectile::SplashMode);
PushTransparent(Vars::Aimbot::Projectile::SplashMode.Value != Vars::Aimbot::Projectile::SplashModeEnum::Trace); PushTransparent(Vars::Aimbot::Projectile::SplashMode.Value != Vars::Aimbot::Projectile::SplashModeEnum::Trace);
{ {
FSlider(Vars::Aimbot::Projectile::SplashPointsDirect, FSliderEnum::Left); FSlider(Vars::Aimbot::Projectile::SplashPointsDirect, FSliderEnum::Left);
Amalgam/src/SDK/Vars.h
+7 -7
View File
@@ -307,18 +307,21 @@ NAMESPACE_BEGIN(Vars)
CVarEnum(StrafePrediction, VA_LIST("Predict", "Strafe prediction"), 0b11, DROPDOWN_MULTI, "Off", CVarEnum(StrafePrediction, VA_LIST("Predict", "Strafe prediction"), 0b11, DROPDOWN_MULTI, "Off",
VA_LIST("Air strafing", "Ground strafing"), VA_LIST("Air strafing", "Ground strafing"),
Air = 1 << 0, Ground = 1 << 1); Air = 1 << 0, Ground = 1 << 1);
CVarEnum(SplashPrediction, VA_LIST("Splash", "Splash prediction"), 0, NONE, nullptr, CVarEnum(Hitboxes, VA_LIST("Hitboxes", "Projectile hitboxes"), 0b001111, DROPDOWN_MULTI, nullptr,
VA_LIST("Auto", "##Divider", "Head", "Body", "Feet", "##Divider", "Bodyaim if lethal", "Prioritize feet"),
Auto = 1 << 0, Head = 1 << 1, Body = 1 << 2, Feet = 1 << 3, BodyaimIfLethal = 1 << 4, PrioritizeFeet = 1 << 5);
CVarEnum(SplashPrediction, "Splash prediction", 0, NONE, nullptr,
VA_LIST("Off", "Include", "Prefer", "Only"), VA_LIST("Off", "Include", "Prefer", "Only"),
Off, Include, Prefer, Only); Off, Include, Prefer, Only);
CVarEnum(SplashMode, "Splash mode", 0, NONE, nullptr,
VA_LIST("Trace", "Face"),
Trace, Face);
CVarEnum(AutoDetonate, "Auto detonate", 0b00, DROPDOWN_MULTI, "Off", CVarEnum(AutoDetonate, "Auto detonate", 0b00, DROPDOWN_MULTI, "Off",
VA_LIST("Stickies", "Flares", "##Divider", "Prevent self damage", "Ignore invisible"), VA_LIST("Stickies", "Flares", "##Divider", "Prevent self damage", "Ignore invisible"),
Stickies = 1 << 0, Flares = 1 << 1, PreventSelfDamage = 1 << 2, IgnoreInvisible = 1 << 3); Stickies = 1 << 0, Flares = 1 << 1, PreventSelfDamage = 1 << 2, IgnoreInvisible = 1 << 3);
CVarEnum(AutoAirblast, "Auto airblast", 0b000, DROPDOWN_MULTI, "Off", CVarEnum(AutoAirblast, "Auto airblast", 0b000, DROPDOWN_MULTI, "Off",
VA_LIST("Enabled", "##Divider", "Redirect", "Ignore FOV"), VA_LIST("Enabled", "##Divider", "Redirect", "Ignore FOV"),
Enabled = 1 << 0, Redirect = 1 << 1, IgnoreFOV = 1 << 2); Enabled = 1 << 0, Redirect = 1 << 1, IgnoreFOV = 1 << 2);
CVarEnum(Hitboxes, VA_LIST("Hitboxes", "Projectile hitboxes"), 0b001111, DROPDOWN_MULTI, nullptr,
VA_LIST("Auto", "##Divider", "Head", "Body", "Feet", "##Divider", "Bodyaim if lethal", "Prioritize feet"),
Auto = 1 << 0, Head = 1 << 1, Body = 1 << 2, Feet = 1 << 3, BodyaimIfLethal = 1 << 4, PrioritizeFeet = 1 << 5);
CVarEnum(Modifiers, VA_LIST("Modifiers", "Projectile modifiers"), 0b0010, DROPDOWN_MULTI, nullptr, CVarEnum(Modifiers, VA_LIST("Modifiers", "Projectile modifiers"), 0b0010, DROPDOWN_MULTI, nullptr,
VA_LIST("Charge weapon", "Cancel charge", "Use arm time", "Air splash", "Lob angles", "Target dormant"), VA_LIST("Charge weapon", "Cancel charge", "Use arm time", "Air splash", "Lob angles", "Target dormant"),
ChargeWeapon = 1 << 0, CancelCharge = 1 << 1, UseArmTime = 1 << 2, AirSplash = 1 << 3, LobAngles = 1 << 4, TargetDormant = 1 << 5); ChargeWeapon = 1 << 0, CancelCharge = 1 << 1, UseArmTime = 1 << 2, AirSplash = 1 << 3, LobAngles = 1 << 4, TargetDormant = 1 << 5);
@@ -359,9 +362,6 @@ NAMESPACE_BEGIN(Vars)
CVar(HuntsmanPullPoint, "Huntsman pull point", false, NOSAVE | DEBUGVAR); CVar(HuntsmanPullPoint, "Huntsman pull point", false, NOSAVE | DEBUGVAR);
CVar(HuntsmanPullNoZ, "Pull no Z", false, NOSAVE | DEBUGVAR); CVar(HuntsmanPullNoZ, "Pull no Z", false, NOSAVE | DEBUGVAR);
CVarEnum(SplashMode, "Splash mode", 0, NOSAVE | DEBUGVAR, nullptr,
VA_LIST("Trace", "Face"),
Trace, Face);
CVar(SplashAirCount, "Splash air count", 0, NOSAVE | DEBUGVAR | SLIDER_MIN, 0, 10); CVar(SplashAirCount, "Splash air count", 0, NOSAVE | DEBUGVAR | SLIDER_MIN, 0, 10);
CVar(SplashPointsDirect, "Splash points direct", 100, NOSAVE | DEBUGVAR | SLIDER_MIN | SLIDER_PRECISION, 0, 400, 5); CVar(SplashPointsDirect, "Splash points direct", 100, NOSAVE | DEBUGVAR | SLIDER_MIN | SLIDER_PRECISION, 0, 400, 5);
CVar(SplashPointsArc, "Splash points arc", 100, NOSAVE | DEBUGVAR | SLIDER_MIN | SLIDER_PRECISION, 0, 400, 5); CVar(SplashPointsArc, "Splash points arc", 100, NOSAVE | DEBUGVAR | SLIDER_MIN | SLIDER_PRECISION, 0, 400, 5);