diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 38a50cb688..7d05c738b8 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -456,7 +456,7 @@ void PetAI::HandleReturnMovement() ClearCharmInfoFlags(); me->GetCharmInfo()->SetIsReturning(true); me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveFollow(me->GetCharmerOrOwner(), PET_FOLLOW_DIST, me->GetFollowAngle()); + me->GetMotionMaster()->MoveFollow(me->GetCharmerOrOwner(), PET_FOLLOW_DIST, ChaseAngle(me->GetFollowAngle(), 0.f), true); } } diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 33b02e010f..6677bd2199 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -254,7 +254,7 @@ void CreatureAI::EnterEvadeMode(EvadeReason why) if (Unit* owner = me->GetCharmerOrOwner()) { me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle(), MOTION_SLOT_ACTIVE); + me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle()); } else { diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 8782fd625c..f58e263a5c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -77,7 +77,7 @@ void FollowerAI::JustReachedHome() { if (HasFollowState(STATE_FOLLOW_PAUSED)) return; - me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); + me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE, true); } else me->DespawnOrUnsummon(); @@ -202,7 +202,7 @@ void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, uint32 q AddFollowState(STATE_FOLLOW_INPROGRESS); - me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); + me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE, true); TC_LOG_DEBUG("scripts.ai.followerai", "FollowerAI::StartFollow: start follow %s - %s (%s)", player->GetName().c_str(), _leaderGUID.ToString().c_str(), me->GetGUID().ToString().c_str()); } @@ -280,7 +280,7 @@ void FollowerAI::SetFollowPaused(bool paused) RemoveFollowState(STATE_FOLLOW_PAUSED); if (Player* leader = GetLeaderForFollower()) - me->GetMotionMaster()->MoveFollow(leader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); + me->GetMotionMaster()->MoveFollow(leader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE, true); } } diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 5aa5dc2819..e048f4fde9 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -302,6 +302,10 @@ Minion::Minion(SummonPropertiesEntry const* properties, Unit* owner, bool isWorl ASSERT(m_owner); m_unitTypeMask |= UNIT_MASK_MINION; m_followAngle = PET_FOLLOW_ANGLE; + + if (properties && properties->Title == SUMMON_TYPE_MINIPET) + m_followAngle = COMPANION_FOLLOW_ANGLE; + /// @todo: Find correct way InitCharmInfo(); } diff --git a/src/server/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h index f7f7ec6bc7..a8a440b2e3 100644 --- a/src/server/game/Entities/Pet/PetDefines.h +++ b/src/server/game/Entities/Pet/PetDefines.h @@ -80,5 +80,6 @@ enum PetTalk #define PET_FOLLOW_DIST 1.0f #define PET_FOLLOW_ANGLE float(M_PI / 2) +#define COMPANION_FOLLOW_ANGLE float(M_PI) #endif diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6290678f64..b4c4d431f8 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9058,25 +9058,6 @@ void Unit::UpdateSpeed(UnitMoveType mtype) break; } - if (Creature* creature = ToCreature()) - { - if (creature->HasUnitTypeMask(UNIT_MASK_MINION) && !creature->IsInCombat()) - { - MovementGenerator* top = creature->GetMotionMaster()->topOrNull(); - if (top && top->GetMovementGeneratorType() == FOLLOW_MOTION_TYPE) - { - Unit* followed = ASSERT_NOTNULL(dynamic_cast(top))->GetTarget(); - if (followed && followed->GetGUID() == GetOwnerGUID() && !followed->IsInCombat()) - { - float ownerSpeed = followed->GetSpeedRate(mtype); - if (speed < ownerSpeed || creature->IsWithinDist3d(followed, 10.0f)) - speed = ownerSpeed; - speed *= std::min(std::max(1.0f, 0.75f + (GetDistance(followed) - PET_FOLLOW_DIST) * 0.05f), 1.3f); - } - } - } - } - // Apply strongest slow aura mod to speed int32 slow = GetMaxNegativeAuraModifier(SPELL_AURA_MOD_DECREASE_SPEED); if (slow) diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 64752d1c5d..c79b18bbf9 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -179,7 +179,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe pet->AttackStop(); pet->InterruptNonMeleeSpells(false); pet->ClearInPetCombat(); - pet->GetMotionMaster()->MoveFollow(_player, PET_FOLLOW_DIST, pet->GetFollowAngle()); + pet->GetMotionMaster()->MoveFollow(_player, PET_FOLLOW_DIST, ChaseAngle(pet->GetFollowAngle(), 0.f), true); charmInfo->SetCommandState(COMMAND_FOLLOW); charmInfo->SetIsCommandAttack(false); diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 6362ce987d..9c1fd9eee1 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -252,14 +252,15 @@ void MotionMaster::MoveRandom(float spawndist) } } -void MotionMaster::MoveFollow(Unit* target, float dist, ChaseAngle angle, MovementSlot slot) +void MotionMaster::MoveFollow(Unit* target, float dist, ChaseAngle angle, bool allignToTargetSpeed, MovementSlot slot) { // ignore movement request if target not exist if (!target || target == _owner) return; 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), slot); + + Mutate(new FollowMovementGenerator(target, dist, angle, allignToTargetSpeed), slot); } void MotionMaster::MoveChase(Unit* target, Optional dist, Optional angle) diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 9721397600..781118f825 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -160,7 +160,7 @@ class TC_GAME_API MotionMaster void MoveIdle(); void MoveTargetedHome(); void MoveRandom(float spawndist = 0.0f); - void MoveFollow(Unit* target, float dist, ChaseAngle angle, MovementSlot slot = MOTION_SLOT_ACTIVE); + void MoveFollow(Unit* target, float dist, ChaseAngle angle, bool allignToTargetSpeed = false, MovementSlot slot = MOTION_SLOT_ACTIVE); void MoveChase(Unit* target, Optional dist = {}, Optional angle = {}); void MoveChase(Unit* target, float dist, float angle) { MoveChase(target, ChaseRange(dist), ChaseAngle(angle)); } void MoveChase(Unit* target, float dist) { MoveChase(target, ChaseRange(dist)); } diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp index 612c330c6f..818c35c861 100644 --- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp @@ -24,8 +24,10 @@ #include "Unit.h" #include "Util.h" -FollowMovementGenerator::FollowMovementGenerator(Unit* target, float range, ChaseAngle angle) : AbstractFollower(ASSERT_NOTNULL(target)), _range(range), _angle(angle) {} -FollowMovementGenerator::~FollowMovementGenerator() {} +FollowMovementGenerator::FollowMovementGenerator(Unit* target, float range, ChaseAngle angle, bool allignToTargetSpeed) : AbstractFollower(ASSERT_NOTNULL(target)), + _range(range), _useTargetSpeed(allignToTargetSpeed), _hasStopped(false), _angle(angle) { } + +FollowMovementGenerator::~FollowMovementGenerator() { } static void DoMovementInform(Unit* owner, Unit* target) { @@ -35,18 +37,11 @@ static void DoMovementInform(Unit* owner, Unit* target) static_cast(ai)->MovementInform(FOLLOW_MOTION_TYPE, target->GetGUID().GetCounter()); } -static bool PositionOkay(Unit* owner, Unit* target, float range, Optional angle = {}) -{ - if (owner->GetExactDistSq(target) > square(owner->GetCombatReach() + target->GetCombatReach() + range)) - return false; - return !angle || angle->IsAngleOkay(target->GetRelativeAngle(owner)); -} - void FollowMovementGenerator::Initialize(Unit* owner) { owner->AddUnitState(UNIT_STATE_FOLLOW); - UpdatePetSpeed(owner); - _lastTargetPosition.reset(); + _hasStopped = false; + _followMovementTimer.Reset(0); } bool FollowMovementGenerator::Update(Unit* owner, uint32 diff) @@ -60,49 +55,23 @@ bool FollowMovementGenerator::Update(Unit* owner, uint32 diff) if (!target) return false; + // follower cannot move at the moment if (owner->HasUnitState(UNIT_STATE_NOT_MOVE) || owner->IsMovementPreventedByCasting()) { owner->StopMoving(); - _lastTargetPosition.reset(); + _hasStopped = true; + _followMovementTimer.Reset(0); return true; } - if (owner->HasUnitState(UNIT_STATE_FOLLOW_MOVE)) + _followMovementTimer.Update(diff); + if (_followMovementTimer.Passed()) { - if (_checkTimer > diff) - _checkTimer -= diff; - else + // Follow target is moving, launch our follow movement + if (!target->movespline->Finalized() || target->isMoving()) { - _checkTimer = CHECK_INTERVAL; - if (PositionOkay(owner, target, _range, _angle)) - { - _path = nullptr; - owner->StopMoving(); - DoMovementInform(owner, target); - return true; - } - } - } - - if (owner->HasUnitState(UNIT_STATE_FOLLOW_MOVE) && owner->movespline->Finalized()) - { - _path = nullptr; - owner->ClearUnitState(UNIT_STATE_FOLLOW_MOVE); - DoMovementInform(owner, target); - } - - if (!_lastTargetPosition || _lastTargetPosition->GetExactDistSq(target->GetPosition()) > 0.0f) - { - _lastTargetPosition = target->GetPosition(); - if (owner->HasUnitState(UNIT_STATE_FOLLOW_MOVE) || !PositionOkay(owner, target, _range + FOLLOW_RANGE_TOLERANCE)) - { - if (!_path) - _path = std::make_unique(owner); - - float x, y, z; - - // select angle - float tAngle; + // Select angle + float tAngle = 0.f; float const curAngle = target->GetRelativeAngle(owner); if (_angle.IsAngleOkay(curAngle)) tAngle = curAngle; @@ -116,49 +85,93 @@ bool FollowMovementGenerator::Update(Unit* owner, uint32 diff) tAngle = _angle.LowerBound(); } - target->GetNearPoint(owner, x, y, z, _range, target->NormalizeOrientation(target->GetOrientation() + tAngle)); + Position dest = target->GetPosition(); + target->MovePositionToFirstCollision(dest, _range + target->GetBoundaryRadius() + owner->GetBoundaryRadius(), tAngle); - if (owner->IsHovering()) - owner->UpdateAllowedPositionZ(x, y, z); + // Determine our velocity + float velocity = 0.f; + if (_useTargetSpeed) + velocity = target->IsWalking() ? target->GetSpeed(MOVE_WALK) : target->GetSpeed(MOVE_RUN); + else + velocity = owner->IsWalking() ? owner->GetSpeed(MOVE_WALK) : owner->GetSpeed(MOVE_RUN); - // pets are allowed to "cheat" on pathfinding when following their master - bool allowShortcut = false; - if (Pet* oPet = owner->ToPet()) - if (target->GetGUID() == oPet->GetOwnerGUID()) - allowShortcut = true; - - bool success = _path->CalculatePath(x, y, z, allowShortcut); - if (!success || (_path->GetPathType() & PATHFIND_NOPATH)) + // Follow target based speed allignment + if (_useTargetSpeed) { - owner->StopMoving(); - return true; + float distance = owner->GetExactDist2d(dest); + + // Determine catchup speed rate + if (!dest.HasInArc(float(M_PI), owner)) // follower is behind follow destination + { + // Limit catchup speed to a total of 1.5 times of the follow target's velocity + float distMod = 1.f + std::min(distance * 0.1f, 0.5f); + velocity *= distMod; + } + else if (distance > (velocity / 2)) + { + // We are beyond our destination, throttle movement to fall back + float distMod = 1.f - std::min((distance - velocity / 2) * 0.1f, 0.5f); + velocity *= distMod; + } } - owner->AddUnitState(UNIT_STATE_FOLLOW_MOVE); + // Move our destination ahead (according to sniffs, it's roundabout velocity * 2) + target->MovePositionToFirstCollision(dest, velocity * 2, 0.f); Movement::MoveSplineInit init(owner); - init.MovebyPath(_path->GetPath()); - init.SetWalk(target->IsWalking()); - init.SetFacing(target->GetOrientation()); + init.MoveTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ()); + init.SetVelocity(velocity); init.Launch(); + + _hasStopped = false; + owner->AddUnitState(UNIT_STATE_FOLLOW_MOVE); + _followMovementTimer.Reset(FOLLOW_MOVEMENT_INTERVAL); } } + + // Follow target has stopped moving, allign to current position and inform AI + // (Note: for WoD and beyond this rule only applies to regular followers. Pets, Guardians, Minions etc. stop in the next update cycle) + if (!_hasStopped && target->movespline->Finalized() && !target->isMoving()) + { + // select angle + float tAngle = 0.f; + float const curAngle = target->GetRelativeAngle(owner); + if (_angle.IsAngleOkay(curAngle)) + tAngle = curAngle; + else + { + float const diffUpper = Position::NormalizeOrientation(curAngle - _angle.UpperBound()); + float const diffLower = Position::NormalizeOrientation(_angle.LowerBound() - curAngle); + if (diffUpper < diffLower) + tAngle = _angle.UpperBound(); + else + tAngle = _angle.LowerBound(); + } + + Position dest = target->GetPosition(); + target->MovePositionToFirstCollision(dest, _range + target->GetBoundaryRadius() + owner->GetBoundaryRadius(), tAngle); + + Movement::MoveSplineInit init(owner); + init.MoveTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ()); + init.SetFacing(target->GetOrientation()); + init.Launch(); + + _followMovementTimer.Reset(FOLLOW_MOVEMENT_INTERVAL); // block excessive movement launching via stutter stepping + _hasStopped = true; + return true; + } + + if (owner->HasUnitState(UNIT_STATE_FOLLOW_MOVE) && owner->movespline->Finalized()) + { + owner->ClearUnitState(UNIT_STATE_FOLLOW_MOVE); + owner->SetFacingTo(target->GetOrientation()); // according to sniffs we launch a extra spline just for the facing + DoMovementInform(owner, target); + } + return true; } void FollowMovementGenerator::Finalize(Unit* owner) { owner->ClearUnitState(UNIT_STATE_FOLLOW | UNIT_STATE_FOLLOW_MOVE); - UpdatePetSpeed(owner); -} - -void FollowMovementGenerator::UpdatePetSpeed(Unit* owner) -{ - if (Pet* oPet = owner->ToPet()) - if (!GetTarget() || GetTarget()->GetGUID() == owner->GetOwnerGUID()) - { - oPet->UpdateSpeed(MOVE_RUN); - oPet->UpdateSpeed(MOVE_WALK); - oPet->UpdateSpeed(MOVE_SWIM); - } } diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h index 32bc9c9f04..e5bb36287f 100644 --- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ - + #ifndef TRINITY_FOLLOWMOVEMENTGENERATOR_H #define TRINITY_FOLLOWMOVEMENTGENERATOR_H @@ -27,32 +27,26 @@ class Unit; class FollowMovementGenerator : public MovementGenerator, public AbstractFollower { - public: - MovementGeneratorType GetMovementGeneratorType() const override { return FOLLOW_MOTION_TYPE; } +public: + MovementGeneratorType GetMovementGeneratorType() const override { return FOLLOW_MOTION_TYPE; } - FollowMovementGenerator(Unit* target, float range, ChaseAngle angle); - ~FollowMovementGenerator(); + FollowMovementGenerator(Unit* target, float range, ChaseAngle angle, bool alligntToTargetSpeed = false); + ~FollowMovementGenerator(); - void Initialize(Unit* owner) override; - void Reset(Unit* owner) override { Initialize(owner); } - bool Update(Unit* owner, uint32 diff) override; - void Finalize(Unit* owner) override; + void Initialize(Unit* owner) override; + void Reset(Unit* owner) override { Initialize(owner); } + bool Update(Unit* owner, uint32 diff) override; + void Finalize(Unit* owner) override; - void UnitSpeedChanged() override { _lastTargetPosition.reset(); } +private: + static constexpr uint32 FOLLOW_MOVEMENT_INTERVAL = 800; // sniffed (2 batch update cycles) + // static inline const when? - private: - static constexpr uint32 CHECK_INTERVAL = 500; -// static inline const when? -#define FOLLOW_RANGE_TOLERANCE 1.0f - - void UpdatePetSpeed(Unit* owner); - - float const _range; - ChaseAngle const _angle; - - uint32 _checkTimer = CHECK_INTERVAL; - std::unique_ptr _path; - Optional _lastTargetPosition; + float const _range; + bool const _useTargetSpeed; + bool _hasStopped; + ChaseAngle const _angle; + TimeTrackerSmall _followMovementTimer; }; #endif