Reduced melee aiming range. Fixed autoheal trying to heali local player.

Fixed vaccinator detection.
This commit is contained in:
nullifiedcat 2016-12-21 10:58:01 +03:00
parent 57ec046725
commit a43983ee5c
3 changed files with 4 additions and 3 deletions

View File

@ -182,7 +182,7 @@ Color colors::EntityF(CachedEntity* ent) {
if (ent->m_iTeam == TEAM_BLU) result = blu_u;
else if (ent->m_iTeam == TEAM_RED) result = red_u;
}
if (ent->Var<int>(netvar.iCond2) & cond_ex::vacc_bullet) {
if (ent->Var<int>(netvar.iCond1) & cond_ex::vacc_bullet) {
if (ent->m_iTeam == TEAM_BLU) result = blu_v;
else if (ent->m_iTeam == TEAM_RED) result = red_v;
}

View File

@ -305,7 +305,7 @@ bool Aimbot::ShouldTarget(IClientEntity* entity) {
if ((enemy_pos - my_pos).Length() > v_iMaxRange->GetInt()) return false;
}
if (GetWeaponMode(g_pLocalPlayer->entity) == weaponmode::weapon_melee) {
if ((enemy_pos - my_pos).Length() > 120) return false;
if ((enemy_pos - my_pos).Length() > 105) return false;
}
int econd = GetEntityValue<int>(entity, netvar.iCond1);
if ((econd & cond_ex::vacc_bullet)) return false;
@ -333,7 +333,7 @@ bool Aimbot::ShouldTarget(IClientEntity* entity) {
if ((enemy_pos - g_pLocalPlayer->v_Origin).Length() > v_iMaxRange->GetInt()) return false;
}
if (GetWeaponMode(g_pLocalPlayer->entity) == weaponmode::weapon_melee) {
if ((enemy_pos - g_pLocalPlayer->v_Origin).Length() > 120) return false;
if ((enemy_pos - g_pLocalPlayer->v_Origin).Length() > 105) return false;
}
Vector resultAim;
// TODO fix proj buildings

View File

@ -54,6 +54,7 @@ bool AutoHeal::CanHeal(int idx) {
IClientEntity* ent = interfaces::entityList->GetClientEntity(idx);
if (!ent) return false;
if (ent->GetClientClass()->m_ClassID != ClassID::CTFPlayer) return false;
if (interfaces::engineClient->GetLocalPlayer() == idx) return false;
if (GetEntityValue<char>(ent, netvar.iLifeState)) return false;
if (g_pLocalPlayer->team != GetEntityValue<int>(ent, netvar.iTeamNum)) return false;
if (g_pLocalPlayer->v_Origin.DistToSqr(ent->GetAbsOrigin()) > 420 * 420) return false;