Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Movement: Removed template from FleeingMovementGenerator

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/cc47fd75b44fcfc749cbbdc250295422e8838971)
This commit is contained in:
hondacrx
2024-02-24 15:26:23 -05:00
parent 6abd99260b
commit 18d20e0a75
2 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Movement/Generators/FleeingMovementGenerator.cs
+22 -23
View File
@@ -8,7 +8,7 @@ using System;
namespace Game.Movement namespace Game.Movement
{ {
public class FleeingMovementGenerator<T> : MovementGeneratorMedium<T> where T : Unit public class FleeingMovementGenerator : MovementGenerator
{ {
public const float MIN_QUIET_DISTANCE = 28.0f; public const float MIN_QUIET_DISTANCE = 28.0f;
public const float MAX_QUIET_DISTANCE = 43.0f; public const float MAX_QUIET_DISTANCE = 43.0f;
@@ -24,7 +24,7 @@ namespace Game.Movement
BaseUnitState = UnitState.Fleeing; BaseUnitState = UnitState.Fleeing;
} }
public override void DoInitialize(T owner) public override void Initialize(Unit owner)
{ {
RemoveFlag(MovementGeneratorFlags.InitializationPending | MovementGeneratorFlags.Transitory | MovementGeneratorFlags.Deactivated); RemoveFlag(MovementGeneratorFlags.InitializationPending | MovementGeneratorFlags.Transitory | MovementGeneratorFlags.Deactivated);
AddFlag(MovementGeneratorFlags.Initialized); AddFlag(MovementGeneratorFlags.Initialized);
@@ -36,13 +36,13 @@ namespace Game.Movement
SetTargetLocation(owner); SetTargetLocation(owner);
} }
public override void DoReset(T owner) public override void Reset(Unit owner)
{ {
RemoveFlag(MovementGeneratorFlags.Transitory | MovementGeneratorFlags.Deactivated); RemoveFlag(MovementGeneratorFlags.Transitory | MovementGeneratorFlags.Deactivated);
DoInitialize(owner); Initialize(owner);
} }
public override bool DoUpdate(T owner, uint diff) public override bool Update(Unit owner, uint diff)
{ {
if (owner == null || !owner.IsAlive()) if (owner == null || !owner.IsAlive())
return false; return false;
@@ -67,34 +67,32 @@ namespace Game.Movement
return true; return true;
} }
public override void DoDeactivate(T owner) public override void Deactivate(Unit owner)
{ {
AddFlag(MovementGeneratorFlags.Deactivated); AddFlag(MovementGeneratorFlags.Deactivated);
owner.ClearUnitState(UnitState.FleeingMove); owner.ClearUnitState(UnitState.FleeingMove);
} }
public override void DoFinalize(T owner, bool active, bool movementInform) public override void Finalize(Unit owner, bool active, bool movementInform)
{ {
AddFlag(MovementGeneratorFlags.Finalized); AddFlag(MovementGeneratorFlags.Finalized);
if (active) if (active)
{ {
if (owner.IsPlayer()) owner.ClearUnitState(UnitState.FleeingMove);
if (owner.IsCreature())
{ {
owner.ClearUnitState(UnitState.FleeingMove);
owner.StopMoving();
}
else
{
owner.ClearUnitState(UnitState.FleeingMove);
Unit victim = owner.GetVictim(); Unit victim = owner.GetVictim();
if (victim != null) if (victim != null)
owner.SetTarget(victim.GetGUID()); owner.SetTarget(victim.GetGUID());
} }
else if (owner.IsPlayer())
owner.StopMoving();
} }
} }
void SetTargetLocation(T owner) void SetTargetLocation(Unit owner)
{ {
if (owner == null || !owner.IsAlive()) if (owner == null || !owner.IsAlive())
return; return;
@@ -107,7 +105,7 @@ namespace Game.Movement
return; return;
} }
Position destination = new (owner.GetPosition()); Position destination = new(owner.GetPosition());
GetPoint(owner, destination); GetPoint(owner, destination);
// Add LOS check for target point // Add LOS check for target point
@@ -139,7 +137,7 @@ namespace Game.Movement
_timer.Reset(traveltime + RandomHelper.URand(800, 1500)); _timer.Reset(traveltime + RandomHelper.URand(800, 1500));
} }
void GetPoint(T owner, Position position) void GetPoint(Unit owner, Position position)
{ {
float casterDistance, casterAngle; float casterDistance, casterAngle;
Unit fleeTarget = Global.ObjAccessor.GetUnit(owner, _fleeTargetGUID); Unit fleeTarget = Global.ObjAccessor.GetUnit(owner, _fleeTargetGUID);
@@ -192,7 +190,7 @@ namespace Game.Movement
TimeTracker _timer; TimeTracker _timer;
} }
public class TimedFleeingMovementGenerator : FleeingMovementGenerator<Creature> public class TimedFleeingMovementGenerator : FleeingMovementGenerator
{ {
public TimedFleeingMovementGenerator(ObjectGuid fright, TimeSpan time) : base(fright) public TimedFleeingMovementGenerator(ObjectGuid fright, TimeSpan time) : base(fright)
{ {
@@ -208,7 +206,7 @@ namespace Game.Movement
if (_totalFleeTime.Passed()) if (_totalFleeTime.Passed())
return false; return false;
return DoUpdate(owner.ToCreature(), diff); return base.Update(owner.ToCreature(), diff);
} }
public override void Finalize(Unit owner, bool active, bool movementInform) public override void Finalize(Unit owner, bool active, bool movementInform)
@@ -217,13 +215,14 @@ namespace Game.Movement
if (!active) if (!active)
return; return;
Unit victim = owner.GetVictim(); owner.StopMoving();
if (victim != null) if (owner.IsCreature() && owner.IsAlive())
{ {
if (owner.IsAlive()) Unit victim = owner.GetVictim();
if (victim != null)
{ {
owner.AttackStop(); owner.AttackStop();
owner.ToCreature().GetAI().AttackStart(victim); owner.GetAI().AttackStart(victim);
} }
} }
Source/Game/Movement/MotionMaster.cs
+3 -8
View File
@@ -585,15 +585,10 @@ namespace Game.Movement
if (enemy == null) if (enemy == null)
return; return;
if (_owner.IsCreature()) if (_owner.IsCreature() && time > TimeSpan.Zero)
{ Add(new TimedFleeingMovementGenerator(enemy.GetGUID(), time));
if (time != TimeSpan.Zero)
Add(new TimedFleeingMovementGenerator(enemy.GetGUID(), time));
else
Add(new FleeingMovementGenerator<Creature>(enemy.GetGUID()));
}
else else
Add(new FleeingMovementGenerator<Player>(enemy.GetGUID())); Add(new FleeingMovementGenerator(enemy.GetGUID()));
} }
public void MovePoint(uint id, Position pos, bool generatePath = true, float? finalOrient = null, float? speed = null, MovementWalkRunSpeedSelectionMode speedSelectionMode = MovementWalkRunSpeedSelectionMode.Default, float? closeEnoughDistance = null) public void MovePoint(uint id, Position pos, bool generatePath = true, float? finalOrient = null, float? speed = null, MovementWalkRunSpeedSelectionMode speedSelectionMode = MovementWalkRunSpeedSelectionMode.Default, float? closeEnoughDistance = null)