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

Navbot changes and deny keyboard in menu

Browse Source
This commit is contained in:
TotallyNotElite 2018-10-26 17:35:18 +02:00
parent e6e4fb4170
commit d5482d3bbf
5 changed files with 62 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/navparser.hpp
View File

@ -1,13 +1,34 @@
#pragma once
#include <memory>
#include <mutex>
#include <CNavFile.h>
namespace nav
{
// Navfile containing areas and its lock
enum thread_status : uint8_t
{
off = 0,
unavailable,
initing,
on
};
// Call prepare first and check its return value
extern std::unique_ptr<CNavFile> navfile;
extern std::mutex navfile_lock;
// Current path priority
extern int curr_priority;
// Check if ready to recieve another NavTo (to avoid overwriting of instructions)
extern bool ReadyForCommands;
// Ignore. For level init only
extern std::atomic<thread_status> status;
// Nav to vector
bool navTo(Vector destination, int priority = 5, bool should_repath = true, bool nav_to_local = true, bool is_repath = false);
// Check and init navparser
bool prepare();
// Clear current path
void clearInstructions();
} // namespace nav

46
src/hacks/FollowBot.cpp
View File

@ -230,16 +230,16 @@ static HookedFunction
}
if (CE_GOOD(ENTITY(follow_target)) && navtime.test_and_set(2000))
{
// if (nav::NavTo(ENTITY(follow_target)->m_vecOrigin()))
// {
// navtimeout.update();
// }
if (nav::navTo(ENTITY(follow_target)->m_vecOrigin()))
{
navtimeout.update();
}
}
if (navtimeout.check(15000) || nav::curr_priority == 0)
{
isnaving = false;
nav::clearInstructions();
}
// if (navtimeout.check(15000) || nav::priority == 0)
// {
// isnaving = false;
// nav::clearInstructions();
// }
return;
}
@ -312,13 +312,13 @@ static HookedFunction
if (VisCheckEntFromEnt(LOCAL_E, entity))
found = true;
}
// if (!found && nav::Prepare())
// {
// if (!nav::NavTo(entity->m_vecOrigin()))
// continue;
// navtimeout.update();
// found = true;
// }
if (!found && nav::prepare())
{
if (!nav::navTo(entity->m_vecOrigin()))
continue;
navtimeout.update();
found = true;
}
if (!found)
continue;
follow_target = entity->m_IDX;
@ -416,13 +416,13 @@ static HookedFunction
if (VisCheckEntFromEnt(LOCAL_E, entity))
found = true;
}
// if (!found && nav::Prepare())
// {
// if (!nav::NavTo(entity->m_vecOrigin()))
// continue;
// navtimeout.update();
// found = true;
// }
if (!found && nav::prepare())
{
if (!nav::navTo(entity->m_vecOrigin()))
continue;
navtimeout.update();
found = true;
}
if (!found)
continue;
// ooooo, a target

1
src/hooks/CreateMove.cpp
View File

@ -277,6 +277,7 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time,
DelayTimer.update();
// hacks::tf2::NavBot::Init();
// hacks::tf2::NavBot::initonce();
nav::status = nav::off;
IRC::auth();
firstcm = false;
}

33
src/navparser.cpp
View File

@ -12,14 +12,6 @@ static settings::Bool enabled{ "misc.pathing", "true" };
static std::vector<Vector> crumbs;
enum thread_status : uint8_t
{
off = 0,
unavailable,
initing,
on
};
enum ignore_status : uint8_t
{
// Status is unknown
@ -172,7 +164,7 @@ public:
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now() - time.last)
.count();
if (connection.stucktime > 2999)
if (connection.stucktime > 3999)
{
connection.status = explicit_ignored;
connection.ignoreTimeout.update();
@ -280,11 +272,10 @@ struct Graph : public micropather::Graph
}
};
// Navfile containing areas and its lock
// Navfile containing areas
std::unique_ptr<CNavFile> navfile;
std::mutex navfile_lock;
// Thread and status of thread
static std::atomic<thread_status> status;
std::atomic<thread_status> status;
static std::thread thread;
// See "Graph", does pathing and stuff I guess
@ -304,13 +295,12 @@ void initThread()
lvldir.append(".nav");
logging::Info(format("Pathing: Nav File location: ", lvldir).c_str());
std::lock_guard<std::mutex> lock(navfile_lock);
navfile = std::make_unique<CNavFile>(lvldir.c_str());
if (!navfile->m_isOK)
{
navfile.reset();
status = off;
status = unavailable;
}
logging::Info("Pather: Initing with %i Areas", navfile->m_areas.size());
status = on;
@ -408,7 +398,6 @@ std::vector<Vector> findPath(Vector start, Vector end)
{
if (status != on)
return {};
std::lock_guard<std::mutex> lock(navfile_lock);
CNavArea *local = findClosestNavSquare(start);
CNavArea *dest = findClosestNavSquare(end);
@ -517,12 +506,12 @@ static HookedFunction
if (crumbs.empty())
return;
// Detect when jumping is necessary
if ((crumbs.at(0).z - g_pLocalPlayer->v_Origin.z > 18 &&
if ((!(g_pLocalPlayer->holding_sniper_rifle && g_pLocalPlayer->bZoomed) && crumbs.at(0).z - g_pLocalPlayer->v_Origin.z > 18 &&
last_jump.test_and_set(200)) ||
(last_jump.test_and_set(200) && inactivity.check(2000)))
(last_jump.test_and_set(200) && inactivity.check(3000)))
current_user_cmd->buttons |= IN_JUMP;
// If inactive for too long
if (inactivity.check(3000))
if (inactivity.check(4000))
{
// Ignore connection
ignoremanager::addTime(last_area, crumbs.at(0), inactivity);
@ -556,15 +545,19 @@ static CatCommand nav_find("nav_find", "Debug nav find", []() {
static CatCommand nav_set("nav_set", "Debug nav find",
[]() { loc = g_pLocalPlayer->v_Origin; });
static CatCommand nav_init("nav_init", "Debug nav init", []() { prepare(); });
static CatCommand nav_init("nav_init", "Debug nav init", []() {
status = off;
prepare();
});
static CatCommand nav_path("nav_path", "Debug nav path", []() { navTo(loc); });
static CatCommand nav_reset_ignores("nav_reset_ignores", "Reset all ignores.",
[]() { ignoremanager::reset(); });
void yeet()
void clearInstructions()
{
crumbs.clear();
}
} // namespace nav

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

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