From 0ce1e9d6522974e3186e8b5cf75b7c653a075862 Mon Sep 17 00:00:00 2001 From: Chaouki Dhib Date: Sun, 7 Jan 2018 00:55:17 +0100 Subject: Core/Movement: Correct the allowed distance to target before a repositioning is necessary. #20173 Also getting rid of the wordserveur config parameter 'TargetPosRecalculateRange' since it is no longer needed. (cherry picked from commit 274dede3dc89fa72ec1687d5ff454feba9849e47) --- .../TargetedMovementGenerator.cpp | 28 ++++++++++++++++++---- .../MovementGenerators/TargetedMovementGenerator.h | 5 ++++ src/server/game/World/World.cpp | 13 ---------- src/server/game/World/World.h | 1 - src/server/worldserver/worldserver.conf.dist | 11 --------- 5 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index a2e954ad225..037b77d3982 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -60,9 +60,10 @@ bool TargetedMovementGenerator::DoUpdate(T* owner, uint32 diff) { _timer.Reset(100); - float distance = owner->GetCombatReach() + sWorld->getRate(RATE_TARGET_POS_RECALCULATION_RANGE); + // the allowed distance between target and mover before the mover needs to reposition in order to keep attacking + float distance = GetMaxDistanceBeforeRepositioning(owner); if (owner->IsPet() && (owner->GetCharmerOrOwnerGUID() == GetTarget()->GetGUID())) - distance = 1.f; // pet following owner + distance = 1.f + GetTarget()->GetCombatReach(); // pet following owner G3D::Vector3 destination = owner->movespline->FinalDestination(); if (owner->movespline->onTransport) @@ -71,9 +72,9 @@ bool TargetedMovementGenerator::DoUpdate(T* owner, uint32 diff) // First check distance if (owner->GetTypeId() == TYPEID_UNIT && owner->ToCreature()->CanFly()) - targetMoved = !GetTarget()->IsWithinDist3d(destination.x, destination.y, destination.z, distance); + targetMoved = !GetTarget()->IsInDist(destination.x, destination.y, destination.z, distance); else - targetMoved = !GetTarget()->IsWithinDist2d(destination.x, destination.y, distance); + targetMoved = !GetTarget()->IsInDist2d(destination.x, destination.y, distance); // then, if the target is in range, check also Line of Sight. if (!targetMoved) @@ -266,6 +267,15 @@ void ChaseMovementGenerator::ReachTarget(T* owner) template void ChaseMovementGenerator::MovementInform(T*) { } +template +float ChaseMovementGenerator::GetMaxDistanceBeforeRepositioning(T* owner) +{ + // the notion of melee range and melee attack is clearly separated from the notion of the movement. + // As a seperation of concern refactoring, this value should be passed into parameter by the caller (during creation of ChaseMoveGen) instead of defining it + // here (or a callback should be used since this value depends on dynamic fields (combat reach). + return owner->GetMeleeRange(TargetedMovementGeneratorBase::GetTarget()); +} + template<> void ChaseMovementGenerator::MovementInform(Creature* owner) { @@ -349,6 +359,12 @@ bool FollowMovementGenerator::EnableWalking() const template void FollowMovementGenerator::MovementInform(T*) { } +template +float FollowMovementGenerator::GetMaxDistanceBeforeRepositioning(T* owner) +{ + return owner->GetCombatReach() + TargetedMovementGeneratorBase::GetTarget()->GetCombatReach() + MOVE_FOLLOW_REPOSITIONING_DISTANCE; +} + template<> void FollowMovementGenerator::MovementInform(Creature* unit) { @@ -385,6 +401,8 @@ template bool ChaseMovementGenerator::HasLostTarget(Creature*) const; template void ChaseMovementGenerator::ReachTarget(Player*); template void ChaseMovementGenerator::ReachTarget(Creature*); template void ChaseMovementGenerator::MovementInform(Player*); +template float ChaseMovementGenerator::GetMaxDistanceBeforeRepositioning(Player*); +template float ChaseMovementGenerator::GetMaxDistanceBeforeRepositioning(Creature*); template void FollowMovementGenerator::DoInitialize(Player*); template void FollowMovementGenerator::DoInitialize(Creature*); @@ -399,3 +417,5 @@ template void FollowMovementGenerator::AddUnitStateMove(Creature*); template void FollowMovementGenerator::ReachTarget(Player*); template void FollowMovementGenerator::ReachTarget(Creature*); template void FollowMovementGenerator::MovementInform(Player*); +template float FollowMovementGenerator::GetMaxDistanceBeforeRepositioning(Player*); +template float FollowMovementGenerator::GetMaxDistanceBeforeRepositioning(Creature*); diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index 9f4e3712b5c..de1d08dbf91 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -22,6 +22,8 @@ #include "FollowerReference.h" #include "Timer.h" +#define MOVE_FOLLOW_REPOSITIONING_DISTANCE 1.5f + class TargetedMovementGeneratorBase { public: @@ -55,6 +57,7 @@ class TargetedMovementGenerator : public MovementGeneratorMedium< T, D >, public virtual void ReachTarget(T*) { } virtual bool EnableWalking() const { return false; } virtual void MovementInform(T*) { } + virtual float GetMaxDistanceBeforeRepositioning(T*) { return 0.0f; } bool IsReachable() const; void SetTargetLocation(T* owner, bool updateDestination); @@ -87,6 +90,7 @@ class ChaseMovementGenerator : public TargetedMovementGenerator @@ -107,6 +111,7 @@ class FollowMovementGenerator : public TargetedMovementGeneratorGetFloatDefault("Rate.Corpse.Decay.Looted", 0.5f); - rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = sConfigMgr->GetFloatDefault("TargetPosRecalculateRange", 1.5f); - if (rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] < CONTACT_DISTANCE) - { - TC_LOG_ERROR("server.loading", "TargetPosRecalculateRange (%f) must be >= %f. Using %f instead.", rate_values[RATE_TARGET_POS_RECALCULATION_RANGE], CONTACT_DISTANCE, CONTACT_DISTANCE); - rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = CONTACT_DISTANCE; - } - else if (rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] > NOMINAL_MELEE_RANGE) - { - TC_LOG_ERROR("server.loading", "TargetPosRecalculateRange (%f) must be <= %f. Using %f instead.", - rate_values[RATE_TARGET_POS_RECALCULATION_RANGE], NOMINAL_MELEE_RANGE, NOMINAL_MELEE_RANGE); - rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = NOMINAL_MELEE_RANGE; - } - rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = sConfigMgr->GetFloatDefault("DurabilityLoss.OnDeath", 10.0f); if (rate_values[RATE_DURABILITY_LOSS_ON_DEATH] < 0.0f) { diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 1dcc407b997..76272c92e8e 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -494,7 +494,6 @@ enum Rates RATE_TALENT, RATE_CORPSE_DECAY_LOOTED, RATE_INSTANCE_RESET_TIME, - RATE_TARGET_POS_RECALCULATION_RANGE, RATE_DURABILITY_LOSS_ON_DEATH, RATE_DURABILITY_LOSS_DAMAGE, RATE_DURABILITY_LOSS_PARRY, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 20c1bf6158f..165121838ec 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -454,17 +454,6 @@ DetectPosCollision = 1 CheckGameObjectLoS = 1 -# -# TargetPosRecalculateRange -# Description: Max distance from movement target point (+moving unit size) and targeted -# object (+size) after that new target movement point calculated. -# Range: 0.5-5.0 -# Default: 1.5 -# 0.5 - (Minimum, Contact Range, More sensitive reaction to target movement) -# 5.0 - (Maximum, Melee attack range, Less CPU usage) - -TargetPosRecalculateRange = 1.5 - # # UpdateUptimeInterval # Description: Update realm uptime period (in minutes). -- cgit v1.2.3