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

Core/SAI: Replace sai specific object type checking functions with Object functions

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4887e0ea1da6fe32c76a899f03c4bf10ed21bc55)
This commit is contained in:
Hondacrx
2025-08-20 10:15:11 -04:00
parent bdd66a8384
commit 921b3deec4
2 changed files with 363 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/SmartScripts/SmartAI.cs
+8 -13
View File
@@ -215,7 +215,7 @@ namespace Game.AI
List<WorldObject> targets = GetScript().GetStoredTargetList(SharedConst.SmartEscortTargets, me); List<WorldObject> targets = GetScript().GetStoredTargetList(SharedConst.SmartEscortTargets, me);
if (targets != null && EscortQuestID != 0) if (targets != null && EscortQuestID != 0)
{ {
if (targets.Count == 1 && GetScript().IsPlayer(targets.First())) if (targets.Count == 1 && targets.First().IsPlayer())
{ {
Player player = targets.First().ToPlayer(); Player player = targets.First().ToPlayer();
if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null) if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null)
@@ -242,11 +242,11 @@ namespace Game.AI
} }
else else
{ {
foreach (var obj in targets) foreach (var target in targets)
{ {
if (GetScript().IsPlayer(obj)) Player player = target.ToPlayer();
if (player != null)
{ {
Player player = obj.ToPlayer();
if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null) if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null)
player.AreaExploredOrEventHappens(EscortQuestID); player.AreaExploredOrEventHappens(EscortQuestID);
else if (fail) else if (fail)
@@ -324,7 +324,7 @@ namespace Game.AI
if (targets != null) if (targets != null)
{ {
float checkDist = me.GetInstanceScript() != null ? SMART_ESCORT_MAX_PLAYER_DIST * 2 : SMART_ESCORT_MAX_PLAYER_DIST; float checkDist = me.GetInstanceScript() != null ? SMART_ESCORT_MAX_PLAYER_DIST * 2 : SMART_ESCORT_MAX_PLAYER_DIST;
if (targets.Count == 1 && GetScript().IsPlayer(targets.First())) if (targets.Count == 1 && targets.First().IsPlayer())
{ {
Player player = targets.First().ToPlayer(); Player player = targets.First().ToPlayer();
if (me.GetDistance(player) <= checkDist) if (me.GetDistance(player) <= checkDist)
@@ -343,14 +343,9 @@ namespace Game.AI
} }
else else
{ {
foreach (var obj in targets) foreach (var target in targets)
{ if (target.IsPlayer() && me.GetDistance(target) <= checkDist)
if (GetScript().IsPlayer(obj)) return true;
{
if (me.GetDistance(obj.ToPlayer()) <= checkDist)
return true;
}
}
} }
// no valid target found // no valid target found
Source/Game/AI/SmartScripts/SmartScript.cs
+355 -270
View File
File diff suppressed because it is too large Load Diff