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

Merge remote-tracking branch 'origin/master' into experimental

Browse Source
This commit is contained in:
TotallyNotElite 2018-10-26 15:30:07 +02:00
commit e6e4fb4170
7 changed files with 87 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hacks/CatBot.cpp
View File

@ -216,12 +216,15 @@ void reportall()
// server
if (!ent)
continue;
// Pointer comparison is fine
if (ent == LOCAL_E)
continue;
player_info_s info;
if (g_IEngine->GetPlayerInfo(i, &info))
{
if (player_tools::shouldTarget(ent) !=
// Need to use SteamID ignore
if (player_tools::shouldTargetSteamId(info.friendsID) !=
player_tools::IgnoreReason::DO_NOT_IGNORE)
continue;
CSteamID id(info.friendsID, EUniverse::k_EUniversePublic,
@ -311,7 +314,7 @@ static HookedFunction cm(HF_CreateMove, "catbot", 5, []() {
!HasCondition<TFCond_Disguised>(LOCAL_E) && disguise.test_and_set(3000))
{
int teamtodisguise =
(LOCAL_E->m_iTeam() == TEAM_RED) ? TEAM_BLU - 1 : TEAM_RED - 1;
(LOCAL_E->m_iTeam() == TEAM_RED) ? TEAM_RED - 1 : TEAM_BLU - 1;
int classtojoin = classes[rand() % 3];
g_IEngine->ClientCmd_Unrestricted(
format("disguise ", classtojoin, " ", teamtodisguise).c_str());

102
src/hacks/FollowBot.cpp
View File

@ -32,25 +32,25 @@ namespace hacks::shared::followbot
{
unsigned steamid = 0x0;
CatCommand follow_steam("fb_steam", "Follow Steam Id",
[](const CCommand &args) {
if (args.ArgC() < 1)
{
steam_var = 0;
return;
}
try
{
steam_var = std::stoul(args.Arg(1));
logging::Info("Stored Steamid: %u", steamid);
}
catch (std::invalid_argument)
{
logging::Info("Invalid Argument! resetting steamid.");
steam_var = 0;
return;
}
});
CatCommand
follow_steam("fb_steam", "Follow Steam Id", [](const CCommand &args) {
if (args.ArgC() < 1)
{
steam_var = 0;
return;
}
try
{
steam_var = std::stoul(args.Arg(1));
logging::Info("Stored Steamid: %u", steamid);
}
catch (std::invalid_argument)
{
logging::Info("Invalid Argument! resetting steamid.");
steam_var = 0;
return;
}
});
CatCommand steam_debug("debug_steamid", "Print steamids", []() {
for (int i = 0; i < g_IEngine->GetMaxClients(); i++)
@ -158,33 +158,40 @@ void addCrumbPair(CachedEntity *player1, CachedEntity *player2,
}
}
}
/* Order:
* No Class = 0,
* tf_scout = 1,
* tf_sniper = 2,
* tf_soldier = 3,
* tf_demoman = 4,
* tf_medic = 5,
* tf_heavy = 6,
* tf_pyro = 7,
* tf_spy = 8,
* tf_engineer = 9
*/
static int priority_list[10][10] = {
/*0 1 2 3 4 5 6 7 8 9 */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // No class
{ 0, 8, 2, 7, 6, 2, 5, 1, 0, 0 }, // Scout
{ 0, 1, 8, 2, 2, 2, 2, 0, 0, 0 }, // Sniper
{ 0, 6, 1, 8, 7, 5, 6, 4, 0, 0 }, // Soldier
{ 0, 6, 1, 7, 8, 5, 6, 4, 0, 0 }, // Demoman
{ 0, 3, 1, 7, 7, 1, 8, 2, 0, 0 }, // Medic
{ 0, 2, 0, 7, 6, 4, 8, 5, 0, 0 }, // Heavy
{ 0, 6, 1, 6, 5, 3, 5, 8, 0, 0 }, // Pyro
{ 0, 1, 0, 0, 0, 0, 0, 0, 8, 0 }, // Spy
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 8 } // Engineer
};
int ClassPriority(CachedEntity *ent)
{
switch (g_pPlayerResource->GetClass(ent))
{
case tf_spy:
return 0;
case tf_engineer:
return 1;
case tf_medic:
return 2;
case tf_pyro:
return 3;
case tf_scout:
return 4;
case tf_sniper:
return 5;
case tf_demoman:
return 6;
case tf_soldier:
return 7;
case tf_heavy:
return 8;
default:
return 0;
}
int local_class = g_pPlayerResource->GetClass(LOCAL_E);
int ents_class = g_pPlayerResource->GetClass(ent);
return priority_list[local_class][ents_class];
}
Timer waittime{};
int lastent = 0;
@ -243,7 +250,8 @@ static HookedFunction
if (breadcrumbs.size() > crumb_limit)
follow_target = 0;
// Still good check
else if (CE_BAD(ENTITY(follow_target)) || IsPlayerInvisible(ENTITY(follow_target)))
else if (CE_BAD(ENTITY(follow_target)) ||
IsPlayerInvisible(ENTITY(follow_target)))
follow_target = 0;
}
@ -301,7 +309,7 @@ static HookedFunction
}
else
{
if(VisCheckEntFromEnt(LOCAL_E, entity))
if (VisCheckEntFromEnt(LOCAL_E, entity))
found = true;
}
// if (!found && nav::Prepare())
@ -405,7 +413,7 @@ static HookedFunction
}
else
{
if(VisCheckEntFromEnt(LOCAL_E, entity))
if (VisCheckEntFromEnt(LOCAL_E, entity))
found = true;
}
// if (!found && nav::Prepare())
@ -493,12 +501,12 @@ static HookedFunction
g_IEngine->ClientCmd("taunt");
}
// Follow the crumbs when too far away, or just starting to follow
// Follow the crumbs when too far away, or just starting to follow
#if ENABLE_IPC
float follow_dist = (float) follow_distance;
if (ipc::peer)
follow_dist += (float) additional_distance * ipc::peer->client_id;
if (dist_to_target > follow_dist )
if (dist_to_target > follow_dist)
#else
if (dist_to_target > (float) follow_distance)
#endif

27
src/hacks/KillSay.cpp
View File

@ -101,7 +101,7 @@ class KillSayEventListener : public IGameEventListener2
std::string message = hacks::shared::killsay::ComposeKillSay(event);
if (!message.empty())
{
int vid = event->GetInt("userid");
int vid = event->GetInt("userid");
killsay_storage[vid].delay = *delay;
killsay_storage[vid].timer.update();
killsay_storage[vid].message = message;
@ -109,20 +109,21 @@ class KillSayEventListener : public IGameEventListener2
}
};
static HookedFunction ProcessKillsay(HookedFunctions_types::HF_Paint, "KillSay_send", 1, []() {
if (killsay_storage.empty())
return;
for (auto &i : killsay_storage)
{
if (i.second.message.empty())
continue;
if (i.second.timer.test_and_set(i.second.delay))
static HookedFunction
ProcessKillsay(HookedFunctions_types::HF_Paint, "KillSay_send", 1, []() {
if (killsay_storage.empty())
return;
for (auto &i : killsay_storage)
{
chat_stack::Say(i.second.message, false);
i.second = {};
if (i.second.message.empty())
continue;
if (i.second.timer.test_and_set(i.second.delay))
{
chat_stack::Say(i.second.message, false);
i.second = {};
}
}
}
});
});
static KillSayEventListener listener{};

