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

Core/Movement: cleanup MovementGeneratorType

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/dbe54973fbbcfca55316e03b8a27dcd6d115b543)
This commit is contained in:
hondacrx
2020-05-06 14:38:54 -04:00
parent ba885908b7
commit 9889415e6b
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Movement/MovementConst.cs
+11 -13
View File
@@ -32,22 +32,20 @@ namespace Framework.Constants
Waypoint = 2, // WaypointMovement Waypoint = 2, // WaypointMovement
MaxDB = 3, // *** this and below motion types can't be set in DB. MaxDB = 3, // *** this and below motion types can't be set in DB.
AnimalRandom = MaxDB, // AnimalRandomMovementGenerator.h Confused = 4, // ConfusedMovementGenerator
Confused = 4, // ConfusedMovementGenerator.h Chase = 5, // TargetedMovementGenerator
Chase = 5, // TargetedMovementGenerator.h Home = 6, // HomeMovementGenerator
Home = 6, // HomeMovementGenerator.h Flight = 7, // WaypointMovementGenerator
Flight = 7, // WaypointMovementGenerator.h Point = 8, // PointMovementGenerator
Point = 8, // PointMovementGenerator.h Fleeing = 9, // FleeingMovementGenerator
Fleeing = 9, // FleeingMovementGenerator.h Distract = 10, // IdleMovementGenerator
Distract = 10, // IdleMovementGenerator.h Assistance = 11, // PointMovementGenerator
Assistance = 11, // PointMovementGenerator.h (first part of flee for assistance) AssistanceDistract = 12, // IdleMovementGenerator
AssistanceDistract = 12, // IdleMovementGenerator.h (second part of flee for assistance) TimedFleeing = 13, // FleeingMovementGenerator
TimedFleeing = 13, // FleeingMovementGenerator.h (alt.second part of flee for assistance)
Follow = 14, Follow = 14,
Rotate = 15, Rotate = 15,
Effect = 16, Effect = 16,
Null = 17, SplineChain = 17,
SplineChain = 18,
Max Max
} }
Source/Game/Chat/Commands/MiscCommands.cs
-3
View File
@@ -1865,9 +1865,6 @@ namespace Game.Chat
case MovementGeneratorType.Waypoint: case MovementGeneratorType.Waypoint:
handler.SendSysMessage(CypherStrings.MovegensWaypoint); handler.SendSysMessage(CypherStrings.MovegensWaypoint);
break; break;
case MovementGeneratorType.AnimalRandom:
handler.SendSysMessage(CypherStrings.MovegensAnimalRandom);
break;
case MovementGeneratorType.Confused: case MovementGeneratorType.Confused:
handler.SendSysMessage(CypherStrings.MovegensConfused); handler.SendSysMessage(CypherStrings.MovegensConfused);
break; break;
Source/Game/Movement/MotionMaster.cs
+1 -1
View File
@@ -149,7 +149,7 @@ namespace Game.Movement
public MovementGeneratorType GetMotionSlotType(MovementSlot slot) public MovementGeneratorType GetMotionSlotType(MovementSlot slot)
{ {
if (_slot[(int)slot] == null) if (_slot[(int)slot] == null)
return MovementGeneratorType.Null; return MovementGeneratorType.Max;
else else
return _slot[(int)slot].GetMovementGeneratorType(); return _slot[(int)slot].GetMovementGeneratorType();
} }