pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-03 07:02:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #781 from SecretsOTheP/movement_manager

Browse Source 
Add MoveTo functionality to allow NPC to clip through walls and preve…
This commit is contained in:
Alex 2018-10-19 13:03:29 -07:00 committed by GitHub
commit b3fd1e6c9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
zone/mob_movement_manager.cpp
View File

@ -623,11 +623,28 @@ void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMove
bool stuck = false; bool stuck = false;
auto route = zone->pathing->FindRoute(glm::vec3(who->GetX(), who->GetY(), who->GetZ()), glm::vec3(x, y, z), partial, stuck); auto route = zone->pathing->FindRoute(glm::vec3(who->GetX(), who->GetY(), who->GetZ()), glm::vec3(x, y, z), partial, stuck);
//if route empty then return //if route empty or only has two points, and we have los, then just force npc to move to location
if (route.empty()) { if (route.size() < 3) {
return; auto iter = _impl->Entries.find(who);
auto &ent = (*iter);
if (zone->zonemap->CheckLoS(who->GetPosition(), glm::vec3(x, y, z)) && route.size() > 0)
{
auto &first = route.front();
auto &last = route.back();
PushMoveTo(ent.second, x, y, z, mode);
return;
}
else if(route.size() < 2)
{
PushMoveTo(ent.second, x, y, z, mode);
return;
}
} }
auto &first = route.front(); auto &first = route.front();
auto &last = route.back(); auto &last = route.back();
@ -695,19 +712,21 @@ void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMove
} }
//move to / teleport to node + 1 //move to / teleport to node + 1
if (next_node.teleport) { if (next_node.teleport && next_node.pos.x != 0.0f && next_node.pos.y != 0.0f) {
PushTeleportTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z, PushTeleportTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z,
CalculateHeadingAngleBetweenPositions(current_node.pos.x, current_node.pos.y, next_node.pos.x, next_node.pos.y)); CalculateHeadingAngleBetweenPositions(current_node.pos.x, current_node.pos.y, next_node.pos.x, next_node.pos.y));
} }
else { else {
PushMoveTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z, mode); if (next_node.pos.x != 0.0f && next_node.pos.y != 0.0f)
{
PushMoveTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z, mode);
}
} }
} }
//if stuck then handle stuck //if stuck then handle stuck
if (stuck) { if (stuck) {
PushTeleportTo(ent.second, x, y, z, PushMoveTo(ent.second, x, y, z, mode);
CalculateHeadingAngleBetweenPositions(previous_pos.x, previous_pos.y, x, y));
} }
else { else {
PushStopMoving(ent.second); PushStopMoving(ent.second);