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

WIP: Pathfinding Nr. 9: Fix Gay

Browse Source
This commit is contained in:
TotallyNotElite 2018-08-17 18:22:07 +02:00
parent 26291c5879
commit 5373b3296d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/navparser.cpp
View File

@ -1,6 +1,7 @@
#include "common.hpp" #include "common.hpp"
#include "micropather.h" #include "micropather.h"
#include "pwd.h" #include "pwd.h"
#include "navparser.hpp"
namespace nav namespace nav
{ {
@ -84,7 +85,7 @@ struct MAP : public micropather::Graph
auto &neighbours = area->m_connections; auto &neighbours = area->m_connections;
for (auto i : neighbours) for (auto i : neighbours)
{ {
if (GetZBetweenAreas(area, i.area) > 30) if (GetZBetweenAreas(area, i.area) > 42)
continue; continue;
micropather::StateCost cost; micropather::StateCost cost;
cost.state = cost.state =
@ -123,7 +124,7 @@ void Init()
lvldir.append(".nav"); lvldir.append(".nav");
logging::Info(format("Pathing: Nav File location: ", lvldir).c_str()); logging::Info(format("Pathing: Nav File location: ", lvldir).c_str());
areas.empty(); areas.clear();
navfile = CNavFile(lvldir.c_str()); navfile = CNavFile(lvldir.c_str());
if (!navfile.m_isOK) if (!navfile.m_isOK)
logging::Info("Pathing: Invalid Nav File"); logging::Info("Pathing: Invalid Nav File");
@ -198,6 +199,7 @@ std::vector<Vector> findPath(Vector loc, Vector dest)
{ {
path.push_back(static_cast<CNavArea *>(pathNodes[i])->m_center); path.push_back(static_cast<CNavArea *>(pathNodes[i])->m_center);
} }
path.push_back(dest);
return path; return path;
} }
@ -232,13 +234,16 @@ void CreateMove()
return; return;
} }
ReadyForCommands = false; ReadyForCommands = false;
if(g_pLocalPlayer->v_Origin.DistTo(crumbs.at(0)) < 20.0f) if (g_pLocalPlayer->v_Origin.DistTo(crumbs.at(0)) < 30.0f)
{ {
crumbs.erase(crumbs.begin()); crumbs.erase(crumbs.begin());
inactivity.update(); inactivity.update();
} }
if (crumbs.empty()) if (crumbs.empty())
return; return;
if (crumbs.at(0).z - g_pLocalPlayer->v_Origin.z > 18 &&
lastJump.test_and_set(200))
current_user_cmd->buttons |= IN_JUMP;
if (inactivity.test_and_set(5000)) if (inactivity.test_and_set(5000))
{ {
logging::Info("NavBot inactive for too long. Canceling tasks..."); logging::Info("NavBot inactive for too long. Canceling tasks...");