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

Core/SAI: Added param PointId to SMART_ACTION_MOVE_OFFSET

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e218f276028124682790e93688aeae567ca1eaba)
This commit is contained in:
hondacrx
2023-01-04 16:55:54 -05:00
parent 518061d4c0
commit 1d6edf58d6
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/SmartAIConst.cs
+1 -1
View File
@@ -361,7 +361,7 @@ namespace Framework.Constants
GameEventStop = 111, // GameEventId GameEventStop = 111, // GameEventId
GameEventStart = 112, // GameEventId GameEventStart = 112, // GameEventId
StartClosestWaypoint = 113, // wp1, wp2, wp3, wp4, wp5, wp6, wp7 StartClosestWaypoint = 113, // wp1, wp2, wp3, wp4, wp5, wp6, wp7
MoveOffset = 114, MoveOffset = 114, // PointId
RandomSound = 115, // SoundId1, SoundId2, SoundId3, SoundId4, SoundId5, onlySelf RandomSound = 115, // SoundId1, SoundId2, SoundId3, SoundId4, SoundId5, onlySelf
SetCorpseDelay = 116, // timer SetCorpseDelay = 116, // timer
DisableEvade = 117, // 0/1 (1 = disabled, 0 = enabled) DisableEvade = 117, // 0/1 (1 = disabled, 0 = enabled)
Source/Game/AI/SmartScripts/SmartAIManager.cs
+8
View File
@@ -25,6 +25,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using static Game.AI.SmartAction;
namespace Game.AI namespace Game.AI
{ {
@@ -3062,6 +3063,9 @@ namespace Game.AI
[FieldOffset(4)] [FieldOffset(4)]
public ClosestWaypointFromList closestWaypointFromList; public ClosestWaypointFromList closestWaypointFromList;
[FieldOffset(4)]
public MoveOffset moveOffset;
[FieldOffset(4)] [FieldOffset(4)]
public RandomSound randomSound; public RandomSound randomSound;
@@ -3553,6 +3557,10 @@ namespace Game.AI
public uint wp5; public uint wp5;
public uint wp6; public uint wp6;
} }
public struct MoveOffset
{
public uint PointId;
}
public struct RandomSound public struct RandomSound
{ {
public uint sound1; public uint sound1;
Source/Game/AI/SmartScripts/SmartScript.cs
+1 -1
View File
@@ -1111,7 +1111,7 @@ namespace Game.AI
float x = (float)(pos.GetPositionX() + (Math.Cos(o - (Math.PI / 2)) * e.Target.x) + (Math.Cos(o) * e.Target.y)); float x = (float)(pos.GetPositionX() + (Math.Cos(o - (Math.PI / 2)) * e.Target.x) + (Math.Cos(o) * e.Target.y));
float y = (float)(pos.GetPositionY() + (Math.Sin(o - (Math.PI / 2)) * e.Target.x) + (Math.Sin(o) * e.Target.y)); float y = (float)(pos.GetPositionY() + (Math.Sin(o - (Math.PI / 2)) * e.Target.x) + (Math.Sin(o) * e.Target.y));
float z = pos.GetPositionZ() + e.Target.z; float z = pos.GetPositionZ() + e.Target.z;
target.ToCreature().GetMotionMaster().MovePoint(EventId.SmartRandomPoint, x, y, z); target.ToCreature().GetMotionMaster().MovePoint(e.Action.moveOffset.PointId, x, y, z);
} }
break; break;
} }