Skip to content

Commit 5ba93a9

Browse files
offloffl
authored
Core/SAI: Remove SMART_ACTION_ADD_AURA & actions to change object flags (#27571)
1 parent 5f0e80b commit 5ba93a9

File tree

3 files changed

+8
-71
lines changed

3 files changed

+8
-71
lines changed

‎src/server/game/AI/SmartScripts/SmartScript.cpp‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -693,19 +693,6 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
693693
}
694694
break;
695695
}
696-
case SMART_ACTION_ADD_AURA:
697-
{
698-
for (WorldObject* target : targets)
699-
{
700-
if (IsUnit(target))
701-
{
702-
target->ToUnit()->AddAura(e.action.addAura.spell, target->ToUnit());
703-
TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_ADD_AURA: Adding aura %u to unit %s",
704-
e.action.addAura.spell, target->GetGUID().ToString().c_str());
705-
}
706-
}
707-
break;
708-
}
709696
case SMART_ACTION_ACTIVATE_GOBJECT:
710697
{
711698
for (WorldObject* target : targets)
@@ -1920,27 +1907,6 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
19201907
target->ToCreature()->SetControlled(e.action.setRoot.root != 0, UNIT_STATE_ROOT);
19211908
break;
19221909
}
1923-
case SMART_ACTION_SET_GO_FLAG:
1924-
{
1925-
for (WorldObject* target : targets)
1926-
if (IsGameObject(target))
1927-
target->ToGameObject()->SetUInt32Value(GAMEOBJECT_FLAGS, e.action.goFlag.flag);
1928-
break;
1929-
}
1930-
case SMART_ACTION_ADD_GO_FLAG:
1931-
{
1932-
for (WorldObject* target : targets)
1933-
if (IsGameObject(target))
1934-
target->ToGameObject()->SetFlag(GAMEOBJECT_FLAGS, e.action.goFlag.flag);
1935-
break;
1936-
}
1937-
case SMART_ACTION_REMOVE_GO_FLAG:
1938-
{
1939-
for (WorldObject* target : targets)
1940-
if (IsGameObject(target))
1941-
target->ToGameObject()->RemoveFlag(GAMEOBJECT_FLAGS, e.action.goFlag.flag);
1942-
break;
1943-
}
19441910
case SMART_ACTION_SUMMON_CREATURE_GROUP:
19451911
{
19461912
std::list<TempSummon*> summonList;

‎src/server/game/AI/SmartScripts/SmartScriptMgr.cpp‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,6 @@ bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e)
870870
case SMART_ACTION_CLOSE_GOSSIP: return NO_PARAMS;
871871
case SMART_ACTION_TRIGGER_TIMED_EVENT: return sizeof(SmartAction::timeEvent);
872872
case SMART_ACTION_REMOVE_TIMED_EVENT: return sizeof(SmartAction::timeEvent);
873-
case SMART_ACTION_ADD_AURA: return sizeof(SmartAction::addAura);
874873
case SMART_ACTION_CALL_SCRIPT_RESET: return NO_PARAMS;
875874
case SMART_ACTION_SET_RANGED_MOVEMENT: return sizeof(SmartAction::setRangedMovement);
876875
case SMART_ACTION_CALL_TIMED_ACTIONLIST: return sizeof(SmartAction::timedActionList);
@@ -893,9 +892,6 @@ bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e)
893892
case SMART_ACTION_SET_HOME_POS: return NO_PARAMS;
894893
case SMART_ACTION_SET_HEALTH_REGEN: return sizeof(SmartAction::setHealthRegen);
895894
case SMART_ACTION_SET_ROOT: return sizeof(SmartAction::setRoot);
896-
case SMART_ACTION_SET_GO_FLAG: return sizeof(SmartAction::goFlag);
897-
case SMART_ACTION_ADD_GO_FLAG: return sizeof(SmartAction::goFlag);
898-
case SMART_ACTION_REMOVE_GO_FLAG: return sizeof(SmartAction::goFlag);
899895
case SMART_ACTION_SUMMON_CREATURE_GROUP: return sizeof(SmartAction::creatureGroup);
900896
case SMART_ACTION_SET_POWER: return sizeof(SmartAction::power);
901897
case SMART_ACTION_ADD_POWER: return sizeof(SmartAction::power);
@@ -1563,10 +1559,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
15631559
if (!IsSpellValid(e, e.action.cast.spell))
15641560
return false;
15651561
break;
1566-
case SMART_ACTION_ADD_AURA:
1567-
if (!IsSpellValid(e, e.action.addAura.spell))
1568-
return false;
1569-
break;
15701562
case SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS:
15711563
case SMART_ACTION_CALL_GROUPEVENTHAPPENS:
15721564
if (Quest const* qid = sObjectMgr->GetQuestTemplate(e.action.quest.quest))
@@ -2102,9 +2094,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
21022094
case SMART_ACTION_GO_SET_GO_STATE:
21032095
case SMART_ACTION_SEND_TARGET_TO_TARGET:
21042096
case SMART_ACTION_SET_HOME_POS:
2105-
case SMART_ACTION_SET_GO_FLAG:
2106-
case SMART_ACTION_ADD_GO_FLAG:
2107-
case SMART_ACTION_REMOVE_GO_FLAG:
21082097
case SMART_ACTION_SUMMON_CREATURE_GROUP:
21092098
case SMART_ACTION_MOVE_OFFSET:
21102099
case SMART_ACTION_SET_CORPSE_DELAY:
@@ -2120,12 +2109,16 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
21202109
case SMART_ACTION_REMOVE_UNIT_FLAG:
21212110
case SMART_ACTION_INSTALL_AI_TEMPLATE:
21222111
case SMART_ACTION_SET_SWIM:
2112+
case SMART_ACTION_ADD_AURA:
21232113
case SMART_ACTION_OVERRIDE_SCRIPT_BASE_OBJECT:
21242114
case SMART_ACTION_RESET_SCRIPT_BASE_OBJECT:
21252115
case SMART_ACTION_SEND_GO_CUSTOM_ANIM:
21262116
case SMART_ACTION_SET_DYNAMIC_FLAG:
21272117
case SMART_ACTION_ADD_DYNAMIC_FLAG:
21282118
case SMART_ACTION_REMOVE_DYNAMIC_FLAG:
2119+
case SMART_ACTION_SET_GO_FLAG:
2120+
case SMART_ACTION_ADD_GO_FLAG:
2121+
case SMART_ACTION_REMOVE_GO_FLAG:
21292122
case SMART_ACTION_SET_CAN_FLY:
21302123
case SMART_ACTION_REMOVE_AURAS_BY_TYPE:
21312124
case SMART_ACTION_SET_SIGHT_DIST:
@@ -2138,18 +2131,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
21382131
return false;
21392132
}
21402133

