aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp8
-rw-r--r--src/server/scripts/Commands/cs_debug.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp23
-rw-r--r--src/server/scripts/Events/childrens_week.cpp29
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_grizzly_hills.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp2
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp11
10 files changed, 30 insertions, 59 deletions
diff --git a/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp b/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp
index b9f4e994d5a..488c6110c34 100644
--- a/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp
+++ b/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp
@@ -198,7 +198,7 @@ struct npc_feasting_valarjar : public ScriptedAI
{
_scheduler.Schedule(5s, 30s, [this](TaskContext context)
{
- uint32 emoteID = Trinity::Containers::SelectRandomContainerElement(_randomEmotes);
+ Emote emoteID = Trinity::Containers::SelectRandomContainerElement(_randomEmotes);
if (emoteID == EMOTE_ONESHOT_EAT_NO_SHEATHE)
{
me->SetVirtualItem(0, urand(0, 1) ? ITEM_MONSTER_ITEM_MUTTON_WITH_BITE : ITEM_MONSTER_ITEM_TANKARD_WOODEN);
@@ -235,7 +235,7 @@ struct npc_feasting_valarjar : public ScriptedAI
private:
TaskScheduler _scheduler;
- std::unordered_set<uint32> _randomEmotes;
+ std::unordered_set<Emote> _randomEmotes;
};
struct npc_valarjar_paying_respect_to_odyn : ScriptedAI
@@ -302,7 +302,7 @@ struct npc_valarjar_paying_respect_to_odyn : ScriptedAI
private:
TaskScheduler _scheduler;
- std::unordered_set<uint32> _randomEmotes;
+ std::unordered_set<Emote> _randomEmotes;
};
struct npc_incoming_valarjar_aspirant_1 : public npc_valarjar_paying_respect_to_odyn
@@ -583,7 +583,7 @@ struct npc_spectating_valarjar : public ScriptedAI
private:
TaskScheduler _scheduler;
- std::unordered_set<uint32> _randomEmotes;
+ std::unordered_set<Emote> _randomEmotes;
};
struct npc_valkyr_of_odyn : public ScriptedAI
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 7f1dc590e4c..e82a314798e 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1256,14 +1256,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 841034035bf..eebe379b8c7 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -524,7 +524,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/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
index c59df0ed693..81661015ca5 100644
--- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
@@ -275,27 +275,20 @@ enum RedridgeCitizen
EVENT_SAY_TEXT = 9, // Used by npc's in Lakeshire Townhall
EVENT_LEAVE_TOWNHALL = 10, // Used by npc's in Lakeshire Townhall
- EMOTE_ONESHOTCHEER = 4,
- EMOTE_ONESHOTROAR = 15,
- EMOTE_ONESHOTSHOT = 22,
- EMOTE_ONESHOTPOINT = 25,
- EMOTE_ONESHOTBATTLEROAR = 53,
- EMOTE_ONESHOTNO = 274,
-
SAY_IN_TOWNHALL = 0, // Used by npc's in Lakeshire Townhall
SAY_LEAVE_TOWNHALL = 1, // Used by npc's in Lakeshire Townhall
SPELL_APPLY_QUEST_INVIS_ZONE_19 = 82099 // Used by npc's in Lakeshire Townhall
};
-const uint32 Emote[6] =
+const Emote EmoteID[6] =
{
- EMOTE_ONESHOTCHEER,
- EMOTE_ONESHOTROAR,
- EMOTE_ONESHOTSHOT,
- EMOTE_ONESHOTPOINT,
- EMOTE_ONESHOTBATTLEROAR,
- EMOTE_ONESHOTNO
+ EMOTE_ONESHOT_CHEER,
+ EMOTE_ONESHOT_ROAR,
+ EMOTE_ONESHOT_SHOUT,
+ EMOTE_ONESHOT_POINT,
+ EMOTE_ONESHOT_BATTLE_ROAR,
+ EMOTE_ONESHOT_NO
};
uint32 const pathSize = 8;
@@ -343,7 +336,7 @@ public:
_events.ScheduleEvent(EVENT_SAY_TEXT, Seconds(5), Seconds(30));
break;
case EVENT_PLAYEMOTE:
- me->HandleEmoteCommand(Emote[urand(0, 5)]);
+ me->HandleEmoteCommand(EmoteID[urand(0, 5)]);
_events.ScheduleEvent(EVENT_PLAYEMOTE, Seconds(10), Seconds(25));
break;
case EVENT_SAY_TEXT:
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp
index d5f0f10383d..ab619a98e1a 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/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 5ae1c6c7bea..cb0007b86c2 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 7801e80c60b..b880fa32ed2 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -672,7 +672,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 eeab7e2ff11..262ffc44dbc 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -127,7 +127,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 b4cd3d82f2f..ea3734612f3 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 28bb777f866..5ebaaae0049 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -3094,14 +3094,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
{
@@ -3110,7 +3103,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