Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc: improve UNIT_STATE_DISTRACTED handling

Browse Source
This commit is contained in:
ccrs
2026-01-09 20:21:46 +01:00
parent 502afe50e8
commit 15b8a43311
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/AI/CoreAI/UnitAI.cpp
View File

@@ -30,15 +30,7 @@
void UnitAI::AttackStart(Unit* victim)
{
if (victim && me->Attack(victim, true))
{
// Clear distracted state on attacking
if (me->HasUnitState(UNIT_STATE_DISTRACTED))
{
me->ClearUnitState(UNIT_STATE_DISTRACTED);
me->GetMotionMaster()->Clear();
}
me->GetMotionMaster()->MoveChase(victim);
}
}
void UnitAI::InitializeAI()

6
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -8773,6 +8773,12 @@ void Unit::AtExitCombat()
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LEAVE_COMBAT);
}
void Unit::AtEngage(Unit *)
{
if (HasUnitState(UNIT_STATE_DISTRACTED))
GetMotionMaster()->Remove(DISTRACT_MOTION_TYPE);
}
void Unit::AtTargetAttacked(Unit* target, bool canInitialAggro)
{
if (!target->IsEngaged() && !canInitialAggro)

2
src/server/game/Entities/Unit/Unit.h
View File

@@ -1914,7 +1914,7 @@ class TC_GAME_API Unit : public WorldObject
virtual void AtEnterCombat() { }
virtual void AtExitCombat();
virtual void AtEngage(Unit* /*target*/) {}
void AtEngage(Unit* /*target*/);
virtual void AtDisengage() {}
private:

11
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
View File

@@ -140,7 +140,7 @@ MovementGeneratorType RotateMovementGenerator::GetMovementGeneratorType() const
//----------------------------------------------------//
DistractMovementGenerator::DistractMovementGenerator(uint32 timer, float orientation) : _timer(timer), _orientation(orientation)
DistractMovementGenerator::DistractMovementGenerator(uint32 timer, float orientation) : _timer(timer), _orientation(orientation), _originalOrientation(0.f)
{
Mode = MOTION_MODE_DEFAULT;
Priority = MOTION_PRIORITY_HIGHEST;
@@ -157,6 +157,8 @@ void DistractMovementGenerator::Initialize(Unit* owner)
if (!owner->IsStandState())
owner->SetStandState(UNIT_STAND_STATE_STAND);
_originalOrientation = owner->GetOrientation();
Movement::MoveSplineInit init(owner);
init.MoveTo(PositionToVector3(*owner), false);
if (owner->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && !owner->GetTransGUID().IsEmpty())
@@ -196,13 +198,8 @@ void DistractMovementGenerator::Finalize(Unit* owner, bool/* active*/, bool move
{
AddFlag(MOVEMENTGENERATOR_FLAG_FINALIZED);
// TODO: This code should be handled somewhere else
// If this is a creature, then return orientation to original position (for idle movement creatures)
if (movementInform && HasFlag(MOVEMENTGENERATOR_FLAG_INFORM_ENABLED) && owner->GetTypeId() == TYPEID_UNIT)
{
float angle = owner->ToCreature()->GetHomePosition().GetOrientation();
owner->SetFacingTo(angle);
}
owner->SetFacingTo(_originalOrientation, true);
}
MovementGeneratorType DistractMovementGenerator::GetMovementGeneratorType() const

1
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
View File

@@ -68,6 +68,7 @@ class DistractMovementGenerator : public MovementGenerator
private:
uint32 _timer;
float _orientation;
float _originalOrientation;
};
class AssistanceDistractMovementGenerator : public DistractMovementGenerator