6
src/hooks/CreateMove.cpp
View File

@ -255,8 +255,10 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time,
#if !ENABLE_VISUALS
if (no_shake && CE_GOOD(LOCAL_E) && LOCAL_E->m_bAlivePlayer())
{
NET_VECTOR(RAW_ENT(LOCAL_E), netvar.vecPunchAngle) = {0.0f, 0.0f, 0.0f};
NET_VECTOR(RAW_ENT(LOCAL_E), netvar.vecPunchAngleVel) = {0.0f, 0.0f, 0.0f};
NET_VECTOR(RAW_ENT(LOCAL_E), netvar.vecPunchAngle) = { 0.0f, 0.0f,
0.0f };
NET_VECTOR(RAW_ENT(LOCAL_E), netvar.vecPunchAngleVel) = { 0.0f, 0.0f,
0.0f };
}
#endif
// PROF_END("Entity Cache updating");

6
src/hooks/visual/FrameStageNotify.cpp
View File

@ -105,8 +105,10 @@ DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_,
RemoveCondition<TFCond_Zoomed>(LOCAL_E);
if (no_shake && CE_GOOD(LOCAL_E) && LOCAL_E->m_bAlivePlayer())
{
NET_VECTOR(RAW_ENT(LOCAL_E), netvar.vecPunchAngle) = {0.0f, 0.0f, 0.0f};
NET_VECTOR(RAW_ENT(LOCAL_E), netvar.vecPunchAngleVel) = {0.0f, 0.0f, 0.0f};
NET_VECTOR(RAW_ENT(LOCAL_E),
netvar.vecPunchAngle) = { 0.0f, 0.0f, 0.0f };
NET_VECTOR(RAW_ENT(LOCAL_E),
netvar.vecPunchAngleVel) = { 0.0f, 0.0f, 0.0f };
}
}
hacks::tf::thirdperson::frameStageNotify();

5
src/irc.cpp
View File

@ -78,11 +78,12 @@ void authreq(std::string &msg)
// Get playerinfo and check if player on server
if (!g_IEngine->GetPlayerInfo(i, &pinfo))
continue;
auto tarsteamid = pinfo.friendsID;
auto tarsteamid = pinfo.friendsID;
std::string total_hash = std::to_string(tarsteamid) + pinfo.name;
MD5Value_t result;
// Hash steamid
MD5_ProcessSingleBuffer(total_hash.c_str(), strlen(total_hash.c_str()), result);
MD5_ProcessSingleBuffer(total_hash.c_str(), strlen(total_hash.c_str()),
result);
// Get bits of hash and store in string
std::string tarhash;
for (auto i : result.bits)

3
src/visual/menu/GuiInterface.cpp
View File

@ -173,7 +173,8 @@ bool gui::handleSdlEvent(SDL_Event *event)
}
}
zerokernel::Menu::instance->handleSdlEvent(event);
if (!zerokernel::Menu::instance->isInGame() && event->type == SDL_MOUSEBUTTONDOWN)
if (!zerokernel::Menu::instance->isInGame() &&
event->type == SDL_MOUSEBUTTONDOWN)
return true;
else
return false;