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

Core/SAI: Add maxSize parameter to SMART_TARGET_CREATURE_DISTANCE, SMART_TARGET_GAMEOBJECT_DISTANCE, SMART_TARGET_CREATURE_RANGE and SMART_TARGET_GAMEOBJECT_RANGE

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d6ce2fa8b8b48c6634a6fc55c4e7d7e93278f94b)
This commit is contained in:
hondacrx
2021-11-15 20:33:50 -05:00
parent f2a7383fad
commit 10145749ca
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/SmartScripts/SmartAIManager.cs
+4
View File
@@ -3163,6 +3163,7 @@ namespace Game.AI
public uint creature;
public uint minDist;
public uint maxDist;
public uint maxSize;
}
public struct UnitGUID
{
@@ -3173,6 +3174,7 @@ namespace Game.AI
{
public uint creature;
public uint dist;
public uint maxSize;
}
public struct PlayerDistance
{
@@ -3192,6 +3194,7 @@ namespace Game.AI
public uint entry;
public uint minDist;
public uint maxDist;
public uint maxSize;
}
public struct GoGUID
{
@@ -3202,6 +3205,7 @@ namespace Game.AI
{
public uint entry;
public uint dist;
public uint maxSize;
}
public struct Position
{
Source/Game/AI/SmartScripts/SmartScript.cs
+25 -13
View File
@@ -1195,20 +1195,20 @@ namespace Game.AI
if (!summoner)
break;
foreach (var target in targets)
{
Position pos = target.GetPositionWithOffset(new Position(e.Target.x, e.Target.y, e.Target.z, e.Target.o));
Quaternion rot = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(pos.GetOrientation(), 0f, 0f));
summoner.SummonGameObject(e.Action.summonGO.entry, pos, rot, e.Action.summonGO.despawnTime, (GameObjectSummonType)e.Action.summonGO.summonType);
}
if (e.GetTargetType() != SmartTargets.Position)
break;
Quaternion _rot = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(e.Target.o, 0f, 0f));
summoner.SummonGameObject(e.Action.summonGO.entry, new Position(e.Target.x, e.Target.y, e.Target.z, e.Target.o), _rot, e.Action.summonGO.despawnTime, (GameObjectSummonType)e.Action.summonGO.summonType);
break;
foreach (var target in targets)
{
Position pos = target.GetPositionWithOffset(new Position(e.Target.x, e.Target.y, e.Target.z, e.Target.o));
Quaternion rot = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(pos.GetOrientation(), 0f, 0f));
summoner.SummonGameObject(e.Action.summonGO.entry, pos, rot, e.Action.summonGO.despawnTime, (GameObjectSummonType)e.Action.summonGO.summonType);
}
if (e.GetTargetType() != SmartTargets.Position)
break;
Quaternion _rot = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(e.Target.o, 0f, 0f));
summoner.SummonGameObject(e.Action.summonGO.entry, new Position(e.Target.x, e.Target.y, e.Target.z, e.Target.o), _rot, e.Action.summonGO.despawnTime, (GameObjectSummonType)e.Action.summonGO.summonType);
break;
}
case SmartActions.KillUnit:
{
foreach (var target in targets)
@@ -2726,6 +2726,9 @@ namespace Game.AI
if ((e.Target.unitRange.creature == 0 || obj.ToCreature().GetEntry() == e.Target.unitRange.creature) && baseObject.IsInRange(obj, e.Target.unitRange.minDist, e.Target.unitRange.maxDist))
targets.Add(obj);
}
if (e.Target.unitRange.maxSize != 0)
targets.RandomResize(e.Target.unitRange.maxSize);
break;
}
case SmartTargets.CreatureDistance:
@@ -2742,6 +2745,9 @@ namespace Game.AI
if (e.Target.unitDistance.creature == 0 || obj.ToCreature().GetEntry() == e.Target.unitDistance.creature)
targets.Add(obj);
}
if (e.Target.unitDistance.maxSize != 0)
targets.RandomResize(e.Target.unitDistance.maxSize);
break;
}
case SmartTargets.GameobjectDistance:
@@ -2758,6 +2764,9 @@ namespace Game.AI
if (e.Target.goDistance.entry == 0 || obj.ToGameObject().GetEntry() == e.Target.goDistance.entry)
targets.Add(obj);
}
if (e.Target.goDistance.maxSize != 0)
targets.RandomResize(e.Target.goDistance.maxSize);
break;
}
case SmartTargets.GameobjectRange:
@@ -2774,6 +2783,9 @@ namespace Game.AI
if ((e.Target.goRange.entry == 0 && obj.ToGameObject().GetEntry() == e.Target.goRange.entry) && baseObject.IsInRange(obj, e.Target.goRange.minDist, e.Target.goRange.maxDist))
targets.Add(obj);
}
if (e.Target.goRange.maxSize != 0)
targets.RandomResize(e.Target.goRange.maxSize);
break;
}
case SmartTargets.CreatureGuid: