diff --git a/simple-ipc b/simple-ipc index e532876f..94a287d6 160000 --- a/simple-ipc +++ b/simple-ipc @@ -1 +1 @@ -Subproject commit e532876ffd707a48389d54ff904dcc40a84f2839 +Subproject commit 94a287d6faa00d44e1084b04e602842849858443 diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp index 1d8a84ed..702fe6fc 100644 --- a/src/hacks/Aimbot.cpp +++ b/src/hacks/Aimbot.cpp @@ -100,6 +100,8 @@ static CatVar auto_spin_up(CV_SWITCH, "aimbot_spin_up", "0", "Auto Spin Up", "Sp static CatVar auto_zoom(CV_SWITCH, "aimbot_auto_zoom", "0", "Auto Zoom", "Automatically zoom in if you can see target, useful for followbots"); */ +static CatVar rageonly(CV_SWITCH, "aimbot_rage_only", "0", "Ignore non-rage targets", "Use playerlist to set up rage targets"); + // Current Entity int target_eid { 0 }; CachedEntity* target = 0; @@ -359,6 +361,11 @@ bool IsTargetStateGood(CachedEntity* entity) { if (EffectiveTargetingRange()) { if (entity->m_flDistance > EffectiveTargetingRange()) return false; } + if (rageonly) { + if (playerlist::AccessData(entity).state != playerlist::k_EState::RAGE) { + return false; + } + } IF_GAME (IsTF()) { // If settings allow waiting for charge, and current charge cant kill target, dont aim if (wait_for_charge && g_pLocalPlayer->holding_sniper_rifle) { diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp index 4ba4ca9b..3cd9c63d 100644 --- a/src/hacks/ESP.cpp +++ b/src/hacks/ESP.cpp @@ -399,6 +399,7 @@ void _FASTCALL ProcessEntity(CachedEntity* ent) { // only if bTeammatePowerup or bTeammates is true if (legit && ent->m_iTeam != g_pLocalPlayer->team && playerlist::IsDefault(info.friendsID)) { if (IsPlayerInvisible(ent)) return; + if (vischeck && !ent->IsVisible()) return; /*if (ent->m_lLastSeen > (unsigned)v_iLegitSeenTicks->GetInt()) { return; }*/ diff --git a/src/hacks/Trigger.cpp b/src/hacks/Trigger.cpp index ab0af204..f115b30e 100644 --- a/src/hacks/Trigger.cpp +++ b/src/hacks/Trigger.cpp @@ -27,7 +27,7 @@ static CatVar trigger_key_mode(trigger_key_modes_enum, "trigger_key_mode", "1", static CatEnum hitbox_mode_enum({ "AUTO-HEAD", "AUTO-CLOSEST", "Head only" }); static CatVar hitbox_mode(hitbox_mode_enum, "trigger_hitboxmode", "0", "Hitbox Mode", "Defines hitbox selection mode"); -static CatVar accuracy(CV_INT, "trigger_accuracy", "0", "Improve accuracy", "Improves triggerbot accuracy when aiming for specific hitbox"); +static CatVar accuracy(CV_INT, "trigger_accuracy", "0", "Improve accuracy", "Improves triggerbot accuracy when aiming for specific hitbox. Recommended to use with sniper rifle/ambassador"); static CatVar ignore_vaccinator(CV_SWITCH, "trigger_ignore_vaccinator", "1", "Ignore Vaccinator", "Hitscan weapons won't fire if enemy is vaccinated against bullets"); static CatVar ignore_hoovy(CV_SWITCH, "trigger_ignore_hoovy", "1", "Ignore Hoovies", "Triggerbot won't attack hoovies"); diff --git a/src/helpers.cpp b/src/helpers.cpp index 03fefa59..74398d80 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -726,7 +726,10 @@ void PrintChat(const char* fmt, ...) { vsprintf(buf, fmt, list); va_end(list); std::unique_ptr str(strfmt("\x07%06X[\x07%06XCAT\x07%06X]\x01 %s", 0x5e3252, 0xba3d9a, 0x5e3252, buf)); + // FIXME DEBUG LOG + logging::Info("%s", str.get()); chat->Printf(str.get()); + } else { } } diff --git a/src/hooks/others.cpp b/src/hooks/others.cpp index 9d3a0b20..a7bf11cf 100644 --- a/src/hooks/others.cpp +++ b/src/hooks/others.cpp @@ -215,7 +215,7 @@ static CatVar resolver(CV_SWITCH, "resolver", "0", "Resolve angles"); const char* GetFriendPersonaName_hook(ISteamFriends* _this, CSteamID steamID) { static const GetFriendPersonaName_t original = (GetFriendPersonaName_t)hooks::steamfriends.GetMethod(offsets::GetFriendPersonaName()); - if ((force_name.convar->m_StringLength > 3) && steamID == g_ISteamUser->GetSteamID()) { + if ((strlen(force_name.GetString()) > 1) && steamID == g_ISteamUser->GetSteamID()) { return force_name_newlined; } return original(_this, steamID); diff --git a/tf-settings/menu.json b/tf-settings/menu.json index 91ee2899..ef1c3c76 100644 --- a/tf-settings/menu.json +++ b/tf-settings/menu.json @@ -135,6 +135,7 @@ "type": "list", "name": "Triggerbot Preferences", "list": [ + "trigger_accuracy", "trigger_zoomed", "trigger_maxrange", "trigger_charge",