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

Core/Waypoints: Drop waypoint_scripts table

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3f6f683ce4b5f4a95a2d70921de2c80de6b3a8fe)
This commit is contained in:
hondacrx
2024-02-03 11:47:02 -05:00
parent ee7b89560e
commit 284cb628c9
9 changed files with 5 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Movement/Generators/WaypointMovement.cs
+1 -8
View File
@@ -288,7 +288,7 @@ namespace Game.Movement
}
if (_waitTimeRangeAtPathEnd.HasValue && _followPathBackwardsFromEndToStart
&& ((_isReturningToStart && _currentNode == 0) || (!_isReturningToStart && _currentNode == _path.nodes.Count - 1)))
&& ((_isReturningToStart && _currentNode == 0) || (!_isReturningToStart && _currentNode == _path.nodes.Count - 1)))
{
owner.ClearUnitState(UnitState.RoamingMove);
TimeSpan waitTime = RandomHelper.RandTime(_waitTimeRangeAtPathEnd.Value.min, _waitTimeRangeAtPathEnd.Value.max);
@@ -301,13 +301,6 @@ namespace Game.Movement
_nextMoveTime.Reset(waitTime);
}
if (waypoint.eventId != 0 && RandomHelper.URand(0, 99) < waypoint.eventChance)
{
Log.outDebug(LogFilter.MapsScript, $"Creature movement start script {waypoint.eventId} at point {_currentNode} for {owner.GetGUID()}.");
owner.ClearUnitState(UnitState.RoamingMove);
owner.GetMap().ScriptsStart(ScriptsType.Waypoint, waypoint.eventId, owner, null);
}
// inform AI
CreatureAI ai = owner.GetAI();
if (ai != null)
Source/Game/Movement/WaypointManager.cs
+2 -10
View File
@@ -15,8 +15,8 @@ namespace Game
{
var oldMSTime = Time.GetMSTime();
// 0 1 2 3 4 5 6 7 8 9
SQLResult result = DB.World.Query("SELECT id, point, position_x, position_y, position_z, orientation, move_type, delay, action, action_chance FROM waypoint_data ORDER BY id, point");
// 0 1 2 3 4 5 6 7
SQLResult result = DB.World.Query("SELECT id, point, position_x, position_y, position_z, orientation, move_type, delay FROM waypoint_data ORDER BY id, point");
if (result.IsEmpty())
{
@@ -55,8 +55,6 @@ namespace Game
}
waypoint.delay = result.Read<uint>(7);
waypoint.eventId = result.Read<uint>(8);
waypoint.eventChance = result.Read<byte>(9);
if (!_waypointStore.ContainsKey(pathId))
_waypointStore[pathId] = new WaypointPath();
@@ -110,8 +108,6 @@ namespace Game
}
waypoint.delay = result.Read<uint>(6);
waypoint.eventId = result.Read<uint>(7);
waypoint.eventChance = result.Read<byte>(8);
values.Add(waypoint);
}
@@ -139,18 +135,14 @@ namespace Game
z = _z;
orientation = _orientation;
delay = _delay;
eventId = 0;
moveType = WaypointMoveType.Walk;
eventChance = 100;
}
public uint id;
public float x, y, z;
public float? orientation;
public uint delay;
public uint eventId;
public WaypointMoveType moveType;
public byte eventChance;
}
public class WaypointPath