nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore spy for a while after decloak

Browse Source
This commit is contained in:
LightCat 2019-03-23 15:23:38 +01:00
parent 63fbb12318
commit 6cd35c6d44
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/menu/nullifiedcat/movement.xml
View File

@ -38,6 +38,7 @@
<AutoVariable width="fill" target="navbot.autojump.trigger-distance" label="Jump Distance"/>
<!--AutoVariable width="fill" target="navbot.target-sentry" label="Try to target sentries"/-->
<AutoVariable width="fill" target="navbot.stay-near" label="Zone enemies (stay near)"/>
<AutoVariable width="fill" target="navbot.spy-ignore-time" label="Spy ignore time"/>
<!-- <!AutoVariable width="fill" target="navbot.take-teleporters" label="take teleporters"/> -->
</List>
</Box>

30
src/hacks/NavBot.cpp
View File

@ -16,6 +16,7 @@ static settings::Bool get_health("navbot.get-health-and-ammo", "true");
static settings::Float jump_distance("navbot.autojump.trigger-distance", "300");
static settings::Bool autojump("navbot.autojump.enabled", "false");
static settings::Bool primary_only("navbot.primary-only", "true");
static settings::Int spy_ignore_time("navbot.spy-ignore-time", "5000");
// -Forward declarations-
bool init(bool first_cm);
@ -30,6 +31,8 @@ using task::current_task;
static std::vector<std::pair<CNavArea *, Vector>> sniper_spots;
// How long should the bot wait until pathing again?
static Timer wait_until_path{};
// Time before following target cloaked spy again
static std::array<Timer, 33> spy_cloak{};
// What is the bot currently doing
namespace task
{
@ -125,8 +128,15 @@ static std::pair<CachedEntity *, float> getNearestPlayerDistance()
for (int i = 1; i < g_IEngine->GetMaxClients(); i++)
{
CachedEntity *ent = ENTITY(i);
if (CE_GOOD(ent) && ent->m_bAlivePlayer() && ent->m_bEnemy() && g_pLocalPlayer->v_Origin.DistTo(ent->m_vecOrigin()) < distance && player_tools::shouldTarget(ent) && (!hacks::shared::aimbot::ignore_cloak || !IsPlayerInvisible(ent)) && VisCheckEntFromEnt(LOCAL_E, ent))
if (CE_GOOD(ent) && ent->m_bAlivePlayer() && ent->m_bEnemy() && g_pLocalPlayer->v_Origin.DistTo(ent->m_vecOrigin()) < distance && player_tools::shouldTarget(ent) && VisCheckEntFromEnt(LOCAL_E, ent))
{
if (hacks::shared::aimbot::ignore_cloak && IsPlayerInvisible(ent))
{
spy_cloak[i].update();
continue;
}
if (!spy_cloak[i].check(*spy_ignore_time))
continue;
distance = g_pLocalPlayer->v_Origin.DistTo(ent->m_vecOrigin());
best_ent = ent;
}
@ -211,7 +221,14 @@ static bool stayNearPlayers(const bot_class_config &config, CachedEntity *&resul
for (int i = 1; i < g_IEngine->GetMaxClients(); i++)
{
CachedEntity *ent = ENTITY(i);
if (CE_BAD(ent) || !ent->m_bAlivePlayer() || !ent->m_bEnemy() || !player_tools::shouldTarget(ent) || (hacks::shared::aimbot::ignore_cloak && IsPlayerInvisible(ent)))
if (CE_BAD(ent) || !ent->m_bAlivePlayer() || !ent->m_bEnemy() || !player_tools::shouldTarget(ent))
continue;
if (hacks::shared::aimbot::ignore_cloak && IsPlayerInvisible(ent))
{
spy_cloak[i].update();
continue;
}
if (!spy_cloak[i].check(*spy_ignore_time))
continue;
players.push_back(ent);
}
@ -273,8 +290,10 @@ static bool stayNear()
if (CE_GOOD(last_target) && stayNearHelpers::isValidNearPosition(last_area->m_center, last_target->m_vecOrigin(), *config))
invalid_area_time.update();
if (CE_GOOD(last_target) && (!last_target->m_bAlivePlayer() || !last_target->m_bEnemy() || !player_tools::shouldTarget(last_target) || (hacks::shared::aimbot::ignore_cloak && IsPlayerInvisible(last_target))))
if (CE_GOOD(last_target) && (!last_target->m_bAlivePlayer() || !last_target->m_bEnemy() || !player_tools::shouldTarget(last_target) || !spy_cloak[last_target->m_IDX].check(*spy_ignore_time) || (hacks::shared::aimbot::ignore_cloak && IsPlayerInvisible(last_target))))
{
if (hacks::shared::aimbot::ignore_cloak && IsPlayerInvisible(last_target))
spy_cloak[last_target->m_IDX].update();
nav::clearInstructions();
current_task = task::none;
}
@ -290,12 +309,17 @@ static bool stayNear()
// Are we doing nothing? Check if our current location can still attack our
// last target
if (current_task == task::none && CE_GOOD(last_target) && last_target->m_bAlivePlayer() && last_target->m_bEnemy())
{
if (hacks::shared::aimbot::ignore_cloak && IsPlayerInvisible(last_target))
spy_cloak[last_target->m_IDX].update();
if (spy_cloak[last_target->m_IDX].check(*spy_ignore_time))
{
if (stayNearHelpers::isValidNearPosition(g_pLocalPlayer->v_Origin, last_target->m_vecOrigin(), *config))
return true;
// If not, can we try pathing to our last target again?
if (stayNearHelpers::stayNearPlayer(last_target, *config, last_area))
return true;
}
last_target = nullptr;
}