diff options
| author | Ovah <dreadkiller@gmx.de> | 2020-12-26 23:31:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-26 23:31:25 +0100 |
| commit | b7ba856b63da4fa1b0f916de357ff85624b8b831 (patch) | |
| tree | b82af098742337750790f345e64ee20b79b7ec32 /src | |
| parent | 8217519ea2d64917d725d8141fb3247bcadf716b (diff) | |
Core/SAI: implement new smart actions to change AI Animkits and to enable/disable hover movement (#25623)
* Core/SAI: implement new smart actions to change AI Animkits and to enable/disable hover movement for units
SMART_ACTION_SET_AI_ANIM_KIT (parameter 1: animKitId)
SMART_ACTION_SET_HOVER (parameter1: enable/disable)
* Update SmartScriptMgr.cpp
* Update SmartScript.cpp
* removed SMART_ACTION_SET_AI_ANIM_KIT since it's reserved for master
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.h | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index f55215096f8..a6945a804a7 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2367,6 +2367,11 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } break; } + case SMART_ACTION_SET_HOVER: + for (WorldObject* target : targets) + if (IsUnit(target)) + target->ToUnit()->SetHover(e.action.setHover.enable != 0); + break; default: TC_LOG_ERROR("sql.sql", "SmartScript::ProcessAction: Entry %d SourceType %u, Event %u, Unhandled Action type %u", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType()); break; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 3c0d064c402..05e84332717 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -1668,6 +1668,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_ACTION_SPAWN_SPAWNGROUP: case SMART_ACTION_DESPAWN_SPAWNGROUP: case SMART_ACTION_PLAY_CINEMATIC: + case SMART_ACTION_SET_HOVER: break; default: TC_LOG_ERROR("sql.sql", "SmartAIMgr: Not handled action_type(%u), event_type(%u), Entry %d SourceType %u Event %u, skipped.", e.GetActionType(), e.GetEventType(), e.entryOrGuid, e.GetScriptType(), e.event_id); diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 11b15dc5210..7d9bfa39db2 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -596,8 +596,10 @@ enum SMART_ACTION SMART_ACTION_PLAY_SPELL_VISUAL_KIT = 137, // spellVisualKitId (RESERVED, PENDING CHERRYPICK) SMART_ACTION_OVERRIDE_LIGHT = 138, // zoneId, overrideLightID, transitionMilliseconds SMART_ACTION_OVERRIDE_WEATHER = 139, // zoneId, weatherId, intensity + SMART_ACTION_SET_AI_ANIM_KIT = 140, // don't use on 3.3.5a + SMART_ACTION_SET_HOVER = 141, // 0/1 - SMART_ACTION_END = 140 + SMART_ACTION_END = 142 }; struct SmartAction @@ -1179,6 +1181,11 @@ struct SmartAction struct { + uint32 enable; + } setHover; + + struct + { uint32 toRespawnPosition; } evade; |