Core/SAI: Remove SMART_ACTION_ADD_AURA & actions to change object flags
Port From (https://github.com/TrinityCore/TrinityCore/commit/8b7effa4cfa3476ed5aa41729b4ab9fb15e7a1c0)
This commit is contained in:
@@ -739,7 +739,6 @@ namespace Game.AI
|
|||||||
SmartActions.CloseGossip => 0,
|
SmartActions.CloseGossip => 0,
|
||||||
SmartActions.TriggerTimedEvent => Marshal.SizeOf(typeof(SmartAction.TimeEvent)),
|
SmartActions.TriggerTimedEvent => Marshal.SizeOf(typeof(SmartAction.TimeEvent)),
|
||||||
SmartActions.RemoveTimedEvent => Marshal.SizeOf(typeof(SmartAction.TimeEvent)),
|
SmartActions.RemoveTimedEvent => Marshal.SizeOf(typeof(SmartAction.TimeEvent)),
|
||||||
SmartActions.AddAura => Marshal.SizeOf(typeof(SmartAction.AddAura)),
|
|
||||||
SmartActions.CallScriptReset => 0,
|
SmartActions.CallScriptReset => 0,
|
||||||
SmartActions.SetRangedMovement => Marshal.SizeOf(typeof(SmartAction.SetRangedMovement)),
|
SmartActions.SetRangedMovement => Marshal.SizeOf(typeof(SmartAction.SetRangedMovement)),
|
||||||
SmartActions.CallTimedActionlist => Marshal.SizeOf(typeof(SmartAction.TimedActionList)),
|
SmartActions.CallTimedActionlist => Marshal.SizeOf(typeof(SmartAction.TimedActionList)),
|
||||||
@@ -764,9 +763,6 @@ namespace Game.AI
|
|||||||
SmartActions.SetHomePos => 0,
|
SmartActions.SetHomePos => 0,
|
||||||
SmartActions.SetHealthRegen => Marshal.SizeOf(typeof(SmartAction.SetHealthRegen)),
|
SmartActions.SetHealthRegen => Marshal.SizeOf(typeof(SmartAction.SetHealthRegen)),
|
||||||
SmartActions.SetRoot => Marshal.SizeOf(typeof(SmartAction.SetRoot)),
|
SmartActions.SetRoot => Marshal.SizeOf(typeof(SmartAction.SetRoot)),
|
||||||
SmartActions.SetGoFlag => Marshal.SizeOf(typeof(SmartAction.Flag)),
|
|
||||||
SmartActions.AddGoFlag => Marshal.SizeOf(typeof(SmartAction.Flag)),
|
|
||||||
SmartActions.RemoveGoFlag => Marshal.SizeOf(typeof(SmartAction.Flag)),
|
|
||||||
SmartActions.SummonCreatureGroup => Marshal.SizeOf(typeof(SmartAction.CreatureGroup)),
|
SmartActions.SummonCreatureGroup => Marshal.SizeOf(typeof(SmartAction.CreatureGroup)),
|
||||||
SmartActions.SetPower => Marshal.SizeOf(typeof(SmartAction.Power)),
|
SmartActions.SetPower => Marshal.SizeOf(typeof(SmartAction.Power)),
|
||||||
SmartActions.AddPower => Marshal.SizeOf(typeof(SmartAction.Power)),
|
SmartActions.AddPower => Marshal.SizeOf(typeof(SmartAction.Power)),
|
||||||
@@ -1468,10 +1464,6 @@ namespace Game.AI
|
|||||||
if (!IsSpellValid(e, e.Action.cast.spell))
|
if (!IsSpellValid(e, e.Action.cast.spell))
|
||||||
return false;
|
return false;
|
||||||
break;
|
break;
|
||||||
case SmartActions.AddAura:
|
|
||||||
if (!IsSpellValid(e, e.Action.addAura.spell))
|
|
||||||
return false;
|
|
||||||
break;
|
|
||||||
case SmartActions.CallAreaexploredoreventhappens:
|
case SmartActions.CallAreaexploredoreventhappens:
|
||||||
case SmartActions.CallGroupeventhappens:
|
case SmartActions.CallGroupeventhappens:
|
||||||
Quest qid = Global.ObjectMgr.GetQuestTemplate(e.Action.quest.questId);
|
Quest qid = Global.ObjectMgr.GetQuestTemplate(e.Action.quest.questId);
|
||||||
@@ -2065,9 +2057,6 @@ namespace Game.AI
|
|||||||
case SmartActions.GoSetGoState:
|
case SmartActions.GoSetGoState:
|
||||||
case SmartActions.SendTargetToTarget:
|
case SmartActions.SendTargetToTarget:
|
||||||
case SmartActions.SetHomePos:
|
case SmartActions.SetHomePos:
|
||||||
case SmartActions.SetGoFlag:
|
|
||||||
case SmartActions.AddGoFlag:
|
|
||||||
case SmartActions.RemoveGoFlag:
|
|
||||||
case SmartActions.SummonCreatureGroup:
|
case SmartActions.SummonCreatureGroup:
|
||||||
case SmartActions.MoveOffset:
|
case SmartActions.MoveOffset:
|
||||||
case SmartActions.SetCorpseDelay:
|
case SmartActions.SetCorpseDelay:
|
||||||
@@ -2090,12 +2079,16 @@ namespace Game.AI
|
|||||||
case SmartActions.RemoveUnitFlag:
|
case SmartActions.RemoveUnitFlag:
|
||||||
case SmartActions.InstallAITemplate:
|
case SmartActions.InstallAITemplate:
|
||||||
case SmartActions.SetSwim:
|
case SmartActions.SetSwim:
|
||||||
|
case SmartActions.AddAura:
|
||||||
case SmartActions.OverrideScriptBaseObject:
|
case SmartActions.OverrideScriptBaseObject:
|
||||||
case SmartActions.ResetScriptBaseObject:
|
case SmartActions.ResetScriptBaseObject:
|
||||||
case SmartActions.SendGoCustomAnim:
|
case SmartActions.SendGoCustomAnim:
|
||||||
case SmartActions.SetDynamicFlag:
|
case SmartActions.SetDynamicFlag:
|
||||||
case SmartActions.AddDynamicFlag:
|
case SmartActions.AddDynamicFlag:
|
||||||
case SmartActions.RemoveDynamicFlag:
|
case SmartActions.RemoveDynamicFlag:
|
||||||
|
case SmartActions.SetGoFlag:
|
||||||
|
case SmartActions.AddGoFlag:
|
||||||
|
case SmartActions.RemoveGoFlag:
|
||||||
case SmartActions.SetCanFly:
|
case SmartActions.SetCanFly:
|
||||||
case SmartActions.RemoveAurasByType:
|
case SmartActions.RemoveAurasByType:
|
||||||
case SmartActions.SetSightDist:
|
case SmartActions.SetSightDist:
|
||||||
@@ -2108,18 +2101,6 @@ namespace Game.AI
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Additional check for deprecated
|
|
||||||
switch (e.GetActionType())
|
|
||||||
{
|
|
||||||
// Deprecated
|
|
||||||
case SmartActions.AddAura:
|
|
||||||
case SmartActions.SetGoFlag:
|
|
||||||
Log.outWarn(LogFilter.Sql, $"SmartAIMgr: Deprecated action_type: {e}, it might be removed in the future, loaded for now.");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!CheckUnusedActionParams(e))
|
if (!CheckUnusedActionParams(e))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -2882,9 +2863,6 @@ namespace Game.AI
|
|||||||
[FieldOffset(4)]
|
[FieldOffset(4)]
|
||||||
public IncEventPhase incEventPhase;
|
public IncEventPhase incEventPhase;
|
||||||
|
|
||||||
[FieldOffset(4)]
|
|
||||||
public AddAura addAura;
|
|
||||||
|
|
||||||
[FieldOffset(4)]
|
[FieldOffset(4)]
|
||||||
public CastedCreatureOrGO castedCreatureOrGO;
|
public CastedCreatureOrGO castedCreatureOrGO;
|
||||||
|
|
||||||
@@ -3246,10 +3224,6 @@ namespace Game.AI
|
|||||||
public uint inc;
|
public uint inc;
|
||||||
public uint dec;
|
public uint dec;
|
||||||
}
|
}
|
||||||
public struct AddAura
|
|
||||||
{
|
|
||||||
public uint spell;
|
|
||||||
}
|
|
||||||
public struct CastedCreatureOrGO
|
public struct CastedCreatureOrGO
|
||||||
{
|
{
|
||||||
public uint creature;
|
public uint creature;
|
||||||
|
|||||||
Reference in New Issue
Block a user