nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-15 16:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/CreatureAI): improve npc position during the combat (#3369)

Browse Source 
+ tangent equation to find correct angle and distance when moving

+ implemented proper backward

* Improved performance + random angle margin

* chore: add tollerance calculation in instance

* improved LOS checks with movements

* implemented collisions using raycast (imported by TC)

+ improved collision detection for CanReachPositionAndGetCoords

+ improved collision check

+ set correct flags for the backward movement

+ first implementation of slope angle (to improve)

Co-authored-by: Yehonal <yehonal.azeroth@gmail.com>
This commit is contained in:
Stefano Borzì
2021-01-04 20:23:08 +01:00
committed by GitHub
parent 039e143d48
commit b2761626fe
22 changed files with 1411 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/server/game/Movement/MotionMaster.cpp
View File

@@ -320,12 +320,81 @@ void MotionMaster::MoveChase(Unit* target, float dist, float angle)
}
}
void MotionMaster::MoveBackwards(Unit* target, float dist)
{
if (!target)
{
return;
}
Position const& pos = target->GetPosition();
float angle = target->GetAngle(_owner);
G3D::Vector3 point;
point.x = pos.m_positionX + dist * cosf(angle);
point.y = pos.m_positionY + dist * sinf(angle);
point.z = pos.m_positionZ;
//if (_owner->IsFlying())
// point.z = pos.m_positionZ;
//else
// point.z = _owner->GetMapHeight(point.x, point.y, point.z);
if (_owner->GetMap()->CanReachPositionAndGetCoords(_owner, point.x, point.y, point.z, true, 6.0f, M_PI/4))
{
Movement::MoveSplineInit init(_owner);
init.MoveTo(point.x, point.y, point.z, true);
init.SetFacing(target);
init.SetOrientationInversed();
init.Launch();
}
}
void MotionMaster::MoveCircleTarget(Unit* target)
{
if (!target)
{
return;
}
Position* point = target->GetMeleeAttackPoint(_owner);
if (point == NULL)
{
return;
}
if (_owner->IsFlying()) {
// Dont do anything yet might add later
}
else
{
point->m_positionZ = _owner->GetMapHeight(point->m_positionX, point->m_positionY, point->m_positionZ);
}
const Map* _map = _owner->GetBaseMap();
float x = point->m_positionX;
float y = point->m_positionY;
float z = point->m_positionZ;
if (_map->CanReachPositionAndGetCoords(_owner, x, y, z, true, 6.0f, M_PI/3))
{
Movement::MoveSplineInit init(_owner);
init.SetSmooth();
init.MoveTo(x, y, z, true);
init.SetWalk(true);
init.SetFacing(target);
init.Launch();
}
}
void MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlot slot)
{
// Xinef: do not allow to move with UNIT_FLAG_DISABLE_MOVE
// ignore movement request if target not exist
if (!target || target == _owner || _owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
{
return;
}
//_owner->AddUnitState(UNIT_STATE_FOLLOW);
if (_owner->GetTypeId() == TYPEID_PLAYER)