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

Fix issue with roambox wait time after switch to navmesh.

Browse Source
This commit is contained in:
Noudess 2019-03-15 10:28:23 -04:00
parent 20de6acfea
commit a4c171cb1d
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zone/mob_ai.cpp
View File

@ -38,6 +38,8 @@
#include <limits> #include <limits>
#include <math.h> #include <math.h>
#define ROAMBOX_MOVE_IN_PROGESS (666)
extern EntityList entity_list; extern EntityList entity_list;
extern FastMath g_Math; extern FastMath g_Math;
@ -1572,9 +1574,21 @@ void NPC::AI_DoMovement() {
/** /**
* Roambox logic sets precedence * Roambox logic sets precedence
*/ */
if (roambox_distance > 0) { if (roambox_distance > 0) {
if (!IsMoving()) { // Check if we're already moving to a WP
// If so, if we're not moving we have arrived and need to set delay
if (GetCWP() == ROAMBOX_MOVE_IN_PROGESS && !IsMoving()) {
// We have arrived
time_until_can_move = Timer::GetCurrentTime() + RandomTimer(roambox_min_delay, roambox_delay);
SetCurrentWP(0);
return;
}
// Set a new destination
if (!IsMoving() && time_until_can_move < Timer::GetCurrentTime()) {
auto move_x = static_cast<float>(zone->random.Real(-roambox_distance, roambox_distance)); auto move_x = static_cast<float>(zone->random.Real(-roambox_distance, roambox_distance));
auto move_y = static_cast<float>(zone->random.Real(-roambox_distance, roambox_distance)); auto move_y = static_cast<float>(zone->random.Real(-roambox_distance, roambox_distance));
@ -1642,12 +1656,10 @@ void NPC::AI_DoMovement() {
roambox_min_y, roambox_min_y,
roambox_max_y, roambox_max_y,
roambox_destination_y); roambox_destination_y);
} Log(Logs::Detail, Logs::NPCRoamBox, "Dest Z is (%f)", roambox_destination_z);
NavigateTo(roambox_destination_x, roambox_destination_y, roambox_destination_z); SetCurrentWP(ROAMBOX_MOVE_IN_PROGESS);
NavigateTo(roambox_destination_x, roambox_destination_y, roambox_destination_z);
if (m_Position.x == roambox_destination_x && m_Position.y == roambox_destination_y) {
time_until_can_move = Timer::GetCurrentTime() + RandomTimer(roambox_min_delay, roambox_delay);
} }
return; return;