diff options
Diffstat (limited to 'src/server/scripts')
10 files changed, 25 insertions, 47 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 5a9c94b384f..eca67c1bf8e 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1243,14 +1243,10 @@ public: } //show animation - static bool HandleDebugAnimCommand(ChatHandler* handler, char const* args) + static bool HandleDebugAnimCommand(ChatHandler* handler, uint32 emoteId) { - if (!*args) - return false; - - uint32 animId = atoi((char*)args); if (Unit* unit = handler->getSelectedUnit()) - unit->HandleEmoteCommand(animId); + unit->HandleEmoteCommand(static_cast<Emote>(emoteId)); return true; } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index f6e8d40e03f..13e9d0a8635 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -525,7 +525,7 @@ struct boss_headless_horseman : public ScriptedAI if (Player* player = it->GetSource()) { player->Say(HeadlessHorsemanInitialPlayerTexts[talkContext.GetRepeatCounter()], LANG_UNIVERSAL); - player->HandleEmoteCommand(ANIM_EMOTE_SHOUT); + player->HandleEmoteCommand(EMOTE_ONESHOT_SHOUT); } } diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 48733f2b7cd..bcb4644f224 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -1046,26 +1046,15 @@ class npc_cw_area_trigger : public CreatureScript if (player->GetQuestStatus(QUEST_NOW_WHEN_I_GROW_UP) == QUEST_STATUS_COMPLETE) if (Creature* samuro = me->FindNearestCreature(25151, 20.0f)) { - uint32 emote = 0; - switch (urand(1, 5)) - { - case 1: - emote = EMOTE_ONESHOT_WAVE; - break; - case 2: - emote = EMOTE_ONESHOT_ROAR; - break; - case 3: - emote = EMOTE_ONESHOT_FLEX; - break; - case 4: - emote = EMOTE_ONESHOT_SALUTE; - break; - case 5: - emote = EMOTE_ONESHOT_DANCE; - break; - } - samuro->HandleEmoteCommand(emote); + Emote const emotes[] = + { + EMOTE_ONESHOT_WAVE, + EMOTE_ONESHOT_ROAR, + EMOTE_ONESHOT_FLEX, + EMOTE_ONESHOT_SALUTE, + EMOTE_ONESHOT_DANCE + }; + samuro->HandleEmoteCommand(Trinity::Containers::SelectRandomContainerElement(emotes)); } } break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index b246c8da786..abbb21686fe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -617,7 +617,7 @@ struct npc_martha_goslin : public CreatureScript InterruptTimer = 12000; SplineChainMovementGenerator::GetResumeInfo(ResumeInfo, me); me->GetMotionMaster()->Clear(); - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } void MovementInform(uint32 type, uint32 id) override @@ -627,12 +627,12 @@ struct npc_martha_goslin : public CreatureScript switch (id) { case MOVEID_EVENT1: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); me->SetFacingTo(marthaIdleOrientation1, true); Events.ScheduleEvent(EVENT_MARTHA_IDLE2, Seconds(9), Seconds(15)); break; case MOVEID_EVENT2: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); me->SetFacingTo(marthaIdleOrientation2, true); Events.ScheduleEvent(EVENT_MARTHA_IDLE1, Seconds(9), Seconds(15)); break; @@ -669,11 +669,11 @@ struct npc_martha_goslin : public CreatureScript switch (eventId) { case EVENT_MARTHA_IDLE1: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); me->GetMotionMaster()->MoveAlongSplineChain(MOVEID_EVENT1, CHAIN_MARTHA_IDLE1, true); break; case EVENT_MARTHA_IDLE2: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); me->GetMotionMaster()->MoveAlongSplineChain(MOVEID_EVENT2, CHAIN_MARTHA_IDLE2, true); break; default: @@ -684,7 +684,7 @@ struct npc_martha_goslin : public CreatureScript void JustAppeared() override { - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); Events.RescheduleEvent(EVENT_MARTHA_IDLE2, Seconds(5), Seconds(10)); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index c267e9bfd0f..2dcc3246dee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1074,7 +1074,7 @@ public: DoCast(citizen, SPELL_CRUSADER_STRIKE, TRIGGERED_IGNORE_SET_FACING); if (Creature* resident = me->FindNearestCreature(NPC_RESIDENT, 100.0f, true)) { - resident->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_COWER); + resident->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_COWER); resident->AI()->Talk(RP2_LINE_RESIDENT1, ObjectAccessor::GetUnit(*me, _eventStarterGuid)); } break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 0f8deaadb80..85e73c40f70 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1091,7 +1091,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript break; case EVENT_ESCAPE_7: if (Creature* lichking = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING_ESCAPE))) - lichking->HandleEmoteCommand(TEXT_EMOTE_ROAR); + lichking->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); me->GetMotionMaster()->MovePoint(0, NpcJainaOrSylvanasEscapeRoute[0]); _events.ScheduleEvent(EVENT_ESCAPE_8, 3s); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index fc681d398ac..b504a8f816a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -678,7 +678,7 @@ private: bool _checkCasting; }; -static std::vector<uint32> const DarkFallensEmotes = +static Emote const DarkFallensEmotes[]= { EMOTE_ONESHOT_TALK, EMOTE_ONESHOT_EXCLAMATION, diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index a5fb0ad3389..3ee199c8481 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -128,7 +128,7 @@ public: break; case 20: if (Creature* RWORG = ObjectAccessor::GetCreature(*me, _RavenousworgGUID)) - RWORG->HandleEmoteCommand(34); + RWORG->HandleEmoteCommand(EMOTE_ONESHOT_WOUND_CRITICAL); break; case 21: if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID)) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 9b795cc4610..8653254d5f0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -150,7 +150,7 @@ class boss_broggok : public CreatureScript } }; -static std::vector<uint32> const PrisionersEmotes = +static Emote const PrisionersEmotes[] = { EMOTE_ONESHOT_ROAR, EMOTE_ONESHOT_SHOUT, diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index c83cd236629..5e69d8ce72e 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3200,14 +3200,7 @@ class spell_gen_seaforium_blast : public SpellScript } }; -enum SpectatorCheerTrigger -{ - EMOTE_ONE_SHOT_CHEER = 4, - EMOTE_ONE_SHOT_EXCLAMATION = 5, - EMOTE_ONE_SHOT_APPLAUD = 21 -}; - -uint8 const EmoteArray[3] = { EMOTE_ONE_SHOT_CHEER, EMOTE_ONE_SHOT_EXCLAMATION, EMOTE_ONE_SHOT_APPLAUD }; +static Emote const EmoteArray[] = { EMOTE_ONESHOT_CHEER, EMOTE_ONESHOT_EXCLAMATION, EMOTE_ONESHOT_APPLAUD }; class spell_gen_spectator_cheer_trigger : public SpellScript { @@ -3216,7 +3209,7 @@ class spell_gen_spectator_cheer_trigger : public SpellScript void HandleDummy(SpellEffIndex /*effIndex*/) { if (roll_chance_i(40)) - GetCaster()->HandleEmoteCommand(EmoteArray[urand(0, 2)]); + GetCaster()->HandleEmoteCommand(Trinity::Containers::SelectRandomContainerElement(EmoteArray)); } void Register() override |