diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index bc5ac1ec68..e37e65eacc 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9190,6 +9190,7 @@ void Unit::FollowTarget(Unit* target) // Determine follow configuration bool joinFormation = false; // unit will follow its target in a generated formation shape and catches up to its target bool catchUpToTarget = false; // unit will allign to the target speed and catches up to the target automatically + bool faceTarget = false; // unit will face its target with every spline float distance = DEFAULT_FOLLOW_DISTANCE_PET; if (TempSummon* summon = ToTempSummon()) @@ -9205,6 +9206,7 @@ void Unit::FollowTarget(Unit* target) { joinFormation = false; catchUpToTarget = true; + faceTarget = true; distance = DEFAULT_FOLLOW_DISTANCE; } @@ -9225,7 +9227,7 @@ void Unit::FollowTarget(Unit* target) if (joinFormation && target->HasFormationFollower(this)) return; - GetMotionMaster()->MoveFollow(target, distance, DEFAULT_FOLLOW_ANGLE, joinFormation, catchUpToTarget); + GetMotionMaster()->MoveFollow(target, distance, DEFAULT_FOLLOW_ANGLE, joinFormation, catchUpToTarget, faceTarget); } void Unit::RemoveFormationFollower(Unit* follower) diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 7046f3d205..15fe4c5dfe 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -255,7 +255,7 @@ void MotionMaster::MoveRandom(float spawndist) } } -void MotionMaster::MoveFollow(Unit* target, float dist, float angle, bool joinFormation /*= false*/, bool catchUpToTarget /*= false*/, MovementSlot slot /*= MOTION_SLOT_IDLE*/) +void MotionMaster::MoveFollow(Unit* target, float dist, float angle, bool joinFormation /*= false*/, bool catchUpToTarget /*= false*/, bool faceTarget /*= false*/, MovementSlot slot /*= MOTION_SLOT_IDLE*/) { // ignore movement request if target not exist if (!target || target == _owner) @@ -263,7 +263,7 @@ void MotionMaster::MoveFollow(Unit* target, float dist, float angle, bool joinFo TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFollow: '%s', starts following '%s'", _owner->GetGUID().ToString().c_str(), target->GetGUID().ToString().c_str()); - Mutate(new FollowMovementGenerator(target, dist, angle, joinFormation, catchUpToTarget), slot); + Mutate(new FollowMovementGenerator(target, dist, angle, joinFormation, catchUpToTarget, faceTarget), slot); } void MotionMaster::MoveChase(Unit* target, float dist, Optional angle) diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index cd556cc674..24b4e0af92 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -147,7 +147,7 @@ class TC_GAME_API MotionMaster void MoveIdle(); void MoveTargetedHome(); void MoveRandom(float spawndist = 0.0f); - void MoveFollow(Unit* target, float dist, float angle, bool joinFormation = false, bool catchUpToTarget = false, MovementSlot slot = MOTION_SLOT_IDLE); + void MoveFollow(Unit* target, float dist, float angle, bool joinFormation = false, bool catchUpToTarget = false, bool faceTarget = false, MovementSlot slot = MOTION_SLOT_IDLE); void MoveChase(Unit* target, float dist = 0.f, Optional angle = {}); void MoveChase(Unit* target, float dist, float angle) { MoveChase(target, dist, ChaseAngle(angle)); } diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp index 4f4351d4c1..f18a473eac 100644 --- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp @@ -154,8 +154,8 @@ static void GetFollowOffsets(uint8 followerIndex, float& distance, float& relati relativeAngle = Position().GetRelativeAngle(pos); } -FollowMovementGenerator::FollowMovementGenerator(Unit* target, Optional distance, Optional angle, bool joinFormation /*= true*/, bool catchUpToTarget /*= false*/) : - _target(target), _joinFormation(joinFormation), _catchUpToTarget(catchUpToTarget) +FollowMovementGenerator::FollowMovementGenerator(Unit* target, Optional distance, Optional angle, bool joinFormation /*= true*/, bool catchUpToTarget /*= false*/, bool faceTarget /*= false*/) : + _target(target), _joinFormation(joinFormation), _catchUpToTarget(catchUpToTarget), _faceTarget(faceTarget) { _distance = distance ? distance.get() : 0.f; _angle = angle ? angle.get() : 0.f; @@ -227,10 +227,16 @@ bool FollowMovementGenerator::Update(Unit* owner, uint32 diff) } else if (owner->HasUnitState(UNIT_STATE_FOLLOW_MOVE)) { - owner->StopMoving(); owner->ClearUnitState(UNIT_STATE_FOLLOW_MOVE); DoMovementInform(owner, _target); - _events.ScheduleEvent(EVENT_ALLIGN_TO_TARGET, Milliseconds(ALLIGN_MOVEMENT_INTERVAL)); + + if (!_faceTarget) + { + owner->StopMoving(); + _events.ScheduleEvent(EVENT_ALLIGN_TO_TARGET, Milliseconds(ALLIGN_MOVEMENT_INTERVAL)); + } + else + _events.ScheduleEvent(EVENT_ALLIGN_TO_TARGET, 1ms); } } @@ -243,10 +249,15 @@ bool FollowMovementGenerator::Update(Unit* owner, uint32 diff) { Position pos = _target->GetPosition(); _target->MovePositionToFirstCollision(pos, _distance, _angle); + Movement::MoveSplineInit init (owner); + if (_faceTarget) + init.SetFacing(_target); init.MoveTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ()); uint32 duration = std::max(1, init.Launch()); - _events.ScheduleEvent(EVENT_ALLIGN_TO_FACING_DIRECTION, Milliseconds(duration + FOLLOW_MOVEMENT_INTERVAL)); + + if (!_faceTarget) + _events.ScheduleEvent(EVENT_ALLIGN_TO_FACING_DIRECTION, Milliseconds(duration + FOLLOW_MOVEMENT_INTERVAL)); break; } case EVENT_ALLIGN_TO_FACING_DIRECTION: @@ -339,6 +350,10 @@ void FollowMovementGenerator::LaunchMovement(Unit* owner) Movement::MoveSplineInit init(owner); init.MoveTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ()); init.SetVelocity(velocity); + + if (_faceTarget) + init.SetFacing(_target); + init.Launch(); owner->AddUnitState(UNIT_STATE_FOLLOW_MOVE); diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h index 949c626f50..52b4839eb3 100644 --- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h @@ -42,7 +42,7 @@ class FollowMovementGenerator : public MovementGenerator public: MovementGeneratorType GetMovementGeneratorType() const override { return FOLLOW_MOTION_TYPE; } - FollowMovementGenerator(Unit* target, Optional distance, Optional angle, bool joinFormation = false, bool catchUpToTarget = false); + FollowMovementGenerator(Unit* target, Optional distance, Optional angle, bool joinFormation = false, bool catchUpToTarget = false, bool faceTarget = false); ~FollowMovementGenerator(); void Initialize(Unit* owner) override; @@ -63,8 +63,9 @@ private: Unit* _target; float _distance; float _angle; - bool _joinFormation; - bool _catchUpToTarget; + bool const _joinFormation; + bool const _catchUpToTarget; + bool const _faceTarget; TimeTrackerSmall _followMovementTimer; EventMap _events;