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

Core/Movement: Added functions to MoveSplineInit to enable steering flag

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/cf4c3b5467fde04f53636443a7a8b392aa527cf5)
This commit is contained in:
Hondacrx
2024-08-12 16:16:29 -04:00
parent 8805432cee
commit 35cc0006c8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Movement/SplineConst.cs
+1 -1
View File
@@ -57,6 +57,6 @@ namespace Framework.Constants
MaskNoMonsterMove = Done, MaskNoMonsterMove = Done,
// Unused, not suported flags // Unused, not suported flags
MaskUnused = NoSpline | EnterCycle | Frozen | Unknown_0x8 | Unknown_0x100 | Unknown_0x20000 | Unknown_0x40000 MaskUnused = NoSpline | EnterCycle | Frozen | Unknown_0x8 | Unknown_0x100 | Unknown_0x20000 | Unknown_0x40000
| Unknown_0x800000 | Unknown_0x1000000 | FadeObject | Steering | UnlimitedSpeed | Unknown_0x40000000 | Unknown_0x80000000 | Unknown_0x800000 | Unknown_0x1000000 | FadeObject | UnlimitedSpeed | Unknown_0x40000000 | Unknown_0x80000000
} }
} }
Source/Game/Movement/MoveSplineFlags.cs
+1
View File
@@ -33,6 +33,7 @@ namespace Game.Movement
public void EnableCatmullRom() { Flags = (Flags & ~SplineFlag.SmoothGroundPath) | SplineFlag.Catmullrom; } public void EnableCatmullRom() { Flags = (Flags & ~SplineFlag.SmoothGroundPath) | SplineFlag.Catmullrom; }
public void EnableTransportEnter() { Flags = (Flags & ~SplineFlag.TransportExit) | SplineFlag.TransportEnter; } public void EnableTransportEnter() { Flags = (Flags & ~SplineFlag.TransportExit) | SplineFlag.TransportEnter; }
public void EnableTransportExit() { Flags = (Flags & ~SplineFlag.TransportEnter) | SplineFlag.TransportExit; } public void EnableTransportExit() { Flags = (Flags & ~SplineFlag.TransportEnter) | SplineFlag.TransportExit; }
public void EnableSteering() { Flags = (Flags & ~SplineFlag.SmoothGroundPath) | SplineFlag.Steering; }
public SplineFlag Flags; public SplineFlag Flags;
public byte animTier; public byte animTier;
Source/Game/Movement/MoveSplineInit.cs
+5 -3
View File
@@ -23,8 +23,8 @@ namespace Game.Movement
args.flags.SetUnsetFlag(SplineFlag.CanSwim, unit.CanSwim()); args.flags.SetUnsetFlag(SplineFlag.CanSwim, unit.CanSwim());
args.walk = unit.HasUnitMovementFlag(MovementFlag.Walking); args.walk = unit.HasUnitMovementFlag(MovementFlag.Walking);
args.flags.SetUnsetFlag(SplineFlag.Flying, unit.HasUnitMovementFlag(MovementFlag.CanFly | MovementFlag.DisableGravity)); args.flags.SetUnsetFlag(SplineFlag.Flying, unit.HasUnitMovementFlag(MovementFlag.CanFly | MovementFlag.DisableGravity));
args.flags.SetUnsetFlag(SplineFlag.SmoothGroundPath, true); // enabled by default, CatmullRom mode or client config "pathSmoothing" will disable this
args.flags.SetUnsetFlag(SplineFlag.Steering, unit.HasNpcFlag2(NPCFlags2.Steering)); args.flags.SetUnsetFlag(SplineFlag.Steering, unit.HasNpcFlag2(NPCFlags2.Steering));
args.flags.SetUnsetFlag(SplineFlag.SmoothGroundPath, !args.flags.HasFlag(SplineFlag.Flying) && !args.flags.HasFlag(SplineFlag.Steering)); // enabled by default, CatmullRom mode or client config "pathSmoothing" will disable this
} }
UnitMoveType SelectSpeedType(MovementFlag moveFlags) UnitMoveType SelectSpeedType(MovementFlag moveFlags)
@@ -60,7 +60,7 @@ namespace Game.Movement
MoveSpline move_spline = unit.MoveSpline; MoveSpline move_spline = unit.MoveSpline;
bool transport = !unit.GetTransGUID().IsEmpty(); bool transport = !unit.GetTransGUID().IsEmpty();
Vector4 real_position = new(); Vector4 real_position = new();
// there is a big chance that current position is unknown if current state is not finalized, need compute it // there is a big chance that current position is unknown if current state is not finalized, need compute it
// this also allows calculate spline position and update map position in much greater intervals // this also allows calculate spline position and update map position in much greater intervals
// Don't compute for transport movement if the unit is in a motion between two transports // Don't compute for transport movement if the unit is in a motion between two transports
@@ -203,7 +203,7 @@ namespace Game.Movement
args.facing.f = new Vector3(finalSpot.X, finalSpot.Y, finalSpot.Z); args.facing.f = new Vector3(finalSpot.X, finalSpot.Y, finalSpot.Z);
args.facing.type = MonsterMoveType.FacingSpot; args.facing.type = MonsterMoveType.FacingSpot;
} }
public void SetFacing(float x, float y, float z) public void SetFacing(float x, float y, float z)
{ {
SetFacing(new Vector3(x, y, z)); SetFacing(new Vector3(x, y, z));
@@ -282,6 +282,8 @@ namespace Game.Movement
public void SetOrientationFixed(bool enable) { args.flags.SetUnsetFlag(SplineFlag.OrientationFixed, enable); } public void SetOrientationFixed(bool enable) { args.flags.SetUnsetFlag(SplineFlag.OrientationFixed, enable); }
public void SetSteering() { args.flags.EnableSteering(); }
public void SetUnlimitedSpeed() { args.flags.SetUnsetFlag(SplineFlag.UnlimitedSpeed, true); } public void SetUnlimitedSpeed() { args.flags.SetUnsetFlag(SplineFlag.UnlimitedSpeed, true); }
public void MovebyPath(Vector3[] controls, int path_offset = 0) public void MovebyPath(Vector3[] controls, int path_offset = 0)