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

[Quest API] Optionally parse EVENT_WAYPOINT_ARRIVE and EVENT_WAYPOINT_DEPART

Browse Source 
# Notes
- Optionally parse these events instead of always doing so.
This commit is contained in:
Kinglykrab
2023-02-12 16:42:14 -05:00
parent 924e91cf64
commit 107e768c90
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob_ai.cpp
+7 -6
View File
@@ -1753,9 +1753,10 @@ void NPC::AI_DoMovement() {
RotateTo(m_CurrentWayPoint.w);
}
//kick off event_waypoint arrive
std::string export_string = fmt::format("{}", cur_wp);
parse->EventNPC(EVENT_WAYPOINT_ARRIVE, CastToNPC(), nullptr, export_string, 0);
if (parse->HasQuestSub(GetNPCTypeID(), EVENT_WAYPOINT_ARRIVE)) {
parse->EventNPC(EVENT_WAYPOINT_ARRIVE, CastToNPC(), nullptr, std::to_string(cur_wp), 0);
}
// No need to move as we are there. Next loop will
// take care of normal grids, even at pause 0.
// We do need to call and setup a wp if we're cur_wp=-2
@@ -1871,9 +1872,9 @@ void NPC::AI_SetupNextWaypoint() {
entity_list.OpenDoorsNear(this);
if (!DistractedFromGrid) {
//kick off event_waypoint depart
std::string export_string = fmt::format("{}", cur_wp);
parse->EventNPC(EVENT_WAYPOINT_DEPART, CastToNPC(), nullptr, export_string, 0);
if (parse->HasQuestSub(GetNPCTypeID(), EVENT_WAYPOINT_DEPART)) {
parse->EventNPC(EVENT_WAYPOINT_DEPART, CastToNPC(), nullptr, std::to_string(cur_wp), 0);
}
//setup our next waypoint, if we are still on our normal grid
//remember that the quest event above could have done anything it wanted with our grid
zone/waypoints.cpp
+4 -2
View File
@@ -165,10 +165,12 @@ void NPC::ResumeWandering()
if (m_CurrentWayPoint.x == GetX() && m_CurrentWayPoint.y == GetY())
{ // are we we at a waypoint? if so, trigger event and start to next
std::string export_string = fmt::format("{}", cur_wp);
CalculateNewWaypoint();
SetAppearance(eaStanding, false);
parse->EventNPC(EVENT_WAYPOINT_DEPART, this, nullptr, export_string, 0);
if (parse->HasQuestSub(GetNPCTypeID(), EVENT_WAYPOINT_DEPART)) {
parse->EventNPC(EVENT_WAYPOINT_DEPART, this, nullptr, std::to_string(cur_wp), 0);
}
} // if not currently at a waypoint, we continue on to the one we were headed to before the stop
}
else