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

Add another layer of randomization to roam box logic, npc's who weren't originally spawned in water won't roambox into water

Browse Source
This commit is contained in:
Akkadius
2018-08-18 22:01:46 -05:00
parent 4b6ab34fd9
commit 834062fbf9
7 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob_ai.cpp
+30 -2
View File
@@ -1663,9 +1663,35 @@ void NPC::AI_DoMovement() {
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));
roambox_destination_x = EQEmu::Clamp((GetX() + move_x), roambox_min_x, roambox_min_y);
roambox_destination_x = EQEmu::Clamp((GetX() + move_x), roambox_min_x, roambox_max_x);
roambox_destination_y = EQEmu::Clamp((GetY() + move_y), roambox_min_y, roambox_max_y);
if (roambox_destination_x == roambox_min_x || roambox_destination_x == roambox_max_x) {
roambox_destination_x = static_cast<float>(zone->random.Real(roambox_min_x, roambox_max_y));
}
if (roambox_destination_y == roambox_min_y || roambox_destination_y == roambox_max_y) {
roambox_destination_y = static_cast<float>(zone->random.Real(roambox_min_y, roambox_max_y));
}
/**
* If mob was not spawned in water, let's not randomly roam them into water
* if the roam box was sloppily configured
*/
if (!this->GetWasSpawnedInWater()) {
if (zone->zonemap != nullptr && zone->watermap != nullptr) {
auto position = glm::vec3(
roambox_destination_x,
roambox_destination_y,
this->FindGroundZ(roambox_destination_x, roambox_destination_y, 5)
);
if (zone->watermap->InLiquid(position)) {
return;
}
}
}
this->FixZ();
Log(Logs::Detail,
@@ -1681,7 +1707,9 @@ void NPC::AI_DoMovement() {
roambox_destination_y);
}
if (!CalculateNewPosition(roambox_destination_x, roambox_destination_y, GetFixedZ(m_Position), move_speed, true)) {
float new_z = this->FindGroundZ(m_Position.x, m_Position.y, 5) + GetZOffset();
if (!CalculateNewPosition(roambox_destination_x, roambox_destination_y, new_z, move_speed, true)) {
time_until_can_move = Timer::GetCurrentTime() + RandomTimer(roambox_min_delay, roambox_delay);
SetMoving(false);
this->FixZ();