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

rework autoheal slightly

Browse Source
This commit is contained in:
rei-2 committed 2024-10-12 20:22:07 -04:00
1 parent 65354cfa83
commit 8c80cf89f0
1 file changed
+11 -3
Download Patch File Download Diff File Expand all files Collapse all files
Amalgam/src/Features/Aimbot/AimbotHitscan/AimbotHitscan.cpp
+11 -3
View File
@@ -42,14 +42,14 @@ std::vector<Target_t> CAimbotHitscan::GetTargetsMedigun(CTFPlayer* pLocal, CWeap
for (auto pEntity : H::Entities.GetGroup(EGroupType::PLAYERS_TEAMMATES))
{
auto pPlayer = pEntity->As<CTFPlayer>();
if (pPlayer == pLocal || !pPlayer->IsAlive() || pPlayer->IsAGhost() || pPlayer->InCond(TF_COND_STEALTHED) || pWeapon->m_hHealingTarget().Get() == pPlayer)
if (pPlayer == pLocal || !pPlayer->IsAlive() || pPlayer->IsAGhost() || pPlayer->InCond(TF_COND_STEALTHED))
continue;
if (Vars::Aimbot::Healing::FriendsOnly.Value && !H::Entities.IsFriend(pEntity->entindex()))
continue;
float flFOVTo; Vec3 vPos, vAngleTo;
if (!PlayerBoneInFOV(pPlayer, vLocalPos, vLocalAngles, flFOVTo, vPos, vAngleTo))
if (!PlayerBoneInFOV(pPlayer, vLocalPos, vLocalAngles, flFOVTo, vPos, vAngleTo) && pWeapon->m_hHealingTarget().Get() != pPlayer)
continue;
const float flDistTo = vLocalPos.DistTo(vPos);
@@ -783,6 +783,13 @@ void CAimbotHitscan::Run(CTFPlayer* pLocal, CTFWeaponBase* pWeapon, CUserCmd* pC
for (auto& target : targets)
{
if (pWeapon->GetWeaponID() == TF_WEAPON_MEDIGUN && pWeapon->As<CWeaponMedigun>()->m_hHealingTarget().Get() == target.m_pEntity)
{
if (G::LastUserCmd->buttons & IN_ATTACK)
pCmd->buttons |= IN_ATTACK;
return;
}
const auto iResult = CanHit(target, pLocal, pWeapon);
if (!iResult) continue;
if (iResult == 2)
@@ -799,7 +806,8 @@ void CAimbotHitscan::Run(CTFPlayer* pLocal, CTFWeaponBase* pWeapon, CUserCmd* pC
if (bShouldFire)
{
pCmd->buttons |= IN_ATTACK;
if (pWeapon->GetWeaponID() != TF_WEAPON_MEDIGUN || !(G::LastUserCmd->buttons & IN_ATTACK))
pCmd->buttons |= IN_ATTACK;
if (nWeaponID == TF_WEAPON_SNIPERRIFLE_CLASSIC && pWeapon->As<CTFSniperRifle>()->m_flChargedDamage())
pCmd->buttons &= ~IN_ATTACK;