2141-
// Additional check for deprecated
2142-
switch (e.GetActionType())
2143-
{
2144-
// Deprecated
2145-
case SMART_ACTION_ADD_AURA:
2146-
case SMART_ACTION_SET_GO_FLAG:
2147-
TC_LOG_WARN("sql.sql.deprecation", "SmartAIMgr: Deprecated action_type(%u), Entry %d SourceType %u Event %u, it might be removed in the future, loaded for now.", e.GetActionType(), e.entryOrGuid, e.GetScriptType(), e.event_id);
2148-
break;
2149-
default:
2150-
break;
2151-
}
2152-
21532134
if (!CheckUnusedActionParams(e))
21542135
return false;
21552136

‎src/server/game/AI/SmartScripts/SmartScriptMgr.h‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ enum SMART_ACTION
512512
SMART_ACTION_CLOSE_GOSSIP = 72, // none
513513
SMART_ACTION_TRIGGER_TIMED_EVENT = 73, // id(>1)
514514
SMART_ACTION_REMOVE_TIMED_EVENT = 74, // id(>1)
515-
SMART_ACTION_ADD_AURA = 75, // spellid, targets
515+
SMART_ACTION_ADD_AURA = 75, // UNUSED, DO NOT REUSE
516516
SMART_ACTION_OVERRIDE_SCRIPT_BASE_OBJECT = 76, // UNUSED, DO NOT REUSE
517517
SMART_ACTION_RESET_SCRIPT_BASE_OBJECT = 77, // UNUSED, DO NOT REUSE
518518
SMART_ACTION_CALL_SCRIPT_RESET = 78, // none
@@ -541,9 +541,9 @@ enum SMART_ACTION
541541
SMART_ACTION_SET_HOME_POS = 101, // none
542542
SMART_ACTION_SET_HEALTH_REGEN = 102, // 0/1
543543
SMART_ACTION_SET_ROOT = 103, // off/on
544-
SMART_ACTION_SET_GO_FLAG = 104, // Flags
545-
SMART_ACTION_ADD_GO_FLAG = 105, // Flags
546-
SMART_ACTION_REMOVE_GO_FLAG = 106, // Flags
544+
SMART_ACTION_SET_GO_FLAG = 104, // UNUSED, DO NOT REUSE
545+
SMART_ACTION_ADD_GO_FLAG = 105, // UNUSED, DO NOT REUSE
546+
SMART_ACTION_REMOVE_GO_FLAG = 106, // UNUSED, DO NOT REUSE
547547
SMART_ACTION_SUMMON_CREATURE_GROUP = 107, // Group, attackInvoker
548548
SMART_ACTION_SET_POWER = 108, // PowerType, newPower
549549
SMART_ACTION_ADD_POWER = 109, // PowerType, newPower
@@ -726,11 +726,6 @@ struct SmartAction
726726
uint32 dec;
727727
} incEventPhase;
728728

729-
struct
730-
{
731-
uint32 spell;
732-
} addAura;
733-
734729
struct
735730
{
736731
uint32 spell;
@@ -1019,11 +1014,6 @@ struct SmartAction
10191014
SAIBool root;
10201015
} setRoot;
10211016

1022-
struct
1023-
{
1024-
uint32 flag;
1025-
} goFlag;
1026-
10271017
struct
10281018
{
10291019
uint32 state;

0 commit comments

Comments
 (0)