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

Core/SAI: Temporarily allow SMART_ACTION_WP_START to specify parameter value 3 for reactState

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/fc3e26fdfe68a7b1a7c0dd6f67dc545f40b9465e)
This commit is contained in:
hondacrx
2022-05-29 16:02:53 -04:00
parent 5e6dfb61ac
commit 8f11cd7660
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/SmartScripts/SmartAIManager.cs
+5 -1
View File
@@ -1703,7 +1703,11 @@ namespace Game.AI
if (e.Action.wpStart.quest != 0 && !IsQuestValid(e, e.Action.wpStart.quest))
return false;
if (e.Action.wpStart.reactState > (uint)ReactStates.Aggressive)
// Allow "invalid" value 3 for a while to allow cleanup the values stored in the db for SMART_ACTION_WP_START.
// Remember to remove this once the clean is complete.
int TEMPORARY_EXTRA_VALUE_FOR_DB_CLEANUP = 1;
if (e.Action.wpStart.reactState > (uint)(ReactStates.Aggressive + TEMPORARY_EXTRA_VALUE_FOR_DB_CLEANUP))
{
Log.outError(LogFilter.ScriptsAi, $"SmartAIMgr: {e} uses invalid React State {e.Action.wpStart.reactState}, skipped.");
return false;
Source/Game/AI/SmartScripts/SmartScript.cs
+6 -4
View File
@@ -1384,13 +1384,15 @@ namespace Game.AI
}
}
_me.SetReactState((ReactStates)e.Action.wpStart.reactState);
((SmartAI)_me.GetAI()).StartPath(run, entry, repeat, unit);
// Extra validation to ignore invalid values stored in the db, see comment at TEMPORARY_EXTRA_VALUE_FOR_DB_CLEANUP definition
if ((ReactStates)e.Action.wpStart.reactState <= ReactStates.Aggressive)
_me.SetReactState((ReactStates)e.Action.wpStart.reactState);
_me.GetAI<SmartAI>().StartPath(run, entry, repeat, unit);
uint quest = e.Action.wpStart.quest;
uint DespawnTime = e.Action.wpStart.despawnTime;
((SmartAI)_me.GetAI()).EscortQuestID = quest;
((SmartAI)_me.GetAI()).SetDespawnTime(DespawnTime);
_me.GetAI<SmartAI>().EscortQuestID = quest;
_me.GetAI<SmartAI>().SetDespawnTime(DespawnTime);
break;
}
case SmartActions.WpPause: