pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-22 16:28:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust constants

Browse Source
This commit is contained in:
Akkadius
2019-03-25 18:24:16 -05:00
parent 03458b88a4
commit 850b32f2ca
3 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob_ai.cpp
+5 -9
View File
@@ -1572,14 +1572,12 @@ void NPC::AI_DoMovement() {
/**
* Roambox logic sets precedence
*/
using EQEmu::waypoints::WaypointStatus;
if (roambox_distance > 0) {
// 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() == WaypointStatus::wpsRoamBoxPauseInProgress && !IsMoving()) {
if (GetCWP() == EQEmu::WaypointStatus::RoamBoxPauseInProgress && !IsMoving()) {
// We have arrived
time_until_can_move = Timer::GetCurrentTime() + RandomTimer(roambox_min_delay, roambox_delay);
SetCurrentWP(0);
@@ -1657,7 +1655,7 @@ void NPC::AI_DoMovement() {
roambox_destination_y);
Log(Logs::Detail, Logs::NPCRoamBox, "Dest Z is (%f)", roambox_destination_z);
SetCurrentWP(WaypointStatus::wpsRoamBoxPauseInProgress);
SetCurrentWP(EQEmu::WaypointStatus::RoamBoxPauseInProgress);
NavigateTo(roambox_destination_x, roambox_destination_y, roambox_destination_z);
}
@@ -1671,7 +1669,7 @@ void NPC::AI_DoMovement() {
int32 gridno = CastToNPC()->GetGrid();
if (gridno > 0 || cur_wp == WaypointStatus::wpsQuestControlNoGrid) {
if (gridno > 0 || cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) {
if (pause_timer_complete == true) { // time to pause at wp is over
AI_SetupNextWaypoint();
} // endif (pause_timer_complete==true)
@@ -1703,7 +1701,7 @@ void NPC::AI_DoMovement() {
// as that is where roamer is unset and we don't want
// the next trip through to move again based on grid stuff.
doMove = false;
if (cur_wp == WaypointStatus::wpsQuestControlNoGrid) {
if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) {
AI_SetupNextWaypoint();
}
@@ -1801,11 +1799,9 @@ void NPC::AI_SetupNextWaypoint() {
else {
pause_timer_complete = false;
Log(Logs::Detail, Logs::Pathing, "We are departing waypoint %d.", cur_wp);
using EQEmu::waypoints::WaypointStatus;
//if we were under quest control (with no grid), we are done now..
if (cur_wp == WaypointStatus::wpsQuestControlNoGrid) {
if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) {
Log(Logs::Detail, Logs::Pathing, "Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode.");
roamer = false;
cur_wp = 0;