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

Pets now use navmesh

Browse Source
This commit is contained in:
Akkadius 2018-09-04 20:27:43 -05:00
parent 0a42b45c67
commit 7c298a249f
1 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
zone/mob_ai.cpp
View File

@ -1557,26 +1557,46 @@ void Mob::AI_Process() {
case SPO_Follow: { case SPO_Follow: {
Mob *owner = GetOwner(); Mob *owner = GetOwner();
if (owner == nullptr) if (owner == nullptr) {
break; break;
}
glm::vec4 ownerPos = owner->GetPosition(); glm::vec4 pet_owner_position = owner->GetPosition();
float dist = DistanceSquared(m_Position, ownerPos); float distance_to_owner = DistanceSquared(m_Position, pet_owner_position);
float distz = ownerPos.z - m_Position.z; float z_distance = pet_owner_position.z - m_Position.z;
if (dist >= 400 || distz > 100) { if (distance_to_owner >= 400 || z_distance > 100) {
int speed = GetWalkspeed();
if (dist >= 1225) // 35
speed = GetRunspeed();
if (dist >= 202500 || distz > 100) // dist >= 450 int pet_speed = GetWalkspeed();
{
m_Position = ownerPos; /**
* Distance: >= 35 (Run if far away)
*/
if (distance_to_owner >= 1225) {
pet_speed = GetRunspeed();
}
/**
* Distance: >= 450 (Snap to owner)
*/
if (distance_to_owner >= 202500 || z_distance > 100) {
m_Position = pet_owner_position;
SendPositionUpdate(); SendPositionUpdate();
moved = true; moved = true;
} }
else { else {
CalculateNewPosition(owner->GetX(), owner->GetY(), owner->GetZ(), speed);
bool waypoint_changed, node_reached;
glm::vec3 Goal = UpdatePath(
owner->GetX(),
owner->GetY(),
owner->GetZ(),
pet_speed,
waypoint_changed,
node_reached
);
CalculateNewPosition(Goal.x, Goal.y, Goal.z, pet_speed, true);
} }
} }
else { else {
@ -1601,24 +1621,43 @@ void Mob::AI_Process() {
break; break;
} }
} }
if (IsPetRegroup()) if (IsPetRegroup()) {
return; return;
}
} }
/* Entity has been assigned another entity to follow */ /* Entity has been assigned another entity to follow */
else if (GetFollowID()) { else if (GetFollowID()) {
Mob *follow = entity_list.GetMob(GetFollowID()); Mob *follow = entity_list.GetMob(static_cast<uint16>(GetFollowID()));
if (!follow) { SetFollowID(0); } if (!follow) {
SetFollowID(0);
}
else { else {
float dist2 = DistanceSquared(m_Position, follow->GetPosition());
int followdist = GetFollowDistance();
if (dist2 >= followdist) // Default follow distance is 100 float distance = DistanceSquared(m_Position, follow->GetPosition());
{ int follow_distance = GetFollowDistance();
/**
* Default follow distance is 100
*/
if (distance >= follow_distance) {
int speed = GetWalkspeed(); int speed = GetWalkspeed();
if (dist2 >= followdist + 150) {
if (distance >= follow_distance + 150) {
speed = GetRunspeed(); speed = GetRunspeed();
} }
CalculateNewPosition(follow->GetX(), follow->GetY(), follow->GetZ(), speed);
bool waypoint_changed, node_reached;
glm::vec3 Goal = UpdatePath(
follow->GetX(),
follow->GetY(),
follow->GetZ(),
speed,
waypoint_changed,
node_reached
);
CalculateNewPosition(Goal.x, Goal.y, Goal.z, speed, true);
} }
else { else {
moved = false; moved = false;