diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 35 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 27 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.h | 18 |
3 files changed, 8 insertions, 72 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index e4bdcbf8c8b..ea30a829f9a 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -697,19 +697,6 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } break; } - case SMART_ACTION_ADD_AURA: - { - for (WorldObject* target : targets) - { - if (IsUnit(target)) - { - target->ToUnit()->AddAura(e.action.addAura.spell, target->ToUnit()); - TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_ADD_AURA: Adding aura %u to unit %s", - e.action.addAura.spell, target->GetGUID().ToString().c_str()); - } - } - break; - } case SMART_ACTION_ACTIVATE_GOBJECT: { for (WorldObject* target : targets) @@ -1978,28 +1965,6 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u target->ToCreature()->SetControlled(e.action.setRoot.root != 0, UNIT_STATE_ROOT); break; } - case SMART_ACTION_SET_GO_FLAG: - { - for (WorldObject* target : targets) - if (IsGameObject(target)) - target->ToGameObject()->SetFlags(GameObjectFlags(e.action.goFlag.flag)); - - break; - } - case SMART_ACTION_ADD_GO_FLAG: - { - for (WorldObject* target : targets) - if (IsGameObject(target)) - target->ToGameObject()->AddFlag(GameObjectFlags(e.action.goFlag.flag)); - break; - } - case SMART_ACTION_REMOVE_GO_FLAG: - { - for (WorldObject* target : targets) - if (IsGameObject(target)) - target->ToGameObject()->RemoveFlag(GameObjectFlags(e.action.goFlag.flag)); - break; - } case SMART_ACTION_SUMMON_CREATURE_GROUP: { std::list<TempSummon*> summonList; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 1fc6de35a1c..52e3f79e857 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -942,7 +942,6 @@ bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e) case SMART_ACTION_CLOSE_GOSSIP: return NO_PARAMS; case SMART_ACTION_TRIGGER_TIMED_EVENT: return sizeof(SmartAction::timeEvent); case SMART_ACTION_REMOVE_TIMED_EVENT: return sizeof(SmartAction::timeEvent); - case SMART_ACTION_ADD_AURA: return sizeof(SmartAction::addAura); case SMART_ACTION_CALL_SCRIPT_RESET: return NO_PARAMS; case SMART_ACTION_SET_RANGED_MOVEMENT: return sizeof(SmartAction::setRangedMovement); case SMART_ACTION_CALL_TIMED_ACTIONLIST: return sizeof(SmartAction::timedActionList); @@ -965,9 +964,6 @@ bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e) case SMART_ACTION_SET_HOME_POS: return NO_PARAMS; case SMART_ACTION_SET_HEALTH_REGEN: return sizeof(SmartAction::setHealthRegen); case SMART_ACTION_SET_ROOT: return sizeof(SmartAction::setRoot); - case SMART_ACTION_SET_GO_FLAG: return sizeof(SmartAction::goFlag); - case SMART_ACTION_ADD_GO_FLAG: return sizeof(SmartAction::goFlag); - case SMART_ACTION_REMOVE_GO_FLAG: return sizeof(SmartAction::goFlag); case SMART_ACTION_SUMMON_CREATURE_GROUP: return sizeof(SmartAction::creatureGroup); case SMART_ACTION_SET_POWER: return sizeof(SmartAction::power); case SMART_ACTION_ADD_POWER: return sizeof(SmartAction::power); @@ -1666,10 +1662,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) if (!IsSpellValid(e, e.action.cast.spell)) return false; break; - case SMART_ACTION_ADD_AURA: - if (!IsSpellValid(e, e.action.addAura.spell)) - return false; - break; case SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS: case SMART_ACTION_CALL_GROUPEVENTHAPPENS: if (Quest const* qid = sObjectMgr->GetQuestTemplate(e.action.quest.quest)) @@ -2292,9 +2284,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_ACTION_GO_SET_GO_STATE: case SMART_ACTION_SEND_TARGET_TO_TARGET: case SMART_ACTION_SET_HOME_POS: - case SMART_ACTION_SET_GO_FLAG: - case SMART_ACTION_ADD_GO_FLAG: - case SMART_ACTION_REMOVE_GO_FLAG: case SMART_ACTION_SUMMON_CREATURE_GROUP: case SMART_ACTION_MOVE_OFFSET: case SMART_ACTION_SET_CORPSE_DELAY: @@ -2318,12 +2307,16 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_ACTION_REMOVE_UNIT_FLAG: case SMART_ACTION_INSTALL_AI_TEMPLATE: case SMART_ACTION_SET_SWIM: + case SMART_ACTION_ADD_AURA: case SMART_ACTION_OVERRIDE_SCRIPT_BASE_OBJECT: case SMART_ACTION_RESET_SCRIPT_BASE_OBJECT: case SMART_ACTION_SEND_GO_CUSTOM_ANIM: case SMART_ACTION_SET_DYNAMIC_FLAG: case SMART_ACTION_ADD_DYNAMIC_FLAG: case SMART_ACTION_REMOVE_DYNAMIC_FLAG: + case SMART_ACTION_SET_GO_FLAG: + case SMART_ACTION_ADD_GO_FLAG: + case SMART_ACTION_REMOVE_GO_FLAG: case SMART_ACTION_SET_CAN_FLY: case SMART_ACTION_REMOVE_AURAS_BY_TYPE: case SMART_ACTION_SET_SIGHT_DIST: @@ -2336,18 +2329,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) return false; } - // Additional check for deprecated - switch (e.GetActionType()) - { - // Deprecated - case SMART_ACTION_ADD_AURA: - case SMART_ACTION_SET_GO_FLAG: - TC_LOG_WARN("sql.sql.deprecation", "SmartAIMgr: Deprecated action_type(%u), Entry " SI64FMTD " SourceType %u Event %u, it might be removed in the future, loaded for now.", e.GetActionType(), e.entryOrGuid, e.GetScriptType(), e.event_id); - break; - default: - break; - } - if (!CheckUnusedActionParams(e)) return false; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index a0296e772bb..69dc73ea5ce 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -518,7 +518,7 @@ enum SMART_ACTION SMART_ACTION_CLOSE_GOSSIP = 72, // none SMART_ACTION_TRIGGER_TIMED_EVENT = 73, // id(>1) SMART_ACTION_REMOVE_TIMED_EVENT = 74, // id(>1) - SMART_ACTION_ADD_AURA = 75, // spellid, targets + SMART_ACTION_ADD_AURA = 75, // UNUSED, DO NOT REUSE SMART_ACTION_OVERRIDE_SCRIPT_BASE_OBJECT = 76, // UNUSED, DO NOT REUSE SMART_ACTION_RESET_SCRIPT_BASE_OBJECT = 77, // UNUSED, DO NOT REUSE SMART_ACTION_CALL_SCRIPT_RESET = 78, // none @@ -547,9 +547,9 @@ enum SMART_ACTION SMART_ACTION_SET_HOME_POS = 101, // none SMART_ACTION_SET_HEALTH_REGEN = 102, // 0/1 SMART_ACTION_SET_ROOT = 103, // off/on - SMART_ACTION_SET_GO_FLAG = 104, // Flags - SMART_ACTION_ADD_GO_FLAG = 105, // Flags - SMART_ACTION_REMOVE_GO_FLAG = 106, // Flags + SMART_ACTION_SET_GO_FLAG = 104, // UNUSED, DO NOT REUSE + SMART_ACTION_ADD_GO_FLAG = 105, // UNUSED, DO NOT REUSE + SMART_ACTION_REMOVE_GO_FLAG = 106, // UNUSED, DO NOT REUSE SMART_ACTION_SUMMON_CREATURE_GROUP = 107, // Group, attackInvoker SMART_ACTION_SET_POWER = 108, // PowerType, newPower SMART_ACTION_ADD_POWER = 109, // PowerType, newPower @@ -735,11 +735,6 @@ struct SmartAction struct { uint32 spell; - } addAura; - - struct - { - uint32 spell; uint32 charges; SAIBool onlyOwnedAuras; } removeAura; @@ -1034,11 +1029,6 @@ struct SmartAction struct { - uint32 flag; - } goFlag; - - struct - { uint32 state; } goState; |